Fixed naming of the A/W types.

include/setupapi.h

@@ -21,6 +21,13 @@
 
 #include <commctrl.h>
 
+/* setupapi doesn't use the normal convention, it adds an underscore before A/W */
+#ifdef __WINESRC__
+# define DECL_WINELIB_SETUPAPI_TYPE_AW(type)  /* nothing */
+#else   /* __WINESRC__ */
+# define DECL_WINELIB_SETUPAPI_TYPE_AW(type)  typedef WINELIB_NAME_AW(type##_) type;
+#endif  /* __WINESRC__ */
+
 /* Define type for handle to a loaded inf file */
 typedef PVOID HINF;
 
@@ -102,14 +109,14 @@ typedef struct _SP_FILE_COPY_PARAMS_W
     PCWSTR   SecurityDescriptor;
 } SP_FILE_COPY_PARAMS_W, *PSP_FILE_COPY_PARAMS_W;
 
-DECL_WINELIB_TYPE_AW(SP_FILE_COPY_PARAMS_)
-DECL_WINELIB_TYPE_AW(PSP_FILE_COPY_PARAMS_)
+DECL_WINELIB_SETUPAPI_TYPE_AW(SP_FILE_COPY_PARAMS)
+DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_FILE_COPY_PARAMS)
 
 typedef UINT (CALLBACK *PSP_FILE_CALLBACK_A)( PVOID Context, UINT Notification,
                                               UINT Param1, UINT Param2 );
 typedef UINT (CALLBACK *PSP_FILE_CALLBACK_W)( PVOID Context, UINT Notification,
                                               UINT Param1, UINT Param2 );
-#define PSP_FILE_CALLBACK WINELIB_NAME_AW(PSP_FILE_CALLBACK_)
+DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_FILE_CALLBACK)
 
 #define LINE_LEN                    256
 #define MAX_INF_STRING_LENGTH       4096
@@ -150,10 +157,8 @@ typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATA_W
    WCHAR      DevicePath[ANYSIZE_ARRAY];
 } SP_DEVICE_INTERFACE_DETAIL_DATA_W, *PSP_DEVICE_INTERFACE_DETAIL_DATA_W;
 
-#ifndef __WINESRC__
-typedef WINELIB_NAME_AW(SP_DEVICE_INTERFACE_DETAIL_DATA_) SP_DEVICE_INTERFACE_DETAIL_DATA;
-typedef WINELIB_NAME_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA_) PSP_DEVICE_INTERFACE_DETAIL_DATA;
-#endif
+DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DEVICE_INTERFACE_DETAIL_DATA)
+DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA)
 
 typedef struct _FILE_IN_CABINET_INFO_A {
   LPCSTR NameInCabinet;
@@ -175,8 +180,8 @@ typedef struct _FILE_IN_CABINET_INFO_W {
   WCHAR FullTargetName[MAX_PATH];
 } FILE_IN_CABINET_INFO_W, *PFILE_IN_CABINET_INFO_W;
 
-DECL_WINELIB_TYPE_AW(FILE_IN_CABINET_INFO)
-DECL_WINELIB_TYPE_AW(PFILE_IN_CABINET_INFO)
+DECL_WINELIB_SETUPAPI_TYPE_AW(FILE_IN_CABINET_INFO)
+DECL_WINELIB_SETUPAPI_TYPE_AW(PFILE_IN_CABINET_INFO)
 
 typedef struct _CABINET_INFO_A {
   PCSTR CabinetPath;
@@ -194,8 +199,8 @@ typedef struct _CABINET_INFO_W {
   USHORT CabinetNumber;
 } CABINET_INFO_W, *PCABINET_INFO_W;
 
-DECL_WINELIB_TYPE_AW(CABINET_INFO);
-DECL_WINELIB_TYPE_AW(PCABINET_INFO);
+DECL_WINELIB_SETUPAPI_TYPE_AW(CABINET_INFO);
+DECL_WINELIB_SETUPAPI_TYPE_AW(PCABINET_INFO);
 
 #define INF_STYLE_NONE           0x00
 #define INF_STYLE_OLDNT          0x01
@@ -230,8 +235,8 @@ typedef struct _FILEPATHS_W
     DWORD  Flags;
 } FILEPATHS_W, *PFILEPATHS_W;
 
-DECL_WINELIB_TYPE_AW(FILEPATHS_)
-DECL_WINELIB_TYPE_AW(PFILEPATHS_)
+DECL_WINELIB_SETUPAPI_TYPE_AW(FILEPATHS)
+DECL_WINELIB_SETUPAPI_TYPE_AW(PFILEPATHS)
 
 #define SPFILENOTIFY_STARTQUEUE           0x0001
 #define SPFILENOTIFY_ENDQUEUE             0x0002
@@ -590,4 +595,6 @@ BOOL     WINAPI SetupIterateCabinetA(PCSTR, DWORD, PSP_FILE_CALLBACK_A, PVOID);
 BOOL     WINAPI SetupIterateCabinetW(PCWSTR, DWORD, PSP_FILE_CALLBACK_W, PVOID);
 #define         SetupIterateCabinet WINELIB_NAME_AW(SetupIterateCabinet)
 
+#undef DECL_WINELIB_SETUPAPI_TYPE_AW
+
 #endif /* _INC_SETUPAPI */