Porting fixes - MS_VC/Mingw

[Steven Edwards]

Changelog:
Remove a few unneeded include statments internal headers.
Started bringing setupapi in line with PSDK.

Thanks
Steven


__________________________________
Do you Yahoo!?
The New Yahoo! Shopping - with improved product search
http://shopping.yahoo.com
-------------- next part --------------
Index: wine/dlls/commdlg/printdlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v
retrieving revision 1.70
diff -u -r1.70 printdlg.c
--- wine/dlls/commdlg/printdlg.c	10 Sep 2003 03:56:48 -0000	1.70
+++ wine/dlls/commdlg/printdlg.c	7 Oct 2003 20:10:17 -0000
@@ -31,15 +31,15 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "wine/wingdi16.h"
 #include "winuser.h"
-#include "wine/winuser16.h"
+#include "winspool.h"
+#include "winerror.h"
+
+#include "wine/debug.h"
+
 #include "commdlg.h"
 #include "dlgs.h"
-#include "wine/debug.h"
 #include "cderr.h"
-#include "winspool.h"
-#include "winerror.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

Index: wine/dlls/setupapi/devinst.c
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/devinst.c,v
retrieving revision 1.15
diff -u -r1.15 devinst.c
--- wine/dlls/setupapi/devinst.c	11 Sep 2003 02:58:46 -0000	1.15
+++ wine/dlls/setupapi/devinst.c	7 Oct 2003 20:10:22 -0000
@@ -38,7 +38,7 @@
 BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
       HDEVINFO DeviceInfoSet,
       PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
-      PSP_DEVICE_INTERFACE_DETAIL_DATAA DeviceInterfaceDetailData,
+      PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData,
       DWORD DeviceInterfaceDetailDataSize,
       PDWORD RequiredSize,
       PSP_DEVINFO_DATA DeviceInfoData )
@@ -53,7 +53,7 @@
 BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
       HDEVINFO DeviceInfoSet,
       PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
-      PSP_DEVICE_INTERFACE_DETAIL_DATAW DeviceInterfaceDetailData,
+      PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData,
       DWORD DeviceInterfaceDetailDataSize,
       PDWORD RequiredSize,
       PSP_DEVINFO_DATA DeviceInfoData )

Index: wine/dlls/winmm/joystick.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/joystick.c,v
retrieving revision 1.25
diff -u -r1.25 joystick.c
--- wine/dlls/winmm/joystick.c	5 Sep 2003 23:08:28 -0000	1.25
+++ wine/dlls/winmm/joystick.c	7 Oct 2003 20:10:24 -0000
@@ -42,7 +42,7 @@
 #include "winuser.h"
 #include "winnls.h"
 
-#include "winemm.h"
+#include "mmddk.h"
 
 #include "wine/debug.h"
 
Index: wine/include/setupapi.h
===================================================================
RCS file: /home/wine/wine/include/setupapi.h,v
retrieving revision 1.11
diff -u -r1.11 setupapi.h
--- wine/include/setupapi.h	28 Aug 2003 21:43:35 -0000	1.11
+++ wine/include/setupapi.h	7 Oct 2003 20:10:28 -0000
@@ -138,17 +138,17 @@
    ULONG_PTR  Reserved;
 } SP_DEVICE_INTERFACE_DATA, *PSP_DEVICE_INTERFACE_DATA;
 
-typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATAA
+typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATA_A
 {
    DWORD      cbSize;
    CHAR       DevicePath[ANYSIZE_ARRAY];
-} SP_DEVICE_INTERFACE_DETAIL_DATAA, *PSP_DEVICE_INTERFACE_DETAIL_DATAA;
+} SP_DEVICE_INTERFACE_DETAIL_DATA_A, *PSP_DEVICE_INTERFACE_DETAIL_DATA_A;
 
-typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATAW
+typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATA_W
 {
    DWORD      cbSize;
    WCHAR      DevicePath[ANYSIZE_ARRAY];
-} SP_DEVICE_INTERFACE_DETAIL_DATAW, *PSP_DEVICE_INTERFACE_DETAIL_DATAW;
+} SP_DEVICE_INTERFACE_DETAIL_DATA_W, *PSP_DEVICE_INTERFACE_DETAIL_DATA_W;
 
 DECL_WINELIB_TYPE_AW(SP_DEVICE_INTERFACE_DETAIL_DATA)
 DECL_WINELIB_TYPE_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA)