Sync to Wine-20050830: Alexandre Julliard julliard@winehq.org - Don't prefix the functions DllCanUnloadNow, DllGetClassObject and Dll(Un)RegisterServer with the dll name so that the compiler can check the prototypes. - Uncomment out DisableThreadLibraryCalls in DllMain and add the kernel32 imports that it requires. Deleted: trunk/reactos/lib/dinput8/Makefile.in Modified: trunk/reactos/lib/dinput8/dinput8.spec Modified: trunk/reactos/lib/dinput8/dinput8_main.c _____
Deleted: trunk/reactos/lib/dinput8/Makefile.in --- trunk/reactos/lib/dinput8/Makefile.in 2005-09-05 21:04:10 UTC (rev 17666) +++ trunk/reactos/lib/dinput8/Makefile.in 2005-09-05 21:06:55 UTC (rev 17667) @@ -1,17 +0,0 @@
-TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = dinput8.dll -IMPORTLIB = libdinput8.$(IMPLIBEXT) -IMPORTS = dinput -EXTRALIBS = -luuid - -C_SRCS = \ - dinput8_main.c - -RC_SRCS = version.rc - -@MAKE_DLL_RULES@ - -### Dependencies: _____
Modified: trunk/reactos/lib/dinput8/dinput8.spec --- trunk/reactos/lib/dinput8/dinput8.spec 2005-09-05 21:04:10 UTC (rev 17666) +++ trunk/reactos/lib/dinput8/dinput8.spec 2005-09-05 21:06:55 UTC (rev 17667) @@ -1,5 +1,5 @@
-@ stdcall DirectInput8Create(long long ptr ptr ptr) -@ stdcall -private DllCanUnloadNow() DINPUT8_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DINPUT8_DllGetClassObject -@ stdcall -private DllRegisterServer() DINPUT8_DllRegisterServer -@ stdcall -private DllUnregisterServer() DINPUT8_DllUnregisterServer +@ stdcall DirectInput8Create(long long ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Property changes on: trunk/reactos/lib/dinput8/dinput8.spec ___________________________________________________________________ Name: svn:eol-style + native _____
Modified: trunk/reactos/lib/dinput8/dinput8_main.c --- trunk/reactos/lib/dinput8/dinput8_main.c 2005-09-05 21:04:10 UTC (rev 17666) +++ trunk/reactos/lib/dinput8/dinput8_main.c 2005-09-05 21:06:55 UTC (rev 17667) @@ -43,7 +43,7 @@
/*********************************************************************** * DllCanUnloadNow (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("(void): stub\n");
@@ -53,8 +53,7 @@
/*********************************************************************** * DllGetClassObject (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllGetClassObject(REFCLSID rclsid, REFIID riid, - LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -65,7 +64,7 @@
/*********************************************************************** * DllRegisterServer (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { FIXME("(void): stub\n");
@@ -75,7 +74,7 @@
/*********************************************************************** * DllUnregisterServer (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { FIXME("(void): stub\n");