USB: windows very much like its filenames (fix various dialog bugs)

pcsx2/USB/Win32/Config_usb.cpp

@@ -16,7 +16,7 @@
 #include "PrecompiledHeader.h"
 #include "AppCoreThread.h"
 #include "../USB.h"
-#include "resource.h"
+#include "resource_usb.h"
 #include "Config_usb.h"
 #include "../deviceproxy.h"
 #include "../usb-pad/padproxy.h"

pcsx2/USB/Win32/USBDialog.rc

@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "resource_usb.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

pcsx2/USB/Win32/resource.h

@@ -1,44 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by USBlinuz.rc
-//
-#define IDC_STATIC_USB -1
-#define IDC_CONFIGURE1_USB 203
-#define IDC_CONFIGURE2_USB 204
-#define IDD_CONFDLG_USB 20101
-#define IDD_CONFIG_USB 20101
-#define IDD_ABOUT_USB 20103
-#define IDD_DLGMSD_USB 20106
-#define IDD_DLGWASAPI_USB 20107
-#define IDD_DLG_EYETOY_USB 20108
-#define IDC_NAME_USB 201000
-#define IDC_LOGGING_USB 201007
-#define IDC_COMBO1_USB 201008
-#define IDC_COMBO2_USB 201009
-#define IDC_LIST1_USB 201010
-#define IDC_COMBO_API1_USB 201010
-#define IDC_COMBO3_USB 201010
-#define IDC_COMBO_FFB_USB 201011
-#define IDC_COMBO_API2_USB 201011
-#define IDC_BUTTON1_USB 201012
-#define IDC_DFP_PASS_USB 201013
-#define IDC_BUILD_DATE_USB 201014
-#define IDC_EDIT1_USB 201015
-#define IDC_COMBO_WHEEL_TYPE1_USB 201037
-#define IDC_COMBO_WHEEL_TYPE2_USB 201038
-#define IDC_SLIDER1_USB 201039
-#define IDC_BUFFER1_USB 201040
-#define IDC_COMBOMICAPI_USB 201041
-#define IDC_SLIDER2_USB 201041
-#define IDC_BUFFER2_USB 201042
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 109
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1042
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif

pcsx2/USB/Win32/resource_usb.h

@@ -0,0 +1,44 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by USBlinuz.rc
+//
+#define IDC_STATIC_USB -1
+#define IDC_CONFIGURE1_USB 3
+#define IDC_CONFIGURE2_USB 4
+#define IDD_CONFDLG_USB 101
+#define IDD_CONFIG_USB 101
+#define IDD_ABOUT_USB 103
+#define IDD_DLGMSD_USB 106
+#define IDD_DLGWASAPI_USB 107
+#define IDD_DLG_EYETOY_USB 108
+#define IDC_NAME_USB 1000
+#define IDC_LOGGING_USB 1007
+#define IDC_COMBO1_USB 1008
+#define IDC_COMBO2_USB 1009
+#define IDC_LIST1_USB 1010
+#define IDC_COMBO_API1_USB 1010
+#define IDC_COMBO3_USB 1010
+#define IDC_COMBO_FFB_USB 1011
+#define IDC_COMBO_API2_USB 1011
+#define IDC_BUTTON1_USB 1012
+#define IDC_DFP_PASS_USB 1013
+#define IDC_BUILD_DATE_USB 1014
+#define IDC_EDIT1_USB 1015
+#define IDC_COMBO_WHEEL_TYPE1_USB 1037
+#define IDC_COMBO_WHEEL_TYPE2_USB 1038
+#define IDC_SLIDER1_USB 1039
+#define IDC_BUFFER1_USB 1040
+#define IDC_COMBOMICAPI_USB 1041
+#define IDC_SLIDER2_USB 1041
+#define IDC_BUFFER2_USB 1042
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 109
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1042
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif

pcsx2/USB/usb-eyetoy/cam-windows.cpp

@@ -20,7 +20,7 @@
 #include "jo_mpeg.h"
 
 #include "../Win32/Config_usb.h"
-#include "../Win32/resource.h"
+#include "../Win32/resource_usb.h"
 
 namespace usb_eyetoy
 {

pcsx2/USB/usb-mic/audiodev-wasapi.cpp

@@ -23,7 +23,7 @@
 #include <process.h>
 #include "audiodev-wasapi.h"
 #include "../Win32/Config_usb.h"
-#include "../Win32/resource.h"
+#include "../Win32/resource_usb.h"
 
 #define SafeRelease(x) \
 	if (x)             \

pcsx2/USB/usb-msd/usb-msd-win32.cpp

@@ -17,7 +17,7 @@
 #include <commdlg.h>
 #include "usb-msd.h"
 #include "../Win32/Config_usb.h"
-#include "../Win32/resource.h"
+#include "../Win32/resource_usb.h"
 
 namespace usb_msd
 {

pcsx2/windows/VCprojects/pcsx2.vcxproj

@@ -712,7 +712,7 @@
     <ClInclude Include="..\..\USB\usb-pad\usb-pad.h" />
     <ClInclude Include="..\..\USB\USB.h" />
     <ClInclude Include="..\..\USB\Win32\Config_usb.h" />
-    <ClInclude Include="..\..\USB\Win32\resource.h" />
+    <ClInclude Include="..\..\USB\Win32\resource_usb.h" />
     <ClInclude Include="..\..\Utilities\AsciiFile.h" />
     <ClInclude Include="..\..\Elfheader.h" />
     <ClInclude Include="..\..\CDVD\IsoFileFormats.h" />
@@ -905,4 +905,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

pcsx2/windows/VCprojects/pcsx2.vcxproj.filters

@@ -1863,9 +1863,6 @@
     <ClInclude Include="..\..\USB\shared\ringbuffer.h">
       <Filter>System\Ps2\USB\shared</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\USB\Win32\resource.h">
-      <Filter>System\Ps2\USB\Win32</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\USB\usb-mic\audiodev-wasapi.h">
       <Filter>System\Ps2\USB\usb-mic</Filter>
     </ClInclude>
@@ -1908,6 +1905,9 @@
     <ClInclude Include="..\..\USB\shared\rawinput_usb.h">
       <Filter>System\Ps2\USB\shared</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\USB\Win32\resource_usb.h">
+      <Filter>System\Ps2\USB\Win32</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\wxResources.rc">
@@ -2064,4 +2064,4 @@
       <Filter>AppHost\Resources</Filter>
     </Manifest>
   </ItemGroup>
-</Project>
+</Project>