From ca56d0c491f4fef03d2fa7b47b7f4e2fb6bbf34f Mon Sep 17 00:00:00 2001
From: otya <otya128@users.noreply.github.com>
Date: Sat, 13 Nov 2021 20:36:06 +0900
Subject: [PATCH] user.exe16: Fix stub (2).

---
 user/CMakeLists.txt       | 2 +-
 user/{stub.cpp => stub.c} | 5 -----
 user/user.vcxproj         | 2 +-
 user/user.vcxproj.filters | 6 +++---
 4 files changed, 5 insertions(+), 10 deletions(-)
 rename user/{stub.cpp => stub.c} (99%)

diff --git a/user/CMakeLists.txt b/user/CMakeLists.txt
index 7749f705072..abdf9d58261 100644
--- 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 b/user/stub.c
similarity index 99%
rename from user/stub.cpp
rename to user/stub.c
index 91270b46890..801d1534751 100644
--- a/user/stub.cpp
+++ b/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
index a204ffa1bfc..fd1f7d09b24 100644
--- 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
index 6165d971409..7b0395da3a5 100644
--- 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">