From 5b882003fe6d76362d89338d1b388a513dfd52af Mon Sep 17 00:00:00 2001
From: Aric Stewart <aric@codeweavers.com>
Date: Thu, 25 Jun 2015 10:15:33 -0500
Subject: [PATCH] hid: Break HidD functions out into their own module.

---
 dlls/hid/Makefile.in        |  1 +
 dlls/hid/{main.c => hidd.c} | 26 +++++---------------------
 dlls/hid/main.c             | 38 +-------------------------------------
 3 files changed, 7 insertions(+), 58 deletions(-)
 copy dlls/hid/{main.c => hidd.c} (77%)

diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in
index af0d7dc70f4..3a115ca997e 100644
--- a/dlls/hid/Makefile.in
+++ b/dlls/hid/Makefile.in
@@ -2,6 +2,7 @@ MODULE    = hid.dll
 IMPORTLIB = hid
 
 C_SRCS = \
+	hidd.c \
 	main.c
 
 RC_SRCS = version.rc
diff --git a/dlls/hid/main.c b/dlls/hid/hidd.c
similarity index 77%
copy from dlls/hid/main.c
copy to dlls/hid/hidd.c
index 927b563cc0c..18a033c990a 100644
--- a/dlls/hid/main.c
+++ b/dlls/hid/hidd.c
@@ -22,32 +22,16 @@
 
 #include <stdarg.h>
 
+#include "wine/debug.h"
+
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
-#include "ddk/hidsdi.h"
 
-#include "wine/debug.h"
+#include "ddk/hidclass.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(hid);
 
-#include "initguid.h"
-DEFINE_GUID(HID_GUID, 0x4D1E55B2, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30);
-
-/***********************************************************************/
-
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
-{
-    switch(fdwReason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;  /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hInstDLL);
-            break;
-    }
-    return TRUE;
-}
-
 BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength)
 {
     static int count = 0;
@@ -59,7 +43,7 @@ BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG
 void WINAPI HidD_GetHidGuid(LPGUID guid)
 {
     TRACE("(%p)\n", guid);
-    *guid = HID_GUID;
+    *guid = GUID_DEVINTERFACE_HID;
 }
 
 BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength)
diff --git a/dlls/hid/main.c b/dlls/hid/main.c
index 927b563cc0c..1e38220c241 100644
--- a/dlls/hid/main.c
+++ b/dlls/hid/main.c
@@ -24,14 +24,10 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "ddk/hidsdi.h"
 
 #include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hid);
-
 #include "initguid.h"
-DEFINE_GUID(HID_GUID, 0x4D1E55B2, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30);
+#include "ddk/hidclass.h"
 
 /***********************************************************************/
 
@@ -47,35 +43,3 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
     }
     return TRUE;
 }
-
-BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength)
-{
-    static int count = 0;
-    if (!count++)
-        FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength);
-    return FALSE;
-}
-
-void WINAPI HidD_GetHidGuid(LPGUID guid)
-{
-    TRACE("(%p)\n", guid);
-    *guid = HID_GUID;
-}
-
-BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength)
-{
-    FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength);
-    return FALSE;
-}
-
-BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength)
-{
-    FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength);
-    return FALSE;
-}
-
-BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength)
-{
-    FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength);
-    return FALSE;
-}
-- 
2.11.4.GIT