Aric Stewart : hid: Break HidD functions out into their own module.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5b882003fe6d76362d89338d1b388a513dfd52af
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5b882003fe6d76362d89338d1b...

Author: Aric Stewart 
Date:   Thu Jun 25 10:15:33 2015 -0500

hid: Break HidD functions out into their own module.

---

dlls/hid/Makefile.in |  1 +
 dlls/hid/hidd.c      | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 dlls/hid/main.c      | 38 +-----------------------------
 3 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in
index af0d7dc..3a115ca 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/hidd.c b/dlls/hid/hidd.c
new file mode 100644
index 0000000..18a033c
--- /dev/null
+++ b/dlls/hid/hidd.c
@@ -0,0 +1,65 @@
+/*
+ * Human Input Devices
+ *
+ * Copyright (C) 2006 Kevin Koltzau
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "wine/debug.h"
+
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
+
+#include "ddk/hidclass.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(hid);
+
+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 = GUID_DEVINTERFACE_HID;
+}
+
+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;
+}
diff --git a/dlls/hid/main.c b/dlls/hid/main.c
index 927b563..1e38220 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;
-}