[DINPUT]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61718

diff --git a/reactos/dll/directx/wine/dinput/config.c b/reactos/dll/directx/wine/dinput/config.c
index 55a1ed0..52a950a 100644 (file)
--- a/reactos/dll/directx/wine/dinput/config.c
+++ b/reactos/dll/directx/wine/dinput/config.c
@@ -16,12 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
-
-//#include "wine/unicode.h"
-//#include "objbase.h"
 #include "dinput_private.h"
-//#include "device_private.h"
+
+#include <winuser.h>
+#include <commctrl.h>
 
 #include "resource.h"
 

diff --git a/reactos/dll/directx/wine/dinput/device.c b/reactos/dll/directx/wine/dinput/device.c
index bb9eae8..2abde28 100644 (file)
--- a/reactos/dll/directx/wine/dinput/device.c
+++ b/reactos/dll/directx/wine/dinput/device.c
@@ -24,22 +24,8 @@
 
    It also contains all the helper functions.
 */
-#include <config.h>
-
-//#include <stdarg.h>
-//#include <string.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "windef.h"
-//#include "winbase.h"
-#include <winreg.h>
-#include <winuser.h>
-//#include "winerror.h"
-//#include "dinput.h"
-#include "device_private.h"
-//#include "dinput_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dinput);
+
+#include "dinput_private.h"
 
 static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface)
 {

diff --git a/reactos/dll/directx/wine/dinput/device_private.h b/reactos/dll/directx/wine/dinput/device_private.h
index f203c8b..75d872d 100644 (file)
--- a/reactos/dll/directx/wine/dinput/device_private.h
+++ b/reactos/dll/directx/wine/dinput/device_private.h
@@ -20,14 +20,6 @@
 #ifndef __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H
 #define __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "dinput.h"
-//#include "wine/list.h"
-#include "dinput_private.h"
-
 typedef struct
 {
     int size;

diff --git a/reactos/dll/directx/wine/dinput/dinput.rc b/reactos/dll/directx/wine/dinput/dinput.rc
index 3c09784..3b598e0 100644 (file)
--- a/reactos/dll/directx/wine/dinput/dinput.rc
+++ b/reactos/dll/directx/wine/dinput/dinput.rc
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <winuser.h>
+#include <commctrl.h>
+
 #include "resource.h"
 
 1 WINE_REGISTRY dinput_classes.rgs

diff --git a/reactos/dll/directx/wine/dinput/dinput_main.c b/reactos/dll/directx/wine/dinput/dinput_main.c
index 6beed0e..c885b68 100644 (file)
--- a/reactos/dll/directx/wine/dinput/dinput_main.c
+++ b/reactos/dll/directx/wine/dinput/dinput_main.c
@@ -30,33 +30,9 @@
  * - Fallout : works great in X and DGA mode
  */
 
-#include <config.h>
-//#include <assert.h>
-//#include <stdarg.h>
-//#include <string.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-//#include "windef.h"
-#include <winbase.h>
-#include <winuser.h>
-#include <winnls.h>
-//#include "winerror.h"
-#include <objbase.h>
-#include <rpcproxy.h>
-//#include "initguid.h"
-//#include "dinput_private.h"
-#include "device_private.h"
-//#include "dinputd.h"
+#include "dinput_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dinput);
+#include <rpcproxy.h>
 
 static const IDirectInput7AVtbl ddi7avt;
 static const IDirectInput7WVtbl ddi7wvt;

diff --git a/reactos/dll/directx/wine/dinput/dinput_private.h b/reactos/dll/directx/wine/dinput/dinput_private.h
index e7b2c07..2c4b7de 100644 (file)
--- a/reactos/dll/directx/wine/dinput/dinput_private.h
+++ b/reactos/dll/directx/wine/dinput/dinput_private.h
@@ -19,17 +19,29 @@
 #ifndef __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H
 #define __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H
 
+#include <wine/config.h>
+
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
+#define COBJMACROS
+#define NONAMELESSUNION
 
 #include <windef.h>
 #include <winbase.h>
+#include <winreg.h>
+#include <winuser.h>
 #include <dinput.h>
 #include <dinputd.h>
+
+#include <wine/debug.h>
 #include <wine/list.h>
+#include <wine/unicode.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 /* Implementation specification */
 typedef struct IDirectInputImpl IDirectInputImpl;
@@ -82,4 +94,6 @@ extern WCHAR* get_mapping_path(const WCHAR *device, const WCHAR *username) DECLS
 #define DIMOUSE_MASK       0x82000000
 #define DIGENRE_ANY        0xFF000000
 
+#include "device_private.h"
+
 #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */

diff --git a/reactos/dll/directx/wine/dinput/joystick.c b/reactos/dll/directx/wine/dinput/joystick.c
index 875d8ac..5019efd 100644 (file)
--- a/reactos/dll/directx/wine/dinput/joystick.c
+++ b/reactos/dll/directx/wine/dinput/joystick.c
@@ -26,11 +26,9 @@
  *     force feedback
  */
 
-#include "joystick_private.h"
-#include <wine/debug.h>
-#include <winreg.h>
+#include "dinput_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dinput);
+#include "joystick_private.h"
 
 static inline JoystickGenericImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface)
 {

diff --git a/reactos/dll/directx/wine/dinput/joystick_linux.c b/reactos/dll/directx/wine/dinput/joystick_linux.c
index f8c36d5..04d0d03 100644 (file)
--- a/reactos/dll/directx/wine/dinput/joystick_linux.c
+++ b/reactos/dll/directx/wine/dinput/joystick_linux.c
@@ -25,24 +25,17 @@
  *     force feedback
  */
 
-#include <config.h>
-//#include "wine/port.h"
+#include "dinput_private.h"
 
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-//#include <time.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
-//#include <fcntl.h>
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-//#include <errno.h>
 #ifdef HAVE_LINUX_IOCTL_H
 # include <linux/ioctl.h>
 #endif
@@ -54,19 +47,6 @@
 # include <sys/poll.h>
 #endif
 
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "dinput.h"
-
-//#include "dinput_private.h"
-#include "device_private.h"
-//#include "joystick_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dinput);
-
 #ifdef HAVE_LINUX_22_JOYSTICK_API
 
 #define JOYDEV_NEW "/dev/input/js"

diff --git a/reactos/dll/directx/wine/dinput/joystick_linuxinput.c b/reactos/dll/directx/wine/dinput/joystick_linuxinput.c
index c40f442..8961553 100644 (file)
--- a/reactos/dll/directx/wine/dinput/joystick_linuxinput.c
+++ b/reactos/dll/directx/wine/dinput/joystick_linuxinput.c
@@ -20,14 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <assert.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-//#include <time.h>
+#include "dinput_private.h"
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -50,20 +44,7 @@
 # include <sys/poll.h>
 #endif
 
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-//#include "wine/list.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winreg.h"
-//#include "dinput.h"
-
-//#include "dinput_private.h"
 #include "device_private.h"
-//#include "joystick_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 #ifdef HAS_PROPER_HEADER
 

diff --git a/reactos/dll/directx/wine/dinput/joystick_private.h b/reactos/dll/directx/wine/dinput/joystick_private.h
index 947e2df..3e24dee 100644 (file)
--- a/reactos/dll/directx/wine/dinput/joystick_private.h
+++ b/reactos/dll/directx/wine/dinput/joystick_private.h
@@ -19,20 +19,6 @@
 #ifndef __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H
 #define __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H
 
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include "windef.h"
-#include "winbase.h"
-#include "dinput.h"
-#include "wine/list.h"
-#include "wine/unicode.h"
-#include "dinput_private.h"
-#include "device_private.h"
-
 /* Number of objects in the default data format */
 #define MAX_PROPS 164
 struct JoystickGenericImpl;

diff --git a/reactos/dll/directx/wine/dinput/keyboard.c b/reactos/dll/directx/wine/dinput/keyboard.c
index 27e8769..21415f5 100644 (file)
--- a/reactos/dll/directx/wine/dinput/keyboard.c
+++ b/reactos/dll/directx/wine/dinput/keyboard.c
@@ -20,24 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <string.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winnls.h>
-//#include "winerror.h"
-//#include "dinput.h"
-
-//#include "dinput_private.h"
-#include "device_private.h"
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dinput);
+#include "dinput_private.h"
 
 #define WINE_DINPUT_KEYBOARD_MAX_KEYS 256
 

diff --git a/reactos/dll/directx/wine/dinput/mouse.c b/reactos/dll/directx/wine/dinput/mouse.c
index 6192556..d73a94a 100644 (file)
--- a/reactos/dll/directx/wine/dinput/mouse.c
+++ b/reactos/dll/directx/wine/dinput/mouse.c
@@ -19,26 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <string.h>
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "wingdi.h"
-#include <winuser.h>
-//#include "winerror.h"
-#include <winreg.h>
-//#include "dinput.h"
-
-//#include "dinput_private.h"
-#include "device_private.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(dinput);
+#include "dinput_private.h"
 
 /* Wine mouse driver object instances */
 #define WINE_MOUSE_X_AXIS_INSTANCE   0

diff --git a/reactos/dll/directx/wine/dinput/resource.h b/reactos/dll/directx/wine/dinput/resource.h
index 936ea6f..fa0376f 100644 (file)
--- a/reactos/dll/directx/wine/dinput/resource.h
+++ b/reactos/dll/directx/wine/dinput/resource.h
@@ -16,11 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "shlobj.h"
-
-#include <windef.h>
-#include <winuser.h>
-#include <commctrl.h>
+#pragma once
 
 #define IDD_CONFIGUREDEVICES                    1