From a3b56ff138684f7fa75df9402dabb335d8be6a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 5 Sep 2005 21:06:55 +0000
Subject: [PATCH] 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.

svn path=/trunk/; revision=17667
---
 reactos/lib/dinput8/Makefile.in    | 17 -----------------
 reactos/lib/dinput8/dinput8.spec   | 10 +++++-----
 reactos/lib/dinput8/dinput8_main.c |  9 ++++-----
 3 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 reactos/lib/dinput8/Makefile.in

diff --git a/reactos/lib/dinput8/Makefile.in b/reactos/lib/dinput8/Makefile.in
deleted file mode 100644
index c434023b5c7..00000000000
--- a/reactos/lib/dinput8/Makefile.in
+++ /dev/null
@@ -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:
diff --git a/reactos/lib/dinput8/dinput8.spec b/reactos/lib/dinput8/dinput8.spec
index 22baa36a354..e8b15fdec7c 100644
--- a/reactos/lib/dinput8/dinput8.spec
+++ b/reactos/lib/dinput8/dinput8.spec
@@ -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()
diff --git a/reactos/lib/dinput8/dinput8_main.c b/reactos/lib/dinput8/dinput8_main.c
index 7de9b95079b..432d3f184a2 100644
--- a/reactos/lib/dinput8/dinput8_main.c
+++ b/reactos/lib/dinput8/dinput8_main.c
@@ -43,7 +43,7 @@ HRESULT WINAPI DirectInput8Create(
 /***********************************************************************
  *		DllCanUnloadNow (DINPUT8.@)
  */
-HRESULT WINAPI DINPUT8_DllCanUnloadNow(void)
+HRESULT WINAPI DllCanUnloadNow(void)
 {
     FIXME("(void): stub\n");
 
@@ -53,8 +53,7 @@ HRESULT WINAPI DINPUT8_DllCanUnloadNow(void)
 /***********************************************************************
  *		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 @@ HRESULT WINAPI DINPUT8_DllGetClassObject(REFCLSID rclsid, REFIID riid,
 /***********************************************************************
  *		DllRegisterServer (DINPUT8.@)
  */
-HRESULT WINAPI DINPUT8_DllRegisterServer(void)
+HRESULT WINAPI DllRegisterServer(void)
 {
     FIXME("(void): stub\n");
 
@@ -75,7 +74,7 @@ HRESULT WINAPI DINPUT8_DllRegisterServer(void)
 /***********************************************************************
  *		DllUnregisterServer (DINPUT8.@)
  */
-HRESULT WINAPI DINPUT8_DllUnregisterServer(void)
+HRESULT WINAPI DllUnregisterServer(void)
 {
     FIXME("(void): stub\n");