From 98b28058670af96c4584135c08c8189c8e05aa97 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 5 Jun 2016 23:29:24 -0700 Subject: [PATCH] set mem limit to 2048mb globally which is the max for msvc 32 bit apps; make the minimum and maximum framerate user configurable, make the client and setup app DPI aware (no more turning off scaling!), and finally rebadge these as 2.0/2.0b --- .../src/win32/ConfigSharedFoundation.cpp | 8 +- .../src/win32/ConfigSharedFoundation.h | 1 + .../src/win32/SetupSharedFoundation.cpp | 4 + .../src/win32/SetupSharedFoundation.h | 2 +- .../src/shared/MemoryManager.cpp | 2 +- .../oracle_win32/ora80/bin/orancrypt8.dll.bak | Bin 42768 -> 0 bytes .../SwgClient/build/win32/SwgClient.vcxproj | 9 ++ .../SwgClient/src/win32/ClientMain.cpp | 12 +- .../SwgClient/src/win32/SwgClient.rc | 50 +++----- .../build/win32/SwgClientSetup.vcxproj | 16 ++- .../src/win32/SwgClientSetup.rc | 120 +++++++++--------- 11 files changed, 117 insertions(+), 107 deletions(-) delete mode 100644 src/external/3rd/library/oracle_win32/ora80/bin/orancrypt8.dll.bak diff --git a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp index 71c802e28..e571ffb6a 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp +++ b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp @@ -90,12 +90,8 @@ void ConfigSharedFoundation::install (const Defaults &defaults) KEY_BOOL(demoMode, defaults.demoMode); - ms_frameRateLimit = 144.f; - ms_minFrameRate = 30.f; - - KEY_FLOAT(frameRateLimit, 144.f); - - KEY_FLOAT(minFrameRate, 30.f); + KEY_FLOAT(frameRateLimit, defaults.frameRateLimit); + KEY_FLOAT(minFrameRate, defaults.minFrameRate); KEY_BOOL(useRemoteDebug, false); KEY_INT(defaultRemoteDebugPort, 4445); diff --git a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.h b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.h index 6efa38409..c89a5a761 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.h +++ b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.h @@ -21,6 +21,7 @@ public: int screenWidth; bool windowed; real frameRateLimit; + real minFrameRate; bool demoMode; bool verboseWarnings; }; diff --git a/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.cpp b/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.cpp index 98889b525..12056433f 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.cpp +++ b/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.cpp @@ -223,6 +223,7 @@ void SetupSharedFoundation::install(const Data &data) { ConfigSharedFoundation::Defaults defaults; defaults.frameRateLimit = data.frameRateLimit; + defaults.minFrameRate = data.minFrameRate; defaults.demoMode = data.demoMode; defaults.verboseWarnings = data.verboseWarnings; ConfigSharedFoundation::install(defaults); @@ -338,6 +339,7 @@ void SetupSharedFoundation::Data::setupGameDefaults() productRegistryKey = NULL; frameRateLimit = CONST_REAL(0); + minFrameRate = CONST_REAL(0); lostFocusCallback = NULL; @@ -370,6 +372,7 @@ void SetupSharedFoundation::Data::setupConsoleDefaults() productRegistryKey = NULL; frameRateLimit = CONST_REAL(0); + minFrameRate = CONST_REAL(0); lostFocusCallback = NULL; @@ -402,6 +405,7 @@ void SetupSharedFoundation::Data::setupMfcDefaults() productRegistryKey = NULL; frameRateLimit = CONST_REAL(0); + minFrameRate = CONST_REAL(0); demoMode = false; verboseWarnings = false; diff --git a/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.h b/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.h index b0675d8ff..d0d4c13e9 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.h +++ b/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.h @@ -48,7 +48,7 @@ public: const char *productRegistryKey; real frameRateLimit; - + real minFrameRate; bool demoMode; diff --git a/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp b/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp index 210d17bcb..e39346f84 100644 --- a/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp +++ b/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp @@ -217,7 +217,7 @@ namespace MemoryManagerNamespace bool ms_installed; bool ms_limitSet; bool ms_hardLimit; - int ms_limitMegabytes = 2047; + int ms_limitMegabytes = 2048; SystemAllocation * ms_firstSystemAllocation; int ms_numberOfSystemAllocations; int ms_systemMemoryAllocatedMegabytes; diff --git a/src/external/3rd/library/oracle_win32/ora80/bin/orancrypt8.dll.bak b/src/external/3rd/library/oracle_win32/ora80/bin/orancrypt8.dll.bak deleted file mode 100644 index 706ef3be6afb43a94ccd11fd244fb45f3e1ad6be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42768 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 0x0409 + + true + @@ -154,6 +157,9 @@ _ITERATOR_DEBUG_LEVEL=0;_DEBUG;%(PreprocessorDefinitions) 0x0409 + + true + @@ -196,6 +202,9 @@ _ITERATOR_DEBUG_LEVEL=0;NDEBUG;%(PreprocessorDefinitions) 0x0409 + + true + diff --git a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp index 4ebf26863..5b3e81a8b 100644 --- a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp +++ b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp @@ -158,20 +158,24 @@ int ClientMain( data.commandLine = lpCmdLine; data.configFile = "client.cfg"; data.clockUsesSleep = true; - data.frameRateLimit = 144.f; + data.minFrameRate = 1.f; + data.frameRateLimit = 144.f; #if PRODUCTION data.demoMode = true; #endif if (ApplicationVersion::isPublishBuild() || ApplicationVersion::isBootlegBuild()) - data.writeMiniDumps = true; - SetupSharedFoundation::install (data); + { + data.writeMiniDumps = true; + } + + SetupSharedFoundation::install(data); REPORT_LOG(true, ("ClientMain: Command Line = \"%s\"\n", lpCmdLine)); REPORT_LOG (true, ("ClientMain: Memory size = %i MB\n", MemoryManager::getLimit())); // check for any config file entries if (ConfigFile::isEmpty()) - FATAL(true, ("Config file not specified")); + FATAL(true, ("Config file not specified")); InstallTimer::checkConfigFile(); diff --git a/src/game/client/application/SwgClient/src/win32/SwgClient.rc b/src/game/client/application/SwgClient/src/win32/SwgClient.rc index 9742abf1b..f0fb375cb 100644 --- a/src/game/client/application/SwgClient/src/win32/SwgClient.rc +++ b/src/game/client/application/SwgClient/src/win32/SwgClient.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -7,20 +7,17 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "WinResrc.h" -#define IDC_STATIC -1 +#include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -29,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" -IDI_ICON2 ICON DISCARDABLE "icon2.ico" +IDI_ICON1 ICON "icon1.ico" +IDI_ICON2 ICON "icon2.ico" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -38,18 +35,18 @@ IDI_ICON2 ICON DISCARDABLE "icon2.ico" // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -58,15 +55,14 @@ END #endif // APSTUDIO_INVOKED -#ifndef _MAC ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -81,18 +77,16 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Sony Online Entertainment\0" - VALUE "FileDescription", "SwgClient_r\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "SwgClient_r\0" - VALUE "LegalCopyright", "© 2003-2004 Lucasfilm Entertainment Company Ltd. or Lucasfilm Ltd.\0" - VALUE "LegalTrademarks", "Star Wars Galaxies is a trademark of Lucasfilm Entertainment Company Ltd.\0" - VALUE "OriginalFilename", "SwgClient_r.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Star Wars Galaxies\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - VALUE "SpecialBuild", "\0" + VALUE "Comments", "Compiled for Stella Bellum Testing" + VALUE "CompanyName", "Sony Online Entertainment" + VALUE "FileDescription", "SwgClient_r" + VALUE "FileVersion", "2.0b" + VALUE "InternalName", "SwgClient_r" + VALUE "LegalCopyright", "© Lucasfilm Entertainment Company Ltd. or Lucasfilm Ltd." + VALUE "LegalTrademarks", "Star Wars Galaxies is a trademark of Lucasfilm Entertainment Company Ltd." + VALUE "OriginalFilename", "SwgClient_r.exe" + VALUE "ProductName", "Star Wars Galaxies" + VALUE "ProductVersion", "2.0b" END END BLOCK "VarFileInfo" @@ -101,9 +95,7 @@ BEGIN END END -#endif // !_MAC - -#endif // English (U.S.) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj b/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj index a1337bfb8..d0af638e5 100644 --- a/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj +++ b/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj @@ -63,7 +63,7 @@ Disabled - ..\..\..\..\..\..\external\3rd\library\directx9\include;..\..\..\..\..\..\external\3rd\library\miles\include;..\..\..\..\..\..\external\3rd\library\trackIR\include;%(AdditionalIncludeDirectories) + ..\..\..\..\..\..\external\3rd\library\atlmfc\include;..\..\..\..\..\..\external\3rd\library\directx9\include;..\..\..\..\..\..\external\3rd\library\miles\include;..\..\..\..\..\..\external\3rd\library\trackIR\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_MBCS;UNICODE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) true EnableFastChecks @@ -97,11 +97,15 @@ MachineX86 /SAFESEH:NO %(AdditionalOptions) Enabled + false true .\..\..\..\..\..\..\compile\win32\SwgClientSetup\Debug/SwgClientSetup.bsc + + true + @@ -115,7 +119,7 @@ MinSpace OnlyExplicitInline - ..\..\..\..\..\..\external\3rd\library\directx9\include;..\..\..\..\..\..\external\3rd\library\miles\include;..\..\..\..\..\..\external\3rd\library\trackIR\include;%(AdditionalIncludeDirectories) + ..\..\..\..\..\..\external\3rd\library\atlmfc\include;..\..\..\..\..\..\external\3rd\library\directx9\include;..\..\..\..\..\..\external\3rd\library\miles\include;..\..\..\..\..\..\external\3rd\library\trackIR\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_MBCS;UNICODE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -136,20 +140,24 @@ 0x0409 - d3d9.lib;ddraw.lib;dinput8.lib;dxguid.lib;mss32.lib;ws2_32.lib;..\..\..\..\..\..\external\3rd\library\ms_unicode\unicows.lib;kernel32.lib;advapi32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;version.lib;mpr.lib;rasapi32.lib;winmm.lib;winspool.lib;vfw32.lib;oleacc.lib;oledlg.lib;%(AdditionalDependencies) + d3d9.lib;ddraw.lib;dinput8.lib;dxguid.lib;Mss32.lib;ws2_32.lib;unicows.lib;kernel32.lib;advapi32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;version.lib;mpr.lib;rasapi32.lib;winmm.lib;winspool.lib;vfw32.lib;oleacc.lib;oledlg.lib;%(AdditionalDependencies) ..\..\..\..\..\..\compile\win32\SwgClientSetup\Release/SwgClientSetup_r.exe true - ..\..\..\..\..\..\external\3rd\library\directx9\lib;..\..\..\..\..\..\external\3rd\library\miles\lib\win;%(AdditionalLibraryDirectories) + ..\..\..\..\..\..\..\src\external\3rd\library\atlmfc\lib;..\..\..\..\..\..\..\src\external\3rd\library\blat194\build\win32;..\..\..\..\..\..\..\src\external\3rd\library\directx9\lib;..\..\..\..\..\..\..\src\external\3rd\library\miles-7.2e\lib\win;..\..\..\..\..\..\..\src\external\3rd\library\miles-7.2e\redist;%(AdditionalLibraryDirectories) kernel32.lib;advapi32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;version.lib;mpr.lib;rasapi32.lib;winmm.lib;winspool.lib;vfw32.lib;secur32.lib;oleacc.lib;oledlg.lib;sensapi.lib;%(IgnoreSpecificDefaultLibraries) .\..\..\..\..\..\..\compile\win32\SwgClientSetup\Release/SwgClientSetup_r.pdb Windows wWinMainCRTStartup MachineX86 + false true .\..\..\..\..\..\..\compile\win32\SwgClientSetup\Release/SwgClientSetup.bsc + + true + diff --git a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc index 77916be50..9123f91fd 100644 --- a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc +++ b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc @@ -7,32 +7,30 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "../../../../../../external/3rd/library/atlmfc/include/afxres.h" +#include "afxres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Japanese resources +// Japanese (Japan) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) -#ifdef _WIN32 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT #pragma code_page(932) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDS_INFO_NUM_PROCESSORS "CPU??" IDS_INFO_CPU_ID "CPU?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INFO_CPU_SPEED "CPU????" IDS_INFO_CPU_VENDOR "CPU????" @@ -41,7 +39,7 @@ BEGIN IDS_INFO_VIDEO_IDENTIFIER "???????" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INFO_VIDEO_DRIVER_VERSION "?????????????" IDS_INFO_VIDEO_MEMORY_SIZE "????????" @@ -61,7 +59,7 @@ BEGIN IDS_GRAPHICS_DISABLE_FAST_MOUSE_CURSOR "??????????????" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GRAPHICS_USE_SAFE_RENDERER "???????????(??)" IDS_SOUND_DISABLE_AUDIO "???" @@ -81,7 +79,7 @@ BEGIN "?????1GB??????????RAM?75%????????(Direct3D?OS????????????)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DEBUG_CRASH_LOGS "????????" IDS_DEBUG_INCLUDE_STATION_ID_IN_LOGS "??????ID?????????????" @@ -100,7 +98,7 @@ BEGIN IDS_INFO_DIRECTXVERSION "DirectX" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INFO_TRACKIRVERSION "trackIR" IDS_SENDCRASH_TITLE "???????????????????????" @@ -119,7 +117,7 @@ BEGIN IDS_NO "???" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GB "GB" IDS_SEND_HARDWARE_INFO "???????????????????????????????????????????????????????????????(????????????????ID????????????)?????????????????PC???????????????????????????????????????????????PC??????????????????????????????????????????????????????????????????" @@ -138,14 +136,14 @@ BEGIN IDS_INVALIDCOMMANDLINE "????????????????????????????????????????????????????????????????????????????" END -STRINGTABLE +STRINGTABLE BEGIN CG_IDS_PROGRESS_CAPTION "?????????????" IDS_LANGUAGE "??" IDS_ADVANCED_CAPTION "???????" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DEBUG_CAPTION "???????" IDS_GAME_CAPTION "????" @@ -154,7 +152,7 @@ BEGIN IDS_SOUND_CAPTION "?????" END -STRINGTABLE +STRINGTABLE BEGIN IDS_RESET_IN_GAME "?????" IDS_VSPS_OPTIMAL "??" @@ -165,7 +163,7 @@ BEGIN IDS_ANOTHER_INSTANCE "?????????????????????????????????????" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOT_MINIMUM "??PC????????? ??????????????????????????????????:\n\n" IDS_ENABLE_JOYSTICKS "??????????" @@ -178,13 +176,13 @@ BEGIN IDS_NICE_MINIMUM "??PC????????? ??????????????????????????????????:\n\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FINAL_CONFIG "- 250MB???????????\n- DirectX 9.0c\n\n????????????????????????????????????????" IDS_512MB_PHYSICAL "- 512MB???????\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_512MB_PHYSICAL_DETECTED "- 512MB???????(?? %i MB)\n" IDS_900MHZ_PROCESSOR "- 900 MHz???CPU\n" @@ -193,7 +191,7 @@ BEGIN IDS_32MB_VIDEO_MEMORY "- 32MB?????????\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_32MB_VIDEO_MEMORY_DETECTED "- 32 MB????????? (?? %i MB)\n" IDS_NO_CHANGE_DETECTED "\n\n????????PC????????????????????" @@ -205,24 +203,22 @@ BEGIN IDS_THANK_YOU "??????????????????????????????????????????????????????????????????????????????????????????????????????????????\n\n??????????\n\n???????? ????????????" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UNKNOWN "??" IDS_NO_SOUND_CARD "???" END -#endif // Japanese resources +#endif // Japanese (Japan) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -287,7 +283,7 @@ BEGIN RTEXT "v. 1.46",IDC_STATIC,195,219,23,8 END -IDD_PROPPAGE_INFORMATION DIALOG 0, 0, 212, 186 +IDD_PROPPAGE_INFORMATION DIALOG 0, 0, 212, 186 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Information" FONT 8, "MS Sans Serif" @@ -323,7 +319,7 @@ BEGIN LTEXT "x",IDC_STATIC_DIRECTXVERSION,88,140,95,8 END -IDD_PROPPAGE_GRAPHICS DIALOG 0, 0, 162, 186 +IDD_PROPPAGE_GRAPHICS DIALOG 0, 0, 162, 186 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Graphics" FONT 8, "MS Sans Serif" @@ -351,7 +347,7 @@ BEGIN RTEXT "Vertex/Pixel\nShader Version",IDC_GRAPH_LBL_PIXEL_SHADER_VERSION,7,22,56,16 END -IDD_PROPPAGE_SOUND DIALOG 0, 0, 192, 90 +IDD_PROPPAGE_SOUND DIALOG 0, 0, 192, 90 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sound" FONT 8, "MS Sans Serif" @@ -363,7 +359,7 @@ BEGIN LTEXT "x",IDC_SOUNDVERSION,68,27,117,8 END -IDD_PROPPAGE_ADVANCED DIALOG 0, 0, 199, 178 +IDD_PROPPAGE_ADVANCED DIALOG 0, 0, 199, 178 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Sans Serif" @@ -385,7 +381,7 @@ BEGIN LTEXT "This value should be 75% of your total system RAM up to 1 GB (reserving memory for Direct3D and the OS).",IDC_LBL_ADVANCED_GAME_MEMORY_INFO,85,125,107,34 END -IDD_PROPPAGE_DEBUG DIALOG 0, 0, 212, 183 +IDD_PROPPAGE_DEBUG DIALOG 0, 0, 212, 183 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Debug" FONT 8, "MS Sans Serif" @@ -401,7 +397,7 @@ BEGIN LTEXT "Static",IDC_STATIC_CONTACT,115,46,90,8 END -CG_IDD_PROGRESS DIALOG 0, 0, 186, 79 +CG_IDD_PROGRESS DIALOG 0, 0, 186, 79 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Transmitting diagnostic files..." FONT 8, "MS Sans Serif" @@ -412,7 +408,7 @@ BEGIN LTEXT "",CG_IDC_PROGDLG_STATUS,13,7,158,8 END -IDD_DIALOG_MINIDUMP DIALOG 0, 0, 280, 156 +IDD_DIALOG_MINIDUMP DIALOG 0, 0, 280, 156 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Automatically Send Crash Logs?" FONT 8, "MS Sans Serif" @@ -426,7 +422,7 @@ BEGIN PUSHBUTTON "Cancel",ID_CANCEL,169,135,50,14 END -IDD_PROPPAGE_GAME DIALOG 0, 0, 195, 164 +IDD_PROPPAGE_GAME DIALOG 0, 0, 195, 164 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Game" FONT 8, "MS Sans Serif" @@ -443,7 +439,7 @@ BEGIN COMBOBOX IDC_DROP_LANGUAGE,68,96,120,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_DIALOG_STATIONID DIALOG 0, 0, 280, 156 +IDD_DIALOG_STATIONID DIALOG 0, 0, 280, 156 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Include Your Station Id in Crash Logs?" FONT 8, "MS Sans Serif" @@ -458,7 +454,7 @@ BEGIN PUSHBUTTON "Cancel",ID_CANCEL,169,135,50,14 END -IDD_DIALOG_CONTACT DIALOG 0, 0, 280, 156 +IDD_DIALOG_CONTACT DIALOG 0, 0, 280, 156 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Can SOE Contact You?" FONT 8, "MS Sans Serif" @@ -472,7 +468,7 @@ BEGIN LTEXT "How would you like to proceed?",IDC_LBL_SOE_CONTACT_QUERY,7,89,102,8 END -IDD_DIALOG_HARDWAREINFORMATION DIALOG 0, 0, 280, 156 +IDD_DIALOG_HARDWAREINFORMATION DIALOG 0, 0, 280, 156 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Automatically Send Hardware Information?" FONT 8, "MS Sans Serif" @@ -487,7 +483,7 @@ BEGIN PUSHBUTTON "Cancel",ID_CANCEL,169,135,50,14 END -IDD_DIALOG_FINISH DIALOG 0, 0, 280, 156 +IDD_DIALOG_FINISH DIALOG 0, 0, 280, 156 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Configuration Complete!" FONT 8, "MS Sans Serif" @@ -496,7 +492,7 @@ BEGIN PUSHBUTTON "Finish",IDC_BUTTON_PROCEED,223,135,50,14 END -IDD_DIALOG_RATING DIALOG 0, 0, 315, 311 +IDD_DIALOG_RATING DIALOG 0, 0, 315, 311 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION CAPTION "Send us your feedback!" FONT 8, "MS Sans Serif" @@ -509,7 +505,7 @@ BEGIN PUSHBUTTON "Finished",IDC_BUTTON_COMPLETE,137,287,62,17 END -IDD_DIALOG_POLL DIALOG 0, 0, 295, 200 +IDD_DIALOG_POLL DIALOG 0, 0, 295, 200 STYLE DS_SETFONT | WS_CHILD FONT 8, "MS Sans Serif" BEGIN @@ -525,7 +521,7 @@ BEGIN PUSHBUTTON "Template",IDC_BUTTON_TEMPLATE7,253,79,34,14,WS_DISABLED END -IDD_MESSAGEBOX2 DIALOG 0, 0, 413, 142 +IDD_MESSAGEBOX2 DIALOG 0, 0, 413, 142 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Message" FONT 8, "MS Sans Serif" @@ -544,8 +540,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -562,12 +558,12 @@ BEGIN BEGIN VALUE "CompanyName", "Sony Online Entertainment" VALUE "FileDescription", "SwgClientSetup MFC Application" - VALUE "FileVersion", "1, 0, 0, 1" + VALUE "FileVersion", "2.0b" VALUE "InternalName", "SwgClientSetup" - VALUE "LegalCopyright", "Copyright (C) 2002-2004 Sony Online Entertainment" - VALUE "OriginalFilename", "SwgClientSetup.EXE" + VALUE "LegalCopyright", "Copyright (C) Sony Online Entertainment" + VALUE "OriginalFilename", "SwgClientSetup_r.exe" VALUE "ProductName", "SwgClientSetup Application" - VALUE "ProductVersion", "1, 0, 0, 1" + VALUE "ProductVersion", "2.0b" END END BLOCK "VarFileInfo" @@ -583,7 +579,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_SWGCLIENTSETUP_DIALOG, DIALOG BEGIN @@ -723,13 +719,13 @@ END // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDS_INFO_NUM_PROCESSORS "Number of Processors" IDS_INFO_CPU_ID "Cpu Identifier" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INFO_CPU_SPEED "Cpu Speed" IDS_INFO_CPU_VENDOR "Cpu Vendor" @@ -738,7 +734,7 @@ BEGIN IDS_INFO_VIDEO_IDENTIFIER "Video Identifier" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INFO_VIDEO_DRIVER_VERSION "Video Driver Version" IDS_INFO_VIDEO_MEMORY_SIZE "Video Memory Size" @@ -758,7 +754,7 @@ BEGIN IDS_GRAPHICS_DISABLE_FAST_MOUSE_CURSOR "Disable Fast Mouse Cursor" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GRAPHICS_USE_SAFE_RENDERER "Use Safe Renderer (slower)" IDS_SOUND_DISABLE_AUDIO "Disable Audio" @@ -778,7 +774,7 @@ BEGIN "This value should be 75% of your total system RAM up to 2 GB (reserving memory for Direct3D and the OS)." END -STRINGTABLE +STRINGTABLE BEGIN IDS_DEBUG_CRASH_LOGS "Crash Logs" IDS_DEBUG_INCLUDE_STATION_ID_IN_LOGS "Include Station Id in crash logs" @@ -800,7 +796,7 @@ BEGIN IDS_INFO_DIRECTXVERSION "DirectX Version" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INFO_TRACKIRVERSION "trackIR Version" IDS_SENDCRASH_TITLE "Automatically Send Crash Logs?" @@ -819,7 +815,7 @@ BEGIN IDS_NO "NO" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GB "GB" IDS_SEND_HARDWARE_INFO "In order to help Sony Online Entertainment make better decisions about optimizations and hardware support we would like to be able to survey your hardware configuration from time to time (which will also contain your Station Id in order to count each hardware configuration exactly once). If you elect to automatically send us your hardware configuration by choosing that option below, then you expressly permit, consent to and grant Sony Online Entertainment the right to upload such information from your computer system along with your Station Id from time to time for the sole purpose of analyzing, improving and maintaining the game, and this information will be automatically resent to us whenever your hardware changes." @@ -840,14 +836,14 @@ BEGIN IDS_INVALIDCOMMANDLINE "We have detected an error which may result in the inability for the game to function properly. We recommend you try a virus and spyware scan. Do you wish to continue anyway?" END -STRINGTABLE +STRINGTABLE BEGIN CG_IDS_PROGRESS_CAPTION "Transmitting diagnostic files..." IDS_LANGUAGE "Language:" IDS_ADVANCED_CAPTION "Advanced" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DEBUG_CAPTION "Debug" IDS_GAME_CAPTION "Game" @@ -856,7 +852,7 @@ BEGIN IDS_SOUND_CAPTION "Sound" END -STRINGTABLE +STRINGTABLE BEGIN IDS_RESET_IN_GAME "Reset in-game options" IDS_VSPS_OPTIMAL "Optimal" @@ -867,7 +863,7 @@ BEGIN IDS_ANOTHER_INSTANCE "Another instance of this application is already running. Application will now close." END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOT_MINIMUM "Your computer may not meet the minimum requirements necessary in order to run Star Wars Galaxies, which requires at least:\n\n" IDS_ENABLE_JOYSTICKS "Enable Joystick" @@ -880,13 +876,13 @@ BEGIN IDS_NICE_MINIMUM "Your computer meets the minimum requirements necessary in order to run Star Wars Galaxies, but in order to get the best experience, we strongly recommend that you upgrade your system to at least:\n\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FINAL_CONFIG "- 250 MB of free disk space\n- DirectX 9\n\nThe application will continue to run, but we cannot guarantee stability or performance." IDS_512MB_PHYSICAL "- 512 MB of physical memory\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_512MB_PHYSICAL_DETECTED "- 512 MB of physical memory (detected %i MB)\n" @@ -897,7 +893,7 @@ BEGIN IDS_32MB_VIDEO_MEMORY "- 32 MB of video memory\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_32MB_VIDEO_MEMORY_DETECTED "- 32 MB of video memory (detected %i MB)\n" @@ -910,13 +906,13 @@ BEGIN IDS_THANK_YOU "If you agree to allow Sony Online Entertainment to upload, review and use this information or agree to allow us to contact you but change your mind in the future, you can disable this feature by choosing the \\""Options\\"" button from the LaunchPad, click on the \\""Debug\\"" tab, then change your setting by clicking on \\""Configure\\"". \n\nThank you for your continued support!\n\nStar Wars Galaxies Development Team\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UNKNOWN "Unknown" IDS_NO_SOUND_CARD "No valid sound card detected" END -#endif // English (U.S.) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// @@ -937,7 +933,7 @@ LANGUAGE 9, 1 #pragma code_page(1252) #endif //_WIN32 #include "res\SwgClientSetup.rc2" // non-Microsoft Visual C++ edited resources -#include "../../../../../../external/3rd/library/atlmfc/include/afxres.rc" // Standard components +#include "afxres.rc" // Standard components #endif /////////////////////////////////////////////////////////////////////////////