diff --git a/.gitignore b/.gitignore index 26938d1ac..24ec1ab77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,7 @@ *.user -/Bin/Debug/SyncPlugin -/Bin/Debug/lib -/Bin/Debug/Logs -/Bin/Debug/map -/Bin/Debug/pdb -/Bin/Debug/Save -/Bin/Debug/Screenshots -/Project64.ncb -/Project64.suo -/Save -/build -/Bin/Release/Project64.exe -/Bin/Release/lib -/Bin/Release/Logs -/Bin/Release/map -/Bin/Release/pdb -/Bin/Release/Save -/Bin/Release/Screenshots -/Bin/Release/SyncPlugin -/Bin/Release/d3d syslog.txt -/Bin/Release/d3d syslog.txt.bak -/Plugin/RSP/RSP_d 1.7.dll -/Plugin/RSP/lib -/Plugin/RSP/map -/Plugin/RSP/pdb -/Plugin/RSP/RSP 1.7.dll -/Source/Project64/User Interface/UI Resources.aps +/*.opensdf +/*.sdf +/*.suo /Bin/Beta Release/Config/Project64.cache3 /Bin/Beta Release/Config/Project64.cfg /Bin/Beta Release/Config/Project64.cht @@ -34,16 +10,23 @@ /Bin/Beta Release/Config/Project64.rdx /Bin/Beta Release/Config/Project64.zcache /Bin/Beta Release/Logs/Project64.log -/Bin/Beta Release/Project64.exe /Bin/Beta Release/map/Project64.map /Bin/Beta Release/pdb/Project64.pdb +/Bin/Beta Release/Project64.exe /Bin/Debug/Config/Project64.cache3 /Bin/Debug/Config/Project64.cht /Bin/Debug/Config/Project64.rdb /Bin/Debug/Config/Project64.rdn /Bin/Debug/Config/Project64.rdx /Bin/Debug/Config/Project64.zcache +/Bin/Debug/lib +/Bin/Debug/Logs +/Bin/Debug/map +/Bin/Debug/pdb /Bin/Debug/Project64.exe +/Bin/Debug/Save +/Bin/Debug/Screenshots +/Bin/Debug/SyncPlugin /Bin/External Release/Config/Project64.cache3 /Bin/External Release/Config/Project64.cfg /Bin/External Release/Config/Project64.cht @@ -51,14 +34,25 @@ /Bin/External Release/Config/Project64.rdn /Bin/External Release/Config/Project64.rdx /Bin/External Release/Config/Project64.zcache +/Bin/External Release/d3d syslog.txt /Bin/External Release/Logs/CPUoutput.log /Bin/External Release/Logs/Project64.log /Bin/External Release/Logs/RSP_x86Log.txt /Bin/External Release/Project64.exe -/Bin/External Release/d3d syslog.txt -/Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h -/Plugin/GFX/PJ64Glide64.dll -/Plugin/GFX/PJ64Glide64_d.dll +/Bin/Release/d3d syslog.txt +/Bin/Release/d3d syslog.txt.bak +/Bin/Release/lib +/Bin/Release/Logs +/Bin/Release/map +/Bin/Release/pdb +/Bin/Release/Project64.exe +/Bin/Release/Save +/Bin/Release/Screenshots +/Bin/Release/Setup Project64*.exe +/Bin/Release/SyncPlugin +/build +/Config/Project64.cfg +/ipch /Plugin/GFX/lib/PJ64Glide64.exp /Plugin/GFX/lib/PJ64Glide64.lib /Plugin/GFX/lib/PJ64Glide64_d.exp @@ -67,5 +61,18 @@ /Plugin/GFX/map/PJ64Glide64_d.map /Plugin/GFX/pdb/PJ64Glide64.pdb /Plugin/GFX/pdb/PJ64Glide64_d.pdb +/Plugin/GFX/PJ64Glide64.dll +/Plugin/GFX/PJ64Glide64_d.dll +/Plugin/RSP/lib +/Plugin/RSP/map +/Plugin/RSP/pdb +/Plugin/RSP/RSP 1.7.dll +/Plugin/RSP/RSP_d 1.7.dll +/Project64.ncb +/Project64.suo +/Save +/Source/3rd Party/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h +/Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h /Source/Glide64/Glide64.aps -/Textures +/Source/Project64/User Interface/UI Resources.aps +/Textures \ No newline at end of file diff --git a/Project64.vs2010.sln b/Project64.vs2013.sln similarity index 100% rename from Project64.vs2010.sln rename to Project64.vs2013.sln diff --git a/PropertySheets/Debug.props b/PropertySheets/Debug.props new file mode 100644 index 000000000..b2812cc1e --- /dev/null +++ b/PropertySheets/Debug.props @@ -0,0 +1,32 @@ + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + _DEBUG;DEBUG;%(PreprocessorDefinitions) + Disabled + Default + false + Neither + false + false + false + EnableFastChecks + true + MultiThreadedDebug + + + + + + _DEBUG;DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;DEBUG;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/PropertySheets/Release.props b/PropertySheets/Release.props new file mode 100644 index 000000000..b22c81a3e --- /dev/null +++ b/PropertySheets/Release.props @@ -0,0 +1,30 @@ + + + + <_ProjectFileVersion>12.0.21005.1 + + + + MinSpace + Default + false + Size + false + false + false + NDEBUG;%(PreprocessorDefinitions) + false + MultiThreaded + + + + + + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/PropertySheets/Win32.Debug.props b/PropertySheets/Win32.Debug.props new file mode 100644 index 000000000..16f18ab90 --- /dev/null +++ b/PropertySheets/Win32.Debug.props @@ -0,0 +1,13 @@ + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + \ No newline at end of file diff --git a/PropertySheets/Win32.Release.props b/PropertySheets/Win32.Release.props new file mode 100644 index 000000000..75f0422da --- /dev/null +++ b/PropertySheets/Win32.Release.props @@ -0,0 +1,13 @@ + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + \ No newline at end of file diff --git a/PropertySheets/Win32.props b/PropertySheets/Win32.props new file mode 100644 index 000000000..a6d0c781e --- /dev/null +++ b/PropertySheets/Win32.props @@ -0,0 +1,193 @@ + + + + $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)build\$(Configuration)\$(ProjectName)\ + *.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean) + false + false + false + true + + + $(SolutionDir)bin\$(Configuration)\lib\ + + + + WIN32;_WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + + + MachineX86 + + + + $(SolutionDir) + $(ROOT)Source\ + + + + $(ROOT) + + + $(SRC) + + + + + + $(IntDir)BuildLog.htm + + + true + $(OutDir)$(ProjectName).bsc + + + .\;..\;..\3rd Party;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + false + false + false + true + true + Async + Default + false + Default + false + true + NotSet + Precise + false + false + + true + true + false + false + Use + StdAfx.h + $(IntDir)$(TargetName).pch + false + + $(IntDir) + $(IntDir) + $(IntDir)vc90.pdb + false + $(IntDir) + + $(IntDir) + Level4 + false + true + ProgramDatabase + Cdecl + Default + false + false + false + false + false + Prompt + + + $(OutDir)$(ProjectName).lib + true + true + false + + + true + false + + + false + false + /IGNORE:4199 /OPT:ICF=3 %(AdditionalOptions) + NotSet + true + $(IntDir)$(TargetFileName).intermediate.manifest + false + + advapi32.dll;userenv.dll;shell32.dll;shlwapi.dll;ws2_32.dll;version.dll;wtsapi32.dll;%(DelayLoadDLLs) + false + 1 + true + + $(TargetDir)pdb/$(TargetName).pdb + true + $(TargetDir)map/$(TargetName).map + false + 0 + 0 + 0 + 0 + + + false + false + true + true + + false + false + false + false + + false + false + $(TargetDir)lib/$(TargetName).lib + false + DefaultThreadingAttribute + Default + PromptImmediately + false + + + .;$(SRC);$(SRC)\3rd Party;%(AdditionalIncludeDirectories) + false + false + 3 + false + true + Unsigned + true + true + $(IntDir)%(Filename).tlb + %(Filename)_h.h + + %(Filename)_i.c + %(Filename)_p.c + All + false + false + false + false + false + true + NotSet + + + 0x0000 + false + false + $(IntDir)%(Filename).res + + + $(IntDir)$(TargetFileName).embed.manifest + true + false + false + false + + + $(IntDir)$(TargetFileName).embed.manifest.res + + + true + true + $(TargetDir)$(TargetName).xml + + + + \ No newline at end of file diff --git a/Source/3rd Party/7zip/7zip.vcxproj b/Source/3rd Party/7zip/7zip.vcxproj new file mode 100644 index 000000000..2dd6532b9 --- /dev/null +++ b/Source/3rd Party/7zip/7zip.vcxproj @@ -0,0 +1,82 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {3326E128-33AF-422C-BB7C-67CC6B915610} + 7zip + + + + StaticLibrary + v120 + + + StaticLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + + 4127;%(DisableSpecificWarnings) + + + + + + 4127;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/3rd Party/7zip/7zip.vcxproj.filters b/Source/3rd Party/7zip/7zip.vcxproj.filters new file mode 100644 index 000000000..bd2cf11a6 --- /dev/null +++ b/Source/3rd Party/7zip/7zip.vcxproj.filters @@ -0,0 +1,83 @@ + + + + + {5eb82abf-a87d-43e6-b765-7e70ec0a5df0} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {a0c6ef27-6c55-4c16-99d4-e912bc363ca5} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Source/3rd Party/WTL/WTL.vcxproj b/Source/3rd Party/WTL/WTL.vcxproj new file mode 100644 index 000000000..0de52d925 --- /dev/null +++ b/Source/3rd Party/WTL/WTL.vcxproj @@ -0,0 +1,68 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {4BC6906B-213E-40D7-9FC7-1A93E228393D} + WTL + + + + StaticLibrary + v120 + + + StaticLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/3rd Party/WTL/WTL.vcxproj.filters b/Source/3rd Party/WTL/WTL.vcxproj.filters new file mode 100644 index 000000000..5d4419ade --- /dev/null +++ b/Source/3rd Party/WTL/WTL.vcxproj.filters @@ -0,0 +1,71 @@ + + + + + {571df6bb-e450-49dc-8f57-3492a402bff7} + h;hpp;hxx;hm;inl + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/include/wx/platform.h b/Source/3rd Party/wx/include/wx/platform.h index 9f3971a83..05b132af1 100644 --- a/Source/3rd Party/wx/include/wx/platform.h +++ b/Source/3rd Party/wx/include/wx/platform.h @@ -436,6 +436,8 @@ # define __VISUALC10__ # elif __VISUALC__ < 1800 # define __VISUALC11__ +# elif __VISUALC__ < 1900 +# define __VISUALC12__ # else # pragma message("Please update wx/platform.h to recognize this VC++ version") # endif diff --git a/Source/3rd Party/wx/wx_base.vcxproj b/Source/3rd Party/wx/wx_base.vcxproj new file mode 100644 index 000000000..acc0a30c2 --- /dev/null +++ b/Source/3rd Party/wx/wx_base.vcxproj @@ -0,0 +1,399 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + base + {427F1DCD-3BED-4010-9322-077A4C06D871} + base + + + + StaticLibrary + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + wxbase29d + + + wxbase29 + + + + lib\vc_lib\mswud;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories) + _LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + wx/wxprec.h + 4005;%(DisableSpecificWarnings) + + + $(OutDir)wxbase29d.lib + + + + + lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories) + _LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + wx/wxprec.h + 4005;%(DisableSpecificWarnings) + + + $(OutDir)wxbase29.lib + + + + + + + + + + + + + + + + + + + + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + \wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories) + true + \wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories) + + + + + Creating lib\vc_lib\mswud\wx\setup.h + copy "%(FullPath)" lib\vc_lib\mswud\wx\setup.h + + lib\vc_lib\mswud\wx\setup.h;%(Outputs) + Creating lib\vc_lib\mswu\wx\setup.h + copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h + + lib\vc_lib\mswu\wx\setup.h;%(Outputs) + + + + + + + + + + Creating lib\vc_lib\mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswud\wx\msw\rcdefs.h" + + lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) + Creating lib\vc_lib\mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswu\wx\msw\rcdefs.h" + + lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {93447136-facd-4740-8f35-fc46fb4a9e82} + false + + + + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_base.vcxproj.filters b/Source/3rd Party/wx/wx_base.vcxproj.filters new file mode 100644 index 000000000..0652ad22f --- /dev/null +++ b/Source/3rd Party/wx/wx_base.vcxproj.filters @@ -0,0 +1,880 @@ + + + + + {c47f3dca-3d23-41cc-bd84-4adfbdc7757a} + + + {58ad57de-3105-49e4-8e4c-eddb8cd5bc2e} + + + {c46d9455-113a-4716-8e37-b801e5b378bc} + + + {cbe58bbf-0605-4d87-9484-3ecae0288c7f} + + + {32a9afd0-b6a3-483a-bbdd-304067d12b94} + + + {0633f4e8-69d6-4e8c-b39d-7f02816de34e} + + + {afed9fae-e417-4025-982b-37f89ac0d87e} + + + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + Generic Sources + + + + + MSW Sources + + + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + Generic Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + + + Setup Headers + + + MSW Headers + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_core.vcxproj b/Source/3rd Party/wx/wx_core.vcxproj new file mode 100644 index 000000000..53f75d19b --- /dev/null +++ b/Source/3rd Party/wx/wx_core.vcxproj @@ -0,0 +1,631 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + core + {93447136-FACD-4740-8F35-FC46FB4A9E82} + core + + + + StaticLibrary + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + wxmsw29d_core + + + wxmsw29_core + + + + lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;%(AdditionalIncludeDirectories) + _LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + wx/wxprec.h + 4005;%(DisableSpecificWarnings) + + + $(OutDir)wxmsw29d_core.lib + + + + + lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;%(AdditionalIncludeDirectories) + _LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + wx/wxprec.h + 4005;%(DisableSpecificWarnings) + + + $(OutDir)wxmsw29_core.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + \wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories) + true + \wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories) + + + + + Creating lib\vc_lib\mswd\wx\setup.h + copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h + + lib\vc_lib\mswd\wx\setup.h;%(Outputs) + Creating lib\vc_lib\mswu\wx\setup.h + copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h + + lib\vc_lib\mswu\wx\setup.h;%(Outputs) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Creating lib\vc_lib\mswud\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswud\wx\msw\rcdefs.h" + + lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) + Creating lib\vc_lib\mswu\wx\msw\rcdefs.h + cl /EP /nologo "%(FullPath)" > "lib\vc_lib\mswu\wx\msw\rcdefs.h" + + lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_core.vcxproj.filters b/Source/3rd Party/wx/wx_core.vcxproj.filters new file mode 100644 index 000000000..9b0034a55 --- /dev/null +++ b/Source/3rd Party/wx/wx_core.vcxproj.filters @@ -0,0 +1,1507 @@ + + + + + {238bd9e7-3a90-41dd-890f-365a693b7ed7} + + + {906ff3ef-0c1c-4a78-bd1d-fd06f5e8d2b9} + + + {54a674e6-3b50-4c0a-820b-49b82fb1fc79} + + + {287b8cb7-e71f-4126-b0c7-e4f8c79642aa} + + + {69468513-6a58-46aa-9d14-e6603fa5feaf} + + + {4dd735b9-9915-4f15-809b-327e37c08e0b} + + + {7bb9f0fa-58dd-4d3d-989b-46b1d94ecdac} + + + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + Common Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + MSW Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + Generic Sources + + + + + MSW Sources + + + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + MSW Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Generic Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + Common Headers + + + + + Setup Headers + + + MSW Headers + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj b/Source/3rd Party/wx/wx_wxjpeg.vcxproj new file mode 100644 index 000000000..b304d423d --- /dev/null +++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj @@ -0,0 +1,114 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + wxjpeg + {93CFEDF3-9A75-4484-B169-D9D8074F5AC2} + wxjpeg + + + + StaticLibrary + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + wxjpegd + + + + lib\vc_lib\mswud;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + $(OutDir)wxjpegd.lib + + + + + ..\..\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + $(OutDir)wxjpeg.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj.filters b/Source/3rd Party/wx/wx_wxjpeg.vcxproj.filters new file mode 100644 index 000000000..41221b0ca --- /dev/null +++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj.filters @@ -0,0 +1,148 @@ + + + + + {4ed3c042-494b-4796-be9a-6ba534721d3e} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj b/Source/3rd Party/wx/wx_wxpng.vcxproj new file mode 100644 index 000000000..7d41b4233 --- /dev/null +++ b/Source/3rd Party/wx/wx_wxpng.vcxproj @@ -0,0 +1,84 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + wxpng + {05B9CB11-12D1-47CD-8E4A-88E12162119B} + wxpng + + + + StaticLibrary + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + wxpngd + + + + src\zlib;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + false + + Level3 + + + $(OutDir)wxpngd.lib + + + + + src\zlib;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) + + Level3 + + + $(OutDir)wxpng.lib + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj.filters b/Source/3rd Party/wx/wx_wxpng.vcxproj.filters new file mode 100644 index 000000000..0aa1b6fe3 --- /dev/null +++ b/Source/3rd Party/wx/wx_wxpng.vcxproj.filters @@ -0,0 +1,55 @@ + + + + + {3934553c-b320-4297-a70b-f730c81debd4} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj b/Source/3rd Party/wx/wx_wxzlib.vcxproj new file mode 100644 index 000000000..5e98ede84 --- /dev/null +++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj @@ -0,0 +1,77 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + wxzlib + {25A25249-C284-4C5A-8DC2-26FC3EB13703} + wxzlib + + + + StaticLibrary + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + wxzlibd + + + + + Level3 + + + $(OutDir)wxzlibd.lib + + + + + _LIB;%(PreprocessorDefinitions) + + Level3 + + + $(OutDir)wxzlib.lib + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters b/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters new file mode 100644 index 000000000..3734eb6dd --- /dev/null +++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters @@ -0,0 +1,46 @@ + + + + + {72ef58c0-f0a1-4938-a18a-c55d762af660} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/Source/3rd Party/zlib/zlib.vcxproj b/Source/3rd Party/zlib/zlib.vcxproj new file mode 100644 index 000000000..7866f097e --- /dev/null +++ b/Source/3rd Party/zlib/zlib.vcxproj @@ -0,0 +1,98 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {731BD205-2826-4631-B7AF-117658E88DBC} + zlib + + + + StaticLibrary + v120 + + + StaticLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + + Level3 + + + + + + Level3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/3rd Party/zlib/zlib.vcxproj.filters b/Source/3rd Party/zlib/zlib.vcxproj.filters new file mode 100644 index 000000000..ec4ac5eeb --- /dev/null +++ b/Source/3rd Party/zlib/zlib.vcxproj.filters @@ -0,0 +1,138 @@ + + + + + {20a593ff-2e3f-48c3-89ef-81cd7bdd8898} + cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90 + + + {a3b93770-ecab-40a0-93dc-ace6e58b2384} + h;hpp;hxx;hm;inl;fi;fd + + + {976e25a0-5f1d-4b4d-8a84-df1126658768} + ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe + + + {873bcaad-0a88-4791-922a-b7420d765969} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Minizip + + + Minizip + + + Minizip + + + Minizip + + + Minizip + + + Minizip + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Minizip + + + Minizip + + + Minizip + + + Minizip + + + Minizip + + + Minizip + + + \ No newline at end of file diff --git a/Source/Common/Common.vcxproj b/Source/Common/Common.vcxproj new file mode 100644 index 000000000..a34df03a5 --- /dev/null +++ b/Source/Common/Common.vcxproj @@ -0,0 +1,75 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421} + Common + + + + StaticLibrary + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Common/Common.vcxproj.filters b/Source/Common/Common.vcxproj.filters new file mode 100644 index 000000000..f77f45322 --- /dev/null +++ b/Source/Common/Common.vcxproj.filters @@ -0,0 +1,98 @@ + + + + + {5842da68-d69c-48c6-a4dd-4871600401a4} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {f6332643-96d2-488b-90e6-f3de1582e8a0} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Source/Common/File Class.cpp b/Source/Common/File Class.cpp index e0dfc358c..0c3134eb1 100644 --- a/Source/Common/File Class.cpp +++ b/Source/Common/File Class.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include CFile::CFile() : m_hFile(INVALID_HANDLE_VALUE), @@ -13,7 +12,7 @@ CFile::CFile(HANDLE hFile) : { if (hFile == 0) { - ATLASSERT(hFile != 0); + _ASSERTE(hFile != 0); } } @@ -60,7 +59,7 @@ bool CFile::Open(LPCTSTR lpszFileName, ULONG nOpenFlags) dwAccess = GENERIC_READ|GENERIC_WRITE; break; default: - ATLASSERT(false); + _ASSERTE(false); } COSVersion osver; diff --git a/Source/Common/md5.cpp b/Source/Common/md5.cpp index a8c8f6ae2..3fe2536d1 100644 --- a/Source/Common/md5.cpp +++ b/Source/Common/md5.cpp @@ -113,8 +113,14 @@ void MD5::update(FILE *file){ unsigned char buffer[1024]; int len; - while (len=(int)fread(buffer, 1, 1024, file)) - update(buffer, len); + do + { + len = (int)fread(buffer, 1, 1024, file); + if (len) + { + update(buffer, len); + } + } while (len); fclose (file); diff --git a/Source/Common/path.cpp b/Source/Common/path.cpp index dffd79696..51b5bafc0 100644 --- a/Source/Common/path.cpp +++ b/Source/Common/path.cpp @@ -2,7 +2,6 @@ // ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include #include ////////////////////////////////////////////////////////////////////// @@ -415,7 +414,7 @@ void CPath::SpecialDirectory(SpecialDirectoryType eInitialDir) default: // Accept only constants we know about //Bugger - ATLASSERT(false); + _ASSERTE(false); break; } } @@ -2243,13 +2242,7 @@ BOOL CPath::AttributesMatch(ULONG dwTargetAttributes, ULONG dwFileAttributes) { return ((_A_SUBDIR & dwFileAttributes) == 0); } - else - { - return ( ((dwTargetAttributes & dwFileAttributes) != 0) && - ((_A_SUBDIR & dwTargetAttributes) == (_A_SUBDIR & dwFileAttributes)) ); - } - - return FALSE; + return ( ((dwTargetAttributes & dwFileAttributes) != 0) && ((_A_SUBDIR & dwTargetAttributes) == (_A_SUBDIR & dwFileAttributes)) ); } //------------------------------------------------------------- diff --git a/Source/Glide64/Glide64.vcxproj b/Source/Glide64/Glide64.vcxproj new file mode 100644 index 000000000..3e920db13 --- /dev/null +++ b/Source/Glide64/Glide64.vcxproj @@ -0,0 +1,189 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {A4D13408-A794-4199-8FC7-4A9A32505005} + n64Glide + + + + DynamicLibrary + v120 + + + DynamicLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + PJ64Glide64_d + $(SolutionDir)Plugin\GFX\ + + + $(SolutionDir)Plugin\GFX\ + PJ64Glide64 + + + + $(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;inc;%(AdditionalIncludeDirectories) + __MSC__;%(PreprocessorDefinitions) + + + + $(Root)Source\3rd Party\wx\lib\vc_lib;%(AdditionalLibraryDirectories) + + + + + $(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;inc;%(AdditionalIncludeDirectories) + __MSC__;%(PreprocessorDefinitions) + + + + $(Root)Source\3rd Party\wx\lib\vc_lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {427f1dcd-3bed-4010-9322-077a4c06d871} + false + + + {93447136-facd-4740-8f35-fc46fb4a9e82} + false + + + {93cfedf3-9a75-4484-b169-d9d8074f5ac2} + false + + + {05b9cb11-12d1-47cd-8e4a-88e12162119b} + false + + + {25a25249-c284-4c5a-8dc2-26fc3eb13703} + false + + + {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} + false + + + {2daddaa5-0f57-46ed-a974-747908ddc7f3} + false + + + {462c2608-182f-452c-944f-af201e19300b} + false + + + {8b9961b1-88d9-4ea3-a752-507a00dd9f3d} + false + + + + + + \ No newline at end of file diff --git a/Source/Glide64/Glide64.vcxproj.filters b/Source/Glide64/Glide64.vcxproj.filters new file mode 100644 index 000000000..405f40d56 --- /dev/null +++ b/Source/Glide64/Glide64.vcxproj.filters @@ -0,0 +1,191 @@ + + + + + {27e3a0da-75ed-4f27-8b34-e688ef226011} + + + {c3c04c2d-bf87-47c1-a72f-1ed2ca98d219} + + + {0e996a30-185f-4191-b77d-b88d86055b8c} + + + {a8253215-16b6-4579-9f98-538ad5f4a6c3} + txt + + + {a4bb9cf1-305d-4c72-bb6e-c494301dcdad} + + + {f0e9ed7a-3046-4b82-a4b1-5f58e1fe7446} + + + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + ucode + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Texture + + + Config + + + Res + + + Res + + + Res + + + + + + + + + + + + + + + + + Texture + + + Texture + + + Texture + + + Config + + + + + + + + + + + + + + + + + + Doc + + + + + Icons + + + Icons + + + Icons + + + Icons + + + Icons + + + Icons + + + Icons + + + + + Res + + + \ No newline at end of file diff --git a/Source/GlideHQ/GlideHQ.vcxproj b/Source/GlideHQ/GlideHQ.vcxproj new file mode 100644 index 000000000..18d6c494f --- /dev/null +++ b/Source/GlideHQ/GlideHQ.vcxproj @@ -0,0 +1,103 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2DADDAA5-0F57-46ED-A974-747908DDC7F3} + GlideHQ + + + + StaticLibrary + v120 + + + StaticLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + $(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories) + + Level3 + + + + + $(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories) + + Level3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} + false + + + + + + \ No newline at end of file diff --git a/Source/GlideHQ/GlideHQ.vcxproj.filters b/Source/GlideHQ/GlideHQ.vcxproj.filters new file mode 100644 index 000000000..cdc181abd --- /dev/null +++ b/Source/GlideHQ/GlideHQ.vcxproj.filters @@ -0,0 +1,125 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {e42072d3-97be-40c3-b6eb-6a250288e739} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + tc-1.1+ + + + tc-1.1+ + + + tc-1.1+ + + + tc-1.1+ + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + tc-1.1+ + + + tc-1.1+ + + + tc-1.1+ + + + \ No newline at end of file diff --git a/Source/Glitch64/Glitch64.vcxproj b/Source/Glitch64/Glitch64.vcxproj new file mode 100644 index 000000000..dbcceea9d --- /dev/null +++ b/Source/Glitch64/Glitch64.vcxproj @@ -0,0 +1,73 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {462C2608-182F-452C-944F-AF201E19300B} + glide3x + + + + StaticLibrary + v120 + + + StaticLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + inc;%(AdditionalIncludeDirectories) + + + + OpenGL32.lib;%(AdditionalDependencies) + + + + + inc;%(AdditionalIncludeDirectories) + + + + OpenGL32.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Glitch64/Glitch64.vcxproj.filters b/Source/Glitch64/Glitch64.vcxproj.filters new file mode 100644 index 000000000..76f38032a --- /dev/null +++ b/Source/Glitch64/Glitch64.vcxproj.filters @@ -0,0 +1,38 @@ + + + + + {67046859-ebd4-4537-aed8-a6d9f2fd82b5} + *.h + + + {2b6170d8-e8e8-4f3a-94af-a88d7b8ce7d9} + *.cpp + + + + + Headers + + + Headers + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/Source/Installer/Installer.vcxproj b/Source/Installer/Installer.vcxproj new file mode 100644 index 000000000..6be3dce05 --- /dev/null +++ b/Source/Installer/Installer.vcxproj @@ -0,0 +1,75 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + Project64Setup + {360A34F3-3172-4B09-8BC9-B3FBEE677863} + Project64Setup + + + + StaticLibrary + v120 + + + StaticLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + + + + + + + + + + + "$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss" + + $(OutDir)Project64.exe;%(AdditionalInputs) + $(OutDir)Setup Project64 2.0.exe;%(Outputs) + "$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss" + $(OutDir)Project64.exe;%(AdditionalInputs) + $(OutDir)Setup Project64 2.0.exe;%(Outputs) + + + + + + + + {7e534c8e-1ace-4a88-8807-39a11ed4da18} + false + + + + + + \ No newline at end of file diff --git a/Source/Installer/Installer.vcxproj.filters b/Source/Installer/Installer.vcxproj.filters new file mode 100644 index 000000000..419b40f53 --- /dev/null +++ b/Source/Installer/Installer.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {93ba3998-9310-4111-bfd3-a907e3452213} + + + {389ec096-ad75-499a-82a2-f6b5dbe0ed90} + + + + + Source Files\binno + + + Source Files\binno + + + Source Files\binno + + + + + Source Files + + + \ No newline at end of file diff --git a/Source/Project64/N64 System/Cheat Class.cpp b/Source/Project64/N64 System/Cheat Class.cpp index d65432140..4178fa529 100644 --- a/Source/Project64/N64 System/Cheat Class.cpp +++ b/Source/Project64/N64 System/Cheat Class.cpp @@ -478,7 +478,7 @@ DWORD CCheats::AsciiToHex (const char * HexValue) { return Value; } -void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, WND_HANDLE hParent, bool CheatActive) { +void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, HWND hParent, bool CheatActive) { TV_INSERTSTRUCT tv; //Work out text to add @@ -496,9 +496,9 @@ void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, WND_HANDL TreeView_GetItem((HWND)m_hCheatTree,&tv.item); if (strcmp(Text,Item) == 0) { //If already exists then just use existing one - int State = TV_GetCheckState(m_hCheatTree,(WND_HANDLE)tv.item.hItem); + int State = TV_GetCheckState(m_hCheatTree,(HWND)tv.item.hItem); if ((CheatActive && State == TV_STATE_CLEAR) || (!CheatActive && State == TV_STATE_CHECKED)) { - TV_SetCheckState(m_hCheatTree,(WND_HANDLE)tv.item.hItem,TV_STATE_INDETERMINATE); + TV_SetCheckState(m_hCheatTree,(HWND)tv.item.hItem,TV_STATE_INDETERMINATE); } size_t StartPos = strlen(Text) + 1; stdstr TempCheatName; @@ -506,7 +506,7 @@ void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, WND_HANDL { TempCheatName = CheatName.substr(StartPos); } - AddCodeLayers(CheatNumber,TempCheatName, (WND_HANDLE)tv.item.hItem, CheatActive); + AddCodeLayers(CheatNumber,TempCheatName, (HWND)tv.item.hItem, CheatActive); return; } tv.item.hItem = TreeView_GetNextSibling((HWND)m_hCheatTree,tv.item.hItem); @@ -518,7 +518,7 @@ void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, WND_HANDL tv.item.pszText = Text; tv.item.lParam = CheatNumber; tv.hParent = (HTREEITEM)hParent; - hParent = (WND_HANDLE)TreeView_InsertItem((HWND)m_hCheatTree,&tv); + hParent = (HWND)TreeView_InsertItem((HWND)m_hCheatTree,&tv); TV_SetCheckState(m_hCheatTree,hParent,CheatActive?TV_STATE_CHECKED:TV_STATE_CLEAR); if (strcmp(Text,CheatName.c_str()) == 0) { return; } @@ -586,11 +586,11 @@ void CCheats::RefreshCheatManager(void) stdstr Name = GetCheatName(i,true); if (Name.length() == 0) { break; } - AddCodeLayers(i,Name,(WND_HANDLE)TVI_ROOT, g_Settings->LoadBoolIndex(Cheat_Active,i) != 0); + AddCodeLayers(i,Name,(HWND)TVI_ROOT, g_Settings->LoadBoolIndex(Cheat_Active,i) != 0); } } -stdstr CCheats::GetDlgItemStr (WND_HANDLE hDlg, int nIDDlgItem) +stdstr CCheats::GetDlgItemStr (HWND hDlg, int nIDDlgItem) { HWND hDlgItem = GetDlgItem((HWND)hDlg,nIDDlgItem); int length = SendMessage(hDlgItem, WM_GETTEXTLENGTH, 0, 0); @@ -607,7 +607,7 @@ stdstr CCheats::GetDlgItemStr (WND_HANDLE hDlg, int nIDDlgItem) return Result; } -void CCheats::SelectCheats(WND_HANDLE hParent, bool BlockExecution) { +void CCheats::SelectCheats(HWND hParent, bool BlockExecution) { if (m_Window != NULL) { SetForegroundWindow((HWND)m_Window); return; @@ -626,7 +626,7 @@ void CCheats::SelectCheats(WND_HANDLE hParent, bool BlockExecution) { } -bool CCheats::CheatChanged (WND_HANDLE hDlg) +bool CCheats::CheatChanged (HWND hDlg) { bool Changed = false; if (m_EditName != GetDlgItemStr(hDlg,IDC_CODE_NAME) || @@ -652,7 +652,7 @@ bool CCheats::CheatChanged (WND_HANDLE hDlg) return false; } -void CCheats::RecordCheatValues ( WND_HANDLE hDlg ) +void CCheats::RecordCheatValues ( HWND hDlg ) { m_EditName = GetDlgItemStr(hDlg,IDC_CODE_NAME); m_EditCode = GetDlgItemStr(hDlg,IDC_CHEAT_CODES); @@ -660,7 +660,7 @@ void CCheats::RecordCheatValues ( WND_HANDLE hDlg ) m_EditNotes = GetDlgItemStr(hDlg,IDC_NOTES); } -int CALLBACK CCheats::CheatAddProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { +int CALLBACK CCheats::CheatAddProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { switch (uMsg) { case WM_INITDIALOG: { @@ -895,7 +895,7 @@ int CALLBACK CCheats::CheatAddProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWO return true; } -int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { +int CALLBACK CCheats::CheatListProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { switch (uMsg) { case WM_INITDIALOG: { @@ -913,7 +913,7 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW GetWindowRect(GetDlgItem((HWND)hDlg, IDC_CHEATSFRAME), &rcList); GetWindowRect(GetDlgItem((HWND)hDlg, IDC_UNMARK), &rcButton); - _this->m_hCheatTree = (WND_HANDLE)CreateWindowEx(WS_EX_CLIENTEDGE,WC_TREEVIEW,"", + _this->m_hCheatTree = (HWND)CreateWindowEx(WS_EX_CLIENTEDGE,WC_TREEVIEW,"", WS_CHILD | WS_BORDER | WS_VISIBLE | WS_VSCROLL | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_DISABLEDRAGDROP |WS_TABSTOP| TVS_FULLROWSELECT, 8, 15, rcList.right-rcList.left-16, @@ -959,13 +959,13 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW item.mask = TVIF_PARAM ; TreeView_GetItem((HWND)_this->m_hCheatTree,&item); - _this->ChangeChildrenStatus((WND_HANDLE)TVI_ROOT,false); + _this->ChangeChildrenStatus((HWND)TVI_ROOT,false); _this->DeleteCheat(item.lParam); _this->RefreshCheatManager(); } break; case IDC_UNMARK: - _this->ChangeChildrenStatus((WND_HANDLE)TVI_ROOT,false); + _this->ChangeChildrenStatus((HWND)TVI_ROOT,false); _this->m_CheatSelectionChanged = true; break; } @@ -994,7 +994,7 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW MapWindowPoints(HWND_DESKTOP, lpnmh->hwndFrom, &ht.pt, 1); TreeView_HitTest(lpnmh->hwndFrom, &ht); - _this->m_hSelectedItem = (WND_HANDLE)ht.hItem; + _this->m_hSelectedItem = (HWND)ht.hItem; if (g_Settings->LoadBool(UserInterface_BasicMode)) { return true; } //Show Menu @@ -1004,9 +1004,9 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW GetCursorPos(&Mouse); - MenuSetText((MENU_HANDLE)hPopupMenu, 0, GS(CHEAT_ADDNEW), NULL); - MenuSetText((MENU_HANDLE)hPopupMenu, 1, GS(CHEAT_EDIT), NULL); - MenuSetText((MENU_HANDLE)hPopupMenu, 3, GS(CHEAT_DELETE), NULL); + MenuSetText((HMENU)hPopupMenu, 0, GS(CHEAT_ADDNEW), NULL); + MenuSetText((HMENU)hPopupMenu, 1, GS(CHEAT_EDIT), NULL); + MenuSetText((HMENU)hPopupMenu, 3, GS(CHEAT_DELETE), NULL); if (_this->m_hSelectedItem == NULL || TreeView_GetChild((HWND)_this->m_hCheatTree,_this->m_hSelectedItem) != NULL) @@ -1033,11 +1033,11 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW if(TVHT_ONITEMSTATEICON & ht.flags) { - switch (TV_GetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem)) { + switch (TV_GetCheckState(_this->m_hCheatTree,(HWND)ht.hItem)) { case TV_STATE_CLEAR: case TV_STATE_INDETERMINATE: //Make sure that the item has a valid code extenstion selected - if (TreeView_GetChild((HWND)_this->m_hCheatTree, (WND_HANDLE)ht.hItem) == NULL) { + if (TreeView_GetChild((HWND)_this->m_hCheatTree, (HWND)ht.hItem) == NULL) { TVITEM item; item.mask = TVIF_PARAM ; item.hItem = (HTREEITEM)ht.hItem; @@ -1049,25 +1049,25 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW if (!g_Settings->LoadStringIndex(Cheat_Extension,item.lParam,CheatExtension)) { SendMessage((HWND)hDlg, UM_CHANGECODEEXTENSION, 0, (LPARAM)ht.hItem); - TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CLEAR); + TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CLEAR); break; } } } - TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CHECKED); - _this->ChangeChildrenStatus((WND_HANDLE)ht.hItem,true); - _this->CheckParentStatus((WND_HANDLE)TreeView_GetParent((HWND)_this->m_hCheatTree,ht.hItem)); + TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CHECKED); + _this->ChangeChildrenStatus((HWND)ht.hItem,true); + _this->CheckParentStatus((HWND)TreeView_GetParent((HWND)_this->m_hCheatTree,ht.hItem)); break; case TV_STATE_CHECKED: - TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CLEAR); - _this->ChangeChildrenStatus((WND_HANDLE)ht.hItem,false); - _this->CheckParentStatus((WND_HANDLE)TreeView_GetParent((HWND)_this->m_hCheatTree,ht.hItem)); + TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CLEAR); + _this->ChangeChildrenStatus((HWND)ht.hItem,false); + _this->CheckParentStatus((HWND)TreeView_GetParent((HWND)_this->m_hCheatTree,ht.hItem)); break; } - switch (TV_GetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem)) { - case TV_STATE_CHECKED: TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_INDETERMINATE); break; - case TV_STATE_CLEAR: TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CHECKED); break; - case TV_STATE_INDETERMINATE: TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CLEAR); break; + switch (TV_GetCheckState(_this->m_hCheatTree,(HWND)ht.hItem)) { + case TV_STATE_CHECKED: TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_INDETERMINATE); break; + case TV_STATE_CLEAR: TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CHECKED); break; + case TV_STATE_INDETERMINATE: TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CLEAR); break; } _this->m_CheatSelectionChanged = true; @@ -1118,7 +1118,7 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW CCheats * _this = (CCheats *)GetProp((HWND)hDlg,"Class"); ; //Get the selected item - _this->m_hSelectedItem = (WND_HANDLE)lParam; + _this->m_hSelectedItem = (HWND)lParam; TVITEM item; item.mask = TVIF_PARAM ; item.hItem = (HTREEITEM)_this->m_hSelectedItem; @@ -1160,7 +1160,7 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW return true; } -int CALLBACK CCheats::CheatsCodeExProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { +int CALLBACK CCheats::CheatsCodeExProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { switch (uMsg) { case WM_INITDIALOG: { @@ -1237,7 +1237,7 @@ int CALLBACK CCheats::CheatsCodeExProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, return true; } -int CALLBACK CCheats::CheatsCodeQuantProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { +int CALLBACK CCheats::CheatsCodeQuantProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { static WORD Start, Stop, SelStart, SelStop; switch (uMsg) { @@ -1346,7 +1346,7 @@ bool CCheats::IsCheatMessage( MSG * msg ) return false; } -int CALLBACK CCheats::ManageCheatsProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { +int CALLBACK CCheats::ManageCheatsProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) { switch (uMsg) { case WM_INITDIALOG: { @@ -1359,7 +1359,7 @@ int CALLBACK CCheats::ManageCheatsProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, GetWindowPlacement((HWND)hDlg, &WndPlac); SetWindowText((HWND)hDlg, GS(CHEAT_TITLE)); - _this->m_hSelectCheat = (WND_HANDLE)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_List),(HWND)hDlg,(DLGPROC)CheatListProc,(LPARAM)_this); + _this->m_hSelectCheat = (HWND)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_List),(HWND)hDlg,(DLGPROC)CheatListProc,(LPARAM)_this); SetWindowPos((HWND)_this->m_hSelectCheat,HWND_TOP, 5, 8, 0, 0, SWP_NOSIZE); ShowWindow((HWND)_this->m_hSelectCheat,SW_SHOW); @@ -1377,7 +1377,7 @@ int CALLBACK CCheats::ManageCheatsProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, ShowWindow(GetDlgItem((HWND)hDlg, IDC_STATE),SW_HIDE); } else { - _this->m_AddCheat = (WND_HANDLE)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_Add),(HWND)hDlg,(DLGPROC)CheatAddProc,(LPARAM)_this); + _this->m_AddCheat = (HWND)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_Add),(HWND)hDlg,(DLGPROC)CheatAddProc,(LPARAM)_this); SetWindowPos((HWND)_this->m_AddCheat, HWND_TOP, (rc->right - rc->left)/2, 8, 0, 0, SWP_NOSIZE); ShowWindow((HWND)_this->m_AddCheat,SW_HIDE); @@ -1478,7 +1478,7 @@ int CALLBACK CCheats::ManageCheatsProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, return true; } -bool CCheats::TV_SetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem, TV_CHECK_STATE state) +bool CCheats::TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state) { TVITEM tvItem; @@ -1498,7 +1498,7 @@ bool CCheats::TV_SetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem, TV_CHE return TreeView_SetItem((HWND)hwndTreeView, &tvItem) != 0; } -int CCheats::TV_GetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem) +int CCheats::TV_GetCheckState(HWND hwndTreeView, HWND hItem) { TVITEM tvItem; @@ -1519,7 +1519,7 @@ int CCheats::TV_GetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem) return ((int)(tvItem.state >> 12) -1); } -void CCheats::MenuSetText ( MENU_HANDLE hMenu, int MenuPos, const char * Title, char * ShotCut) { +void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const char * Title, char * ShotCut) { MENUITEMINFO MenuInfo; char String[256]; @@ -1604,7 +1604,7 @@ void CCheats::DeleteCheat(int Index) CSettingTypeCheats::FlushChanges(); } -void CCheats::ChangeChildrenStatus(WND_HANDLE hParent, bool Checked) { +void CCheats::ChangeChildrenStatus(HWND hParent, bool Checked) { HTREEITEM hItem = TreeView_GetChild((HWND)m_hCheatTree, hParent); if (hItem == NULL) { if ((HTREEITEM)hParent == TVI_ROOT) { return; } @@ -1632,13 +1632,13 @@ void CCheats::ChangeChildrenStatus(WND_HANDLE hParent, bool Checked) { } TV_CHECK_STATE state = TV_STATE_UNKNOWN; while (hItem != NULL) { - TV_CHECK_STATE ChildState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,(WND_HANDLE)hItem); + TV_CHECK_STATE ChildState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,(HWND)hItem); if ((ChildState != TV_STATE_CHECKED || !Checked) && (ChildState != TV_STATE_CLEAR || Checked)) { - ChangeChildrenStatus((WND_HANDLE)hItem,Checked); + ChangeChildrenStatus((HWND)hItem,Checked); } - ChildState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,(WND_HANDLE)hItem); + ChildState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,(HWND)hItem); if (state == TV_STATE_UNKNOWN) { state = ChildState; } if (state != ChildState) { state = TV_STATE_INDETERMINATE; } hItem = TreeView_GetNextSibling((HWND)m_hCheatTree,hItem); @@ -1648,29 +1648,29 @@ void CCheats::ChangeChildrenStatus(WND_HANDLE hParent, bool Checked) { } } -void CCheats::CheckParentStatus(WND_HANDLE hParent) { +void CCheats::CheckParentStatus(HWND hParent) { TV_CHECK_STATE CurrentState, InitialState; HTREEITEM hItem; if (!hParent) { return; } hItem = TreeView_GetChild((HWND)m_hCheatTree, (HTREEITEM)hParent); InitialState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,hParent); - CurrentState = (TV_CHECK_STATE)TV_GetCheckState((WND_HANDLE)m_hCheatTree,(WND_HANDLE)hItem); + CurrentState = (TV_CHECK_STATE)TV_GetCheckState((HWND)m_hCheatTree,(HWND)hItem); while (hItem != NULL) { - if (TV_GetCheckState((WND_HANDLE)m_hCheatTree,(WND_HANDLE)hItem) != CurrentState) { + if (TV_GetCheckState((HWND)m_hCheatTree,(HWND)hItem) != CurrentState) { CurrentState = TV_STATE_INDETERMINATE; break; } hItem = TreeView_GetNextSibling((HWND)m_hCheatTree,hItem); } - TV_SetCheckState((WND_HANDLE)m_hCheatTree,(WND_HANDLE)hParent,CurrentState); + TV_SetCheckState((HWND)m_hCheatTree,(HWND)hParent,CurrentState); if (InitialState != CurrentState) { - CheckParentStatus((WND_HANDLE)TreeView_GetParent((HWND)m_hCheatTree,(HTREEITEM)hParent)); + CheckParentStatus((HWND)TreeView_GetParent((HWND)m_hCheatTree,(HTREEITEM)hParent)); } } -stdstr CCheats::ReadCodeString (WND_HANDLE hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat ) { +stdstr CCheats::ReadCodeString (HWND hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat ) { int numlines, linecount, len; char str[128]; int i; @@ -1749,7 +1749,7 @@ stdstr CCheats::ReadCodeString (WND_HANDLE hDlg, bool &validcodes, bool &validop return codestring; } -stdstr CCheats::ReadOptionsString(WND_HANDLE hDlg, bool &/*validcodes*/, bool &validoptions, bool &/*nooptions*/, int &codeformat) +stdstr CCheats::ReadOptionsString(HWND hDlg, bool &/*validcodes*/, bool &validoptions, bool &/*nooptions*/, int &codeformat) { int numlines, linecount, len; char str[128]; diff --git a/Source/Project64/N64 System/Cheat Class.h b/Source/Project64/N64 System/Cheat Class.h index f27a8eec2..177833c08 100644 --- a/Source/Project64/N64 System/Cheat Class.h +++ b/Source/Project64/N64 System/Cheat Class.h @@ -23,14 +23,14 @@ class CCheats { CN64Rom * const _Rom; - static int CALLBACK CheatAddProc ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam ); - static int CALLBACK CheatListProc ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam ); - static int CALLBACK ManageCheatsProc ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam ); - static int CALLBACK CheatsCodeExProc ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam ); - static int CALLBACK CheatsCodeQuantProc ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam ); + static int CALLBACK CheatAddProc ( HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam ); + static int CALLBACK CheatListProc ( HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam ); + static int CALLBACK ManageCheatsProc ( HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam ); + static int CALLBACK CheatsCodeExProc ( HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam); + static int CALLBACK CheatsCodeQuantProc ( HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam); //information about the gui for selecting cheats - WND_HANDLE m_Window, m_hSelectCheat, m_AddCheat, m_hCheatTree, m_hSelectedItem; + HWND m_Window, m_hSelectCheat, m_AddCheat, m_hCheatTree, m_hSelectedItem; void * const m_rcList, * const m_rcAdd; int m_MinSizeDlg, m_MaxSizeDlg; int m_EditCheat; @@ -50,16 +50,16 @@ class CCheats { void LoadPermCheats (void); bool LoadCode ( int CheatNo, LPCSTR CheatString ); - void AddCodeLayers ( int CheatNumber, const stdstr &CheatName, WND_HANDLE hParent, bool CheatActive ); + void AddCodeLayers ( int CheatNumber, const stdstr &CheatName, HWND hParent, bool CheatActive ); //Reload the cheats from the ini file to the select gui void RefreshCheatManager ( void ); - void ChangeChildrenStatus ( WND_HANDLE hParent, bool Checked ); - void CheckParentStatus ( WND_HANDLE hParent ); - static stdstr ReadCodeString ( WND_HANDLE hDlg, bool &validcodes, bool &validoption, bool &nooptions, int &codeformat ); - static stdstr ReadOptionsString( WND_HANDLE hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat ); + void ChangeChildrenStatus ( HWND hParent, bool Checked ); + void CheckParentStatus ( HWND hParent ); + static stdstr ReadCodeString ( HWND hDlg, bool &validcodes, bool &validoption, bool &nooptions, int &codeformat ); + static stdstr ReadOptionsString( HWND hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat ); int ApplyCheatEntry (CMipsMemory * MMU,const CODES & CodeEntry, int CurrentEntry, BOOL Execute ); - void RecordCheatValues ( WND_HANDLE hDlg ); - bool CheatChanged ( WND_HANDLE hDlg ); + void RecordCheatValues ( HWND hDlg ); + bool CheatChanged ( HWND hDlg ); bool IsValid16BitCode ( LPCSTR CheatString ) const; void DeleteCheat(int Index); @@ -68,14 +68,14 @@ class CCheats { static bool CheatUsesCodeExtensions ( const stdstr &LineEntry ); //Working with treeview - static bool TV_SetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem, TV_CHECK_STATE state); - static int TV_GetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem); + static bool TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state); + static int TV_GetCheckState(HWND hwndTreeView, HWND hItem); static DWORD AsciiToHex ( const char * HexValue ); - static void MenuSetText ( MENU_HANDLE hMenu, int MenuPos, const char * Title, char * ShotCut ); + static void MenuSetText ( HMENU hMenu, int MenuPos, const char * Title, char * ShotCut ); //UI Functions - static stdstr GetDlgItemStr (WND_HANDLE hDlg, int nIDDlgItem); + static stdstr GetDlgItemStr (HWND hDlg, int nIDDlgItem); public: CCheats (CN64Rom * const Rom = NULL); @@ -85,6 +85,6 @@ public: void ApplyCheats ( CMipsMemory * MMU ); void ApplyGSButton ( CMipsMemory * MMU ); void LoadCheats ( bool DisableSelected ); - void SelectCheats ( WND_HANDLE hParent, bool BlockExecution ); + void SelectCheats ( HWND hParent, bool BlockExecution ); inline bool CheatsSlectionChanged ( void ) const { return m_CheatSelectionChanged; } }; \ No newline at end of file diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp index 08a82d071..6ff29bf30 100644 --- a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp +++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp @@ -135,7 +135,7 @@ LRESULT CDumpMemory::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, //CDumpMemory::~CDumpMemory() //{ //} -//void CDumpMemory::DisplayDump(WND_HANDLE & hParent) +//void CDumpMemory::DisplayDump(HWND & hParent) //{ // DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_DumpMemory), // (HWND)hParent, (DLGPROC)WinProc,(LPARAM)this); @@ -176,7 +176,7 @@ LRESULT CDumpMemory::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, // } // return Value; //} -//int CALLBACK CDumpMemory::WinProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) +//int CALLBACK CDumpMemory::WinProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) //{ // switch (uMsg) { // case WM_INITDIALOG: @@ -342,7 +342,7 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC, //{ //} // -//void CDumpMemory::DisplayDump(WND_HANDLE & hParent) +//void CDumpMemory::DisplayDump(HWND & hParent) //{ // DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_DumpMemory), // (HWND)hParent, (DLGPROC)WinProc,(LPARAM)this); @@ -387,7 +387,7 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC, // return Value; //} // -//int CALLBACK CDumpMemory::WinProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) +//int CALLBACK CDumpMemory::WinProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) //{ // switch (uMsg) { // case WM_INITDIALOG: diff --git a/Source/Project64/N64 System/Debugger/Debugger - TLB.h b/Source/Project64/N64 System/Debugger/Debugger - TLB.h index 377252ac1..9112dc6f2 100644 --- a/Source/Project64/N64 System/Debugger/Debugger - TLB.h +++ b/Source/Project64/N64 System/Debugger/Debugger - TLB.h @@ -29,23 +29,4 @@ public: virtual ~CDebugTlb(void); void RefreshTLBWindow ( void ); -}; - -//class CDebugTlb -//{ -// CTLB * g_TLB; -// -// //Debugger -// WND_HANDLE m_hDebugWnd; -// void SetupDebugWindow (void); -// static void CreateDebugWindow ( CDebugTlb * _this ); -// friend DWORD CALLBACK DebugWndProc ( WND_HANDLE, DWORD, DWORD, DWORD ); -// -//public: -// CDebugTlb(CTLB * g_TLB); -// ~CDebugTlb(void); -// -// //debugger function -// void ShowTLBWindow ( void ); -// void RefreshTLBWindow ( void ); -//}; +}; \ No newline at end of file diff --git a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp index d3d8a7d25..c485a7500 100644 --- a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp +++ b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp @@ -1484,8 +1484,6 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr ) Call_Direct(AddressOf(&CRegisters::CheckInterrupts),"CRegisters::CheckInterrupts"); AfterCallDirect(m_RegWorkingSet); break; - MoveX86regToVariable(Reg,&g_Reg->VI_ORIGIN_REG,"VI_ORIGIN_REG"); - AndConstToVariable(0xFFFFFF,&g_Reg->VI_ORIGIN_REG,"VI_ORIGIN_REG"); case 0x04600014: MoveX86regToVariable(Reg,&g_Reg->PI_DOMAIN1_REG,"PI_DOMAIN1_REG"); AndConstToVariable(0xFF,&g_Reg->PI_DOMAIN1_REG,"PI_DOMAIN1_REG"); @@ -1874,9 +1872,6 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer ) } lpEP->ContextRecord->Eip = (DWORD)(ReadPos + 4); return EXCEPTION_CONTINUE_EXECUTION; - default: - if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); } - return EXCEPTION_EXECUTE_HANDLER; } if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); } return EXCEPTION_EXECUTE_HANDLER; @@ -2159,7 +2154,6 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) { * Value = 0; return FALSE; } - g_Notify->BreakPoint(__FILE__,__LINE__); break; default: *Value = PAddr & 0xFFFF; diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp index 2e2a4d62d..5e4705fd9 100644 --- a/Source/Project64/N64 System/N64 Class.cpp +++ b/Source/Project64/N64 System/N64 Class.cpp @@ -433,12 +433,12 @@ void CN64System::CloseCpu ( void ) CpuStopped(); } -void CN64System::SelectCheats ( WND_HANDLE hParent ) +void CN64System::SelectCheats ( HWND hParent ) { m_Cheats.SelectCheats(hParent,false); } -void CN64System::DisplayRomInfo ( WND_HANDLE hParent ) { +void CN64System::DisplayRomInfo ( HWND hParent ) { if (!g_Rom) { return; } RomInformation Info(g_Rom); @@ -462,7 +462,7 @@ void CN64System::Pause(void) g_Notify->DisplayMessage(5,MSG_CPU_RESUMED); } -stdstr CN64System::ChooseFileToOpen ( WND_HANDLE hParent ) { +stdstr CN64System::ChooseFileToOpen ( HWND hParent ) { OPENFILENAME openfilename; char FileName[_MAX_PATH],Directory[_MAX_PATH]; diff --git a/Source/Project64/N64 System/N64 Class.h b/Source/Project64/N64 System/N64 Class.h index a1c1335c8..1c7a212f7 100644 --- a/Source/Project64/N64 System/N64 Class.h +++ b/Source/Project64/N64 System/N64 Class.h @@ -48,9 +48,9 @@ public: void CloseCpu ( void ); void ExternalEvent ( SystemEvent action ); //covers gui interacting and timers etc.. - stdstr ChooseFileToOpen ( WND_HANDLE hParent ); - void DisplayRomInfo ( WND_HANDLE hParent ); - void SelectCheats ( WND_HANDLE hParent ); + stdstr ChooseFileToOpen ( HWND hParent ); + void DisplayRomInfo ( HWND hParent ); + void SelectCheats ( HWND hParent ); void StartEmulation ( bool NewThread ); void SyncToAudio ( void ); bool IsDialogMsg ( MSG * msg ); diff --git a/Source/Project64/N64 System/Rom Information Class.cpp b/Source/Project64/N64 System/Rom Information Class.cpp index 46c083a41..1b1072fba 100644 --- a/Source/Project64/N64 System/Rom Information Class.cpp +++ b/Source/Project64/N64 System/Rom Information Class.cpp @@ -38,14 +38,14 @@ RomInformation::~RomInformation(void) { } #include -void RomInformation::DisplayInformation(WND_HANDLE hParent) const { +void RomInformation::DisplayInformation(HWND hParent) const { if (m_FileName.length() == 0) { return; } DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Rom_Information), (HWND)hParent, (DLGPROC)RomInfoProc, (DWORD)this); } -DWORD CALLBACK RomInfoProc (WND_HANDLE hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) { +DWORD CALLBACK RomInfoProc (HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) { switch (uMsg) { case WM_INITDIALOG: { diff --git a/Source/Project64/N64 System/Rom Information Class.h b/Source/Project64/N64 System/Rom Information Class.h index d6194a7a5..6d6f32075 100644 --- a/Source/Project64/N64 System/Rom Information Class.h +++ b/Source/Project64/N64 System/Rom Information Class.h @@ -16,12 +16,12 @@ class RomInformation stdstr const m_FileName; CN64Rom * m_pRomInfo; - friend DWORD CALLBACK RomInfoProc ( WND_HANDLE, DWORD, DWORD, DWORD ); + friend DWORD CALLBACK RomInfoProc ( HWND, DWORD, DWORD, DWORD ); public: RomInformation(const char * RomFile ); RomInformation(CN64Rom * RomInfo ); ~RomInformation(void); - void DisplayInformation (WND_HANDLE hParent) const; + void DisplayInformation (HWND hParent) const; }; \ No newline at end of file diff --git a/Source/Project64/Plugins/GFX plugin.cpp b/Source/Project64/Plugins/GFX plugin.cpp index 03ec1e5d7..44aea8f15 100644 --- a/Source/Project64/Plugins/GFX plugin.cpp +++ b/Source/Project64/Plugins/GFX plugin.cpp @@ -87,8 +87,8 @@ void CGfxPlugin::Init ( const char * FileName ) DrawStatus = (void (__cdecl *)(const char *, BOOL ))GetProcAddress((HMODULE)m_hDll, "DrawFullScreenStatus"); // Rom Browser - GetRomBrowserMenu = (MENU_HANDLE (__cdecl *)( void ))GetProcAddress( (HMODULE)m_hDll, "GetRomBrowserMenu" ); - OnRomBrowserMenuItem = (void (__cdecl *) ( int, WND_HANDLE, BYTE * ))GetProcAddress( (HMODULE)m_hDll, "OnRomBrowserMenuItem" ); + GetRomBrowserMenu = (HMENU (__cdecl *)( void ))GetProcAddress( (HMODULE)m_hDll, "GetRomBrowserMenu" ); + OnRomBrowserMenuItem = (void (__cdecl *) ( int, HWND, BYTE * ))GetProcAddress( (HMODULE)m_hDll, "OnRomBrowserMenuItem" ); //Make sure dll had all needed functions if (ChangeWindow == NULL) { UnloadPlugin(); return; } diff --git a/Source/Project64/Plugins/GFX plugin.h b/Source/Project64/Plugins/GFX plugin.h index 9f49b4e55..8b7e712fa 100644 --- a/Source/Project64/Plugins/GFX plugin.h +++ b/Source/Project64/Plugins/GFX plugin.h @@ -15,19 +15,19 @@ class CGfxPlugin typedef struct { /* Menu */ /* Items should have an ID between 5101 and 5200 */ - MENU_HANDLE hGFXMenu; + HMENU hGFXMenu; void (__cdecl *ProcessMenuItem) ( int ID ); /* Break Points */ BOOL UseBPoints; char BPPanelName[20]; void (__cdecl *Add_BPoint) ( void ); - void (__cdecl *CreateBPPanel) ( WND_HANDLE hDlg, RECT_STRUCT rcBox ); + void (__cdecl *CreateBPPanel) ( HWND hDlg, RECT_STRUCT rcBox ); void (__cdecl *HideBPPanel) ( void ); void (__cdecl *PaintBPPanel) ( WINDOWS_PAINTSTRUCT ps ); void (__cdecl *ShowBPPanel) ( void ); - void (__cdecl *RefreshBpoints) ( WND_HANDLE hList ); - void (__cdecl *RemoveBpoint) ( WND_HANDLE hList, int index ); + void (__cdecl *RefreshBpoints) ( HWND hList ); + void (__cdecl *RemoveBpoint) ( HWND hList, int index ); void (__cdecl *RemoveAllBpoint) ( void ); /* GFX command Window */ @@ -72,10 +72,10 @@ public: void (__cdecl *SoftReset) ( void ); //Rom Browser - MENU_HANDLE (__cdecl * GetRomBrowserMenu) ( void ); /* Items should have an ID between 4101 and 4200 */ - void (__cdecl * OnRomBrowserMenuItem) ( int MenuID, WND_HANDLE hParent, BYTE * HEADER ); + HMENU (__cdecl * GetRomBrowserMenu) ( void ); /* Items should have an ID between 4101 and 4200 */ + void (__cdecl * OnRomBrowserMenuItem) ( int MenuID, HWND hParent, BYTE * HEADER ); - MENU_HANDLE GetDebugMenu (void ) { return m_GFXDebug.hGFXMenu; } + HMENU GetDebugMenu (void ) { return m_GFXDebug.hGFXMenu; } void ProcessMenuItem (int id ); private: diff --git a/Source/Project64/Plugins/RSP Plugin.h b/Source/Project64/Plugins/RSP Plugin.h index 08e383708..319dea817 100644 --- a/Source/Project64/Plugins/RSP Plugin.h +++ b/Source/Project64/Plugins/RSP Plugin.h @@ -15,19 +15,19 @@ class CRSP_Plugin typedef struct { /* Menu */ /* Items should have an ID between 5001 and 5100 */ - MENU_HANDLE hRSPMenu; + HMENU hRSPMenu; void (__cdecl *ProcessMenuItem) ( int ID ); /* Break Points */ BOOL UseBPoints; char BPPanelName[20]; void (__cdecl *Add_BPoint) ( void ); - void (__cdecl *CreateBPPanel) ( MENU_HANDLE hDlg, RECT_STRUCT rcBox ); + void (__cdecl *CreateBPPanel) ( HMENU hDlg, RECT_STRUCT rcBox ); void (__cdecl *HideBPPanel) ( void ); void (__cdecl *PaintBPPanel) ( WINDOWS_PAINTSTRUCT ps ); void (__cdecl *ShowBPPanel) ( void ); - void (__cdecl *RefreshBpoints) ( MENU_HANDLE hList ); - void (__cdecl *RemoveBpoint) ( MENU_HANDLE hList, int index ); + void (__cdecl *RefreshBpoints) ( HMENU hList ); + void (__cdecl *RemoveBpoint) ( HMENU hList, int index ); void (__cdecl *RemoveAllBpoint) ( void ); /* RSP command Window */ @@ -61,7 +61,7 @@ public: DWORD (__cdecl *DoRspCycles) ( DWORD ); void (__cdecl *EnableDebugging) ( BOOL Enable ); - MENU_HANDLE GetDebugMenu (void ) { return m_RSPDebug.hRSPMenu; } + HMENU GetDebugMenu (void ) { return m_RSPDebug.hRSPMenu; } void ProcessMenuItem (int id ); private: diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj new file mode 100644 index 000000000..169c633bc --- /dev/null +++ b/Source/Project64/Project64.vcxproj @@ -0,0 +1,343 @@ + + + + + Beta Release + Win32 + + + Debug + Win32 + + + Release + Win32 + + + + {7E534C8E-1ACE-4A88-8807-39A11ED4DA18} + Project64 + + + + Application + v120_xp + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + false + false + + + + + + BETA_RELEASE;%(PreprocessorDefinitions) + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + + + NotUsing + + + NotUsing + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + User Interface;%(AdditionalIncludeDirectories) + User Interface;%(AdditionalIncludeDirectories) + User Interface;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {3326e128-33af-422c-bb7c-67cc6b915610} + false + + + {731bd205-2826-4631-b7af-117658e88dbc} + false + + + {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} + false + + + {a4d13408-a794-4199-8fc7-4a9a32505005} + false + + + + + + \ No newline at end of file diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters new file mode 100644 index 000000000..8e076f143 --- /dev/null +++ b/Source/Project64/Project64.vcxproj.filters @@ -0,0 +1,843 @@ + + + + + {994eee48-3b61-4493-9a7f-6340a5a47175} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {60e2fd87-7b6b-4147-82fe-e12516efe43c} + + + {305f064d-be0e-418e-a93e-7de72242550e} + + + {7b81a6a8-b20b-464e-8184-864886bb00fd} + + + {bbef87b7-814a-4c87-9713-a07a2de577d4} + + + {19f68e68-7068-4a3c-a11d-c3ff48fe78b2} + + + {89244064-68f5-44d9-9021-7a592d910e43} + + + {94e87bf5-3b11-4f61-8a4a-333690ecf588} + + + {4d3c9ef9-7903-4112-8356-1e7ab2112c20} + + + {2b25c9d1-e1ec-46b6-988a-034edc1fc184} + + + {28ecfeb8-9360-4619-ae95-6f67d66f848d} + + + {9a830b90-21d4-429d-b211-26ab691d6474} + + + {b5142b69-6b3b-4221-a3cb-2c6c0a35e1d7} + + + {242ae4a5-b150-44e6-b31c-027acd6d38b0} + + + {0b08dc3f-d3a6-453b-98ab-169c510f34a5} + + + {547023e2-7478-40d0-9123-eef7659a97ab} + + + {1e3eb4f7-a0b1-4d09-9e50-b5c699f24050} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + {bc88015e-37f7-4320-8aa4-d5043d17a386} + h;hpp;hxx;hm;inl + + + {80441979-1696-4aca-8652-199a9db22d06} + + + {024d5b64-27a9-466b-9388-5c08c5eb5a47} + + + {54e8f51f-d81d-4f8f-b4f1-76584c1b29a5} + + + {81b58fad-f73f-4098-8ebc-ffceaff53478} + + + {838a58e7-e1d2-45d3-bcf0-dcedad19610c} + + + {5531af4d-33bb-4e84-8a55-c971a18ec7bf} + + + {6cfab019-2f8d-4e09-be41-1df513b5a680} + + + {34662870-e7f3-4ab8-8788-a659bf32f764} + + + {4db18f2d-3c89-4a86-adf7-46731ca35087} + + + {c4249d55-df70-4453-b017-b548514ad094} + + + {a3157468-d5a6-4167-b28f-9de5719ec1e9} + + + {d87d7401-c716-40f7-a51b-2d9803936b23} + + + {93ec15cf-1fb2-4095-ae07-95128a67d3df} + + + {21f6da31-289d-4d03-80bb-b77fe60355d7} + + + {53a1d70d-ec39-415a-88eb-70d6b6eaa918} + + + {ef4a164b-c5ed-4469-a0e2-4eb21f800b11} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Settings Files + + + Source Files\Settings Files + + + Source Files\Settings Files + + + Source Files\Settings Files + + + Source Files\Settings Files + + + Source Files\Settings Files + + + Source Files\Settings Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\Settings Files\Setting Types Files + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\Settings Source + + + Source Files\User Interface Source\WTL Controls Source + + + Source Files\User Interface Source\WTL Controls Source + + + Source Files\User Interface Source\Debugger Source + + + Source Files\User Interface Source\Debugger Source + + + Source Files\User Interface Source\Debugger Source + + + Source Files\User Interface Source\Debugger Source + + + Source Files\User Interface Source\Debugger Source + + + Source Files\Multilanguage Source + + + Source Files\N64 System Source + + + Source Files\N64 System Source + + + Source Files\N64 System Source + + + Source Files\N64 System Source + + + Source Files\N64 System Source + + + Source Files\N64 System Source + + + Source Files\N64 System Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\Mips Source + + + Source Files\N64 System Source\C Core Source + + + Source Files\N64 System Source\C Core Source + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Recompiler Files + + + Source Files\N64 System Source\Interpreter Files + + + Source Files\N64 System Source\Interpreter Files + + + Source Files\N64 System Source\Interpreter Files + + + Source Files\Plugin Source + + + Source Files\Plugin Source + + + Source Files\Plugin Source + + + Source Files\Plugin Source + + + Source Files\Plugin Source + + + Source Files\Plugin Source + + + Source Files\3rd Party Source + + + Source Files\3rd Party Source + + + Source Files\3rd Party Source\ZLib Source + + + Source Files\3rd Party Source\ZLib Source + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\Settings Headers + + + Header Files\Settings Headers + + + Header Files\Settings Headers + + + Header Files\Settings Headers + + + Header Files\Settings Headers + + + Header Files\Settings Headers + + + Header Files\Settings Headers + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\Settings Headers\Setting Types Header + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\Settings Header + + + Header Files\User Interface Headers\WTL Controls Headers + + + Header Files\User Interface Headers\WTL Controls Headers + + + Header Files\User Interface Headers\WTL Controls Headers + + + Header Files\User Interface Headers\WTL Controls Headers + + + Header Files\User Interface Headers\WTL Controls Headers + + + Header Files\Multilanguage Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\Mips Headers + + + Header Files\N64 System Headers\C Core Headers + + + Header Files\N64 System Headers\C Core Headers + + + Header Files\N64 System Headers\Debugger Headers + + + Header Files\N64 System Headers\Debugger Headers + + + Header Files\N64 System Headers\Debugger Headers + + + Header Files\N64 System Headers\Debugger Headers + + + Header Files\N64 System Headers\Debugger Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Recompiler Headers + + + Header Files\N64 System Headers\Interpreter Headers + + + Header Files\N64 System Headers\Interpreter Headers + + + Header Files\N64 System Headers\Interpreter Headers + + + Header Files\Plugin Headers + + + Header Files\Plugin Headers + + + Header Files\Plugin Headers + + + Header Files\Plugin Headers + + + Header Files\Plugin Headers + + + Header Files\Plugin Headers + + + Header Files\3rd Party Headers + + + Header Files\3rd Party Headers + + + Header Files\3rd Party Headers + + + Header Files\3rd Party Headers\HTML Help + + + Header Files\3rd Party Headers\Zlib Headers + + + Header Files\3rd Party Headers\Zlib Headers + + + Header Files\3rd Party Headers\Zlib Headers + + + Header Files\3rd Party Headers\Zlib Headers + + + \ No newline at end of file diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp index c295674ea..fe745930b 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp @@ -81,7 +81,7 @@ bool CSettingTypeRomDatabaseSetting::Load ( int /*Index*/, stdstr & /*Value*/ ) } //return the default values -void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, bool & Value ) const +void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__,__LINE__); /*if (m_DefaultSetting != Default_None) @@ -107,7 +107,7 @@ void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, ULONG & Value } } -void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, stdstr & Value ) const +void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { g_Notify->BreakPoint(__FILE__,__LINE__); /*if (m_DefaultSetting != Default_None) @@ -122,7 +122,7 @@ void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, stdstr & Value } //Update the settings -void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, bool Value ) +void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, bool /*Value*/ ) { g_Notify->BreakPoint(__FILE__,__LINE__); /*if (!g_Settings->LoadBool(Setting_RdbEditor)) @@ -169,7 +169,7 @@ void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, const stdstr & /*Valu */ } -void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, const char * Value ) +void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, const char * /*Value*/ ) { g_Notify->BreakPoint(__FILE__,__LINE__); /*if (!g_Settings->LoadBool(Setting_RdbEditor)) diff --git a/Source/Project64/User Interface.h b/Source/Project64/User Interface.h index 359e0ba53..05b97978f 100644 --- a/Source/Project64/User Interface.h +++ b/Source/Project64/User Interface.h @@ -16,13 +16,6 @@ #include "Multilanguage.h" #include "Settings.h" -#define DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name - -DECLARE_HANDLE (WND_HANDLE); -DECLARE_HANDLE (MENU_HANDLE); -DECLARE_HANDLE (DC_HANDLE); - - typedef unsigned char BYTE; typedef unsigned short WORD; typedef unsigned long DWORD; @@ -39,7 +32,7 @@ typedef struct } RECT_STRUCT; typedef struct { - DC_HANDLE hdc; + HDC hdc; int fErase; RECT_STRUCT rcPaint; int fRestore; diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp index cdb277931..02ef8ae11 100644 --- a/Source/Project64/User Interface/Gui Class.cpp +++ b/Source/Project64/User Interface/Gui Class.cpp @@ -17,7 +17,7 @@ void EnterLogOptions(HWND hwndOwner); #pragma comment(lib, "Comctl32.lib") DWORD CALLBACK AboutBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam); -DWORD CALLBACK MainGui_Proc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam); +DWORD CALLBACK MainGui_Proc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam); bool CMainGui::RegisterWinClass ( void ) { WNDCLASS wcl; @@ -156,7 +156,7 @@ void CMainGui::AboutIniBox (void) { DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_About_Ini), (HWND)m_hMainWindow, (DLGPROC)AboutIniBoxProc,(LPARAM)this); } -DWORD CALLBACK AboutIniBoxProc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam, DWORD /*lParam*/) { +DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD /*lParam*/) { static char RDBHomePage[300], CHTHomePage[300], RDXHomePage[300]; switch (uMsg) { @@ -310,13 +310,13 @@ void CMainGui::Caption (LPCSTR Caption) { } void CMainGui::Create (const char * WindowTitle) { - m_hMainWindow = (WND_HANDLE)CreateWindow ("Project64 2.0", WindowTitle, WS_OVERLAPPED | WS_CLIPCHILDREN | + m_hMainWindow = (HWND)CreateWindow ("Project64 2.0", WindowTitle, WS_OVERLAPPED | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_SYSMENU | WS_MINIMIZEBOX,5,5,640,480, NULL,NULL,GetModuleHandle(NULL),this ); } void CMainGui::CreateStatusBar (void) { - m_hStatusWnd = (WND_HANDLE)CreateStatusWindow( WS_CHILD | WS_VISIBLE, "", (HWND)m_hMainWindow, StatusBarID ); + m_hStatusWnd = (HWND)CreateStatusWindow( WS_CHILD | WS_VISIBLE, "", (HWND)m_hMainWindow, StatusBarID ); SendMessage( (HWND)m_hStatusWnd, SB_SETTEXT, 0, (LPARAM)"" ); } @@ -464,7 +464,7 @@ void CMainGui::SaveWindowLoc ( void ) } -DWORD CALLBACK CMainGui::MainGui_Proc (WND_HANDLE hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) { +DWORD CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) { switch (uMsg) { case WM_CREATE: { diff --git a/Source/Project64/User Interface/Gui Class.h b/Source/Project64/User Interface/Gui Class.h index ab50e3c5d..4c54c5d88 100644 --- a/Source/Project64/User Interface/Gui Class.h +++ b/Source/Project64/User Interface/Gui Class.h @@ -71,7 +71,7 @@ public: bool InitiatePlugins ( void ); //Get Window Handle - inline WND_HANDLE GetHandle ( void ) const { return m_hMainWindow; } + inline HWND GetHandle ( void ) const { return m_hMainWindow; } private: CMainGui(void); // Disable default constructor @@ -89,8 +89,8 @@ private: void Resize ( DWORD fwSizeType, WORD nWidth, WORD nHeight ); //responding to WM_SIZE friend DWORD CALLBACK AboutBoxProc ( HWND, DWORD, DWORD, DWORD ); - friend DWORD CALLBACK AboutIniBoxProc ( WND_HANDLE, DWORD, DWORD, DWORD ); - static DWORD CALLBACK MainGui_Proc ( WND_HANDLE, DWORD, DWORD, DWORD ); + friend DWORD CALLBACK AboutIniBoxProc ( HWND, DWORD, DWORD, DWORD ); + static DWORD CALLBACK MainGui_Proc ( HWND, DWORD, DWORD, DWORD ); friend void RomBowserEnabledChanged (CMainGui * Gui); friend void RomBowserColoumnsChanged (CMainGui * Gui); @@ -98,7 +98,7 @@ private: CBaseMenu * m_Menu; - WND_HANDLE m_hMainWindow, m_hStatusWnd; + HWND m_hMainWindow, m_hStatusWnd; DWORD m_ThreadId; #ifdef BETA_RELEASE bool m_hacked; diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp index f4e55b06b..420c46bfc 100644 --- a/Source/Project64/User Interface/Main Menu Class.cpp +++ b/Source/Project64/User Interface/Main Menu Class.cpp @@ -50,7 +50,7 @@ void CMainMenu::SettingsChanged (CMainMenu * _this ) _this->ResetMenu(); } -int CMainMenu::ProcessAccelerator ( WND_HANDLE hWnd, void * lpMsg ) { +int CMainMenu::ProcessAccelerator ( HWND hWnd, void * lpMsg ) { if (m_ResetAccelerators) { m_ResetAccelerators = false; @@ -60,7 +60,7 @@ int CMainMenu::ProcessAccelerator ( WND_HANDLE hWnd, void * lpMsg ) { return TranslateAccelerator((HWND)hWnd,(HACCEL)m_AccelTable,(LPMSG)lpMsg); } -bool CMainMenu::ProcessMessage(WND_HANDLE hWnd, DWORD /*FromAccelerator*/, DWORD MenuID) { +bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuID) { switch (MenuID) { case ID_FILE_OPEN_ROM: { @@ -671,7 +671,7 @@ stdstr CMainMenu::GetSaveSlotString (int Slot) return stdstr_f("%s%s",SlotName.c_str(),LastSaveTime.c_str()) ; } -void CMainMenu::FillOutMenu ( MENU_HANDLE hMenu ) { +void CMainMenu::FillOutMenu ( HMENU hMenu ) { CGuard Guard(m_CS); MENU_ITEM Item; @@ -1199,12 +1199,12 @@ void CMainMenu::ResetMenu(void) { //Create a new window with all the items WriteTrace(TraceDebug,__FUNCTION__ ": Create Menu"); - MENU_HANDLE hMenu = (MENU_HANDLE)CreateMenu(); + HMENU hMenu = (HMENU)CreateMenu(); FillOutMenu(hMenu); WriteTrace(TraceDebug,__FUNCTION__ ": Create Menu Done"); //save old menu to destroy latter - MENU_HANDLE OldMenuHandle; + HMENU OldMenuHandle; { CGuard Guard(m_CS); OldMenuHandle = m_MenuHandle; diff --git a/Source/Project64/User Interface/Main Menu Class.h b/Source/Project64/User Interface/Main Menu Class.h index cc8db595d..a8fa12d83 100644 --- a/Source/Project64/User Interface/Main Menu Class.h +++ b/Source/Project64/User Interface/Main Menu Class.h @@ -64,7 +64,7 @@ class CMainMenu : SettingList m_ChangeSettingList; CriticalSection m_CS; - void FillOutMenu ( MENU_HANDLE hMenu ); + void FillOutMenu ( HMENU hMenu ); //stdstr ShortCutString(MSC_MAP & ShortCuts, int MenuID, CMenuShortCutKey::ACCESS_MODE AccessLevel); stdstr GetSaveSlotString ( int Slot ); stdstr GetFileLastMod ( stdstr FileName ); @@ -75,8 +75,8 @@ public: CMainMenu ( CMainGui * Window ); ~CMainMenu(); - int ProcessAccelerator ( WND_HANDLE hWnd, void * lpMsg ); - bool ProcessMessage ( WND_HANDLE hWnd, DWORD wNotifyCode, DWORD wID); + int ProcessAccelerator ( HWND hWnd, void * lpMsg ); + bool ProcessMessage ( HWND hWnd, DWORD wNotifyCode, DWORD wID); void ResetMenu ( void ); void ResetAccelerators ( void ) { m_ResetAccelerators = true; } }; diff --git a/Source/Project64/User Interface/Menu Class.cpp b/Source/Project64/User Interface/Menu Class.cpp index ff287a16b..569887b18 100644 --- a/Source/Project64/User Interface/Menu Class.cpp +++ b/Source/Project64/User Interface/Menu Class.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" CBaseMenu::CBaseMenu () : - m_MenuHandle((MENU_HANDLE)CreateMenu()) + m_MenuHandle((HMENU)CreateMenu()) { } -bool CBaseMenu::AddMenu(MENU_HANDLE hMenu, MenuItemList Items ) { +bool CBaseMenu::AddMenu(HMENU hMenu, MenuItemList Items ) { if (Items.begin() == Items.end()) { return false; } UINT ItemID, uFlags; @@ -36,7 +36,7 @@ bool CBaseMenu::AddMenu(MENU_HANDLE hMenu, MenuItemList Items ) { ItemID = (UINT)CreatePopupMenu(); uFlags |= MF_POPUP; - AddMenu((MENU_HANDLE)ItemID,*SubMenu); + AddMenu((HMENU)ItemID,*SubMenu); } if (ItemID == ID_PLUGIN_MENU) diff --git a/Source/Project64/User Interface/Menu Class.h b/Source/Project64/User Interface/Menu Class.h index 9928dad43..8f342e696 100644 --- a/Source/Project64/User Interface/Menu Class.h +++ b/Source/Project64/User Interface/Menu Class.h @@ -53,16 +53,16 @@ typedef std::list MenuItemList; class CBaseMenu { protected: - MENU_HANDLE m_MenuHandle; + HMENU m_MenuHandle; - bool AddMenu ( MENU_HANDLE hMenu, MenuItemList Items ); + bool AddMenu ( HMENU hMenu, MenuItemList Items ); public: CBaseMenu (); - virtual int ProcessAccelerator(WND_HANDLE hWnd, void * lpMsg ) = 0; // pure virtual draw() function - virtual bool ProcessMessage(WND_HANDLE hWnd, DWORD wNotifyCode, DWORD wID) = 0; // pure virtual draw() function + virtual int ProcessAccelerator(HWND hWnd, void * lpMsg ) = 0; // pure virtual draw() function + virtual bool ProcessMessage(HWND hWnd, DWORD wNotifyCode, DWORD wID) = 0; // pure virtual draw() function virtual void ResetMenu(void) = 0; // pure virtual draw() function - MENU_HANDLE GetHandle (void) { return m_MenuHandle; } + HMENU GetHandle (void) { return m_MenuHandle; } }; diff --git a/Source/Project64/User Interface/Rom Browser Class.cpp b/Source/Project64/User Interface/Rom Browser Class.cpp index 481f4ed5d..c4f46650a 100644 --- a/Source/Project64/User Interface/Rom Browser Class.cpp +++ b/Source/Project64/User Interface/Rom Browser Class.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -CRomBrowser::CRomBrowser (WND_HANDLE & MainWindow, WND_HANDLE & StatusWindow ) : +CRomBrowser::CRomBrowser (HWND & MainWindow, HWND & StatusWindow ) : m_MainWindow(MainWindow), m_StatusWindow(StatusWindow), m_RefreshThread(NULL), @@ -365,7 +365,7 @@ DWORD CRomBrowser::AsciiToHex (char * HexValue) { void CRomBrowser::CreateRomListControl (void) { - m_hRomList = (WND_HANDLE)CreateWindowEx( WS_EX_CLIENTEDGE,WC_LISTVIEW,NULL, + m_hRomList = (HWND)CreateWindowEx( WS_EX_CLIENTEDGE,WC_LISTVIEW,NULL, WS_TABSTOP | WS_VISIBLE | WS_CHILD | LVS_OWNERDRAWFIXED | WS_BORDER | LVS_SINGLESEL | LVS_REPORT, 0,0,0,0,(HWND)m_MainWindow,(HMENU)IDC_ROMLIST,GetModuleHandle(NULL),NULL); @@ -937,7 +937,7 @@ void CRomBrowser::LoadRomList (void) { RomList_SortList(); } -void CRomBrowser::MenuSetText ( MENU_HANDLE hMenu, int MenuPos, const char * Title, char * ShotCut) { +void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const char * Title, char * ShotCut) { MENUITEMINFO MenuInfo; char String[256]; @@ -1368,7 +1368,7 @@ void CRomBrowser::RomList_PopupMenu(DWORD /*pnmh*/) //Load the menu HMENU hMenu = LoadMenu(GetModuleHandle(NULL),MAKEINTRESOURCE(IDR_POPUP)); - MENU_HANDLE hPopupMenu = (MENU_HANDLE)GetSubMenu(hMenu,0); + HMENU hPopupMenu = (HMENU)GetSubMenu(hMenu,0); //Fix up menu MenuSetText(hPopupMenu, 0, GS(POPUP_PLAY), NULL); @@ -1502,7 +1502,7 @@ void CRomBrowser::SaveRomListColoumnInfo(void) { WriteTrace(TraceDebug,__FUNCTION__ ": Done"); } -int CALLBACK CRomBrowser::SelectRomDirCallBack(WND_HANDLE hwnd,DWORD uMsg,DWORD /*lp*/, DWORD lpData) +int CALLBACK CRomBrowser::SelectRomDirCallBack(HWND hwnd,DWORD uMsg,DWORD /*lp*/, DWORD lpData) { switch(uMsg) { @@ -1738,7 +1738,6 @@ void CRomBrowser::WatchRomDirChanged ( CRomBrowser * _this ) } WriteTrace(TraceDebug,__FUNCTION__ ": 5d"); } - WriteTrace(TraceDebug,__FUNCTION__ ": 5e"); } catch (...) { diff --git a/Source/Project64/User Interface/Rom Browser.h b/Source/Project64/User Interface/Rom Browser.h index b168015d3..4ee96ac82 100644 --- a/Source/Project64/User Interface/Rom Browser.h +++ b/Source/Project64/User Interface/Rom Browser.h @@ -130,9 +130,9 @@ class CRomBrowser typedef std::vector ROMINFO_LIST; - WND_HANDLE & m_MainWindow; - WND_HANDLE & m_StatusWindow; - WND_HANDLE m_hRomList; + HWND & m_MainWindow; + HWND & m_StatusWindow; + HWND m_hRomList; ROMBROWSER_FIELDS_LIST m_Fields; FIELD_TYPE_LIST m_FieldType; ROMINFO_LIST m_RomInfo; @@ -163,7 +163,7 @@ class CRomBrowser static int GetCicChipID ( BYTE * RomData ); bool LoadDataFromRomFile ( char * FileName, BYTE * Data,int DataLen, int * RomSize, FILE_FORMAT & FileFormat ); void LoadRomList ( void ); - void MenuSetText ( MENU_HANDLE hMenu, int MenuPos, const char * Title, char * ShotCut); + void MenuSetText ( HMENU hMenu, int MenuPos, const char * Title, char * ShotCut); void SaveRomList ( strlist & FileList ); void RomList_ColoumnSortList ( DWORD pnmh ); void RomList_GetDispInfo ( DWORD pnmh ); @@ -187,11 +187,11 @@ class CRomBrowser static void AddField (ROMBROWSER_FIELDS_LIST & Fields, LPCSTR Name, int Pos,int ID,int Width,LanguageStringID LangID, bool UseDefault); //Callback - static int CALLBACK SelectRomDirCallBack ( WND_HANDLE hwnd,DWORD uMsg,DWORD lp, DWORD lpData ); + static int CALLBACK SelectRomDirCallBack ( HWND hwnd,DWORD uMsg,DWORD lp, DWORD lpData ); static int CALLBACK RomList_CompareItems ( DWORD lParam1, DWORD lParam2, DWORD lParamSort ); public: - CRomBrowser ( WND_HANDLE & hMainWindow, WND_HANDLE & StatusWindow ); + CRomBrowser ( HWND & hMainWindow, HWND & StatusWindow ); ~CRomBrowser ( void ); void HighLightLastRom ( void ); void HideRomList ( void ); diff --git a/Source/Project64/WTL App.h b/Source/Project64/WTL App.h index 2fcd5a9b5..cfda490a8 100644 --- a/Source/Project64/WTL App.h +++ b/Source/Project64/WTL App.h @@ -11,8 +11,14 @@ #pragma once //#define _WIN32_WINNT 0x0500 +#define _ATL_DISABLE_NOTHROW_NEW +#include #include -#include + +#pragma warning(push) +#pragma warning(disable : 4996) // warning C4996: 'GetVersionExA': was declared deprecated +#include +#pragma warning(pop) class CPj64Module : public CAppModule diff --git a/Source/RSP/RSP.vcxproj b/Source/RSP/RSP.vcxproj new file mode 100644 index 000000000..93fc2fb4a --- /dev/null +++ b/Source/RSP/RSP.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1} + RSP + + + + DynamicLibrary + v120 + + + DynamicLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + RSP_d 1.7 + $(SolutionDir)Plugin\RSP\ + + + + + + + + true + + + + + + + + $(Root)Plugin/RSP/RSP 1.7.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} + false + + + {8b9961b1-88d9-4ea3-a752-507a00dd9f3d} + false + + + + + + \ No newline at end of file diff --git a/Source/RSP/RSP.vcxproj.filters b/Source/RSP/RSP.vcxproj.filters new file mode 100644 index 000000000..8c3d284fa --- /dev/null +++ b/Source/RSP/RSP.vcxproj.filters @@ -0,0 +1,134 @@ + + + + + {efc57297-d491-4393-82bc-c7d7522164e4} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {0baf5ca2-d686-4cb5-b3d2-1617c3b17dc0} + h;hpp;hxx;hm;inl + + + {d213ff3a-6660-487a-9efc-5f05821cef48} + + + {53b9495d-f564-4b1d-968c-42c816ca2d41} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + Header Files\RSP Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/Source/RSP/X86.c b/Source/RSP/X86.c index 5314bb3da..7e82771bc 100644 --- a/Source/RSP/X86.c +++ b/Source/RSP/X86.c @@ -809,9 +809,9 @@ void Cwde(void) { PUTDST8(RecompPos, 0x98); } -void DecX86reg(x86Reg) { - CPU_Message(" dec %s",x86_Name(x86Reg)); - switch (x86Reg) { +void DecX86reg(int x86reg) { + CPU_Message(" dec %s", x86_Name(x86reg)); + switch (x86reg) { case x86_EAX: PUTDST16(RecompPos,0xC8FF); break; case x86_EBX: PUTDST16(RecompPos,0xCBFF); break; case x86_ECX: PUTDST16(RecompPos,0xC9FF); break; diff --git a/Source/Settings/Settings.vcxproj b/Source/Settings/Settings.vcxproj new file mode 100644 index 000000000..28edee0de --- /dev/null +++ b/Source/Settings/Settings.vcxproj @@ -0,0 +1,60 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {8B9961B1-88D9-4EA3-A752-507A00DD9F3D} + Settings + + + + StaticLibrary + v120 + + + StaticLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Settings/Settings.vcxproj.filters b/Source/Settings/Settings.vcxproj.filters new file mode 100644 index 000000000..f664b9c0d --- /dev/null +++ b/Source/Settings/Settings.vcxproj.filters @@ -0,0 +1,23 @@ + + + + + {891241b1-ca4e-4637-b7bb-01ed0dbea256} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {ecd62392-723f-4db7-aa1f-6e688cfb2e1a} + h;hpp;hxx;hm;inl + + + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/Source/SortRdb/SortRdb.vcxproj b/Source/SortRdb/SortRdb.vcxproj new file mode 100644 index 000000000..255f33ece --- /dev/null +++ b/Source/SortRdb/SortRdb.vcxproj @@ -0,0 +1,71 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {5788717F-E3D4-40CF-9637-3A2AEE85BB81} + SortRdb + Win32Proj + + + + Application + v120 + + + Application + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + + Level4 + + + Console + + + + + + + + Console + + + + + + + + {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} + false + + + + + + \ No newline at end of file diff --git a/Source/SortRdb/SortRdb.vcxproj.filters b/Source/SortRdb/SortRdb.vcxproj.filters new file mode 100644 index 000000000..a5aaa3f23 --- /dev/null +++ b/Source/SortRdb/SortRdb.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + \ No newline at end of file diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj new file mode 100644 index 000000000..ca7950473 --- /dev/null +++ b/Source/nragev20/NRage_Input_V2.vcxproj @@ -0,0 +1,104 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {FD617E80-9E40-4138-85DA-B94633972E6A} + NRage_Input_V2 + + + + DynamicLibrary + v120 + + + DynamicLibrary + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + + $(Root)Source\3rd Party\directx\include;%(AdditionalIncludeDirectories) + + Level3 + + + xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies) + $(Root)Plugin/Input/NRage_Input_V2_d.dll + $(Root)Source\3rd Party\directx\lib;%(AdditionalLibraryDirectories) + + + + + $(Root)Source\3rd Party\directx\include;%(AdditionalIncludeDirectories) + + Level3 + + + xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies) + $(Root)Plugin/Input/NRage_Input_V2.dll + $(Root)Source\3rd Party\directx\lib;%(AdditionalLibraryDirectories) + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/nragev20/NRage_Input_V2.vcxproj.filters b/Source/nragev20/NRage_Input_V2.vcxproj.filters new file mode 100644 index 000000000..2f1dfd4bc --- /dev/null +++ b/Source/nragev20/NRage_Input_V2.vcxproj.filters @@ -0,0 +1,103 @@ + + + + + {d605fa72-86f1-484f-ae67-9d7561e0d9ca} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {dc26775d-8e36-4858-a40e-8e07fdbc831f} + h;hpp;hxx;hm;inl + + + {2bcd7a7e-5013-4acc-88b4-a6a04c432ef3} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file