user.exe16: Fix stub (2).

otya128 · Nov 13, 2021 · ca56d0c · ca56d0c
1 parent 1c7ecf6
commit ca56d0c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/user/CMakeLists.txt b/user/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB SOURCE *.c *.cpp)
+file(GLOB SOURCE *.c)
 add_library(user SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/user.def user.exe16.obj)
 include_directories(../wine)
 add_definitions(-D_X86_ -D__WINESRC__ -D__i386__ -DHAVE_STRNCASECMP -DHAVE__STRNICMP -D_WINTERNL_ -DNtCurrentTeb=NtCurrentTeb__ -DDECLSPEC_HIDDEN= -Dstrncasecmp=_strnicmp -D_WIN32_WINNT=0x0A00)

diff --git a/user/stub.cpp → user/stub.c b/user/stub.cpp → user/stub.c
@@ -1,7 +1,3 @@
-extern "C"
-{
-#define new _new
-
 #include "wine/debug.h"
 #include "user_private.h"
 
@@ -161,4 +157,3 @@ LONG WINAPI GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, LONG *height)
     if (height) *height = sz.cy;
     return (sz.cx / 26 + 1) / 2;
 }
-}
diff --git a/user/user.vcxproj b/user/user.vcxproj
@@ -96,7 +96,7 @@
     <ClCompile Include="hook.c" />
     <ClCompile Include="message.c" />
     <ClCompile Include="network.c" />
-    <ClCompile Include="stub.cpp">
+    <ClCompile Include="stub.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="user.c" />

diff --git a/user/user.vcxproj.filters b/user/user.vcxproj.filters
@@ -39,15 +39,15 @@
     <ClCompile Include="dialog.c">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
-    <ClCompile Include="stub.cpp">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
     <ClCompile Include="winhelp.c">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
     <ClCompile Include="dde.c">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="stub.c">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="user_private.h">