diff --git a/Src/Agave/Component/ifc_wa5component.h b/Src/Agave/Component/ifc_wa5component.h index fb0a1b548..59210b374 100644 --- a/Src/Agave/Component/ifc_wa5component.h +++ b/Src/Agave/Component/ifc_wa5component.h @@ -5,7 +5,7 @@ class api_service; #ifdef WIN32 -#include +#include #endif class NOVTABLE ifc_wa5component : public Dispatchable diff --git a/Src/Components/wac_browser/wac_browser.vcxproj b/Src/Components/wac_browser/wac_browser.vcxproj index d9ca824ea..a20b86a1d 100644 --- a/Src/Components/wac_browser/wac_browser.vcxproj +++ b/Src/Components/wac_browser/wac_browser.vcxproj @@ -215,24 +215,24 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\Build\Winamp_$(PlatformShortName true - x86-windows-static-md + x86-arch-static-md true - x86-windows-static-md + x86-arch-static-md true - x86-windows-static-md + x86-arch-static-md true - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Components/wac_downloadManager/DownloadCallbackT.h b/Src/Components/wac_downloadManager/DownloadCallbackT.h index f0d46f6a9..9f9c61e5f 100644 --- a/Src/Components/wac_downloadManager/DownloadCallbackT.h +++ b/Src/Components/wac_downloadManager/DownloadCallbackT.h @@ -5,7 +5,7 @@ #define WIN32_LEAN_AND_MEAN -//#include // for InterlockedIncrememt/Decrement +//#include // for InterlockedIncrememt/Decrement #include /* DownloadCallbackT is reference counted for you. if you don't like that, inherit from ifc_downloadManagerCallback yourself */ diff --git a/Src/Components/wac_downloadManager/wac_downloadManager.vcxproj b/Src/Components/wac_downloadManager/wac_downloadManager.vcxproj index 4238f73ba..7f9a11d3e 100644 --- a/Src/Components/wac_downloadManager/wac_downloadManager.vcxproj +++ b/Src/Components/wac_downloadManager/wac_downloadManager.vcxproj @@ -117,13 +117,13 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\Build\Winamp_$(PlatformShortName true - x86-windows-static-md + x86-arch-static-md true - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Components/wac_network/netinc.h b/Src/Components/wac_network/netinc.h index d2892bc24..c599f5e44 100644 --- a/Src/Components/wac_network/netinc.h +++ b/Src/Components/wac_network/netinc.h @@ -15,7 +15,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #include #include #include diff --git a/Src/Components/wac_network/wac_network.vcxproj b/Src/Components/wac_network/wac_network.vcxproj index 53ca29d50..068cbb98a 100644 --- a/Src/Components/wac_network/wac_network.vcxproj +++ b/Src/Components/wac_network/wac_network.vcxproj @@ -233,24 +233,24 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\Build\Winamp_$(PlatformShortName false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Components/wac_playlists/wac_playlists.vcxproj b/Src/Components/wac_playlists/wac_playlists.vcxproj index b84db0d15..a7feb06c5 100644 --- a/Src/Components/wac_playlists/wac_playlists.vcxproj +++ b/Src/Components/wac_playlists/wac_playlists.vcxproj @@ -98,16 +98,16 @@ .w5s - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Elevator/Elevator.vcxproj b/Src/Elevator/Elevator.vcxproj index 12e039cdf..d4df3c256 100644 --- a/Src/Elevator/Elevator.vcxproj +++ b/Src/Elevator/Elevator.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Elevator/ElevatorPS.vcxproj b/Src/Elevator/ElevatorPS.vcxproj index 54c6e2e0c..3351e49f2 100644 --- a/Src/Elevator/ElevatorPS.vcxproj +++ b/Src/Elevator/ElevatorPS.vcxproj @@ -93,26 +93,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Elevator/FileTypeRegistrar.cpp b/Src/Elevator/FileTypeRegistrar.cpp index e56da01b4..35c079040 100644 --- a/Src/Elevator/FileTypeRegistrar.cpp +++ b/Src/Elevator/FileTypeRegistrar.cpp @@ -1,5 +1,5 @@ #include "FileTypeRegistrar.h" -#include +#include #include #include #include diff --git a/Src/Mastering/Winamp/talkback.ini b/Src/Mastering/Winamp/talkback.ini index af5e27c6e..fadb8a841 100644 --- a/Src/Mastering/Winamp/talkback.ini +++ b/Src/Mastering/Winamp/talkback.ini @@ -36,14 +36,14 @@ ServerAddress0 = 1, "http://aoldiag2.aol.com/spiral-bin/Collector.dll" NubCollectors = UIProcess, CommandLine, StackDump, ModuleList, MemoryStatus, ProcessList95, ProcessListNT, ExceptionType, Registers, PCMemory, PC, StackTrace, ThreadList95, ThreadListNT, ThreadRegisters, ThreadStackDump, ThreadIDList, ThreadIDTrigger, ThreadStackTrace, Trigger, TriggerTime UIProcess = 0xa000000f, "SWin32 UI Process" CommandLine = 0xa000000d, "SWin32 Command Line" -StackDump = 0xa0000001, "SDump of Stack windows", 4096 +StackDump = 0xa0000001, "SDump of Stack arch", 4096 ModuleList = 0xa0000003, "SLoaded Module list Win32" MemoryStatus = 0xa000000b, "SWin32 MEMORYSTATUS struct" ProcessList95 = 0xa0000009, "SWindows 95 process list" ProcessListNT = 0xa0000007, "SWindows NT process list" ExceptionType = 0xa0000004, "SWin32 Processor exception type" Registers = 0xa0000000, "SWin32 x86 registers" -PCMemory = 0xa000000a, "SCode memory windows", 32, 64 +PCMemory = 0xa000000a, "SCode memory arch", 32, 64 PC = 0xa0000002, "SPC at time of crash" StackTrace = 0xa0000005, "SWin32 stack trace" ThreadList95 = 0xa0000008, "SWindows 95 thread list" diff --git a/Src/Plugins/DSP/dsp_sc/Include/c_wavein.h b/Src/Plugins/DSP/dsp_sc/Include/c_wavein.h index 7bcac3cbf..d6fa06bbe 100644 --- a/Src/Plugins/DSP/dsp_sc/Include/c_wavein.h +++ b/Src/Plugins/DSP/dsp_sc/Include/c_wavein.h @@ -1,7 +1,7 @@ #ifndef __C_WAVEIN_H__ #define __C_WAVEIN_H__ -#include +#include #include #define EXIT_ON_ERROR(hr) \ if (FAILED(hr)) { goto Exit; } diff --git a/Src/Plugins/DSP/dsp_sc/NSIS/dsp_sc_v2.nsi b/Src/Plugins/DSP/dsp_sc/NSIS/dsp_sc_v2.nsi index 9a9adeacf..96bdda5fd 100644 --- a/Src/Plugins/DSP/dsp_sc/NSIS/dsp_sc_v2.nsi +++ b/Src/Plugins/DSP/dsp_sc/NSIS/dsp_sc_v2.nsi @@ -24,7 +24,7 @@ BrandingText "${NAME} v${VERSION} Build ${BUILD}" InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Winamp" "UninstallString" ; The file to write -OutFile "shoutcast-dsp-2-4-2-windows.exe" +OutFile "shoutcast-dsp-2-4-2-arch.exe" ; The default installation directory InstallDir "$PROGRAMFILES32\Winamp" diff --git a/Src/Plugins/DSP/dsp_sc/dsp_sc.vcxproj b/Src/Plugins/DSP/dsp_sc/dsp_sc.vcxproj index 6e842b13f..d512d08f0 100644 --- a/Src/Plugins/DSP/dsp_sc/dsp_sc.vcxproj +++ b/Src/Plugins/DSP/dsp_sc/dsp_sc.vcxproj @@ -109,16 +109,16 @@ Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/Plugins/DSP/dsp_sc/main.cpp b/Src/Plugins/DSP/dsp_sc/main.cpp index 8a3236c19..32b68252f 100644 --- a/Src/Plugins/DSP/dsp_sc/main.cpp +++ b/Src/Plugins/DSP/dsp_sc/main.cpp @@ -12,7 +12,7 @@ #define APP_VersionW L"2.4.2" #define APP_Build "449" -#include +#include #include #include #include @@ -2277,7 +2277,7 @@ public: size--; } - // e.g. dsp_sc,2.3.4.210,http://download.nullsoft.com/shoutcast/tools/shoutcast-dsp-2-3-4-windows.exe + // e.g. dsp_sc,2.3.4.210,http://download.nullsoft.com/shoutcast/tools/shoutcast-dsp-2-3-4-arch.exe if ( p && *p ) { char *tok = strtok( p, "," ); diff --git a/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder.cpp b/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder.cpp index a2a3f2feb..fc83ea6e7 100644 --- a/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder.cpp +++ b/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder.cpp @@ -1,4 +1,4 @@ -#include +#include #include "c_encoder.h" C_ENCODER::C_ENCODER(int ExtInfoSize) { diff --git a/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_mp3dll.h b/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_mp3dll.h index 05beb05ee..cc2512fb8 100644 --- a/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_mp3dll.h +++ b/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_mp3dll.h @@ -5,7 +5,7 @@ #include "c_encoder.h" #include "../lame/include/lame.h" #include "../lame/libmp3lame/lame_global_flags.h" -#include +#include // Defaults for this encoder #define MP3_DEFAULT_INPUTSAMPLERATE 44100 diff --git a/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_nsv.h b/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_nsv.h index 14adca085..6aa3a920d 100644 --- a/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_nsv.h +++ b/Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_nsv.h @@ -6,7 +6,7 @@ #include "c_encoder.h" #include "enc_if.h" -#include +#include #include #include "../../Resource/resource.h" diff --git a/Src/Plugins/DSP/dsp_sc/sc2srclib/Include/c_jobmanager.h b/Src/Plugins/DSP/dsp_sc/sc2srclib/Include/c_jobmanager.h index c7feacc96..963360283 100644 --- a/Src/Plugins/DSP/dsp_sc/sc2srclib/Include/c_jobmanager.h +++ b/Src/Plugins/DSP/dsp_sc/sc2srclib/Include/c_jobmanager.h @@ -8,7 +8,7 @@ #include // for mutex support #define T_MUTEX HANDLE #else // _WIN32 -#error "This won't compile under anything other than windows since I haven't implemented mutexing on anything else" +#error "This won't compile under anything other than arch since I haven't implemented mutexing on anything else" #endif // _WIN32 template class C_JOBMANAGER { diff --git a/Src/Plugins/DSP/dsp_sc/sc2srclib/shoutcast_output.cpp b/Src/Plugins/DSP/dsp_sc/sc2srclib/shoutcast_output.cpp index 17e05b8b4..6a223bfac 100644 --- a/Src/Plugins/DSP/dsp_sc/sc2srclib/shoutcast_output.cpp +++ b/Src/Plugins/DSP/dsp_sc/sc2srclib/shoutcast_output.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "../api.h" #include "Include/shoutcast_output.h" diff --git a/Src/Plugins/DSP/dsp_sc/utils.cpp b/Src/Plugins/DSP/dsp_sc/utils.cpp index 809234df8..0c80179f3 100644 --- a/Src/Plugins/DSP/dsp_sc/utils.cpp +++ b/Src/Plugins/DSP/dsp_sc/utils.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "utils.h" #include "api.h" diff --git a/Src/Plugins/DSP/dsp_sps/dsp_sps.cpp b/Src/Plugins/DSP/dsp_sps/dsp_sps.cpp index 3c9323d8a..197df3cc2 100644 --- a/Src/Plugins/DSP/dsp_sps/dsp_sps.cpp +++ b/Src/Plugins/DSP/dsp_sps/dsp_sps.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "../winamp/dsp.h" #include "resource.h" diff --git a/Src/Plugins/DSP/dsp_sps/dsp_sps.vcxproj b/Src/Plugins/DSP/dsp_sps/dsp_sps.vcxproj index 897568f09..dd360880f 100644 --- a/Src/Plugins/DSP/dsp_sps/dsp_sps.vcxproj +++ b/Src/Plugins/DSP/dsp_sps/dsp_sps.vcxproj @@ -90,17 +90,17 @@ Debug - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.dsp b/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.dsp index e35a6a76b..322b0f9f3 100644 --- a/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.dsp +++ b/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.dsp @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib DMOGUIDS.LIB winmm.lib comdlg32.lib /nologo /entry:"DllEntryPoint@12" /subsystem:windows /dll /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /libpath:"../../dshow" /opt:nowin98 +# ADD BASE LINK32 /nologo /subsystem:arch /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib DMOGUIDS.LIB winmm.lib comdlg32.lib /nologo /entry:"DllEntryPoint@12" /subsystem:arch /dll /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /libpath:"../../dshow" /opt:nowin98 # SUBTRACT LINK32 /pdb:none # Begin Custom Build - Custom Build Steps OutDir=.\Release @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib DMOGUIDS.LIB winmm.lib comdlg32.lib /nologo /entry:"DllEntryPoint@12" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /pdbtype:sept /libpath:"../../dshow" +# ADD BASE LINK32 /nologo /subsystem:arch /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib DMOGUIDS.LIB winmm.lib comdlg32.lib /nologo /entry:"DllEntryPoint@12" /subsystem:arch /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /pdbtype:sept /libpath:"../../dshow" # Begin Custom Build - Custom Build Steps OutDir=.\Debug TargetName=AudioPlugIn diff --git a/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.mak b/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.mak index 09d2403e1..7ee84eb1f 100644 --- a/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.mak +++ b/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.mak @@ -97,7 +97,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\AudioPlugIn.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib \build\sdks\dxmedia\lib\DMOGUIDS.LIB winmm.lib /nologo /entry:"DllEntryPoint@12" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\AudioPlugIn.pdb" /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /def:".\AudioPlugIn.def" /out:"$(OUTDIR)\AudioPlugIn.dll" /implib:"$(OUTDIR)\AudioPlugIn.lib" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib \build\sdks\dxmedia\lib\DMOGUIDS.LIB winmm.lib /nologo /entry:"DllEntryPoint@12" /subsystem:arch /dll /incremental:no /pdb:"$(OUTDIR)\AudioPlugIn.pdb" /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /def:".\AudioPlugIn.def" /out:"$(OUTDIR)\AudioPlugIn.dll" /implib:"$(OUTDIR)\AudioPlugIn.lib" DEF_FILE= \ ".\AudioPlugIn.def" LINK32_OBJS= \ @@ -203,7 +203,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\AudioPlugIn.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib \build\sdks\dxmedia\lib\DMOGUIDS.LIB winmm.lib /nologo /entry:"DllEntryPoint@12" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\AudioPlugIn.pdb" /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /def:".\AudioPlugIn.def" /out:"$(OUTDIR)\AudioPlugIn.dll" /implib:"$(OUTDIR)\AudioPlugIn.lib" /pdbtype:sept +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib \build\sdks\dxmedia\lib\DMOGUIDS.LIB winmm.lib /nologo /entry:"DllEntryPoint@12" /subsystem:arch /dll /incremental:yes /pdb:"$(OUTDIR)\AudioPlugIn.pdb" /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /def:".\AudioPlugIn.def" /out:"$(OUTDIR)\AudioPlugIn.dll" /implib:"$(OUTDIR)\AudioPlugIn.lib" /pdbtype:sept DEF_FILE= \ ".\AudioPlugIn.def" LINK32_OBJS= \ diff --git a/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.rc b/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.rc index 38ba0bd74..276e87e9b 100644 --- a/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.rc +++ b/Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include \r\n" + "#include \r\n" "\0" END diff --git a/Src/Plugins/DSP/dsp_sps/dxi/StdAfx.h b/Src/Plugins/DSP/dsp_sps/dxi/StdAfx.h index 7af620530..1ff774f22 100644 --- a/Src/Plugins/DSP/dsp_sps/dxi/StdAfx.h +++ b/Src/Plugins/DSP/dsp_sps/dxi/StdAfx.h @@ -12,8 +12,8 @@ #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers -#include -#include +#include +#include #ifdef _DEBUG #define DEBUG // the DirectShow headers use this symbol diff --git a/Src/Plugins/DSP/dsp_sps/dxi/include/CakeMedParam.h b/Src/Plugins/DSP/dsp_sps/dxi/include/CakeMedParam.h index 0ecf149a8..5e62a63c2 100644 --- a/Src/Plugins/DSP/dsp_sps/dxi/include/CakeMedParam.h +++ b/Src/Plugins/DSP/dsp_sps/dxi/include/CakeMedParam.h @@ -24,7 +24,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/Plugins/DSP/dsp_sps/sps_common.cpp b/Src/Plugins/DSP/dsp_sps/sps_common.cpp index 1e8df30b9..c6ee9eca1 100644 --- a/Src/Plugins/DSP/dsp_sps/sps_common.cpp +++ b/Src/Plugins/DSP/dsp_sps/sps_common.cpp @@ -1,4 +1,4 @@ -#include +#include #include "resource.h" #include "..\..\..\winamp\dsp.h" #include "sps_common.h" diff --git a/Src/Plugins/Encoder/enc_fhgaac/config.cpp b/Src/Plugins/Encoder/enc_fhgaac/config.cpp index e899b0524..1df222c81 100644 --- a/Src/Plugins/Encoder/enc_fhgaac/config.cpp +++ b/Src/Plugins/Encoder/enc_fhgaac/config.cpp @@ -1,5 +1,5 @@ #include "config.h" -#include +#include #include #include #include "mp4FastAAClib.h" diff --git a/Src/Plugins/Encoder/enc_fhgaac/config.h b/Src/Plugins/Encoder/enc_fhgaac/config.h index 5a7dc0094..4bd63c464 100644 --- a/Src/Plugins/Encoder/enc_fhgaac/config.h +++ b/Src/Plugins/Encoder/enc_fhgaac/config.h @@ -1,7 +1,7 @@ #pragma once #include "mp4FastAAClib.h" -#include // or MAX_PATH +#include // or MAX_PATH #define ENCODER_TYPE_MPEG4 (mmioFOURCC('A','A','C','f')) diff --git a/Src/Plugins/Encoder/enc_fhgaac/link_control.cpp b/Src/Plugins/Encoder/enc_fhgaac/link_control.cpp index 5f34f40b8..fb1364d90 100644 --- a/Src/Plugins/Encoder/enc_fhgaac/link_control.cpp +++ b/Src/Plugins/Encoder/enc_fhgaac/link_control.cpp @@ -1,4 +1,4 @@ -#include +#include #include "link_control.h" static HCURSOR link_hand_cursor; diff --git a/Src/Plugins/Encoder/enc_fhgaac/link_control.h b/Src/Plugins/Encoder/enc_fhgaac/link_control.h index a9008d48d..9901548d8 100644 --- a/Src/Plugins/Encoder/enc_fhgaac/link_control.h +++ b/Src/Plugins/Encoder/enc_fhgaac/link_control.h @@ -1,5 +1,5 @@ #pragma once -#include +#include extern "C" { void link_startsubclass(HWND hwndDlg, UINT id); diff --git a/Src/Plugins/Encoder/enc_fhgaac/main.cpp b/Src/Plugins/Encoder/enc_fhgaac/main.cpp index 90fefb2a1..a4e4c5635 100644 --- a/Src/Plugins/Encoder/enc_fhgaac/main.cpp +++ b/Src/Plugins/Encoder/enc_fhgaac/main.cpp @@ -2,7 +2,7 @@ #pragma message(__FILE__": telling linker to ignore libmmd.lib") #include "FhGAACEncoder.h" -#include +#include #include #include #include "../nsv/enc_if.h" diff --git a/Src/Plugins/Encoder/enc_fhgaac/preferences.h b/Src/Plugins/Encoder/enc_fhgaac/preferences.h index 0ed9cabca..189aa9eb9 100644 --- a/Src/Plugins/Encoder/enc_fhgaac/preferences.h +++ b/Src/Plugins/Encoder/enc_fhgaac/preferences.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "config.h" extern HINSTANCE enc_fhg_HINST; diff --git a/Src/Plugins/Encoder/enc_fhgaac/preferences_adts.cpp b/Src/Plugins/Encoder/enc_fhgaac/preferences_adts.cpp index 88231e5a6..f7e0daff2 100644 --- a/Src/Plugins/Encoder/enc_fhgaac/preferences_adts.cpp +++ b/Src/Plugins/Encoder/enc_fhgaac/preferences_adts.cpp @@ -2,7 +2,7 @@ #include "config.h" #include "preferences.h" #include "../Winamp/wa_ipc.h" -#include +#include #include #include "resource.h" #include "link_control.h" diff --git a/Src/Plugins/Encoder/enc_fhgaac/preferences_mp4.cpp b/Src/Plugins/Encoder/enc_fhgaac/preferences_mp4.cpp index 7f06dfb08..e6e9d48d9 100644 --- a/Src/Plugins/Encoder/enc_fhgaac/preferences_mp4.cpp +++ b/Src/Plugins/Encoder/enc_fhgaac/preferences_mp4.cpp @@ -2,7 +2,7 @@ #include "config.h" #include "preferences.h" #include "../Winamp/wa_ipc.h" -#include +#include #include #include "resource.h" #include "link_control.h" diff --git a/Src/Plugins/Encoder/enc_flac/StreamFileWin32.h b/Src/Plugins/Encoder/enc_flac/StreamFileWin32.h index 6c09bc46a..c489426d3 100644 --- a/Src/Plugins/Encoder/enc_flac/StreamFileWin32.h +++ b/Src/Plugins/Encoder/enc_flac/StreamFileWin32.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include struct Win32_State { diff --git a/Src/Plugins/Encoder/enc_flac/enc_flac2.vcxproj b/Src/Plugins/Encoder/enc_flac/enc_flac2.vcxproj index b937baea0..394655cd8 100644 --- a/Src/Plugins/Encoder/enc_flac/enc_flac2.vcxproj +++ b/Src/Plugins/Encoder/enc_flac/enc_flac2.vcxproj @@ -93,26 +93,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Encoder/enc_flac/main.cpp b/Src/Plugins/Encoder/enc_flac/main.cpp index d0507c59e..4828ace61 100644 --- a/Src/Plugins/Encoder/enc_flac/main.cpp +++ b/Src/Plugins/Encoder/enc_flac/main.cpp @@ -5,7 +5,7 @@ #include "AudioCoderFlac.h" #include "resource.h" #include -#include +#include #include #include #include diff --git a/Src/Plugins/Encoder/enc_lame/BladeMP3EncDLL.c b/Src/Plugins/Encoder/enc_lame/BladeMP3EncDLL.c index e982cad2e..f1002b4c7 100644 --- a/Src/Plugins/Encoder/enc_lame/BladeMP3EncDLL.c +++ b/Src/Plugins/Encoder/enc_lame/BladeMP3EncDLL.c @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include #include #include "BladeMP3EncDLL.h" #include diff --git a/Src/Plugins/Encoder/enc_lame/MP3Coder.h b/Src/Plugins/Encoder/enc_lame/MP3Coder.h index 9a16b603f..e4457868d 100644 --- a/Src/Plugins/Encoder/enc_lame/MP3Coder.h +++ b/Src/Plugins/Encoder/enc_lame/MP3Coder.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_MP3_CODER_H #define NULLSOFT_MP3_CODER_H -#include +#include #include "../nsv/enc_if.h" #include "BladeMP3EncDLL.h" #ifndef _BLADEDLL diff --git a/Src/Plugins/Encoder/enc_lame/enc_lame.vcxproj b/Src/Plugins/Encoder/enc_lame/enc_lame.vcxproj index 6dcaa1eb5..882b13f50 100644 --- a/Src/Plugins/Encoder/enc_lame/enc_lame.vcxproj +++ b/Src/Plugins/Encoder/enc_lame/enc_lame.vcxproj @@ -96,31 +96,31 @@ Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md Disabled - ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\lame + ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\lame _WINDOWS;_USRDLL;_BLADEDLL;NSV_CODER_MP3_EXPORTS;WINDOWS_IGNORE_PACKING_MISMATCH;WIN32;_DEBUG;%(PreprocessorDefinitions) false true @@ -144,7 +144,7 @@ $(IntDir)$(TargetName).lib MachineX86 false - ..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\debug\lib\;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\debug\lib\;%(AdditionalLibraryDirectories) xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Plugins\ @@ -156,7 +156,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource Disabled - ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\lame + ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\lame _DEBUG;_WINDOWS;_USRDLL;_BLADEDLL;NSV_CODER_MP3_EXPORTS;WIN64;%(PreprocessorDefinitions) false true @@ -171,14 +171,14 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource 0x0409 - shlwapi.lib;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\debug\lib\libmp3lame-static.lib + shlwapi.lib;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\debug\lib\libmp3lame-static.lib $(OutDir)$(TargetName)$(TargetExt) true $(IntDir)$(TargetName).pdb false $(IntDir)$(TargetName).lib false - ..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\debug\lib\;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\debug\lib\;%(AdditionalLibraryDirectories) xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Plugins\ @@ -192,7 +192,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource MinSpace OnlyExplicitInline Size - ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\lame + ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\lame _WINDOWS;_USRDLL;_BLADEDLL;NSV_CODER_MP3_EXPORTS;WINDOWS_IGNORE_PACKING_MISMATCH;NDEBUG;WIN32;%(PreprocessorDefinitions) true true @@ -218,7 +218,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource $(IntDir)$(TargetName).lib MachineX86 false - ..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\lib\;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\lib\;%(AdditionalLibraryDirectories) xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Plugins\ @@ -231,7 +231,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource MinSpace OnlyExplicitInline Size - ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\lame + ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\lame NDEBUG;_WINDOWS;_USRDLL;NSV_CODER_MP3_EXPORTS;WIN64;%(PreprocessorDefinitions) true true @@ -246,7 +246,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource 0x0409 - shlwapi.lib;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\lib\libmp3lame-static.lib;%(AdditionalDependencies) + shlwapi.lib;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\lib\libmp3lame-static.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) false $(IntDir)$(TargetName).pdb @@ -255,7 +255,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource false $(IntDir)$(TargetName).lib false - ..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\debug\lib\;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\debug\lib\;%(AdditionalLibraryDirectories) xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Plugins\ diff --git a/Src/Plugins/Encoder/enc_vorbis/enc_vorbis.vcxproj b/Src/Plugins/Encoder/enc_vorbis/enc_vorbis.vcxproj index fff723160..741d0b52a 100644 --- a/Src/Plugins/Encoder/enc_vorbis/enc_vorbis.vcxproj +++ b/Src/Plugins/Encoder/enc_vorbis/enc_vorbis.vcxproj @@ -91,26 +91,26 @@ false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/Plugins/Encoder/enc_vorbis/main.cpp b/Src/Plugins/Encoder/enc_vorbis/main.cpp index d42a4ede4..4eb9a32e2 100644 --- a/Src/Plugins/Encoder/enc_vorbis/main.cpp +++ b/Src/Plugins/Encoder/enc_vorbis/main.cpp @@ -18,7 +18,7 @@ #define ENC_VERSION "v1.58" -#include +#include #include #include #include diff --git a/Src/Plugins/Encoder/enc_wav/ACMEncoder.h b/Src/Plugins/Encoder/enc_wav/ACMEncoder.h index deb959687..1a5748130 100644 --- a/Src/Plugins/Encoder/enc_wav/ACMEncoder.h +++ b/Src/Plugins/Encoder/enc_wav/ACMEncoder.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ENC_ACM_ACMENCODER_H #define NULLSOFT_ENC_ACM_ACMENCODER_H -#include +#include #include #include #include "../nsv/enc_if.h" diff --git a/Src/Plugins/Encoder/enc_wav/Config.cpp b/Src/Plugins/Encoder/enc_wav/Config.cpp index bb7974f90..cd305448b 100644 --- a/Src/Plugins/Encoder/enc_wav/Config.cpp +++ b/Src/Plugins/Encoder/enc_wav/Config.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "Config.h" diff --git a/Src/Plugins/Encoder/enc_wav/Config.h b/Src/Plugins/Encoder/enc_wav/Config.h index 7ca66652b..c0a618f4c 100644 --- a/Src/Plugins/Encoder/enc_wav/Config.h +++ b/Src/Plugins/Encoder/enc_wav/Config.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ENC_ACM_CONFIG_H #define NULLSOFT_ENC_ACM_CONFIG_H -#include +#include #include #include diff --git a/Src/Plugins/Encoder/enc_wav/WAVEncoder.h b/Src/Plugins/Encoder/enc_wav/WAVEncoder.h index a9867d555..570683200 100644 --- a/Src/Plugins/Encoder/enc_wav/WAVEncoder.h +++ b/Src/Plugins/Encoder/enc_wav/WAVEncoder.h @@ -2,7 +2,7 @@ #define NULLSOFT_ENC_WAV_WAVENCODER_H -#include +#include #include #include #include "../nsv/enc_if.h" diff --git a/Src/Plugins/Encoder/enc_wma/AudioCoderWMA.cpp b/Src/Plugins/Encoder/enc_wma/AudioCoderWMA.cpp index 3fa7a7f0c..d3c8dc15e 100644 --- a/Src/Plugins/Encoder/enc_wma/AudioCoderWMA.cpp +++ b/Src/Plugins/Encoder/enc_wma/AudioCoderWMA.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "../nu/ns_wc.h" diff --git a/Src/Plugins/Encoder/enc_wma/config.cpp b/Src/Plugins/Encoder/enc_wma/config.cpp index a1114f175..74dfb2390 100644 --- a/Src/Plugins/Encoder/enc_wma/config.cpp +++ b/Src/Plugins/Encoder/enc_wma/config.cpp @@ -1,4 +1,4 @@ -#include +#include // LGIVEN Mods 4-10-05 #include "main.h" diff --git a/Src/Plugins/Encoder/enc_wma/main.cpp b/Src/Plugins/Encoder/enc_wma/main.cpp index 451304a1b..a5248b664 100644 --- a/Src/Plugins/Encoder/enc_wma/main.cpp +++ b/Src/Plugins/Encoder/enc_wma/main.cpp @@ -19,7 +19,7 @@ #define ENC_VERSION "v1.23" -#include +#include #include #include diff --git a/Src/Plugins/Encoder/enc_wma/main.h b/Src/Plugins/Encoder/enc_wma/main.h index 460fb03e1..897db8c0f 100644 --- a/Src/Plugins/Encoder/enc_wma/main.h +++ b/Src/Plugins/Encoder/enc_wma/main.h @@ -1,4 +1,4 @@ -#include +#include #include #include "../nsv/enc_if.h" diff --git a/Src/Plugins/Encoder/enc_wma/wmaudiosdk.h b/Src/Plugins/Encoder/enc_wma/wmaudiosdk.h index 99199d9d2..8f44842e9 100644 --- a/Src/Plugins/Encoder/enc_wma/wmaudiosdk.h +++ b/Src/Plugins/Encoder/enc_wma/wmaudiosdk.h @@ -12,7 +12,7 @@ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/Plugins/General/gen_crasher/ExceptionHandler.cpp b/Src/Plugins/General/gen_crasher/ExceptionHandler.cpp index ae1c23995..b9037bc43 100644 --- a/Src/Plugins/General/gen_crasher/ExceptionHandler.cpp +++ b/Src/Plugins/General/gen_crasher/ExceptionHandler.cpp @@ -30,7 +30,7 @@ #define _WIN32_WINDOWS 0x0500 // for IsDebuggerPresent -#include "windows.h" +#include "arch.h" #include #include "GetWinVer.h" #include "miniversion.h" diff --git a/Src/Plugins/General/gen_crasher/ExceptionHandler.h b/Src/Plugins/General/gen_crasher/ExceptionHandler.h index 5b4a2ce27..f45148cec 100644 --- a/Src/Plugins/General/gen_crasher/ExceptionHandler.h +++ b/Src/Plugins/General/gen_crasher/ExceptionHandler.h @@ -20,7 +20,7 @@ BOOL CreateLog(PEXCEPTION_POINTERS pExceptPtrs, LPCWSTR lpszMessage); BOOL CreateDump(PEXCEPTION_POINTERS pExceptPtrs); // We forward declare PEXCEPTION_POINTERS so that the function -// prototype doesn't needlessly require windows.h. +// prototype doesn't needlessly require arch.h. #ifdef __cplusplus extern "C" { diff --git a/Src/Plugins/General/gen_crasher/GetWinVer.h b/Src/Plugins/General/gen_crasher/GetWinVer.h index 120a76530..2421f1943 100644 --- a/Src/Plugins/General/gen_crasher/GetWinVer.h +++ b/Src/Plugins/General/gen_crasher/GetWinVer.h @@ -11,7 +11,7 @@ // damage or loss of business that this software may cause. // /////////////////////////////////////////////////////////////////////////////// -#include +#include #ifndef GETWINVER_H #define GETWINVER_H diff --git a/Src/Plugins/General/gen_crasher/MiniVersion.h b/Src/Plugins/General/gen_crasher/MiniVersion.h index 4a44d97ec..3e3555ebd 100644 --- a/Src/Plugins/General/gen_crasher/MiniVersion.h +++ b/Src/Plugins/General/gen_crasher/MiniVersion.h @@ -16,7 +16,7 @@ #ifndef MINIVERSION_H #define MINIVERSION_H -#include +#include #include class CMiniVersion diff --git a/Src/Plugins/General/gen_crasher/config.h b/Src/Plugins/General/gen_crasher/config.h index 1016b570e..3cc5a0828 100644 --- a/Src/Plugins/General/gen_crasher/config.h +++ b/Src/Plugins/General/gen_crasher/config.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_CONFIG_H_ #define NULLSOFT_CONFIG_H_ -#include +#include #include #include #include diff --git a/Src/Plugins/General/gen_crasher/configDlg.cpp b/Src/Plugins/General/gen_crasher/configDlg.cpp index 5e8454254..45f10d93b 100644 --- a/Src/Plugins/General/gen_crasher/configDlg.cpp +++ b/Src/Plugins/General/gen_crasher/configDlg.cpp @@ -22,7 +22,7 @@ BOOL CALLBACK ConfigDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara { HWND hwCombo = GetDlgItem(hwndDlg, IDC_CMB_DMPTYPE); - // detect windows version + // detect arch version wchar_t strBuff[2048] = {0}, winVer[32] = {0}, build[32] = {0}; int nWinVer = 0; GetWinVer(winVer, &nWinVer, build); diff --git a/Src/Plugins/General/gen_crasher/configDlg.h b/Src/Plugins/General/gen_crasher/configDlg.h index 5c3ef4df6..ac9e9e2bb 100644 --- a/Src/Plugins/General/gen_crasher/configDlg.h +++ b/Src/Plugins/General/gen_crasher/configDlg.h @@ -1,5 +1,5 @@ #pragma once -#include +#include int SelectComboBoxItem(const HWND hwCombo, int data); BOOL OpenFolderDialog(HWND parent, LPWSTR pathBuffer); diff --git a/Src/Plugins/General/gen_crasher/crashDlg.h b/Src/Plugins/General/gen_crasher/crashDlg.h index eb92f0270..bd1585c9b 100644 --- a/Src/Plugins/General/gen_crasher/crashDlg.h +++ b/Src/Plugins/General/gen_crasher/crashDlg.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include BOOL CALLBACK CrashDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); \ No newline at end of file diff --git a/Src/Plugins/General/gen_crasher/feedback/email/SendEmail.h b/Src/Plugins/General/gen_crasher/feedback/email/SendEmail.h index ce1c523bd..21023a16a 100644 --- a/Src/Plugins/General/gen_crasher/feedback/email/SendEmail.h +++ b/Src/Plugins/General/gen_crasher/feedback/email/SendEmail.h @@ -17,7 +17,7 @@ #define SENDEMAIL_H #include -#include +#include const wchar_t* GetFilePart(LPCWSTR lpszFile); diff --git a/Src/Plugins/General/gen_crasher/feedback/feedback.rc b/Src/Plugins/General/gen_crasher/feedback/feedback.rc index 0e02c7e10..725d68ec9 100644 --- a/Src/Plugins/General/gen_crasher/feedback/feedback.rc +++ b/Src/Plugins/General/gen_crasher/feedback/feedback.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" +#include "arch.h" #undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -65,7 +65,7 @@ END 2 TEXTINCLUDE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" + "#include ""arch.h""\r\n" "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/Src/Plugins/General/gen_crasher/feedback/main.h b/Src/Plugins/General/gen_crasher/feedback/main.h index bd2363fd4..552480663 100644 --- a/Src/Plugins/General/gen_crasher/feedback/main.h +++ b/Src/Plugins/General/gen_crasher/feedback/main.h @@ -1,7 +1,7 @@ #ifndef FEEDBACK_H #define FEEDBACK_H -#include +#include #include "resource.h" #include "..\settings.h" diff --git a/Src/Plugins/General/gen_crasher/feedback/manifest.xml b/Src/Plugins/General/gen_crasher/feedback/manifest.xml index 651ac7431..a14e163c3 100644 --- a/Src/Plugins/General/gen_crasher/feedback/manifest.xml +++ b/Src/Plugins/General/gen_crasher/feedback/manifest.xml @@ -29,8 +29,8 @@ - + true - + \ No newline at end of file diff --git a/Src/Plugins/General/gen_crasher/feedback/smtp/Base64.h b/Src/Plugins/General/gen_crasher/feedback/smtp/Base64.h index 4e5d39247..2a85bf30a 100644 --- a/Src/Plugins/General/gen_crasher/feedback/smtp/Base64.h +++ b/Src/Plugins/General/gen_crasher/feedback/smtp/Base64.h @@ -5,7 +5,7 @@ #if !defined(AFX_CBase64_H__B2E45717_0625_11D2_A80A_00C04FB6794C__INCLUDED_) #define AFX_CBase64_H__B2E45717_0625_11D2_A80A_00C04FB6794C__INCLUDED_ -#include +#include #define lCONTEXT char #define PlCONTEXT lCONTEXT* diff --git a/Src/Plugins/General/gen_crasher/feedback/xzip/XZip.cpp b/Src/Plugins/General/gen_crasher/feedback/xzip/XZip.cpp index 0e2ac6a38..17899be86 100644 --- a/Src/Plugins/General/gen_crasher/feedback/xzip/XZip.cpp +++ b/Src/Plugins/General/gen_crasher/feedback/xzip/XZip.cpp @@ -86,7 +86,7 @@ // /////////////////////////////////////////////////////////////////////////////// -#include +#include #include #include "xzip.h" @@ -2179,14 +2179,14 @@ ZRESULT GetFileInfo(HANDLE hf, ulg *attr, long *size, iztimes *times, ulg *times // unsigned integer comparison of absolute times. The attributes have two // high bytes unix attr, and two low bytes a mapping of that to DOS attr. //struct stat s; int res=stat(fn,&s); if (res!=0) return false; - // translate windows file attributes into zip ones. + // translate arch file attributes into zip ones. BY_HANDLE_FILE_INFORMATION bhi; BOOL res=GetFileInformationByHandle(hf,&bhi); if (!res) return ZR_NOFILE; DWORD fa=bhi.dwFileAttributes; ulg a=0; - // Zip uses the lower word for its interpretation of windows stuff + // Zip uses the lower word for its interpretation of arch stuff if (fa&FILE_ATTRIBUTE_READONLY) a|=0x01; if (fa&FILE_ATTRIBUTE_HIDDEN) a|=0x02; if (fa&FILE_ATTRIBUTE_SYSTEM) a|=0x04; diff --git a/Src/Plugins/General/gen_crasher/main.h b/Src/Plugins/General/gen_crasher/main.h index ee3262f0c..91884e851 100644 --- a/Src/Plugins/General/gen_crasher/main.h +++ b/Src/Plugins/General/gen_crasher/main.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_CRASHER_MAIN_H #define NULLSOFT_CRASHER_MAIN_H -#include +#include #include #include "resource.h" #define NO_IVIDEO_DECLARE diff --git a/Src/Plugins/General/gen_crasher/smtpDlg.h b/Src/Plugins/General/gen_crasher/smtpDlg.h index 3ddac4660..007b3e460 100644 --- a/Src/Plugins/General/gen_crasher/smtpDlg.h +++ b/Src/Plugins/General/gen_crasher/smtpDlg.h @@ -1,5 +1,5 @@ #pragma once -#include +#include void CenterDialog(HWND hwndDlg); BOOL CALLBACK smtpDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); \ No newline at end of file diff --git a/Src/Plugins/General/gen_ff/ff_ipc.cpp b/Src/Plugins/General/gen_ff/ff_ipc.cpp index 12d0325f9..bafb4f0d9 100644 --- a/Src/Plugins/General/gen_ff/ff_ipc.cpp +++ b/Src/Plugins/General/gen_ff/ff_ipc.cpp @@ -181,7 +181,7 @@ COLORREF getWindowBackground(COLORREF *wb) windowbackground = b[_w*_y+_x]; WASABI_API_SKIN->imgldr_releaseSkinBitmap(b); } else { - // no idea... we'll just set the default windows color + // no idea... we'll just set the default arch color windowbackground = GetSysColor(COLOR_WINDOWFRAME); } } diff --git a/Src/Plugins/General/gen_ff/ff_ipc.h b/Src/Plugins/General/gen_ff/ff_ipc.h index 6a422e2ad..ef296136f 100644 --- a/Src/Plugins/General/gen_ff/ff_ipc.h +++ b/Src/Plugins/General/gen_ff/ff_ipc.h @@ -79,8 +79,8 @@ typedef struct { // ----------------------------------------------------------------------------------------------- #define IPC_FF_ONCOLORTHEMECHANGED IPC_FF_FIRST + 3 // data = name of the new color theme (const char *) -#define IPC_FF_ISMAINWND IPC_FF_FIRST + 4 // data = hwnd, returns 1 if hwnd is main window or any of its windowshade -#define IPC_FF_GETCONTENTWND IPC_FF_FIRST + 5 // data = HWND, returns the wa2 window that is embedded in the window's container (ie if hwnd is the pledit windowshade hwnd, it returns the wa2 pledit hwnd). if no content is found (ie, the window has nothing embedded) it returns the parameter you gave it +#define IPC_FF_ISMAINWND IPC_FF_FIRST + 4 // data = hwnd, returns 1 if hwnd is main window or any of its archhade +#define IPC_FF_GETCONTENTWND IPC_FF_FIRST + 5 // data = HWND, returns the wa2 window that is embedded in the window's container (ie if hwnd is the pledit archhade hwnd, it returns the wa2 pledit hwnd). if no content is found (ie, the window has nothing embedded) it returns the parameter you gave it #define IPC_FF_NOTIFYHOTKEY IPC_FF_FIRST + 6 // data = const char * to hotkey description #endif diff --git a/Src/Plugins/General/gen_ff/gen_ff.rc b/Src/Plugins/General/gen_ff/gen_ff.rc index 033885fb1..3c74ffdad 100644 --- a/Src/Plugins/General/gen_ff/gen_ff.rc +++ b/Src/Plugins/General/gen_ff/gen_ff.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "pixels",IDC_STATIC,225,106,19,8 GROUPBOX "Miscellaneous",IDC_STATIC,4,131,256,86 CONTROL "Enable tooltips",IDC_CHECK_TOOLTIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,144,65,10 - CONTROL "Dock windows at ",IDC_CHECK_DOCKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,156,67,11 + CONTROL "Dock arch at ",IDC_CHECK_DOCKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,156,67,11 EDITTEXT IDC_EDIT_DOCKDISTANCE,79,155,30,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SPIN_DOCKDISTANCE,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,97,154,10,14 LTEXT "pixels",IDC_STATIC,111,157,18,8 @@ -182,7 +182,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Scaling",IDC_STATIC,4,3,256,76 - CONTROL "Link all windows in all skins:",IDC_CHECK_LINKALLRATIO, + CONTROL "Link all arch in all skins:",IDC_CHECK_LINKALLRATIO, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,15,103,10 CTEXT "100%",IDC_STATIC_SCALE,159,10,51,8 LTEXT "10%",IDC_STATIC_SCALE11,124,17,16,8 @@ -193,7 +193,7 @@ BEGIN GROUPBOX "On Window Close/Reopen",IDC_STATIC,10,41,244,32 COMBOBOX IDC_COMBO_SCALE,16,54,232,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Opacity",IDC_STATIC_OPACITY,4,81,256,138 - CONTROL "Link all windows in all skins:",IDC_CHECK_LINKALLALPHA, + CONTROL "Link all arch in all skins:",IDC_CHECK_LINKALLALPHA, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,92,102,10 COMBOBOX IDC_COMBO_OPACITY,11,106,98,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Slider1",IDC_SLIDER_CUSTOMALPHA,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,114,106,140,10 @@ -520,7 +520,7 @@ BEGIN IDS_KHZ "kHz" IDS_KBPS "kbps" IDS_USELOCK "Reset window scale to global 'double size' except if it is locked" - IDS_ALLLOCKED "All windows remember their scale, disregard global 'double size'" + IDS_ALLLOCKED "All arch remember their scale, disregard global 'double size'" IDS_OPAQUE_FOCUS "Auto opaque on focus" IDS_OPAQUE_HOVER "Auto opaque on hover" IDS_NO_OPACITY "No auto opacity" diff --git a/Src/Plugins/General/gen_ff/gen_ff.vcxproj b/Src/Plugins/General/gen_ff/gen_ff.vcxproj index 84fd0c5e3..33c2fe609 100644 --- a/Src/Plugins/General/gen_ff/gen_ff.vcxproj +++ b/Src/Plugins/General/gen_ff/gen_ff.vcxproj @@ -93,19 +93,19 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/Plugins/General/gen_ff/main.cpp b/Src/Plugins/General/gen_ff/main.cpp index 728d99a41..91f0c2972 100644 --- a/Src/Plugins/General/gen_ff/main.cpp +++ b/Src/Plugins/General/gen_ff/main.cpp @@ -1,5 +1,5 @@ #include "precomp__gen_ff.h" -#include +#include #include #include "main.h" @@ -53,7 +53,7 @@ #include "../nu/AutoWide.h" #include -#include +#include //wtf? #define _WAFE_H_ #define ___HOTAMP3_H___ @@ -342,11 +342,11 @@ void autoOpacifyFocus(); ifc_window *g_controlMenuTarget = NULL; HMENU controlmenu = NULL; void lockScaling(int lock); -int ffwindowsitempos = -1; +int ffarchitempos = -1; int ffoptionstop = -1; int ffwoptionstop = -1; -int ffwindowstop = -1; -int ffwindowsitempos2 = -1; +int ffarchtop = -1; +int ffarchitempos2 = -1; int eqremoved = 0; void removeEq(); void restoreEq(); @@ -422,7 +422,7 @@ __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, L } //----------------------------------------------------------------------------------------------- -// core actions implement "play", "stop", etc. wndEmbedded embed wa2 windows into GUID-based wnds +// core actions implement "play", "stop", etc. wndEmbedded embed wa2 arch into GUID-based wnds //----------------------------------------------------------------------------------------------- BEGIN_SERVICES(Winamp2_Svcs); DECLARE_SERVICETSINGLE(svc_action, CoreActions); @@ -1454,7 +1454,7 @@ static LRESULT WINAPI wa_newWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR } else if (wParam == 2) { - // embed the windows that are currently visible because at the time the window were originally shown, + // embed the arch that are currently visible because at the time the window were originally shown, // we hadn't been loaded yet // but then again, we might if it's only a switch skin and not a app load, so let's check anyway @@ -1548,7 +1548,7 @@ static LRESULT WINAPI wa_newWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR wa2.setIdealVideoSize(HIWORD(wParam), LOWORD(wParam)); break; } - // this is where we detect that wa2 wants to open one of its windows (thru popup menu, button, whatever) + // this is where we detect that wa2 wants to open one of its arch (thru popup menu, button, whatever) // when this happens, we create a freeform wndembedder if one doesn't already exist. that embedder will // reparent and resize the wa2 window on its own. when we return, winamp then shows the HWND inside our frame // as it would show the HWND as a popup normally. @@ -1616,7 +1616,7 @@ static LRESULT WINAPI wa_newWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR break; } break; - // here we do the reverse, we detect that wa2 wants to close one of its windows, so we destroy our window + // here we do the reverse, we detect that wa2 wants to close one of its arch, so we destroy our window // embedder (it will reparent the wa2 window back to its former parent and resize it back to where it was // on its own). when we return, winamp then hides the window. @@ -1733,7 +1733,7 @@ static LRESULT WINAPI wa_newWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR // sending us the WM_KEY* directly if (WASABI_API_WND->isKeyboardLocked()) return 0; } - else if ((uMsg == WM_COMMAND || uMsg == WM_SYSCOMMAND) && LOWORD(wParam) >= 43000 && LOWORD(wParam) < ffwindowstop) + else if ((uMsg == WM_COMMAND || uMsg == WM_SYSCOMMAND) && LOWORD(wParam) >= 43000 && LOWORD(wParam) < ffarchtop) { int id = LOWORD(wParam) - 43000; @@ -2132,7 +2132,7 @@ void init_inst() if ( DEFERREDCALLBACKMSG > 65536 ) PostMessage( wa2.getMainWindow(), WM_WA_IPC, 2, DEFERREDCALLBACKMSG ); - // so if some embedwindows are already visible, they update their look + // so if some embedarch are already visible, they update their look PostMessage( wa2.getMainWindow(), WM_WA_IPC, 0xf00d, IPC_FF_ONCOLORTHEMECHANGED ); // monitor color theme @@ -2698,7 +2698,7 @@ void restoreEq() //----------------------------------------------------------------------------------------------- void unpopulateWindowsMenus() { - if (ffwindowsitempos == -1) return ; + if (ffarchitempos == -1) return ; HMENU menuBarMenu = wa2.getMenuBarMenu(Winamp2FrontEnd::WA2_MAINMENUBAR_WINDOWS); for(int i = GetMenuItemCount(menuBarMenu)-1; i >= 0; i--) @@ -2726,8 +2726,8 @@ void unpopulateWindowsMenus() } } - ffwindowsitempos = -1; - ffwindowsitempos2 = -1; + ffarchitempos = -1; + ffarchitempos2 = -1; MenuActions::removeSkinWindowOptions(); MenuActions::removeSkinOptions(); @@ -2736,20 +2736,20 @@ void unpopulateWindowsMenus() //----------------------------------------------------------------------------------------------- void populateWindowsMenus() { - if (ffwindowsitempos != -1) unpopulateWindowsMenus(); + if (ffarchitempos != -1) unpopulateWindowsMenus(); MenuActions::installSkinOptions(); MenuActions::installSkinWindowOptions(); - ffwindowsitempos = wa2.adjustFFWindowsMenu(0) + NUMSTATICWINDOWS; - ffwindowsitempos2 = wa2.adjustOptionsPopupMenu(0) + 6 + NUMSTATICWINDOWS + 1; + ffarchitempos = wa2.adjustFFWindowsMenu(0) + NUMSTATICWINDOWS; + ffarchitempos2 = wa2.adjustOptionsPopupMenu(0) + 6 + NUMSTATICWINDOWS + 1; MENUITEMINFOW i = {sizeof(i), }; i.fMask = MIIM_TYPE | MIIM_DATA | MIIM_ID | MIIM_STATE; i.fType = MFT_STRING; i.wID = 43000; i.dwItemData = 0xD01; // use this as a check so we're only removing the correct items!! - int pos = ffwindowsitempos; - int pos2 = ffwindowsitempos2; + int pos = ffarchitempos; + int pos2 = ffarchitempos2; PtrListQuickSorted items; HMENU hMenu = wa2.getMenuBarMenu(Winamp2FrontEnd::WA2_MAINMENUBAR_WINDOWS); @@ -2824,7 +2824,7 @@ void populateWindowsMenus() } items.deleteAll(); - ffwindowstop = i.wID; + ffarchtop = i.wID; } //----------------------------------------------------------------------------------------------- @@ -3465,7 +3465,7 @@ void updateParentlessOnTop() Layout *l = c->enumLayout(j); if (l != NULL) { - // skip windows owned by winamp + // skip arch owned by winamp // skip appbars, they take care of themselves if (l->getNoParent() && !l->appbar_isDocked()) { @@ -3479,17 +3479,17 @@ void updateParentlessOnTop() void onGoFullscreen() { - // hidden windows will not receive APPBAR_CALLBACK, so forward it to winamp's main + // hidden arch will not receive APPBAR_CALLBACK, so forward it to winamp's main SendMessageW(wa2.getMainWindow(), APPBAR_CALLBACK, ABN_FULLSCREENAPP, 1); - // update ontop flag for windows that are not parented to winamp + // update ontop flag for arch that are not parented to winamp updateParentlessOnTop(); } void onCancelFullscreen() { - // hidden windows will not receive APPBAR_CALLBACK, so forward it to winamp's main + // hidden arch will not receive APPBAR_CALLBACK, so forward it to winamp's main SendMessageW(wa2.getMainWindow(), APPBAR_CALLBACK, ABN_FULLSCREENAPP, 0); - // update ontop flag for windows that are not owned by winamp + // update ontop flag for arch that are not owned by winamp updateParentlessOnTop(); } diff --git a/Src/Plugins/General/gen_ff/menuactions.cpp b/Src/Plugins/General/gen_ff/menuactions.cpp index 266dd74a0..674235ade 100644 --- a/Src/Plugins/General/gen_ff/menuactions.cpp +++ b/Src/Plugins/General/gen_ff/menuactions.cpp @@ -639,19 +639,19 @@ void MenuActions::installSkinWindowOptions() mii.wID = 42000; mii.dwItemData = 0xD02; // use this as a check so we're only removing the correct items!! - if (menu && windowsmenuitems) + if (menu && archmenuitems) { - int n = MIN(windowsmenuitems->getNumAttributes(), 500); + int n = MIN(archmenuitems->getNumAttributes(), 500); int cmdoffset = 0; for (int i = 0;i < n;i++) { - const wchar_t *attr = windowsmenuitems->enumAttribute(i); + const wchar_t *attr = archmenuitems->enumAttribute(i); if (attr && *attr) { HMENU submenu = NULL; wchar_t txt[256] = {0}; - windowsmenuitems->getData(attr, txt, 256); + archmenuitems->getData(attr, txt, 256); GUID g = nsGUID::fromCharW(txt); if (g != INVALID_GUID) { // submenu ! @@ -659,7 +659,7 @@ void MenuActions::installSkinWindowOptions() if (submenu) wmenulist.addItem(submenu); } - int v = windowsmenuitems->getDataAsInt(attr, 0); + int v = archmenuitems->getDataAsInt(attr, 0); wa2.adjustFFWindowsMenu(1); wa2.adjustOptionsPopupMenu(1); @@ -698,7 +698,7 @@ void MenuActions::removeSkinWindowOptions() HMENU menu = wa2.getMenuBarMenu(Winamp2FrontEnd::WA2_MAINMENUBAR_WINDOWS); HMENU omenu = wa2.getPopupMenu(); - if (menu && windowsmenuitems) + if (menu && archmenuitems) { for(int i = GetMenuItemCount(menu)-1; i != 0; i--) { @@ -758,7 +758,7 @@ int MenuActions::toggleWindowOption(int n, GUID guid, int *cmdoffset) if (!cmdoffset) cmdoffset = &_cmdoffset; CfgItem *item = NULL; if (guid == INVALID_GUID) - item = windowsmenuitems; + item = archmenuitems; else item = WASABI_API_CONFIG->config_getCfgItemByGuid(guid); diff --git a/Src/Plugins/General/gen_ff/prefs.cpp b/Src/Plugins/General/gen_ff/prefs.cpp index 998d3b50a..d42a2d7d8 100644 --- a/Src/Plugins/General/gen_ff/prefs.cpp +++ b/Src/Plugins/General/gen_ff/prefs.cpp @@ -7,7 +7,7 @@ #include "../Agave/Language/api_language.h" #include "gen.h" #include -#include +#include void turnonoff(HWND wnd, int *t, int n, int v) { for (int i=0;i +#include extern int m_are_we_loaded; extern int toggle_from_wa2; diff --git a/Src/Plugins/General/gen_ff/prefs_font.cpp b/Src/Plugins/General/gen_ff/prefs_font.cpp index ccb5c586b..d238cddd6 100644 --- a/Src/Plugins/General/gen_ff/prefs_font.cpp +++ b/Src/Plugins/General/gen_ff/prefs_font.cpp @@ -1,7 +1,7 @@ #include "precomp__gen_ff.h" #include -#include -#include +#include +#include #include "resource.h" #include #include diff --git a/Src/Plugins/General/gen_ff/wa2cfgitems.cpp b/Src/Plugins/General/gen_ff/wa2cfgitems.cpp index a225df8ce..c7f67dfd6 100644 --- a/Src/Plugins/General/gen_ff/wa2cfgitems.cpp +++ b/Src/Plugins/General/gen_ff/wa2cfgitems.cpp @@ -121,7 +121,7 @@ void AvsCfg::onVisRandomChanged(BOOL set) { //--------------------------------------------------------- Options *options; CustomOptionsMenuItems *optionsmenuitems; -CustomWindowsMenuItems *windowsmenuitems; +CustomWindowsMenuItems *archmenuitems; SkinTweaks *skintweaks; Crossfader *crossfader; AvsCfg *avscfg; @@ -134,8 +134,8 @@ Wa2CfgItems::Wa2CfgItems() { // set up custom options menu items WASABI_API_CONFIG->config_registerCfgItem((optionsmenuitems = new CustomOptionsMenuItems())); - // set up custom windows menu items - WASABI_API_CONFIG->config_registerCfgItem((windowsmenuitems = new CustomWindowsMenuItems())); + // set up custom arch menu items + WASABI_API_CONFIG->config_registerCfgItem((archmenuitems = new CustomWindowsMenuItems())); // set up skintweaks options menu items WASABI_API_CONFIG->config_registerCfgItem((skintweaks = new SkinTweaks())); @@ -150,7 +150,7 @@ Wa2CfgItems::Wa2CfgItems() { Wa2CfgItems::~Wa2CfgItems() { WASABI_API_CONFIG->config_deregisterCfgItem(options); WASABI_API_CONFIG->config_deregisterCfgItem(optionsmenuitems); - WASABI_API_CONFIG->config_deregisterCfgItem(windowsmenuitems); + WASABI_API_CONFIG->config_deregisterCfgItem(archmenuitems); WASABI_API_CONFIG->config_deregisterCfgItem(skintweaks); WASABI_API_CONFIG->config_deregisterCfgItem(crossfader); WASABI_API_CONFIG->config_deregisterCfgItem(avscfg); @@ -158,8 +158,8 @@ Wa2CfgItems::~Wa2CfgItems() { options = NULL; delete optionsmenuitems; optionsmenuitems = NULL; - delete windowsmenuitems; - windowsmenuitems = NULL; + delete archmenuitems; + archmenuitems = NULL; delete skintweaks; skintweaks = NULL; delete crossfader; diff --git a/Src/Plugins/General/gen_ff/wa2cfgitems.h b/Src/Plugins/General/gen_ff/wa2cfgitems.h index 6d2959b24..3398dd1d9 100644 --- a/Src/Plugins/General/gen_ff/wa2cfgitems.h +++ b/Src/Plugins/General/gen_ff/wa2cfgitems.h @@ -127,7 +127,7 @@ extern _int cfg_uioptions_extendautoopacity; extern _bool cfg_options_usefontmapper; extern CustomOptionsMenuItems *optionsmenuitems; -extern CustomWindowsMenuItems *windowsmenuitems; +extern CustomWindowsMenuItems *archmenuitems; extern SkinTweaks *skintweaks; extern int disable_set_wa2_repeat; extern StringW eqmenustring; diff --git a/Src/Plugins/General/gen_ff/wa2frontend.h b/Src/Plugins/General/gen_ff/wa2frontend.h index 38eb819bf..535506b33 100644 --- a/Src/Plugins/General/gen_ff/wa2frontend.h +++ b/Src/Plugins/General/gen_ff/wa2frontend.h @@ -40,7 +40,7 @@ //----------------------------------------------------------------------------------------------- -#include +#include #include "../gen_ml/ml.h" #include "../winamp/wa_ipc.h" #include "../winamp/ipc_pe.h" diff --git a/Src/Plugins/General/gen_ff/wa2wndembed.cpp b/Src/Plugins/General/gen_ff/wa2wndembed.cpp index bcd2aaac6..67a21814d 100644 --- a/Src/Plugins/General/gen_ff/wa2wndembed.cpp +++ b/Src/Plugins/General/gen_ff/wa2wndembed.cpp @@ -38,7 +38,7 @@ void WaOsWndHost::onBeforeReparent(int host) #else embedWindowState* ws = (embedWindowState*)GetWindowLong(getHWND(), GWL_USERDATA); #endif - // 0x49474541 is related to keeping windows shown on litestep desktops + // 0x49474541 is related to keeping arch shown on litestep desktops if (ws == NULL || (int)ws == 0x49474541) { HWND w = getHWND(); @@ -68,7 +68,7 @@ void WaOsWndHost::onAfterReparent(int host) #else embedWindowState* ws = (embedWindowState*)GetWindowLong(getHWND(), GWL_USERDATA); #endif - // 0x49474541 is related to keeping windows shown on litestep desktops + // 0x49474541 is related to keeping arch shown on litestep desktops if (ws == NULL || (int)ws == 0x49474541) { HWND w = getHWND(); @@ -432,11 +432,11 @@ int Wa2WndEmbed::destroyWindow(ifc_window *w) // if you load another skin (ie: NonStep), and you close the pledit, it immediately reappears with the wa2 look since oswndhost_unhost // reset the flags, region and parent to what they were before the window was embedded - // i think that what we need is to save which windows were visible (and their location) before switching to freeform + // i think that what we need is to save which arch were visible (and their location) before switching to freeform // and to restore them when we go back to wa2 mode. this will also be more consistant with the freeform behavior of // remembering visible status and coordinates on a per skin basis (since otherwise freeform dockings get screwed) - // it also makes sense when we consider that we are going to need to remove all windowshade modes from the embedded - // windows when going freeform. + // it also makes sense when we consider that we are going to need to remove all archhade modes from the embedded + // arch when going freeform. // see new functions: rememberVisibleWindows() and restoreVisibleWindows() @@ -742,7 +742,7 @@ int Wa2WndEmbed::embedRememberProc(embedWindowState *p, embedEnumStruct *parms) extern int m_loading_at_startup; //----------------------------------------------------------------------------------------------- -// todo: remember and restore windowshade modes +// todo: remember and restore archhade modes void Wa2WndEmbed::rememberVisibleWindows() { wa2wndstatus.deleteAll(); @@ -821,9 +821,9 @@ void Wa2WndEmbed::restoreVisibleWindows() SetWindowPos(ws->wnd, 0, 0, 0, mlwidth, mlheight, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE); } } - // FG> as of oct19, this function only restores state for windows that WERE visible + // FG> as of oct19, this function only restores state for arch that WERE visible // because there is no reason to hide one, since this function is designed to bring - // back those windows that were here in one mode, but aren't so anymore in another + // back those arch that were here in one mode, but aren't so anymore in another if (ws->visible) { if (ws->wndcode != -1) diff --git a/Src/Plugins/General/gen_hotkeys/Configdlg.h b/Src/Plugins/General/gen_hotkeys/Configdlg.h index a6fc772aa..2c9c5592e 100644 --- a/Src/Plugins/General/gen_hotkeys/Configdlg.h +++ b/Src/Plugins/General/gen_hotkeys/Configdlg.h @@ -1,7 +1,7 @@ #ifndef __CONFIG_DIALOG_H__ #define __CONFIG_DIALOG_H__ -#include +#include #include "resource.h" BOOL CALLBACK ConfigProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam); diff --git a/Src/Plugins/General/gen_hotkeys/HotKeyCtl.h b/Src/Plugins/General/gen_hotkeys/HotKeyCtl.h index 237aabba6..26cda9e53 100644 --- a/Src/Plugins/General/gen_hotkeys/HotKeyCtl.h +++ b/Src/Plugins/General/gen_hotkeys/HotKeyCtl.h @@ -1,7 +1,7 @@ #ifndef ____HOTKEY_CTL___H____ #define ____HOTKEY_CTL___H____ -#include +#include #define HOTKEYF_WIN 0x10 diff --git a/Src/Plugins/General/gen_hotkeys/gen_hotkeys.h b/Src/Plugins/General/gen_hotkeys/gen_hotkeys.h index 4cfb390c0..d09f1dda3 100644 --- a/Src/Plugins/General/gen_hotkeys/gen_hotkeys.h +++ b/Src/Plugins/General/gen_hotkeys/gen_hotkeys.h @@ -1,7 +1,7 @@ #ifndef ___HOTAMP3_H___ #define ___HOTAMP3_H___ -#include +#include #include #include "winamp.h" #include "wa_hotkeys.h" diff --git a/Src/Plugins/General/gen_hotkeys/gen_hotkeys.rc b/Src/Plugins/General/gen_hotkeys/gen_hotkeys.rc index 6187bdd17..886246f4d 100644 --- a/Src/Plugins/General/gen_hotkeys/gen_hotkeys.rc +++ b/Src/Plugins/General/gen_hotkeys/gen_hotkeys.rc @@ -158,8 +158,8 @@ BEGIN IDS_PLAYBACK__PLAY_PAUSE "Playback: Play/Pause" IDS_PLAYBACK__TOGGLE_REPEAT "Playback: Toggle repeat" IDS_PLAYBACK__TOGGLE_SHUFFLE "Playback: Toggle shuffle" - IDS_UI__TOGGLE_WINSHADE "UI: Toggle windowshade" - IDS_UI__TOGGLE_PLAYLIST_WINSHADE "UI: Toggle playlist windowshade" + IDS_UI__TOGGLE_WINSHADE "UI: Toggle archhade" + IDS_UI__TOGGLE_PLAYLIST_WINSHADE "UI: Toggle playlist archhade" IDS_UI__TOGGLE_DOUBLESIZE "UI: Toggle doublesize" IDS_UI__TOGGLE_MAIN_WINDOW "UI: Toggle main window" IDS_UI__TOGGLE_MINIBROWSER "UI: Toggle main minibrowser" diff --git a/Src/Plugins/General/gen_ml/banner.h b/Src/Plugins/General/gen_ml/banner.h index 9b7409cf4..62f781cd3 100644 --- a/Src/Plugins/General/gen_ml/banner.h +++ b/Src/Plugins/General/gen_ml/banner.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_BANNER_HEADER #define NULLSOFT_ML_BANNER_HEADER -#include +#include class MLBanner { diff --git a/Src/Plugins/General/gen_ml/colors.h b/Src/Plugins/General/gen_ml/colors.h index e8dc5ca56..8b29e9d00 100644 --- a/Src/Plugins/General/gen_ml/colors.h +++ b/Src/Plugins/General/gen_ml/colors.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include //******************************* Window #define MLSO_WINDOW 0 diff --git a/Src/Plugins/General/gen_ml/comboskin.h b/Src/Plugins/General/gen_ml/comboskin.h index c3fbbdc89..a9007a5be 100644 --- a/Src/Plugins/General/gen_ml/comboskin.h +++ b/Src/Plugins/General/gen_ml/comboskin.h @@ -1,7 +1,7 @@ #ifndef _COMBOSKIN_H #define _COMBOSKIN_H -#include +#include //class ScrollWnd; diff --git a/Src/Plugins/General/gen_ml/config.cpp b/Src/Plugins/General/gen_ml/config.cpp index 7cd519df7..fd04e1187 100644 --- a/Src/Plugins/General/gen_ml/config.cpp +++ b/Src/Plugins/General/gen_ml/config.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "config.h" diff --git a/Src/Plugins/General/gen_ml/fileview.h b/Src/Plugins/General/gen_ml/fileview.h index 980adf6a4..97e204bd2 100644 --- a/Src/Plugins/General/gen_ml/fileview.h +++ b/Src/Plugins/General/gen_ml/fileview.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/Plugins/General/gen_ml/fileview_columns.cpp b/Src/Plugins/General/gen_ml/fileview_columns.cpp index 019136924..84d151df4 100644 --- a/Src/Plugins/General/gen_ml/fileview_columns.cpp +++ b/Src/Plugins/General/gen_ml/fileview_columns.cpp @@ -2,7 +2,7 @@ #include "./fileview_internal.h" #include "./resource.h" #include "../nu/menushortcuts.h" -#include +#include #include #define COLUMN_WIDTH_MIN 16 diff --git a/Src/Plugins/General/gen_ml/fileview_internal.h b/Src/Plugins/General/gen_ml/fileview_internal.h index 5526bf32e..ba5b9a48c 100644 --- a/Src/Plugins/General/gen_ml/fileview_internal.h +++ b/Src/Plugins/General/gen_ml/fileview_internal.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #include "../winamp/gen.h" #include "api__gen_ml.h" #include "./ml_ipc_0313.h" diff --git a/Src/Plugins/General/gen_ml/fileview_menu.cpp b/Src/Plugins/General/gen_ml/fileview_menu.cpp index 624cf232b..fb6d37d29 100644 --- a/Src/Plugins/General/gen_ml/fileview_menu.cpp +++ b/Src/Plugins/General/gen_ml/fileview_menu.cpp @@ -2,7 +2,7 @@ #include "./fileview_internal.h" #include "./resource.h" #include "../nu/menushortcuts.h" -#include +#include #include #define SUBMENU_VIEWMODE 0 diff --git a/Src/Plugins/General/gen_ml/fileview_toolbar.cpp b/Src/Plugins/General/gen_ml/fileview_toolbar.cpp index 4bb2614a0..e0f11ec82 100644 --- a/Src/Plugins/General/gen_ml/fileview_toolbar.cpp +++ b/Src/Plugins/General/gen_ml/fileview_toolbar.cpp @@ -2,7 +2,7 @@ #include "./fileview_internal.h" #include "./resource.h" #include "../nu/menushortcuts.h" -#include +#include #include #define FVTOOLBAR_DATAW L"FVTOOLBAR" diff --git a/Src/Plugins/General/gen_ml/flickerfix.cpp b/Src/Plugins/General/gen_ml/flickerfix.cpp index 0bed2bbaf..15568c189 100644 --- a/Src/Plugins/General/gen_ml/flickerfix.cpp +++ b/Src/Plugins/General/gen_ml/flickerfix.cpp @@ -1,4 +1,4 @@ -#include +#include #include "ml.h" #include "../nu/CGlobalAtom.h" diff --git a/Src/Plugins/General/gen_ml/folderbrowser.cpp b/Src/Plugins/General/gen_ml/folderbrowser.cpp index 34fd8472d..077408639 100644 --- a/Src/Plugins/General/gen_ml/folderbrowser.cpp +++ b/Src/Plugins/General/gen_ml/folderbrowser.cpp @@ -6,7 +6,7 @@ #include "./skinnedlistbox.h" #include "./colors.h" -#include +#include #include diff --git a/Src/Plugins/General/gen_ml/folderbrowser.h b/Src/Plugins/General/gen_ml/folderbrowser.h index 7f983dbf6..ddf05611c 100644 --- a/Src/Plugins/General/gen_ml/folderbrowser.h +++ b/Src/Plugins/General/gen_ml/folderbrowser.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/Plugins/General/gen_ml/folderbrowser_internal.h b/Src/Plugins/General/gen_ml/folderbrowser_internal.h index 918678301..f97e0c0a1 100644 --- a/Src/Plugins/General/gen_ml/folderbrowser_internal.h +++ b/Src/Plugins/General/gen_ml/folderbrowser_internal.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #include "./ml_ipc_0313.h" #include "../nu/trace.h" diff --git a/Src/Plugins/General/gen_ml/gaystring.h b/Src/Plugins/General/gen_ml/gaystring.h index 54b39005c..28ebd3d70 100644 --- a/Src/Plugins/General/gen_ml/gaystring.h +++ b/Src/Plugins/General/gen_ml/gaystring.h @@ -1,7 +1,7 @@ #ifndef _GAYSTRING_H_ #define _GAYSTRING_H_ -#include +#include class GayString { diff --git a/Src/Plugins/General/gen_ml/gen_ml.vcxproj b/Src/Plugins/General/gen_ml/gen_ml.vcxproj index bb833fd82..8477a9abe 100644 --- a/Src/Plugins/General/gen_ml/gen_ml.vcxproj +++ b/Src/Plugins/General/gen_ml/gen_ml.vcxproj @@ -93,26 +93,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md true - x86-windows-static-md + x86-arch-static-md Debug true - x86-windows-static-md + x86-arch-static-md @@ -152,7 +152,7 @@ $(IntDir)$(TargetName).lib MachineX86 false - ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;%(AdditionalLibraryDirectories) Windows true true @@ -205,7 +205,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN $(IntDir)$(TargetName).lib false - ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;%(AdditionalLibraryDirectories) Windows true true @@ -256,7 +256,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN $(IntDir)$(TargetName).lib MachineX86 false - ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;%(AdditionalLibraryDirectories) Windows 0x8000 true @@ -300,7 +300,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN false $(IntDir)$(TargetName).lib false - ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;%(AdditionalLibraryDirectories) Windows diff --git a/Src/Plugins/General/gen_ml/graphics.h b/Src/Plugins/General/gen_ml/graphics.h index a7a00d6fb..4c3f2d362 100644 --- a/Src/Plugins/General/gen_ml/graphics.h +++ b/Src/Plugins/General/gen_ml/graphics.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include typedef struct _COLOR24 COLOR24; diff --git a/Src/Plugins/General/gen_ml/itemlist.cpp b/Src/Plugins/General/gen_ml/itemlist.cpp index 7658d07fb..a81435034 100644 --- a/Src/Plugins/General/gen_ml/itemlist.cpp +++ b/Src/Plugins/General/gen_ml/itemlist.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include "itemlist.h" C_ItemList::C_ItemList() diff --git a/Src/Plugins/General/gen_ml/listheader.cpp b/Src/Plugins/General/gen_ml/listheader.cpp index 07bf536df..e483757f6 100644 --- a/Src/Plugins/General/gen_ml/listheader.cpp +++ b/Src/Plugins/General/gen_ml/listheader.cpp @@ -1,5 +1,5 @@ #include "main.h" -#include +#include #include "config.h" #include "../winamp/wa_dlg.h" @@ -110,7 +110,7 @@ INT_PTR handleListViewHeaderMsgs(HWND hwndDlg, switch (lpnmcd->dwDrawStage) { // prior to painting case CDDS_PREPAINT: - return CDRF_NOTIFYITEMDRAW; // tell windows we want individual notification of each item being drawn + return CDRF_NOTIFYITEMDRAW; // tell arch we want individual notification of each item being drawn // notification of each item being drawn case CDDS_ITEMPREPAINT: { diff --git a/Src/Plugins/General/gen_ml/listskin.h b/Src/Plugins/General/gen_ml/listskin.h index 63bfb42e3..d53f065ab 100644 --- a/Src/Plugins/General/gen_ml/listskin.h +++ b/Src/Plugins/General/gen_ml/listskin.h @@ -1,7 +1,7 @@ #ifndef _LISTSKIN_H #define _LISTSKIN_H -#include +#include class ScrollWnd; diff --git a/Src/Plugins/General/gen_ml/listview.cpp b/Src/Plugins/General/gen_ml/listview.cpp index a3ceb22c6..a778c5764 100644 --- a/Src/Plugins/General/gen_ml/listview.cpp +++ b/Src/Plugins/General/gen_ml/listview.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include #include "listview.h" diff --git a/Src/Plugins/General/gen_ml/listview.h b/Src/Plugins/General/gen_ml/listview.h index 1a3a463e5..0b27e9dfc 100644 --- a/Src/Plugins/General/gen_ml/listview.h +++ b/Src/Plugins/General/gen_ml/listview.h @@ -19,8 +19,8 @@ #ifndef _LISTVIEW_H_ #define _LISTVIEW_H_ -#include -#include +#include +#include #include class W_ListView diff --git a/Src/Plugins/General/gen_ml/main.cpp b/Src/Plugins/General/gen_ml/main.cpp index 8fc9069c8..4014e3ccd 100644 --- a/Src/Plugins/General/gen_ml/main.cpp +++ b/Src/Plugins/General/gen_ml/main.cpp @@ -1,5 +1,5 @@ #include "main.h" -#include +#include #include #include #include "../winamp/gen.h" @@ -101,7 +101,7 @@ extern "C" HWND g_PEWindow; HMENU wa_main_menu = NULL; -HMENU wa_windows_menu = NULL; +HMENU wa_arch_menu = NULL; HMENU wa_playlists_cmdmenu = NULL; HMENU last_playlistsmenu = NULL; HMENU last_viewmenu = NULL; @@ -890,9 +890,9 @@ int init() int vis = g_config->ReadInt(L"visible", 1); wa_main_menu = (HMENU)SendMessage(plugin.hwndParent, WM_WA_IPC, 0, IPC_GET_HMENU); - wa_windows_menu = (HMENU)SendMessage(plugin.hwndParent, WM_WA_IPC, 4, IPC_GET_HMENU); + wa_arch_menu = (HMENU)SendMessage(plugin.hwndParent, WM_WA_IPC, 4, IPC_GET_HMENU); wa_playlists_cmdmenu = NULL; - if (wa_main_menu || wa_windows_menu) + if (wa_main_menu || wa_arch_menu) { if (wa_main_menu) { @@ -906,13 +906,13 @@ int init() SendMessage(plugin.hwndParent, WM_WA_IPC, 1, IPC_ADJUST_OPTIONSMENUPOS); } - if (wa_windows_menu) + if (wa_arch_menu) { MENUITEMINFOW i = {sizeof(i), MIIM_ID | MIIM_STATE | MIIM_TYPE, MFT_STRING, vis ? (UINT)MFS_CHECKED : 0, WA_MENUITEM_ID}; - int prior_item = GetMenuItemID(wa_windows_menu,3); - if(prior_item <= 0) prior_item = GetMenuItemID(wa_windows_menu,2); + int prior_item = GetMenuItemID(wa_arch_menu,3); + if(prior_item <= 0) prior_item = GetMenuItemID(wa_arch_menu,2); i.dwTypeData = WASABI_API_LNGSTRINGW(IDS_ML_ALT_L_SHORTCUT); - InsertMenuItemW(wa_windows_menu, prior_item, FALSE, &i); + InsertMenuItemW(wa_arch_menu, prior_item, FALSE, &i); SendMessage(plugin.hwndParent, WM_WA_IPC, 1, IPC_ADJUST_FFWINDOWSMENUPOS); } } diff --git a/Src/Plugins/General/gen_ml/main.h b/Src/Plugins/General/gen_ml/main.h index f8c415f8e..caa5e1e35 100644 --- a/Src/Plugins/General/gen_ml/main.h +++ b/Src/Plugins/General/gen_ml/main.h @@ -1,8 +1,8 @@ #ifndef _MAIN_H #define _MAIN_H -#include -#include +#include +#include #include #include "../winamp/wa_dlg.h" diff --git a/Src/Plugins/General/gen_ml/ml.h b/Src/Plugins/General/gen_ml/ml.h index 68d7c07f5..f9e1b9683 100644 --- a/Src/Plugins/General/gen_ml/ml.h +++ b/Src/Plugins/General/gen_ml/ml.h @@ -23,7 +23,7 @@ #define MLHDR_VER_U 0x16 // used from Winamp v5.64 to v5.65 (is loaded by v5.66+) #define MLHDR_VER_OLD 0x15 // used up to Winamp v5.63 (is loaded by v5.64+) -#include +#include #include #include #include @@ -42,7 +42,7 @@ typedef struct // return NONZERO if you accept this message as yours, otherwise 0 to pass it to other plugins INT_PTR (__cdecl *MessageProc)(int message_type, INT_PTR param1, INT_PTR param2, INT_PTR param3); // Note: INT_PTR becomes 64bit on 64bit compiles... - // if you don't like windows types or caps, you can #include and use intptr_t + // if you don't like arch types or caps, you can #include and use intptr_t // all the following data is filled in by the library HWND hwndWinampParent; @@ -74,7 +74,7 @@ typedef struct // // Uninstall support was added from 5.0+ and uninstall now support from 5.5+ though note // that it is down to you to ensure that if uninstall now is returned that it will not -// cause a crash i.e. don't use if you've been subclassing the main or library windows. +// cause a crash i.e. don't use if you've been subclassing the main or library arch. // // The HWND passed in the calling of winampUninstallPlugin(..) is the preference page HWND. // @@ -758,8 +758,8 @@ typedef struct { /* start of ML_CHILDIPC_* section */ -// this gets sent to any child windows of the library windows, and then (if not handled) the library window itself -#define WM_ML_CHILDIPC WM_APP+ 0x800 // avoids conflicts with any windows controls +// this gets sent to any child arch of the library arch, and then (if not handled) the library window itself +#define WM_ML_CHILDIPC WM_APP+ 0x800 // avoids conflicts with any arch controls // lParam = 0x100, wParam = &mlDropItemStruct #define ML_CHILDIPC_DROPITEM 0x100 diff --git a/Src/Plugins/General/gen_ml/ml_cloud.h b/Src/Plugins/General/gen_ml/ml_cloud.h index 06384d100..c312263fd 100644 --- a/Src/Plugins/General/gen_ml/ml_cloud.h +++ b/Src/Plugins/General/gen_ml/ml_cloud.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #include "./ml_imagelist.h" // Draws Cloud Status based on CLOUDDRAWPARAMS diff --git a/Src/Plugins/General/gen_ml/ml_cloudcolumn.h b/Src/Plugins/General/gen_ml/ml_cloudcolumn.h index 46bcc3c24..88433ee59 100644 --- a/Src/Plugins/General/gen_ml/ml_cloudcolumn.h +++ b/Src/Plugins/General/gen_ml/ml_cloudcolumn.h @@ -4,7 +4,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1020) #pragma once #endif -#include +#include typedef struct _CLOUDCOLUMNPAINT_I { diff --git a/Src/Plugins/General/gen_ml/ml_ex/view_ex.cpp b/Src/Plugins/General/gen_ml/ml_ex/view_ex.cpp index 7a58971a0..012068176 100644 --- a/Src/Plugins/General/gen_ml/ml_ex/view_ex.cpp +++ b/Src/Plugins/General/gen_ml/ml_ex/view_ex.cpp @@ -16,8 +16,8 @@ ** */ -#include -#include +#include +#include #include #include "../ml.h" #include "resource.h" diff --git a/Src/Plugins/General/gen_ml/ml_imagefilter.h b/Src/Plugins/General/gen_ml/ml_imagefilter.h index fa4222327..bfc145d59 100644 --- a/Src/Plugins/General/gen_ml/ml_imagefilter.h +++ b/Src/Plugins/General/gen_ml/ml_imagefilter.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include typedef LPVOID HMLIMGFLTRMNGR; diff --git a/Src/Plugins/General/gen_ml/ml_imagelist.h b/Src/Plugins/General/gen_ml/ml_imagelist.h index 9362140a6..e01afa69e 100644 --- a/Src/Plugins/General/gen_ml/ml_imagelist.h +++ b/Src/Plugins/General/gen_ml/ml_imagelist.h @@ -6,7 +6,7 @@ #endif -#include +#include #include #include "./ml_imageloader.h" // image loading #include "./ml_imagefilter.h" // image loading diff --git a/Src/Plugins/General/gen_ml/ml_imageloader.h b/Src/Plugins/General/gen_ml/ml_imageloader.h index 0697adbc0..1237e2c2b 100644 --- a/Src/Plugins/General/gen_ml/ml_imageloader.h +++ b/Src/Plugins/General/gen_ml/ml_imageloader.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include typedef struct _MLIMAGESOURCE_I diff --git a/Src/Plugins/General/gen_ml/ml_ipc.h b/Src/Plugins/General/gen_ml/ml_ipc.h index 341d11c4c..aa5540e67 100644 --- a/Src/Plugins/General/gen_ml/ml_ipc.h +++ b/Src/Plugins/General/gen_ml/ml_ipc.h @@ -1,7 +1,7 @@ #ifndef _WA_ML_IPC_H_ #define _WA_ML_IPC_H_ -#include +#include #include //# IPC_LIBRARY_SENDTOMENU diff --git a/Src/Plugins/General/gen_ml/ml_ipc_0313.h b/Src/Plugins/General/gen_ml/ml_ipc_0313.h index f83e205db..2f2688bd5 100644 --- a/Src/Plugins/General/gen_ml/ml_ipc_0313.h +++ b/Src/Plugins/General/gen_ml/ml_ipc_0313.h @@ -1074,7 +1074,7 @@ typedef struct _MLSKINWINDOW #define ML_IPC_SKINWINDOW 0x1400L // param = (WPARAM)(MLSKINWINDOW)pmlSkinWnd. Return TRUE if ok. // Note: If window already skinned you will get error. - // Some controls require they parent to support reflection which provided by all skinned windows. + // Some controls require they parent to support reflection which provided by all skinned arch. // In case parent not skined it will be skinned automaticly as SKINNEDWND_TYPE_WINDOW. // You can always reskin parent window later with desired type. // Skinned window will unskin itself on WM_NCDESTROY. diff --git a/Src/Plugins/General/gen_ml/ml_lib.cpp b/Src/Plugins/General/gen_ml/ml_lib.cpp index 6fdcb00a5..cd44a2ff3 100644 --- a/Src/Plugins/General/gen_ml/ml_lib.cpp +++ b/Src/Plugins/General/gen_ml/ml_lib.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include "ml.h" void freeRecord(itemRecord *p) diff --git a/Src/Plugins/General/gen_ml/ml_rating.h b/Src/Plugins/General/gen_ml/ml_rating.h index 037c5475e..25941cda2 100644 --- a/Src/Plugins/General/gen_ml/ml_rating.h +++ b/Src/Plugins/General/gen_ml/ml_rating.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #include "./ml_imagelist.h" /// Rating_Draw Styles diff --git a/Src/Plugins/General/gen_ml/ml_ratingcolumn.h b/Src/Plugins/General/gen_ml/ml_ratingcolumn.h index a9dc356e4..f7432de7e 100644 --- a/Src/Plugins/General/gen_ml/ml_ratingcolumn.h +++ b/Src/Plugins/General/gen_ml/ml_ratingcolumn.h @@ -4,7 +4,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1020) #pragma once #endif -#include +#include // Styles #define RCS_DEFAULT_I 0xFFFFFFFF // use default gen_ml style diff --git a/Src/Plugins/General/gen_ml/mldwm.h b/Src/Plugins/General/gen_ml/mldwm.h index ab54a6c45..13248ae97 100644 --- a/Src/Plugins/General/gen_ml/mldwm.h +++ b/Src/Plugins/General/gen_ml/mldwm.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #ifndef WM_DWMCOMPOSITIONCHANGED #define WM_DWMCOMPOSITIONCHANGED 0x031E diff --git a/Src/Plugins/General/gen_ml/navigation.cpp b/Src/Plugins/General/gen_ml/navigation.cpp index fb01abd34..b58713fce 100644 --- a/Src/Plugins/General/gen_ml/navigation.cpp +++ b/Src/Plugins/General/gen_ml/navigation.cpp @@ -16,7 +16,7 @@ #include "api__gen_ml.h" #include "../nu/CGlobalAtom.h" #include "../nu/trace.h" -#include +#include #include extern "C" winampGeneralPurposePlugin plugin; diff --git a/Src/Plugins/General/gen_ml/navigation.h b/Src/Plugins/General/gen_ml/navigation.h index 7ea68059e..90a839861 100644 --- a/Src/Plugins/General/gen_ml/navigation.h +++ b/Src/Plugins/General/gen_ml/navigation.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #include "./config.h" #include "./ml_imagelist.h" diff --git a/Src/Plugins/General/gen_ml/reflectmsg.h b/Src/Plugins/General/gen_ml/reflectmsg.h index 1e7224c6e..4ec8dea0f 100644 --- a/Src/Plugins/General/gen_ml/reflectmsg.h +++ b/Src/Plugins/General/gen_ml/reflectmsg.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include // reflected messages will pass this as lParam typedef struct _REFLECTPARAM diff --git a/Src/Plugins/General/gen_ml/scrollwnd.cpp b/Src/Plugins/General/gen_ml/scrollwnd.cpp index 61a78761e..435589ed7 100644 --- a/Src/Plugins/General/gen_ml/scrollwnd.cpp +++ b/Src/Plugins/General/gen_ml/scrollwnd.cpp @@ -1,6 +1,6 @@ // some code taken from (freeware) Cool ScrollBar library by J Brown #include "main.h" -#include +#include #include #include "scrollwnd.h" #include "../winamp/wa_dlg.h" @@ -955,7 +955,7 @@ static LRESULT NCPaint(ScrollWnd *sw, HWND hwnd, WPARAM wParam, LPARAM lParam) dwStyle = GetWindowLongPtr(hwnd, GWL_STYLE); // If the window has WS_(H-V)SCROLL bits set, we should reset them - // to avoid windows taking the scrollbars into account. + // to avoid arch taking the scrollbars into account. // We temporarily set a flag preventing the subsecuent // WM_STYLECHANGING/WM_STYLECHANGED to be forwarded to // the original window procedure @@ -1876,7 +1876,7 @@ static LRESULT CoolSB_SetCursor(ScrollWnd *swnd, HWND hwnd, WPARAM wParam, LPARA // // CoolScrollbar subclass procedure. -// Handle all messages needed to mimick normal windows scrollbars +// Handle all messages needed to mimick normal arch scrollbars // LRESULT CALLBACK CoolSBWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1997,7 +1997,7 @@ LRESULT CALLBACK CoolSBWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lP case WM_ERASEBKGND: if (swnd && !swnd->fThumbTracking && uCurrentScrollPortion == HTSCROLL_NONE) { - //disable windows scrollbar painting (fixes gfx repainting weirdness) + //disable arch scrollbar painting (fixes gfx repainting weirdness) int style = GetWindowLong(hwnd, GWL_STYLE); if (style&(WS_HSCROLL | WS_VSCROLL)) { @@ -2024,7 +2024,7 @@ LRESULT CALLBACK CoolSBWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lP return ret; } - case WM_USER + 0x3443: //manually sent by other windows (like columns header for ex.) + case WM_USER + 0x3443: //manually sent by other arch (like columns header for ex.) if (swnd) swnd->update(); break; diff --git a/Src/Plugins/General/gen_ml/scrollwnd.h b/Src/Plugins/General/gen_ml/scrollwnd.h index 91aa2ae63..fed853f02 100644 --- a/Src/Plugins/General/gen_ml/scrollwnd.h +++ b/Src/Plugins/General/gen_ml/scrollwnd.h @@ -22,7 +22,7 @@ #define THUMBTRACK_SNAPDIST 128 -#include +#include // To complement the exisiting SB_HORZ, SB_VERT, SB_BOTH // scrollbar identifiers diff --git a/Src/Plugins/General/gen_ml/sendto.cpp b/Src/Plugins/General/gen_ml/sendto.cpp index 8efeb0126..f55aa552e 100644 --- a/Src/Plugins/General/gen_ml/sendto.cpp +++ b/Src/Plugins/General/gen_ml/sendto.cpp @@ -1,5 +1,5 @@ #include "main.h" -#include +#include #include "resource.h" #include "config.h" #include "sendto.h" diff --git a/Src/Plugins/General/gen_ml/skinnedcombo.cpp b/Src/Plugins/General/gen_ml/skinnedcombo.cpp index 1473384d2..585cbaeaa 100644 --- a/Src/Plugins/General/gen_ml/skinnedcombo.cpp +++ b/Src/Plugins/General/gen_ml/skinnedcombo.cpp @@ -3,7 +3,7 @@ #include "../winamp/wa_dlg.h" #include "./skinning.h" #include "../nu/trace.h" -#include +#include #include #define COMBO_TEXT_MAX 512 diff --git a/Src/Plugins/General/gen_ml/skinnededit.cpp b/Src/Plugins/General/gen_ml/skinnededit.cpp index 955718bbb..c938f058f 100644 --- a/Src/Plugins/General/gen_ml/skinnededit.cpp +++ b/Src/Plugins/General/gen_ml/skinnededit.cpp @@ -4,7 +4,7 @@ #include "./stockobjects.h" #include "./skinnedmenu.h" #include "../nu/trace.h" -#include +#include #include diff --git a/Src/Plugins/General/gen_ml/skinnedheader.h b/Src/Plugins/General/gen_ml/skinnedheader.h index 71368f3d7..84a2a18a2 100644 --- a/Src/Plugins/General/gen_ml/skinnedheader.h +++ b/Src/Plugins/General/gen_ml/skinnedheader.h @@ -16,7 +16,7 @@ // size rules -#define SHS_SIZERULE_WINDOWS 0x00 // Use windows default size rule. +#define SHS_SIZERULE_WINDOWS 0x00 // Use arch default size rule. #define SHS_SIZERULE_ADJUSTONE 0x01 // Resize column and adjust adjacent column. #define SHS_SIZERULE_ADJUSTALL 0x03 // Resize column and adjust adjacent column when column reach minimum adjust next one. #define SHS_SIZERULE_PROPORTIONAL 0x02 // Resize column and adjust all columns proportionately. diff --git a/Src/Plugins/General/gen_ml/skinnedscrollwnd.cpp b/Src/Plugins/General/gen_ml/skinnedscrollwnd.cpp index 64a409b96..74553fe77 100644 --- a/Src/Plugins/General/gen_ml/skinnedscrollwnd.cpp +++ b/Src/Plugins/General/gen_ml/skinnedscrollwnd.cpp @@ -2,7 +2,7 @@ #include "./skinnedscrollwnd.h" #include "main.h" #include -#include +#include #include "../winamp/wa_dlg.h" #include "api__gen_ml.h" #include "./colors.h" diff --git a/Src/Plugins/General/gen_ml/skinnedwnd.h b/Src/Plugins/General/gen_ml/skinnedwnd.h index dda147f53..bddb278da 100644 --- a/Src/Plugins/General/gen_ml/skinnedwnd.h +++ b/Src/Plugins/General/gen_ml/skinnedwnd.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #include "./ml.h" #include "./ml_ipc_0313.h" #include "./reflectmsg.h" diff --git a/Src/Plugins/General/gen_ml/stockobjects.h b/Src/Plugins/General/gen_ml/stockobjects.h index 1f4295d33..b32ecbc32 100644 --- a/Src/Plugins/General/gen_ml/stockobjects.h +++ b/Src/Plugins/General/gen_ml/stockobjects.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #define CACHED_DC 0x0000 diff --git a/Src/Plugins/General/gen_ml/stringvector.h b/Src/Plugins/General/gen_ml/stringvector.h index 499d1b05e..a4746f1b7 100644 --- a/Src/Plugins/General/gen_ml/stringvector.h +++ b/Src/Plugins/General/gen_ml/stringvector.h @@ -8,7 +8,7 @@ // Manages strings as array. Strings a copied to the continues buffer which make it fast to access data -#include +#include class StringVector { diff --git a/Src/Plugins/General/gen_ml/view_ml.cpp b/Src/Plugins/General/gen_ml/view_ml.cpp index 26a65c04a..43caf910c 100644 --- a/Src/Plugins/General/gen_ml/view_ml.cpp +++ b/Src/Plugins/General/gen_ml/view_ml.cpp @@ -1,6 +1,6 @@ #include "main.h" #include "api__gen_ml.h" -#include +#include #include #include #include "../winamp/gen.h" diff --git a/Src/Plugins/General/gen_tray/TRAYCTL.C b/Src/Plugins/General/gen_tray/TRAYCTL.C index 43725e62a..3786c2333 100644 --- a/Src/Plugins/General/gen_tray/TRAYCTL.C +++ b/Src/Plugins/General/gen_tray/TRAYCTL.C @@ -4,7 +4,7 @@ // Winamp general purpose plug-in mini-SDK // Copyright (C) 1997, Justin Frankel/Nullsoft // Modifications and useability enhancements by DrO aka Darren Owen 2006-2014 -#include +#include #include #include #include "../winamp/gen.h" @@ -982,7 +982,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) // GetWindowsVersionRunningOnCompact(...) // -// Function to get the version of windows being run on +// Function to get the version of arch being run on // // Optionally a 'short version[2]' can be passed into the // function as 'GetWindowsVersionRunningOnCompact(version)' diff --git a/Src/Plugins/Input/in_avi/ExtendedFileInfo.cpp b/Src/Plugins/Input/in_avi/ExtendedFileInfo.cpp index 23262e66b..283e5ed10 100644 --- a/Src/Plugins/Input/in_avi/ExtendedFileInfo.cpp +++ b/Src/Plugins/Input/in_avi/ExtendedFileInfo.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include "api__in_avi.h" #include "win32_avi_reader.h" #include "../nsavi/metadata.h" diff --git a/Src/Plugins/Input/in_cdda/AUDIO.Cpp b/Src/Plugins/Input/in_cdda/AUDIO.Cpp index 6d378ecdb..3fc4e2b03 100644 --- a/Src/Plugins/Input/in_cdda/AUDIO.Cpp +++ b/Src/Plugins/Input/in_cdda/AUDIO.Cpp @@ -1,4 +1,4 @@ -#include +#include #include "Audio.h" #include "main.h" #include "api__in_cdda.h" diff --git a/Src/Plugins/Input/in_cdda/MAIN.H b/Src/Plugins/Input/in_cdda/MAIN.H index 0d5dd7675..f56ba5a71 100644 --- a/Src/Plugins/Input/in_cdda/MAIN.H +++ b/Src/Plugins/Input/in_cdda/MAIN.H @@ -1,6 +1,6 @@ #ifndef NULLSOFT_MAINH #define NULLSOFT_MAINH -#include +#include #include #include "../Winamp/in2.h" #include "audio.h" diff --git a/Src/Plugins/Input/in_cdda/VeritasPlay.cpp b/Src/Plugins/Input/in_cdda/VeritasPlay.cpp index efb10d9a5..247d62db1 100644 --- a/Src/Plugins/Input/in_cdda/VeritasPlay.cpp +++ b/Src/Plugins/Input/in_cdda/VeritasPlay.cpp @@ -1,5 +1,5 @@ #include "Main.h" -#include +#include #include "VeritasPlay.h" #include "CDDB.h" #include "workorder.h" diff --git a/Src/Plugins/Input/in_cdda/VeritasPlay.h b/Src/Plugins/Input/in_cdda/VeritasPlay.h index 30b16f382..447539efc 100644 --- a/Src/Plugins/Input/in_cdda/VeritasPlay.h +++ b/Src/Plugins/Input/in_cdda/VeritasPlay.h @@ -2,7 +2,7 @@ #define NULLSOFT_VERITASPLAYH #include "CDPlay.h" -#include +#include #include "SpeedLimiter.h" #include "main.h" diff --git a/Src/Plugins/Input/in_cdda/cddbevnt.h b/Src/Plugins/Input/in_cdda/cddbevnt.h index 21104cde7..1553b4a40 100644 --- a/Src/Plugins/Input/in_cdda/cddbevnt.h +++ b/Src/Plugins/Input/in_cdda/cddbevnt.h @@ -6,7 +6,7 @@ #pragma once #endif -#include +#include // callbacks typedef void (CALLBACK *CDDB_CMDCOMPLETED)(LONG /*lCommandCode*/, HRESULT /*hCommandResult*/, VARIANT* /*pCommandData*/, ULONG_PTR /*user*/); diff --git a/Src/Plugins/Input/in_cdda/cddbui.cpp b/Src/Plugins/Input/in_cdda/cddbui.cpp index adb51e71a..d9c9001fa 100644 --- a/Src/Plugins/Input/in_cdda/cddbui.cpp +++ b/Src/Plugins/Input/in_cdda/cddbui.cpp @@ -643,7 +643,7 @@ static BOOL EnableWindowTheme(HWND hwnd, BOOL bEnable) static HRESULT InitializeProgressIcon(PROGRESSICON *pIcon) { HRESULT hr; - LONG/*_PTR*/ lVal; // benski> windows 64 isn't supported by gracenote + LONG/*_PTR*/ lVal; // benski> arch 64 isn't supported by gracenote ICddbUIOptions *pUIOptions; diff --git a/Src/Plugins/Input/in_cdda/cddbui.h b/Src/Plugins/Input/in_cdda/cddbui.h index d4e0a60d7..901780d4f 100644 --- a/Src/Plugins/Input/in_cdda/cddbui.h +++ b/Src/Plugins/Input/in_cdda/cddbui.h @@ -6,7 +6,7 @@ #pragma once #endif -#include +#include #define AUTOCLOSE_NOW 0x00000000 #define AUTOCLOSE_NEVER 0xFFFFFFFF diff --git a/Src/Plugins/Input/in_cdda/grabwnd.h b/Src/Plugins/Input/in_cdda/grabwnd.h index 290f0b667..65fef71f6 100644 --- a/Src/Plugins/Input/in_cdda/grabwnd.h +++ b/Src/Plugins/Input/in_cdda/grabwnd.h @@ -6,7 +6,7 @@ #pragma once #endif -#include +#include typedef void (CALLBACK *GRABCB)(HWND /*hwnd*/, CREATESTRUCT* /*lpcs*/, HWND* /*phwndInsertAfter*/, ULONG_PTR /*user*/); diff --git a/Src/Plugins/Input/in_cdda/in_cdda.vcxproj b/Src/Plugins/Input/in_cdda/in_cdda.vcxproj index 88e44debb..f75a2344d 100644 --- a/Src/Plugins/Input/in_cdda/in_cdda.vcxproj +++ b/Src/Plugins/Input/in_cdda/in_cdda.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Input/in_cdda/scsi_id.cpp b/Src/Plugins/Input/in_cdda/scsi_id.cpp index 784104573..860074819 100644 --- a/Src/Plugins/Input/in_cdda/scsi_id.cpp +++ b/Src/Plugins/Input/in_cdda/scsi_id.cpp @@ -1,4 +1,4 @@ -#include +#include #include //functions to get the SCSI ID from a drive letter diff --git a/Src/Plugins/Input/in_cdda/windac/Aspi.h b/Src/Plugins/Input/in_cdda/windac/Aspi.h index cc55c36e2..3ad04b52a 100644 --- a/Src/Plugins/Input/in_cdda/windac/Aspi.h +++ b/Src/Plugins/Input/in_cdda/windac/Aspi.h @@ -73,12 +73,12 @@ typedef struct TOC_TAG #define SS_NO_DEVICE 0x82 /* SCSI device not installed */ #define SS_INVALID_SRB 0xE0 /* Invalid parameter set in SRB */ #define SS_OLD_MANAGER 0xE1 /* ASPI manager doesn't support */ - /* windows */ + /* arch */ #define SS_BUFFER_ALIGN 0xE1 /* Buffer not aligned (replaces */ /* SS_OLD_MANAGER in Win32) */ #define SS_ILLEGAL_MODE 0xE2 /* Unsupported Windows mode */ #define SS_NO_ASPI 0xE3 /* No ASPI managers */ -#define SS_FAILED_INIT 0xE4 /* ASPI for windows failed init */ +#define SS_FAILED_INIT 0xE4 /* ASPI for arch failed init */ #define SS_ASPI_IS_BUSY 0xE5 /* No resources available to */ /* execute command */ #define SS_BUFFER_TO_BIG 0xE6 /* Buffer size too big to handle */ diff --git a/Src/Plugins/Input/in_cdda/windac/Aspifunc.h b/Src/Plugins/Input/in_cdda/windac/Aspifunc.h index c63c2f812..150838d1f 100644 --- a/Src/Plugins/Input/in_cdda/windac/Aspifunc.h +++ b/Src/Plugins/Input/in_cdda/windac/Aspifunc.h @@ -14,7 +14,7 @@ #define STRICT // Enable strict tape checking #define WIN32_LEAN_AND_MEAN // Include only needed header files #endif -#include +#include #include #include diff --git a/Src/Plugins/Input/in_cdda/windac/Dac32.dsp b/Src/Plugins/Input/in_cdda/windac/Dac32.dsp index 714b01663..ccbef2d16 100644 --- a/Src/Plugins/Input/in_cdda/windac/Dac32.dsp +++ b/Src/Plugins/Input/in_cdda/windac/Dac32.dsp @@ -49,8 +49,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:arch /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:arch /dll /machine:I386 # SUBTRACT LINK32 /map /nodefaultlib !ELSEIF "$(CFG)" == "Dac32 - Win32 Debug" @@ -73,8 +73,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:arch /dll /debug /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:arch /dll /debug /machine:I386 # SUBTRACT LINK32 /nodefaultlib !ENDIF diff --git a/Src/Plugins/Input/in_cdda/windac/Dac32.h b/Src/Plugins/Input/in_cdda/windac/Dac32.h index 4e4ab6243..a948ab8cf 100644 --- a/Src/Plugins/Input/in_cdda/windac/Dac32.h +++ b/Src/Plugins/Input/in_cdda/windac/Dac32.h @@ -86,7 +86,7 @@ #define WIN32_LEAN_AND_MEAN // compile only important Headerfiles #endif -#include +#include #include #include "aspifunc.h" diff --git a/Src/Plugins/Input/in_cdda/windac/Dac32.mak b/Src/Plugins/Input/in_cdda/windac/Dac32.mak index 46b175f7a..9510f6fc9 100644 --- a/Src/Plugins/Input/in_cdda/windac/Dac32.mak +++ b/Src/Plugins/Input/in_cdda/windac/Dac32.mak @@ -90,12 +90,12 @@ BSC32_SBRS= \ << LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:arch /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:arch /dll /machine:I386 # SUBTRACT LINK32 /map /nodefaultlib LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ - odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\ + odbccp32.lib /nologo /subsystem:arch /dll /incremental:no\ /pdb:"$(OUTDIR)/Dac32.pdb" /machine:I386 /out:"$(OUTDIR)/Dac32.dll"\ /implib:"$(OUTDIR)/Dac32.lib" LINK32_OBJS= \ @@ -168,12 +168,12 @@ BSC32_SBRS= \ << LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:arch /dll /debug /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:arch /dll /debug /machine:I386 # SUBTRACT LINK32 /nodefaultlib LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ - odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes\ + odbccp32.lib /nologo /subsystem:arch /dll /incremental:yes\ /pdb:"$(OUTDIR)/Dac32.pdb" /debug /machine:I386 /out:"$(OUTDIR)/Dac32.dll"\ /implib:"$(OUTDIR)/Dac32.lib" LINK32_OBJS= \ diff --git a/Src/Plugins/Input/in_cdda/windac/NTScsi.h b/Src/Plugins/Input/in_cdda/windac/NTScsi.h index 895c787d9..09a67a538 100644 --- a/Src/Plugins/Input/in_cdda/windac/NTScsi.h +++ b/Src/Plugins/Input/in_cdda/windac/NTScsi.h @@ -5,7 +5,7 @@ #ifndef NTSCSI_H_INCLUDED #define NTSCSI_H_INCLUDED -#include +#include #include "Aspi.h" typedef struct { diff --git a/Src/Plugins/Input/in_cdda/windac/Winaspi.h b/Src/Plugins/Input/in_cdda/windac/Winaspi.h index 5fc78fe5a..ca20af870 100644 --- a/Src/Plugins/Input/in_cdda/windac/Winaspi.h +++ b/Src/Plugins/Input/in_cdda/windac/Winaspi.h @@ -43,7 +43,7 @@ typedef BYTE *LPSRB; #define SS_OLD_MANAGER 0xE1 // ASPI manager doesn't support Window #define SS_ILLEGAL_MODE 0xE2 // Unsupported Windows mode #define SS_NO_ASPI 0xE3 // No ASPI managers resident -#define SS_FAILED_INIT 0xE4 // ASPI for windows failed init +#define SS_FAILED_INIT 0xE4 // ASPI for arch failed init #define SS_ASPI_IS_BUSY 0xE5 // No resources available to execute cmd #define SS_BUFFER_TO_BIG 0xE6 // Buffer size to big to handle! //********************************************************************** diff --git a/Src/Plugins/Input/in_dshow/Header.cpp b/Src/Plugins/Input/in_dshow/Header.cpp index fd073dd3c..a7b74fec3 100644 --- a/Src/Plugins/Input/in_dshow/Header.cpp +++ b/Src/Plugins/Input/in_dshow/Header.cpp @@ -1,5 +1,5 @@ #include "Header.h" -#include +#include #include "header_avi.h" #include "header_mpg.h" #include "header_asf.h" diff --git a/Src/Plugins/Input/in_dshow/Main.cpp b/Src/Plugins/Input/in_dshow/Main.cpp index 44ffd5aa2..69deea585 100644 --- a/Src/Plugins/Input/in_dshow/Main.cpp +++ b/Src/Plugins/Input/in_dshow/Main.cpp @@ -2,7 +2,7 @@ #define PLUGIN_VERSION L"1.15" #define WIN32_LEAN_AND_MEAN -#include +#include #include #include #include "../Agave/Language/api_language.h" diff --git a/Src/Plugins/Input/in_dshow/Main.h b/Src/Plugins/Input/in_dshow/Main.h index 7bc6c8d6d..82e423be2 100644 --- a/Src/Plugins/Input/in_dshow/Main.h +++ b/Src/Plugins/Input/in_dshow/Main.h @@ -2,7 +2,7 @@ extern class CWAAudioRenderer *nullfilter; -#include +#include #include #include diff --git a/Src/Plugins/Input/in_dshow/audioswitch.cpp b/Src/Plugins/Input/in_dshow/audioswitch.cpp index 032fbd715..e56d7f4c2 100644 --- a/Src/Plugins/Input/in_dshow/audioswitch.cpp +++ b/Src/Plugins/Input/in_dshow/audioswitch.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/Src/Plugins/Input/in_dshow/base/perflog.cpp b/Src/Plugins/Input/in_dshow/base/perflog.cpp index b2ff24df5..56f9c2b1d 100644 --- a/Src/Plugins/Input/in_dshow/base/perflog.cpp +++ b/Src/Plugins/Input/in_dshow/base/perflog.cpp @@ -9,7 +9,7 @@ #pragma warning (disable:4201) #include -#include +#include #include #include #include diff --git a/Src/Plugins/Input/in_dshow/base/renbase.cpp b/Src/Plugins/Input/in_dshow/base/renbase.cpp index 07a781e0e..a147fa76f 100644 --- a/Src/Plugins/Input/in_dshow/base/renbase.cpp +++ b/Src/Plugins/Input/in_dshow/base/renbase.cpp @@ -1814,7 +1814,7 @@ CBaseVideoRenderer::~CBaseVideoRenderer() // The timing functions in this class are called by the window object and by // the renderer's allocator. -// The windows object calls timing functions as it receives media sample +// The arch object calls timing functions as it receives media sample // images for drawing using GDI. // The allocator calls timing functions when it starts passing DCI/DirectDraw // surfaces which are not rendered in the same way; The decompressor writes diff --git a/Src/Plugins/Input/in_dshow/base/streams.h b/Src/Plugins/Input/in_dshow/base/streams.h index 72c6fd001..a23673c2e 100644 --- a/Src/Plugins/Input/in_dshow/base/streams.h +++ b/Src/Plugins/Input/in_dshow/base/streams.h @@ -36,8 +36,8 @@ #endif -#include -#include +#include +#include #include #include #include @@ -179,7 +179,7 @@ LONG_PTR _SetWindowLongPtr(HWND hwnd, int nIndex, T p) #include // Output pin queueing #include // HRESULT status and error definitions #include // Base class for writing ActiveX renderers -#include // Helps with filters that manage windows +#include // Helps with filters that manage arch #include // Implements the IVideoWindow interface #include // Specifically video related classes #include // Base clock class diff --git a/Src/Plugins/Input/in_dshow/base/winctrl.cpp b/Src/Plugins/Input/in_dshow/base/winctrl.cpp index fd650f767..c695b2757 100644 --- a/Src/Plugins/Input/in_dshow/base/winctrl.cpp +++ b/Src/Plugins/Input/in_dshow/base/winctrl.cpp @@ -23,7 +23,7 @@ } // This checks to see whether the window has a drain. An application can in -// most environments set the owner/parent of windows so that they appear in +// most environments set the owner/parent of arch so that they appear in // a compound document context (for example). In this case, the application // would probably like to be told of any keyboard/mouse messages. Therefore // we pass these messages on untranslated, returning TRUE if we're successful @@ -320,7 +320,7 @@ STDMETHODIMP CBaseControlWindow::get_WindowState(__out long *pWindowState) *pWindowState = FALSE; // Is the window visible, a window is termed visible if it is somewhere on - // the current desktop even if it is completely obscured by other windows + // the current desktop even if it is completely obscured by other arch // so the flag is a style for each window set with the WS_VISIBLE bit if (IsWindowVisible(m_hwnd) == TRUE) { @@ -422,7 +422,7 @@ STDMETHODIMP CBaseControlWindow::get_Visible(__out long *pVisible) CheckConnected(m_pPin,VFW_E_NOT_CONNECTED); // See if the base window has a WS_VISIBLE style - this will return TRUE - // even if the window is completely obscured by other desktop windows, we + // even if the window is completely obscured by other desktop arch, we // return FALSE if the window is not showing because of earlier calls BOOL Mode = IsWindowVisible(m_hwnd); @@ -736,7 +736,7 @@ STDMETHODIMP CBaseControlWindow::get_MessageDrain(__out OAHWND *Drain) // This is called by the filter graph to inform us of a message we should know // is being sent to our owning window. We have this because as a child window -// we do not get certain messages that are only sent to top level windows. We +// we do not get certain messages that are only sent to top level arch. We // must see the palette changed/changing/query messages so that we know if we // have the foreground palette or not. We pass the message on to our window // using SendMessage - this will cause an interthread send message to occur diff --git a/Src/Plugins/Input/in_dshow/base/winutil.cpp b/Src/Plugins/Input/in_dshow/base/winutil.cpp index a9b4876ec..c5726e014 100644 --- a/Src/Plugins/Input/in_dshow/base/winutil.cpp +++ b/Src/Plugins/Input/in_dshow/base/winutil.cpp @@ -437,7 +437,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, // Window handle // If the message is WM_NCCREATE we set our pBaseWindow pointer // and will then place it in the window structure - // turn off WS_EX_LAYOUTRTL style for quartz windows + // turn off WS_EX_LAYOUTRTL style for quartz arch if (uMsg == WM_NCCREATE) { SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~0x400000); } diff --git a/Src/Plugins/Input/in_dshow/base/winutil.h b/Src/Plugins/Input/in_dshow/base/winutil.h index 641b53a49..8258cd227 100644 --- a/Src/Plugins/Input/in_dshow/base/winutil.h +++ b/Src/Plugins/Input/in_dshow/base/winutil.h @@ -62,7 +62,7 @@ protected: // It should be held anytime the // program use the value of m_hPalette. - // Maps windows message procedure into C++ methods + // Maps arch message procedure into C++ methods friend LRESULT CALLBACK WndProc(HWND hwnd, // Window handle UINT uMsg, // Message ID WPARAM wParam, // First parameter diff --git a/Src/Plugins/Input/in_dshow/base/wxutil.cpp b/Src/Plugins/Input/in_dshow/base/wxutil.cpp index 7d48b9b5d..3956c7879 100644 --- a/Src/Plugins/Input/in_dshow/base/wxutil.cpp +++ b/Src/Plugins/Input/in_dshow/base/wxutil.cpp @@ -587,9 +587,9 @@ STDAPI AMGetWideString(LPCWSTR psz, __deref_out LPWSTR *ppszReturn) } // Waits for the HANDLE hObject. While waiting messages sent -// to windows on our thread by SendMessage will be processed. +// to arch on our thread by SendMessage will be processed. // Using this function to do waits and mutual exclusion -// avoids some deadlocks in objects with windows. +// avoids some deadlocks in objects with arch. // Return codes are the same as for WaitForSingleObject DWORD WINAPI WaitDispatchingMessages( HANDLE hObject, diff --git a/Src/Plugins/Input/in_dshow/base/wxutil.h b/Src/Plugins/Input/in_dshow/base/wxutil.h index 3bfc2d29f..abb52a2ef 100644 --- a/Src/Plugins/Input/in_dshow/base/wxutil.h +++ b/Src/Plugins/Input/in_dshow/base/wxutil.h @@ -457,7 +457,7 @@ STDAPI FreeBSTR(__deref_in BSTR* pstr); // E_OUTOFMEMORY - can't allocate memory for returned string STDAPI AMGetWideString(LPCWSTR pszString, __deref_out LPWSTR *ppszReturn); -// Special wait for objects owning windows +// Special wait for objects owning arch DWORD WINAPI WaitDispatchingMessages( HANDLE hObject, DWORD dwWait, diff --git a/Src/Plugins/Input/in_dshow/config.cpp b/Src/Plugins/Input/in_dshow/config.cpp index 451d9307b..af94675c2 100644 --- a/Src/Plugins/Input/in_dshow/config.cpp +++ b/Src/Plugins/Input/in_dshow/config.cpp @@ -1,4 +1,4 @@ -#include +#include #include "resource.h" #include "../Agave/Language/api_language.h" #include "main.h" diff --git a/Src/Plugins/Input/in_dshow/dshowrender.cpp b/Src/Plugins/Input/in_dshow/dshowrender.cpp index 5a2b81dc5..f08eedea5 100644 --- a/Src/Plugins/Input/in_dshow/dshowrender.cpp +++ b/Src/Plugins/Input/in_dshow/dshowrender.cpp @@ -5,7 +5,7 @@ // #ifdef WINAMPX -#include +#include #include #include "message.h" diff --git a/Src/Plugins/Input/in_dshow/header_asf.cpp b/Src/Plugins/Input/in_dshow/header_asf.cpp index c78e3f3b8..c6a1390be 100644 --- a/Src/Plugins/Input/in_dshow/header_asf.cpp +++ b/Src/Plugins/Input/in_dshow/header_asf.cpp @@ -1,4 +1,4 @@ -#include +#include #include "header_asf.h" #include #include diff --git a/Src/Plugins/Input/in_dshow/header_avi.cpp b/Src/Plugins/Input/in_dshow/header_avi.cpp index 3fea2756e..6cf3e1a21 100644 --- a/Src/Plugins/Input/in_dshow/header_avi.cpp +++ b/Src/Plugins/Input/in_dshow/header_avi.cpp @@ -1,4 +1,4 @@ -#include +#include #include "header_avi.h" #include #include diff --git a/Src/Plugins/Input/in_dshow/header_avi.h b/Src/Plugins/Input/in_dshow/header_avi.h index d96fe2c36..be46dc1ad 100644 --- a/Src/Plugins/Input/in_dshow/header_avi.h +++ b/Src/Plugins/Input/in_dshow/header_avi.h @@ -1,7 +1,7 @@ #ifndef _HEADER_AVI_H #define _HEADER_AVI_H -#include +#include #include "Header.h" diff --git a/Src/Plugins/Input/in_dshow/header_mpg.cpp b/Src/Plugins/Input/in_dshow/header_mpg.cpp index 874ead79d..9453781fd 100644 --- a/Src/Plugins/Input/in_dshow/header_mpg.cpp +++ b/Src/Plugins/Input/in_dshow/header_mpg.cpp @@ -1,4 +1,4 @@ -#include +#include #include "header_mpg.h" #include diff --git a/Src/Plugins/Input/in_dshow/header_wav.cpp b/Src/Plugins/Input/in_dshow/header_wav.cpp index 04fbc8467..5d5582388 100644 --- a/Src/Plugins/Input/in_dshow/header_wav.cpp +++ b/Src/Plugins/Input/in_dshow/header_wav.cpp @@ -1,5 +1,5 @@ #include "header_wav.h" -#include +#include #include "header_avi.h" #include #include diff --git a/Src/Plugins/Input/in_dshow/header_wav.h b/Src/Plugins/Input/in_dshow/header_wav.h index 5ff506d8e..52610c5ad 100644 --- a/Src/Plugins/Input/in_dshow/header_wav.h +++ b/Src/Plugins/Input/in_dshow/header_wav.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_IN_DSHOW_HEADER_WAV_H #define NULLSOFT_IN_DSHOW_HEADER_WAV_H -#include +#include #include "Header.h" diff --git a/Src/Plugins/Input/in_flac/DecodeThread.cpp b/Src/Plugins/Input/in_flac/DecodeThread.cpp index 38c7fcb6e..071978f81 100644 --- a/Src/Plugins/Input/in_flac/DecodeThread.cpp +++ b/Src/Plugins/Input/in_flac/DecodeThread.cpp @@ -22,7 +22,7 @@ #define WIN32_LEAN_AND_MEAN #endif #include "main.h" -#include +#include #include #include #include diff --git a/Src/Plugins/Input/in_flac/FileInfo.cpp b/Src/Plugins/Input/in_flac/FileInfo.cpp index d0684c59d..2982214fd 100644 --- a/Src/Plugins/Input/in_flac/FileInfo.cpp +++ b/Src/Plugins/Input/in_flac/FileInfo.cpp @@ -22,7 +22,7 @@ #include #include "main.h" #include "../nu/ns_wc.h" -#include +#include #include "resource.h" #include "Metadata.h" #include "../nu/AutoWide.h" diff --git a/Src/Plugins/Input/in_flac/StreamFileWin32.cpp b/Src/Plugins/Input/in_flac/StreamFileWin32.cpp index f34b08639..fae8c8202 100644 --- a/Src/Plugins/Input/in_flac/StreamFileWin32.cpp +++ b/Src/Plugins/Input/in_flac/StreamFileWin32.cpp @@ -18,7 +18,7 @@ ** Created: March 1, 2007 ** */ -#include +#include #include #include #include "StreamFileWin32.h" diff --git a/Src/Plugins/Input/in_flac/StreamFileWin32.h b/Src/Plugins/Input/in_flac/StreamFileWin32.h index e3a98d796..918f24cc7 100644 --- a/Src/Plugins/Input/in_flac/StreamFileWin32.h +++ b/Src/Plugins/Input/in_flac/StreamFileWin32.h @@ -2,7 +2,7 @@ #define NULLSOFT_IN_FLAC_STREAMFILEWIN32_H #include -#include +#include struct Win32_State { diff --git a/Src/Plugins/Input/in_flac/in_flac.vcxproj b/Src/Plugins/Input/in_flac/in_flac.vcxproj index cb9250ccd..4a00bddbb 100644 --- a/Src/Plugins/Input/in_flac/in_flac.vcxproj +++ b/Src/Plugins/Input/in_flac/in_flac.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Input/in_flac/main.h b/Src/Plugins/Input/in_flac/main.h index bbe316a4d..b4c206d66 100644 --- a/Src/Plugins/Input/in_flac/main.h +++ b/Src/Plugins/Input/in_flac/main.h @@ -3,7 +3,7 @@ #define PLUGIN_VER L"3.2" -#include +#include extern HANDLE killswitch; #include "../Winamp/in2.h" diff --git a/Src/Plugins/Input/in_flv/AMFObject.h b/Src/Plugins/Input/in_flv/AMFObject.h index bb423a9ce..98859406a 100644 --- a/Src/Plugins/Input/in_flv/AMFObject.h +++ b/Src/Plugins/Input/in_flv/AMFObject.h @@ -2,7 +2,7 @@ #define NULLSOFT_AMFOBJECT_H #include "FLVUtil.h" -#include +#include #include #include #include diff --git a/Src/Plugins/Input/in_flv/ExtendedInfo.cpp b/Src/Plugins/Input/in_flv/ExtendedInfo.cpp index c7a807f0f..0a105f059 100644 --- a/Src/Plugins/Input/in_flv/ExtendedInfo.cpp +++ b/Src/Plugins/Input/in_flv/ExtendedInfo.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include "api__in_flv.h" #include "resource.h" diff --git a/Src/Plugins/Input/in_flv/FLVMetadata.cpp b/Src/Plugins/Input/in_flv/FLVMetadata.cpp index b98e801b5..b8e8ab005 100644 --- a/Src/Plugins/Input/in_flv/FLVMetadata.cpp +++ b/Src/Plugins/Input/in_flv/FLVMetadata.cpp @@ -1,6 +1,6 @@ #include "FLVMetadata.h" #include "FLVUtil.h" -#include +#include /* (c) 2006 Nullsoft, Inc. diff --git a/Src/Plugins/Input/in_flv/FLVReader.h b/Src/Plugins/Input/in_flv/FLVReader.h index 27e681836..1eb823ccd 100644 --- a/Src/Plugins/Input/in_flv/FLVReader.h +++ b/Src/Plugins/Input/in_flv/FLVReader.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_IN_FLV_FLVREADER_H #define NULLSOFT_IN_FLV_FLVREADER_H -#include +#include #include #include "FLVStreamheader.h" #include "../nu/AutoLock.h" diff --git a/Src/Plugins/Input/in_flv/FileProcessor.h b/Src/Plugins/Input/in_flv/FileProcessor.h index d0fb6bd30..d80a8a3ee 100644 --- a/Src/Plugins/Input/in_flv/FileProcessor.h +++ b/Src/Plugins/Input/in_flv/FileProcessor.h @@ -1,6 +1,6 @@ #pragma once #include "FLVProcessor.h" -#include +#include #include #include "../nu/AutoLock.h" diff --git a/Src/Plugins/Input/in_flv/PlayThread.cpp b/Src/Plugins/Input/in_flv/PlayThread.cpp index 33fa735ee..cc7608d5c 100644 --- a/Src/Plugins/Input/in_flv/PlayThread.cpp +++ b/Src/Plugins/Input/in_flv/PlayThread.cpp @@ -1,5 +1,5 @@ #include "main.h" -#include +#include #include "api__in_flv.h" #include "../Winamp/wa_ipc.h" #include "FLVHeader.h" diff --git a/Src/Plugins/Input/in_flv/VideoThread.cpp b/Src/Plugins/Input/in_flv/VideoThread.cpp index e07d58d0d..ceb45450a 100644 --- a/Src/Plugins/Input/in_flv/VideoThread.cpp +++ b/Src/Plugins/Input/in_flv/VideoThread.cpp @@ -3,7 +3,7 @@ #include "api__in_flv.h" #include "FLVVideoHeader.h" #include -#include +#include #include "../nu/threadname.h" #include #include "../nu/AutoLock.h" diff --git a/Src/Plugins/Input/in_flv/main.h b/Src/Plugins/Input/in_flv/main.h index ba3f43765..5f58e7b53 100644 --- a/Src/Plugins/Input/in_flv/main.h +++ b/Src/Plugins/Input/in_flv/main.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_IN_FLV_MAIN_H #define NULLSOFT_IN_FLV_MAIN_H -#include +#include #include "../Winamp/in2.h" #include "../nu/VideoClock.h" #include "../nu/AutoLock.h" diff --git a/Src/Plugins/Input/in_linein/audio.cpp b/Src/Plugins/Input/in_linein/audio.cpp index 4ab2472c1..506ff617e 100644 --- a/Src/Plugins/Input/in_linein/audio.cpp +++ b/Src/Plugins/Input/in_linein/audio.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Audio.h" #include "main.h" #pragma intrinsic(memcpy, memset) diff --git a/Src/Plugins/Input/in_linein/in_linein.cpp b/Src/Plugins/Input/in_linein/in_linein.cpp index 1b2eda2b2..8c549f704 100644 --- a/Src/Plugins/Input/in_linein/in_linein.cpp +++ b/Src/Plugins/Input/in_linein/in_linein.cpp @@ -2,7 +2,7 @@ #define PLUGIN_VERSION L"3.16" #include "main.h" -#include +#include #include "LineIn.h" #include #include "../Agave/Language/api_language.h" diff --git a/Src/Plugins/Input/in_midi/cvt.h b/Src/Plugins/Input/in_midi/cvt.h index 12d8f0c52..9689df516 100644 --- a/Src/Plugins/Input/in_midi/cvt.h +++ b/Src/Plugins/Input/in_midi/cvt.h @@ -1,7 +1,7 @@ #ifndef STRICT #define STRICT 1 #endif -#include +#include #include #include diff --git a/Src/Plugins/Input/in_midi/dmplugin.h b/Src/Plugins/Input/in_midi/dmplugin.h index 821ef7d60..23a1442f7 100644 --- a/Src/Plugins/Input/in_midi/dmplugin.h +++ b/Src/Plugins/Input/in_midi/dmplugin.h @@ -10,7 +10,7 @@ #ifndef _DMPLUGIN_ #define _DMPLUGIN_ -#include +#include #define COM_NO_WINDOWS_H #include diff --git a/Src/Plugins/Input/in_midi/dmusicc.h b/Src/Plugins/Input/in_midi/dmusicc.h index 3608babbd..ecd3b1f63 100644 --- a/Src/Plugins/Input/in_midi/dmusicc.h +++ b/Src/Plugins/Input/in_midi/dmusicc.h @@ -9,7 +9,7 @@ #ifndef _DMUSICC_ #define _DMUSICC_ -#include +#include #define COM_NO_WINDOWS_H #include diff --git a/Src/Plugins/Input/in_midi/dmusicf.h b/Src/Plugins/Input/in_midi/dmusicf.h index 10908a9b5..9286ae8f8 100644 --- a/Src/Plugins/Input/in_midi/dmusicf.h +++ b/Src/Plugins/Input/in_midi/dmusicf.h @@ -10,7 +10,7 @@ #define _DMUSICF_ -#include +#include #define COM_NO_WINDOWS_H #include diff --git a/Src/Plugins/Input/in_midi/dmusici.h b/Src/Plugins/Input/in_midi/dmusici.h index c6bc37db9..f438ac3d6 100644 --- a/Src/Plugins/Input/in_midi/dmusici.h +++ b/Src/Plugins/Input/in_midi/dmusici.h @@ -10,7 +10,7 @@ #ifndef _DMUSICI_ #define _DMUSICI_ -#include +#include #define COM_NO_WINDOWS_H #include diff --git a/Src/Plugins/Input/in_midi/genres.c b/Src/Plugins/Input/in_midi/genres.c index c8add1857..e302a70fa 100644 --- a/Src/Plugins/Input/in_midi/genres.c +++ b/Src/Plugins/Input/in_midi/genres.c @@ -1,5 +1,5 @@ #define STRICT -#include +#include #include "genres.h" diff --git a/Src/Plugins/Input/in_midi/in_midi.vcxproj b/Src/Plugins/Input/in_midi/in_midi.vcxproj index dbe34afcd..83136861e 100644 --- a/Src/Plugins/Input/in_midi/in_midi.vcxproj +++ b/Src/Plugins/Input/in_midi/in_midi.vcxproj @@ -92,26 +92,26 @@ false - x86-windows-static-md + x86-arch-static-md false Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md Disabled - ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\minizip;.;%(AdditionalIncludeDirectories) + ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\minizip;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IN_MIDI_EXPORTS;IN_MIDI;WINVER=0x601;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false true @@ -192,7 +192,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN MinSpace OnlyExplicitInline Size - ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\minizip;.;%(AdditionalIncludeDirectories) + ..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\minizip;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IN_MIDI_EXPORTS;IN_MIDI;WINVER=0x601;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true diff --git a/Src/Plugins/Input/in_midi/main.h b/Src/Plugins/Input/in_midi/main.h index ee73606e3..685686ff4 100644 --- a/Src/Plugins/Input/in_midi/main.h +++ b/Src/Plugins/Input/in_midi/main.h @@ -2,7 +2,7 @@ #define STRICT #endif #include "../Agave/Language/api_language.h" -#include +#include #include #ifndef NOVTABLE diff --git a/Src/Plugins/Input/in_mkv/ExtendedFileInfo.cpp b/Src/Plugins/Input/in_mkv/ExtendedFileInfo.cpp index b48233559..b1e65fe65 100644 --- a/Src/Plugins/Input/in_mkv/ExtendedFileInfo.cpp +++ b/Src/Plugins/Input/in_mkv/ExtendedFileInfo.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include "api__in_mkv.h" #include "MKVInfo.h" #include diff --git a/Src/Plugins/Input/in_mkv/MKVPlayer.h b/Src/Plugins/Input/in_mkv/MKVPlayer.h index 91de51223..a746ff184 100644 --- a/Src/Plugins/Input/in_mkv/MKVPlayer.h +++ b/Src/Plugins/Input/in_mkv/MKVPlayer.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include // nsmkv stuff diff --git a/Src/Plugins/Input/in_mkv/PlayThread.cpp b/Src/Plugins/Input/in_mkv/PlayThread.cpp index 81941c7c1..7bd0b5cf4 100644 --- a/Src/Plugins/Input/in_mkv/PlayThread.cpp +++ b/Src/Plugins/Input/in_mkv/PlayThread.cpp @@ -15,7 +15,7 @@ #include "../nsmkv/file_mkv_reader.h" #include #include -#include +#include #include // {B6CB4A7C-A8D0-4c55-8E60-9F7A7A23DA0F} diff --git a/Src/Plugins/Input/in_mod-openmpt/ExtendedInfo.cpp b/Src/Plugins/Input/in_mod-openmpt/ExtendedInfo.cpp index 93f2fa4c6..72e1489eb 100644 --- a/Src/Plugins/Input/in_mod-openmpt/ExtendedInfo.cpp +++ b/Src/Plugins/Input/in_mod-openmpt/ExtendedInfo.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include "api__in_mod.h" #include "resource.h" diff --git a/Src/Plugins/Input/in_mod-openmpt/in_mod-openmpt.vcxproj b/Src/Plugins/Input/in_mod-openmpt/in_mod-openmpt.vcxproj index 608eac69f..15c394113 100644 --- a/Src/Plugins/Input/in_mod-openmpt/in_mod-openmpt.vcxproj +++ b/Src/Plugins/Input/in_mod-openmpt/in_mod-openmpt.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Input/in_mod/mikamp/include/Main.h b/Src/Plugins/Input/in_mod/mikamp/include/Main.h index 9f9b91714..a9f52fbd8 100644 --- a/Src/Plugins/Input/in_mod/mikamp/include/Main.h +++ b/Src/Plugins/Input/in_mod/mikamp/include/Main.h @@ -1,7 +1,7 @@ #ifndef __MIKAMP_MAIN_H__ #define __MIKAMP_MAIN_H__ -#include +#include #include #include "mikmod.h" #include "mplayer.h" diff --git a/Src/Plugins/Input/in_mod/mikamp/src/drv_amp.c b/Src/Plugins/Input/in_mod/mikamp/src/drv_amp.c index b84c818bc..609f7d216 100644 --- a/Src/Plugins/Input/in_mod/mikamp/src/drv_amp.c +++ b/Src/Plugins/Input/in_mod/mikamp/src/drv_amp.c @@ -1,4 +1,4 @@ -#include +#include #include #include "mikmod.h" #include "virtch.h" diff --git a/Src/Plugins/Input/in_mod/mikamp/src/drv_buffer.cpp b/Src/Plugins/Input/in_mod/mikamp/src/drv_buffer.cpp index ed75d798c..4f9aec363 100644 --- a/Src/Plugins/Input/in_mod/mikamp/src/drv_buffer.cpp +++ b/Src/Plugins/Input/in_mod/mikamp/src/drv_buffer.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "mikmod.h" #include "virtch.h" diff --git a/Src/Plugins/Input/in_mod/mikamp/src/rf_wrapper.c b/Src/Plugins/Input/in_mod/mikamp/src/rf_wrapper.c index 3431affd2..5eac5e636 100644 --- a/Src/Plugins/Input/in_mod/mikamp/src/rf_wrapper.c +++ b/Src/Plugins/Input/in_mod/mikamp/src/rf_wrapper.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include "../../winamp/wa_ipc.h" diff --git a/Src/Plugins/Input/in_mp3/CVbriHeader.cpp b/Src/Plugins/Input/in_mp3/CVbriHeader.cpp index d8eebd840..b4f62c849 100644 --- a/Src/Plugins/Input/in_mp3/CVbriHeader.cpp +++ b/Src/Plugins/Input/in_mp3/CVbriHeader.cpp @@ -14,7 +14,7 @@ // //--------------------------------------------------------------------------/ -#include +#include #include "CVbriHeader.h" #include "LAMEInfo.h" diff --git a/Src/Plugins/Input/in_mp3/DXHEAD.C b/Src/Plugins/Input/in_mp3/DXHEAD.C index f739240ac..a9a361bb9 100644 --- a/Src/Plugins/Input/in_mp3/DXHEAD.C +++ b/Src/Plugins/Input/in_mp3/DXHEAD.C @@ -10,7 +10,7 @@ mod 12/7/98 add vbr scale Copyright 1998 Xing Technology Corp. -----------------------------------------------------------*/ -#include +#include #include #include #include diff --git a/Src/Plugins/Input/in_mp3/DecodeThread.h b/Src/Plugins/Input/in_mp3/DecodeThread.h index b3fc6735a..f58fbdaf8 100644 --- a/Src/Plugins/Input/in_mp3/DecodeThread.h +++ b/Src/Plugins/Input/in_mp3/DecodeThread.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_DECODETHREADH #define NULLSOFT_DECODETHREADH -#include +#include DWORD WINAPI DecodeThread(LPVOID b); diff --git a/Src/Plugins/Input/in_mp3/ID3v1.cpp b/Src/Plugins/Input/in_mp3/ID3v1.cpp index 5fe251066..3aa69d00f 100644 --- a/Src/Plugins/Input/in_mp3/ID3v1.cpp +++ b/Src/Plugins/Input/in_mp3/ID3v1.cpp @@ -1,6 +1,6 @@ #include "ID3v1.h" #include "../nu/ns_wc.h" -#include +#include #include "config.h" #include diff --git a/Src/Plugins/Input/in_mp3/LAMEinfo.cpp b/Src/Plugins/Input/in_mp3/LAMEinfo.cpp index febfec981..ff3a3077f 100644 --- a/Src/Plugins/Input/in_mp3/LAMEinfo.cpp +++ b/Src/Plugins/Input/in_mp3/LAMEinfo.cpp @@ -1,5 +1,5 @@ #include "LAMEinfo.h" -#include +#include #include #include #include "api__in_mp3.h" diff --git a/Src/Plugins/Input/in_mp3/Lyrics3.cpp b/Src/Plugins/Input/in_mp3/Lyrics3.cpp index bdd8ece6f..ee99ad2c6 100644 --- a/Src/Plugins/Input/in_mp3/Lyrics3.cpp +++ b/Src/Plugins/Input/in_mp3/Lyrics3.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Lyrics3.h" #include "config.h" #include diff --git a/Src/Plugins/Input/in_mp3/MP3Info.h b/Src/Plugins/Input/in_mp3/MP3Info.h index b161feeb6..070076074 100644 --- a/Src/Plugins/Input/in_mp3/MP3Info.h +++ b/Src/Plugins/Input/in_mp3/MP3Info.h @@ -2,7 +2,7 @@ #define NULLSOFT_IN_MP3_MP3_INFO_H #include "Metadata.h" -#include +#include class MP3Info { diff --git a/Src/Plugins/Input/in_mp3/about.cpp b/Src/Plugins/Input/in_mp3/about.cpp index 7bc3ae042..603675f1d 100644 --- a/Src/Plugins/Input/in_mp3/about.cpp +++ b/Src/Plugins/Input/in_mp3/about.cpp @@ -1,4 +1,4 @@ -#include +#include #include "main.h" #if 1 BOOL CALLBACK AboutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,LPARAM lParam) diff --git a/Src/Plugins/Input/in_mp3/config.cpp b/Src/Plugins/Input/in_mp3/config.cpp index fcff41e8a..41e47851d 100644 --- a/Src/Plugins/Input/in_mp3/config.cpp +++ b/Src/Plugins/Input/in_mp3/config.cpp @@ -1,7 +1,7 @@ #include "main.h" #include #include -#include +#include #include "../winamp/wa_ipc.h" #include "config.h" #include "api__in_mp3.h" diff --git a/Src/Plugins/Input/in_mp3/giofile.h b/Src/Plugins/Input/in_mp3/giofile.h index 121d77c96..7ed07cbf9 100644 --- a/Src/Plugins/Input/in_mp3/giofile.h +++ b/Src/Plugins/Input/in_mp3/giofile.h @@ -17,7 +17,7 @@ #define _GIOFILE_H /* ------------------------ includes --------------------------------------*/ -#include +#include #include "CVbriHeader.h" #include "jnetlib/jnetlib.h" diff --git a/Src/Plugins/Input/in_mp3/graphics/filterWater.h b/Src/Plugins/Input/in_mp3/graphics/filterWater.h index 21ed92c08..7b2fca6fe 100644 --- a/Src/Plugins/Input/in_mp3/graphics/filterWater.h +++ b/Src/Plugins/Input/in_mp3/graphics/filterWater.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_IMAGE_FILTERWATER_HEADER #define NULLSOFT_ML_IMAGE_FILTERWATER_HEADER -#include +#include #include ".\image.h" class MLImageFilterWater diff --git a/Src/Plugins/Input/in_mp3/graphics/image.h b/Src/Plugins/Input/in_mp3/graphics/image.h index 72a4aa5dc..2b7c32acd 100644 --- a/Src/Plugins/Input/in_mp3/graphics/image.h +++ b/Src/Plugins/Input/in_mp3/graphics/image.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_IMAGE_HEADER #define NULLSOFT_ML_IMAGE_HEADER -#include +#include #define RGBA(r,g,b,a) ((COLORREF)(((BYTE)(r)|((WORD)(g)<<8))|(((DWORD)(BYTE)(b))<<16)|(((DWORD)(BYTE)(a))<<24))) #define FIXCOLORREF(clr) RGBA(GetBValue(clr),GetGValue(clr), GetRValue(clr),((DWORD)(clr)) >> 24) diff --git a/Src/Plugins/Input/in_mp3/graphics/imageFilters.h b/Src/Plugins/Input/in_mp3/graphics/imageFilters.h index ebb1c752a..47af957e1 100644 --- a/Src/Plugins/Input/in_mp3/graphics/imageFilters.h +++ b/Src/Plugins/Input/in_mp3/graphics/imageFilters.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_IMAGE_FILTER_HEADER #define NULLSOFT_ML_IMAGE_FILTER_HEADER -#include +#include #include ".\image.h" #include ".\filterwater.h" diff --git a/Src/Plugins/Input/in_mp3/in_mp3.vcxproj b/Src/Plugins/Input/in_mp3/in_mp3.vcxproj index 7a08280a9..7dd1ab18a 100644 --- a/Src/Plugins/Input/in_mp3/in_mp3.vcxproj +++ b/Src/Plugins/Input/in_mp3/in_mp3.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Input/in_mp3/main.h b/Src/Plugins/Input/in_mp3/main.h index 01febf7dc..96d0b78b6 100644 --- a/Src/Plugins/Input/in_mp3/main.h +++ b/Src/Plugins/Input/in_mp3/main.h @@ -2,7 +2,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #include "giofile.h" #include "dxhead.h" #include "CVbriHeader.h" diff --git a/Src/Plugins/Input/in_mp3/pdtimer.h b/Src/Plugins/Input/in_mp3/pdtimer.h index 1c0da8875..cb7f1235d 100644 --- a/Src/Plugins/Input/in_mp3/pdtimer.h +++ b/Src/Plugins/Input/in_mp3/pdtimer.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_PDTIMERH #define NULLSOFT_PDTIMERH -#include +#include __int64 pdReadResolution(void); __int64 pdReadTimer(void); diff --git a/Src/Plugins/Input/in_mp3/tagz.cpp b/Src/Plugins/Input/in_mp3/tagz.cpp index 0e110b239..8c34f2819 100644 --- a/Src/Plugins/Input/in_mp3/tagz.cpp +++ b/Src/Plugins/Input/in_mp3/tagz.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/Src/Plugins/Input/in_mp3/todo.txt b/Src/Plugins/Input/in_mp3/todo.txt index 4cbe62e6d..0897a72a3 100644 --- a/Src/Plugins/Input/in_mp3/todo.txt +++ b/Src/Plugins/Input/in_mp3/todo.txt @@ -15,7 +15,7 @@ Changes: * [a4] fixed pause right after playback starts bug * fixed crash/hang/freeze when reading some mp3 files with a weird id3v2 tag (as found in some real jukebox generated mp3s, etc...) - * this one will break a few things (i.e. windowshade vis), because justin is updating it to go + * this one will break a few things (i.e. archhade vis), because justin is updating it to go with winamp 2.7 * all code is now win32 file io * %a will now display id3v1.1/v2 track # diff --git a/Src/Plugins/Input/in_mp4/Main.cpp b/Src/Plugins/Input/in_mp4/Main.cpp index 59ca1a89d..3901fdc1b 100644 --- a/Src/Plugins/Input/in_mp4/Main.cpp +++ b/Src/Plugins/Input/in_mp4/Main.cpp @@ -1,6 +1,6 @@ #define PLUGIN_VERSION L"2.70" #include "Main.h" -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Input/in_mp4/PlayThread.cpp b/Src/Plugins/Input/in_mp4/PlayThread.cpp index 661d30034..d4f8cfc1a 100644 --- a/Src/Plugins/Input/in_mp4/PlayThread.cpp +++ b/Src/Plugins/Input/in_mp4/PlayThread.cpp @@ -214,7 +214,7 @@ static bool BuildAudioBuffers() DWORD WINAPI PlayProc(LPVOID lpParameter) { - // set an event when we start. this keeps Windows from queueing an APC before the thread proc even starts (evil, evil windows) + // set an event when we start. this keeps Windows from queueing an APC before the thread proc even starts (evil, evil arch) HANDLE threadCreatedEvent = (HANDLE)lpParameter; SetEvent(threadCreatedEvent); diff --git a/Src/Plugins/Input/in_nsv/BigLib.cpp b/Src/Plugins/Input/in_nsv/BigLib.cpp index 5e8c541f6..a7a0871e6 100644 --- a/Src/Plugins/Input/in_nsv/BigLib.cpp +++ b/Src/Plugins/Input/in_nsv/BigLib.cpp @@ -1,6 +1,6 @@ #ifdef WINAMPX #define WIN32_LEAN_AND_MEAN 1 -#include +#include #include "stdio.h" #include "proxydt.h" #include @@ -319,7 +319,7 @@ int GetAutoConfigScriptProxySettings(LPSTR lpIPAddress, int *pnPort) return retval; } - // use the registry read of HKCU\\software\microsoft\windows\current version\internet settings to see if "Use Automatic Configuration Script" is checked + // use the registry read of HKCU\\software\microsoft\arch\current version\internet settings to see if "Use Automatic Configuration Script" is checked lstrcpyn(szWPADLocation, "", MAX_PATH); lRet = RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", 0, KEY_READ, &hKey); @@ -756,7 +756,7 @@ BOOL GetAutomaticConfigurationScriptCheckboxState() #if 1 - // use the registry read of HKCU\\software\microsoft\windows\current version\internet settings to see if "Use Automatic Configuration Script" is checked + // use the registry read of HKCU\\software\microsoft\arch\current version\internet settings to see if "Use Automatic Configuration Script" is checked szWPAD[0] = '\0'; lRet = RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", 0, KEY_READ, &hKey); @@ -987,7 +987,7 @@ int CProfileFolder::GetProfileFolder(LPSTR lpProfileFolder, BOOL bFirefox) } // private function for GetProfileFolder() -// on my test system, the folder to get is c:\windows\application data\mozilla\profiles\default\y3h9azmi.slt +// on my test system, the folder to get is c:\arch\application data\mozilla\profiles\default\y3h9azmi.slt int CProfileFolder::GetProfileFolder_9598ME(LPSTR lpProfileFolder, BOOL bFirefox) { WIN32_FIND_DATA fd; diff --git a/Src/Plugins/Input/in_nsv/Main.cpp b/Src/Plugins/Input/in_nsv/Main.cpp index 159ee873a..c0a3ff452 100644 --- a/Src/Plugins/Input/in_nsv/Main.cpp +++ b/Src/Plugins/Input/in_nsv/Main.cpp @@ -1,7 +1,7 @@ #define PLUGIN_NAME "Nullsoft NSV Decoder" #define PLUGIN_VERSION L"1.76" -#include +#include #include "../Winamp/in2.h" #include "../nsv/nsvplay/main.h" #include "resource.h" diff --git a/Src/Plugins/Input/in_nsv/config.cpp b/Src/Plugins/Input/in_nsv/config.cpp index 6c4ada019..281d284db 100644 --- a/Src/Plugins/Input/in_nsv/config.cpp +++ b/Src/Plugins/Input/in_nsv/config.cpp @@ -1,4 +1,4 @@ -#include +#include #include "api.h" #include "resource.h" #include "../Winamp/wa_ipc.h" diff --git a/Src/Plugins/Input/in_nsv/infodlg.cpp b/Src/Plugins/Input/in_nsv/infodlg.cpp index 99a993429..4931bbac4 100644 --- a/Src/Plugins/Input/in_nsv/infodlg.cpp +++ b/Src/Plugins/Input/in_nsv/infodlg.cpp @@ -1,4 +1,4 @@ -#include +#include #include "api.h" #include "resource.h" diff --git a/Src/Plugins/Input/in_swf/flash9e.tlh b/Src/Plugins/Input/in_swf/flash9e.tlh index d2d4d9f4d..1f2fb2d81 100644 --- a/Src/Plugins/Input/in_swf/flash9e.tlh +++ b/Src/Plugins/Input/in_swf/flash9e.tlh @@ -2,7 +2,7 @@ // // e:\nullsoft\in_swf\release\flash9e.tlh // -// C++ source equivalent of Win32 type library C:/windows/system32/macromed/Flash/Flash9e.ocx +// C++ source equivalent of Win32 type library C:/arch/system32/macromed/Flash/Flash9e.ocx // compiler-generated file created 04/17/08 at 15:29:08 - DO NOT EDIT! #pragma once diff --git a/Src/Plugins/Input/in_swf/main.h b/Src/Plugins/Input/in_swf/main.h index ac62679ca..253efb6f0 100644 --- a/Src/Plugins/Input/in_swf/main.h +++ b/Src/Plugins/Input/in_swf/main.h @@ -3,7 +3,7 @@ #include "../Winamp/in2.h" extern In_Module plugin; -#include +#include #include "../Winamp/wa_ipc.h" extern IVideoOutput *videoOutput; diff --git a/Src/Plugins/Input/in_wave/AudioThread.cpp b/Src/Plugins/Input/in_wave/AudioThread.cpp index b6e8676c7..8b152c305 100644 --- a/Src/Plugins/Input/in_wave/AudioThread.cpp +++ b/Src/Plugins/Input/in_wave/AudioThread.cpp @@ -1,4 +1,4 @@ -#include +#include #include "main.h" #include "../Winamp/wa_ipc.h" #include "config.h" diff --git a/Src/Plugins/Input/in_wave/AudioThread.h b/Src/Plugins/Input/in_wave/AudioThread.h index 5679e44a2..46b90b49e 100644 --- a/Src/Plugins/Input/in_wave/AudioThread.h +++ b/Src/Plugins/Input/in_wave/AudioThread.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_AUDIOTHREADH #define NULLSOFT_AUDIOTHREADH -#include +#include VOID CALLBACK APCSeek( ULONG_PTR p_data ); VOID CALLBACK APCPause( ULONG_PTR p_data ); diff --git a/Src/Plugins/Input/in_wave/VirtualIO.cpp b/Src/Plugins/Input/in_wave/VirtualIO.cpp index b09c2523f..55c74435c 100644 --- a/Src/Plugins/Input/in_wave/VirtualIO.cpp +++ b/Src/Plugins/Input/in_wave/VirtualIO.cpp @@ -3,7 +3,7 @@ #include #include "../nu/AutoWide.h" #include -#include +#include // TODO: extend this to use api_filereader // instead of just the HTTP reader directly diff --git a/Src/Plugins/Input/in_wave/in_wave.vcxproj b/Src/Plugins/Input/in_wave/in_wave.vcxproj index f502afbe1..23f101f22 100644 --- a/Src/Plugins/Input/in_wave/in_wave.vcxproj +++ b/Src/Plugins/Input/in_wave/in_wave.vcxproj @@ -91,26 +91,26 @@ false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/Plugins/Input/in_wave/main.h b/Src/Plugins/Input/in_wave/main.h index 2614325f4..8fc3fb879 100644 --- a/Src/Plugins/Input/in_wave/main.h +++ b/Src/Plugins/Input/in_wave/main.h @@ -10,7 +10,7 @@ extern In_Module plugin; extern int pan, volume; -#include +#include BOOL CALLBACK PreferencesDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); int ExtensionExists(const char *ext, const char *extensionList); diff --git a/Src/Plugins/Input/in_wmvdrm/ASXLoader.cpp b/Src/Plugins/Input/in_wmvdrm/ASXLoader.cpp index 485e0f775..559f11fe8 100644 --- a/Src/Plugins/Input/in_wmvdrm/ASXLoader.cpp +++ b/Src/Plugins/Input/in_wmvdrm/ASXLoader.cpp @@ -463,7 +463,7 @@ int ASXLoader::Load(const wchar_t *filename, ifc_playlistloadercallback *playlis parser->xmlreader_registerCallback(L"ASX\fENTRY\fTITLE", &asxXml.title); parser->xmlreader_registerCallback(L"ASX\fENTRY\fAUTHOR", &asxXml.artist); parser->xmlreader_open(); - parser->xmlreader_setEncoding(L"windows-1252"); + parser->xmlreader_setEncoding(L"arch-1252"); int ret; if (wcsstr(filename, L"://")) diff --git a/Src/Plugins/Input/in_wmvdrm/Main.h b/Src/Plugins/Input/in_wmvdrm/Main.h index 85b3e4b5d..bd97ff07e 100644 --- a/Src/Plugins/Input/in_wmvdrm/Main.h +++ b/Src/Plugins/Input/in_wmvdrm/Main.h @@ -5,7 +5,7 @@ #include "WinampInterface.h" #include "../Winamp/in2.h" -#include +#include #include "WMDRMModule.h" #include #include diff --git a/Src/Plugins/Input/in_wmvdrm/StatusHook.cpp b/Src/Plugins/Input/in_wmvdrm/StatusHook.cpp index 45cf618a8..f9725304f 100644 --- a/Src/Plugins/Input/in_wmvdrm/StatusHook.cpp +++ b/Src/Plugins/Input/in_wmvdrm/StatusHook.cpp @@ -1,5 +1,5 @@ #if 0 -#include +#include #include "../Winamp/wa_ipc.h" #include "Main.h" #include diff --git a/Src/Plugins/Input/in_wmvdrm/StatusHook.h b/Src/Plugins/Input/in_wmvdrm/StatusHook.h index 400c134aa..c3ab39a57 100644 --- a/Src/Plugins/Input/in_wmvdrm/StatusHook.h +++ b/Src/Plugins/Input/in_wmvdrm/StatusHook.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_STATUSHOOKH #define NULLSOFT_STATUSHOOKH -#include +#include void Hook(HWND winamp); void Unhook(HWND winamp); #endif \ No newline at end of file diff --git a/Src/Plugins/Input/in_wmvdrm/VideoThread.cpp b/Src/Plugins/Input/in_wmvdrm/VideoThread.cpp index fd6f1f098..26aec23f0 100644 --- a/Src/Plugins/Input/in_wmvdrm/VideoThread.cpp +++ b/Src/Plugins/Input/in_wmvdrm/VideoThread.cpp @@ -2,7 +2,7 @@ #include "VideoThread.h" #include "VideoLayer.h" #include "config.h" -#include +#include DWORD WINAPI VidThread_stub(void *ptr) { diff --git a/Src/Plugins/Input/in_wmvdrm/WinampInterface.h b/Src/Plugins/Input/in_wmvdrm/WinampInterface.h index 227b834cc..b2f25d5fc 100644 --- a/Src/Plugins/Input/in_wmvdrm/WinampInterface.h +++ b/Src/Plugins/Input/in_wmvdrm/WinampInterface.h @@ -2,7 +2,7 @@ #define NULLSOFT_WINAMPINTERFACEH #include "Main.h" -#include +#include #include "../Winamp/wa_ipc.h" #include "../Winamp/In2.h" #include "../Winamp/strutil.h" diff --git a/Src/Plugins/Input/in_wmvdrm/api.cpp b/Src/Plugins/Input/in_wmvdrm/api.cpp index 05749577f..28c30b09b 100644 --- a/Src/Plugins/Input/in_wmvdrm/api.cpp +++ b/Src/Plugins/Input/in_wmvdrm/api.cpp @@ -1,6 +1,6 @@ #include "main.h" #include "api.h" -#include +#include #include "../Winamp/wa_ipc.h" #include "FactoryHelper.h" #include "MetaTagFactory.h" diff --git a/Src/Plugins/Input/in_wmvdrm/api.h b/Src/Plugins/Input/in_wmvdrm/api.h index 4e226ea1e..32f975f54 100644 --- a/Src/Plugins/Input/in_wmvdrm/api.h +++ b/Src/Plugins/Input/in_wmvdrm/api.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_API_H #define NULLSOFT_API_H -#include +#include int LoadWasabi(); void UnloadWasabi(); diff --git a/Src/Plugins/Input/in_wmvdrm/loadini.h b/Src/Plugins/Input/in_wmvdrm/loadini.h index 4d57eb6b9..c7c471723 100644 --- a/Src/Plugins/Input/in_wmvdrm/loadini.h +++ b/Src/Plugins/Input/in_wmvdrm/loadini.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_LOADINIH #define NULLSOFT_LOADINIH -#include +#include extern wchar_t INI_FILE[MAX_PATH]; void IniFile(HWND hMainWindow); diff --git a/Src/Plugins/Input/in_wmvdrm/output/AudioOut.h b/Src/Plugins/Input/in_wmvdrm/output/AudioOut.h index 90d36202e..8ccb40577 100644 --- a/Src/Plugins/Input/in_wmvdrm/output/AudioOut.h +++ b/Src/Plugins/Input/in_wmvdrm/output/AudioOut.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_AUDIOOUTH #define NULLSOFT_AUDIOOUTH -#include +#include #include "../../../../Winamp/out.h" enum InitState diff --git a/Src/Plugins/Input/in_wmvdrm/util.h b/Src/Plugins/Input/in_wmvdrm/util.h index 8c8890da7..fef51ff5f 100644 --- a/Src/Plugins/Input/in_wmvdrm/util.h +++ b/Src/Plugins/Input/in_wmvdrm/util.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_UTILH #define NULLSOFT_UTILH -#include +#include void WaitForEvent(HANDLE hEvent, DWORD msMaxWaitTime); char *HRErrorCode(HRESULT hr); diff --git a/Src/Plugins/Input/in_wmvdrm/vid_ddraw.cpp b/Src/Plugins/Input/in_wmvdrm/vid_ddraw.cpp index 7aed89de8..1e3509ae6 100644 --- a/Src/Plugins/Input/in_wmvdrm/vid_ddraw.cpp +++ b/Src/Plugins/Input/in_wmvdrm/vid_ddraw.cpp @@ -710,7 +710,7 @@ void DDrawVideoOutput::displayFrame(const char * /*buf*/, int size, int time) ClientToScreen(hwnd, (LPPOINT)&r); ClientToScreen(hwnd, ((LPPOINT)&r) + 1); - // transform coords from windows desktop coords (where 0,0==upper-left corner of box encompassing all monitors) + // transform coords from arch desktop coords (where 0,0==upper-left corner of box encompassing all monitors) // to the coords for the monitor we're displaying on: r.left -= m_mon_x; r.right -= m_mon_x; diff --git a/Src/Plugins/Input/in_wmvdrm/vid_overlay.cpp b/Src/Plugins/Input/in_wmvdrm/vid_overlay.cpp index dd6864891..aee654501 100644 --- a/Src/Plugins/Input/in_wmvdrm/vid_overlay.cpp +++ b/Src/Plugins/Input/in_wmvdrm/vid_overlay.cpp @@ -1,5 +1,5 @@ #include "main.h" -#include +#include #include #include "vid_overlay.h" #include "directdraw.h" diff --git a/Src/Plugins/Input/in_wv/in_wv.cpp b/Src/Plugins/Input/in_wv/in_wv.cpp index ddfef3d62..cf45f3ae3 100644 --- a/Src/Plugins/Input/in_wv/in_wv.cpp +++ b/Src/Plugins/Input/in_wv/in_wv.cpp @@ -2,7 +2,7 @@ ** .WV input plug-in for WavPack ** Copyright (c) 2000 - 2006, Conifer Software, All Rights Reserved */ -#include +#include #include #include #include diff --git a/Src/Plugins/Input/in_wv/wasabi/Winamp/GEN.H b/Src/Plugins/Input/in_wv/wasabi/Winamp/GEN.H index b010c1009..4aebc3aac 100644 --- a/Src/Plugins/Input/in_wv/wasabi/Winamp/GEN.H +++ b/Src/Plugins/Input/in_wv/wasabi/Winamp/GEN.H @@ -1,7 +1,7 @@ #ifndef NULLSOFT_WINAMP_GEN_H #define NULLSOFT_WINAMP_GEN_H -#include +#include #define GEN_INIT_SUCCESS 0 diff --git a/Src/Plugins/Input/in_wv/wasabi/Winamp/api_wa5component.h b/Src/Plugins/Input/in_wv/wasabi/Winamp/api_wa5component.h index da43396be..65ef41a72 100644 --- a/Src/Plugins/Input/in_wv/wasabi/Winamp/api_wa5component.h +++ b/Src/Plugins/Input/in_wv/wasabi/Winamp/api_wa5component.h @@ -4,7 +4,7 @@ #include class api_service; #ifdef WIN32 -#include +#include #endif class NOVTABLE api_wa5component : public Dispatchable diff --git a/Src/Plugins/Input/in_wv/wasabi/Winamp/wa_ipc.h b/Src/Plugins/Input/in_wv/wasabi/Winamp/wa_ipc.h index dd2559b52..501d9e70a 100644 --- a/Src/Plugins/Input/in_wv/wasabi/Winamp/wa_ipc.h +++ b/Src/Plugins/Input/in_wv/wasabi/Winamp/wa_ipc.h @@ -19,7 +19,7 @@ #ifndef _WA_IPC_H_ #define _WA_IPC_H_ -#include +#include #include #if (_MSC_VER <= 1200) typedef int intptr_t; @@ -440,9 +440,9 @@ typedef struct { #define IPC_ENABLEDISABLE_ALL_WINDOWS 259 // 0xdeadbeef to disable /* (requires Winamp 2.9+) ** SendMessage(hwnd_winamp,WM_WA_IPC,(enable?0:0xdeadbeef),IPC_ENABLEDISABLE_ALL_WINDOWS); -** Sending this message with 0xdeadbeef as the param will disable all winamp windows and -** any other values will enable all of the Winamp windows again. When disabled you won't -** get any response on clicking or trying to do anything to the Winamp windows. If the +** Sending this message with 0xdeadbeef as the param will disable all winamp arch and +** any other values will enable all of the Winamp arch again. When disabled you won't +** get any response on clicking or trying to do anything to the Winamp arch. If the ** taskbar icon is shown then you may still have control ;) */ @@ -593,7 +593,7 @@ typedef struct { ** 0 : main popup menu ** 1 : main menubar file menu ** 2 : main menubar options menu -** 3 : main menubar windows menu +** 3 : main menubar arch menu ** 4 : main menubar help menu ** other values will return NULL. */ @@ -1480,8 +1480,8 @@ class ITrackSelector #define IPC_ADJUST_FFWINDOWSMENUPOS 606 /* (requires Winamp 2.9+) ** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFWINDOWSMENUPOS); -** This will move where Winamp expects the freeform windows in the menubar windows main -** menu. This is useful if you wish to insert a menu item above extra freeform windows. +** This will move where Winamp expects the freeform arch in the menubar arch main +** menu. This is useful if you wish to insert a menu item above extra freeform arch. */ @@ -1496,7 +1496,7 @@ class ITrackSelector #define IPC_ADJUST_FFOPTIONSMENUPOS 609 /* (requires Winamp 2.9+) ** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFOPTIONSMENUPOS); -** moves where winamp expects the freeform preferences item in the menubar windows main +** moves where winamp expects the freeform preferences item in the menubar arch main ** menu. This is useful if you wish to insert a menu item above the preferences item. ** ** Note: This setting was ignored by gen_ff until it was fixed in 5.1 @@ -1705,7 +1705,7 @@ typedef struct { /* (requires Winamp 5.0+) ** SendMessage(hwnd_winamp,WM_WA_IPC,enabled,IPC_SETDRAWBORDERS); ** Set enabled to 1 to enable and 0 to disable drawing of the playlist editor and winamp -** gen class windows (used by gen_ff to allow it to draw its own window borders). +** gen class arch (used by gen_ff to allow it to draw its own window borders). */ @@ -2040,7 +2040,7 @@ typedef struct { ** int ismainwnd = (HWND)SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)(HWND)test_wnd,IPC_FF_ISMAINWND); ** ** This allows you to determine if the window handle passed to it is a modern skin main -** window or not. If it is a main window or any of its windowshade variants then it will +** window or not. If it is a main window or any of its archhade variants then it will ** return 1. ** ** Because of the way modern skins are implemented, it is possible for this message to @@ -2049,7 +2049,7 @@ typedef struct { ** window and also a winshaded version. ** ** The following code example below is one way of seeing how this api works since it will -** enumerate all windows related to Winamp at the time and allows you to process as +** enumerate all arch related to Winamp at the time and allows you to process as ** required when a detection happens. ** ** @@ -2059,7 +2059,7 @@ typedef struct { ** ** if(SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)hwnd,IPC_FF_ISMAINWND)){ ** // do processing in here -** // or continue the enum for other main windows (if they exist) +** // or continue the enum for other main arch (if they exist) ** // and just comment out the line below ** return 0; ** } @@ -2073,7 +2073,7 @@ typedef struct { ** HWND wa2embed = (HWND)SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)(HWND)test_wnd,IPC_FF_GETCONTENTWND); ** ** This will return the Winamp 2 window that is embedded in the window's container -** i.e. if hwnd is the playlist editor windowshade hwnd then it will return the Winamp 2 +** i.e. if hwnd is the playlist editor archhade hwnd then it will return the Winamp 2 ** playlist editor hwnd. ** ** If no content is found such as the window has nothing embedded then this will return diff --git a/Src/Plugins/Input/in_wv/wasabi/bfc/platform/platform.h b/Src/Plugins/Input/in_wv/wasabi/bfc/platform/platform.h index 46baf8a8b..4dbb8d0e2 100644 --- a/Src/Plugins/Input/in_wv/wasabi/bfc/platform/platform.h +++ b/Src/Plugins/Input/in_wv/wasabi/bfc/platform/platform.h @@ -142,7 +142,7 @@ inline int MulDiv(int a, int b, int c) #else #error port me -// Windows API dependant definitions for non-windows platforms +// Windows API dependant definitions for non-arch platforms #define __cdecl #define __stdcall diff --git a/Src/Plugins/Input/in_wv/wasabi/bfc/platform/types.h b/Src/Plugins/Input/in_wv/wasabi/bfc/platform/types.h index 9de1d7b17..cbc822a5a 100644 --- a/Src/Plugins/Input/in_wv/wasabi/bfc/platform/types.h +++ b/Src/Plugins/Input/in_wv/wasabi/bfc/platform/types.h @@ -39,7 +39,7 @@ typedef unsigned long FOURCC; #if defined(_WIN32) && !defined(__GNUC__) #include - // since windows doesn't have stdint.h + // since arch doesn't have stdint.h typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; @@ -56,7 +56,7 @@ typedef unsigned long FOURCC; #endif #ifdef WIN32 -#include +#include // this is for GUID == and != #include #ifndef GUID_EQUALS_DEFINED diff --git a/Src/Plugins/Input/in_wv/wasabi/bfc/platform/win32.h b/Src/Plugins/Input/in_wv/wasabi/bfc/platform/win32.h index 16e61bee7..66e2a19ed 100644 --- a/Src/Plugins/Input/in_wv/wasabi/bfc/platform/win32.h +++ b/Src/Plugins/Input/in_wv/wasabi/bfc/platform/win32.h @@ -9,11 +9,11 @@ #error this file should only be included from platform.h #endif -// this should be the *only* place windows.h gets included! +// this should be the *only* place arch.h gets included! #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #ifndef _WIN32_WCE #include #endif diff --git a/Src/Plugins/Input/in_wv/wasabi/nu/AutoChar.h b/Src/Plugins/Input/in_wv/wasabi/nu/AutoChar.h index 646df5d3d..a850353f3 100644 --- a/Src/Plugins/Input/in_wv/wasabi/nu/AutoChar.h +++ b/Src/Plugins/Input/in_wv/wasabi/nu/AutoChar.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_AUTOCHARH #define NULLSOFT_AUTOCHARH #ifdef WIN32 -#include +#include inline char *AutoCharDupN(const wchar_t *convert, size_t len, UINT codePage = CP_ACP, UINT flags=0) { diff --git a/Src/Plugins/Input/in_wv/wasabi/nu/AutoWide.h b/Src/Plugins/Input/in_wv/wasabi/nu/AutoWide.h index 26f3edb18..a9a31942d 100644 --- a/Src/Plugins/Input/in_wv/wasabi/nu/AutoWide.h +++ b/Src/Plugins/Input/in_wv/wasabi/nu/AutoWide.h @@ -1,7 +1,7 @@ #ifndef AUTOWIDEH #define AUTOWIDEH #ifdef WIN32 -#include +#include inline wchar_t *AutoWideDup(const char *convert, UINT codePage=CP_ACP) { diff --git a/Src/Plugins/Library/ml_autotag/main.h b/Src/Plugins/Library/ml_autotag/main.h index 996368ac7..9a6469474 100644 --- a/Src/Plugins/Library/ml_autotag/main.h +++ b/Src/Plugins/Library/ml_autotag/main.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_AUTOTAG_MAIN_H #define NULLSOFT_ML_AUTOTAG_MAIN_H -#include +#include #include #include "../../General/gen_ml/ml.h" #include "../nu/AutoWide.h" diff --git a/Src/Plugins/Library/ml_autotag/ml_autotag.vcxproj b/Src/Plugins/Library/ml_autotag/ml_autotag.vcxproj index a9a3c213c..13143e6af 100644 --- a/Src/Plugins/Library/ml_autotag/ml_autotag.vcxproj +++ b/Src/Plugins/Library/ml_autotag/ml_autotag.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_bookmarks/listview.cpp b/Src/Plugins/Library/ml_bookmarks/listview.cpp index a3ceb22c6..a778c5764 100644 --- a/Src/Plugins/Library/ml_bookmarks/listview.cpp +++ b/Src/Plugins/Library/ml_bookmarks/listview.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include #include "listview.h" diff --git a/Src/Plugins/Library/ml_bookmarks/listview.h b/Src/Plugins/Library/ml_bookmarks/listview.h index 5938a4dc4..dd91f9d9f 100644 --- a/Src/Plugins/Library/ml_bookmarks/listview.h +++ b/Src/Plugins/Library/ml_bookmarks/listview.h @@ -19,8 +19,8 @@ #ifndef _LISTVIEW_H_ #define _LISTVIEW_H_ -#include -#include +#include +#include #include class W_ListView diff --git a/Src/Plugins/Library/ml_bookmarks/main.h b/Src/Plugins/Library/ml_bookmarks/main.h index d8c2f3554..fd61bab29 100644 --- a/Src/Plugins/Library/ml_bookmarks/main.h +++ b/Src/Plugins/Library/ml_bookmarks/main.h @@ -1,8 +1,8 @@ #ifndef NULLSOFT_BOOKMARKS_MAIN_H #define NULLSOFT_BOOKMARKS_MAIN_H -#include -#include +#include +#include #include "api__ml_bookmarks.h" diff --git a/Src/Plugins/Library/ml_bookmarks/ml_bookmarks.vcxproj b/Src/Plugins/Library/ml_bookmarks/ml_bookmarks.vcxproj index 669a08938..1455501fa 100644 --- a/Src/Plugins/Library/ml_bookmarks/ml_bookmarks.vcxproj +++ b/Src/Plugins/Library/ml_bookmarks/ml_bookmarks.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_devices/gen_deviceprovider/gen_deviceprovider.vcproj b/Src/Plugins/Library/ml_devices/gen_deviceprovider/gen_deviceprovider.vcproj index 24f71f980..f85e00877 100644 --- a/Src/Plugins/Library/ml_devices/gen_deviceprovider/gen_deviceprovider.vcproj +++ b/Src/Plugins/Library/ml_devices/gen_deviceprovider/gen_deviceprovider.vcproj @@ -63,7 +63,7 @@ /> false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md @@ -131,7 +131,7 @@ true - comctl32.lib;shlwapi.lib;windowscodecs.lib;%(AdditionalDependencies) + comctl32.lib;shlwapi.lib;archcodecs.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true $(IntDir)$(TargetName).pdb @@ -171,7 +171,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\..\Build\Winamp_$(PlatformSho true - comctl32.lib;shlwapi.lib;windowscodecs.lib;%(AdditionalDependencies) + comctl32.lib;shlwapi.lib;archcodecs.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true $(IntDir)$(TargetName).pdb @@ -209,7 +209,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\..\Build\Winamp_$(PlatformSho $(IntDir)$(TargetName).pdb - comctl32.lib;shlwapi.lib;windowscodecs.lib;%(AdditionalDependencies) + comctl32.lib;shlwapi.lib;archcodecs.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) false $(IntDir)$(TargetName).pdb @@ -248,7 +248,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\..\Build\Winamp_$(PlatformSho $(IntDir)$(TargetName).pdb - comctl32.lib;shlwapi.lib;windowscodecs.lib;%(AdditionalDependencies) + comctl32.lib;shlwapi.lib;archcodecs.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) false $(IntDir)$(TargetName).pdb diff --git a/Src/Plugins/Library/ml_devices/ml_devices.vcxproj b/Src/Plugins/Library/ml_devices/ml_devices.vcxproj index baabc009b..d562a14c4 100644 --- a/Src/Plugins/Library/ml_devices/ml_devices.vcxproj +++ b/Src/Plugins/Library/ml_devices/ml_devices.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_disc/M3UWriter.h b/Src/Plugins/Library/ml_disc/M3UWriter.h index 2f4335d54..b934b4020 100644 --- a/Src/Plugins/Library/ml_disc/M3UWriter.h +++ b/Src/Plugins/Library/ml_disc/M3UWriter.h @@ -2,7 +2,7 @@ #define NULLSOFT_M3UWRITERH #include -#include +#include class M3UWriter { diff --git a/Src/Plugins/Library/ml_disc/PLSWriter.cpp b/Src/Plugins/Library/ml_disc/PLSWriter.cpp index 8231d5b7d..307792785 100644 --- a/Src/Plugins/Library/ml_disc/PLSWriter.cpp +++ b/Src/Plugins/Library/ml_disc/PLSWriter.cpp @@ -1,5 +1,5 @@ #include "PLSWriter.h" -#include +#include PLSWriter::PLSWriter() : numEntries(0), entryUsed(0) { diff --git a/Src/Plugins/Library/ml_disc/PLSWriter.h b/Src/Plugins/Library/ml_disc/PLSWriter.h index d97ddd472..6e82db181 100644 --- a/Src/Plugins/Library/ml_disc/PLSWriter.h +++ b/Src/Plugins/Library/ml_disc/PLSWriter.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_PLSWRITERH #define NULLSOFT_PLSWRITERH -#include +#include class PLSWriter { diff --git a/Src/Plugins/Library/ml_disc/ReplayGain.h b/Src/Plugins/Library/ml_disc/ReplayGain.h index 3e79e8c4d..d1ca364ad 100644 --- a/Src/Plugins/Library/ml_disc/ReplayGain.h +++ b/Src/Plugins/Library/ml_disc/ReplayGain.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_DISC_REPLAYGAIN_H #define NULLSOFT_ML_DISC_REPLAYGAIN_H -#include +#include #include "../ml_rg/obj_replaygain.h" void CALLBACK StartGain(ULONG_PTR data); diff --git a/Src/Plugins/Library/ml_disc/banner.h b/Src/Plugins/Library/ml_disc/banner.h index 9b7409cf4..62f781cd3 100644 --- a/Src/Plugins/Library/ml_disc/banner.h +++ b/Src/Plugins/Library/ml_disc/banner.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_BANNER_HEADER #define NULLSOFT_ML_BANNER_HEADER -#include +#include class MLBanner { diff --git a/Src/Plugins/Library/ml_disc/cdrip.cpp b/Src/Plugins/Library/ml_disc/cdrip.cpp index 58192596b..278c2e579 100644 --- a/Src/Plugins/Library/ml_disc/cdrip.cpp +++ b/Src/Plugins/Library/ml_disc/cdrip.cpp @@ -1,5 +1,5 @@ #include "main.h" -#include +#include #include "resource.h" #include "..\nu\listview.h" @@ -24,7 +24,7 @@ #include "PLSWriter.h" #include "./settings.h" #include -#include +#include #include extern unsigned int FileTimeToUnixTime(FILETIME *ft); diff --git a/Src/Plugins/Library/ml_disc/cmdbar_data.cpp b/Src/Plugins/Library/ml_disc/cmdbar_data.cpp index 1cd8b5118..04457da20 100644 --- a/Src/Plugins/Library/ml_disc/cmdbar_data.cpp +++ b/Src/Plugins/Library/ml_disc/cmdbar_data.cpp @@ -1,5 +1,5 @@ #include "main.h" -#include +#include #include "./resource.h" #include "./commandbar.h" #include diff --git a/Src/Plugins/Library/ml_disc/commandbar.h b/Src/Plugins/Library/ml_disc/commandbar.h index 6ff90583e..2bbbf5d4f 100644 --- a/Src/Plugins/Library/ml_disc/commandbar.h +++ b/Src/Plugins/Library/ml_disc/commandbar.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/Plugins/Library/ml_disc/config.h b/Src/Plugins/Library/ml_disc/config.h index 6ec17685b..aaa184f7a 100644 --- a/Src/Plugins/Library/ml_disc/config.h +++ b/Src/Plugins/Library/ml_disc/config.h @@ -6,7 +6,7 @@ #endif #define C_CONFIG_WIN32NATIVE -#include +#include class C_Config { diff --git a/Src/Plugins/Library/ml_disc/copyfiles.h b/Src/Plugins/Library/ml_disc/copyfiles.h index bd762f531..3350be1c9 100644 --- a/Src/Plugins/Library/ml_disc/copyfiles.h +++ b/Src/Plugins/Library/ml_disc/copyfiles.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/Plugins/Library/ml_disc/copyinternal.h b/Src/Plugins/Library/ml_disc/copyinternal.h index b59be7a63..9ce8508c3 100644 --- a/Src/Plugins/Library/ml_disc/copyinternal.h +++ b/Src/Plugins/Library/ml_disc/copyinternal.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #include "../Agave/Metadata/api_metadata.h" #include "../ml_local/api_mldb.h" diff --git a/Src/Plugins/Library/ml_disc/discInfo.h b/Src/Plugins/Library/ml_disc/discInfo.h index 89f6d30e8..8bedd5c42 100644 --- a/Src/Plugins/Library/ml_disc/discInfo.h +++ b/Src/Plugins/Library/ml_disc/discInfo.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_DISCINFO_HEADER #define NULLSOFT_DISCINFO_HEADER -#include +#include // disc data array size (see decalrations in discInfo.cpp) diff --git a/Src/Plugins/Library/ml_disc/drive.h b/Src/Plugins/Library/ml_disc/drive.h index 3bfe5b92c..4a280335d 100644 --- a/Src/Plugins/Library/ml_disc/drive.h +++ b/Src/Plugins/Library/ml_disc/drive.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include LPCWSTR Drive_GetTypeString(DWORD nType); LPCWSTR Drive_GetBusTypeString(DWORD nBusType); diff --git a/Src/Plugins/Library/ml_disc/driveListBox.h b/Src/Plugins/Library/ml_disc/driveListBox.h index 95d0c4e19..15bcea108 100644 --- a/Src/Plugins/Library/ml_disc/driveListBox.h +++ b/Src/Plugins/Library/ml_disc/driveListBox.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_DRIVE_COMBOBOX_HEADER #define NULLSOFT_DRIVE_COMBOBOX_HEADER -#include "windows.h" +#include "arch.h" class DriveListBox { diff --git a/Src/Plugins/Library/ml_disc/drivemngr.h b/Src/Plugins/Library/ml_disc/drivemngr.h index c5e9c2e97..6a4026555 100644 --- a/Src/Plugins/Library/ml_disc/drivemngr.h +++ b/Src/Plugins/Library/ml_disc/drivemngr.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include //#include "../primo/obj_primo.h" // drive types diff --git a/Src/Plugins/Library/ml_disc/infoBox.h b/Src/Plugins/Library/ml_disc/infoBox.h index b945aab47..49388e993 100644 --- a/Src/Plugins/Library/ml_disc/infoBox.h +++ b/Src/Plugins/Library/ml_disc/infoBox.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_INFOBOX_HEADER #define NULLSOFT_ML_INFOBOX_HEADER -#include +#include #define CAPTION_LENGTH 64 class MLInfoBox diff --git a/Src/Plugins/Library/ml_disc/main.h b/Src/Plugins/Library/ml_disc/main.h index 285b8de6b..b100e2c5e 100644 --- a/Src/Plugins/Library/ml_disc/main.h +++ b/Src/Plugins/Library/ml_disc/main.h @@ -15,7 +15,7 @@ #include "./copyinternal.h" #include -#include +#include #include #ifndef LONGX86 diff --git a/Src/Plugins/Library/ml_disc/medium.h b/Src/Plugins/Library/ml_disc/medium.h index fc0f5764c..544e9d82b 100644 --- a/Src/Plugins/Library/ml_disc/medium.h +++ b/Src/Plugins/Library/ml_disc/medium.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include LPCWSTR Medium_GetTypeString(DWORD nType); LPCWSTR Medium_GetPhysicalTypeString(DWORD nType); diff --git a/Src/Plugins/Library/ml_disc/ml_disc.vcxproj b/Src/Plugins/Library/ml_disc/ml_disc.vcxproj index a20771ca8..ca3a7f7d8 100644 --- a/Src/Plugins/Library/ml_disc/ml_disc.vcxproj +++ b/Src/Plugins/Library/ml_disc/ml_disc.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_disc/primosdk_helper.h b/Src/Plugins/Library/ml_disc/primosdk_helper.h index 04078bfd4..b2e79495a 100644 --- a/Src/Plugins/Library/ml_disc/primosdk_helper.h +++ b/Src/Plugins/Library/ml_disc/primosdk_helper.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include //#include #define PRIMOSDK_CMDSEQUENCE ((DWORD)0xFFFFFFFF) #define PRIMOSDK_OK 0 diff --git a/Src/Plugins/Library/ml_disc/settings.h b/Src/Plugins/Library/ml_disc/settings.h index 86aafa7a9..8b7b24e41 100644 --- a/Src/Plugins/Library/ml_disc/settings.h +++ b/Src/Plugins/Library/ml_disc/settings.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/Plugins/Library/ml_disc/spti.h b/Src/Plugins/Library/ml_disc/spti.h index 8c14e8e1e..848fb574d 100644 --- a/Src/Plugins/Library/ml_disc/spti.h +++ b/Src/Plugins/Library/ml_disc/spti.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include // 02:04:01 - LOGICAL UNIT IS IN PROCESS OF BECOMING READY diff --git a/Src/Plugins/Library/ml_disc/view_cdrom.cpp b/Src/Plugins/Library/ml_disc/view_cdrom.cpp index a980aef06..c679f37b1 100644 --- a/Src/Plugins/Library/ml_disc/view_cdrom.cpp +++ b/Src/Plugins/Library/ml_disc/view_cdrom.cpp @@ -1,7 +1,7 @@ #include #include "main.h" -#include +#include #include "resource.h" #include "../nu/DialogSkinner.h" #include "../nu/ChildSizer.h" diff --git a/Src/Plugins/Library/ml_disc/view_container.cpp b/Src/Plugins/Library/ml_disc/view_container.cpp index d5dad3354..8ced66957 100644 --- a/Src/Plugins/Library/ml_disc/view_container.cpp +++ b/Src/Plugins/Library/ml_disc/view_container.cpp @@ -7,7 +7,7 @@ #include "../nu/trace.h" //#include -#include +#include #include #define MINIINFO_HEIGHT 100 diff --git a/Src/Plugins/Library/ml_disc/view_data.cpp b/Src/Plugins/Library/ml_disc/view_data.cpp index d21def967..4474fbb2c 100644 --- a/Src/Plugins/Library/ml_disc/view_data.cpp +++ b/Src/Plugins/Library/ml_disc/view_data.cpp @@ -1,5 +1,5 @@ #include "main.h" -#include +#include #include "resource.h" #include "../winamp/wa_ipc.h" #include "../nu/DialogSkinner.h" diff --git a/Src/Plugins/Library/ml_disc/view_info.cpp b/Src/Plugins/Library/ml_disc/view_info.cpp index 609405f96..e84f9c214 100644 --- a/Src/Plugins/Library/ml_disc/view_info.cpp +++ b/Src/Plugins/Library/ml_disc/view_info.cpp @@ -2,7 +2,7 @@ #include "./resource.h" #include "../nu/DialogSkinner.h" -#include +#include static HBRUSH hbBack = NULL; diff --git a/Src/Plugins/Library/ml_disc/view_wait.cpp b/Src/Plugins/Library/ml_disc/view_wait.cpp index 17a8fa6f6..7e05d4c2f 100644 --- a/Src/Plugins/Library/ml_disc/view_wait.cpp +++ b/Src/Plugins/Library/ml_disc/view_wait.cpp @@ -2,7 +2,7 @@ #include "./resource.h" #include "../nu/DialogSkinner.h" -#include +#include static HBRUSH hbBack = NULL; #define TIMER_SHOWTEXT_ID 1985 diff --git a/Src/Plugins/Library/ml_downloads/Defaults.h b/Src/Plugins/Library/ml_downloads/Defaults.h index 52afbd601..4dab66a41 100644 --- a/Src/Plugins/Library/ml_downloads/Defaults.h +++ b/Src/Plugins/Library/ml_downloads/Defaults.h @@ -1,6 +1,6 @@ #ifndef NULLSOFT_DEFAULTSH #define NULLSOFT_DEFAULTSH -#include +#include extern wchar_t defaultDownloadPath[MAX_PATH]; diff --git a/Src/Plugins/Library/ml_downloads/Main.h b/Src/Plugins/Library/ml_downloads/Main.h index 39c4de664..0403a818c 100644 --- a/Src/Plugins/Library/ml_downloads/Main.h +++ b/Src/Plugins/Library/ml_downloads/Main.h @@ -20,7 +20,7 @@ void CloseDatabase(); #include "../nu/AutoChar.h" #include "../nu/AutoWide.h" #include "../nu/AutoLock.h" -#include +#include #include extern ATOM VIEWPROP; diff --git a/Src/Plugins/Library/ml_downloads/layout.cpp b/Src/Plugins/Library/ml_downloads/layout.cpp index bfdd95913..8393bec7a 100644 --- a/Src/Plugins/Library/ml_downloads/layout.cpp +++ b/Src/Plugins/Library/ml_downloads/layout.cpp @@ -1,6 +1,6 @@ #include "./layout.h" -#include +#include BOOL Layout_Initialize( HWND hwnd, const INT *itemList, INT itemCount, LAYOUTITEM *layout ) { diff --git a/Src/Plugins/Library/ml_downloads/ml_downloads.vcxproj b/Src/Plugins/Library/ml_downloads/ml_downloads.vcxproj index 3d27d8bfd..5868626bd 100644 --- a/Src/Plugins/Library/ml_downloads/ml_downloads.vcxproj +++ b/Src/Plugins/Library/ml_downloads/ml_downloads.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_fanzone/listview.cpp b/Src/Plugins/Library/ml_fanzone/listview.cpp index a3ceb22c6..a778c5764 100644 --- a/Src/Plugins/Library/ml_fanzone/listview.cpp +++ b/Src/Plugins/Library/ml_fanzone/listview.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include #include "listview.h" diff --git a/Src/Plugins/Library/ml_fanzone/listview.h b/Src/Plugins/Library/ml_fanzone/listview.h index 5938a4dc4..dd91f9d9f 100644 --- a/Src/Plugins/Library/ml_fanzone/listview.h +++ b/Src/Plugins/Library/ml_fanzone/listview.h @@ -19,8 +19,8 @@ #ifndef _LISTVIEW_H_ #define _LISTVIEW_H_ -#include -#include +#include +#include #include class W_ListView diff --git a/Src/Plugins/Library/ml_fanzone/main.h b/Src/Plugins/Library/ml_fanzone/main.h index 23dcf870f..303452792 100644 --- a/Src/Plugins/Library/ml_fanzone/main.h +++ b/Src/Plugins/Library/ml_fanzone/main.h @@ -1,13 +1,13 @@ #ifndef NULLSOFT_FANZONE_MAIN_H #define NULLSOFT_FANZONE_MAIN_H -#include +#include #include #include #include "api__ml_fanzone.h" #include "resource.h" -#include +#include #include "../Plugins/General/gen_ml/ml.h" #include "../nu/MediaLibraryInterface.h" diff --git a/Src/Plugins/Library/ml_fanzone/ml_fanzone.rc b/Src/Plugins/Library/ml_fanzone/ml_fanzone.rc index a537e8c95..0385c4124 100644 --- a/Src/Plugins/Library/ml_fanzone/ml_fanzone.rc +++ b/Src/Plugins/Library/ml_fanzone/ml_fanzone.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" +#include "arch.h" #undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ END 2 TEXTINCLUDE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" + "#include ""arch.h""\r\n" "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/Src/Plugins/Library/ml_fanzone/view.cpp b/Src/Plugins/Library/ml_fanzone/view.cpp index b223c2dfe..4761b9581 100644 --- a/Src/Plugins/Library/ml_fanzone/view.cpp +++ b/Src/Plugins/Library/ml_fanzone/view.cpp @@ -305,7 +305,7 @@ static BOOL FANZONE_OnDisplayChange() LayoutWindows( m_hwnd, TRUE ); - // Display the modal windows + // Display the modal arch ShowWindow( m_fanzone_node.getwnd(), SW_SHOW ); UpdateWindow( m_fanzone_node.getwnd() ); diff --git a/Src/Plugins/Library/ml_history/Main.h b/Src/Plugins/Library/ml_history/Main.h index 685b8ad15..48b518132 100644 --- a/Src/Plugins/Library/ml_history/Main.h +++ b/Src/Plugins/Library/ml_history/Main.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_MAINH #define NULLSOFT_MAINH -#include +#include #include "..\..\General\gen_ml/ml.h" #include "resource.h" #include "../nu/MediaLibraryInterface.h" @@ -9,7 +9,7 @@ #include #include #include "ml_history.h" -#include +#include #include "..\..\General\gen_ml/ml.h" #include "..\..\General\gen_ml/ml_ipc.h" #include "../nde/nde_c.h" diff --git a/Src/Plugins/Library/ml_history/ml_history.h b/Src/Plugins/Library/ml_history/ml_history.h index 4e8e60f53..b0bb33257 100644 --- a/Src/Plugins/Library/ml_history/ml_history.h +++ b/Src/Plugins/Library/ml_history/ml_history.h @@ -2,7 +2,7 @@ #define ML_HISTORY_MAIN_H #include "main.h" -#include +#include #include #include "..\..\General\gen_ml/gaystring.h" #include "..\..\General\gen_ml/config.h" diff --git a/Src/Plugins/Library/ml_history/ml_history.vcxproj b/Src/Plugins/Library/ml_history/ml_history.vcxproj index 0d6cf7cd1..65dd8a94d 100644 --- a/Src/Plugins/Library/ml_history/ml_history.vcxproj +++ b/Src/Plugins/Library/ml_history/ml_history.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_hotmixradio/listview.cpp b/Src/Plugins/Library/ml_hotmixradio/listview.cpp index a3ceb22c6..a778c5764 100644 --- a/Src/Plugins/Library/ml_hotmixradio/listview.cpp +++ b/Src/Plugins/Library/ml_hotmixradio/listview.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include #include "listview.h" diff --git a/Src/Plugins/Library/ml_hotmixradio/listview.h b/Src/Plugins/Library/ml_hotmixradio/listview.h index 5938a4dc4..dd91f9d9f 100644 --- a/Src/Plugins/Library/ml_hotmixradio/listview.h +++ b/Src/Plugins/Library/ml_hotmixradio/listview.h @@ -19,8 +19,8 @@ #ifndef _LISTVIEW_H_ #define _LISTVIEW_H_ -#include -#include +#include +#include #include class W_ListView diff --git a/Src/Plugins/Library/ml_hotmixradio/main.h b/Src/Plugins/Library/ml_hotmixradio/main.h index 4bd45b41f..1ee2031e0 100644 --- a/Src/Plugins/Library/ml_hotmixradio/main.h +++ b/Src/Plugins/Library/ml_hotmixradio/main.h @@ -1,11 +1,11 @@ #ifndef NULLSOFT_HOTMIXRADIO_MAIN_H #define NULLSOFT_HOTMIXRADIO_MAIN_H -#include +#include #include "../Plugins/General/gen_ml/ml.h" #include "../nu/MediaLibraryInterface.h" #include "resource.h" -#include +#include #include "resource.h" #include "../winamp/wa_ipc.h" #include "../Plugins/General/gen_ml/ml.h" diff --git a/Src/Plugins/Library/ml_impex/impex.cpp b/Src/Plugins/Library/ml_impex/impex.cpp index f37eaa657..fce997e6a 100644 --- a/Src/Plugins/Library/ml_impex/impex.cpp +++ b/Src/Plugins/Library/ml_impex/impex.cpp @@ -7,7 +7,7 @@ //#define PLUGIN_NAME "Nullsoft Database Import/Export" #define PLUGIN_VERSION L"2.65" -#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_impex/itunesxmlwrite.cpp b/Src/Plugins/Library/ml_impex/itunesxmlwrite.cpp index b4f863525..3b9a1530f 100644 --- a/Src/Plugins/Library/ml_impex/itunesxmlwrite.cpp +++ b/Src/Plugins/Library/ml_impex/itunesxmlwrite.cpp @@ -5,7 +5,7 @@ // //------------------------------------------------------------------------ -#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_impex/ml_impex.vcxproj b/Src/Plugins/Library/ml_impex/ml_impex.vcxproj index c1cf536d9..dd3a9a186 100644 --- a/Src/Plugins/Library/ml_impex/ml_impex.vcxproj +++ b/Src/Plugins/Library/ml_impex/ml_impex.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_local/AlbumArtContainer.h b/Src/Plugins/Library/ml_local/AlbumArtContainer.h index 988721ff5..c86df925c 100644 --- a/Src/Plugins/Library/ml_local/AlbumArtContainer.h +++ b/Src/Plugins/Library/ml_local/AlbumArtContainer.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_LOCAL_ALBUMARTCONTAINER_H #define NULLSOFT_ML_LOCAL_ALBUMARTCONTAINER_H -#include // for HDC +#include // for HDC #include class AlbumArtContainer diff --git a/Src/Plugins/Library/ml_local/AlbumArtFilter.cpp b/Src/Plugins/Library/ml_local/AlbumArtFilter.cpp index d7295571d..b984844da 100644 --- a/Src/Plugins/Library/ml_local/AlbumArtFilter.cpp +++ b/Src/Plugins/Library/ml_local/AlbumArtFilter.cpp @@ -833,7 +833,7 @@ INT_PTR AlbumArtFilter::DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,LPARAM if((ListView_GetItemState(list->getwnd(), x, LVIS_FOCUSED)&LVIS_FOCUSED) && albumList.Items[x+1].art) { // TODO change to use the explorer api - if(opened++ >= 10) break; // that's enough! Opening 400 exploerer windows may seem like fun, but windows _hates_ it. + if(opened++ >= 10) break; // that's enough! Opening 400 exploerer arch may seem like fun, but arch _hates_ it. wchar_t fn[MAX_PATH] = {0}; lstrcpynW(fn,albumList.Items[x+1].art->filename,MAX_PATH); PathRemoveFileSpecW(fn); diff --git a/Src/Plugins/Library/ml_local/FolderBrowseEx.h b/Src/Plugins/Library/ml_local/FolderBrowseEx.h index 746d186d5..644a377f2 100644 --- a/Src/Plugins/Library/ml_local/FolderBrowseEx.h +++ b/Src/Plugins/Library/ml_local/FolderBrowseEx.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_FOLDERBROWSE_EXTENDED_DIALOG_HEADER #define NULLSOFT_FOLDERBROWSE_EXTENDED_DIALOG_HEADER -#include +#include #include /// Standart controls diff --git a/Src/Plugins/Library/ml_local/MLString.h b/Src/Plugins/Library/ml_local/MLString.h index ddf98e587..808cd5c11 100644 --- a/Src/Plugins/Library/ml_local/MLString.h +++ b/Src/Plugins/Library/ml_local/MLString.h @@ -1,7 +1,7 @@ #ifndef NULLOSFT_MLSTRING_HEADER #define NULLOSFT_MLSTRING_HEADER -#include +#include class MLString { diff --git a/Src/Plugins/Library/ml_local/Main.h b/Src/Plugins/Library/ml_local/Main.h index bde0bc52d..32de079a0 100644 --- a/Src/Plugins/Library/ml_local/Main.h +++ b/Src/Plugins/Library/ml_local/Main.h @@ -1,8 +1,8 @@ #ifndef NULLSOFT_MAINH #define NULLSOFT_MAINH -#include -#include +#include +#include #include #include "..\..\General\gen_ml/ml.h" #include "../nu/MediaLibraryInterface.h" diff --git a/Src/Plugins/Library/ml_local/contnr.cpp b/Src/Plugins/Library/ml_local/contnr.cpp index 6306f3f2b..9b749d5fb 100644 --- a/Src/Plugins/Library/ml_local/contnr.cpp +++ b/Src/Plugins/Library/ml_local/contnr.cpp @@ -21,7 +21,7 @@ #include statements **************************************************************************/ #include "main.h" -#include +#include #include #include "contnr.h" diff --git a/Src/Plugins/Library/ml_local/editquery.cpp b/Src/Plugins/Library/ml_local/editquery.cpp index e1d4ca23f..1c8b7f4ff 100644 --- a/Src/Plugins/Library/ml_local/editquery.cpp +++ b/Src/Plugins/Library/ml_local/editquery.cpp @@ -1,6 +1,6 @@ #include "main.h" #include "ml_local.h" -#include +#include #include "editquery.h" #include "../nde/NDE.h" #include "resource.h" diff --git a/Src/Plugins/Library/ml_local/evntsink.cpp b/Src/Plugins/Library/ml_local/evntsink.cpp index e3301e39d..06731b13f 100644 --- a/Src/Plugins/Library/ml_local/evntsink.cpp +++ b/Src/Plugins/Library/ml_local/evntsink.cpp @@ -20,7 +20,7 @@ **************************************************************************/ #include "main.h" -#include +#include #include "evntsink.h" /************************************************************************** diff --git a/Src/Plugins/Library/ml_local/guess.cpp b/Src/Plugins/Library/ml_local/guess.cpp index 24686ddc3..f9607be36 100644 --- a/Src/Plugins/Library/ml_local/guess.cpp +++ b/Src/Plugins/Library/ml_local/guess.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include wchar_t *guessTitles(const wchar_t *filename, int *tracknum, diff --git a/Src/Plugins/Library/ml_local/ml_local.cpp b/Src/Plugins/Library/ml_local/ml_local.cpp index b6e0dde76..34e7670f6 100644 --- a/Src/Plugins/Library/ml_local/ml_local.cpp +++ b/Src/Plugins/Library/ml_local/ml_local.cpp @@ -2,7 +2,7 @@ #pragma warning(disable:4530) #include "main.h" #include "ml_local.h" -#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_local/ml_local.h b/Src/Plugins/Library/ml_local/ml_local.h index b607607c2..758663ce3 100644 --- a/Src/Plugins/Library/ml_local/ml_local.h +++ b/Src/Plugins/Library/ml_local/ml_local.h @@ -1,7 +1,7 @@ #ifndef ML_LOCAL_HEADER #define ML_LOCAL_HEADER -#include +#include #include #include // for std::wstring diff --git a/Src/Plugins/Library/ml_local/ml_local.vcxproj b/Src/Plugins/Library/ml_local/ml_local.vcxproj index 847d5b6d5..7ec429ceb 100644 --- a/Src/Plugins/Library/ml_local/ml_local.vcxproj +++ b/Src/Plugins/Library/ml_local/ml_local.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_local/nde_itemRecord.cpp b/Src/Plugins/Library/ml_local/nde_itemRecord.cpp index 7af7f6fc7..95fdb16e8 100644 --- a/Src/Plugins/Library/ml_local/nde_itemRecord.cpp +++ b/Src/Plugins/Library/ml_local/nde_itemRecord.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include "../../General/gen_ml/ml.h" #include "../nde/nde.h" #include "../nu/sort.h" diff --git a/Src/Plugins/Library/ml_local/view_audio.cpp b/Src/Plugins/Library/ml_local/view_audio.cpp index a2068ffaa..ee4c386f5 100644 --- a/Src/Plugins/Library/ml_local/view_audio.cpp +++ b/Src/Plugins/Library/ml_local/view_audio.cpp @@ -1,7 +1,7 @@ #include "main.h" #include "api__ml_local.h" #include "ml_local.h" -#include +#include #include "../nu/listview.h" #include "resource.h" #include "..\..\General\gen_ml/config.h" @@ -1220,7 +1220,7 @@ INT_PTR CALLBACK view_audioDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP SendMessageW(hwndDlg, WM_DISPLAYCHANGE, 0, 0L); - // clear the media windows refine shit + // clear the media arch refine shit SetDlgItemText(m_media_hwnd, IDC_QUICKSEARCH, L""); SetDlgItemText(m_media_hwnd, IDC_SEARCHCAPTION, WASABI_API_LNGSTRINGW(IDS_REFINE)); SetDlgItemText(m_media_hwnd, IDC_CLEAR, WASABI_API_LNGSTRINGW(IDS_CLEAR_REFINE)); diff --git a/Src/Plugins/Library/ml_local/view_media.cpp b/Src/Plugins/Library/ml_local/view_media.cpp index 7c8aa07e6..50292c430 100644 --- a/Src/Plugins/Library/ml_local/view_media.cpp +++ b/Src/Plugins/Library/ml_local/view_media.cpp @@ -1,6 +1,6 @@ #include "main.h" #include "ml_local.h" -#include +#include #include "../nu/listview.h" #include "..\..\General\gen_ml/config.h" #include "resource.h" diff --git a/Src/Plugins/Library/ml_nft/listview.cpp b/Src/Plugins/Library/ml_nft/listview.cpp index a3ceb22c6..a778c5764 100644 --- a/Src/Plugins/Library/ml_nft/listview.cpp +++ b/Src/Plugins/Library/ml_nft/listview.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include #include "listview.h" diff --git a/Src/Plugins/Library/ml_nft/listview.h b/Src/Plugins/Library/ml_nft/listview.h index 5938a4dc4..dd91f9d9f 100644 --- a/Src/Plugins/Library/ml_nft/listview.h +++ b/Src/Plugins/Library/ml_nft/listview.h @@ -19,8 +19,8 @@ #ifndef _LISTVIEW_H_ #define _LISTVIEW_H_ -#include -#include +#include +#include #include class W_ListView diff --git a/Src/Plugins/Library/ml_nft/main.h b/Src/Plugins/Library/ml_nft/main.h index fd93d9a76..d11e5448e 100644 --- a/Src/Plugins/Library/ml_nft/main.h +++ b/Src/Plugins/Library/ml_nft/main.h @@ -1,11 +1,11 @@ #ifndef NULLSOFT_NFT_MAIN_H #define NULLSOFT_NFT_MAIN_H -#include +#include #include "../Plugins/General/gen_ml/ml.h" #include "../nu/MediaLibraryInterface.h" #include "resource.h" -#include +#include #include "resource.h" #include "../winamp/wa_ipc.h" #include "../Plugins/General/gen_ml/ml.h" diff --git a/Src/Plugins/Library/ml_online/Preferences.cpp b/Src/Plugins/Library/ml_online/Preferences.cpp index 5bac3daf5..53ed117a8 100644 --- a/Src/Plugins/Library/ml_online/Preferences.cpp +++ b/Src/Plugins/Library/ml_online/Preferences.cpp @@ -6,7 +6,7 @@ #include "./api__ml_online.h" #include "./config.h" -#include +#include #include static prefsDlgRecW preferences; diff --git a/Src/Plugins/Library/ml_online/Setup/setupImage.h b/Src/Plugins/Library/ml_online/Setup/setupImage.h index 893e2c93e..89cf7da2a 100644 --- a/Src/Plugins/Library/ml_online/Setup/setupImage.h +++ b/Src/Plugins/Library/ml_online/Setup/setupImage.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include class SetupImage { diff --git a/Src/Plugins/Library/ml_online/Setup/setupListbox.cpp b/Src/Plugins/Library/ml_online/Setup/setupListbox.cpp index 1035c6992..090206b17 100644 --- a/Src/Plugins/Library/ml_online/Setup/setupListbox.cpp +++ b/Src/Plugins/Library/ml_online/Setup/setupListbox.cpp @@ -6,7 +6,7 @@ #include "../resource.h" #include "../api__ml_online.h" -#include "../../nu/windowsTheme.h" +#include "../../nu/archTheme.h" #include diff --git a/Src/Plugins/Library/ml_online/Setup/setupListbox.h b/Src/Plugins/Library/ml_online/Setup/setupListbox.h index 0fceffc3a..511bcfdce 100644 --- a/Src/Plugins/Library/ml_online/Setup/setupListbox.h +++ b/Src/Plugins/Library/ml_online/Setup/setupListbox.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include class SetupGroupList; class SetupListboxItem; diff --git a/Src/Plugins/Library/ml_online/Setup/setupPage.cpp b/Src/Plugins/Library/ml_online/Setup/setupPage.cpp index 8b2db86db..c45d6c6ee 100644 --- a/Src/Plugins/Library/ml_online/Setup/setupPage.cpp +++ b/Src/Plugins/Library/ml_online/Setup/setupPage.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/Src/Plugins/Library/ml_online/local_menu.cpp b/Src/Plugins/Library/ml_online/local_menu.cpp index 2548ad187..8d15e5c71 100644 --- a/Src/Plugins/Library/ml_online/local_menu.cpp +++ b/Src/Plugins/Library/ml_online/local_menu.cpp @@ -5,7 +5,7 @@ #include "./api__ml_online.h" #include "../../General/gen_ml/menu.h" -#include +#include #include #define MENU_SERVICECONTEXT 0 diff --git a/Src/Plugins/Library/ml_online/messageBox.cpp b/Src/Plugins/Library/ml_online/messageBox.cpp index 03a850e14..17f44069e 100644 --- a/Src/Plugins/Library/ml_online/messageBox.cpp +++ b/Src/Plugins/Library/ml_online/messageBox.cpp @@ -2,7 +2,7 @@ #include "./api__ml_online.h" #include "./resource.h" -#include +#include #include typedef struct __MESSAGEBOX diff --git a/Src/Plugins/Library/ml_online/ml_online.vcxproj b/Src/Plugins/Library/ml_online/ml_online.vcxproj index 8475fcd7c..672ec0f44 100644 --- a/Src/Plugins/Library/ml_online/ml_online.vcxproj +++ b/Src/Plugins/Library/ml_online/ml_online.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md @@ -303,7 +303,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN - + diff --git a/Src/Plugins/Library/ml_online/ml_online.vcxproj.filters b/Src/Plugins/Library/ml_online/ml_online.vcxproj.filters index 6963e519f..52aee7919 100644 --- a/Src/Plugins/Library/ml_online/ml_online.vcxproj.filters +++ b/Src/Plugins/Library/ml_online/ml_online.vcxproj.filters @@ -130,7 +130,7 @@ Source Files - + Source Files diff --git a/Src/Plugins/Library/ml_playlists/PlaylistInfo.h b/Src/Plugins/Library/ml_playlists/PlaylistInfo.h index df2f5722c..770077192 100644 --- a/Src/Plugins/Library/ml_playlists/PlaylistInfo.h +++ b/Src/Plugins/Library/ml_playlists/PlaylistInfo.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_PLAYLISTS_PLAYLIST_INFO_H #define NULLSOFT_ML_PLAYLISTS_PLAYLIST_INFO_H -#include // for MAX_PATH +#include // for MAX_PATH #include // for std::wstring // REVIEW: what if we want this to be an ifc_playlist * from elsewhere instead of a physical m3u file diff --git a/Src/Plugins/Library/ml_playlists/main.h b/Src/Plugins/Library/ml_playlists/main.h index 2aa135fe9..fb0eec2cc 100644 --- a/Src/Plugins/Library/ml_playlists/main.h +++ b/Src/Plugins/Library/ml_playlists/main.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_PLAYLISTS_MAIN_H #define NULLSOFT_ML_PLAYLISTS_MAIN_H -#include +#include #include #include "resource.h" diff --git a/Src/Plugins/Library/ml_playlists/ml_playlists.vcxproj b/Src/Plugins/Library/ml_playlists/ml_playlists.vcxproj index f86211b46..7db05391d 100644 --- a/Src/Plugins/Library/ml_playlists/ml_playlists.vcxproj +++ b/Src/Plugins/Library/ml_playlists/ml_playlists.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_playlists/pluginproc.cpp b/Src/Plugins/Library/ml_playlists/pluginproc.cpp index ed951d0b8..58658eaf6 100644 --- a/Src/Plugins/Library/ml_playlists/pluginproc.cpp +++ b/Src/Plugins/Library/ml_playlists/pluginproc.cpp @@ -1,6 +1,6 @@ #include "main.h" #include "resource.h" -#include +#include #include #include "SendTo.h" #include "ml_local/api_mldb.h" diff --git a/Src/Plugins/Library/ml_playlists/view_pl.cpp b/Src/Plugins/Library/ml_playlists/view_pl.cpp index 05cd2e1bd..4ab6782f0 100644 --- a/Src/Plugins/Library/ml_playlists/view_pl.cpp +++ b/Src/Plugins/Library/ml_playlists/view_pl.cpp @@ -1706,7 +1706,7 @@ static void CALLBACK playlist_OnScrollTimer( HWND hwnd, UINT uMsg, UINT_PTR idEv { static INT scrollInterval = 0; if ( 0 == scrollInterval ) - scrollInterval = GetProfileInt( TEXT( "windows" ), TEXT( "DragScrollInterval" ), DD_DEFSCROLLINTERVAL ); + scrollInterval = GetProfileInt( TEXT( "arch" ), TEXT( "DragScrollInterval" ), DD_DEFSCROLLINTERVAL ); if ( 0 != scrollInterval ) SetTimer( hwnd, idEvent, scrollTimerElapse, playlist_OnScrollTimer ); @@ -1719,7 +1719,7 @@ static INT playlist_GetScrollDirection( HWND hList, POINT pt ) { static INT scrollZone = 0; if ( 0 == scrollZone ) - scrollZone = GetProfileInt( TEXT( "windows" ), TEXT( "DragScrollInset" ), DD_DEFSCROLLINSET ); + scrollZone = GetProfileInt( TEXT( "arch" ), TEXT( "DragScrollInset" ), DD_DEFSCROLLINSET ); RECT rc, rcTest; if ( 0 == scrollZone || !GetClientRect( playlist_list.getwnd(), &rc ) ) @@ -1796,7 +1796,7 @@ static void playlist_MouseMove( HWND hwndDlg, POINTS pts ) if ( SCROLLDIR_NONE == scrollDirection ) { if ( 0 == scrollDelay ) - scrollDelay = GetProfileInt( TEXT( "windows" ), TEXT( "DragScrollDelay" ), DD_DEFSCROLLDELAY ); + scrollDelay = GetProfileInt( TEXT( "arch" ), TEXT( "DragScrollDelay" ), DD_DEFSCROLLDELAY ); if ( 0 != scrollDelay ) { diff --git a/Src/Plugins/Library/ml_playlists/view_playlists.cpp b/Src/Plugins/Library/ml_playlists/view_playlists.cpp index b84b0f52c..c439bb637 100644 --- a/Src/Plugins/Library/ml_playlists/view_playlists.cpp +++ b/Src/Plugins/Library/ml_playlists/view_playlists.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_plg/generate.cpp b/Src/Plugins/Library/ml_plg/generate.cpp index ed392dda7..c17d83cb4 100644 --- a/Src/Plugins/Library/ml_plg/generate.cpp +++ b/Src/Plugins/Library/ml_plg/generate.cpp @@ -1,6 +1,6 @@ #include "../gracenote/gracenote.h" #include "api__ml_plg.h" -#include +#include #include "resource.h" #include "../../General/gen_ml/ml.h" #include "../winamp/wa_ipc.h" diff --git a/Src/Plugins/Library/ml_plg/impl_playlist.h b/Src/Plugins/Library/ml_plg/impl_playlist.h index 589146af6..f86b90cbb 100644 --- a/Src/Plugins/Library/ml_plg/impl_playlist.h +++ b/Src/Plugins/Library/ml_plg/impl_playlist.h @@ -3,7 +3,7 @@ #include "../playlist/ifc_playlist.h" #include -#include // for MAX_PATH +#include // for MAX_PATH #include "../playlist/pl_entry.h" #include #include diff --git a/Src/Plugins/Library/ml_plg/main.h b/Src/Plugins/Library/ml_plg/main.h index 6a47e5d41..a37607a73 100644 --- a/Src/Plugins/Library/ml_plg/main.h +++ b/Src/Plugins/Library/ml_plg/main.h @@ -1,6 +1,6 @@ #ifndef NULLSOFT_ML_PLG_MAIN_H #define NULLSOFT_ML_PLG_MAIN_H -#include +#include #include "playlist.h" #include "../../General/gen_ml/ml.h" #include "IDScanner.h" diff --git a/Src/Plugins/Library/ml_plg/ml_plg.cpp b/Src/Plugins/Library/ml_plg/ml_plg.cpp index da519db30..1f418789e 100644 --- a/Src/Plugins/Library/ml_plg/ml_plg.cpp +++ b/Src/Plugins/Library/ml_plg/ml_plg.cpp @@ -112,7 +112,7 @@ void WriteIntToIni(const char *key, const int value) WritePrivateProfileStringA("ml_plg", key, buf, mediaLibrary.GetWinampIni()); } -// BE CAREFULL! Using this could potentially internationalize floats on some versions of windows eg. '1,6' instead of '1.6' +// BE CAREFULL! Using this could potentially internationalize floats on some versions of arch eg. '1,6' instead of '1.6' void WriteFloatToIni(const char *key, const float value) { char buf[32] = {0}; diff --git a/Src/Plugins/Library/ml_plg/ml_plg.vcxproj b/Src/Plugins/Library/ml_plg/ml_plg.vcxproj index d97866f3e..154c94f59 100644 --- a/Src/Plugins/Library/ml_plg/ml_plg.vcxproj +++ b/Src/Plugins/Library/ml_plg/ml_plg.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_plg/prefs.cpp b/Src/Plugins/Library/ml_plg/prefs.cpp index f8ce2d75f..dbc32d16e 100644 --- a/Src/Plugins/Library/ml_plg/prefs.cpp +++ b/Src/Plugins/Library/ml_plg/prefs.cpp @@ -1,6 +1,6 @@ #include "../gracenote/gracenote.h" #include "api__ml_plg.h" -#include +#include #include "resource.h" #include "../../General/gen_ml/ml.h" #include "../winamp/wa_ipc.h" diff --git a/Src/Plugins/Library/ml_pmp/ArtistAlbumLists.h b/Src/Plugins/Library/ml_pmp/ArtistAlbumLists.h index be868d0cb..f3974c779 100644 --- a/Src/Plugins/Library/ml_pmp/ArtistAlbumLists.h +++ b/Src/Plugins/Library/ml_pmp/ArtistAlbumLists.h @@ -1,8 +1,8 @@ #ifndef _ARTISTALBUMLISTS_H_ #define _ARTISTALBUMLISTS_H_ -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_pmp/DeviceView.h b/Src/Plugins/Library/ml_pmp/DeviceView.h index a930834ed..0bc208727 100644 --- a/Src/Plugins/Library/ml_pmp/DeviceView.h +++ b/Src/Plugins/Library/ml_pmp/DeviceView.h @@ -3,8 +3,8 @@ //#define _WIN32_WINNT 0x0400 -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_pmp/Filters.h b/Src/Plugins/Library/ml_pmp/Filters.h index c6be1f548..124237c24 100644 --- a/Src/Plugins/Library/ml_pmp/Filters.h +++ b/Src/Plugins/Library/ml_pmp/Filters.h @@ -1,8 +1,8 @@ #ifndef _FILTERS_H #define _FILTERS_H -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_pmp/LinkedQueue.h b/Src/Plugins/Library/ml_pmp/LinkedQueue.h index 84310efcc..d16e13671 100644 --- a/Src/Plugins/Library/ml_pmp/LinkedQueue.h +++ b/Src/Plugins/Library/ml_pmp/LinkedQueue.h @@ -1,7 +1,7 @@ #ifndef _LINKEDQUEUE_H_ #define _LINKEDQUEUE_H_ -#include +#include class LinkedQueue; class QueueElement; diff --git a/Src/Plugins/Library/ml_pmp/SkinnedListView.h b/Src/Plugins/Library/ml_pmp/SkinnedListView.h index 3682f9c5c..5a2398710 100644 --- a/Src/Plugins/Library/ml_pmp/SkinnedListView.h +++ b/Src/Plugins/Library/ml_pmp/SkinnedListView.h @@ -1,8 +1,8 @@ #ifndef _SKINNEDLISTVIEW_H_ #define _SKINNEDLISTVIEW_H_ -#include -#include +#include +#include #include #include #include "..\..\General\gen_ml/ml.h" diff --git a/Src/Plugins/Library/ml_pmp/autofill.cpp b/Src/Plugins/Library/ml_pmp/autofill.cpp index f8eb47a44..6bac547ea 100644 --- a/Src/Plugins/Library/ml_pmp/autofill.cpp +++ b/Src/Plugins/Library/ml_pmp/autofill.cpp @@ -16,7 +16,7 @@ ** 3. This notice may not be removed or altered from any source distribution. */ -#include +#include #include #include "../../General/gen_ml/ml.h" #include "pmp.h" diff --git a/Src/Plugins/Library/ml_pmp/banner.h b/Src/Plugins/Library/ml_pmp/banner.h index 85ce0fc11..383744745 100644 --- a/Src/Plugins/Library/ml_pmp/banner.h +++ b/Src/Plugins/Library/ml_pmp/banner.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_ML_BANNER_HEADER #define NULLSOFT_ML_BANNER_HEADER -#include +#include class MLBanner { diff --git a/Src/Plugins/Library/ml_pmp/config.cpp b/Src/Plugins/Library/ml_pmp/config.cpp index c14f110d5..424f8d119 100644 --- a/Src/Plugins/Library/ml_pmp/config.cpp +++ b/Src/Plugins/Library/ml_pmp/config.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_pmp/main.cpp b/Src/Plugins/Library/ml_pmp/main.cpp index 09bd908db..d662fce6b 100644 --- a/Src/Plugins/Library/ml_pmp/main.cpp +++ b/Src/Plugins/Library/ml_pmp/main.cpp @@ -2,8 +2,8 @@ #define PLUGIN_VERSION L"2.25" #include "main.h" -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_pmp/main.h b/Src/Plugins/Library/ml_pmp/main.h index 53d2767e5..19c6a221f 100644 --- a/Src/Plugins/Library/ml_pmp/main.h +++ b/Src/Plugins/Library/ml_pmp/main.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include "./graphics.h" #include "DeviceView.h" diff --git a/Src/Plugins/Library/ml_pmp/ml_pmp.vcxproj b/Src/Plugins/Library/ml_pmp/ml_pmp.vcxproj index 3ccbf638c..d927e729d 100644 --- a/Src/Plugins/Library/ml_pmp/ml_pmp.vcxproj +++ b/Src/Plugins/Library/ml_pmp/ml_pmp.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_pmp/pluginloader.h b/Src/Plugins/Library/ml_pmp/pluginloader.h index efb3cc1e4..5106d4ae7 100644 --- a/Src/Plugins/Library/ml_pmp/pluginloader.h +++ b/Src/Plugins/Library/ml_pmp/pluginloader.h @@ -1,7 +1,7 @@ #ifndef __PLUGINLOADER_H_ #define __PLUGINLOADER_H_ -#include +#include #include "..\..\General\gen_ml/ml.h" #include "pmp.h" #include "..\..\General\gen_ml/itemlist.h" diff --git a/Src/Plugins/Library/ml_pmp/pmp.h b/Src/Plugins/Library/ml_pmp/pmp.h index 1b24036b7..ba66e37ef 100644 --- a/Src/Plugins/Library/ml_pmp/pmp.h +++ b/Src/Plugins/Library/ml_pmp/pmp.h @@ -1,7 +1,7 @@ #ifndef __PMP_H_ #define __PMP_H_ #define WIN32_LEAN_AND_MEAN -#include // needed for HDC and stuff +#include // needed for HDC and stuff #include #include "..\..\General\gen_ml/ml.h" // for itemRecordW // make sure you include ml.h before you include this, wherever you include it. diff --git a/Src/Plugins/Library/ml_pmp/replaceVars.cpp b/Src/Plugins/Library/ml_pmp/replaceVars.cpp index 325442fb7..c691ce5bd 100644 --- a/Src/Plugins/Library/ml_pmp/replaceVars.cpp +++ b/Src/Plugins/Library/ml_pmp/replaceVars.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../../General/gen_ml/ml.h" #include "pmp.h" #include diff --git a/Src/Plugins/Library/ml_pmp/transcoder_imp.h b/Src/Plugins/Library/ml_pmp/transcoder_imp.h index bb41a366d..3c8167d38 100644 --- a/Src/Plugins/Library/ml_pmp/transcoder_imp.h +++ b/Src/Plugins/Library/ml_pmp/transcoder_imp.h @@ -1,8 +1,8 @@ #ifndef _TRANSCODER_IMP_H_ #define _TRANSCODER_IMP_H_ -#include -#include +#include +#include #include "..\..\General\gen_ml/itemlist.h" #include "../winamp/wa_ipc.h" #include "..\..\General\gen_ml/ml.h" diff --git a/Src/Plugins/Library/ml_pmp/view_pmp_devices.cpp b/Src/Plugins/Library/ml_pmp/view_pmp_devices.cpp index 42937088b..aaa9ca6a1 100644 --- a/Src/Plugins/Library/ml_pmp/view_pmp_devices.cpp +++ b/Src/Plugins/Library/ml_pmp/view_pmp_devices.cpp @@ -1,6 +1,6 @@ #include "main.h" -#include -#include +#include +#include #include #include #include "..\..\General\gen_ml/ml.h" diff --git a/Src/Plugins/Library/ml_pmp/view_pmp_media.cpp b/Src/Plugins/Library/ml_pmp/view_pmp_media.cpp index ade8f61d1..a38597465 100644 --- a/Src/Plugins/Library/ml_pmp/view_pmp_media.cpp +++ b/Src/Plugins/Library/ml_pmp/view_pmp_media.cpp @@ -19,8 +19,8 @@ #include "AlbumArtListView.h" #include "./local_menu.h" #include "metadata_utils.h" -#include -#include +#include +#include #include #include diff --git a/Src/Plugins/Library/ml_pmp/view_pmp_queue.cpp b/Src/Plugins/Library/ml_pmp/view_pmp_queue.cpp index aa01c0ce5..bc6af27cd 100644 --- a/Src/Plugins/Library/ml_pmp/view_pmp_queue.cpp +++ b/Src/Plugins/Library/ml_pmp/view_pmp_queue.cpp @@ -1,7 +1,7 @@ /* almost the same as view_pmp_devices, but only one device*/ #include "main.h" -#include -#include +#include +#include #include #include #include "..\..\General\gen_ml/ml.h" diff --git a/Src/Plugins/Library/ml_rg/main.h b/Src/Plugins/Library/ml_rg/main.h index 461b4ae7d..360ffb309 100644 --- a/Src/Plugins/Library/ml_rg/main.h +++ b/Src/Plugins/Library/ml_rg/main.h @@ -1,9 +1,9 @@ #ifndef NULLSOFT_ML_RG_MAIN_H #define NULLSOFT_ML_RG_MAIN_H -#include +#include #include "../../General/gen_ml/ml.h" -#include +#include #include "../winamp/wa_ipc.h" #include "../../General/gen_ml/ml.h" #include "resource.h" diff --git a/Src/Plugins/Library/ml_rg/ml_rg.vcxproj b/Src/Plugins/Library/ml_rg/ml_rg.vcxproj index 309e91948..c56ede2c9 100644 --- a/Src/Plugins/Library/ml_rg/ml_rg.vcxproj +++ b/Src/Plugins/Library/ml_rg/ml_rg.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_transcode/LinkedQueue.h b/Src/Plugins/Library/ml_transcode/LinkedQueue.h index 84310efcc..d16e13671 100644 --- a/Src/Plugins/Library/ml_transcode/LinkedQueue.h +++ b/Src/Plugins/Library/ml_transcode/LinkedQueue.h @@ -1,7 +1,7 @@ #ifndef _LINKEDQUEUE_H_ #define _LINKEDQUEUE_H_ -#include +#include class LinkedQueue; class QueueElement; diff --git a/Src/Plugins/Library/ml_transcode/main.cpp b/Src/Plugins/Library/ml_transcode/main.cpp index e0f0c4575..c8cf98fa8 100644 --- a/Src/Plugins/Library/ml_transcode/main.cpp +++ b/Src/Plugins/Library/ml_transcode/main.cpp @@ -1,7 +1,7 @@ #define PLUGIN_VERSION L"2.79" -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Library/ml_transcode/ml_transcode.vcxproj b/Src/Plugins/Library/ml_transcode/ml_transcode.vcxproj index e41d528d4..ab8767fa4 100644 --- a/Src/Plugins/Library/ml_transcode/ml_transcode.vcxproj +++ b/Src/Plugins/Library/ml_transcode/ml_transcode.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_transcode/replaceVars.cpp b/Src/Plugins/Library/ml_transcode/replaceVars.cpp index 6a6ce53bf..8cd4e72a8 100644 --- a/Src/Plugins/Library/ml_transcode/replaceVars.cpp +++ b/Src/Plugins/Library/ml_transcode/replaceVars.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "..\..\General\gen_ml/ml.h" diff --git a/Src/Plugins/Library/ml_webdev/ml_webdev.vcxproj b/Src/Plugins/Library/ml_webdev/ml_webdev.vcxproj index 0d7093e16..fd084f9e4 100644 --- a/Src/Plugins/Library/ml_webdev/ml_webdev.vcxproj +++ b/Src/Plugins/Library/ml_webdev/ml_webdev.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_wire/BackgroundDownloader.h b/Src/Plugins/Library/ml_wire/BackgroundDownloader.h index 6d2542a7c..80ad93bf5 100644 --- a/Src/Plugins/Library/ml_wire/BackgroundDownloader.h +++ b/Src/Plugins/Library/ml_wire/BackgroundDownloader.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_BACKGROUNDDOWNLOADERH #define NULLSOFT_BACKGROUNDDOWNLOADERH -#include +#include class BackgroundDownloader { diff --git a/Src/Plugins/Library/ml_wire/Cloud.h b/Src/Plugins/Library/ml_wire/Cloud.h index 505d936eb..1a8740f6e 100644 --- a/Src/Plugins/Library/ml_wire/Cloud.h +++ b/Src/Plugins/Library/ml_wire/Cloud.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_CLOUDH #define NULLSOFT_CLOUDH -#include +#include #include "Feeds.h" #include "../nu/threadpool/api_threadpool.h" diff --git a/Src/Plugins/Library/ml_wire/Defaults.h b/Src/Plugins/Library/ml_wire/Defaults.h index 2ffb47574..73b1949fc 100644 --- a/Src/Plugins/Library/ml_wire/Defaults.h +++ b/Src/Plugins/Library/ml_wire/Defaults.h @@ -1,6 +1,6 @@ #ifndef NULLSOFT_DEFAULTSH #define NULLSOFT_DEFAULTSH -#include +#include extern wchar_t defaultDownloadPath[MAX_PATH], serviceUrl[1024]; extern __time64_t updateTime; extern int autoDownloadEpisodes; diff --git a/Src/Plugins/Library/ml_wire/Item.h b/Src/Plugins/Library/ml_wire/Item.h index e7a5e82ba..81ab4d5ed 100644 --- a/Src/Plugins/Library/ml_wire/Item.h +++ b/Src/Plugins/Library/ml_wire/Item.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include +#include namespace RSS { diff --git a/Src/Plugins/Library/ml_wire/Main.h b/Src/Plugins/Library/ml_wire/Main.h index ea9d9a2d5..b73768401 100644 --- a/Src/Plugins/Library/ml_wire/Main.h +++ b/Src/Plugins/Library/ml_wire/Main.h @@ -35,7 +35,7 @@ void CloseDatabase(); #include "../nu/AutoWide.h" #include "../nu/AutoLock.h" #include "..\..\General\gen_ml/menu.h" -#include +#include #include extern ATOM VIEWPROP; diff --git a/Src/Plugins/Library/ml_wire/layout.cpp b/Src/Plugins/Library/ml_wire/layout.cpp index 722dc71f9..bb914fcdd 100644 --- a/Src/Plugins/Library/ml_wire/layout.cpp +++ b/Src/Plugins/Library/ml_wire/layout.cpp @@ -1,6 +1,6 @@ #include "./layout.h" -#include +#include BOOL Layout_Initialize( HWND hwnd, const INT *itemList, INT itemCount, LAYOUTITEM *layout ) { diff --git a/Src/Plugins/Library/ml_wire/ml_wire.vcxproj b/Src/Plugins/Library/ml_wire/ml_wire.vcxproj index 8562012dc..5141180f6 100644 --- a/Src/Plugins/Library/ml_wire/ml_wire.vcxproj +++ b/Src/Plugins/Library/ml_wire/ml_wire.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Library/ml_wire/subscriptionView.h b/Src/Plugins/Library/ml_wire/subscriptionView.h index 9bc5555db..ebd139f0e 100644 --- a/Src/Plugins/Library/ml_wire/subscriptionView.h +++ b/Src/Plugins/Library/ml_wire/subscriptionView.h @@ -7,7 +7,7 @@ #include -#include +#include #include "../nu/listview.h" #include "../nu/AutoLock.h" diff --git a/Src/Plugins/Output/out_disk/main.cpp b/Src/Plugins/Output/out_disk/main.cpp index ca0ed8ce5..6f45ed9fa 100644 --- a/Src/Plugins/Output/out_disk/main.cpp +++ b/Src/Plugins/Output/out_disk/main.cpp @@ -1,6 +1,6 @@ #define STRICT -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Output/out_disk/out_disk.vcxproj b/Src/Plugins/Output/out_disk/out_disk.vcxproj index 89e93029c..7110c2712 100644 --- a/Src/Plugins/Output/out_disk/out_disk.vcxproj +++ b/Src/Plugins/Output/out_disk/out_disk.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Output/out_ds/Config.h b/Src/Plugins/Output/out_ds/Config.h index bd9aa683c..9bf80bc49 100644 --- a/Src/Plugins/Output/out_ds/Config.h +++ b/Src/Plugins/Output/out_ds/Config.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_OUT_DS_CONFIG_H #define NULLSOFT_OUT_DS_CONFIG_H -#include +#include #include "ds_main.h" class DS2config //config struct to pass to DS2::create(); if create messes up, this struct also returns error message diff --git a/Src/Plugins/Output/out_ds/DevEnum.h b/Src/Plugins/Output/out_ds/DevEnum.h index 13bcf5834..4744ba84a 100644 --- a/Src/Plugins/Output/out_ds/DevEnum.h +++ b/Src/Plugins/Output/out_ds/DevEnum.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_OUT_DS_DEVENUM_H #define NULLSOFT_OUT_DS_DEVENUM_H -#include +#include #include #include #include "res_wa2/resource.h" diff --git a/Src/Plugins/Output/out_ds/VolCtrl.h b/Src/Plugins/Output/out_ds/VolCtrl.h index f7b1a02b3..9bf7756e7 100644 --- a/Src/Plugins/Output/out_ds/VolCtrl.h +++ b/Src/Plugins/Output/out_ds/VolCtrl.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_OUT_DS_VOLCTRL_H #define NULLSOFT_OUT_DS_VOLCTRL_H -#include +#include #include #include diff --git a/Src/Plugins/Output/out_ds/cnv_ds2.h b/Src/Plugins/Output/out_ds/cnv_ds2.h index 91e01ab3e..568b8b95e 100644 --- a/Src/Plugins/Output/out_ds/cnv_ds2.h +++ b/Src/Plugins/Output/out_ds/cnv_ds2.h @@ -13,7 +13,7 @@ #include "../studio/services/servicei.h" #include "../studio/corecb.h" -#include +#include #include #include diff --git a/Src/Plugins/Output/out_ds/ds2.h b/Src/Plugins/Output/out_ds/ds2.h index ae8593b3c..9f2b81046 100644 --- a/Src/Plugins/Output/out_ds/ds2.h +++ b/Src/Plugins/Output/out_ds/ds2.h @@ -4,7 +4,7 @@ #ifndef STRICT #define STRICT #endif -#include +#include #include #include diff --git a/Src/Plugins/Output/out_ds/out_ds.h b/Src/Plugins/Output/out_ds/out_ds.h index f481d27f1..ea486cd2a 100644 --- a/Src/Plugins/Output/out_ds/out_ds.h +++ b/Src/Plugins/Output/out_ds/out_ds.h @@ -1,5 +1,5 @@ #define STRICT -#include +#include #include "../Winamp/out.h" #include "ds2.h" #include "../pfc/pfc.h" diff --git a/Src/Plugins/Output/out_ds/out_ds.vcxproj b/Src/Plugins/Output/out_ds/out_ds.vcxproj index b74a71bad..350c2602f 100644 --- a/Src/Plugins/Output/out_ds/out_ds.vcxproj +++ b/Src/Plugins/Output/out_ds/out_ds.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Output/out_ds/wa2_config.cpp b/Src/Plugins/Output/out_ds/wa2_config.cpp index aec0cc57e..3c5fadf26 100644 --- a/Src/Plugins/Output/out_ds/wa2_config.cpp +++ b/Src/Plugins/Output/out_ds/wa2_config.cpp @@ -1,5 +1,5 @@ #include "out_ds.h" -#include +#include #include #include "res_wa2/resource.h" #include "ds2.h" diff --git a/Src/Plugins/Output/out_wasapi/out_wasapi.vcxproj b/Src/Plugins/Output/out_wasapi/out_wasapi.vcxproj index 56b614f05..3393bccc6 100644 --- a/Src/Plugins/Output/out_wasapi/out_wasapi.vcxproj +++ b/Src/Plugins/Output/out_wasapi/out_wasapi.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Output/out_wave/out_wave.h b/Src/Plugins/Output/out_wave/out_wave.h index 5db02d48f..0b3a24180 100644 --- a/Src/Plugins/Output/out_wave/out_wave.h +++ b/Src/Plugins/Output/out_wave/out_wave.h @@ -1,5 +1,5 @@ #define STRICT -#include +#include #include "../Winamp/out.h" extern Out_Module mod; diff --git a/Src/Plugins/Output/out_wave/out_wave.vcxproj b/Src/Plugins/Output/out_wave/out_wave.vcxproj index fcf3c27ce..0f7022c34 100644 --- a/Src/Plugins/Output/out_wave/out_wave.vcxproj +++ b/Src/Plugins/Output/out_wave/out_wave.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Output/out_wave/waveout.cpp b/Src/Plugins/Output/out_wave/waveout.cpp index c69ef4606..56319932c 100644 --- a/Src/Plugins/Output/out_wave/waveout.cpp +++ b/Src/Plugins/Output/out_wave/waveout.cpp @@ -1,5 +1,5 @@ #define STRICT -#include +#include #include "out_wave.h" #include "api.h" #include "waveout.h" diff --git a/Src/Plugins/Portable/pmp_activesync/ASDevice.h b/Src/Plugins/Portable/pmp_activesync/ASDevice.h index c1fa7584c..291beeb6f 100644 --- a/Src/Plugins/Portable/pmp_activesync/ASDevice.h +++ b/Src/Plugins/Portable/pmp_activesync/ASDevice.h @@ -1,8 +1,8 @@ #define _WIN32_DCOM #include -#include -#include +#include +#include #include #include //#include diff --git a/Src/Plugins/Portable/pmp_activesync/activesync/Inc/IRAPIStream.h b/Src/Plugins/Portable/pmp_activesync/activesync/Inc/IRAPIStream.h index c1004fa1d..35494ce13 100644 --- a/Src/Plugins/Portable/pmp_activesync/activesync/Inc/IRAPIStream.h +++ b/Src/Plugins/Portable/pmp_activesync/activesync/Inc/IRAPIStream.h @@ -32,7 +32,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/Plugins/Portable/pmp_activesync/activesync/Inc/rapi.h b/Src/Plugins/Portable/pmp_activesync/activesync/Inc/rapi.h index 18e47dbd3..bd3546981 100644 --- a/Src/Plugins/Portable/pmp_activesync/activesync/Inc/rapi.h +++ b/Src/Plugins/Portable/pmp_activesync/activesync/Inc/rapi.h @@ -15,7 +15,7 @@ #ifndef RAPI_H #define RAPI_H -#include +#include #include "rapitypes.h" #include "irapistream.h" diff --git a/Src/Plugins/Portable/pmp_activesync/activesync/Inc/rapi2.h b/Src/Plugins/Portable/pmp_activesync/activesync/Inc/rapi2.h index 6d930758d..4a3db1b41 100644 --- a/Src/Plugins/Portable/pmp_activesync/activesync/Inc/rapi2.h +++ b/Src/Plugins/Portable/pmp_activesync/activesync/Inc/rapi2.h @@ -32,7 +32,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/Plugins/Portable/pmp_android/androiddevice.h b/Src/Plugins/Portable/pmp_android/androiddevice.h index 331a808f4..b6d9573f7 100644 --- a/Src/Plugins/Portable/pmp_android/androiddevice.h +++ b/Src/Plugins/Portable/pmp_android/androiddevice.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include "../../Library/ml_pmp/transcoder.h" diff --git a/Src/Plugins/Portable/pmp_android/eject.cpp b/Src/Plugins/Portable/pmp_android/eject.cpp index fd9dd9c13..84b54beb1 100644 --- a/Src/Plugins/Portable/pmp_android/eject.cpp +++ b/Src/Plugins/Portable/pmp_android/eject.cpp @@ -1,6 +1,6 @@ // this file almost totally copied from MSDN -#include +#include #include #include diff --git a/Src/Plugins/Portable/pmp_android/filecopy.cpp b/Src/Plugins/Portable/pmp_android/filecopy.cpp index aecf94225..3a6f2a0e5 100644 --- a/Src/Plugins/Portable/pmp_android/filecopy.cpp +++ b/Src/Plugins/Portable/pmp_android/filecopy.cpp @@ -1,5 +1,5 @@ #include "api.h" -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Portable/pmp_android/pmp_android.vcxproj b/Src/Plugins/Portable/pmp_android/pmp_android.vcxproj index 34236c88f..1affa4458 100644 --- a/Src/Plugins/Portable/pmp_android/pmp_android.vcxproj +++ b/Src/Plugins/Portable/pmp_android/pmp_android.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Portable/pmp_android/utils.cpp b/Src/Plugins/Portable/pmp_android/utils.cpp index b81093dcd..d9e7da05e 100644 --- a/Src/Plugins/Portable/pmp_android/utils.cpp +++ b/Src/Plugins/Portable/pmp_android/utils.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../../General/gen_ml/ml.h" #include "../../Library/ml_pmp/pmp.h" #include "AndroidDevice.h" diff --git a/Src/Plugins/Portable/pmp_ipod/SysInfoXML.cpp b/Src/Plugins/Portable/pmp_ipod/SysInfoXML.cpp index 61246c8f4..80aa691ed 100644 --- a/Src/Plugins/Portable/pmp_ipod/SysInfoXML.cpp +++ b/Src/Plugins/Portable/pmp_ipod/SysInfoXML.cpp @@ -1,4 +1,4 @@ -#include +#include #include // for offsetof #include #include diff --git a/Src/Plugins/Portable/pmp_ipod/eject.cpp b/Src/Plugins/Portable/pmp_ipod/eject.cpp index 0786f1412..6868f0879 100644 --- a/Src/Plugins/Portable/pmp_ipod/eject.cpp +++ b/Src/Plugins/Portable/pmp_ipod/eject.cpp @@ -1,6 +1,6 @@ // this file almost totally copied from MSDN -#include +#include #include #include @@ -140,7 +140,7 @@ BOOL EjectVolume(TCHAR cDriveLetter) #else #include -#include +#include #include #include diff --git a/Src/Plugins/Portable/pmp_ipod/filecopy.cpp b/Src/Plugins/Portable/pmp_ipod/filecopy.cpp index e229d7953..3417ad229 100644 --- a/Src/Plugins/Portable/pmp_ipod/filecopy.cpp +++ b/Src/Plugins/Portable/pmp_ipod/filecopy.cpp @@ -1,5 +1,5 @@ #include "api.h" -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Portable/pmp_ipod/iPodArtworkDB.h b/Src/Plugins/Portable/pmp_ipod/iPodArtworkDB.h index 8e74e3e09..ea30fa0c7 100644 --- a/Src/Plugins/Portable/pmp_ipod/iPodArtworkDB.h +++ b/Src/Plugins/Portable/pmp_ipod/iPodArtworkDB.h @@ -36,7 +36,7 @@ #pragma once //#include -#include +#include #include #include #include diff --git a/Src/Plugins/Portable/pmp_ipod/iPodDB.cpp b/Src/Plugins/Portable/pmp_ipod/iPodDB.cpp index 1fe941900..a0e5ecc5f 100644 --- a/Src/Plugins/Portable/pmp_ipod/iPodDB.cpp +++ b/Src/Plugins/Portable/pmp_ipod/iPodDB.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -166,14 +166,14 @@ int STRCMP_NULLOK(const wchar_t *pa, const wchar_t *pb) { } #undef SKIP_THE_AND_WHITESPACE -// convert Macintosh timestamp to windows timestamp +// convert Macintosh timestamp to arch timestamp time_t mactime_to_wintime (const unsigned long mactime) { if (mactime != 0) return (time_t)(mactime - 2082844800); else return (time_t)mactime; } -// convert windows timestamp to Macintosh timestamp +// convert arch timestamp to Macintosh timestamp unsigned long wintime_to_mactime (const __time64_t time) { return (unsigned long)(time + 2082844800); diff --git a/Src/Plugins/Portable/pmp_ipod/iPodDB.h b/Src/Plugins/Portable/pmp_ipod/iPodDB.h index dd4878fa8..1ed6a668c 100644 --- a/Src/Plugins/Portable/pmp_ipod/iPodDB.h +++ b/Src/Plugins/Portable/pmp_ipod/iPodDB.h @@ -47,7 +47,7 @@ #pragma warning( disable : 4786) #include -#include +#include #include #include #include diff --git a/Src/Plugins/Portable/pmp_ipod/iPodDevice.h b/Src/Plugins/Portable/pmp_ipod/iPodDevice.h index 375dcf853..2a4004fd0 100644 --- a/Src/Plugins/Portable/pmp_ipod/iPodDevice.h +++ b/Src/Plugins/Portable/pmp_ipod/iPodDevice.h @@ -1,8 +1,8 @@ #ifndef _IPODDEVICE_H_ #define _IPODDEVICE_H_ -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Portable/pmp_ipod/iPodInfo.cpp b/Src/Plugins/Portable/pmp_ipod/iPodInfo.cpp index 948705534..5f92d74c6 100644 --- a/Src/Plugins/Portable/pmp_ipod/iPodInfo.cpp +++ b/Src/Plugins/Portable/pmp_ipod/iPodInfo.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include extern PMPDevicePlugin plugin; diff --git a/Src/Plugins/Portable/pmp_ipod/pmp_ipod.vcxproj b/Src/Plugins/Portable/pmp_ipod/pmp_ipod.vcxproj index 0e0444f79..2682e464a 100644 --- a/Src/Plugins/Portable/pmp_ipod/pmp_ipod.vcxproj +++ b/Src/Plugins/Portable/pmp_ipod/pmp_ipod.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Portable/pmp_njb/NJBDevice.h b/Src/Plugins/Portable/pmp_njb/NJBDevice.h index d42b40708..58434514f 100644 --- a/Src/Plugins/Portable/pmp_njb/NJBDevice.h +++ b/Src/Plugins/Portable/pmp_njb/NJBDevice.h @@ -9,8 +9,8 @@ #define UNICODE #endif -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Portable/pmp_njb/pmp_njb.vcxproj b/Src/Plugins/Portable/pmp_njb/pmp_njb.vcxproj index 7a12022ec..ca8233b25 100644 --- a/Src/Plugins/Portable/pmp_njb/pmp_njb.vcxproj +++ b/Src/Plugins/Portable/pmp_njb/pmp_njb.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Portable/pmp_p4s/P4SDevice.h b/Src/Plugins/Portable/pmp_p4s/P4SDevice.h index 3c05cb8f2..4832883fc 100644 --- a/Src/Plugins/Portable/pmp_p4s/P4SDevice.h +++ b/Src/Plugins/Portable/pmp_p4s/P4SDevice.h @@ -9,8 +9,8 @@ #define UNICODE #endif -#include -#include +#include +#include #include #include #include diff --git a/Src/Plugins/Portable/pmp_p4s/WMDRMDeviceApp.h b/Src/Plugins/Portable/pmp_p4s/WMDRMDeviceApp.h index 7f0968a42..885ecfbb1 100644 --- a/Src/Plugins/Portable/pmp_p4s/WMDRMDeviceApp.h +++ b/Src/Plugins/Portable/pmp_p4s/WMDRMDeviceApp.h @@ -32,7 +32,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/Plugins/Portable/pmp_p4s/mssachlp.lib b/Src/Plugins/Portable/pmp_p4s/mssachlp.lib index 041f12c30..d3fadcf55 100644 Binary files a/Src/Plugins/Portable/pmp_p4s/mssachlp.lib and b/Src/Plugins/Portable/pmp_p4s/mssachlp.lib differ diff --git a/Src/Plugins/Portable/pmp_p4s/mswmdm.h b/Src/Plugins/Portable/pmp_p4s/mswmdm.h index a2b72f4d2..c26c99022 100644 --- a/Src/Plugins/Portable/pmp_p4s/mswmdm.h +++ b/Src/Plugins/Portable/pmp_p4s/mswmdm.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/Plugins/Portable/pmp_p4s/pmp_p4s.vcxproj b/Src/Plugins/Portable/pmp_p4s/pmp_p4s.vcxproj index 60109e817..f7a04d028 100644 --- a/Src/Plugins/Portable/pmp_p4s/pmp_p4s.vcxproj +++ b/Src/Plugins/Portable/pmp_p4s/pmp_p4s.vcxproj @@ -112,26 +112,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md @@ -247,7 +247,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN $(IntDir)$(TargetName).lib false - ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;%(AdditionalLibraryDirectories) $(IntDir)$(TargetName).map @@ -363,7 +363,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN false $(IntDir)$(TargetName).lib false - ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;%(AdditionalLibraryDirectories) + ..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;%(AdditionalLibraryDirectories) xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Plugins\ diff --git a/Src/Plugins/Portable/pmp_p4s/sehupd.lib b/Src/Plugins/Portable/pmp_p4s/sehupd.lib index a9ebd9387..f5843e15e 100644 Binary files a/Src/Plugins/Portable/pmp_p4s/sehupd.lib and b/Src/Plugins/Portable/pmp_p4s/sehupd.lib differ diff --git a/Src/Plugins/Portable/pmp_p4s/wmdm.chm b/Src/Plugins/Portable/pmp_p4s/wmdm.chm index 5b8bea70a..3750666b1 100644 Binary files a/Src/Plugins/Portable/pmp_p4s/wmdm.chm and b/Src/Plugins/Portable/pmp_p4s/wmdm.chm differ diff --git a/Src/Plugins/Portable/pmp_usb/eject.cpp b/Src/Plugins/Portable/pmp_usb/eject.cpp index 36e12240d..50ed77ffb 100644 --- a/Src/Plugins/Portable/pmp_usb/eject.cpp +++ b/Src/Plugins/Portable/pmp_usb/eject.cpp @@ -1,6 +1,6 @@ // this file almost totally copied from MSDN -#include +#include #include #include diff --git a/Src/Plugins/Portable/pmp_usb/filecopy.cpp b/Src/Plugins/Portable/pmp_usb/filecopy.cpp index aecf94225..3a6f2a0e5 100644 --- a/Src/Plugins/Portable/pmp_usb/filecopy.cpp +++ b/Src/Plugins/Portable/pmp_usb/filecopy.cpp @@ -1,5 +1,5 @@ #include "api.h" -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Portable/pmp_usb/pmp_usb2.vcxproj b/Src/Plugins/Portable/pmp_usb/pmp_usb2.vcxproj index 96c905e2c..bf48fd6af 100644 --- a/Src/Plugins/Portable/pmp_usb/pmp_usb2.vcxproj +++ b/Src/Plugins/Portable/pmp_usb/pmp_usb2.vcxproj @@ -93,26 +93,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Portable/pmp_usb/usbdevice.h b/Src/Plugins/Portable/pmp_usb/usbdevice.h index adeb887e7..701de2642 100644 --- a/Src/Plugins/Portable/pmp_usb/usbdevice.h +++ b/Src/Plugins/Portable/pmp_usb/usbdevice.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include "../../Library/ml_pmp/transcoder.h" diff --git a/Src/Plugins/Portable/pmp_usb/utils.cpp b/Src/Plugins/Portable/pmp_usb/utils.cpp index c2f582b67..7e4584994 100644 --- a/Src/Plugins/Portable/pmp_usb/utils.cpp +++ b/Src/Plugins/Portable/pmp_usb/utils.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../../General/gen_ml/ml.h" #include "../../Library/ml_pmp/pmp.h" #include "USBDevice.h" diff --git a/Src/Plugins/Portable/pmp_wifi/ListenServer.cpp b/Src/Plugins/Portable/pmp_wifi/ListenServer.cpp index 297b0d9ed..016ed176a 100644 --- a/Src/Plugins/Portable/pmp_wifi/ListenServer.cpp +++ b/Src/Plugins/Portable/pmp_wifi/ListenServer.cpp @@ -11,7 +11,7 @@ namespace Wasabi2 #include "ssdp/cb_ssdp.h" } -#include +#include static nu::LockGuard connections_guard; diff --git a/Src/Plugins/Portable/pmp_wifi/pmp_wifi.vcxproj b/Src/Plugins/Portable/pmp_wifi/pmp_wifi.vcxproj index a85823ebb..dc4822885 100644 --- a/Src/Plugins/Portable/pmp_wifi/pmp_wifi.vcxproj +++ b/Src/Plugins/Portable/pmp_wifi/pmp_wifi.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/SDK/burner/BurnerCommon.h b/Src/Plugins/SDK/burner/BurnerCommon.h index 48b0d1b88..31ef6786b 100644 --- a/Src/Plugins/SDK/burner/BurnerCommon.h +++ b/Src/Plugins/SDK/burner/BurnerCommon.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../primo/obj_primo.h" class BurnerCommon diff --git a/Src/Plugins/SDK/dsp_test/dsp_test.c b/Src/Plugins/SDK/dsp_test/dsp_test.c index 1c9fa37ff..f5aed1803 100644 --- a/Src/Plugins/SDK/dsp_test/dsp_test.c +++ b/Src/Plugins/SDK/dsp_test/dsp_test.c @@ -2,7 +2,7 @@ // Copyright (C) 1997, Justin Frankel/Nullsoft // Feel free to base any plugins on this "framework"... -#include +#include #include #include #include "../Winamp/dsp.h" diff --git a/Src/Plugins/SDK/gen_classicart/gen_classicart.cpp b/Src/Plugins/SDK/gen_classicart/gen_classicart.cpp index 98c988a6d..6ed361e10 100644 --- a/Src/Plugins/SDK/gen_classicart/gen_classicart.cpp +++ b/Src/Plugins/SDK/gen_classicart/gen_classicart.cpp @@ -57,7 +57,7 @@ */ -#include +#include #include #include @@ -412,7 +412,7 @@ wchar_t temp[MAX_PATH] = {0}; static LRESULT WINAPI SubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { // handles the item being selected through the main window menu - // including via the windows taskbar menu as it'll fail otherwise + // including via the arch taskbar menu as it'll fail otherwise if((msg == WM_COMMAND || msg == WM_SYSCOMMAND) && LOWORD(wParam) == WINAMP_ARTVIEW_MENUID) { if(artwindow_open) PostMessage(myWndChild,WM_CLOSE,0,0); diff --git a/Src/Plugins/SDK/in_tone/MAIN.C b/Src/Plugins/SDK/in_tone/MAIN.C index 1ab7cccef..96b82499c 100644 --- a/Src/Plugins/SDK/in_tone/MAIN.C +++ b/Src/Plugins/SDK/in_tone/MAIN.C @@ -3,7 +3,7 @@ ** Copyright (c) 1998, Justin Frankel/Nullsoft Inc. */ -#include +#include #include #include #include diff --git a/Src/Plugins/SDK/irctell/dde.cpp b/Src/Plugins/SDK/irctell/dde.cpp index 790ffa099..401b914e6 100644 --- a/Src/Plugins/SDK/irctell/dde.cpp +++ b/Src/Plugins/SDK/irctell/dde.cpp @@ -1,4 +1,4 @@ -#include +#include #include "dde.h" #include diff --git a/Src/Plugins/SDK/irctell/irctell.cpp b/Src/Plugins/SDK/irctell/irctell.cpp index 92f333b8e..d98e44381 100644 --- a/Src/Plugins/SDK/irctell/irctell.cpp +++ b/Src/Plugins/SDK/irctell/irctell.cpp @@ -1,4 +1,4 @@ -#include +#include #include "irctell.h" #include #include @@ -34,7 +34,7 @@ void WACIrctell::RegisterServices(api_service *service) void WACIrctell::DeregisterServices(api_service *service) { - // be sure to delete all your windows etc HERE, not in the destructor + // be sure to delete all your arch etc HERE, not in the destructor // because the API pointer might be invalid in the destructor // if (core) // core->core_delCallback(0, this); diff --git a/Src/Plugins/SDK/ml_xmlex/main.h b/Src/Plugins/SDK/ml_xmlex/main.h index d0b8b4356..0cf8fe6fe 100644 --- a/Src/Plugins/SDK/ml_xmlex/main.h +++ b/Src/Plugins/SDK/ml_xmlex/main.h @@ -1,7 +1,7 @@ #ifndef _XMLEX_MAIN_H_ #define _XMLEX_MAIN_H_ -#include -#include +#include +#include #include "../nu/MediaLibraryInterface.h" #include "..\..\General\gen_ml\ml.h" #include "..\..\General\gen_ml\config.h" diff --git a/Src/Plugins/SDK/ml_xmlex/xmlview.cpp b/Src/Plugins/SDK/ml_xmlex/xmlview.cpp index 463df934d..8f92611b7 100644 --- a/Src/Plugins/SDK/ml_xmlex/xmlview.cpp +++ b/Src/Plugins/SDK/ml_xmlex/xmlview.cpp @@ -1,6 +1,6 @@ #include "main.h" #include -#include +#include #include "shlobj.h" #include "..\..\General\gen_ml\ml_ipc_0313.h" #include "..\..\General\gen_ml\childwnd.h" @@ -245,8 +245,8 @@ static BOOL xmlex_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) case IDC_LOAD: { wchar_t filename[256] = L""; - //browse box supported in windows 2000+ - //if this doesnt work for you (old versions of windows) just know that the file name is set in ofn.lpstrFile which is then moved to filename variable + //browse box supported in arch 2000+ + //if this doesnt work for you (old versions of arch) just know that the file name is set in ofn.lpstrFile which is then moved to filename variable OPENFILENAME ofn = {0}; ofn.lStructSize = sizeof (OPENFILENAME); ofn.hwndOwner=hwnd; diff --git a/Src/Plugins/SDK/out_null/Out_null.dsp b/Src/Plugins/SDK/out_null/Out_null.dsp index 7ec8730f4..19a926d54 100644 --- a/Src/Plugins/SDK/out_null/Out_null.dsp +++ b/Src/Plugins/SDK/out_null/Out_null.dsp @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib /out:"c:\program files\winamp\plugins\out_null.dll" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:arch /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:arch /dll /machine:I386 /nodefaultlib /out:"c:\program files\winamp\plugins\out_null.dll" !ELSEIF "$(CFG)" == "out_null - Win32 Debug" @@ -79,8 +79,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"c:\program files\winamp\plugins\out_null.dll" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:arch /dll /debug /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:arch /dll /debug /machine:I386 /out:"c:\program files\winamp\plugins\out_null.dll" !ENDIF diff --git a/Src/Plugins/SDK/out_null/main.c b/Src/Plugins/SDK/out_null/main.c index 55eb9906b..c26119972 100644 --- a/Src/Plugins/SDK/out_null/main.c +++ b/Src/Plugins/SDK/out_null/main.c @@ -1,4 +1,4 @@ -#include +#include #include #include "../winamp/out.h" diff --git a/Src/Plugins/Visualization/vis_avs/apesdk/avstut00.cpp b/Src/Plugins/Visualization/vis_avs/apesdk/avstut00.cpp index e1c12f0f2..937939799 100644 --- a/Src/Plugins/Visualization/vis_avs/apesdk/avstut00.cpp +++ b/Src/Plugins/Visualization/vis_avs/apesdk/avstut00.cpp @@ -21,7 +21,7 @@ good luck and have fun! **/ -#include +#include #include "resource.h" #include "avs_ape.h" @@ -130,7 +130,7 @@ static BOOL CALLBACK g_DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,LPARAM lPa cs.lpCustColors = custcolors; cs.Flags = CC_RGBINIT|CC_FULLOPEN; - // go to windows color selection screen + // go to arch color selection screen if (ChooseColor(&cs)) { *a = ((cs.rgbResult>>16)&0xff)|(cs.rgbResult&0xff00)|((cs.rgbResult<<16)&0xff0000); diff --git a/Src/Plugins/Visualization/vis_avs/avs_eelif.cpp b/Src/Plugins/Visualization/vis_avs/avs_eelif.cpp index a91418094..5bc171196 100644 --- a/Src/Plugins/Visualization/vis_avs/avs_eelif.cpp +++ b/Src/Plugins/Visualization/vis_avs/avs_eelif.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "../ns-eel2/ns-eel-int.h" #include "../ns-eel2/ns-eel-addfuncs.h" #include "avs_eelif.h" diff --git a/Src/Plugins/Visualization/vis_avs/bpm.cpp b/Src/Plugins/Visualization/vis_avs/bpm.cpp index 1ab80f790..b42fa1ccd 100644 --- a/Src/Plugins/Visualization/vis_avs/bpm.cpp +++ b/Src/Plugins/Visualization/vis_avs/bpm.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/cfgwin.cpp b/Src/Plugins/Visualization/vis_avs/cfgwin.cpp index d16a3ba25..6b2812ab5 100644 --- a/Src/Plugins/Visualization/vis_avs/cfgwin.cpp +++ b/Src/Plugins/Visualization/vis_avs/cfgwin.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/draw.cpp b/Src/Plugins/Visualization/vis_avs/draw.cpp index 5eddc4518..a3ebeebd8 100644 --- a/Src/Plugins/Visualization/vis_avs/draw.cpp +++ b/Src/Plugins/Visualization/vis_avs/draw.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "draw.h" #include diff --git a/Src/Plugins/Visualization/vis_avs/evallib/CAL_TAB.C b/Src/Plugins/Visualization/vis_avs/evallib/CAL_TAB.C index 83345693e..bc5afe4fb 100644 --- a/Src/Plugins/Visualization/vis_avs/evallib/CAL_TAB.C +++ b/Src/Plugins/Visualization/vis_avs/evallib/CAL_TAB.C @@ -1,4 +1,4 @@ -#include +#include #include #include "Compiler.h" #include "eval.h" diff --git a/Src/Plugins/Visualization/vis_avs/evallib/Compiler.c b/Src/Plugins/Visualization/vis_avs/evallib/Compiler.c index 56d3a0676..9b1a95437 100644 --- a/Src/Plugins/Visualization/vis_avs/evallib/Compiler.c +++ b/Src/Plugins/Visualization/vis_avs/evallib/Compiler.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include "Compiler.h" diff --git a/Src/Plugins/Visualization/vis_avs/evallib/cfunc.c b/Src/Plugins/Visualization/vis_avs/evallib/cfunc.c index f311aaada..717f9dcf5 100644 --- a/Src/Plugins/Visualization/vis_avs/evallib/cfunc.c +++ b/Src/Plugins/Visualization/vis_avs/evallib/cfunc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include "Compiler.h" diff --git a/Src/Plugins/Visualization/vis_avs/evallib/eval.c b/Src/Plugins/Visualization/vis_avs/evallib/eval.c index 44e458813..bf42dab01 100644 --- a/Src/Plugins/Visualization/vis_avs/evallib/eval.c +++ b/Src/Plugins/Visualization/vis_avs/evallib/eval.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/ff_ipc.h b/Src/Plugins/Visualization/vis_avs/ff_ipc.h index 9fe335d0b..56ed61da1 100644 --- a/Src/Plugins/Visualization/vis_avs/ff_ipc.h +++ b/Src/Plugins/Visualization/vis_avs/ff_ipc.h @@ -97,8 +97,8 @@ typedef struct { // ----------------------------------------------------------------------------------------------- #define IPC_FF_ONCOLORTHEMECHANGED IPC_FF_FIRST + 3 // data = name of the new color theme (const char *) -#define IPC_FF_ISMAINWND IPC_FF_FIRST + 4 // data = hwnd, returns 1 if hwnd is main window or any of its windowshade -#define IPC_FF_GETCONTENTWND IPC_FF_FIRST + 5 // data = HWND, returns the wa2 window that is embedded in the window's container (ie if hwnd is the pledit windowshade hwnd, it returns the wa2 pledit hwnd). if no content is found (ie, the window has nothing embedded) it returns the parameter you gave it +#define IPC_FF_ISMAINWND IPC_FF_FIRST + 4 // data = hwnd, returns 1 if hwnd is main window or any of its archhade +#define IPC_FF_GETCONTENTWND IPC_FF_FIRST + 5 // data = HWND, returns the wa2 window that is embedded in the window's container (ie if hwnd is the pledit archhade hwnd, it returns the wa2 pledit hwnd). if no content is found (ie, the window has nothing embedded) it returns the parameter you gave it #define IPC_FF_NOTIFYHOTKEY IPC_FF_FIRST + 6 // data = const char * to hotkey description #endif diff --git a/Src/Plugins/Visualization/vis_avs/laser/laser.cpp b/Src/Plugins/Visualization/vis_avs/laser/laser.cpp index c229499b2..546841cb5 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/laser.cpp +++ b/Src/Plugins/Visualization/vis_avs/laser/laser.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include extern "C" { #include "ld32.h" }; diff --git a/Src/Plugins/Visualization/vis_avs/laser/laserline.cpp b/Src/Plugins/Visualization/vis_avs/laser/laserline.cpp index e9c44c2c5..68b852e1d 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/laserline.cpp +++ b/Src/Plugins/Visualization/vis_avs/laser/laserline.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include #include #include "../r_defs.h" extern "C" { diff --git a/Src/Plugins/Visualization/vis_avs/laser/ld32.c b/Src/Plugins/Visualization/vis_avs/laser/ld32.c index 90a1f385b..053587efd 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/ld32.c +++ b/Src/Plugins/Visualization/vis_avs/laser/ld32.c @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include #include "ld32.h" diff --git a/Src/Plugins/Visualization/vis_avs/laser/linelist.cpp b/Src/Plugins/Visualization/vis_avs/laser/linelist.cpp index bfc36e2ea..7cb6443ba 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/linelist.cpp +++ b/Src/Plugins/Visualization/vis_avs/laser/linelist.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include #include "linelist.h" class C_LineList : public C_LineListBase diff --git a/Src/Plugins/Visualization/vis_avs/laser/rl_beathold.cpp b/Src/Plugins/Visualization/vis_avs/laser/rl_beathold.cpp index abbb556c9..b7b0eb75d 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/rl_beathold.cpp +++ b/Src/Plugins/Visualization/vis_avs/laser/rl_beathold.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include #include #include "../r_defs.h" #include "../resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/laser/rl_bren.cpp b/Src/Plugins/Visualization/vis_avs/laser/rl_bren.cpp index d91a310b3..44071d27e 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/rl_bren.cpp +++ b/Src/Plugins/Visualization/vis_avs/laser/rl_bren.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include #include #include "../r_defs.h" #include "../resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/laser/rl_cones.cpp b/Src/Plugins/Visualization/vis_avs/laser/rl_cones.cpp index 027b2607a..aadd04df6 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/rl_cones.cpp +++ b/Src/Plugins/Visualization/vis_avs/laser/rl_cones.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include #include #include "../r_defs.h" #include "../resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/laser/rl_line.cpp b/Src/Plugins/Visualization/vis_avs/laser/rl_line.cpp index a049532ae..cabf63013 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/rl_line.cpp +++ b/Src/Plugins/Visualization/vis_avs/laser/rl_line.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include #include #include "../r_defs.h" #include "../resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/laser/rl_trans.cpp b/Src/Plugins/Visualization/vis_avs/laser/rl_trans.cpp index af4d3f706..eb4d739aa 100644 --- a/Src/Plugins/Visualization/vis_avs/laser/rl_trans.cpp +++ b/Src/Plugins/Visualization/vis_avs/laser/rl_trans.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef LASER -#include +#include #include #include "../r_defs.h" #include "../resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/linedraw.cpp b/Src/Plugins/Visualization/vis_avs/linedraw.cpp index f6ec9de3e..1cfe55bf5 100644 --- a/Src/Plugins/Visualization/vis_avs/linedraw.cpp +++ b/Src/Plugins/Visualization/vis_avs/linedraw.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "r_defs.h" #include diff --git a/Src/Plugins/Visualization/vis_avs/main.cpp b/Src/Plugins/Visualization/vis_avs/main.cpp index 05b16d5c7..a224a7bd4 100644 --- a/Src/Plugins/Visualization/vis_avs/main.cpp +++ b/Src/Plugins/Visualization/vis_avs/main.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include "draw.h" diff --git a/Src/Plugins/Visualization/vis_avs/matrix.cpp b/Src/Plugins/Visualization/vis_avs/matrix.cpp index 8b567f2a8..44d1e0e7f 100644 --- a/Src/Plugins/Visualization/vis_avs/matrix.cpp +++ b/Src/Plugins/Visualization/vis_avs/matrix.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_avi.cpp b/Src/Plugins/Visualization/vis_avs/r_avi.cpp index fd52ff326..a4ddcb52a 100644 --- a/Src/Plugins/Visualization/vis_avs/r_avi.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_avi.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_blit.cpp b/Src/Plugins/Visualization/vis_avs/r_blit.cpp index 901df213e..923347487 100644 --- a/Src/Plugins/Visualization/vis_avs/r_blit.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_blit.cpp @@ -30,7 +30,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // alphachannel safe 11/21/99 // highly optimized on 10/10/00 JF. MMX. -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_blur.cpp b/Src/Plugins/Visualization/vis_avs/r_blur.cpp index 77645dc9d..b9b689605 100644 --- a/Src/Plugins/Visualization/vis_avs/r_blur.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_blur.cpp @@ -29,7 +29,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_bpm.cpp b/Src/Plugins/Visualization/vis_avs/r_bpm.cpp index 9ed19d165..1545fe130 100644 --- a/Src/Plugins/Visualization/vis_avs/r_bpm.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_bpm.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_bright.cpp b/Src/Plugins/Visualization/vis_avs/r_bright.cpp index bb224add3..c099e80f4 100644 --- a/Src/Plugins/Visualization/vis_avs/r_bright.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_bright.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_bspin.cpp b/Src/Plugins/Visualization/vis_avs/r_bspin.cpp index dac61a1b1..530ced1be 100644 --- a/Src/Plugins/Visualization/vis_avs/r_bspin.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_bspin.cpp @@ -29,7 +29,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe (sets alpha to 0 on rendered portions) 11/21/99 -#include +#include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_bump.cpp b/Src/Plugins/Visualization/vis_avs/r_bump.cpp index 5d0e5fdd2..5c33d31a1 100644 --- a/Src/Plugins/Visualization/vis_avs/r_bump.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_bump.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_chanshift.cpp b/Src/Plugins/Visualization/vis_avs/r_chanshift.cpp index 7bf60ea47..39996b2ae 100644 --- a/Src/Plugins/Visualization/vis_avs/r_chanshift.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_chanshift.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_clear.cpp b/Src/Plugins/Visualization/vis_avs/r_clear.cpp index 21021b6bc..dd6fdd0a0 100644 --- a/Src/Plugins/Visualization/vis_avs/r_clear.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_clear.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_colorfade.cpp b/Src/Plugins/Visualization/vis_avs/r_colorfade.cpp index 021a6cd18..64ed54b70 100644 --- a/Src/Plugins/Visualization/vis_avs/r_colorfade.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_colorfade.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_colorreduction.cpp b/Src/Plugins/Visualization/vis_avs/r_colorreduction.cpp index 2d4fa7a41..e2f034845 100644 --- a/Src/Plugins/Visualization/vis_avs/r_colorreduction.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_colorreduction.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "resource.h" #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_colorreplace.cpp b/Src/Plugins/Visualization/vis_avs/r_colorreplace.cpp index adf4d775b..fbc492599 100644 --- a/Src/Plugins/Visualization/vis_avs/r_colorreplace.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_colorreplace.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_comment.cpp b/Src/Plugins/Visualization/vis_avs/r_comment.cpp index be4c8fbac..eeaeb93bd 100644 --- a/Src/Plugins/Visualization/vis_avs/r_comment.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_comment.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_contrast.cpp b/Src/Plugins/Visualization/vis_avs/r_contrast.cpp index bf7395f43..fc470224b 100644 --- a/Src/Plugins/Visualization/vis_avs/r_contrast.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_contrast.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_dcolormod.cpp b/Src/Plugins/Visualization/vis_avs/r_dcolormod.cpp index 640f7e8cc..7f0182fe8 100644 --- a/Src/Plugins/Visualization/vis_avs/r_dcolormod.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_dcolormod.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_ddm.cpp b/Src/Plugins/Visualization/vis_avs/r_ddm.cpp index 21db977ce..a2682a163 100644 --- a/Src/Plugins/Visualization/vis_avs/r_ddm.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_ddm.cpp @@ -29,7 +29,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #define M_PI 3.14159265358979323846 -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_dmove.cpp b/Src/Plugins/Visualization/vis_avs/r_dmove.cpp index 34ce64819..b16112a5d 100644 --- a/Src/Plugins/Visualization/vis_avs/r_dmove.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_dmove.cpp @@ -29,7 +29,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #define M_PI 3.14159265358979323846 -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_dotfnt.cpp b/Src/Plugins/Visualization/vis_avs/r_dotfnt.cpp index 2ec518a99..c318c8a6b 100644 --- a/Src/Plugins/Visualization/vis_avs/r_dotfnt.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_dotfnt.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_dotgrid.cpp b/Src/Plugins/Visualization/vis_avs/r_dotgrid.cpp index 129c6410f..3bc088480 100644 --- a/Src/Plugins/Visualization/vis_avs/r_dotgrid.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_dotgrid.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_dotpln.cpp b/Src/Plugins/Visualization/vis_avs/r_dotpln.cpp index 0f94b1333..738d9a488 100644 --- a/Src/Plugins/Visualization/vis_avs/r_dotpln.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_dotpln.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_fadeout.cpp b/Src/Plugins/Visualization/vis_avs/r_fadeout.cpp index 335b64cf3..c7c769718 100644 --- a/Src/Plugins/Visualization/vis_avs/r_fadeout.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_fadeout.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_fastbright.cpp b/Src/Plugins/Visualization/vis_avs/r_fastbright.cpp index f30a67107..aad34db12 100644 --- a/Src/Plugins/Visualization/vis_avs/r_fastbright.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_fastbright.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_grain.cpp b/Src/Plugins/Visualization/vis_avs/r_grain.cpp index ed8f368b6..8b0c8e3eb 100644 --- a/Src/Plugins/Visualization/vis_avs/r_grain.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_grain.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_interf.cpp b/Src/Plugins/Visualization/vis_avs/r_interf.cpp index 40b4e4bd1..8d8c26ef5 100644 --- a/Src/Plugins/Visualization/vis_avs/r_interf.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_interf.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_interleave.cpp b/Src/Plugins/Visualization/vis_avs/r_interleave.cpp index 62b1ae190..b592f4c73 100644 --- a/Src/Plugins/Visualization/vis_avs/r_interleave.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_interleave.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_invert.cpp b/Src/Plugins/Visualization/vis_avs/r_invert.cpp index 50520b4bc..d8b6b9b11 100644 --- a/Src/Plugins/Visualization/vis_avs/r_invert.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_invert.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_linemode.cpp b/Src/Plugins/Visualization/vis_avs/r_linemode.cpp index 370c19228..f50e6bb08 100644 --- a/Src/Plugins/Visualization/vis_avs/r_linemode.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_linemode.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_list.cpp b/Src/Plugins/Visualization/vis_avs/r_list.cpp index d0ee55a6a..56450caa4 100644 --- a/Src/Plugins/Visualization/vis_avs/r_list.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_list.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_mirror.cpp b/Src/Plugins/Visualization/vis_avs/r_mirror.cpp index 2573cb3ee..a901bdc92 100644 --- a/Src/Plugins/Visualization/vis_avs/r_mirror.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_mirror.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "resource.h" #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_mosaic.cpp b/Src/Plugins/Visualization/vis_avs/r_mosaic.cpp index b298c3d04..f6fdc8fce 100644 --- a/Src/Plugins/Visualization/vis_avs/r_mosaic.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_mosaic.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_multidelay.cpp b/Src/Plugins/Visualization/vis_avs/r_multidelay.cpp index 7f742e63f..85c146585 100644 --- a/Src/Plugins/Visualization/vis_avs/r_multidelay.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_multidelay.cpp @@ -31,7 +31,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // copyright tom holden, 2002 // mail: cfp@myrealbox.com -#include +#include #include "resource.h" #include "r_defs.h" #include "../Agave/Language/api_language.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_multiplier.cpp b/Src/Plugins/Visualization/vis_avs/r_multiplier.cpp index c59acb5ea..744ff91e5 100644 --- a/Src/Plugins/Visualization/vis_avs/r_multiplier.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_multiplier.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "resource.h" #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_nfclr.cpp b/Src/Plugins/Visualization/vis_avs/r_nfclr.cpp index 3c5a393c3..52368cbce 100644 --- a/Src/Plugins/Visualization/vis_avs/r_nfclr.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_nfclr.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_onetone.cpp b/Src/Plugins/Visualization/vis_avs/r_onetone.cpp index c709dac92..0d2ca97a8 100644 --- a/Src/Plugins/Visualization/vis_avs/r_onetone.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_onetone.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_oscring.cpp b/Src/Plugins/Visualization/vis_avs/r_oscring.cpp index 497662bbf..0e82eb9bb 100644 --- a/Src/Plugins/Visualization/vis_avs/r_oscring.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_oscring.cpp @@ -29,7 +29,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_oscstar.cpp b/Src/Plugins/Visualization/vis_avs/r_oscstar.cpp index 1bb37a1b7..74ca8ff16 100644 --- a/Src/Plugins/Visualization/vis_avs/r_oscstar.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_oscstar.cpp @@ -29,7 +29,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_parts.cpp b/Src/Plugins/Visualization/vis_avs/r_parts.cpp index 085830ddf..63ba03770 100644 --- a/Src/Plugins/Visualization/vis_avs/r_parts.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_parts.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_picture.cpp b/Src/Plugins/Visualization/vis_avs/r_picture.cpp index 9ff29ec5d..490190c99 100644 --- a/Src/Plugins/Visualization/vis_avs/r_picture.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_picture.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_rotblit.cpp b/Src/Plugins/Visualization/vis_avs/r_rotblit.cpp index 97ee2a05c..3816c2b67 100644 --- a/Src/Plugins/Visualization/vis_avs/r_rotblit.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_rotblit.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_rotstar.cpp b/Src/Plugins/Visualization/vis_avs/r_rotstar.cpp index dd3c038eb..2f4f70d5f 100644 --- a/Src/Plugins/Visualization/vis_avs/r_rotstar.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_rotstar.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include "r_defs.h" #include diff --git a/Src/Plugins/Visualization/vis_avs/r_scat.cpp b/Src/Plugins/Visualization/vis_avs/r_scat.cpp index 99c9f0f68..27ab55ee3 100644 --- a/Src/Plugins/Visualization/vis_avs/r_scat.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_scat.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_shift.cpp b/Src/Plugins/Visualization/vis_avs/r_shift.cpp index 3fcced027..aeaf1cea1 100644 --- a/Src/Plugins/Visualization/vis_avs/r_shift.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_shift.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_simple.cpp b/Src/Plugins/Visualization/vis_avs/r_simple.cpp index 4d910a6fe..7ea6e89f4 100644 --- a/Src/Plugins/Visualization/vis_avs/r_simple.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_simple.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_sscope.cpp b/Src/Plugins/Visualization/vis_avs/r_sscope.cpp index c466db2ef..a9e986469 100644 --- a/Src/Plugins/Visualization/vis_avs/r_sscope.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_sscope.cpp @@ -29,7 +29,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #define M_PI 3.14159265358979323846 -#include +#include #include #include #include "r_defs.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_stack.cpp b/Src/Plugins/Visualization/vis_avs/r_stack.cpp index 3fca86e0b..dd87c1228 100644 --- a/Src/Plugins/Visualization/vis_avs/r_stack.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_stack.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_stars.cpp b/Src/Plugins/Visualization/vis_avs/r_stars.cpp index 21a1a5fcd..18fcd3f4f 100644 --- a/Src/Plugins/Visualization/vis_avs/r_stars.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_stars.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_svp.cpp b/Src/Plugins/Visualization/vis_avs/r_svp.cpp index 97781f0aa..f790072fa 100644 --- a/Src/Plugins/Visualization/vis_avs/r_svp.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_svp.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_text.cpp b/Src/Plugins/Visualization/vis_avs/r_text.cpp index e0d0edfc7..7dfc82c27 100644 --- a/Src/Plugins/Visualization/vis_avs/r_text.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_text.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_timescope.cpp b/Src/Plugins/Visualization/vis_avs/r_timescope.cpp index 2cd67dc5d..96cc4fa1a 100644 --- a/Src/Plugins/Visualization/vis_avs/r_timescope.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_timescope.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_trans.cpp b/Src/Plugins/Visualization/vis_avs/r_trans.cpp index 9181c354f..ebf607798 100644 --- a/Src/Plugins/Visualization/vis_avs/r_trans.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_trans.cpp @@ -30,7 +30,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // alphachannel safe 11/21/99 #define M_PI 3.14159265358979323846 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_transition.cpp b/Src/Plugins/Visualization/vis_avs/r_transition.cpp index 0d94f64d7..1bb1dc59d 100644 --- a/Src/Plugins/Visualization/vis_avs/r_transition.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_transition.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/r_unkn.cpp b/Src/Plugins/Visualization/vis_avs/r_unkn.cpp index 7d58ef3ea..3b198f0f3 100644 --- a/Src/Plugins/Visualization/vis_avs/r_unkn.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_unkn.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_videodelay.cpp b/Src/Plugins/Visualization/vis_avs/r_videodelay.cpp index e8a3e1fc2..7d303c658 100644 --- a/Src/Plugins/Visualization/vis_avs/r_videodelay.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_videodelay.cpp @@ -31,7 +31,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // copyright tom holden, 2002 // mail: cfp@myrealbox.com -#include +#include #include "resource.h" #include "r_defs.h" #include "../Agave/Language/api_language.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_water.cpp b/Src/Plugins/Visualization/vis_avs/r_water.cpp index 424ec4dd3..30df452e9 100644 --- a/Src/Plugins/Visualization/vis_avs/r_water.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_water.cpp @@ -29,7 +29,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // alphachannel safe 11/21/99 -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/r_waterbump.cpp b/Src/Plugins/Visualization/vis_avs/r_waterbump.cpp index 92a6c85f4..160037c3d 100644 --- a/Src/Plugins/Visualization/vis_avs/r_waterbump.cpp +++ b/Src/Plugins/Visualization/vis_avs/r_waterbump.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_avs/render.cpp b/Src/Plugins/Visualization/vis_avs/render.cpp index 72fd3fb93..b7eb57b68 100644 --- a/Src/Plugins/Visualization/vis_avs/render.cpp +++ b/Src/Plugins/Visualization/vis_avs/render.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "render.h" #include "timing.h" #include "undo.h" diff --git a/Src/Plugins/Visualization/vis_avs/rlib.cpp b/Src/Plugins/Visualization/vis_avs/rlib.cpp index 07c926110..ec17eb1dc 100644 --- a/Src/Plugins/Visualization/vis_avs/rlib.cpp +++ b/Src/Plugins/Visualization/vis_avs/rlib.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "r_defs.h" #include "r_unkn.h" #include "r_list.h" diff --git a/Src/Plugins/Visualization/vis_avs/undo.cpp b/Src/Plugins/Visualization/vis_avs/undo.cpp index 0010dcf18..e337be20e 100644 --- a/Src/Plugins/Visualization/vis_avs/undo.cpp +++ b/Src/Plugins/Visualization/vis_avs/undo.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "undo.h" #include "render.h" diff --git a/Src/Plugins/Visualization/vis_avs/util.cpp b/Src/Plugins/Visualization/vis_avs/util.cpp index 03ffc7691..4ca176359 100644 --- a/Src/Plugins/Visualization/vis_avs/util.cpp +++ b/Src/Plugins/Visualization/vis_avs/util.cpp @@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "r_defs.h" #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_avs/vis_avs.vcxproj b/Src/Plugins/Visualization/vis_avs/vis_avs.vcxproj index 356ca61e8..c23e414bc 100644 --- a/Src/Plugins/Visualization/vis_avs/vis_avs.vcxproj +++ b/Src/Plugins/Visualization/vis_avs/vis_avs.vcxproj @@ -96,26 +96,26 @@ true Debug - x86-windows-static-md + x86-arch-static-md true - x86-windows-static-md + x86-arch-static-md true - x86-windows-static-md + x86-arch-static-md Debug true - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Visualization/vis_avs/wa_ipc.h b/Src/Plugins/Visualization/vis_avs/wa_ipc.h index 1efc79506..57affadad 100644 --- a/Src/Plugins/Visualization/vis_avs/wa_ipc.h +++ b/Src/Plugins/Visualization/vis_avs/wa_ipc.h @@ -309,8 +309,8 @@ do not use :) #define IPC_ENABLEDISABLE_ALL_WINDOWS 259 // 0xdeadbeef to disable /* (requires Winamp 2.9+) ** SendMessage(hwnd_winamp,WM_WA_IPC,enable?0:0xdeadbeef,IPC_MBOPENREAL); -** sending with 0xdeadbeef as the param disables all winamp windows, -** any other values will enable all winamp windows. +** sending with 0xdeadbeef as the param disables all winamp arch, +** any other values will enable all winamp arch. */ @@ -446,7 +446,7 @@ do not use :) ** 0 : main popup menu ** 1 : main menubar file menu ** 2 : main menubar options menu -** 3 : main menubar windows menu +** 3 : main menubar arch menu ** 4 : main menubar help menu ** other values will return NULL. */ @@ -861,8 +861,8 @@ class ITrackSelector #define IPC_ADJUST_FFWINDOWSMENUPOS 606 /* (requires Winamp 2.9+) ** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFWINDOWSMENUPOS); -** moves where winamp expects the freeform windows in the menubar windows main menu. Useful if you wish to insert a -** menu item above extra freeform windows. +** moves where winamp expects the freeform arch in the menubar arch main menu. Useful if you wish to insert a +** menu item above extra freeform arch. */ #define IPC_ISDOUBLESIZE 608 @@ -870,7 +870,7 @@ class ITrackSelector #define IPC_ADJUST_FFOPTIONSMENUPOS 609 /* (requires Winamp 2.9+) ** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFOPTIONSMENUPOS); -** moves where winamp expects the freeform preferences item in the menubar windows main menu. Useful if you wish to insert a +** moves where winamp expects the freeform preferences item in the menubar arch main menu. Useful if you wish to insert a ** menu item above preferences item. */ diff --git a/Src/Plugins/Visualization/vis_avs/wnd.cpp b/Src/Plugins/Visualization/vis_avs/wnd.cpp index 7b9200593..bf15245f2 100644 --- a/Src/Plugins/Visualization/vis_avs/wnd.cpp +++ b/Src/Plugins/Visualization/vis_avs/wnd.cpp @@ -28,8 +28,8 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -#include -#include +#include +#include #include "vis.h" #include "draw.h" #include "wnd.h" diff --git a/Src/Plugins/Visualization/vis_milk2/DOCUMENTATION.TXT b/Src/Plugins/Visualization/vis_milk2/DOCUMENTATION.TXT index 3e98969e0..86ecca15c 100644 --- a/Src/Plugins/Visualization/vis_milk2/DOCUMENTATION.TXT +++ b/Src/Plugins/Visualization/vis_milk2/DOCUMENTATION.TXT @@ -97,11 +97,11 @@ Required software 1. Nullsoft Winamp 2.X (~1 MB) http://www.winamp.com/ 2. Microsoft DirectX 8.0+ - (~11 MB) - http://www.microsoft.com/windows/directx/ + http://www.microsoft.com/arch/directx/ 3. Microsoft Developer Studio (Visual C++) 6.0 (a retail product) 4. Microsoft DirectX 8.0 SDK (Software Development Kit) - (~173 MB) - http://www.microsoft.com/windows/directx/ + http://www.microsoft.com/arch/directx/ (then click the 'msdn' icon in the lower right, under "info for developers") *** NOTE that you can use a later SDK, such as 8.1b; but if you @@ -707,7 +707,7 @@ Version History 'integrate with winamp' checkbox and the plugin [when running in windowed mode] will be skinned just like Winamp. The integrated window works just like any other Winamp window; it docks with - other windows, CTRL+TAB cycles between them all, and lots of new + other arch, CTRL+TAB cycles between them all, and lots of new keys work (J, L, CTRL+P, ALT+E, etc.). -fixed bug (or error in judgment?) where fake fullscreen mode window would actually run at the *bottom* of the Z order when running @@ -717,7 +717,7 @@ Version History (before) to just stick the plugin at the bottom of the Z order in this case. Well, this is now fixed; the plugin tries its best to stay on top, but watch out - if you try and click on any other - windows, the taskbar WILL pop up. If you want to avoid that, + arch, the taskbar WILL pop up. If you want to avoid that, you'll have to run in true fullscreen mode. -improved audio and video synchronization -the current framerate is now used to tell Winamp, each frame, @@ -960,7 +960,7 @@ Version History destroyed (by Windows, it seems). -fixed a bug in config panel, where list of video modes wasn't updating when you changed the fullscreen adapter. - -fixed a bug where DXContext was remembering the native windows display + -fixed a bug where DXContext was remembering the native arch display mode for the first monitor that the window was created on, only. This was a problem because if two monitors had different bit depths, and you ran it and switched to another monitor by toggling fullscreen, diff --git a/Src/Plugins/Visualization/vis_milk2/desktop_mode.cpp b/Src/Plugins/Visualization/vis_milk2/desktop_mode.cpp index 6b66f3c55..1a01b2ffc 100644 --- a/Src/Plugins/Visualization/vis_milk2/desktop_mode.cpp +++ b/Src/Plugins/Visualization/vis_milk2/desktop_mode.cpp @@ -1081,7 +1081,7 @@ NOTES LOG -> fixed if you get rid of m_desktop_focuswnd and don't block WM_MOUSEACTIVATE. -> but doing this causes a flash when you click on - the real desktop (in multimon setup) of any windows + the real desktop (in multimon setup) of any arch that are overtop of the fake desktop, since the fake desktop rises up in the Z order (activates) and then, next frame, gets pushed back again. diff --git a/Src/Plugins/Visualization/vis_milk2/dxcontext.h b/Src/Plugins/Visualization/vis_milk2/dxcontext.h index 15076f9c1..274314242 100644 --- a/Src/Plugins/Visualization/vis_milk2/dxcontext.h +++ b/Src/Plugins/Visualization/vis_milk2/dxcontext.h @@ -30,7 +30,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef __NULLSOFT_DX9_PLUGIN_SHELL_DXCONTEXT_H__ #define __NULLSOFT_DX9_PLUGIN_SHELL_DXCONTEXT_H__ 1 -#include +#include #include "shell_defines.h" #ifdef _DEBUG diff --git a/Src/Plugins/Visualization/vis_milk2/gstring.h b/Src/Plugins/Visualization/vis_milk2/gstring.h index c71346453..944eaf99d 100644 --- a/Src/Plugins/Visualization/vis_milk2/gstring.h +++ b/Src/Plugins/Visualization/vis_milk2/gstring.h @@ -8,7 +8,7 @@ // sytactically the same (usage-wise) as std::string. // Written by Ryan Geiss. -#include +#include class GString { diff --git a/Src/Plugins/Visualization/vis_milk2/icon_t.h b/Src/Plugins/Visualization/vis_milk2/icon_t.h index c1f6e90fc..cb5722508 100644 --- a/Src/Plugins/Visualization/vis_milk2/icon_t.h +++ b/Src/Plugins/Visualization/vis_milk2/icon_t.h @@ -30,7 +30,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef __ICON_T_H__ #define __ICON_T_H__ 1 -#include +#include #include // for ITEMIDLIST typedef struct diff --git a/Src/Plugins/Visualization/vis_milk2/menu.h b/Src/Plugins/Visualization/vis_milk2/menu.h index 2668032e1..293361c56 100644 --- a/Src/Plugins/Visualization/vis_milk2/menu.h +++ b/Src/Plugins/Visualization/vis_milk2/menu.h @@ -32,7 +32,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. //---------------------------------------- -#include +#include //---------------------------------------- diff --git a/Src/Plugins/Visualization/vis_milk2/ns-eel2/ns-eel-int.h b/Src/Plugins/Visualization/vis_milk2/ns-eel2/ns-eel-int.h index 3718604a3..4a03ac065 100644 --- a/Src/Plugins/Visualization/vis_milk2/ns-eel2/ns-eel-int.h +++ b/Src/Plugins/Visualization/vis_milk2/ns-eel2/ns-eel-int.h @@ -25,7 +25,7 @@ #define __NS_EELINT_H__ #ifdef _WIN32 -#include +#include #else #include "../wdltypes.h" #endif diff --git a/Src/Plugins/Visualization/vis_milk2/plugin.cpp b/Src/Plugins/Visualization/vis_milk2/plugin.cpp index e3d66a390..2a11dbad4 100644 --- a/Src/Plugins/Visualization/vis_milk2/plugin.cpp +++ b/Src/Plugins/Visualization/vis_milk2/plugin.cpp @@ -119,7 +119,7 @@ Order of Function Calls (i.e. for wave's y position, 0=bottom and 1=top, which is opposite to the convention in the rest of milkdrop. decided to keep the 'bug' so presets don't need modified.) - d -fixed: Krash: Inconsistency bug - pressing Escape while in the code windows + d -fixed: Krash: Inconsistency bug - pressing Escape while in the code arch for custom waves completely takes you out of the editing menus, rather than back to the custom wave menu d -when editing code: fix display of '&' character @@ -399,7 +399,7 @@ Order of Function Calls (was 24x18, now 32x24) -fixed aspect ratio for final display -auto-texsize is now computed slightly differently; for vertically or horizontally-stretched - windows, the texsize is now biased more toward the larger dimension (vs. just the + arch, the texsize is now biased more toward the larger dimension (vs. just the average). -added anisotropic filtering (for machines that support it) -fixed bug where the values of many variables in the preset init code were not set prior @@ -6771,7 +6771,7 @@ BOOL CPlugin::MyConfigTabProc(int nPage, HWND hwnd,UINT msg,WPARAM wParam,LPARAM // 'nPage' indicates which tab (aka 'property page') is currently showing: 2 through 5. // 'hwnd' is the window handle of the property page (which is a dialog of its own, // embedded in the config dialog). - // 'msg' is the windows message being sent. The main ones are: + // 'msg' is the arch message being sent. The main ones are: // // 1) WM_INITDIALOG: This means the page is being initialized, because the // user clicked on it. When you get this message, you should initialize diff --git a/Src/Plugins/Visualization/vis_milk2/plugin.rc b/Src/Plugins/Visualization/vis_milk2/plugin.rc index aff9fb84c..e684e9454 100644 --- a/Src/Plugins/Visualization/vis_milk2/plugin.rc +++ b/Src/Plugins/Visualization/vis_milk2/plugin.rc @@ -1281,7 +1281,7 @@ BEGIN "This lets you select which display adapter (video card) you'd like to\nrun the plug-in on, when it runs in a window. If you only have one video\ncard and monitor in your system, you will only have one choice here; but\nif you have multiple video cards, or a multi-head video card (one card\nthat drives multiple monitors), there should be two or more choices here.\n\nThe default window position will be somewhere on the monitor for the\ndisplay adapter you choose here. You can drag the window to a different\nmonitor, but it is likely to be very slow, because the pixels will have\nto be copied, via Windows, from one display to the next, each frame.\n\nSo, for best performance in windowed mode, be sure to select the monitor\nyou want it to run on here, in advance, and avoid dragging the window to\nanother monitor at runtime." IDS_DESKTOP_ADAPTER "Help on desktop-mode display adapter selection" IDS_DESKTOP_ADAPTER_HELP - "This lets you select which display adapter (video card & monitor) you'd like to\nrun the plug-in on, when it runs in desktop mode, replacing your windows wallpaper.\nIf you only have one video card and monitor in your system, you will only have\none choice here; but if you have multiple video cards, or a multi-head video card\n(one card that drives multiple monitors), there should be two or more choices here." + "This lets you select which display adapter (video card & monitor) you'd like to\nrun the plug-in on, when it runs in desktop mode, replacing your arch wallpaper.\nIf you only have one video card and monitor in your system, you will only have\none choice here; but if you have multiple video cards, or a multi-head video card\n(one card that drives multiple monitors), there should be two or more choices here." IDS_HELP_ON_X_CHECKBOX "Help on '%s' checkbox" IDS_HELP_ON_X_CHECKBOX_HELP "When a new frame of animation is ready for display, the plug-in\nhas a choice of whether or not to synchronize the new frame to the\nmonitor's next vertical scan.\n\nIf there is no synchronization and the new frame is shown immediately,\nthen the update might occure in 'mid-scan', so for that 1/60th of a second,\nyou'll see the old frame toward the top of the monitor, and the new frame\ntoward the bottom, with a sharp line ('tear') somewhere in between. This\nis especially visible when solid objects on the screen are changing or\nmoving rapidly, from frame to frame.\n\nHowever, if the plug-in waits until the vertical scan is complete to update\nthe image, then at the start of the next vertical scan, the entire image\nwill be ready and will (hopefully) be presented without any tearing.\n\nAlthough page tearing will often cause visible artifacts, it will allow\nthe plug-in to run at its maximum possible framerate. Generally, though,\npage tearing is considered a bad thing, to be avoided when possible.\n\nNote that this synchronization (done by DirectX and your video driver)\nis usually approximate when running in windowed (or fake fullscreen) modes;\nthus, page tearing is often minimized but can't always be completely eliminated.\n\nNote that multisampling is usually only available when page tearing is\nallowed, due to limitations of the DirectX 8 API. The one exception is\n'true' fullscreen mode; there, you can disable page tearing and still use\nmultisampling. (But not in fake fullscreen, windowed, or desktop modes.)" @@ -1291,7 +1291,7 @@ BEGIN "Enable this to force the plug-in to start in desktop mode." IDS_HELP_ON_F1 "Help on 'Press F1...' checkbox" IDS_HELP_ON_F1_HELP "Disable this to prevent the 'Press F1 for Help' message\nfrom appearing when the plug-in starts." - IDS_CB_SKIN_HELP "Check this box to 'skin' the plug-in's window frame when it runs\nin a window, so that it looks like the rest of the windows that\nmake up Winamp's interface.\n\nThis feature requires Winamp 2.90 or later; if the box is greyed\nout, it means you need a newer version of Winamp." + IDS_CB_SKIN_HELP "Check this box to 'skin' the plug-in's window frame when it runs\nin a window, so that it looks like the rest of the arch that\nmake up Winamp's interface.\n\nThis feature requires Winamp 2.90 or later; if the box is greyed\nout, it means you need a newer version of Winamp." IDS_SAVE_CPU_CHECKBOX "Help on 'Save CPU' checkbox" IDS_SAVE_CPU_CHECKBOX_HELP "Check this box to lower the amount of CPU (processor) that the plug-in uses\nto monitor and limit the framerate.\n\nWhen this box is unchecked, the plug-in will extremely accurately limit the\nframerate, resulting in ultra-smooth animation. However, there is some cost\nin terms of CPU time - usually in the range of 0-20%%.\n\nWhen this box is checked, though, the plug-in uses a more lenient algorithm to\nlimit the framerate, which uses virtually no CPU time. However, the framerate\nwill not be as accurately limited (it might vary over time), and animation is\nnot guaranteed to be perfectly smooth.\n\nNote that you can further decrease CPU usage by:\n 1) decreasing the maximum framerate (via the 'Max Framerate' options)\n 2) allowing page tearing (via the 'Allow Page Tearing' checkboxes)" diff --git a/Src/Plugins/Visualization/vis_milk2/plugin.vcxproj b/Src/Plugins/Visualization/vis_milk2/plugin.vcxproj index 67ca4c8d2..5c94a73d6 100644 --- a/Src/Plugins/Visualization/vis_milk2/plugin.vcxproj +++ b/Src/Plugins/Visualization/vis_milk2/plugin.vcxproj @@ -97,26 +97,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Plugins/Visualization/vis_milk2/pluginshell.cpp b/Src/Plugins/Visualization/vis_milk2/pluginshell.cpp index cd79a410d..ebb8c66e3 100644 --- a/Src/Plugins/Visualization/vis_milk2/pluginshell.cpp +++ b/Src/Plugins/Visualization/vis_milk2/pluginshell.cpp @@ -40,12 +40,12 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -make an 'advanced view' button on config panel; hide complicated stuff til they click that. -put an asterisk(*) next to the 'max framerate' values that - are ideal (given the current windows display mode or selected FS dispmode). + are ideal (given the current arch display mode or selected FS dispmode). -or add checkbox: "smart sync" -> matches FPS limit to nearest integer divisor of refresh rate. -debug.txt/logging support! -audio: make it a DSP plugin? then we could get the complete, continuous waveform - and overlap our waveform windows, so we'd never miss a brief high note. + and overlap our waveform arch, so we'd never miss a brief high note. -bugs: -vms plugins sometimes freeze after a several-minute pause; I've seen it with most of them. hard to repro, though. @@ -100,9 +100,9 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. and we have to cleanup & reallocate everything, b/c we can't tell when the resize begins & ends. [justin said he'd fix in wa5, though] - -kiv: with embedded windows of any type (plugin, playlist, etc.) + -kiv: with embedded arch of any type (plugin, playlist, etc.) you can't place the winamp main wnd over them. - -kiv: embedded windows are child windows and don't get the + -kiv: embedded arch are child arch and don't get the WM_SETFOCUS or WM_KILLFOCUS messages when they get or lose the focus. (For a workaround, see milkdrop & scroll lock key.) -kiv: tiny bug (IGNORE): when switching between embedwnd & @@ -1684,7 +1684,7 @@ void CPluginShell::DrawAndDisplay(int redraw) // but it's like this for code simplicity.] int taskbar_is_above_plugin_window = 1; HWND h = FindWindow("Shell_TrayWnd", NULL); - while (h) //(..shouldn't be very many windows to iterate through here) + while (h) //(..shouldn't be very many arch to iterate through here) { h = GetWindow(h, GW_HWNDPREV); if (h == GetPluginWindow()) @@ -2586,7 +2586,7 @@ LRESULT CPluginShell::PluginShellWindowProc(HWND hWnd, unsigned uMsg, WPARAM wPa // in the Z order! (i.e., keep it on the bottom) // without this code, when you click on the 'real' desktop - // in a multimon setup, any windows that are overtop of the + // in a multimon setup, any arch that are overtop of the // 'fake' desktop will flash, since they'll be covered // up by the fake desktop window (but then shown again on // the next frame, when we detect that the fake desktop @@ -3636,7 +3636,7 @@ LRESULT CPluginShell::PluginShellVJModeWndProc(HWND hwnd, UINT message, WPARAM w // in the Z order! (i.e., keep it on the bottom) // without this code, when you click on the 'real' desktop - // in a multimon setup, any windows that are overtop of the + // in a multimon setup, any arch that are overtop of the // 'fake' desktop will flash, since they'll be covered // up by the fake desktop window (but then shown again on // the next frame, when we detect that the fake desktop diff --git a/Src/Plugins/Visualization/vis_milk2/pluginshell.h b/Src/Plugins/Visualization/vis_milk2/pluginshell.h index a74373749..f99db4f79 100644 --- a/Src/Plugins/Visualization/vis_milk2/pluginshell.h +++ b/Src/Plugins/Visualization/vis_milk2/pluginshell.h @@ -268,7 +268,7 @@ public: void READ_FONT(int n); void WRITE_FONT(int n); - // config panel / windows messaging processes: + // config panel / arch messaging processes: static LRESULT CALLBACK WindowProc(HWND hWnd, unsigned uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK DesktopWndProc(HWND hWnd, unsigned uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK VJModeWndProc(HWND hWnd, unsigned uMsg, WPARAM wParam, LPARAM lParam); diff --git a/Src/Plugins/Visualization/vis_milk2/shell_defines.h b/Src/Plugins/Visualization/vis_milk2/shell_defines.h index c978ce716..e18d54f99 100644 --- a/Src/Plugins/Visualization/vis_milk2/shell_defines.h +++ b/Src/Plugins/Visualization/vis_milk2/shell_defines.h @@ -30,7 +30,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef __NULLSOFT_DX9_PLUGIN_SHELL_SHELL_DEFINES_H__ #define __NULLSOFT_DX9_PLUGIN_SHELL_SHELL_DEFINES_H__ 1 -#include +#include #define DEFAULT_FULLSCREEN_WIDTH 640 #define DEFAULT_FULLSCREEN_HEIGHT 480 diff --git a/Src/Plugins/Visualization/vis_milk2/state.cpp b/Src/Plugins/Visualization/vis_milk2/state.cpp index 68b060f3c..3f7689cba 100644 --- a/Src/Plugins/Visualization/vis_milk2/state.cpp +++ b/Src/Plugins/Visualization/vis_milk2/state.cpp @@ -33,7 +33,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ns-eel2/ns-eel.h" #include "plugin.h" #include "utility.h" -#include +#include #include #include "resource.h" #include diff --git a/Src/Plugins/Visualization/vis_milk2/utility.cpp b/Src/Plugins/Visualization/vis_milk2/utility.cpp index a59f2e02d..e561a44cc 100644 --- a/Src/Plugins/Visualization/vis_milk2/utility.cpp +++ b/Src/Plugins/Visualization/vis_milk2/utility.cpp @@ -31,7 +31,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "utility.h" #include #include -#include +#include #ifdef _DEBUG #define D3D_DEBUG_INFO // declare this before including d3d9.h #endif diff --git a/Src/Plugins/Visualization/vis_milk2/utility.h b/Src/Plugins/Visualization/vis_milk2/utility.h index 13d31e4f4..c42d24fe7 100644 --- a/Src/Plugins/Visualization/vis_milk2/utility.h +++ b/Src/Plugins/Visualization/vis_milk2/utility.h @@ -30,7 +30,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef __NULLSOFT_DX9_PLUGIN_SHELL_UTILITY_H__ #define __NULLSOFT_DX9_PLUGIN_SHELL_UTILITY_H__ 1 -#include +#include #include #include #include diff --git a/Src/Plugins/Visualization/vis_milk2/vis.cpp b/Src/Plugins/Visualization/vis_milk2/vis.cpp index afc80edd3..2ed0f46b5 100644 --- a/Src/Plugins/Visualization/vis_milk2/vis.cpp +++ b/Src/Plugins/Visualization/vis_milk2/vis.cpp @@ -28,7 +28,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "api__vis_milk2.h" -#include +#include #include "vis.h" #include "plugin.h" #include "defines.h" diff --git a/Src/Plugins/Visualization/vis_nsfs/Svis.cpp b/Src/Plugins/Visualization/vis_nsfs/Svis.cpp index 1d81d1aae..db90cff16 100644 --- a/Src/Plugins/Visualization/vis_nsfs/Svis.cpp +++ b/Src/Plugins/Visualization/vis_nsfs/Svis.cpp @@ -1,7 +1,7 @@ //#define PLUGIN_NAME "Nullsoft Tiny Fullscreen" #define PLUGIN_VERSION "v2.16" -#include +#include #include #include #include "resource.h" diff --git a/Src/Plugins/Visualization/vis_nsfs/ddraw.cpp b/Src/Plugins/Visualization/vis_nsfs/ddraw.cpp index d0c9da602..a25c3b43d 100644 --- a/Src/Plugins/Visualization/vis_nsfs/ddraw.cpp +++ b/Src/Plugins/Visualization/vis_nsfs/ddraw.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "dd.h" #include "../Agave/Language/api_language.h" diff --git a/Src/Plugins/Visualization/vis_nsfs/linedraw.cpp b/Src/Plugins/Visualization/vis_nsfs/linedraw.cpp index a240cf65c..e5bbe0c3d 100644 --- a/Src/Plugins/Visualization/vis_nsfs/linedraw.cpp +++ b/Src/Plugins/Visualization/vis_nsfs/linedraw.cpp @@ -1,4 +1,4 @@ -#include +#include static void __inline DrawPixel(int color, unsigned char *fb) { diff --git a/Src/Plugins/Visualization/vis_nsfs/makepal.cpp b/Src/Plugins/Visualization/vis_nsfs/makepal.cpp index 65c28a079..46cb3550e 100644 --- a/Src/Plugins/Visualization/vis_nsfs/makepal.cpp +++ b/Src/Plugins/Visualization/vis_nsfs/makepal.cpp @@ -1,4 +1,4 @@ -#include +#include #include extern int (*warand)(void); diff --git a/Src/Plugins/Visualization/vis_nsfs/moveframe.cpp b/Src/Plugins/Visualization/vis_nsfs/moveframe.cpp index 5cdafec12..6e1ddce9c 100644 --- a/Src/Plugins/Visualization/vis_nsfs/moveframe.cpp +++ b/Src/Plugins/Visualization/vis_nsfs/moveframe.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/Src/Plugins/Visualization/vis_nsfs/scope.cpp b/Src/Plugins/Visualization/vis_nsfs/scope.cpp index ec1ede89b..ac709620f 100644 --- a/Src/Plugins/Visualization/vis_nsfs/scope.cpp +++ b/Src/Plugins/Visualization/vis_nsfs/scope.cpp @@ -1,4 +1,4 @@ -#include +#include #include #define M_PI 3.14159265358979323846 diff --git a/Src/Plugins/Visualization/vis_nsfs/shitdrop.cpp b/Src/Plugins/Visualization/vis_nsfs/shitdrop.cpp index 4c1b22866..6d9b54ce2 100644 --- a/Src/Plugins/Visualization/vis_nsfs/shitdrop.cpp +++ b/Src/Plugins/Visualization/vis_nsfs/shitdrop.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/Src/WAT/WAT.vcxproj b/Src/WAT/WAT.vcxproj index 0ca33a52b..a0c511253 100644 --- a/Src/WAT/WAT.vcxproj +++ b/Src/WAT/WAT.vcxproj @@ -93,25 +93,25 @@ false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Wasabi/Wasabi.vcxproj b/Src/Wasabi/Wasabi.vcxproj index 9d0e71c08..fe7380027 100644 --- a/Src/Wasabi/Wasabi.vcxproj +++ b/Src/Wasabi/Wasabi.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Wasabi/api/application/api_application.h b/Src/Wasabi/api/application/api_application.h index d04ec0b84..eea0372ed 100644 --- a/Src/Wasabi/api/application/api_application.h +++ b/Src/Wasabi/api/application/api_application.h @@ -99,7 +99,7 @@ public: #endif // !_WIN32 /* - note: on windows, these two functions DON'T call Set/GetCurrentDirectory, Winamp maintains it's own path + note: on arch, these two functions DON'T call Set/GetCurrentDirectory, Winamp maintains it's own path because calling SetCurrentDirectory locks the folder Added for 5.34 */ @@ -114,7 +114,7 @@ public: You can call this functions with a pointer to any 16 byte data structure cast to a GUID * Added for 5.35 */ - // returns an ID unique to this computer, but not unique to the logged in user (two windows accts would share this ID) + // returns an ID unique to this computer, but not unique to the logged in user (two arch accts would share this ID) int GetMachineID( GUID *id ); // returns an ID unique to this user. Another user logged in to the computer will have a different ID // note that if Winamp was installed with "shared settings", the IDs of multiple users will probably be identical diff --git a/Src/Wasabi/api/application/ifc_messageprocessor.h b/Src/Wasabi/api/application/ifc_messageprocessor.h index 0d61bdc16..255034617 100644 --- a/Src/Wasabi/api/application/ifc_messageprocessor.h +++ b/Src/Wasabi/api/application/ifc_messageprocessor.h @@ -2,7 +2,7 @@ #define __WASABI_IFC_MESSAGEPROCESSOR_H #include -#include +#include class ifc_messageprocessor : public Dispatchable { protected: diff --git a/Src/Wasabi/api/font/font.cpp b/Src/Wasabi/api/font/font.cpp index e45994ce9..0ec55ebd8 100644 --- a/Src/Wasabi/api/font/font.cpp +++ b/Src/Wasabi/api/font/font.cpp @@ -348,7 +348,7 @@ svc_font *Font::requestSkinFont(const wchar_t *id, int *size, int *gotdefault) } */ - // not found ? try to find it in the windows fonts directory + // not found ? try to find it in the arch fonts directory { wchar_t *fp = WMALLOC(WA_MAX_PATH); Wasabi::Std::getFontPath(WA_MAX_PATH, fp); diff --git a/Src/Wasabi/api/service/svcs/svc_wndcreate.h b/Src/Wasabi/api/service/svcs/svc_wndcreate.h index 95e46f89c..1a9c9b149 100644 --- a/Src/Wasabi/api/service/svcs/svc_wndcreate.h +++ b/Src/Wasabi/api/service/svcs/svc_wndcreate.h @@ -20,7 +20,7 @@ public: ifc_window *createWindowOfType(const wchar_t *windowtype, ifc_window *parent, int n = 0); int destroyWindow(ifc_window *w); - int refcount(); // how many windows created + int refcount(); // how many arch created enum { TESTGUID = 100, diff --git a/Src/Wasabi/api/skin/skin.cpp b/Src/Wasabi/api/skin/skin.cpp index 9348d4c97..2a9cc4a5c 100644 --- a/Src/Wasabi/api/skin/skin.cpp +++ b/Src/Wasabi/api/skin/skin.cpp @@ -309,7 +309,7 @@ void Skin::validateBaseTextureRect(RECT *r) // FG> Please change this only if you REALLY know what you are doing. this needs to account for basewnd // coordinates (start from 0,0), as well as virtualwnd (relative to parent), at any depth (group holding // texture as 2nd group of the tree, and rendering the base texture in a basewnd in a virtual in the group), -// and should handle resized textures and scaled windows. ooch +// and should handle resized textures and scaled arch. ooch void Skin::_renderBaseTexture(ifc_window *wndbase, ifc_canvas *c, const RECT &r, ifc_window *dest, int alpha) { diff --git a/Src/Wasabi/api/skin/widgets/mb/iebrowser.cpp b/Src/Wasabi/api/skin/widgets/mb/iebrowser.cpp index 5be43319a..b9e1a6a63 100644 --- a/Src/Wasabi/api/skin/widgets/mb/iebrowser.cpp +++ b/Src/Wasabi/api/skin/widgets/mb/iebrowser.cpp @@ -6,7 +6,7 @@ #include "../Winamp/buildtype.h" #include #include -#include +#include #include #include "minibrowserCOM.h" diff --git a/Src/Wasabi/api/skin/widgets/sa.cpp b/Src/Wasabi/api/skin/widgets/sa.cpp index ff2c72fc9..e56f034d6 100644 --- a/Src/Wasabi/api/skin/widgets/sa.cpp +++ b/Src/Wasabi/api/skin/widgets/sa.cpp @@ -418,7 +418,7 @@ int SAWnd::onQuickPaint(BltCanvas *bc, int w, int h, int newone) { } } -// int ws=(config_windowshade&&config_mw_open); +// int ws=(config_archhade&&config_mw_open); // int s = (config_dsize&&config_mw_open)?1:0; int dbx = fo[max(min(config_safalloff,4),0)]; diff --git a/Src/Wasabi/api/util/savefile.cpp b/Src/Wasabi/api/util/savefile.cpp index f7766fa74..a60c40583 100644 --- a/Src/Wasabi/api/util/savefile.cpp +++ b/Src/Wasabi/api/util/savefile.cpp @@ -1,7 +1,7 @@ #include "precomp.h" //NONPORTABLE -#include +#include #include #include "savefile.h" diff --git a/Src/Wasabi/api/util/systray.cpp b/Src/Wasabi/api/util/systray.cpp index 921d21d78..13a64c23e 100644 --- a/Src/Wasabi/api/util/systray.cpp +++ b/Src/Wasabi/api/util/systray.cpp @@ -1,6 +1,6 @@ #include #ifdef WIN32 -#include +#include #include #endif #include "systray.h" diff --git a/Src/Wasabi/api/wac/main.h b/Src/Wasabi/api/wac/main.h index b77cb00a5..5da9f765a 100644 --- a/Src/Wasabi/api/wac/main.h +++ b/Src/Wasabi/api/wac/main.h @@ -98,7 +98,7 @@ public: static GenWnd *genericwnd; static int shuting_down; - // maintains a stack of modal windows so basewnds can discard messages in WM_MOUSEACTIVATE, should only be used by MsgboxWnd & ModalWnd when we write it ;) + // maintains a stack of modal arch so basewnds can discard messages in WM_MOUSEACTIVATE, should only be used by MsgboxWnd & ModalWnd when we write it ;) static api_window *getModalWnd(); static void pushModalWnd(api_window *wnd); static int popModalWnd(api_window *wnd); diff --git a/Src/Wasabi/api/wnd/accessible.h b/Src/Wasabi/api/wnd/accessible.h index 13e544bbc..7a5d89464 100644 --- a/Src/Wasabi/api/wnd/accessible.h +++ b/Src/Wasabi/api/wnd/accessible.h @@ -341,7 +341,7 @@ * Object events * * The system AND apps generate these. The system generates these for - * real windows. Apps generate these for objects within their window which + * real arch. Apps generate these for objects within their window which * act like a separate control, e.g. an item in a list view. * * When the system generate them, dwParam2 is always WMOBJID_SELF. When @@ -476,7 +476,7 @@ #define EVENT_OBJECT_STATECHANGE 0x800A // hwnd + ID + idChild is item w/ state change /* * Examples of when to send an EVENT_OBJECT_STATECHANGE include - * * It is being enabled/disabled (USER does for windows) + * * It is being enabled/disabled (USER does for arch) * * It is being pressed/released (USER does for buttons) * * It is being checked/unchecked (USER does for radio/check buttons) */ @@ -491,11 +491,11 @@ * title bar, scrollbars, etc. that are also changing shape/moving. * * In other words, it only generates LOCATIONCHANGE notifications for - * real windows that are moving/sizing. It will not generate a LOCATIONCHANGE + * real arch that are moving/sizing. It will not generate a LOCATIONCHANGE * for every non-floating child window when the parent moves (the children are * logically moving also on screen, but not relative to the parent). * - * Now, if the app itself resizes child windows as a result of being + * Now, if the app itself resizes child arch as a result of being * sized, USER will generate LOCATIONCHANGEs for those dudes also because * it doesn't know better. * diff --git a/Src/Wasabi/api/wnd/api_window.h b/Src/Wasabi/api/wnd/api_window.h index 3d6f1c006..77d407c28 100644 --- a/Src/Wasabi/api/wnd/api_window.h +++ b/Src/Wasabi/api/wnd/api_window.h @@ -59,7 +59,7 @@ public: return &ret; } - // this passes thru to the windows WndProc, if there is one -- NONPORTABLE + // this passes thru to the arch WndProc, if there is one -- NONPORTABLE #if defined (_WIN32) || defined (_WIN64) virtual LRESULT wndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)=0; #elif defined(__APPLE__) diff --git a/Src/Wasabi/api/wnd/basewnd.cpp b/Src/Wasabi/api/wnd/basewnd.cpp index f24e4d6fc..8223c53c9 100644 --- a/Src/Wasabi/api/wnd/basewnd.cpp +++ b/Src/Wasabi/api/wnd/basewnd.cpp @@ -4168,7 +4168,7 @@ api_region *BaseWnd::getRegion() int BaseWnd::handleTransparency() { - return 1; // by default all windows handle transparency, only windows blitting directly on the SCREEN (if you blit directly on the DC it's still ok), + return 1; // by default all arch handle transparency, only arch blitting directly on the SCREEN (if you blit directly on the DC it's still ok), } // for instance, a vis or a video using overlay should return 0, this will let the layout auto manage its alpha as that window is shown/hiden void BaseWnd::setAlpha(int active, int inactive) @@ -5564,7 +5564,7 @@ void BaseWnd::unparentHWNDChildren() reparentwnds.deleteAll(); #ifndef WIN32 -#error port me ! // make a list of all the children oswindows and reparent them to the desktop somewhere we can't see +#error port me ! // make a list of all the children osarch and reparent them to the desktop somewhere we can't see #endif OSWINDOWHANDLE wnd = GetWindow(getOsWindowHandle(), GW_CHILD); diff --git a/Src/Wasabi/api/wnd/basewnd.h b/Src/Wasabi/api/wnd/basewnd.h index b8747af07..2ddb557c4 100644 --- a/Src/Wasabi/api/wnd/basewnd.h +++ b/Src/Wasabi/api/wnd/basewnd.h @@ -306,7 +306,7 @@ public: RECT clientRect(); // helper virtual void getNonClientRect(RECT *); RECT nonClientRect(); // helper - virtual void getWindowRect(RECT *); // windows coords in screen system + virtual void getWindowRect(RECT *); // arch coords in screen system RECT windowRect(); // helper virtual void getPosition(POINT *pt); // window coord relative to os window (instead of rootparent) @@ -483,7 +483,7 @@ public: virtual void abortTip(); virtual int isVisible(int within=0); - // Virtual windows functions + // Virtual arch functions virtual Canvas *createFrameBuffer(int w, int h); virtual void prepareFrameBuffer(Canvas *canvas, int w, int h); virtual void deleteFrameBuffer(Canvas *canvas); @@ -559,7 +559,7 @@ public: //DRAGGING AND DROPPING -- (derived from DragInterface) - // derived windows should call this if they detect a drag beginning + // derived arch should call this if they detect a drag beginning // call once per datum per type of data being exposed. order is maintained int addDragItem(const wchar_t *droptype, void *item); // returns TRUE if drop was accepted diff --git a/Src/Wasabi/api/wnd/notifmsg.h b/Src/Wasabi/api/wnd/notifmsg.h index be1cb05ba..c5fe2d5e7 100644 --- a/Src/Wasabi/api/wnd/notifmsg.h +++ b/Src/Wasabi/api/wnd/notifmsg.h @@ -20,7 +20,7 @@ enum { KILLFOCUS = 210, // no params NAMECHANGED = 220, // no params - // for transient child windows + // for transient child arch RETURN_CODE = 300, // param1 = the code // NOTE: Currently only used by editwnd.cpp, but open for custom use by developers diff --git a/Src/Wasabi/api/wnd/popexitchecker.cpp b/Src/Wasabi/api/wnd/popexitchecker.cpp index 31ec91a62..cb0ba230c 100644 --- a/Src/Wasabi/api/wnd/popexitchecker.cpp +++ b/Src/Wasabi/api/wnd/popexitchecker.cpp @@ -73,7 +73,7 @@ void PopupExitChecker::deregisterCallback(PopupExitCallback *cb) { if (e->cb == cb) { watchers.removeByPos(i); i--; delete e; - // no break, watcher can watch many windows, but wait, there cannot be 2 popups at once on a screen! who says so ? + // no break, watcher can watch many arch, but wait, there cannot be 2 popups at once on a screen! who says so ? } } } diff --git a/Src/Wasabi/api/wnd/virtualwnd.cpp b/Src/Wasabi/api/wnd/virtualwnd.cpp index dd45da111..ff1fbc541 100644 --- a/Src/Wasabi/api/wnd/virtualwnd.cpp +++ b/Src/Wasabi/api/wnd/virtualwnd.cpp @@ -269,7 +269,7 @@ void VirtualWnd::getClientRect(RECT *rect) { if (!bypassvirtual) { - // CT:getClientRect behaves differently here for virtual windows + // CT:getClientRect behaves differently here for virtual arch // so we can use onPaint directly on the destination canvas // without using another temporary canvas. Wasabi::Std::setRect(rect, virtualX, virtualY, virtualX + virtualW, virtualY + virtualH); diff --git a/Src/Wasabi/api/wnd/wndclass/appbarwnd.cpp b/Src/Wasabi/api/wnd/wndclass/appbarwnd.cpp index 11629fc10..7fb0b56ed 100644 --- a/Src/Wasabi/api/wnd/wndclass/appbarwnd.cpp +++ b/Src/Wasabi/api/wnd/wndclass/appbarwnd.cpp @@ -15,8 +15,8 @@ #error port me or remove me from the inheritance on this platform ! #endif -#include -#include +#include +#include #include #include "../../../../Plugins/General/gen_ff/main.h" #include "appbarwnd.h" diff --git a/Src/Wasabi/api/wnd/wndclass/blankwnd.h b/Src/Wasabi/api/wnd/wndclass/blankwnd.h index 56f441392..8e2c7db6e 100644 --- a/Src/Wasabi/api/wnd/wndclass/blankwnd.h +++ b/Src/Wasabi/api/wnd/wndclass/blankwnd.h @@ -7,7 +7,7 @@ #define BLANKWND_PARENT VirtualWnd /** - Class BlankWnd provides blank windows. The initial color can be set in the + Class BlankWnd provides blank arch. The initial color can be set in the constructor, with a default of black. There is a method for painting the window from a Canvas. @short Blank Window with background color. diff --git a/Src/Wasabi/api/wnd/wndclass/buttbar.h b/Src/Wasabi/api/wnd/wndclass/buttbar.h index 473ddd581..ce98b12c8 100644 --- a/Src/Wasabi/api/wnd/wndclass/buttbar.h +++ b/Src/Wasabi/api/wnd/wndclass/buttbar.h @@ -78,7 +78,7 @@ public: /** Enables you to add a child window to your button bar. - Since this is a button bar, the windows you can add must be + Since this is a button bar, the arch you can add must be derived or be ButtonWnd's. @see removeChild() diff --git a/Src/Wasabi/api/wnd/wndclass/clickwnd.cpp b/Src/Wasabi/api/wnd/wndclass/clickwnd.cpp index 054915a24..f4e3f3a23 100644 --- a/Src/Wasabi/api/wnd/wndclass/clickwnd.cpp +++ b/Src/Wasabi/api/wnd/wndclass/clickwnd.cpp @@ -171,7 +171,7 @@ int ClickWnd::onMouseMove(int x, int y) down = userDown() || mousedown; // FG> note to self now that i finally fixed this... : - // there is a potential bottleneck here, if for some reason this test is always true when moving the windows around like crazy. + // there is a potential bottleneck here, if for some reason this test is always true when moving the arch around like crazy. if (down != lastdown || (hilite != lasthilite && !m)) { if (wantClickWndAutoInvalidate()) invalidate(); } diff --git a/Src/Wasabi/api/wnd/wndclass/foreignwnd.h b/Src/Wasabi/api/wnd/wndclass/foreignwnd.h index 023cb6b14..bef17e9b8 100644 --- a/Src/Wasabi/api/wnd/wndclass/foreignwnd.h +++ b/Src/Wasabi/api/wnd/wndclass/foreignwnd.h @@ -34,7 +34,7 @@ class ForeignWnd : public BaseWnd public: // takes over an existing OSWINDOWHANDLE and wraps a BaseWnd around it // but does not changes the windowproc, nor does it inserts the wnd - // into the system list. It does not either (under windows anyway) + // into the system list. It does not either (under arch anyway) // sets the userdata windowlong to the object pointer. // if subclass is true, we subclas the windowproc and process events // as if the window was a real rootwnd diff --git a/Src/Wasabi/api/wnd/wndclass/framewnd.cpp b/Src/Wasabi/api/wnd/wndclass/framewnd.cpp index 26e565377..bbe859d18 100644 --- a/Src/Wasabi/api/wnd/wndclass/framewnd.cpp +++ b/Src/Wasabi/api/wnd/wndclass/framewnd.cpp @@ -20,7 +20,7 @@ FrameWnd::FrameWnd() children[i] = NULL; rwchildren[i] = NULL; hidey[i] = 0; - windowshaded[i] = 0; + archhaded[i] = 0; } vert = DIVIDER_UNDEFINED; divideside = SDP_FROMLEFT; @@ -39,7 +39,7 @@ FrameWnd::FrameWnd() v_bitmap = L"wasabi.framewnd.verticaldivider"; h_grabber = L"wasabi.framewnd.horizontalgrabber"; v_grabber = L"wasabi.framewnd.verticalgrabber"; - ws_bitmap = L"wasabi.framewnd.windowshade"; + ws_bitmap = L"wasabi.framewnd.archhade"; resizing = 0; } @@ -67,7 +67,7 @@ FrameWnd::~FrameWnd() { #ifdef WASABI_COMPILE_CONFIG if (getId() != NULL) { StringPrintfW buf(L"FrameWnd/ws,%s", getId()); - WASABI_API_CONFIG->setIntPrivate(buf, windowshaded[0]); + WASABI_API_CONFIG->setIntPrivate(buf, archhaded[0]); } #endif @@ -82,12 +82,12 @@ int FrameWnd::onInit() { ASSERT(vert != DIVIDER_UNDEFINED || nchild == 0); - // have to set children for frame windows + // have to set children for frame arch // fill in members nchild = 0; - // make children create their windows + // make children create their arch for (i = 0; i < MAXCHILD; i++) { if (rwchildren[i] != NULL) { if (rwchildren[i]->init(this) != 0) { @@ -108,8 +108,8 @@ int FrameWnd::onInit() { StringPrintfW buf(L"FrameWnd/ws,%s", getId()); int ws = WASABI_API_CONFIG->getIntPrivate(buf, /*rwchildren[0] && rwchildren[0]->childNotify(NULL, CHILD_WINDOWSHADE_CAPABLE)*/ 0); if (ws) { - windowshade(0, !ws); - windowshade(0, ws); + archhade(0, !ws); + archhade(0, ws); pullbarpos = 0; } } @@ -364,7 +364,7 @@ int FrameWnd::onResize() return 1; } - if (hidey[0] && hidey[1]) return 0; // both windows are hiding + if (hidey[0] && hidey[1]) return 0; // both arch are hiding // if we have only one child, it takes up all the room if (hidey[0]) { @@ -389,7 +389,7 @@ int FrameWnd::onResize() if (!resizeable) sizerwidth = 0; - // resize the subwindows + // resize the subarch int w; if (vert == DIVIDER_VERTICAL) { @@ -584,7 +584,7 @@ int FrameWnd::onPaint(Canvas *canvas) { } } - if (windowshaded[0]) { + if (archhaded[0]) { RECT wr = cr; if (vert == DIVIDER_VERTICAL) { wr.right = r.left; @@ -671,27 +671,27 @@ int FrameWnd::onMouseMove(int x, int y) { { if (rwchildren[0] != NULL && rwchildren[0]->childNotify(NULL, ChildNotify::FRAMEWND_WINDOWSHADE_CAPABLE, 0, 0)) { pullbarpos = 0; - windowshade(0, TRUE); + archhade(0, TRUE); } else { pullbarpos = realMinPixels; } } else { - windowshade(0, FALSE); + archhade(0, FALSE); } } else if (divideside == SDP_FROMRIGHT) { if (pullbarpos < realMinPixels) { if (rwchildren[1] != NULL /* && rwchildren[1]->childNotify(NULL, CHILD_WINDOWSHADE_CAPABLE) */) { pullbarpos = /*convertPropToPix(PULLBAR_FULL)-*/0; - windowshade(1, TRUE); + archhade(1, TRUE); } else { pullbarpos = realMinPixels; } } else { - windowshade(1, FALSE); + archhade(1, FALSE); } } - if (!windowshaded[0] && !windowshaded[1]) { + if (!archhaded[0] && !archhaded[1]) { // if (pullbarpos > pos-convertPropToPix(minwidth)) // pullbarpos = pos-convertPropToPix(minwidth); int realMaxPixels; @@ -738,19 +738,19 @@ int FrameWnd::onLeftButtonUp(int x, int y) { return 0; } -void FrameWnd::windowshade(int which, int shaded) { +void FrameWnd::archhade(int which, int shaded) { ASSERT(which == 0 || which == 1); - if (!!windowshaded[which] == !!shaded) return; + if (!!archhaded[which] == !!shaded) return; if (rwchildren[which] == NULL) return; rwchildren[which]->childNotify(NULL, ChildNotify::FRAMEWND_WINDOWSHADE_ENABLE, shaded, 0); - windowshaded[which] = shaded; + archhaded[which] = shaded; rwchildren[which]->setVisible(!shaded); } ifc_window *FrameWnd::getWindowShadedChild() { if (nchild != 2) return NULL; - if (!(windowshaded[0] | windowshaded[1])) return NULL; - return windowshaded[0] ? rwchildren[0] : rwchildren[1]; + if (!(archhaded[0] | archhaded[1])) return NULL; + return archhaded[0] ? rwchildren[0] : rwchildren[1]; } int FrameWnd::onGetFocus() { diff --git a/Src/Wasabi/api/wnd/wndclass/framewnd.h b/Src/Wasabi/api/wnd/wndclass/framewnd.h index 506426e6f..006201a17 100644 --- a/Src/Wasabi/api/wnd/wndclass/framewnd.h +++ b/Src/Wasabi/api/wnd/wndclass/framewnd.h @@ -71,7 +71,7 @@ public: virtual void onResizeChildren(RECT leftr, RECT rightr); - // drag and drops are forwarded into windowshaded windows + // drag and drops are forwarded into archhaded arch virtual int dragEnter(ifc_window *sourceWnd); virtual int dragOver(int x, int y, ifc_window *sourceWnd); virtual int dragLeave(ifc_window *sourceWnd); @@ -81,7 +81,7 @@ protected: int convertPropToPix(int prop); int ConvertPixToProp(); - void windowshade(int which, int shaded); + void archhade(int which, int shaded); ifc_window *getWindowShadedChild(); void Set_v_bitmap(const wchar_t *new_v_bitmap); @@ -93,7 +93,7 @@ private: BaseWnd *children[MAXCHILD]; ifc_window *rwchildren[MAXCHILD]; int hidey[MAXCHILD]; - int windowshaded[MAXCHILD]; + int archhaded[MAXCHILD]; FrameWndDividerType vert; diff --git a/Src/Wasabi/api/wnd/wndclass/qpaintwnd.cpp b/Src/Wasabi/api/wnd/wndclass/qpaintwnd.cpp index dfdccc18d..612d1af2b 100644 --- a/Src/Wasabi/api/wnd/wndclass/qpaintwnd.cpp +++ b/Src/Wasabi/api/wnd/wndclass/qpaintwnd.cpp @@ -5,7 +5,7 @@ #define TIMER_QUICKPAINT 0x650 -// thread context, this is here so we can avoid the windows types in quickpaintwnd.h +// thread context, this is here so we can avoid the arch types in quickpaintwnd.h class QuickPaintContext { public: diff --git a/Src/Wasabi/api/wnd/wndclass/tabsheet.cpp b/Src/Wasabi/api/wnd/wndclass/tabsheet.cpp index 6323fcc22..97f9dc683 100644 --- a/Src/Wasabi/api/wnd/wndclass/tabsheet.cpp +++ b/Src/Wasabi/api/wnd/wndclass/tabsheet.cpp @@ -131,7 +131,7 @@ int TabSheet::onInit() { rightscroll->setParent(this); } - // init the windows + // init the arch foreach(tabs) if (foreach_index != 0) tabs.getfor()->getBaseWnd()->setStartHidden(TRUE); tabs.getfor()->getBaseWnd()->init(this); diff --git a/Src/Wasabi/api/wnd/wndtrack.cpp b/Src/Wasabi/api/wnd/wndtrack.cpp index c378550ef..35a17f8a4 100644 --- a/Src/Wasabi/api/wnd/wndtrack.cpp +++ b/Src/Wasabi/api/wnd/wndtrack.cpp @@ -192,7 +192,7 @@ void WindowTracker::startCooperativeMove(ifc_window *thiswnd) if (recursList.getNumItems() > 0) recursList.removeAll(); addCooperative(thiswnd); foreach_reverse(recursList) - // FG> we need to prevent windows from excessively activating our windows or focus is gonna blow up + // FG> we need to prevent arch from excessively activating our arch or focus is gonna blow up // thiswnd->bringToFront(); #ifdef WIN32 SetWindowPos(recursList.getfor()->gethWnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_DEFERERASE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); @@ -730,7 +730,7 @@ void WindowTracker::recursAddToMoveWindows(ifc_window *wnd, redock_struct *rs, i )) return ; } - // add all touching windows + // add all touching arch for (int i = 0; i < desktopwnds.getNumItems(); i++) { ifc_window *w = desktopwnds[i]; diff --git a/Src/Wasabi/api/wnd/wndtrack.h b/Src/Wasabi/api/wnd/wndtrack.h index f4f33d805..79b923ded 100644 --- a/Src/Wasabi/api/wnd/wndtrack.h +++ b/Src/Wasabi/api/wnd/wndtrack.h @@ -65,7 +65,7 @@ public: static void removeRootWnd(ifc_window *wnd); static ifc_window *rootWndFromPoint(POINT *pt); static ifc_window *rootWndFromHwnd(OSWINDOWHANDLE h); - static void layoutChanged(Layout *previouswnd, Layout *newwnd); // re-dock windows when changing layout + static void layoutChanged(Layout *previouswnd, Layout *newwnd); // re-dock arch when changing layout static void beforeRedock(Layout *l, redock_struct *rs); static void afterRedock(Layout *l, redock_struct *rs); diff --git a/Src/Wasabi/api/wndmgr/layout.cpp b/Src/Wasabi/api/wndmgr/layout.cpp index 006a953df..af964dec3 100644 --- a/Src/Wasabi/api/wndmgr/layout.cpp +++ b/Src/Wasabi/api/wndmgr/layout.cpp @@ -30,7 +30,7 @@ #include #include #ifdef _WIN32 -#include // for SetWindowRedraw +#include // for SetWindowRedraw #endif #ifdef WASABINOMAINAPI @@ -657,7 +657,7 @@ void Layout::fixPosition() void Layout::saveAllPositions() { // The positions are saved from the lastest to the first one - // The 'Player' windows and the 'Main' windows are using the same prefix + // The 'Player' arch and the 'Main' arch are using the same prefix // In saving in decreasing order we are sure the lastest saved is the one for the Player for (int i = 0;i < SkinParser::script_getNumContainers();i++) diff --git a/Src/Wasabi/api/wndmgr/resize.cpp b/Src/Wasabi/api/wndmgr/resize.cpp index 959ece91d..b8af17ca7 100644 --- a/Src/Wasabi/api/wndmgr/resize.cpp +++ b/Src/Wasabi/api/wndmgr/resize.cpp @@ -1,6 +1,6 @@ #include #ifdef WIN32 -#include +#include #endif #include diff --git a/Src/Wasabi/bfc/assert.cpp b/Src/Wasabi/bfc/assert.cpp index 6fb2aed35..e5142dafb 100644 --- a/Src/Wasabi/bfc/assert.cpp +++ b/Src/Wasabi/bfc/assert.cpp @@ -1,6 +1,6 @@ #include "precomp_wasabi_bfc.h" #ifdef WIN32 -#include +#include #endif #ifdef __APPLE__ #include diff --git a/Src/Wasabi/bfc/bfc.vcxproj b/Src/Wasabi/bfc/bfc.vcxproj index 08e1c2aac..ec7e23968 100644 --- a/Src/Wasabi/bfc/bfc.vcxproj +++ b/Src/Wasabi/bfc/bfc.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Wasabi/bfc/critsec.h b/Src/Wasabi/bfc/critsec.h index e9951a9a6..cc9a61f76 100644 --- a/Src/Wasabi/bfc/critsec.h +++ b/Src/Wasabi/bfc/critsec.h @@ -2,7 +2,7 @@ #define _CRITSEC_H #ifdef _WIN32 -#include +#include #elif defined(__APPLE__) #include #endif diff --git a/Src/Wasabi/bfc/file/wildcharsenum.cpp b/Src/Wasabi/bfc/file/wildcharsenum.cpp index ae3e24e2d..ee1729095 100644 --- a/Src/Wasabi/bfc/file/wildcharsenum.cpp +++ b/Src/Wasabi/bfc/file/wildcharsenum.cpp @@ -1,7 +1,7 @@ // NONPORTABLE NONPORTABLE NONPORTABLE #include "precomp_wasabi_bfc.h" #ifdef WIN32 -#include +#include #endif #include "wildcharsenum.h" #include diff --git a/Src/Wasabi/bfc/platform/linux/linux.cpp b/Src/Wasabi/bfc/platform/linux/linux.cpp index 67471d4aa..283d863a4 100644 --- a/Src/Wasabi/bfc/platform/linux/linux.cpp +++ b/Src/Wasabi/bfc/platform/linux/linux.cpp @@ -131,7 +131,7 @@ int Linux::convertEvent( MSG *m, XEvent *e ) { if ( m->hwnd ) { api_window *rw =(api_window *)GetWindowLong( m->hwnd, GWL_USERDATA ); if ( !rw ) { - // This is to fix messages for dead windows... + // This is to fix messages for dead arch... return 0; } } diff --git a/Src/Wasabi/bfc/platform/platform.h b/Src/Wasabi/bfc/platform/platform.h index 6a14967a8..c6478af98 100644 --- a/Src/Wasabi/bfc/platform/platform.h +++ b/Src/Wasabi/bfc/platform/platform.h @@ -141,7 +141,7 @@ inline int MulDiv(int a, int b, int c) #else #error port me -// Windows API dependant definitions for non-windows platforms +// Windows API dependant definitions for non-arch platforms #define __cdecl #define __stdcall diff --git a/Src/Wasabi/bfc/platform/win32.h b/Src/Wasabi/bfc/platform/win32.h index 73d8872e7..4aa727914 100644 --- a/Src/Wasabi/bfc/platform/win32.h +++ b/Src/Wasabi/bfc/platform/win32.h @@ -7,11 +7,11 @@ #endif -// this should be the *only* place windows.h gets included! +// this should be the *only* place arch.h gets included! #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #ifndef _WIN32_WCE #include #endif diff --git a/Src/Wasabi/bfc/std_keyboard.h b/Src/Wasabi/bfc/std_keyboard.h index eb21c6f46..b9bd4ff6f 100644 --- a/Src/Wasabi/bfc/std_keyboard.h +++ b/Src/Wasabi/bfc/std_keyboard.h @@ -2,7 +2,7 @@ #define NULLSOFT_WASABI_STD_KEYBOARD_H #ifdef _WIN32 -#include +#include enum { STDKEY_SHIFT = VK_SHIFT, @@ -23,7 +23,7 @@ enum enum { STDKEY_SHIFT = shiftKey, - STDKEY_ALT = cmdKey, // yes, I know the option call has "alt" written on it, but Mac programs use Apple key like windows Alt key + STDKEY_ALT = cmdKey, // yes, I know the option call has "alt" written on it, but Mac programs use Apple key like arch Alt key STDKEY_CONTROL = controlKey, STDKEY_UP = kUpArrowCharCode, diff --git a/Src/Wasabi/bfc/std_wnd.cpp b/Src/Wasabi/bfc/std_wnd.cpp index 3ad69fc15..2cb4948f7 100644 --- a/Src/Wasabi/bfc/std_wnd.cpp +++ b/Src/Wasabi/bfc/std_wnd.cpp @@ -560,7 +560,7 @@ void Wasabi::Std::Wnd::setWndRegion(OSWINDOWHANDLE wnd, OSREGIONHANDLE region, #ifdef _WIN32 int Wasabi::Std::Wnd::isDesktopAlphaAvailable() { - return 1; // we're only targetting windows 2000 and up, so it's always available + return 1; // we're only targetting arch 2000 and up, so it's always available } #endif int Wasabi::Std::Wnd::isTransparencyAvailable() diff --git a/Src/Wasabi/bfc/string/PathString.h b/Src/Wasabi/bfc/string/PathString.h index 324fc16d9..fcc132ed1 100644 --- a/Src/Wasabi/bfc/string/PathString.h +++ b/Src/Wasabi/bfc/string/PathString.h @@ -3,7 +3,7 @@ #ifdef _WIN32 -#include +#include class PathString { public: diff --git a/Src/Wasabi2/Wasabi2.vcxproj b/Src/Wasabi2/Wasabi2.vcxproj index 54e9c4864..e89090f33 100644 --- a/Src/Wasabi2/Wasabi2.vcxproj +++ b/Src/Wasabi2/Wasabi2.vcxproj @@ -100,26 +100,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/Winamp/Config.cpp b/Src/Winamp/Config.cpp index 1a5199ad6..c5eeec186 100644 --- a/Src/Winamp/Config.cpp +++ b/Src/Winamp/Config.cpp @@ -337,7 +337,7 @@ void config_write(int i) WI(video_ratio1); WI(video_ratio2); WI(video_useratio); - WI(windowshade); + WI(archhade); WI(preamp); WI(pilp); WI(randskin); @@ -520,7 +520,7 @@ void config_read(int i) RI(video_ratio1); RI(video_ratio2); RI(video_useratio); - RI(windowshade); + RI(archhade); RI(preamp); RI(pilp); RI(randskin); @@ -801,7 +801,7 @@ void config_register(wchar_t *ext, int reg) const wchar_t *which_str = WINAMP_FILEW; if (config_no_registry) return ; if (!ext[0]) return ; - if (!allowed_extension(ext)) return ; //windows=gay + if (!allowed_extension(ext)) return ; //arch=gay IFileTypeRegistrar *registrar=0; if (GetRegistrar(®istrar, true) == 0 && registrar) diff --git a/Src/Winamp/DOCK.cpp b/Src/Winamp/DOCK.cpp index 3275cac77..3eeb1f65d 100644 --- a/Src/Winamp/DOCK.cpp +++ b/Src/Winamp/DOCK.cpp @@ -27,7 +27,7 @@ void EstMainWindowRect( RECT *r ) r->left = config_wx; r->top = config_wy; r->right = config_wx + ( WINDOW_WIDTH << ( config_dsize ? 1 : 0 ) ); - r->bottom = config_wy + ( ( config_windowshade ? 14 : WINDOW_HEIGHT ) << ( config_dsize ? 1 : 0 ) ); + r->bottom = config_wy + ( ( config_archhade ? 14 : WINDOW_HEIGHT ) << ( config_dsize ? 1 : 0 ) ); } void EstEQWindowRect( RECT *r ) diff --git a/Src/Winamp/Eq.cpp b/Src/Winamp/Eq.cpp index df6d7e36b..8ca65ec7e 100644 --- a/Src/Winamp/Eq.cpp +++ b/Src/Winamp/Eq.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Main.h" #include "api.h" diff --git a/Src/Winamp/GEN.H b/Src/Winamp/GEN.H index 293101477..7f56e25d5 100644 --- a/Src/Winamp/GEN.H +++ b/Src/Winamp/GEN.H @@ -2,7 +2,7 @@ #define NULLSOFT_WINAMP_GEN_H // General Purpose plugin interface -#include +#include typedef struct { int version; diff --git a/Src/Winamp/In.cpp b/Src/Winamp/In.cpp index ab83f820e..2e8d11722 100644 --- a/Src/Winamp/In.cpp +++ b/Src/Winamp/In.cpp @@ -689,7 +689,7 @@ static void AddFilterStringW(wchar_t* p, size_t& size, const char* a, BOOL skip) if ( !skip && lstrlenW(p) >= MAX_PATH ) { // if we end with a . then need to fake things to act like a new - // filter since windows will interpret the . as a *.* which is bad + // filter since arch will interpret the . as a *.* which is bad if ( *(p + MAX_PATH) == L'.' ) { *(p + MAX_PATH - 1) = 0; diff --git a/Src/Winamp/Main.h b/Src/Winamp/Main.h index 8af946154..c0c91609d 100644 --- a/Src/Winamp/Main.h +++ b/Src/Winamp/Main.h @@ -6,8 +6,8 @@ extern "C" { #endif -#include -//#include +#include +//#include #include "wasabicfg.h" #include "wa_ipc.h" #include "config.h" @@ -64,7 +64,7 @@ extern HINSTANCE language_pack_instance; #define BIGINT 1000000000 #define MAINMENU_OPTIONS_BASE (11+g_mm_optionsbase_adj) -#define WINDOWMENU_FFWINDOWS_BASE (3+g_mm_ffwindowsbase_adj) +#define WINDOWMENU_FFWINDOWS_BASE (3+g_mm_ffarchbase_adj) #define HIDDEN_TRAP -33 @@ -225,7 +225,7 @@ extern HINSTANCE language_pack_instance; void draw_sa(unsigned char *values, int draw); // array of 12 bands, starting with leftmost, of 0..7 void draw_tbuttons(int b1, int b2, int b3, int b4); void draw_setnoupdate(int); - void draw_tbar(int active, int windowshade, int egg); + void draw_tbar(int active, int archhade, int egg); void draw_eject(int pressed); void draw_clutterbar(int enable); void update_volume_text(int songlen); @@ -466,7 +466,7 @@ extern HINSTANCE language_pack_instance; extern int g_srate, g_brate, g_nch, g_srate_exact; extern int g_mm_optionsbase_adj; - extern int g_mm_ffwindowsbase_adj; + extern int g_mm_ffarchbase_adj; extern HWND g_dialog_box_parent; extern int g_restartonquit; extern char playlist_custom_font[128]; diff --git a/Src/Winamp/MergePlaylist.h b/Src/Winamp/MergePlaylist.h index 5d9be4f10..391eaaaaa 100644 --- a/Src/Winamp/MergePlaylist.h +++ b/Src/Winamp/MergePlaylist.h @@ -1,7 +1,7 @@ #pragma once #include "../playlist/ifc_playlist.h" #include -#include // for MAX_PATH +#include // for MAX_PATH #include #include "../playlist/ifc_playlistloadercallback.h" diff --git a/Src/Winamp/OUT.H b/Src/Winamp/OUT.H index 36738975f..b146ee20f 100644 --- a/Src/Winamp/OUT.H +++ b/Src/Winamp/OUT.H @@ -2,7 +2,7 @@ #define NULLSOFT_OUTH // Output plugin interface -#include +#include #include #define OUT_VER 0x10 diff --git a/Src/Winamp/Peui.cpp b/Src/Winamp/Peui.cpp index 822075b96..e77087b43 100644 --- a/Src/Winamp/Peui.cpp +++ b/Src/Winamp/Peui.cpp @@ -741,7 +741,7 @@ static void do_vscroll(HWND hwnd) {-15,20,-7,-38}, {-20,-20,-1,-1}, }, - b_windowshade[] = + b_archhade[] = { {-(275-254),3,-(275-262),12},//wshade {-(275-264),3,-(275-272),12},//close @@ -763,8 +763,8 @@ void pe_ui_handlecursor(HWND hwnd) mouse_y=p.y; if (config_pe_height == 14) { - b=b_windowshade; - b_len = sizeof(b_windowshade)/sizeof(b_windowshade[0]); + b=b_archhade; + b_len = sizeof(b_archhade)/sizeof(b_archhade[0]); } else { diff --git a/Src/Winamp/Pledit.cpp b/Src/Winamp/Pledit.cpp index fdb0f7074..5d19bf683 100644 --- a/Src/Winamp/Pledit.cpp +++ b/Src/Winamp/Pledit.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Main.h" #include "ipc_pe.h" diff --git a/Src/Winamp/SA.cpp b/Src/Winamp/SA.cpp index 251e0c454..e50dd5c8d 100644 --- a/Src/Winamp/SA.cpp +++ b/Src/Winamp/SA.cpp @@ -236,7 +236,7 @@ static DWORD WINAPI bivis_thread(void *none) { int a = in_getouttime(); int t = config_sa; - //if ((config_windowshade&&config_mw_open) && t == 1) t=4; + //if ((config_archhade&&config_mw_open) && t == 1) t=4; char *c = sa_get(a, t, data); if (c) diff --git a/Src/Winamp/SABuffer.cpp b/Src/Winamp/SABuffer.cpp index dfe47c6cd..bc4eadb12 100644 --- a/Src/Winamp/SABuffer.cpp +++ b/Src/Winamp/SABuffer.cpp @@ -1,7 +1,7 @@ #include "SABuffer.h" #include "fft.h" #include "../nsutil/window.h" -#include +#include static const float const_1_div_128_ = 1.0f / 128.0f; /* 8 bit multiplier */ static const float const_1_div_32768_ = 1.0f / 32768.f; /* 16 bit multiplier */ diff --git a/Src/Winamp/Set.cpp b/Src/Winamp/Set.cpp index fc0bdad85..0080f8b71 100644 --- a/Src/Winamp/Set.cpp +++ b/Src/Winamp/Set.cpp @@ -111,7 +111,7 @@ static void doMyDirtyShitholeDockingShit(HWND myWnd, RECT newr, int sedge) // - else diff = newr.right - oldr.right; - // move any windows docked to the bottom, bottom. recursively. + // move any arch docked to the bottom, bottom. recursively. if (diff) for (int x = 0; ; x ++) { HWND dockwnd=NULL; @@ -243,7 +243,7 @@ static void doScreenDockMoveSubWindows(HWND myWnd, RECT newr, int whichedge) if (myWnd == hMainWindow) FixMainWindowRect(&oldr); - // move any windows docked to the bottom, bottom. recursively. + // move any arch docked to the bottom, bottom. recursively. for (int x = 0; ; x ++) { HWND dockwnd=NULL; @@ -377,7 +377,7 @@ static void doScreenDock() { embedWindowState *p=embedwndlist; - // move any windows docked to the bottom, bottom. recursively. + // move any arch docked to the bottom, bottom. recursively. for (int x = 0; ; x ++) { RECT vp; @@ -538,7 +538,7 @@ void set_eq_wnd_tooltip() {254,3,262,12},{264,3,272,12}, // toggle eq, toggle auto, presets {14,18,39,30},{39,18,72,30},{217,18,261,30}, - // windowshade volume and pan + // archhade volume and pan {61,3,162,11},{163,3,206,11}}; wchar_t buf[2048] = {0}; getStringW(IDS_TOOLTIPS,buf,2048); @@ -573,7 +573,7 @@ void set_eq_wnd_tooltip() else if(x > 15){ if(config_eq_ws) { - // re-use the main tooltip text and handle the 'toggle windowshade' and 'close' buttons as applicable + // re-use the main tooltip text and handle the 'toggle archhade' and 'close' buttons as applicable wchar_t buf[2048], *p=buf; getStringW(IDS_TOOLTIPS,buf,2048); ti.lpszText=(wchar_t*)SendMessageW(hMainWindow,WM_WA_IPC,(x - 4),IPC_CB_GETTOOLTIPW); @@ -599,7 +599,7 @@ void set_eq_wnd_tooltip() } } else if(x > 10){ - // re-use the main tooltip text and handle the 'toggle windowshade' and 'close' buttons as applicable + // re-use the main tooltip text and handle the 'toggle archhade' and 'close' buttons as applicable wchar_t buf[2048], *p=buf; getStringW(IDS_TOOLTIPS,buf,2048); ti.lpszText=(wchar_t*)SendMessageW(hMainWindow,WM_WA_IPC,x-11,IPC_CB_GETTOOLTIPW); @@ -671,7 +671,7 @@ void set_vid_wnd_tooltip() { if(!x) { - // re-use the main tooltip text and handle the 'toggle windowshade' and 'close' buttons as applicable + // re-use the main tooltip text and handle the 'toggle archhade' and 'close' buttons as applicable wchar_t buf2[2048], *p2=buf2; getStringW(IDS_TOOLTIPS,buf2,2048); for(int i = 0; i < 3; i++){ @@ -721,7 +721,7 @@ void set_pl_wnd_tooltip() RECT rs[]={{0,3,0,12},{0,3,0,12}, // add, rem, sel, misc, list buttons {14,0,36,0},{43,0,65,0},{72,0,94,0},{101,0,123,0},{0}, - // windowshade mappings - order is out of kilt so it maps more easily to the string + // archhade mappings - order is out of kilt so it maps more easily to the string // (open, previuos, play, pause, stop, next, time) {0},{0},{0},{0},{0},{0},{0}, // up/down scroll buttons @@ -768,7 +768,7 @@ void set_pl_wnd_tooltip() { if(x < 2) { - // re-use the main tooltip text and handle the 'toggle windowshade' and 'close' buttons as applicable + // re-use the main tooltip text and handle the 'toggle archhade' and 'close' buttons as applicable wchar_t buf2[2048], *p2=buf2; getStringW(IDS_TOOLTIPS,buf2,2048); for(int i = 0; i < (x == 1 ? 1 : 3); i++){ @@ -863,7 +863,7 @@ void set_main_wnd_tooltip() {246+7,76+15,258+7,90+15},{132+7-4+1,60+14+15,132+7-4+22+1,60+14+15+16}, {7+8,15+72,7+31,15+91},{7+32,15+72,7+53,15+91},{7+54,15+72,7+77,15+91},{7+78,15+72,7+100,15+91},{7+101,15+72,7+123,15+91}, {36,26,96,39},{105,24,266,35}, - // windowshade mappings - order is out of kilt so it maps more easily to the string + // archhade mappings - order is out of kilt so it maps more easily to the string // (seeker, open, previuos, play, pause, stop, next, time) {226,4,243,11},{216,2,224,11},{168,2,176,11},{177,2,186,11},{187,2,195,11},{196,2,204,11},{205,2,215,11},{125,4,157,10}}; @@ -884,7 +884,7 @@ void set_main_wnd_tooltip() } else { - if(config_windowshade) + if(config_archhade) { getStringW(IDS_TOOLTIPS,buf,2048); p=buf; @@ -929,8 +929,8 @@ void set_aot(int dodockingstuff) EstPLWindowRect(&newr); doMyDirtyShitholeDockingShit(hPLWindow,newr,-1); - // check to see if any windows used to be docked to the right/bottom, and - // if they did, move them to the bottom and any attached windows + // check to see if any arch used to be docked to the right/bottom, and + // if they did, move them to the bottom and any attached arch // this actually works OK! if ((config_keeponscreen&1) && !g_fsapp) doScreenDock(); @@ -1084,7 +1084,7 @@ void set_aot(int dodockingstuff) hwdp=DeferWindowPos(hwdp,hMainWindow, HWND_NOTOPMOST, r.left, r.top, r.right-r.left, r.bottom-r.top, SWP_NOACTIVATE|(config_mw_open?0:SWP_NOMOVE|SWP_NOSIZE)); } - if (hEQWindow && !GetParent(hEQWindow)) // we check to see if the windows have no parent, for the gen_ff + if (hEQWindow && !GetParent(hEQWindow)) // we check to see if the arch have no parent, for the gen_ff { EstEQWindowRect(&r); hwdp=DeferWindowPos(hwdp,hEQWindow, 0, r.left, r.top, r.right-r.left, r.bottom-r.top, SWP_NOACTIVATE|SWP_NOZORDER); @@ -1109,7 +1109,7 @@ void set_aot(int dodockingstuff) hwdp=DeferWindowPos(hwdp,hVideoWindow, 0, r.left, r.top, r.right-r.left, r.bottom-r.top, SWP_NOCOPYBITS|SWP_NOACTIVATE|SWP_NOZORDER); } - // traverse the embed windows + // traverse the embed arch EnterCriticalSection(&embedcs); { embedWindowState *p=embedwndlist; @@ -1223,14 +1223,14 @@ void set_aot(int dodockingstuff) else SetWindowRgn(hPLWindow,NULL,FALSE); }*/ - // refresh windows + // refresh arch if (config_mw_open) InvalidateRect(hMainWindow,NULL,FALSE); if (hEQWindow) InvalidateRect(hEQWindow,NULL,FALSE); if (hVisWindow) { int x,y,w,h; - if (config_windowshade) + if (config_archhade) { x=79; y=5; diff --git a/Src/Winamp/Skins.cpp b/Src/Winamp/Skins.cpp index 48a84f666..3d6356049 100644 --- a/Src/Winamp/Skins.cpp +++ b/Src/Winamp/Skins.cpp @@ -294,7 +294,7 @@ int Skin_GetRegionPointList( int eq, int **points, int **counts ) { if ( !eq ) { - if ( config_windowshade ) + if ( config_archhade ) { *points = skin_rgn_points_ws; *counts = skin_rgn_numpoints_ws; @@ -432,7 +432,7 @@ static void Skin_LoadCursors( void ) } cursor_loads[ N_CURSORS ] = { - // main, non windowshade, start 0, end 8 + // main, non archhade, start 0, end 8 {IDC_LRSCROLL, L"VolBal.cur"}, // vol & bal {IDC_LRSCROLL, L"Posbar.cur"}, // pos {IDC_NORMALCURSOR, L"WinBut.cur"}, //wshade @@ -442,7 +442,7 @@ static void Skin_LoadCursors( void ) {IDC_MOVEMAIN, L"TitleBar.cur"}, // titelbar {IDC_LRSCROLL, L"SongName.cur"}, {IDC_NORMALCURSOR, L"Normal.cur"}, - // main, windowshade, start 9, end 14 + // main, archhade, start 9, end 14 {IDC_NORMALCURSOR, L"WinBut.cur"}, //wshade {IDC_NORMALCURSOR, L"Min.cur"}, //min {IDC_LRSCROLL, L"WSPosbar.cur"}, // seeker @@ -456,7 +456,7 @@ static void Skin_LoadCursors( void ) {IDC_UDSCROLL, L"PVScroll.cur"}, {IDC_RESIZE, L"PSize.cur"}, {IDC_NORMALCURSOR, L"PNormal.cur"}, - // playlist editor, windowshade, start 21 end 24 + // playlist editor, archhade, start 21 end 24 {IDC_NORMALCURSOR, L"PWinBut.cur"}, //wshade {IDC_DANGER, L"PClose.cur"}, //close {IDC_LRSCROLL, L"PWSSize.cur"}, //size diff --git a/Src/Winamp/TempFileCOM.h b/Src/Winamp/TempFileCOM.h index 84fde6653..f5c82f547 100644 --- a/Src/Winamp/TempFileCOM.h +++ b/Src/Winamp/TempFileCOM.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include class TempFileCOM : public IDispatch { diff --git a/Src/Winamp/Ui.cpp b/Src/Winamp/Ui.cpp index b20a0ec80..0c062781f 100644 --- a/Src/Winamp/Ui.cpp +++ b/Src/Winamp/Ui.cpp @@ -185,8 +185,8 @@ static int do_timedisplay() { if (mouse_type == -2) return 0; - if (((!config_windowshade && inreg(36,26,96,39)) || - (config_windowshade && inreg(129,3,129+28,3+6)) + if (((!config_archhade && inreg(36,26,96,39)) || + (config_archhade && inreg(129,3,129+28,3+6)) ) && mouse_type == 1) { config_timeleftmode = !config_timeleftmode; @@ -211,7 +211,7 @@ static int do_timedisplay() sa_setthread(config_sa); return 1; } - if (config_windowshade && inreg(78,4,116,11) && mouse_type == 1) + if (config_archhade && inreg(78,4,116,11) && mouse_type == 1) { config_sa++; if (config_sa > 2) config_sa = 0; @@ -219,7 +219,7 @@ static int do_timedisplay() sa_setthread(config_sa); return 1; } - if (config_windowshade && inreg(168,2,213+11,11) && mouse_type == 1) + if (config_archhade && inreg(168,2,213+11,11) && mouse_type == 1) { int which = 5 - (mouse_x < 215) - (mouse_x < 204) - (mouse_x < 195) - (mouse_x < 186) - (mouse_x < 176); __do_buttons(which); @@ -340,7 +340,7 @@ static int do_titlebar() omwr=mwr; MoveRect(&mwr,mouse_x-clickx,mouse_y-clicky); - // snap to nondocked windows + // snap to nondocked arch if ((!!config_snap) ^ (!!(mouse_stats & MK_SHIFT))) { embedWindowState *state=embedwndlist; @@ -359,7 +359,7 @@ static int do_titlebar() } - // move docked windows the same amount the the main window has moved + // move docked arch the same amount the the main window has moved { embedWindowState *state=embedwndlist; int movex=mwr.left-omwr.left; @@ -377,7 +377,7 @@ static int do_titlebar() if ((!!config_snap) ^ (!!(mouse_stats & MK_SHIFT))) { - // dock the attached windows to the screen + // dock the attached arch to the screen if (config_keeponscreen&1) { RECT omwr; @@ -444,7 +444,7 @@ static int do_titlebar() } // kepponscreen&1 - // dock the attached windows to the non attached windows + // dock the attached arch to the non attached arch { int x; p = embedwndlist; @@ -519,7 +519,7 @@ static int do_titlebar() } // if snapping { - // calculate number of windows to move + // calculate number of arch to move int deferred_move_count = 1; if (do_titlebar_clicking&2 && !skip_eq) deferred_move_count ++;// final EQ positioning if (do_titlebar_clicking&4 && !skip_pl) deferred_move_count ++;// final PE positioning @@ -578,7 +578,7 @@ static int do_titlebuttons() { if (mouse_type == -2) return 0; - if (inreg(254,3,262,12)) // windowshade button + if (inreg(254,3,262,12)) // archhade button { if (mouse_type == -1) { @@ -947,7 +947,7 @@ static int do_posbar() { if (mouse_type == -1) do_posbar_active=0; - if (config_windowshade) + if (config_archhade) { a = mouse_x - 228; a *= (257-29-10); @@ -973,10 +973,10 @@ static int do_posbar() } } if (mouse_type == 1) - if ((inreg(11+7,58+15,256+7,66+15) && !config_windowshade) || (inreg(228,3,228+14,12) && config_windowshade) ) + if ((inreg(11+7,58+15,256+7,66+15) && !config_archhade) || (inreg(228,3,228+14,12) && config_archhade) ) { do_posbar_active=1; - if (!config_windowshade) + if (!config_archhade) { int curpos = 11 + 7 + ((in_getouttime() * (257-10-29)) / in_getlength()) / 1000; @@ -988,7 +988,7 @@ static int do_posbar() if (do_posbar_active) { - if (config_windowshade) + if (config_archhade) { a = mouse_x - 228; a *= (257-29-10); @@ -1012,7 +1012,7 @@ static int do_posbar() StringCchPrintfW(buf,256, L"%s: %02d:%02d/%02d:%02d (%d%%)",getStringW(IDS_SEEK_TO,seekStr,64),t/60,t%60, a/60,a%60,(t*100)/(a?a:1) ); - if (config_windowshade) draw_time(t/60,t%60,0); + if (config_archhade) draw_time(t/60,t%60,0); t=0; draw_songname(buf,&t,-1); } @@ -1032,7 +1032,7 @@ void ui_drawtime(int time_elapsed, int mode) } else { - if (!do_posbar_active || !config_windowshade) + if (!do_posbar_active || !config_archhade) draw_time(time_elapsed/60,time_elapsed%60,0); } if (playing) @@ -1223,7 +1223,7 @@ void ui_handlecursor(void) {5,3,17,13},//mainmenu {0,0,275,13},// titelbar {105,24,266,35}, - }, b_windowshade[] = + }, b_archhade[] = { {254,3,262,12},//wshade {244,3,253,12},//min @@ -1235,7 +1235,7 @@ void ui_handlecursor(void) int x; if (0 != (WS_DISABLED & GetWindowLongPtrW(hMainWindow, GWL_STYLE))) - x = (config_windowshade) ? 14 : 8; + x = (config_archhade) ? 14 : 8; else { int b_len; @@ -1249,10 +1249,10 @@ void ui_handlecursor(void) if (config_dsize) { mouse_x/=2; mouse_y/=2;} RECT *b; - if (config_windowshade) + if (config_archhade) { - b=b_windowshade; - b_len = sizeof(b_windowshade)/sizeof(b_windowshade[0]); + b=b_archhade; + b_len = sizeof(b_archhade)/sizeof(b_archhade[0]); } else { @@ -1262,7 +1262,7 @@ void ui_handlecursor(void) for (x = 0; x < b_len; x ++) if (inreg(b[x].left,b[x].top,b[x].right,b[x].bottom)) break; - if (config_windowshade) x+=9; + if (config_archhade) x+=9; } diff --git a/Src/Winamp/VIS.cpp b/Src/Winamp/VIS.cpp index 27075d319..1f6cc728c 100644 --- a/Src/Winamp/VIS.cpp +++ b/Src/Winamp/VIS.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Main.h" #include "vis.h" diff --git a/Src/Winamp/VideoAspectAdjuster.h b/Src/Winamp/VideoAspectAdjuster.h index c921f28da..e4f13e852 100644 --- a/Src/Winamp/VideoAspectAdjuster.h +++ b/Src/Winamp/VideoAspectAdjuster.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_VIDEOASPECTADJUSTERH #define NULLSOFT_VIDEOASPECTADJUSTERH -#include +#include class VideoAspectAdjuster { diff --git a/Src/Winamp/VideoOSD.cpp b/Src/Winamp/VideoOSD.cpp index aedb7df01..87ae5fa5f 100644 --- a/Src/Winamp/VideoOSD.cpp +++ b/Src/Winamp/VideoOSD.cpp @@ -312,7 +312,7 @@ void IVideoOSD::Draw() /* ClientToScreen(parent, (LPPOINT)&fullr); ClientToScreen(parent, ((LPPOINT)&fullr) + 1); - // transform coords from windows desktop coords (where 0,0==upper-left corner of the primary monitor) + // transform coords from arch desktop coords (where 0,0==upper-left corner of the primary monitor) // to the coords for the monitor we're displaying on: fullr.top -= m_mon_y; fullr.left -= m_mon_x; diff --git a/Src/Winamp/VideoOSD.h b/Src/Winamp/VideoOSD.h index fdc550417..6d3159dd5 100644 --- a/Src/Winamp/VideoOSD.h +++ b/Src/Winamp/VideoOSD.h @@ -2,7 +2,7 @@ #define NULLSOFT_VIDEOOSDH /* Video On Screen Display */ -#include +#include #define NUM_WIDGETS 11 diff --git a/Src/Winamp/VideoOutput.cpp b/Src/Winamp/VideoOutput.cpp index 9dac1c528..37d92c503 100644 --- a/Src/Winamp/VideoOutput.cpp +++ b/Src/Winamp/VideoOutput.cpp @@ -1,4 +1,4 @@ -#include +#include #include "main.h" #include "VideoOutput.h" diff --git a/Src/Winamp/VideoOutputChild.h b/Src/Winamp/VideoOutputChild.h index 80bbdd575..d5dd36c36 100644 --- a/Src/Winamp/VideoOutputChild.h +++ b/Src/Winamp/VideoOutputChild.h @@ -3,7 +3,7 @@ class SubsItem; -#include +#include #include "VideoAspectAdjuster.h" /* diff --git a/Src/Winamp/WADrawDC.h b/Src/Winamp/WADrawDC.h index 94c90bae8..2b43ca3ce 100644 --- a/Src/Winamp/WADrawDC.h +++ b/Src/Winamp/WADrawDC.h @@ -1,5 +1,5 @@ #pragma once -#include +#include class WADrawDC { diff --git a/Src/Winamp/Winamp.rc b/Src/Winamp/Winamp.rc index 303c1ddb6..ab2eb9d38 100644 --- a/Src/Winamp/Winamp.rc +++ b/Src/Winamp/Winamp.rc @@ -555,12 +555,12 @@ BEGIN GROUPBOX "General Options",IDC_STATIC,4,3,256,79 CONTROL "Dim window titlebars when not in focus",IDC_HIGHLIGHT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,15,138,10 - CONTROL "Dock skinned windows at",IDC_SNAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,28,95,10 + CONTROL "Dock skinned arch at",IDC_SNAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,28,95,10 EDITTEXT IDC_SNAPW,105,27,17,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "pixels",IDC_STATIC,127,28,18,10,SS_CENTERIMAGE - CONTROL "Enable smooth window resizing for resizeable skinned windows",IDC_CHECK2, + CONTROL "Enable smooth window resizing for resizeable skinned arch",IDC_CHECK2, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,41,230,10 - CONTROL "Display tooltips in Winamp's windows",IDC_TTIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,54,133,10 + CONTROL "Display tooltips in Winamp's arch",IDC_TTIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,54,133,10 CONTROL "Use skinned mouse cursors",IDC_WA_CURSORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,67,103,10 GROUPBOX "Main Window Options",IDC_STATIC,4,85,256,86 CONTROL "Display playlist position in the song scroller",IDC_POS_IN_SONGTICKER, @@ -2493,7 +2493,7 @@ BEGIN IDS_P_SETUP_START2 "Removes Winamp items (added from the 'Add' button) from the Start Menu." IDS_P_SETUP_LANG "This lets you change the current language pack for Winamp. The default is English." IDS_P_FT_DIRCONTEXT "Checking this option makes Winamp add a 'play' and 'enqueue' option to directories in explorer." - IDS_P_DISP_SNAPW "This value controls at what distance (in pixels) Winamp windows snap to each other and to the viewport." + IDS_P_DISP_SNAPW "This value controls at what distance (in pixels) Winamp arch snap to each other and to the viewport." IDS_P_PLUG_VISDIR "This button lets you select the directory for Winamp visualization plug-ins. The default is \\Plugins" IDS_P_PLUG_DSPDIR "This button lets you select the directory for Winamp DSP/effect plug-ins. The default is \\Plugins" IDS_SELVISDIR "Select visualization plug-in directory" @@ -2553,7 +2553,7 @@ BEGIN IDS_P_DISP_SYSTRAY "Changes the icon that Winamp puts in the notification area." IDS_P_DISP_TASKBAR "This check toggles whether Winamp is shown on the Windows Taskbar, like normal programs." IDS_P_DISP_SYSTRAYICON "This check toggles whether Winamp has an icon in the notification area (near the clock)." - IDS_P_DISP_FREESIZE "Allows Winamp Classic skinned resizable windows to be freely sized, instead of kept at 25x29 blocks" + IDS_P_DISP_FREESIZE "Allows Winamp Classic skinned resizable arch to be freely sized, instead of kept at 25x29 blocks" IDS_P_CLASSICUI "Classic Skin Options" IDS_P_DISP_HILITE "If enabled this option lets Winamp dim its titlebar when inactive (normally enabled)" IDS_P_DISP_SNAP "If enabled this option makes Winamp snap when you move it. You can temporarily toggle this option by holding down Shift while moving Winamp." diff --git a/Src/Winamp/bm.cpp b/Src/Winamp/bm.cpp index 241270185..1113f5fd2 100644 --- a/Src/Winamp/bm.cpp +++ b/Src/Winamp/bm.cpp @@ -92,7 +92,7 @@ void Bookmark_WriteAsXML(const wchar_t *filename, int max) if (fp && destFp) { - //fprintf(destFp, "", GetACP()); + //fprintf(destFp, "", GetACP()); fprintf(destFp, ""); fputs("\n", destFp); int x=0; diff --git a/Src/Winamp/burn.cpp b/Src/Winamp/burn.cpp index d1a6cc8d4..f64be490f 100644 --- a/Src/Winamp/burn.cpp +++ b/Src/Winamp/burn.cpp @@ -7,7 +7,7 @@ **/ #include "main.h" #include "resource.h" -#include +#include #include #include #include diff --git a/Src/Winamp/commandLink.cpp b/Src/Winamp/commandLink.cpp index 69f181890..1a62b59f7 100644 --- a/Src/Winamp/commandLink.cpp +++ b/Src/Winamp/commandLink.cpp @@ -3,7 +3,7 @@ #include "./api.h" //#include "./guiObjects.h" -#include +#include #include #include #include diff --git a/Src/Winamp/config.h b/Src/Winamp/config.h index 69f16fbbb..d2c21b0f7 100644 --- a/Src/Winamp/config.h +++ b/Src/Winamp/config.h @@ -124,7 +124,7 @@ CONFIG_EXT int config_si_wx DEF_VAL(0), config_si_wy DEF_VAL(0), config_si_width config_si_autoshow DEF_VAL(1), config_si_autosize DEF_VAL(1), config_si_autohide DEF_VAL(1), config_si_open DEF_VAL(0); */ CONFIG_EXT int config_plscrollsize DEF_VAL(1), config_plmw2xscroll DEF_VAL(1); -CONFIG_EXT unsigned char config_windowshade,config_rofiob,config_eq_ws; +CONFIG_EXT unsigned char config_archhade,config_rofiob,config_eq_ws; CONFIG_EXT unsigned char config_preamp DEF_VAL(31); CONFIG_EXT int config_pilp; CONFIG_EXT unsigned char config_randskin; diff --git a/Src/Winamp/creddlg.h b/Src/Winamp/creddlg.h index e15083581..e699d612e 100644 --- a/Src/Winamp/creddlg.h +++ b/Src/Winamp/creddlg.h @@ -6,7 +6,7 @@ #endif -#include +#include #define CDS_USEUSERNAME 0x0001 // szUser will be used to prepopulate user name field #define CDS_USEPASSWORD 0x0002 // szPassword will be used to prepopulate user name field diff --git a/Src/Winamp/dispatchCallback.h b/Src/Winamp/dispatchCallback.h index a59629886..f40a75819 100644 --- a/Src/Winamp/dispatchCallback.h +++ b/Src/Winamp/dispatchCallback.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #include #include diff --git a/Src/Winamp/dpi.h b/Src/Winamp/dpi.h index e657240d4..9f1681ae0 100644 --- a/Src/Winamp/dpi.h +++ b/Src/Winamp/dpi.h @@ -8,7 +8,7 @@ extern "C" { #endif -#include +#include // DPI awareness based on http://msdn.microsoft.com/en-US/library/dd464660.aspx // Definition: relative pixel = 1 pixel at 96 DPI and scaled based on actual DPI. diff --git a/Src/Winamp/draw.cpp b/Src/Winamp/draw.cpp index f47c22d9d..0b953dace 100644 --- a/Src/Winamp/draw.cpp +++ b/Src/Winamp/draw.cpp @@ -543,7 +543,7 @@ void draw_clear() CopyToMainBM(); draw_playicon(2); GetClientRect(hMainWindow,&r); - draw_tbar(config_hilite?(GetForegroundWindow() == hMainWindow?1:0):1, config_windowshade,0); + draw_tbar(config_hilite?(GetForegroundWindow() == hMainWindow?1:0):1, config_archhade,0); update_area(0,0,r.right,r.bottom); } diff --git a/Src/Winamp/draw.h b/Src/Winamp/draw.h index da124636b..ab8c47deb 100644 --- a/Src/Winamp/draw.h +++ b/Src/Winamp/draw.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_DRAWH #define NULLSOFT_DRAWH -#include +#include #include "Main.h" #ifdef __cplusplus extern "C" { diff --git a/Src/Winamp/draw_eq.cpp b/Src/Winamp/draw_eq.cpp index 4d89e44e6..4be1271ad 100644 --- a/Src/Winamp/draw_eq.cpp +++ b/Src/Winamp/draw_eq.cpp @@ -13,7 +13,7 @@ #include "WADrawDC.h" HDC eqMainDC, eqMainDC2; -int enable_eq_windowshade_button; +int enable_eq_archhade_button; HBITMAP eqMainBM = NULL, eqMainBM2 = NULL, eqExBM = NULL, eqOldmainBM2 = NULL, eqOldmainBM = NULL; extern "C" int eq_init = 0; @@ -29,7 +29,7 @@ void draw_eq_init() eqMainDC = CreateCompatibleDC(screenHdc); eqMainDC2 = CreateCompatibleDC(screenHdc); - enable_eq_windowshade_button = 2; + enable_eq_archhade_button = 2; // attempt to use the ISO eq image (if present) if(config_eq_frequencies!=EQ_FREQUENCIES_WINAMP) @@ -38,7 +38,7 @@ void draw_eq_init() if (!eqMainBM) eqMainBM = draw_LBitmap(NULL, L"eqmain.bmp"); if (eqMainBM) - enable_eq_windowshade_button = 0; + enable_eq_archhade_button = 0; // and if that fails then we revert to the built in classic skin resources else eqMainBM = draw_LBitmap(MAKEINTRESOURCE((config_eq_frequencies==EQ_FREQUENCIES_WINAMP)?IDB_EQMAIN:IDB_EQMAIN_ISO), NULL); @@ -48,11 +48,11 @@ void draw_eq_init() if (!eqExBM) { if (!skin_directory[0]) - enable_eq_windowshade_button = 1; + enable_eq_archhade_button = 1; eqExBM = draw_LBitmap(MAKEINTRESOURCE(IDB_EQEX), NULL); } else - enable_eq_windowshade_button = 1; + enable_eq_archhade_button = 1; draw_ReleaseDC(hMainWindow, screenHdc); @@ -247,7 +247,7 @@ void draw_eq_tbutton(int b3, int wsb) } else { - if (wsb && enable_eq_windowshade_button) + if (wsb && enable_eq_archhade_button) BitBlt(eqMainDC, 254, 3, 9, 9, bmDC, 1, 38, SRCCOPY); else BitBlt(eqMainDC, 254, 3, 9, 9, eqMainDC, 254, 137, SRCCOPY); diff --git a/Src/Winamp/draw_main.cpp b/Src/Winamp/draw_main.cpp index 6e73fe935..d016c1eed 100644 --- a/Src/Winamp/draw_main.cpp +++ b/Src/Winamp/draw_main.cpp @@ -18,7 +18,7 @@ void draw_tbuttons(int b1, int b2, int b3, int b4) if (b1 != -1) BitBlt(mainDC,6,3,9,9,bmDC,0,b1*9,SRCCOPY); if (b2 != -1) BitBlt(mainDC,244,3,9,9,bmDC,9,b2*9,SRCCOPY); if (b3 != -1) BitBlt(mainDC,264,3,9,9,bmDC,18,b3*9,SRCCOPY); - if (b4 != -1) BitBlt(mainDC,254,3,9,9,bmDC,b4*9,config_windowshade?27:18,SRCCOPY); + if (b4 != -1) BitBlt(mainDC,254,3,9,9,bmDC,b4*9,config_archhade?27:18,SRCCOPY); unsetSrcBM(); update_area(6,3,9,9); update_area(243,3,274-243,9); @@ -108,12 +108,12 @@ void draw_paint(HWND hwnd) draw_ReleaseDC(hMainWindow,screenHdc); } -void draw_tbar( int active, int windowshade, int egg ) +void draw_tbar( int active, int archhade, int egg ) { int t[ 4 ] = { 0, 15, 29, 42 }; - int l = t[ ( ( active ? 0 : 1 ) + ( windowshade ? 2 : 0 ) ) ]; + int l = t[ ( ( active ? 0 : 1 ) + ( archhade ? 2 : 0 ) ) ]; - if ( egg && !windowshade ) + if ( egg && !archhade ) l = active ? 57 : 72; if ( !draw_initted ) @@ -125,7 +125,7 @@ void draw_tbar( int active, int windowshade, int egg ) unsetSrcBM(); - if ( windowshade && config_windowshade ) + if ( archhade && config_archhade ) { int pos = 0; draw_songname( L"", &pos, 0 ); @@ -212,7 +212,7 @@ void draw_time(int minutes, int seconds, int clear) { else minutes=seconds=tlm=0; } - if (config_windowshade) + if (config_archhade) setSrcBM(fontBM); else { @@ -225,7 +225,7 @@ void draw_time(int minutes, int seconds, int clear) { } if (clear) { - if (config_windowshade) + if (config_archhade) { BitBlt(mainDC,126,4,3,6,bmDC,142,0,SRCCOPY); BitBlt(mainDC,130,4,3,6,bmDC,142,0,SRCCOPY); @@ -249,7 +249,7 @@ void draw_time(int minutes, int seconds, int clear) { } else { - if (config_windowshade) + if (config_archhade) { if (tlm) { @@ -311,7 +311,7 @@ void draw_time(int minutes, int seconds, int clear) { { draw_pe_timedisp(NULL, minutes,seconds,tlm,clear); } - if (config_windowshade) update_area(125,4,32,6); + if (config_archhade) update_area(125,4,32,6); else update_area(36,11+15,96-36+4,13); } @@ -449,7 +449,7 @@ void draw_positionbar(int position, int pressed) // position is 0-256 bmDC,position+29,0,SRCCOPY); unsetSrcBM(); update_rect(r); - if (config_windowshade) + if (config_archhade) { int a; r.left = 226; diff --git a/Src/Winamp/draw_sa.cpp b/Src/Winamp/draw_sa.cpp index e7f8ce05c..cb8a14640 100644 --- a/Src/Winamp/draw_sa.cpp +++ b/Src/Winamp/draw_sa.cpp @@ -24,7 +24,7 @@ void draw_sa(unsigned char *values, int draw) int dbx; float spfo; - int ws=(config_windowshade&&config_mw_open); + int ws=(config_archhade&&config_mw_open); int s = (config_dsize&&config_mw_open)?1:0; unsigned char *gmem; @@ -96,9 +96,9 @@ void draw_sa(unsigned char *values, int draw) } else if (!s) // singlesize { - if (!ws) // non windowshade singlesize + if (!ws) // non archhade singlesize { - if (config_sa == 2) // non windowshade singlesize oscilliscope + if (config_sa == 2) // non archhade singlesize oscilliscope { gmem = specData + 76*2*14; if (draw) @@ -135,7 +135,7 @@ void draw_sa(unsigned char *values, int draw) } } } - else // non windowshade singlesize spectrum analyzer + else // non archhade singlesize spectrum analyzer { for (x = 0; x < 75; x ++) { @@ -185,9 +185,9 @@ void draw_sa(unsigned char *values, int draw) } } } - else // windowshade singlesize + else // archhade singlesize { - if (config_sa==1) // windowshade singlesize spectrum analyzer + if (config_sa==1) // archhade singlesize spectrum analyzer { gmem = specData+76*2*(32-5); for (x = 0; x < 37; x ++) @@ -240,7 +240,7 @@ void draw_sa(unsigned char *values, int draw) if (t_bx[x*2] < 0) t_bx[x*2]=0; } } - else if (config_sa == 2) // windowshade singlesize oscilliscope + else if (config_sa == 2) // archhade singlesize oscilliscope { int wm=((config_safire>>2)&3); int lastv=-5; diff --git a/Src/Winamp/embwnd.cpp b/Src/Winamp/embwnd.cpp index 7f74fb0f2..c394d6067 100644 --- a/Src/Winamp/embwnd.cpp +++ b/Src/Winamp/embwnd.cpp @@ -6,7 +6,7 @@ ** Created: **/ -#include +#include #include "main.h" #include "api.h" @@ -195,14 +195,14 @@ static void do_size( HWND hwnd, embedWindowState *state ) { // TODO need to ensure this isn't used when freesize is disabled // isn't keeping track of the positions correctly on change - // as some windows only part snap e.g. ml won't dock to edges or to bottom of main window + // as some arch only part snap e.g. ml won't dock to edges or to bottom of main window RECT rw = { 0 }, r = { 0 }; POINT pt = { x, y }; SendMessageW( hwnd, WM_USER + 0x101, 1, (LPARAM) &pt ); GetWindowRect( hwnd, &rw ); - // trying to get classic skins to dock to other windows on resizing + // trying to get classic skins to dock to other arch on resizing /*rw.left = state->r.left; rw.top = state->r.top; rw.right = state->r.left + x; diff --git a/Src/Winamp/fullscreen.cpp b/Src/Winamp/fullscreen.cpp index f092973ff..39b6e61c9 100644 --- a/Src/Winamp/fullscreen.cpp +++ b/Src/Winamp/fullscreen.cpp @@ -145,7 +145,7 @@ void restoreAOT() // but for some reason I cannot figure out, it does not work unless WA has been clicked away and back in focus. // if that hasn't been done, then reseting the flag on each window is necessary. // now for the fun part: the above is true for classic skin, but in modern skins, reseting the flag - // on those windows actually prevents the player from coming back ONTOP! FUN! + // on those arch actually prevents the player from coming back ONTOP! FUN! if (GetParent(hPLWindow) == NULL) { SetWindowPos(hPLWindow, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER); diff --git a/Src/Winamp/ipc.cpp b/Src/Winamp/ipc.cpp index a472c31ef..9da18ee82 100644 --- a/Src/Winamp/ipc.cpp +++ b/Src/Winamp/ipc.cpp @@ -554,9 +554,9 @@ LRESULT Main_OnIPC(HWND hwnd, int which, WPARAM data) if (data == 1) g_mm_optionsbase_adj++; return g_mm_optionsbase_adj; case IPC_ADJUST_FFWINDOWSMENUPOS: - if (data == -1) g_mm_ffwindowsbase_adj--; - if (data == 1) g_mm_ffwindowsbase_adj++; - return g_mm_ffwindowsbase_adj; + if (data == -1) g_mm_ffarchbase_adj--; + if (data == 1) g_mm_ffarchbase_adj++; + return g_mm_ffarchbase_adj; case IPC_ADJUST_FFOPTIONSMENUPOS: if (data == -1) g_mm_ffoptionsbase_adj--; if (data == 1) g_mm_ffoptionsbase_adj++; @@ -1208,7 +1208,7 @@ LRESULT Main_OnIPC(HWND hwnd, int which, WPARAM data) EMBEDWND *pew = (EMBEDWND*)calloc(1, sizeof(EMBEDWND)); SetPropW(parms->me, EMBEDWND_PROPW, pew); - // this makes sure that JTFE won't mess with the windows + // this makes sure that JTFE won't mess with the arch SetPropA(parms->me, "WnShdProcIgnore", (HANDLE)1); // do this just incase it's missed off by the plug-in @@ -1414,7 +1414,7 @@ LRESULT Main_OnIPC(HWND hwnd, int which, WPARAM data) case IPC_GET_PREVIOUS_PLITEM: return -1; case IPC_IS_WNDSHADE: - if (data == -1) return config_windowshade; + if (data == -1) return config_archhade; if (data == IPC_GETWND_PE) return config_pe_height == 14; if (data == IPC_GETWND_EQ) return config_eq_ws; return 0; diff --git a/Src/Winamp/main.cpp b/Src/Winamp/main.cpp index b92dda2d8..665e8455d 100644 --- a/Src/Winamp/main.cpp +++ b/Src/Winamp/main.cpp @@ -7,7 +7,7 @@ **/ #include "main.h" -#include +#include #include "../Agave/Language/lang.h" #include @@ -101,7 +101,7 @@ int g_need_titleupd = 0; int g_need_infoupd = 0; int g_SkinTop, g_BookmarkTop, g_LangTop; int g_mm_optionsbase_adj = 0; //used by IPC_ADJUST_OPTIONSMENUPOS -int g_mm_ffwindowsbase_adj = 0; //used by IPC_ADJUST_FFWINDOWSMENUPOS +int g_mm_ffarchbase_adj = 0; //used by IPC_ADJUST_FFWINDOWSMENUPOS int g_mm_ffoptionsbase_adj = 0; //used by IPC_ADJUST_FFOPTIONSMENUPOS int g_has_video_plugin = 0; int g_no_video_loaded = 0; //filled in by in_init @@ -1485,7 +1485,7 @@ LRESULT CALLBACK Main_WndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara eggTyping = FALSE; eggstat = !eggstat; pos = 0; - draw_tbar( 1, config_windowshade, eggstat ); + draw_tbar( 1, config_archhade, eggstat ); } } else @@ -1845,7 +1845,7 @@ again: } else if ( vn == APP_VERSION_NUM ) return lhwnd; } - if ( failed ) return NULL; // no valid winamp windows, but one that fucked up + if ( failed ) return NULL; // no valid winamp arch, but one that fucked up Sleep( 100 ); } diff --git a/Src/Winamp/main_command.cpp b/Src/Winamp/main_command.cpp index f0dd272b9..8f8588699 100644 --- a/Src/Winamp/main_command.cpp +++ b/Src/Winamp/main_command.cpp @@ -48,9 +48,9 @@ static void ToggleWindowShade_EQ() static void ToggleWindowShade_Main() { - config_windowshade = !config_windowshade; + config_archhade = !config_archhade; set_aot(1); - draw_tbar(1, config_windowshade, eggstat); + draw_tbar(1, config_archhade, eggstat); SendMessageW(hMainWindow, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0); sa_setthread(config_sa); } @@ -390,16 +390,16 @@ LRESULT Main_OnCommand(HWND hwnd, int wID, HWND hwndCtl, UINT codeNotify) case WINAMP_EDIT_ID3: if (FileName[0]) in_infobox(DIALOG_PARENT(hMainWindow), FileName); return 1; - case WINAMP_OPTIONS_WINDOWSHADE_PL: // toggle windowshade + case WINAMP_OPTIONS_WINDOWSHADE_PL: // toggle archhade ToggleWindowShade_PL(); return 1; case WINAMP_OPTIONS_WINDOWSHADE_EQ: ToggleWindowShade_EQ(); return 1; - case WINAMP_OPTIONS_WINDOWSHADE: // toggle windowshade + case WINAMP_OPTIONS_WINDOWSHADE: // toggle archhade ToggleWindowShade_Main(); return 1; - case WINAMP_OPTIONS_WINDOWSHADE_GLOBAL: // toggle windowshade + case WINAMP_OPTIONS_WINDOWSHADE_GLOBAL: // toggle archhade { HWND hFocus = GetForegroundWindow(); if (hFocus == hPLWindow || IsChild(hFocus, hPLWindow)) @@ -585,7 +585,7 @@ LRESULT Main_OnCommand(HWND hwnd, int wID, HWND hwndCtl, UINT codeNotify) } } return 0; - case WINAMP_BUTTON1_SHIFT: // button 1 (previous), sent from either windowshade, + case WINAMP_BUTTON1_SHIFT: // button 1 (previous), sent from either archhade, case WINAMP_BUTTON1_CTRL: // keyboard shortcut, or normal buttons (ui.c) case WINAMP_BUTTON1: return (Main_OnButton1(hwnd, LOWORD(wID), hwndCtl, codeNotify)); diff --git a/Src/Winamp/main_display.cpp b/Src/Winamp/main_display.cpp index ddc4296c8..88c7dd969 100644 --- a/Src/Winamp/main_display.cpp +++ b/Src/Winamp/main_display.cpp @@ -19,7 +19,7 @@ int Main_OnGetText(wchar_t *text, int sizeCch) return (int)sizeCch-rem; } -// evil 256 color mode windows palette handling +// evil 256 color mode arch palette handling int Main_OnQueryNewPalette(HWND hwnd) { if (draw_hpal) { // hPal is NULL if we're in hicolor @@ -32,7 +32,7 @@ int Main_OnQueryNewPalette(HWND hwnd) return 1; } -// more 256 color windows palette handling +// more 256 color arch palette handling int Main_OnPaletteChanged(HWND hwnd, HWND hwndPaletteChange) { if (draw_hpal) @@ -75,7 +75,7 @@ int Main_OnDisplayChange(HWND hwnd) draw_panbar(config_pan,0); draw_songname(L"",&t,0); draw_playicon(playing?paused?4:1:2); - draw_tbar(config_hilite?(GetForegroundWindow() == hMainWindow?1:0):1, config_windowshade,eggstat); + draw_tbar(config_hilite?(GetForegroundWindow() == hMainWindow?1:0):1, config_archhade,eggstat); draw_monostereo(-1); if (playing) @@ -86,7 +86,7 @@ int Main_OnDisplayChange(HWND hwnd) draw_setnoupdate(0); draw_songname(FileTitle,&ui_songposition,playing?in_getlength():PlayList_getcurrentlength()); - // tell other windows + // tell other arch if (IsWindow(hVideoWindow)) SendMessageW(hVideoWindow, WM_DISPLAYCHANGE,0,0); if (IsWindow(hEQWindow)) diff --git a/Src/Winamp/main_init.cpp b/Src/Winamp/main_init.cpp index 70f634a6b..209eaa522 100644 --- a/Src/Winamp/main_init.cpp +++ b/Src/Winamp/main_init.cpp @@ -55,7 +55,7 @@ BOOL InitApplication(HINSTANCE hInstance) // register Winamp's window class, re #endif #endif - /* now register unicode windows */ + /* now register unicode arch */ WNDCLASSW wcW = {0, }; wcW.style = CS_DBLCLKS; @@ -220,7 +220,7 @@ void main_Create() draw_playicon(2); draw_clutterbar(0); draw_monostereo(0); - draw_tbar(1, config_windowshade, 0); + draw_tbar(1, config_archhade, 0); draw_setnoupdate(0); InsertMenuW(GetSystemMenu(hMainWindow, FALSE), 0, MF_POPUP | MF_BYPOSITION, (UINT_PTR) main_menu, L"Winamp"); InsertMenu(GetSystemMenu(hMainWindow, FALSE), 1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); diff --git a/Src/Winamp/main_mouse.cpp b/Src/Winamp/main_mouse.cpp index 400e48935..10a3e9655 100644 --- a/Src/Winamp/main_mouse.cpp +++ b/Src/Winamp/main_mouse.cpp @@ -123,45 +123,45 @@ int Main_OnRButtonUp(HWND hwnd, int x, int y, UINT flags) if (ret) SendMessageW(hwnd, WM_COMMAND, ret, 0); return 1; } - else if ((!config_windowshade && x >= 36 && y >= 26 && x < 96 && y < 39) || - (config_windowshade && x >= 129 && y >= 3 && x < 129+28 && y < 3+6)) + else if ((!config_archhade && x >= 36 && y >= 26 && x < 96 && y < 39) || + (config_archhade && x >= 129 && y >= 3 && x < 129+28 && y < 3+6)) { hmenu = GetSubMenu(GetSubMenu(top_menu,3),1); CheckMenuItem(hmenu,WINAMP_OPTIONS_ELAPSED,config_timeleftmode?MF_UNCHECKED:MF_CHECKED); CheckMenuItem(hmenu,WINAMP_OPTIONS_REMAINING,config_timeleftmode?MF_CHECKED:MF_UNCHECKED); } else if ((x >= 27 && y >= 40 && x < 99 && y < 61) || - (config_windowshade && x >= 78 && y >= 4 && x < 116 && y < 11)) + (config_archhade && x >= 78 && y >= 4 && x < 116 && y < 11)) { hmenu=g_submenus_vis; } else if ((x >= 16 && y >= 88 && x < 37 && y < 106) || /// button 1 - (config_windowshade && x >= 167 && y >= 3 && x < 176 && y < 12)) + (config_archhade && x >= 167 && y >= 3 && x < 176 && y < 12)) { hmenu = GetSubMenu(GetSubMenu(top_menu,3),2); } else if ((x >= 37 && y >= 88 && x < 62 && y < 106) || /// button 2 - (config_windowshade && x >= 176 && y >= 3 && x < 186 && y < 12)) + (config_archhade && x >= 176 && y >= 3 && x < 186 && y < 12)) { hmenu = GetSubMenu(GetSubMenu(top_menu,3),3); } else if ((x >= 62 && y >= 88 && x < 89 && y < 106) || /// button 3 - (config_windowshade && x >= 186 && y >= 3 && x < 196 && y < 12)) + (config_archhade && x >= 186 && y >= 3 && x < 196 && y < 12)) { hmenu = GetSubMenu(GetSubMenu(top_menu,3),4); } else if ((x >= 89 && y >= 88 && x < 107 && y < 106) || /// button 4 - (config_windowshade && x >= 196 && y >= 3 && x < 206 && y < 12)) + (config_archhade && x >= 196 && y >= 3 && x < 206 && y < 12)) { hmenu = GetSubMenu(GetSubMenu(top_menu,3),5); } else if ((x >= 107 && y >= 88 && x < 130 && y < 106) || /// button 5 - (config_windowshade && x >= 206 && y >= 3 && x < 216 && y < 12)) + (config_archhade && x >= 206 && y >= 3 && x < 216 && y < 12)) { hmenu = GetSubMenu(GetSubMenu(top_menu,3),6); } else if ((x >= 136 && y >= 89 && x < 158 && y < 105) || /// eject - (config_windowshade && x >= 215 && y >= 3 && x < 225 && y < 12)) + (config_archhade && x >= 215 && y >= 3 && x < 225 && y < 12)) { hmenu = GetSubMenu(GetSubMenu(top_menu,3),7); UpdateAudioCDMenus(hmenu); @@ -208,10 +208,10 @@ int Main_OnLButtonDblClk(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFla KillTimer(hwnd,666); SendMessageW(hwnd,WM_CLOSE,0xDEADBEEF,0xDEADF00D); } - else if (config_windowshade && nx <= 158 && nx >= 129 && + else if (config_archhade && nx <= 158 && nx >= 129 && ny <= 10 && ny >= 5) Main_OnLButtonDown(hwnd,0,x,y,keyFlags); - else if (config_windowshade && nx <= 213 && nx >= 168 && + else if (config_archhade && nx <= 213 && nx >= 168 && ny <= 11 && ny >= 2) Main_OnLButtonDown(hwnd,0,x,y,keyFlags); else if (nx < 266 && nx > 117 && ny < 35 && ny > 24) @@ -219,9 +219,9 @@ int Main_OnLButtonDblClk(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFla SendMessageW(hwnd,WM_COMMAND,WINAMP_EDIT_ID3,0); } else if ((nx >= 24 && ny >= 43 && nx < 24+76 && ny < 43+16) || - (config_windowshade && nx >= 79 && ny >= 5 && nx < 79+38 && ny < 5+5)) + (config_archhade && nx >= 79 && ny >= 5 && nx < 79+38 && ny < 5+5)) { - if (config_windowshade) config_sa = !config_sa; + if (config_archhade) config_sa = !config_sa; else { config_sa+=2; diff --git a/Src/Winamp/main_nonclient.cpp b/Src/Winamp/main_nonclient.cpp index c481ce0cb..eaf7ac661 100644 --- a/Src/Winamp/main_nonclient.cpp +++ b/Src/Winamp/main_nonclient.cpp @@ -15,15 +15,15 @@ BOOL Main_OnNCActivate(HWND hwnd, BOOL fActive, HWND hwndActDeact, BOOL fMinimiz { if (fActive == FALSE) { - draw_tbar(config_hilite ? 0 : 1, config_windowshade, eggstat); - if (config_windowshade) SendMessageW(hwnd, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0); + draw_tbar(config_hilite ? 0 : 1, config_archhade, eggstat); + if (config_archhade) SendMessageW(hwnd, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0); } else { static int i; - if (i) draw_tbar(1, config_windowshade, eggstat); + if (i) draw_tbar(1, config_archhade, eggstat); i = 1; - if (config_windowshade) SendMessageW(hwnd, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0); + if (config_archhade) SendMessageW(hwnd, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0); } return TRUE; diff --git a/Src/Winamp/main_timer.cpp b/Src/Winamp/main_timer.cpp index 12824cdf5..f258a2d9f 100644 --- a/Src/Winamp/main_timer.cpp +++ b/Src/Winamp/main_timer.cpp @@ -114,7 +114,7 @@ LRESULT Main_OnTimer(HWND hwnd, UINT id) draw_playicon(8); } } - if (id == UPDATE_DISPLAY_TIMER + 1 && !config_minimized && !config_windowshade && config_mw_open) + if (id == UPDATE_DISPLAY_TIMER + 1 && !config_minimized && !config_archhade && config_mw_open) if (config_autoscrollname&1) { ui_doscrolling(); diff --git a/Src/Winamp/manifest.xml b/Src/Winamp/manifest.xml index e22433cb2..8d94b73ec 100644 --- a/Src/Winamp/manifest.xml +++ b/Src/Winamp/manifest.xml @@ -47,8 +47,8 @@ - + true - + \ No newline at end of file diff --git a/Src/Winamp/manifest64.xml b/Src/Winamp/manifest64.xml index a005cc6bf..fc66ea069 100644 --- a/Src/Winamp/manifest64.xml +++ b/Src/Winamp/manifest64.xml @@ -46,8 +46,8 @@ - + true - + diff --git a/Src/Winamp/menuv5.cpp b/Src/Winamp/menuv5.cpp index 350548d4d..4302be0e6 100644 --- a/Src/Winamp/menuv5.cpp +++ b/Src/Winamp/menuv5.cpp @@ -307,13 +307,13 @@ int V5_Options_Menu(HWND hwnd, int x, int y, int width, int height) int V5_Windows_Menu(HWND hwnd, int x, int y, int width, int height) { - HMENU windows_menu = GetSubMenu(v5_top_menu, 3); + HMENU arch_menu = GetSubMenu(v5_top_menu, 3); int flag = TPM_LEFTALIGN; - CheckMenuItem(windows_menu, WINAMP_OPTIONS_PLEDIT, config_pe_open ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(windows_menu, WINAMP_VISPLUGIN, vis_running() ? MF_CHECKED : MF_UNCHECKED); - if (g_has_video_plugin) CheckMenuItem(windows_menu, WINAMP_OPTIONS_VIDEO, config_video_open ? MF_CHECKED : MF_UNCHECKED); - ensureInScreen(windows_menu, &x, &y, &flag, width, height); - DoTrackPopup(windows_menu, flag, x, y, hwnd); + CheckMenuItem(arch_menu, WINAMP_OPTIONS_PLEDIT, config_pe_open ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(arch_menu, WINAMP_VISPLUGIN, vis_running() ? MF_CHECKED : MF_UNCHECKED); + if (g_has_video_plugin) CheckMenuItem(arch_menu, WINAMP_OPTIONS_VIDEO, config_video_open ? MF_CHECKED : MF_UNCHECKED); + ensureInScreen(arch_menu, &x, &y, &flag, width, height); + DoTrackPopup(arch_menu, flag, x, y, hwnd); return 1; } diff --git a/Src/Winamp/metrics.cpp b/Src/Winamp/metrics.cpp index a2d3a6042..10d65b552 100644 --- a/Src/Winamp/metrics.cpp +++ b/Src/Winamp/metrics.cpp @@ -7,7 +7,7 @@ **/ #include "Main.h" -#include +#include #include "../nu/AutoUrl.h" #include diff --git a/Src/Winamp/ole.cpp b/Src/Winamp/ole.cpp index b8039668a..a0d6ec780 100644 --- a/Src/Winamp/ole.cpp +++ b/Src/Winamp/ole.cpp @@ -119,7 +119,7 @@ public: { is_pe = 1; if (pledit_poopie) pl_forceappend = 1; // if we got here because we're hosting the pledit, but not actually - // parenting it (meaning we are windowshaded playlist) + // parenting it (meaning we are archhaded playlist) } else { diff --git a/Src/Winamp/options_playlist.cpp b/Src/Winamp/options_playlist.cpp index 1e03a5db7..cae51c0cc 100644 --- a/Src/Winamp/options_playlist.cpp +++ b/Src/Winamp/options_playlist.cpp @@ -6,7 +6,7 @@ ** Created: **/ -#include +#include #include "Main.h" #include "resource.h" diff --git a/Src/Winamp/paths.cpp b/Src/Winamp/paths.cpp index 1bb9101a8..ac41a80ee 100644 --- a/Src/Winamp/paths.cpp +++ b/Src/Winamp/paths.cpp @@ -6,7 +6,7 @@ ** Created: **/ -#include +#include #include #include #include diff --git a/Src/Winamp/random.h b/Src/Winamp/random.h index a91565be9..dab19a158 100644 --- a/Src/Winamp/random.h +++ b/Src/Winamp/random.h @@ -2,7 +2,7 @@ #define NULLSOFT_WINAMP_RANDOM_H #include "api_random.h" -#include // for DWORD +#include // for DWORD class Random : public api_random diff --git a/Src/Winamp/registry.cpp b/Src/Winamp/registry.cpp index e3fe474b5..8f1258de8 100644 --- a/Src/Winamp/registry.cpp +++ b/Src/Winamp/registry.cpp @@ -124,7 +124,7 @@ BOOL config_setup_filetypes(int mode) if (GetRegistrar(®istrar, !mode) == 0 && registrar) { wchar_t str[MAX_PATH+32] = {0}, langbuf[1024] = {0}; - // droptarget stuff for windows XP + // droptarget stuff for arch XP // clsid for open registrar->RegisterGUID(programname, L"{46986115-84D6-459c-8F95-52DD653E532E}"); // clsid for enqueue diff --git a/Src/Winamp/resource/TIPS.TXT b/Src/Winamp/resource/TIPS.TXT index 8af9f5ac1..426770765 100644 --- a/Src/Winamp/resource/TIPS.TXT +++ b/Src/Winamp/resource/TIPS.TXT @@ -1,7 +1,7 @@ Note that these keyboard shortcuts are a good starting point, but this list is far from complete. :) -******* Keyboard Shortcuts (these can be used in most Winamp windows) ******* +******* Keyboard Shortcuts (these can be used in most Winamp arch) ******* Key Action ----------------------------------------------------------------------------- @@ -18,7 +18,7 @@ Alt+E Toggle Playlist Editor Alt+G Toggle Graphical Equalizer Alt+V Toggle Video Window Alt+L Toggle Media Library -Ctrl+Tab Cycle through different Winamp windows +Ctrl+Tab Cycle through different Winamp arch Alt+S Go to Skin selection Ctrl+P Go to Preferences Alt+F Open Main Menu diff --git a/Src/Winamp/setup/httpgrab.h b/Src/Winamp/setup/httpgrab.h index 94845df8b..03b7198e1 100644 --- a/Src/Winamp/setup/httpgrab.h +++ b/Src/Winamp/setup/httpgrab.h @@ -1,7 +1,7 @@ #ifndef WINAMP_HTTP_GRAB_TEXT_HEADER #define WINAMP_HTTP_GRAB_TEXT_HEADER -#include +#include #define HTTPGRAB_USEWINDOWTEXT 0x0000 #define HTTPGRAB_USESTATUSTEXT 0x0001 diff --git a/Src/Winamp/setup/ifc_setupjob.h b/Src/Winamp/setup/ifc_setupjob.h index ae2398104..ef12a1890 100644 --- a/Src/Winamp/setup/ifc_setupjob.h +++ b/Src/Winamp/setup/ifc_setupjob.h @@ -2,7 +2,7 @@ #define WINAMP_IFC_SETUP_JOB_HEADER #include -#include +#include class NOVTABLE ifc_setupjob : public Dispatchable { diff --git a/Src/Winamp/setup/ifc_setuppage.h b/Src/Winamp/setup/ifc_setuppage.h index 3ea57de81..159c82b29 100644 --- a/Src/Winamp/setup/ifc_setuppage.h +++ b/Src/Winamp/setup/ifc_setuppage.h @@ -2,7 +2,7 @@ #define WINAMP_IFC_SETUP_PAGE_HEADER #include -#include +#include class NOVTABLE ifc_setuppage : public Dispatchable { diff --git a/Src/Winamp/setup/langutil.h b/Src/Winamp/setup/langutil.h index dc4168de7..3a3619601 100644 --- a/Src/Winamp/setup/langutil.h +++ b/Src/Winamp/setup/langutil.h @@ -1,7 +1,7 @@ #ifndef WINAMP_SETUP_LANGUTIL_HEADER #define WINAMP_SETUP_LANGUTIL_HEADER -#include +#include #include "./loadimage.h" INT_PTR WADialogBoxParam(LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam); diff --git a/Src/Winamp/setup/loadimage.h b/Src/Winamp/setup/loadimage.h index eb8737532..8c7d66084 100644 --- a/Src/Winamp/setup/loadimage.h +++ b/Src/Winamp/setup/loadimage.h @@ -1,7 +1,7 @@ #ifndef WINAMP_LOADIMAGE_HEADER #define WINAMP_LOADIMAGE_HEADER -#include +#include HBITMAP WALoadImage(HMODULE hMod, LPCWSTR pszSection, LPCWSTR pszImage, BOOL bPremult); HBITMAP WAResizeImage(HBITMAP hbmp, INT cx, INT cy, HBRUSH hbBk); diff --git a/Src/Winamp/setup/postsetup.h b/Src/Winamp/setup/postsetup.h index 001ed6ae8..71a96c6fc 100644 --- a/Src/Winamp/setup/postsetup.h +++ b/Src/Winamp/setup/postsetup.h @@ -1,7 +1,7 @@ #ifndef WINAMP_POSTSETUP_HEADER #define WINAMP_POSTSETUP_HEADER -#include +#include HWND CreateStatusWnd(HWND hwndParent, INT x, INT y, INT cx, INT cy); void SetStatusText(); diff --git a/Src/Winamp/setup/setup_api.h b/Src/Winamp/setup/setup_api.h index 8ed8c1b61..dbb98d327 100644 --- a/Src/Winamp/setup/setup_api.h +++ b/Src/Winamp/setup/setup_api.h @@ -1,7 +1,7 @@ #ifndef WINAMP_SETUP_API_HEADER #define WINAMP_SETUP_API_HEADER -#include +#include class __declspec(novtable) WASetupAPI diff --git a/Src/Winamp/setup/skininfo.h b/Src/Winamp/setup/skininfo.h index b96494dba..2e6c28d31 100644 --- a/Src/Winamp/setup/skininfo.h +++ b/Src/Winamp/setup/skininfo.h @@ -1,7 +1,7 @@ #ifndef WINAMP_SKININFO_HEADER #define WINAMP_SKININFO_HEADER -#include +#include #define SIF_COMMENT 0x01 #define SIF_PREVIEW 0x02 diff --git a/Src/Winamp/setup/svc_setup.h b/Src/Winamp/setup/svc_setup.h index d4cd8106f..a1bf3ff70 100644 --- a/Src/Winamp/setup/svc_setup.h +++ b/Src/Winamp/setup/svc_setup.h @@ -5,7 +5,7 @@ #include "./ifc_setuppage.h" #include "./ifc_setupjob.h" -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/Winamp/skinWindow.cpp b/Src/Winamp/skinWindow.cpp index 8a4ddc127..356d9575d 100644 --- a/Src/Winamp/skinWindow.cpp +++ b/Src/Winamp/skinWindow.cpp @@ -1,4 +1,4 @@ -#include +#include #include "main.h" #include "./api.h" diff --git a/Src/Winamp/strutil.cpp b/Src/Winamp/strutil.cpp index abd349ac0..b67bbc22d 100644 --- a/Src/Winamp/strutil.cpp +++ b/Src/Winamp/strutil.cpp @@ -6,7 +6,7 @@ ** Created: **/ -#include +#include #include #include "strutil.h" diff --git a/Src/Winamp/util.cpp b/Src/Winamp/util.cpp index 23427f560..371f3cf22 100644 --- a/Src/Winamp/util.cpp +++ b/Src/Winamp/util.cpp @@ -7,7 +7,7 @@ **/ #include "main.h" -#include +#include #include "strutil.h" #include "../nu/ns_wc.h" #include "plush/plush.h" diff --git a/Src/Winamp/vid_ddraw.cpp b/Src/Winamp/vid_ddraw.cpp index 42c81c583..7e2b44a0c 100644 --- a/Src/Winamp/vid_ddraw.cpp +++ b/Src/Winamp/vid_ddraw.cpp @@ -191,7 +191,7 @@ bool DDrawVideoOutput::Paint(HWND hwnd) ClientToScreen(hwnd, (LPPOINT)&r); ClientToScreen(hwnd, ((LPPOINT)&r) + 1); - // transform coords from windows desktop coords (where 0,0==upper-left corner of box encompassing all monitors) + // transform coords from arch desktop coords (where 0,0==upper-left corner of box encompassing all monitors) // to the coords for the monitor we're displaying on: r.left -= m_mon_x; r.right -= m_mon_x; diff --git a/Src/Winamp/vid_gdi+.h b/Src/Winamp/vid_gdi+.h index 449f87c3c..3d78fa598 100644 --- a/Src/Winamp/vid_gdi+.h +++ b/Src/Winamp/vid_gdi+.h @@ -1,7 +1,7 @@ #ifndef _VID_GDIPLUS_H_ #define _VID_GDIPLUS_H_ -#include +#include #include #include "VideoOutputChild.h" diff --git a/Src/Winamp/video.cpp b/Src/Winamp/video.cpp index bb061809d..e55d063b5 100644 --- a/Src/Winamp/video.cpp +++ b/Src/Winamp/video.cpp @@ -1,4 +1,4 @@ -#include +#include #include "main.h" #include @@ -47,7 +47,7 @@ int widthOnOpen, heightOnOpen; #define VideoClassicHeight() 58 static void VideoClose(); -/* Resizes the windows (parent and children) based on what the size of the video should be */ +/* Resizes the arch (parent and children) based on what the size of the video should be */ static void SetVideoSize(int width, int height) { if (m_videooutput && m_videooutput->is_fullscreen()) // fullscreen @@ -65,7 +65,7 @@ static void SetVideoSize(int width, int height) } } -/* Resizes the windows (parent and children) based on what the size of the parent should be */ +/* Resizes the arch (parent and children) based on what the size of the parent should be */ void SetExteriorSize(int width, int height) { // calculate interior size @@ -99,7 +99,7 @@ static void LayoutChildren(int width, int height) } } -/* Resizes the windows (parent and children) based on what the size of the parent should be +/* Resizes the arch (parent and children) based on what the size of the parent should be Sets the position of the parent window */ static void SetExteriorSizeAndPosition(int x, int y, int width, int height) { diff --git a/Src/Winamp/wa_ipc.h b/Src/Winamp/wa_ipc.h index 95939e8a4..aec245a3c 100644 --- a/Src/Winamp/wa_ipc.h +++ b/Src/Winamp/wa_ipc.h @@ -19,7 +19,7 @@ #ifndef _WA_IPC_H_ #define _WA_IPC_H_ -#include +#include #include #if (_MSC_VER <= 1200) typedef int intptr_t; @@ -524,9 +524,9 @@ typedef struct { #define IPC_ENABLEDISABLE_ALL_WINDOWS 259 // 0xdeadbeef to disable /* (requires Winamp 2.9+) ** SendMessageW(hwnd_winamp,WM_WA_IPC,(enable?0:0xdeadbeef),IPC_ENABLEDISABLE_ALL_WINDOWS); -** Sending this message with 0xdeadbeef as the param will disable all winamp windows and -** any other values will enable all of the Winamp windows again. When disabled you won't -** get any response on clicking or trying to do anything to the Winamp windows. If the +** Sending this message with 0xdeadbeef as the param will disable all winamp arch and +** any other values will enable all of the Winamp arch again. When disabled you won't +** get any response on clicking or trying to do anything to the Winamp arch. If the ** taskbar icon is shown then you may still have control ;) */ @@ -679,7 +679,7 @@ typedef struct { ** 0 : main popup menu (mapped to -1 in 5.x installs) ** 1 : main menubar file menu ** 2 : main menubar options menu -** 3 : main menubar windows menu +** 3 : main menubar arch menu ** 4 : main menubar help menu ** ** For 5.x client versions the following values are valid (changed due to Modern skin support): @@ -688,8 +688,8 @@ typedef struct { ** 1 : main menubar file menu ** 2 : main menubar play menu ** 3 : main menubar options menu -** 4 : main menubar windows menu -** 5 : main menubar windows help +** 4 : main menubar arch menu +** 5 : main menubar arch help ** 6 : playlist editor menubar file menu ** 7 : playlist editor menubar playlist menu ** 8 : playlist editor menubar sort menu @@ -699,8 +699,8 @@ typedef struct { ** In all client versions, unsupported values will return NULL. ** ** e.g. (psuedo code to add an item to the end of the main window 'view' menu) -** HMENU windows_menu = (HMENU)SendMessageW(hwnd_winamp,WM_WA_IPC,4,IPC_GET_HMENU); -** if(windows_menu) +** HMENU arch_menu = (HMENU)SendMessageW(hwnd_winamp,WM_WA_IPC,4,IPC_GET_HMENU); +** if(arch_menu) ** { ** // WA_MENUITEM_ID is obtained from IPC_REGISTER_WINAMP_IPCMESSAGE or a predefined ** // value if that api is not supported on the client version you are working with. @@ -709,7 +709,7 @@ typedef struct { ** MENUITEMINFO i = {sizeof(i), MIIM_ID | MIIM_STATE | MIIM_TYPE, MFT_STRING, ** window_visible ? MFS_CHECKED : 0, WA_MENUITEM_ID}; ** i.dwTypeData = "My Menu Item"; -** InsertMenuItem(windows_menu, GetMenuItemCount(windows_menu), TRUE, &i); +** InsertMenuItem(arch_menu, GetMenuItemCount(arch_menu), TRUE, &i); ** } */ @@ -1446,7 +1446,7 @@ typedef struct embedEnumStruct ** ** Not sending this (ideally at the end of the window being moved) will likely cause issues ** with the placement and docking of the legacy window when Winamp's naitve and any embedded -** windows are then moved. +** arch are then moved. */ @@ -1460,7 +1460,7 @@ typedef struct embedEnumStruct ** ** or ** -** SnapWindowToAllWindows is used to allow the window to natively dock to other Winamp windows +** SnapWindowToAllWindows is used to allow the window to natively dock to other Winamp arch ** RECT r; ** HWND myWnd = 0; ** void (*SnapWindowToAllWindows)(LPRECT outrc, HWND hwndNoSnap)=0; @@ -1971,8 +1971,8 @@ class ITrackSelector #define IPC_ADJUST_FFWINDOWSMENUPOS 606 /* (requires Winamp 2.9+) ** int newpos=SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFWINDOWSMENUPOS); -** This will move where Winamp expects the freeform windows in the menubar windows main -** menu. This is useful if you wish to insert a menu item above extra freeform windows. +** This will move where Winamp expects the freeform arch in the menubar arch main +** menu. This is useful if you wish to insert a menu item above extra freeform arch. */ @@ -1987,7 +1987,7 @@ class ITrackSelector #define IPC_ADJUST_FFOPTIONSMENUPOS 609 /* (requires Winamp 2.9+) ** int newpos=SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFOPTIONSMENUPOS); -** moves where winamp expects the freeform preferences item in the menubar windows main +** moves where winamp expects the freeform preferences item in the menubar arch main ** menu. This is useful if you wish to insert a menu item above the preferences item. ** If you pass adjust_offset as zero then it will return the current offset without adjusting it. ** @@ -2198,7 +2198,7 @@ typedef struct { /* (requires Winamp 5.0+) ** SendMessageW(hwnd_winamp,WM_WA_IPC,enabled,IPC_SETDRAWBORDERS); ** Set enabled to 1 to enable and 0 to disable drawing of the playlist editor and winamp -** gen class windows (used by gen_ff to allow it to draw its own window borders). +** gen class arch (used by gen_ff to allow it to draw its own window borders). */ @@ -2545,7 +2545,7 @@ typedef struct { ** int ismainwnd = (HWND)SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)(HWND)test_wnd,IPC_FF_ISMAINWND); ** ** This allows you to determine if the window handle passed to it is a modern skin main -** window or not. If it is a main window or any of its windowshade variants then it will +** window or not. If it is a main window or any of its archhade variants then it will ** return 1. ** ** Because of the way modern skins are implemented, it is possible for this message to @@ -2554,7 +2554,7 @@ typedef struct { ** window and also a winshaded version. ** ** The following code example below is one way of seeing how this api works since it will -** enumerate all windows related to Winamp at the time and allows you to process as +** enumerate all arch related to Winamp at the time and allows you to process as ** required when a detection happens. ** ** @@ -2564,7 +2564,7 @@ typedef struct { ** ** if(SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)hwnd,IPC_FF_ISMAINWND)){ ** // do processing in here -** // or continue the enum for other main windows (if they exist) +** // or continue the enum for other main arch (if they exist) ** // and just comment out the line below ** return 0; ** } @@ -2578,7 +2578,7 @@ typedef struct { ** HWND wa2embed = (HWND)SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)(HWND)test_wnd,IPC_FF_GETCONTENTWND); ** ** This will return the Winamp 2 window that is embedded in the window's container -** i.e. if hwnd is the playlist editor windowshade hwnd then it will return the Winamp 2 +** i.e. if hwnd is the playlist editor archhade hwnd then it will return the Winamp 2 ** playlist editor hwnd. ** ** If no content is found such as the window has nothing embedded then this will return diff --git a/Src/Winamp/whatsnew.txt b/Src/Winamp/whatsnew.txt index 4b97de3cb..422f961d3 100644 --- a/Src/Winamp/whatsnew.txt +++ b/Src/Winamp/whatsnew.txt @@ -188,7 +188,7 @@ Winamp 5.12 * Fixed: [in_mp4] unicode metadata writing * Fixed: [in_wm/in_dshow] mms:// streaming video playback * Fixed: [in_cdda] audio cd bitrate display -* Fixed: [in_cdda] Sonic engine on 64bit windows (thanks STanger) +* Fixed: [in_cdda] Sonic engine on 64bit arch (thanks STanger) * Fixed: lots of small bugs ... * Updated: Sonic CD Engine 2.2.50 * Updated: libmp4v2 1.4.1 @@ -352,7 +352,7 @@ Winamp 5.04: * added screenshots of classic/modern mode in installer * fixed MP3 bitrate calculation (in_mp3 was reporting incorrect lengths on some MP3s) * fixed incorrect length reporting on long WMA files -* better fix for pledit/video windows showing up at startup when minimized +* better fix for pledit/video arch showing up at startup when minimized * fixed db text bug when moving EQ sliders * upgraded MP3 encoding to LAME v3.96 * fixed crash in WMA playback when using WMA v8 codecs @@ -384,7 +384,7 @@ Winamp 5.04: * added escaping of ", ', [ and ] in ml queries : uses %HH where HH is the hex char code (uses %% for '%') * added sdk support for multiple audio/video tracks in video input plugins (see wa_ipc.h for ITrackSelector class) * added multiple audio avi support (right click video window, select "Audio Tracks") -* fixed multimonitor problem when toggling a windowshade on one monitor while playing a fullscreen video on the other +* fixed multimonitor problem when toggling a archhade on one monitor while playing a fullscreen video on the other * added ML_IPC_EDITQUERY and ML_IPC_EDITVIEW * fixed pledit drawing bug under winxp/cleartype * fixed crash in id3 reading of zero byte files @@ -398,12 +398,12 @@ Winamp 5.04: * made ui:preferences global hotkey open the prefs to the previously opened page * fixed a few preferences cosmetic 'bugs' * modern skin updates : - - fixed windowshade repeat-track button state + - fixed archhade repeat-track button state - fixed scaling docked toolbars - fixed 5.03 assert on deletion of newGroupAsLayout() - - fixed floating video windows coordinates dropping to 0,0 + - fixed floating video arch coordinates dropping to 0,0 - fixed auto opaque when layouts are loaded already docked as toolbars - - fixed fadein/fadeout not used on notification window when linking all normal windows' + - fixed fadein/fadeout not used on notification window when linking all normal arch' alpha - fixed docked toolbars moving when some other window docked to them switches to an alternative layout @@ -423,7 +423,7 @@ Winamp 5.04: resets to 4:3 proportions - fixed docking bug when using snapadjustleft - fixed buggy calculation of time display default width conflicting with right text alignment - - fixed windows moving after changing screen resolution + - fixed arch moving after changing screen resolution - fixed rare always on top desync with classic skins Winamp 5.03: @@ -448,7 +448,7 @@ Winamp 5.03: * updated VP6 video decoder to latest VP6.2 code * fixed crash when launching winamp with very long filenames from explorer * made registration dialog to appear in Explorer's taskbar when installing pro version -* fixed pledit/video windows showing up at startup when minimized +* fixed pledit/video arch showing up at startup when minimized * modern skins updates : - winamp modern skin now uses a 3 state repeat button: no repeat/repeat all/repeat track - added appplication desktop toolbars capabilities for layouts, add @@ -458,7 +458,7 @@ Winamp 5.03: of course we continue to support 0.8 to 1.1) - (very) limited maki debugger (for now you can bring it up with invokeDebugger(); in a script then use 'x' to continue and 'i' to trace into) - - fixed obscure capture problem with dragging windows + - fixed obscure capture problem with dragging arch - fixed rectrgn being forced to 1 in xml xuiobject buttons that are originally imageless - fixed hilited state not on after clicking on buttons while the mouse stays in area - fixed scripted onEnterArea/onLeaveArea not being always correctly called while mouse @@ -569,7 +569,7 @@ Winamp 5.0rc11: Winamp 5.0rc10: * modern skin updates - - fixed coming back from windowshade closes video drawer + - fixed coming back from archhade closes video drawer - fixed user settings path assert - added 6 color themes (coagulated, peachy, bricks set, rosemary, blueberry and cream, qwayke) * added media library plugins configuration, support for type column @@ -660,15 +660,15 @@ Winamp 5.0rc0 11/16/03 - fixed lack of shift/ctrl + next/play/stop/prev - fixed system.floattostring ignoring its ndigits param - fixed potential crash in text widgets that change display param dynamically - - fixed locked windows going offscreen (like nonstep avs) made then ignore offscreen since they are locked to a layout that checks its own position + - fixed locked arch going offscreen (like nonstep avs) made then ignore offscreen since they are locked to a layout that checks its own position - added nooffscreencheck="1" for layouts in case offscreen check needs to be disabled for a window - fixed assert in region - fixed crash color extraction from undefined container - fixed crash when not specifying a band parameter to an eqband object - fixed buttons onleavearea detection with nonstandard scales - - fixed notifier not showing minimized when "show in windowshade and when minimized" is on + - fixed notifier not showing minimized when "show in archhade and when minimized" is on - fixed freeform dropdownlists not closing - - fixed crash when a window is destroyed while moving all windows docked + - fixed crash when a window is destroyed while moving all arch docked - fixed system.playfile (base dir changed, has to be relative to skin in wa5, so filename is tweaked if it starts with "skin\nameofskin") @@ -710,7 +710,7 @@ Winamp 5.0beta4: - fixed custom opacity using window's opacity as a starting point (and reseting to it on cancel) when opacity is linked - fixed invisible window when loading desktopalpha skin with global transparency on - made jpgloading external - - fixed ctrl+f4 on main window or on pure wasabi windows (with no pl/ml/video, etc, ie: colorthemes) bringing up wa2 window + - fixed ctrl+f4 on main window or on pure wasabi arch (with no pl/ml/video, etc, ie: colorthemes) bringing up wa2 window - fixed notifier "disable in fullscreen" - fixed 0db/-12db not always working - fixed eq showing last modern skin eq settings after going back to classic and changing them @@ -720,7 +720,7 @@ Winamp 5.0beta4: - fixed equalizer menu entry being checked after closing config drawer without animation - fixed blank notifier when linked autoopacity on - fixed switching desktopalpha on a window that previously had forced transparency flag - - fixed clicking eq button on windowshade not repainting drawer when transparency on and eq wasn't the previously selected tab in config drawer and drawer animation is off (phew!) + - fixed clicking eq button on archhade not repainting drawer when transparency on and eq wasn't the previously selected tab in config drawer and drawer animation is off (phew!) * updated a lot of little menu shit * made better handling of no media in library * renamed a lot of directories to folders, library to media library. @@ -791,9 +791,9 @@ Winamp 5.0beta4 11/10/03: Winamp 5.0beta3 11/07/03: * modern skin updates : - new skin drop - - fixed winamp3 skins windowshade not being used : - - prevented use of autoclose="1" in < 1.0 skins (wasn't doing anything in 0.8 but breaks windowshades if used in 1.0) - - added autoavailable="0" to drawer's wndholder params (should _not_ be used in floating component windows unless you know what you are doing) + - fixed winamp3 skins archhade not being used : + - prevented use of autoclose="1" in < 1.0 skins (wasn't doing anything in 0.8 but breaks archhades if used in 1.0) + - added autoavailable="0" to drawer's wndholder params (should _not_ be used in floating component arch unless you know what you are doing) - fixed maddoubleclicks on switch to vis/video spawning undocked wnd - fixed vertical componentbucket sizes stuff, added functions to use as custom bucket - fixed freetype wrapped text draw @@ -829,7 +829,7 @@ Winamp 5.0beta3 11/07/03: - fixed double click in songtitle not cancelling text grab - added fullscreen flag for vis to send to winamp so that script can query if something (video or vis) is fullscreen, modified avs & milkdrop accordingly - linked auto100% opacity when layouts opacity is linked - - added link all windows opacity (and auto100%) & scale, added custom opacity dialog + - added link all arch opacity (and auto100%) & scale, added custom opacity dialog - made auto100% hold time configurable - made another mode where scale lock is just ignored, and everything is locked - fixed notifier being in the menu (added nomenu param to containers) @@ -886,7 +886,7 @@ Winamp 5.0beta2 10/23/03: - added popup menu on song title text - fixed how menus would overlap menubar buttons when skin was at the bottom of the screen - added "animate config drawer" in skin option menus - - fixed saving/restoring of classic main window and eq status, and classic pledit windowshade and size + - fixed saving/restoring of classic main window and eq status, and classic pledit archhade and size - fixed showing classic skins at startup when loading modern skin - even newer skin drop - added "temporary" to scale menu so that this locked scale thing is a bit more obvious @@ -900,7 +900,7 @@ Winamp 5.0beta2 10/23/03: - added checkbox for using operating system font rendering - gave a few fontsizes to bitmapfont text objects so overrides aren't all the same size - fixed crashbugs when not finding ttf fonts - - fixed empty playlist when starting with previously windowshaded playlist in classic mode but no xnf data + - fixed empty playlist when starting with previously archhaded playlist in classic mode but no xnf data - fixed crash when trying to update stuff while switching skin - fixed crossfader time going back to 0 - added right to left ttf rendering @@ -908,7 +908,7 @@ Winamp 5.0beta2 10/23/03: - updated to freetype 2.1.5, fixes crash, #ifdefed out some unused stuff from it - fixed ctrl+w + alt+g guru - fixed alt+tab while resizing player - - fixed player leaving a resize trail when aborting resize above autorefresh-on-alt+tab windows + - fixed player leaving a resize trail when aborting resize above autorefresh-on-alt+tab arch - removed small kerning hack due to freetype 2.1.5 having much better native kerning - fixed equalizer xnf entry getting duplicated over and over - fixed small leak in font loader @@ -917,7 +917,7 @@ Winamp 5.0beta2 10/23/03: - added ability to not override bitmap font with ttf or use altfont on 7-bits character strings - fixed disabled widgets states - fixed typo in about box :) - - added ctrl+tab / ctrl+shift+tab to cycle thru windows + - added ctrl+tab / ctrl+shift+tab to cycle thru arch * made playlist showing deferred so startups looked cleaner with modern skins * fixed crash on skindir change in prefs * added "adding to burner" status window when using sendto/drag&drop to burner, for reassuring @@ -947,7 +947,7 @@ Winamp 5.0beta2 10/23/03: * made modern skin extracted by default, for speed * improved config dialogs for aac/mp3 * made info viewer activated by button instead of slider -* made internet radio/tv page handle resize better (search doesnt get screwed on small windows) +* made internet radio/tv page handle resize better (search doesnt get screwed on small arch) * cleaned up some labeling places * cleaned up ripping and burning UIs more * fixed library prefs radio buttons @@ -985,7 +985,7 @@ Winamp 5.0beta 10/13/03 - removed move="1" for song title display on main window normal and shade modes - fixed click on beatvis that would sometime fail to toggle active status - added gammagroup xml param to vis objects - - made switching to windowshade open undocked video & vis when video is playing or vis is visible, docks back when coming back to normal mode + - made switching to archhade open undocked video & vis when video is playing or vis is visible, docks back when coming back to normal mode * made library able to update info on files that dont support tag writing when tag writing is checked * fixed burning bug when using certain .WAV output settings * enabled burning on multiple devices simultaneously @@ -1009,7 +1009,7 @@ Winamp 5.a10 10/10/03: - fixed right key in menubar when menu item selected is a submenu, fixed left when in a submenu, fixed right after hovering on an submenu item, phew! - fixed left/right keys seeking while in a menubar - fixed guru due to custom checkbox accessing nonexisting layouts because they are now dynamic, made them use configattributes - - made vis & video open undocked when in windowshade mode + - made vis & video open undocked when in archhade mode Winamp 5.0a9 10/08/03: * modern skin updates : @@ -1024,11 +1024,11 @@ Winamp 5.0a9 10/08/03: - added "equalizer" to popups, automatically opens the drawer and switches to the tab - added modern skin submenu to main popup menu/options - added attrib page for adding items to View menu via script (also show up in main popup) - - fixed auto move of docked layouts when switching to windowshade when original layout has snapadjust values + - fixed auto move of docked layouts when switching to archhade when original layout has snapadjust values - added action PE_ListOfLists for winshade playlist editors - added about box guid for lightning bolt click ({8DDA9D48-B915-4320-A888-831A1D837516}) - added unlink="1" for layouts to remember their own position/size regardless of linkwidth/linkheight - - added windowshade for main & pledit, whoohoo Sven! + - added archhade for main & pledit, whoohoo Sven! - fixed checkmark for container entries in menu - added automatic discarding of unused bitmaps in memory, drops usage by 2 to 7mb (depending on skin) when not interacting with the ui - fixed huge leak in ttf rendering, that one was leaking 300k/s when the song title was scrolling ! uh oh... @@ -1038,7 +1038,7 @@ Winamp 5.0a9 10/08/03: - fixed small leak in gammamgr - reduced memory usage by ~3mb when using winamp modern skin. - fixed shutdown sequence - - fixed drawer locking up in closed position after detaching both windows via the menus + - fixed drawer locking up in closed position after detaching both arch via the menus - fixed vis or video poping up when clicking detach menu option while wnd is hidden - added option to bypass user defined drawer direction when window is going to get partially hidden after opening the drawer - added ability to set cfgattribute value "-" to make a separator in the custom skin option menus @@ -1409,7 +1409,7 @@ Winamp 2.7: * new directsound output plug-in (very charming) * many optimizations and bugfixes to AVS - this version is quite fast. * faster playlist loading, faster playlist editting on large lists - * windowshade visualization now has spectrum analyzer instead of (crappy) + * archhade visualization now has spectrum analyzer instead of (crappy) VU meter. * improved that old issue of what happens when you delete the playing file in the playlist. @@ -1450,7 +1450,7 @@ Winamp 2.63: files into WMA! Winamp 2.62: - * Generic dialog processing message loop so now TAB/etc... works in plugins dialog windows + * Generic dialog processing message loop so now TAB/etc... works in plugins dialog arch * Fix to Mjuice (memory leak that caused the full install to puke after many hours) * Winamp Visualization Studio updates. * Installer bitmap updates @@ -1660,7 +1660,7 @@ What's new in Winamp 2.03? * Improved shift selection in playlist editor * Better litestep support (litestep options in preferences/options, too) * Fixed a number of midi/cdda related bugs - * Added WM_GETMINMAXINFO handler, to improve maximize handling and windowshade + * Added WM_GETMINMAXINFO handler, to improve maximize handling and archhade * Fixed some stupid (but very annoying) window region related bugs. * Nitrane 1.22, for better sounding MP3 playback * New 'No Playlist Advance' option for DJs and people who like to jump @@ -1678,9 +1678,9 @@ What's new in Winamp 2.02? * Ported some code to C in in_mod, for the upcoming 2.02 AXP build :) What's new in Winamp 2.01? - * made playlist editor use windows font.. resizable and skinnable + * made playlist editor use arch font.. resizable and skinnable * fixed a silly little hide-mainwindow-while-minimized-bug - * added up/down arrow (and mousewheel scroll) to plwindowshade + * added up/down arrow (and mousewheel scroll) to plarchhade * fixed silly position bar moving bug * made EQ's 0-lock more accurate * made title-scroll option @@ -1771,7 +1771,7 @@ What's new in Winamp 1.91? * mod decoder: fixed priority setting bug * mod decoder: added better 8 bit support * mod decoder: new 'if title is empty' logic.. - * mod decoder: added support for windowshade vu + * mod decoder: added support for archhade vu * mod decoder: added .669 support * mod decoder: new output system (optimized) * mod decoder: added waveform dsp plugin support @@ -1861,7 +1861,7 @@ What's new in Winamp 1.69? What's new in Winamp 1.666? * The Clutterbar. * Windowshade button - * Seek-in-windowshade mode + * Seek-in-archhade mode * Added desktop icon adding to preferences * Added a nifty hq control on main interface. * New ID3 tags @@ -1877,7 +1877,7 @@ What's new in Winamp 1.666? * Changed format of seeking display status * Added nifty "add to playlist from explorer" (more or less) option to prefs/initial setup - * Better VU meter with peak detection in windowshade + * Better VU meter with peak detection in archhade * More stable threading * Improved command line handling (supports relative pathnames better) * Alternate volume setting mode (for some soundcards) @@ -1932,7 +1932,7 @@ What's new in Winamp 1.6 BETA? be pretty useful. * Right-click context menus in main interface * Improved ID3 tag editor w/ MPEG info display - * VU meter and eject button in windowshade mode + * VU meter and eject button in archhade mode * Increased visualization accuracy * Faster seeking * More reliable HTTP streaming diff --git a/Src/Winamp/winampv6.vcxproj b/Src/Winamp/winampv6.vcxproj index 0a97e049f..45cd5d85c 100644 --- a/Src/Winamp/winampv6.vcxproj +++ b/Src/Winamp/winampv6.vcxproj @@ -102,26 +102,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md @@ -146,7 +146,7 @@ comctl32.lib;winmm.lib;msacm32.lib;shlwapi.lib;Rpcrt4.lib;d3dx9d.lib;wininet.lib;fmtd.lib;%(AdditionalDependencies) - ..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories) + ..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories) $(OutDir)$(TargetName)$(TargetExt) msacm32.dll;nsutil.dll;comctl32.dll;comdlg32.dll;tataki.dll;%(DelayLoadDLLs) true @@ -230,7 +230,7 @@ xcopy /Y /D /S "..\..\Qt\DLL_5.12_$(PlatformShortName)\$(Configuration)\" "..\.. comctl32.lib;winmm.lib;msacm32.lib;shlwapi.lib;Rpcrt4.lib;d3dx9d.lib;wininet.lib;fmtd.lib;%(AdditionalDependencies) - ..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories) + ..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories) $(OutDir)$(TargetName)$(TargetExt) msacm32.dll;nsutil.dll;comctl32.dll;comdlg32.dll;tataki.dll;%(DelayLoadDLLs) true @@ -245,7 +245,7 @@ xcopy /Y /D /S "..\..\Qt\DLL_5.12_$(PlatformShortName)\$(Configuration)\" "..\.. xcopy /Y /D /S $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\ xcopy /Y /D /S $(IntDir)$(TargetName).pdb ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\ -xcopy /Y /D /S "..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg\bin\fmtd.dll" "..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\" +xcopy /Y /D /S "..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg\bin\fmtd.dll" "..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\" xcopy /Y /D /S ..\resources\languages\*.wlz ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Lang\ @@ -307,7 +307,7 @@ xcopy /Y /D /S "..\resources\data\dsp_sps\*.sps" "..\..\Build\Winamp_$(PlatformS comctl32.lib;winmm.lib;msacm32.lib;shlwapi.lib;Rpcrt4.lib;d3dx9.lib;wininet.lib;fmt.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) msacm32.dll;nsutil.dll;comctl32.dll;comdlg32.dll;tataki.dll;%(DelayLoadDLLs) - ..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories) + ..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories) false $(IntDir)$(TargetName).pdb Windows @@ -390,7 +390,7 @@ xcopy /Y /D /S "..\..\Qt\DLL_5.12_$(PlatformShortName)\$(Configuration)\" "..\.. comctl32.lib;winmm.lib;msacm32.lib;shlwapi.lib;Rpcrt4.lib;d3dx9.lib;wininet.lib;fmt.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) msacm32.dll;nsutil.dll;comctl32.dll;comdlg32.dll;tataki.dll;%(DelayLoadDLLs) - ..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories) + ..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories) false $(IntDir)$(TargetName).pdb Windows @@ -402,7 +402,7 @@ xcopy /Y /D /S "..\..\Qt\DLL_5.12_$(PlatformShortName)\$(Configuration)\" "..\.. xcopy /Y /D /S $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\ -xcopy /Y /D /S "..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel\bin\fmt.dll" "..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\" +xcopy /Y /D /S "..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel\bin\fmt.dll" "..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\" xcopy /Y /D /S ..\resources\languages\*.wlz ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Lang\ diff --git a/Src/aacdec-mft/aacdec-mft.vcxproj b/Src/aacdec-mft/aacdec-mft.vcxproj index d692e567b..2aee81ba8 100644 --- a/Src/aacdec-mft/aacdec-mft.vcxproj +++ b/Src/aacdec-mft/aacdec-mft.vcxproj @@ -94,16 +94,16 @@ Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/adpcm/adpcm.vcxproj b/Src/adpcm/adpcm.vcxproj index a318b2c5a..aba521936 100644 --- a/Src/adpcm/adpcm.vcxproj +++ b/Src/adpcm/adpcm.vcxproj @@ -90,17 +90,17 @@ Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/alac/alac.vcxproj b/Src/alac/alac.vcxproj index 3ec0656fb..b1fc9766c 100644 --- a/Src/alac/alac.vcxproj +++ b/Src/alac/alac.vcxproj @@ -98,26 +98,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/albumart/albumart.vcxproj b/Src/albumart/albumart.vcxproj index f5205e975..500ff17c9 100644 --- a/Src/albumart/albumart.vcxproj +++ b/Src/albumart/albumart.vcxproj @@ -90,16 +90,16 @@ Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/auth/Loginbox/loginPage.cpp b/Src/auth/Loginbox/loginPage.cpp index d5483aa1a..00cbc359a 100644 --- a/Src/auth/Loginbox/loginPage.cpp +++ b/Src/auth/Loginbox/loginPage.cpp @@ -8,11 +8,11 @@ #include "./common.h" #include "../api.h" -#include "../../nu/windowsTheme.h" +#include "../../nu/archTheme.h" #include #include -#include +#include #define IDC_TITLE 9999 #define IDC_HELPLINK 9998 diff --git a/Src/auth/Loginbox/loginTab.cpp b/Src/auth/Loginbox/loginTab.cpp index 76567cde9..4d62c73f3 100644 --- a/Src/auth/Loginbox/loginTab.cpp +++ b/Src/auth/Loginbox/loginTab.cpp @@ -6,7 +6,7 @@ #include "../api.h" #include "../resource.h" -#include "../../nu/windowsTheme.h" +#include "../../nu/archTheme.h" #include #include diff --git a/Src/auth/Loginbox/loginbox.cpp b/Src/auth/Loginbox/loginbox.cpp index 9161c7340..6bac5da62 100644 --- a/Src/auth/Loginbox/loginbox.cpp +++ b/Src/auth/Loginbox/loginbox.cpp @@ -32,12 +32,12 @@ #include "../api.h" #include "../api_auth.h" -#include "../../nu/windowsTheme.h" +#include "../../nu/archTheme.h" #include "../../winamp/commandLink.h" #include "../../ombrowser/ifc_omcacherecord.h" -#include +#include #include #include #include diff --git a/Src/auth/Loginbox/loginboxTosReminder.cpp b/Src/auth/Loginbox/loginboxTosReminder.cpp index 0d13f0d2e..b2c1c2360 100644 --- a/Src/auth/Loginbox/loginboxTosReminder.cpp +++ b/Src/auth/Loginbox/loginboxTosReminder.cpp @@ -4,7 +4,7 @@ #include "../api.h" -#include +#include typedef struct __TOSREMINDERCREATEPARAM { diff --git a/Src/auth/Loginbox/popupAgreement.cpp b/Src/auth/Loginbox/popupAgreement.cpp index 08682f9b2..65f9d36d1 100644 --- a/Src/auth/Loginbox/popupAgreement.cpp +++ b/Src/auth/Loginbox/popupAgreement.cpp @@ -8,7 +8,7 @@ #include "../../winamp/commandLink.h" -#include +#include #include #include diff --git a/Src/auth/Loginbox/popupMessage.cpp b/Src/auth/Loginbox/popupMessage.cpp index ca3311a1d..d01b967ae 100644 --- a/Src/auth/Loginbox/popupMessage.cpp +++ b/Src/auth/Loginbox/popupMessage.cpp @@ -5,7 +5,7 @@ #include "../resource.h" #include "../api.h" -#include +#include #include typedef struct __MESSAGECREATEPARAM diff --git a/Src/auth/Loginbox/popupPasscode.cpp b/Src/auth/Loginbox/popupPasscode.cpp index 583a817d3..c563e7309 100644 --- a/Src/auth/Loginbox/popupPasscode.cpp +++ b/Src/auth/Loginbox/popupPasscode.cpp @@ -8,7 +8,7 @@ #include "../api.h" #include "../api_auth.h" -#include +#include #include #include diff --git a/Src/auth/Loginbox/resultWebAuth.cpp b/Src/auth/Loginbox/resultWebAuth.cpp index 3ba4a961e..f0093601a 100644 --- a/Src/auth/Loginbox/resultWebAuth.cpp +++ b/Src/auth/Loginbox/resultWebAuth.cpp @@ -246,7 +246,7 @@ HRESULT LoginResultWebAuth::Finish() external = NULL; } - // try to destroy windows before browserMngr->Finish() (this will let them to lock less) + // try to destroy arch before browserMngr->Finish() (this will let them to lock less) if (NULL != hView) { diff --git a/Src/auth/auth.vcxproj b/Src/auth/auth.vcxproj index 354cdc602..0c258da12 100644 --- a/Src/auth/auth.vcxproj +++ b/Src/auth/auth.vcxproj @@ -239,7 +239,7 @@ - + @@ -305,7 +305,7 @@ - + diff --git a/Src/auth/auth.vcxproj.filters b/Src/auth/auth.vcxproj.filters index 2c6e05981..f497a52f8 100644 --- a/Src/auth/auth.vcxproj.filters +++ b/Src/auth/auth.vcxproj.filters @@ -187,7 +187,7 @@ Source Files - + Source Files @@ -399,7 +399,7 @@ Header Files - + Header Files diff --git a/Src/auth/ifc_authcallback.h b/Src/auth/ifc_authcallback.h index f6b44c2f8..ff2246286 100644 --- a/Src/auth/ifc_authcallback.h +++ b/Src/auth/ifc_authcallback.h @@ -1,7 +1,7 @@ #pragma once #include -#include //need this for Sleep() +#include //need this for Sleep() class ifc_authcallback : public Dispatchable { diff --git a/Src/bmp/bmp.vcxproj b/Src/bmp/bmp.vcxproj index 24b23dbfd..f28ed049b 100644 --- a/Src/bmp/bmp.vcxproj +++ b/Src/bmp/bmp.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/burnlib/main.h b/Src/burnlib/main.h index 2daa3d508..7dbd2bb3a 100644 --- a/Src/burnlib/main.h +++ b/Src/burnlib/main.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #ifdef BURNLIB_EXPORTS #define BURNLIB_API //__declspec(dllexport) diff --git a/Src/devices/devices.vcxproj b/Src/devices/devices.vcxproj index 33ce27f71..f52a1565b 100644 --- a/Src/devices/devices.vcxproj +++ b/Src/devices/devices.vcxproj @@ -90,17 +90,17 @@ Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/cpr/CMakeLists.txt b/Src/external_dependencies/cpr/CMakeLists.txt index 886275ddb..a4e00ad86 100644 --- a/Src/external_dependencies/cpr/CMakeLists.txt +++ b/Src/external_dependencies/cpr/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() endif() -# Avoid the dll boilerplate code for windows +# Avoid the dll boilerplate code for arch set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) if (PARENT_CXX_STANDARD) diff --git a/Src/external_dependencies/cpr/cmake/clang-tidy.cmake b/Src/external_dependencies/cpr/cmake/clang-tidy.cmake index 26defad2e..6980222fe 100644 --- a/Src/external_dependencies/cpr/cmake/clang-tidy.cmake +++ b/Src/external_dependencies/cpr/cmake/clang-tidy.cmake @@ -9,5 +9,5 @@ if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXECUTABLE};-warnings-as-errors=*") endif() else() - message(FATAL_ERROR "Clang-tidy is not supported when building for windows") + message(FATAL_ERROR "Clang-tidy is not supported when building for arch") endif() diff --git a/Src/external_dependencies/cpr/include/cpr/multipart.h b/Src/external_dependencies/cpr/include/cpr/multipart.h index 1c4c9dbfb..715f658ef 100644 --- a/Src/external_dependencies/cpr/include/cpr/multipart.h +++ b/Src/external_dependencies/cpr/include/cpr/multipart.h @@ -20,7 +20,7 @@ struct Part { Part(const std::string& p_name, const Buffer& buffer, const std::string& p_content_type = {}) : name{p_name}, value{buffer.filename.string()}, content_type{p_content_type}, data{buffer.data}, datalen{buffer.datalen}, is_file{false}, is_buffer{true} {} std::string name; - // We don't use fs::path here, as this leads to problems using windows + // We don't use fs::path here, as this leads to problems using arch std::string value; std::string content_type; Buffer::data_t data{nullptr}; diff --git a/Src/external_dependencies/cpr/include/cpr/ssl_options.h b/Src/external_dependencies/cpr/include/cpr/ssl_options.h index 7a1784ef3..e4af76e55 100644 --- a/Src/external_dependencies/cpr/include/cpr/ssl_options.h +++ b/Src/external_dependencies/cpr/include/cpr/ssl_options.h @@ -413,10 +413,10 @@ class NoRevoke { } // namespace ssl struct SslOptions { - // We don't use fs::path here, as this leads to problems using windows + // We don't use fs::path here, as this leads to problems using arch std::string cert_file; std::string cert_type; - // We don't use fs::path here, as this leads to problems using windows + // We don't use fs::path here, as this leads to problems using arch std::string key_file; #if SUPPORT_CURLOPT_SSLKEY_BLOB std::string key_blob; @@ -440,14 +440,14 @@ struct SslOptions { #if SUPPORT_MAX_TLS_VERSION int max_version = CURL_SSLVERSION_MAX_DEFAULT; #endif - // We don't use fs::path here, as this leads to problems using windows + // We don't use fs::path here, as this leads to problems using arch std::string ca_info; - // We don't use fs::path here, as this leads to problems using windows + // We don't use fs::path here, as this leads to problems using arch std::string ca_path; #if SUPPORT_CURLOPT_SSL_CTX_FUNCTION std::string ca_buffer; #endif - // We don't use fs::path here, as this leads to problems using windows + // We don't use fs::path here, as this leads to problems using arch std::string crl_file; std::string ciphers; #if SUPPORT_TLSv13_CIPHERS diff --git a/Src/external_dependencies/cpr/test/httpsServer.hpp b/Src/external_dependencies/cpr/test/httpsServer.hpp index cea4d3438..af766ab51 100644 --- a/Src/external_dependencies/cpr/test/httpsServer.hpp +++ b/Src/external_dependencies/cpr/test/httpsServer.hpp @@ -12,7 +12,7 @@ namespace cpr { class HttpsServer : public AbstractServer { private: - // We don't use fs::path here, as this leads to problems using windows + // We don't use fs::path here, as this leads to problems using arch const std::string baseDirPath; const std::string sslCertFileName; const std::string sslKeyFileName; diff --git a/Src/external_dependencies/cpr/test/session_tests.cpp b/Src/external_dependencies/cpr/test/session_tests.cpp index 81c861309..f5045d68f 100644 --- a/Src/external_dependencies/cpr/test/session_tests.cpp +++ b/Src/external_dependencies/cpr/test/session_tests.cpp @@ -1056,7 +1056,7 @@ TEST(LocalPortTests, SetOptionTest) { EXPECT_LE(port_from_response, local_port + local_port_range); } -// The tests using the port of the server as a source port for curl fail for windows. +// The tests using the port of the server as a source port for curl fail for arch. // The reason probably is that Windows allows two sockets to bind to the same port if the full hostname is different. // In these tests, mongoose binds to http://127.0.0.1:61936, while libcurl binds to a different hostname, but still port 61936. // This seems to be okay for Windows, however, these tests expect an error like on Linux and MacOS diff --git a/Src/external_dependencies/intel_ipp_6.1.1.035/em64t/include/ippac.h b/Src/external_dependencies/intel_ipp_6.1.1.035/em64t/include/ippac.h index 3338ed500..53ff49cc4 100644 --- a/Src/external_dependencies/intel_ipp_6.1.1.035/em64t/include/ippac.h +++ b/Src/external_dependencies/intel_ipp_6.1.1.035/em64t/include/ippac.h @@ -451,7 +451,7 @@ typedef struct { /* decoded from the above info */ int numWinGrp; /* window group number */ int pWinGrpLen[IPP_AAC_GROUP_NUM_MAX]; /* buffer for number of - windows in each group */ + arch in each group */ } IppAACIcsInfo; /* @@ -555,7 +555,7 @@ typedef struct{ */ typedef struct { - int windowSequence; /* the windows is short or long type */ + int windowSequence; /* the arch is short or long type */ int windowShape; /* what window is used for the right hand, part of this analysis window */ int maxSfb; /* number of scale factor band transmitted */ @@ -3668,7 +3668,7 @@ IPPAPI(IppStatus, ippsNoiselessDecoder_LC_AAC,(Ipp8u **ppBitStream, // pScalefactor Pointer to the scalefactor buffer. Buffer length // must be more than or equal to 120. // numWinGrp Group number. -// pWinGrpLen Pointer to the number of windows in each group. +// pWinGrpLen Pointer to the number of arch in each group. // Buffer length must be more than or equal to 8. // maxSfb Maximal scale factor bands number for the // current block. @@ -3739,7 +3739,7 @@ IPPAPI(IppStatus, ippsQuantInv_AAC_32s_I,(Ipp32s *pSrcDstSpectralCoef, // group.There is no space between the sequence // groups. // numWinGrp Group number. -// pWinGrpLen Pointer to the number of windows in each group. +// pWinGrpLen Pointer to the number of arch in each group. // Buffer length must be more than or equal to 8. // maxSfb Maximal scale factor bands number for the // current block. @@ -3814,7 +3814,7 @@ IPPAPI(IppStatus, ippsDecodeMsStereo_AAC_32s_I,(Ipp32s *pSrcDstL, // indicate the intensity stereo mode, that is, // direct, inverse, or none. // numWinGrp Group number. -// pWinGrpLen Pointer to the number of windows in each group. +// pWinGrpLen Pointer to the number of arch in each group. // Buffer length must be more than or equal to 8. // maxSfbMax Maximal scale factor bands number for // the current block. @@ -3857,7 +3857,7 @@ IPPAPI(IppStatus, ippsDecodeIsStereo_AAC_32s,(const Ipp32s *pSrcL, // factor band. Buffer length must be more than or // equal to 1024. // numWinGrp Group number. -// pWinGrpLen Pointer to the number of windows in each group. +// pWinGrpLen Pointer to the number of arch in each group. // Buffer length must be more than or equal to 8. // maxSfb Maximal scale factor bands number for // the current block. @@ -3948,7 +3948,7 @@ IPPAPI(IppStatus, ippsDeinterleaveSpectrum_AAC_32s,(const Ipp32s *pSrc, // filter 0 applied to window 0, and order1 is the // order of the noise shaping filter 1 applied to // window 0. After window 0 is processed, process -// window 1, then window 2 until all numWin windows +// window 1, then window 2 until all numWin arch // are processed. // pTnsDirection Pointer to the token that indicates whether the // filter is applied in the upward or downward @@ -4162,8 +4162,8 @@ IPPAPI(IppStatus, ippsDecodeExtensionHeader_AAC,(Ipp8u **ppBitStream, // numWinGrp Number of window groups. // pWinGrpLen Pointer to the length of every window group. // samplingFreqIndex Sampling frequency index. -// winLen Window length. 1024 for long windows, 128 for -// short windows. +// winLen Window length. 1024 for long arch, 128 for +// short arch. // pRandomSeed Random seed for PNS. // pSrcDstSpec Pointer to the output spectrum substituted by // perceptual noise. @@ -4197,10 +4197,10 @@ IPPAPI(IppStatus, ippsDecodePNS_AAC_32s,(Ipp32s *pSrcDstSpec, // pSfbCb Pointer to the scalefactor code book. // pScaleFactor Pointer to the scalefactor coefficients. // maxSfb Number of max scalefactor band. -// numWinGrp Number groups of windows. +// numWinGrp Number groups of arch. // pWinGrpLen Pointer to the group length. // samplingFreqIndex Sampling frequency index. -// winLen Length of windows. +// winLen Length of arch. // pRandomSeed Random seed. // channel Index of current channel: // 0: left; diff --git a/Src/external_dependencies/intel_ipp_6.1.1.035/ia32/include/ippac.h b/Src/external_dependencies/intel_ipp_6.1.1.035/ia32/include/ippac.h index 3338ed500..53ff49cc4 100644 --- a/Src/external_dependencies/intel_ipp_6.1.1.035/ia32/include/ippac.h +++ b/Src/external_dependencies/intel_ipp_6.1.1.035/ia32/include/ippac.h @@ -451,7 +451,7 @@ typedef struct { /* decoded from the above info */ int numWinGrp; /* window group number */ int pWinGrpLen[IPP_AAC_GROUP_NUM_MAX]; /* buffer for number of - windows in each group */ + arch in each group */ } IppAACIcsInfo; /* @@ -555,7 +555,7 @@ typedef struct{ */ typedef struct { - int windowSequence; /* the windows is short or long type */ + int windowSequence; /* the arch is short or long type */ int windowShape; /* what window is used for the right hand, part of this analysis window */ int maxSfb; /* number of scale factor band transmitted */ @@ -3668,7 +3668,7 @@ IPPAPI(IppStatus, ippsNoiselessDecoder_LC_AAC,(Ipp8u **ppBitStream, // pScalefactor Pointer to the scalefactor buffer. Buffer length // must be more than or equal to 120. // numWinGrp Group number. -// pWinGrpLen Pointer to the number of windows in each group. +// pWinGrpLen Pointer to the number of arch in each group. // Buffer length must be more than or equal to 8. // maxSfb Maximal scale factor bands number for the // current block. @@ -3739,7 +3739,7 @@ IPPAPI(IppStatus, ippsQuantInv_AAC_32s_I,(Ipp32s *pSrcDstSpectralCoef, // group.There is no space between the sequence // groups. // numWinGrp Group number. -// pWinGrpLen Pointer to the number of windows in each group. +// pWinGrpLen Pointer to the number of arch in each group. // Buffer length must be more than or equal to 8. // maxSfb Maximal scale factor bands number for the // current block. @@ -3814,7 +3814,7 @@ IPPAPI(IppStatus, ippsDecodeMsStereo_AAC_32s_I,(Ipp32s *pSrcDstL, // indicate the intensity stereo mode, that is, // direct, inverse, or none. // numWinGrp Group number. -// pWinGrpLen Pointer to the number of windows in each group. +// pWinGrpLen Pointer to the number of arch in each group. // Buffer length must be more than or equal to 8. // maxSfbMax Maximal scale factor bands number for // the current block. @@ -3857,7 +3857,7 @@ IPPAPI(IppStatus, ippsDecodeIsStereo_AAC_32s,(const Ipp32s *pSrcL, // factor band. Buffer length must be more than or // equal to 1024. // numWinGrp Group number. -// pWinGrpLen Pointer to the number of windows in each group. +// pWinGrpLen Pointer to the number of arch in each group. // Buffer length must be more than or equal to 8. // maxSfb Maximal scale factor bands number for // the current block. @@ -3948,7 +3948,7 @@ IPPAPI(IppStatus, ippsDeinterleaveSpectrum_AAC_32s,(const Ipp32s *pSrc, // filter 0 applied to window 0, and order1 is the // order of the noise shaping filter 1 applied to // window 0. After window 0 is processed, process -// window 1, then window 2 until all numWin windows +// window 1, then window 2 until all numWin arch // are processed. // pTnsDirection Pointer to the token that indicates whether the // filter is applied in the upward or downward @@ -4162,8 +4162,8 @@ IPPAPI(IppStatus, ippsDecodeExtensionHeader_AAC,(Ipp8u **ppBitStream, // numWinGrp Number of window groups. // pWinGrpLen Pointer to the length of every window group. // samplingFreqIndex Sampling frequency index. -// winLen Window length. 1024 for long windows, 128 for -// short windows. +// winLen Window length. 1024 for long arch, 128 for +// short arch. // pRandomSeed Random seed for PNS. // pSrcDstSpec Pointer to the output spectrum substituted by // perceptual noise. @@ -4197,10 +4197,10 @@ IPPAPI(IppStatus, ippsDecodePNS_AAC_32s,(Ipp32s *pSrcDstSpec, // pSfbCb Pointer to the scalefactor code book. // pScaleFactor Pointer to the scalefactor coefficients. // maxSfb Number of max scalefactor band. -// numWinGrp Number groups of windows. +// numWinGrp Number groups of arch. // pWinGrpLen Pointer to the group length. // samplingFreqIndex Sampling frequency index. -// winLen Length of windows. +// winLen Length of arch. // pRandomSeed Random seed. // channel Index of current channel: // 0: left; diff --git a/Src/external_dependencies/intel_ipp_6.1.1.035/ia32/lib/libiomp5mt.lib b/Src/external_dependencies/intel_ipp_6.1.1.035/ia32/lib/libiomp5mt.lib index 899108c7c..2d69665fa 100644 Binary files a/Src/external_dependencies/intel_ipp_6.1.1.035/ia32/lib/libiomp5mt.lib and b/Src/external_dependencies/intel_ipp_6.1.1.035/ia32/lib/libiomp5mt.lib differ diff --git a/Src/external_dependencies/libmp4v2/include/mpeg4ip_win32.h b/Src/external_dependencies/libmp4v2/include/mpeg4ip_win32.h index 5f14fb39d..8a19195bd 100644 --- a/Src/external_dependencies/libmp4v2/include/mpeg4ip_win32.h +++ b/Src/external_dependencies/libmp4v2/include/mpeg4ip_win32.h @@ -18,14 +18,14 @@ * Contributor(s): * Bill May wmay@cisco.com */ -/* windows defines */ +/* arch defines */ #ifndef __MPEG4IP_WIN32_H__ #define __MPEG4IP_WIN32_H__ #define HAVE_IN_PORT_T #define HAVE_SOCKLEN_T #define NEED_SDL_VIDEO_IN_MAIN_THREAD #define WIN32_LEAN_AND_MEAN -#include +#include #include #include #include diff --git a/Src/external_dependencies/libmp4v2/libmp4v2.vcxproj b/Src/external_dependencies/libmp4v2/libmp4v2.vcxproj index 269cc78e0..71ca0b09d 100644 --- a/Src/external_dependencies/libmp4v2/libmp4v2.vcxproj +++ b/Src/external_dependencies/libmp4v2/libmp4v2.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D2D1.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D2D1.h index e8768dfca..f1d95160b 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D2D1.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D2D1.h @@ -12,7 +12,7 @@ #define _D2D1_H_ #ifndef COM_NO_WINDOWS_H -#include +#include #endif // #ifndef COM_NO_WINDOWS_H #include #include diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D2DBaseTypes.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D2DBaseTypes.h index c2ff5bb3b..b54d6916b 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D2DBaseTypes.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D2DBaseTypes.h @@ -12,7 +12,7 @@ #define _D2DBASETYPES_INCLUDED #ifndef COM_NO_WINDOWS_H -#include +#include #endif // #ifndef COM_NO_WINDOWS_H #ifndef D3DCOLORVALUE_DEFINED diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D10.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D10.h index 248999fb5..3bf82c8df 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D10.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D10.h @@ -32,7 +32,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D10_1.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D10_1.h index 17a8ec5b2..341330047 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D10_1.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D10_1.h @@ -27,7 +27,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D11.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D11.h index 680cf8035..3966b6156 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D11.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D11.h @@ -32,7 +32,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D11SDKLayers.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D11SDKLayers.h index 5970f81b5..5171792c2 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D11SDKLayers.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3D11SDKLayers.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3Dcommon.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3Dcommon.h index 032b8b53e..a94c47dc8 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3Dcommon.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/D3Dcommon.h @@ -27,7 +27,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/DXGI.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/DXGI.h index 1bfb39e82..e2a8f7bfa 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/DXGI.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/DXGI.h @@ -27,7 +27,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/X3DAudio.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/X3DAudio.h index c25d98f40..1c8d9aebf 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/X3DAudio.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/X3DAudio.h @@ -53,7 +53,7 @@ #pragma once //---------------------------------------------------// -#include // general windows types +#include // general arch types #if defined(_XBOX) #include #endif diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPO.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPO.h index 17947d690..77a3b6446 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPO.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPO.h @@ -89,11 +89,11 @@ DEFINE_IID(IXAPOParameters, A90BC001, E897, E897, 55, E4, 9E, 47, 00, 00, 00, 01 #if !defined(GUID_DEFS_ONLY) // ignore rest if only GUID definitions requested - #if defined(_XBOX) // general windows and COM declarations + #if defined(_XBOX) // general arch and COM declarations #include #include #else - #include + #include #include #endif #include "audiodefs.h" // for WAVEFORMATEX etc. diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPOBase.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPOBase.h index 24c5c6f64..23a66c126 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPOBase.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPOBase.h @@ -123,7 +123,7 @@ protected: // // REMARKS: // However, this method is capable of channel upmix/downmix and uses - // the same matrix coefficient table used by windows Vista to do so. + // the same matrix coefficient table used by arch Vista to do so. // // For in-place processing (input buffer == output buffer) // this method does nothing. diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPOFX.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPOFX.h index a5dbeef4b..6373c4baf 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPOFX.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XAPOFX.h @@ -28,11 +28,11 @@ DEFINE_CLSID(FXEcho, A90BC001, E897, E897, 74, 39, 43, 55, 00, 00, 0 #if !defined(GUID_DEFS_ONLY) // ignore rest if only GUID definitions requested - #if defined(_XBOX) // general windows and COM declarations + #if defined(_XBOX) // general arch and COM declarations #include #include #else - #include + #include #include #endif #include // float bounds diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XDSP.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XDSP.h index 6ed0dc546..1c4862ebb 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XDSP.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/XDSP.h @@ -22,7 +22,7 @@ #pragma once //---------------------------------------------------// -#include // general windows types +#include // general arch types #include // trigonometric functions #if defined(_XBOX) // SIMD intrinsics #include diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/d3d10sdklayers.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/d3d10sdklayers.h index ef432ebfd..757d8080f 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/d3d10sdklayers.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/d3d10sdklayers.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/d3d9.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/d3d9.h index e5c7847e6..73f2163d6 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/d3d9.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/d3d9.h @@ -39,7 +39,7 @@ #define COM_NO_WINDOWS_H #include -#include +#include #if !defined(HMONITOR_DECLARED) && (WINVER < 0x0500) #define HMONITOR_DECLARED diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/dsetup.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/dsetup.h index ebada13fd..28d3dccbc 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/dsetup.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/dsetup.h @@ -9,7 +9,7 @@ #ifndef __DSETUP_H__ #define __DSETUP_H__ -#include // windows stuff +#include // arch stuff #ifdef __cplusplus extern "C" { diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/gameux.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/gameux.h index 19e2f956f..1c2653fe0 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/gameux.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/gameux.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/xact3.h b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/xact3.h index c27d56396..8e653c6f9 100644 --- a/Src/external_dependencies/microsoft_directx_sdk_2010/Include/xact3.h +++ b/Src/external_dependencies/microsoft_directx_sdk_2010/Include/xact3.h @@ -36,7 +36,7 @@ //------------------------------------------------------------------------------ #ifndef _XBOX - #include + #include #include #include #endif diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/DxErr.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/DxErr.lib index a4fb22699..852adbde6 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/DxErr.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/DxErr.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/dinput8.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/dinput8.lib index fcd91e148..9ef4173ad 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/dinput8.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/dinput8.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/dxguid.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/dxguid.lib index f3994f9c4..d88182e88 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/dxguid.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/dxguid.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/xapobase.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/xapobase.lib index 9a1bbcbf1..ad004339c 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/xapobase.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/xapobase.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/xapobased.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/xapobased.lib index 63fd4744e..fcff1963a 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/xapobased.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x64/xapobased.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/DxErr.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/DxErr.lib index 8c7651e8c..dad118b12 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/DxErr.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/DxErr.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/dinput8.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/dinput8.lib index c870a09c1..6c44eb06f 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/dinput8.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/dinput8.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/dxguid.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/dxguid.lib index 82835ab22..637d8d637 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/dxguid.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/dxguid.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/xapobase.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/xapobase.lib index 531c06b82..7951cf9ef 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/xapobase.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/xapobase.lib differ diff --git a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/xapobased.lib b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/xapobased.lib index 900734fe3..5db98be87 100644 Binary files a/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/xapobased.lib and b/Src/external_dependencies/microsoft_directx_sdk_2010/Lib/x86/xapobased.lib differ diff --git a/Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Autotools.yml b/Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Autotools.yml index f0b87e910..6b9cc1bd6 100644 --- a/Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Autotools.yml +++ b/Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Autotools.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: windows-latest + runs-on: arch-latest defaults: run: shell: msys2 {0} diff --git a/Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Makefile.yml b/Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Makefile.yml index ad142a4e2..92079ebbd 100644 --- a/Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Makefile.yml +++ b/Src/external_dependencies/openmpt-trunk/.github/workflows/MSYS2-Makefile.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: windows-latest + runs-on: arch-latest defaults: run: shell: msys2 {0} diff --git a/Src/external_dependencies/openmpt-trunk/Makefile b/Src/external_dependencies/openmpt-trunk/Makefile index ade92a694..39a09aedb 100644 --- a/Src/external_dependencies/openmpt-trunk/Makefile +++ b/Src/external_dependencies/openmpt-trunk/Makefile @@ -242,7 +242,7 @@ NUMTHREADS:=$(shell nproc) else ifeq ($(OS),Windows_NT) -HOST=windows +HOST=arch HOST_FLAVOUR= TOOLCHAIN_SUFFIX= diff --git a/Src/external_dependencies/openmpt-trunk/README.md b/Src/external_dependencies/openmpt-trunk/README.md index c360b99a4..5aee14188 100644 --- a/Src/external_dependencies/openmpt-trunk/README.md +++ b/Src/external_dependencies/openmpt-trunk/README.md @@ -64,7 +64,7 @@ How to compile installed with later Visual Studio versions. The Windows 8.1 SDK is available from - or + or directly from . diff --git a/Src/external_dependencies/openmpt-trunk/build/auto/cppcheck_openmpt.sh b/Src/external_dependencies/openmpt-trunk/build/auto/cppcheck_openmpt.sh index b61f17187..2e3bd1613 100644 --- a/Src/external_dependencies/openmpt-trunk/build/auto/cppcheck_openmpt.sh +++ b/Src/external_dependencies/openmpt-trunk/build/auto/cppcheck_openmpt.sh @@ -32,6 +32,6 @@ NPROC=$(nproc) echo "Platform: $CPPCHECK_PLATFORM" echo "Checking config ..." -cppcheck -j $NPROC -DCPPCHECK -DMPT_CPPCHECK_CUSTOM $CPPCHECK_PLATFORM --std=c99 --std=c++17 --library=windows.cfg --library=microsoft_atl.cfg --library=mfc.cfg --library=build/cppcheck/nlohmann-json.cfg --suppressions-list=build/cppcheck/nlohmann-json.suppressions.txt --suppressions-list=build/cppcheck/r8brain.suppressions.txt --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' --suppress=missingIncludeSystem --suppress=uninitMemberVar $CPPCHECK_OPTIONS $CPPCHECK_DEFINES $CPPCHECK_INCLUDES --check-config --suppress=unmatchedSuppression $CPPCHECK_FILES +cppcheck -j $NPROC -DCPPCHECK -DMPT_CPPCHECK_CUSTOM $CPPCHECK_PLATFORM --std=c99 --std=c++17 --library=arch.cfg --library=microsoft_atl.cfg --library=mfc.cfg --library=build/cppcheck/nlohmann-json.cfg --suppressions-list=build/cppcheck/nlohmann-json.suppressions.txt --suppressions-list=build/cppcheck/r8brain.suppressions.txt --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' --suppress=missingIncludeSystem --suppress=uninitMemberVar $CPPCHECK_OPTIONS $CPPCHECK_DEFINES $CPPCHECK_INCLUDES --check-config --suppress=unmatchedSuppression $CPPCHECK_FILES echo "Checking C++ ..." -cppcheck -j $NPROC -DCPPCHECK -DMPT_CPPCHECK_CUSTOM $CPPCHECK_PLATFORM --std=c99 --std=c++17 --library=windows.cfg --library=microsoft_atl.cfg --library=mfc.cfg --library=build/cppcheck/nlohmann-json.cfg --suppressions-list=build/cppcheck/nlohmann-json.suppressions.txt --suppressions-list=build/cppcheck/r8brain.suppressions.txt --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' --suppress=missingIncludeSystem --suppress=uninitMemberVar $CPPCHECK_OPTIONS $CPPCHECK_DEFINES $CPPCHECK_INCLUDES $CPPCHECK_FILES +cppcheck -j $NPROC -DCPPCHECK -DMPT_CPPCHECK_CUSTOM $CPPCHECK_PLATFORM --std=c99 --std=c++17 --library=arch.cfg --library=microsoft_atl.cfg --library=mfc.cfg --library=build/cppcheck/nlohmann-json.cfg --suppressions-list=build/cppcheck/nlohmann-json.suppressions.txt --suppressions-list=build/cppcheck/r8brain.suppressions.txt --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]' --suppress=missingIncludeSystem --suppress=uninitMemberVar $CPPCHECK_OPTIONS $CPPCHECK_DEFINES $CPPCHECK_INCLUDES $CPPCHECK_FILES diff --git a/Src/external_dependencies/openmpt-trunk/build/auto/package_libopenmpt_multi_args.cmd b/Src/external_dependencies/openmpt-trunk/build/auto/package_libopenmpt_multi_args.cmd index a0c039ab8..a30702fe4 100644 --- a/Src/external_dependencies/openmpt-trunk/build/auto/package_libopenmpt_multi_args.cmd +++ b/Src/external_dependencies/openmpt-trunk/build/auto/package_libopenmpt_multi_args.cmd @@ -26,13 +26,13 @@ set MPT_PKG_TAG=%MPT_DIST_VARIANT_OS% cd bin || goto error rmdir /s /q libopenmpt mkdir libopenmpt || goto error -mkdir libopenmpt\bin.windows -mkdir libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING% -rmdir /s /q libopenmpt-windows -del /f /q libopenmpt-windows.tar -del /f /q libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% -mkdir libopenmpt-windows -cd libopenmpt-windows || goto error +mkdir libopenmpt\bin.arch +mkdir libopenmpt\bin.arch\%LIBOPENMPT_VERSION_STRING% +rmdir /s /q libopenmpt-arch +del /f /q libopenmpt-arch.tar +del /f /q libopenmpt-%MPT_REVISION%.bin.arch.%MPT_PKG_FORMAT% +mkdir libopenmpt-arch +cd libopenmpt-arch || goto error mkdir openmpt123 mkdir openmpt123\x86 mkdir openmpt123\amd64 @@ -102,7 +102,7 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\xmp-openmpt.dll .\XMPlay- copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\XMPlay-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\in_openmpt.dll .\Winamp-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\Winamp-legacy\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.arch\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.arch.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ @@ -132,22 +132,22 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\Wina Winamp-legacy\openmpt-mpg123.dll ^ || goto error cd .. || goto error -rmdir /s /q libopenmpt-windows -..\build\tools\7zip\7z.exe a -r -ttar libopenmpt-windows.tar libopenmpt || goto error -del /f /q libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% +rmdir /s /q libopenmpt-arch +..\build\tools\7zip\7z.exe a -r -ttar libopenmpt-arch.tar libopenmpt || goto error +del /f /q libopenmpt\bin.arch\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.arch.%MPT_PKG_FORMAT% rmdir /s /q libopenmpt cd .. || goto error cd bin || goto error rmdir /s /q libopenmpt mkdir libopenmpt || goto error -mkdir libopenmpt\dev.windows.%MPT_VS_VER% -mkdir libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING% -rmdir /s /q libopenmpt-dev-windows-%MPT_VS_VER% -del /f /q libopenmpt-dev-windows-%MPT_VS_VER%.tar -del /f /q libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% -mkdir libopenmpt-dev-windows-%MPT_VS_VER% -cd libopenmpt-dev-windows-%MPT_VS_VER% || goto error +mkdir libopenmpt\dev.arch.%MPT_VS_VER% +mkdir libopenmpt\dev.arch.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING% +rmdir /s /q libopenmpt-dev-arch-%MPT_VS_VER% +del /f /q libopenmpt-dev-arch-%MPT_VS_VER%.tar +del /f /q libopenmpt-%MPT_REVISION%.dev.arch.%MPT_VS_VER%.%MPT_PKG_FORMAT% +mkdir libopenmpt-dev-arch-%MPT_VS_VER% +cd libopenmpt-dev-arch-%MPT_VS_VER% || goto error mkdir inc mkdir inc\libopenmpt mkdir lib @@ -243,7 +243,7 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-mpg123.dll bin\ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-ogg.dll bin\amd64-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-vorbis.dll bin\amd64-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-zlib.dll bin\amd64-legacy\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.arch.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.arch.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ @@ -294,9 +294,9 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-zlib.dll bin\am bin\amd64-legacy\openmpt-zlib.dll ^ || goto error cd .. || goto error -rmdir /s /q libopenmpt-dev-windows-%MPT_VS_VER% -..\build\tools\7zip\7z.exe a -r -ttar libopenmpt-dev-windows-%MPT_VS_VER%.tar libopenmpt || goto error -del /f /q libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% +rmdir /s /q libopenmpt-dev-arch-%MPT_VS_VER% +..\build\tools\7zip\7z.exe a -r -ttar libopenmpt-dev-arch-%MPT_VS_VER%.tar libopenmpt || goto error +del /f /q libopenmpt\dev.arch.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.arch.%MPT_VS_VER%.%MPT_PKG_FORMAT% rmdir /s /q libopenmpt cd .. || goto error diff --git a/Src/external_dependencies/openmpt-trunk/build/autotools/Makefile.am b/Src/external_dependencies/openmpt-trunk/build/autotools/Makefile.am index 9c92a2080..7265c6042 100644 --- a/Src/external_dependencies/openmpt-trunk/build/autotools/Makefile.am +++ b/Src/external_dependencies/openmpt-trunk/build/autotools/Makefile.am @@ -154,7 +154,7 @@ MPT_FILES_SRC_MPT += src/mpt/binary/base64url.hpp MPT_FILES_SRC_MPT += src/mpt/binary/hex.hpp MPT_FILES_SRC_MPT += src/mpt/check/libc.hpp MPT_FILES_SRC_MPT += src/mpt/check/mfc.hpp -MPT_FILES_SRC_MPT += src/mpt/check/windows.hpp +MPT_FILES_SRC_MPT += src/mpt/check/arch.hpp MPT_FILES_SRC_MPT += src/mpt/crc/crc.hpp #MPT_FILES_SRC_MPT += src/mpt/crypto/exception.hpp #MPT_FILES_SRC_MPT += src/mpt/crypto/hash.hpp @@ -206,7 +206,7 @@ MPT_FILES_SRC_MPT += src/mpt/io_write/buffer.hpp #MPT_FILES_SRC_MPT += src/mpt/library/library.hpp MPT_FILES_SRC_MPT += src/mpt/mutex/mutex.hpp MPT_FILES_SRC_MPT += src/mpt/osinfo/class.hpp -MPT_FILES_SRC_MPT += src/mpt/osinfo/windows_version.hpp +MPT_FILES_SRC_MPT += src/mpt/osinfo/arch_version.hpp MPT_FILES_SRC_MPT += src/mpt/out_of_memory/out_of_memory.hpp MPT_FILES_SRC_MPT += src/mpt/parse/parse.hpp #MPT_FILES_SRC_MPT += src/mpt/path/path.hpp diff --git a/Src/external_dependencies/openmpt-trunk/build/build_tools.cmd b/Src/external_dependencies/openmpt-trunk/build/build_tools.cmd index e1f87b0e5..500ed72b7 100644 --- a/Src/external_dependencies/openmpt-trunk/build/build_tools.cmd +++ b/Src/external_dependencies/openmpt-trunk/build/build_tools.cmd @@ -62,7 +62,7 @@ copy /y include\genie\OpenMPT.txt include\genie\OpenMPT-version.txt if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" ( call build\auto\setup_vs2019.cmd || goto error rem cd include\premake || goto error - rem nmake -f Bootstrap.mak windows MSDEV=vs2019 || goto error + rem nmake -f Bootstrap.mak arch MSDEV=vs2019 || goto error rem bin\release\premake5 embed --bytecode || goto error rem bin\release\premake5 --to=build/vs2019 vs2019 --no-curl --no-zlib --no-luasocket || goto error rem cd ..\.. || goto error @@ -75,7 +75,7 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxil if exist "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" ( call build\auto\setup_vs2019.cmd || goto error rem cd include\premake || goto error - rem nmake -f Bootstrap.mak windows MSDEV=vs2019 || goto error + rem nmake -f Bootstrap.mak arch MSDEV=vs2019 || goto error rem bin\release\premake5 embed --bytecode || goto error rem bin\release\premake5 --to=build/vs2019 vs2019 --no-curl --no-zlib --no-luasocket || goto error rem cd ..\.. || goto error @@ -88,7 +88,7 @@ if exist "C:\Program Files\Microsoft Visual Studio\2019\Community\VC\Auxiliary\B if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( call build\auto\setup_vs2017.cmd || goto error rem cd include\premake || goto error - rem nmake -f Bootstrap.mak windows MSDEV=vs2017 || goto error + rem nmake -f Bootstrap.mak arch MSDEV=vs2017 || goto error rem bin\release\premake5 embed --bytecode || goto error rem bin\release\premake5 --to=build/vs2017 vs2017 --no-curl --no-zlib --no-luasocket || goto error rem cd ..\.. || goto error @@ -101,7 +101,7 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxil if exist "C:\Program Files\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( call build\auto\setup_vs2017.cmd || goto error rem cd include\premake || goto error - rem nmake -f Bootstrap.mak windows MSDEV=vs2017 || goto error + rem nmake -f Bootstrap.mak arch MSDEV=vs2017 || goto error rem bin\release\premake5 embed --bytecode || goto error rem bin\release\premake5 --to=build/vs2017 vs2017 --no-curl --no-zlib --no-luasocket || goto error rem cd ..\.. || goto error diff --git a/Src/external_dependencies/openmpt-trunk/build/genie/genie-defaults.lua b/Src/external_dependencies/openmpt-trunk/build/genie/genie-defaults.lua index 887ef4050..184995f9e 100644 --- a/Src/external_dependencies/openmpt-trunk/build/genie/genie-defaults.lua +++ b/Src/external_dependencies/openmpt-trunk/build/genie/genie-defaults.lua @@ -102,8 +102,8 @@ defines { "_WIN32_WINNT=0x0603" } premake.vstudio.storeapp = "8.2" local action = premake.action.current() - action.vstudio.windowsTargetPlatformVersion = "10.0.10240.0" - action.vstudio.windowsTargetPlatformMinVersion = "10.0.10240.0" + action.vstudio.archTargetPlatformVersion = "10.0.10240.0" + action.vstudio.archTargetPlatformMinVersion = "10.0.10240.0" elseif _OPTIONS["target"] == "winstore10" then defines { "_WIN32_WINNT=0x0A00" } diff --git a/Src/external_dependencies/openmpt-trunk/build/genie/genie.lua b/Src/external_dependencies/openmpt-trunk/build/genie/genie.lua index 16acbdaa8..7acb6310f 100644 --- a/Src/external_dependencies/openmpt-trunk/build/genie/genie.lua +++ b/Src/external_dependencies/openmpt-trunk/build/genie/genie.lua @@ -17,7 +17,7 @@ newoption { newoption { trigger = "target", value = "PROJECTS", - description = "windows target platform", + description = "arch target platform", allowed = { { "windesktop81", "windesktop81" }, { "winphone8" , "winphone8" }, diff --git a/Src/external_dependencies/openmpt-trunk/build/pch/PCH.h b/Src/external_dependencies/openmpt-trunk/build/pch/PCH.h index 644598a2e..5b752da7c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/pch/PCH.h +++ b/Src/external_dependencies/openmpt-trunk/build/pch/PCH.h @@ -32,8 +32,8 @@ #if defined(MODPLUG_TRACKER) #if MPT_OS_WINDOWS -#include -#include +#include +#include #include #include #endif // MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/build/premake/ext-flac.lua b/Src/external_dependencies/openmpt-trunk/build/premake/ext-flac.lua index 488df22bf..d5bae03d1 100644 --- a/Src/external_dependencies/openmpt-trunk/build/premake/ext-flac.lua +++ b/Src/external_dependencies/openmpt-trunk/build/premake/ext-flac.lua @@ -54,7 +54,7 @@ "../../include/flac/src/libFLAC/stream_encoder_intrin_ssse3.c", "../../include/flac/src/libFLAC/stream_encoder_framing.c", "../../include/flac/src/libFLAC/window.c", - "../../include/flac/src/libFLAC/windows_unicode_filenames.c", + "../../include/flac/src/libFLAC/arch_unicode_filenames.c", } files { "../../include/flac/src/libFLAC/include/private/all.h", @@ -108,7 +108,7 @@ filter { "action:vs*" } files { "../../include/flac/include/share/win_utf8_io.h", - "../../include/flac/include/share/windows_unicode_filenames.h", + "../../include/flac/include/share/arch_unicode_filenames.h", } filter {} filter { "action:vs*" } diff --git a/Src/external_dependencies/openmpt-trunk/build/premake/mpt-PluginBridge.lua b/Src/external_dependencies/openmpt-trunk/build/premake/mpt-PluginBridge.lua index 3fb3e380f..da395664a 100644 --- a/Src/external_dependencies/openmpt-trunk/build/premake/mpt-PluginBridge.lua +++ b/Src/external_dependencies/openmpt-trunk/build/premake/mpt-PluginBridge.lua @@ -135,9 +135,9 @@ filter { "action:vs*", "architecture:x86_64" } dataexecutionprevention "Off" filter { "action:vs*", "architecture:ARM" } - -- dataexecutionprevention "Off" -- not supported by windows loader on arm64 + -- dataexecutionprevention "Off" -- not supported by arch loader on arm64 filter { "action:vs*", "architecture:ARM64" } - -- dataexecutionprevention "Off" -- not supported by windows loader on arm64 + -- dataexecutionprevention "Off" -- not supported by arch loader on arm64 filter {} characterset "Unicode" warnings "Extra" diff --git a/Src/external_dependencies/openmpt-trunk/build/regenerate_vs_projects.cmd b/Src/external_dependencies/openmpt-trunk/build/regenerate_vs_projects.cmd index 8a5c3ff95..c505f41be 100644 --- a/Src/external_dependencies/openmpt-trunk/build/regenerate_vs_projects.cmd +++ b/Src/external_dependencies/openmpt-trunk/build/regenerate_vs_projects.cmd @@ -12,7 +12,7 @@ if exist "include\premake\premake5.exe" set PREMAKE=include\premake\premake5.exe if exist "include\premake\bin\release\premake5.exe" set PREMAKE=include\premake\bin\release\premake5.exe set GENIE= -set GENIE=include\genie\bin\windows\genie.exe +set GENIE=include\genie\bin\arch\genie.exe diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj index 3bf390eaf..b2877d0c4 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj @@ -759,7 +759,7 @@ - + @@ -831,7 +831,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj.filters index 54f3cc800..802218920 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017uwp/libopenmpt.vcxproj.filters @@ -315,7 +315,7 @@ src\mpt\check - + src\mpt\check @@ -495,7 +495,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj index 4f0c6196b..3cf8843bc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj @@ -1754,7 +1754,7 @@ - + @@ -1814,7 +1814,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj index 8c6a9a1ec..3ad5a6100 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj @@ -1306,7 +1306,7 @@ - + @@ -1366,7 +1366,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj index e65c044a1..9eb55efbc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj @@ -1754,7 +1754,7 @@ - + @@ -1814,7 +1814,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj index ae8c0aa0f..ebeaa783c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj @@ -1754,7 +1754,7 @@ - + @@ -1814,7 +1814,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj index ab1c61ffe..d42511345 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj @@ -1433,7 +1433,7 @@ - + @@ -1493,7 +1493,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj.filters index 40575102f..06c2afc17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj index 346bf0445..f50f0f72f 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj @@ -1433,7 +1433,7 @@ - + @@ -1493,7 +1493,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj.filters index 40575102f..06c2afc17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj index a98af57a0..4790aae72 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj @@ -1370,7 +1370,7 @@ - + @@ -1424,7 +1424,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj index 47825f04c..c69c4f2cf 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj @@ -1370,7 +1370,7 @@ - + @@ -1424,7 +1424,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj index c348dfeff..3ec11c8d3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj @@ -1322,7 +1322,7 @@ - + @@ -1376,7 +1376,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj index 499cc801f..fcfcd53c3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj @@ -1267,7 +1267,7 @@ - + @@ -1327,7 +1327,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win10/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj index 59a89723f..ab8b569b6 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj @@ -1010,7 +1010,7 @@ - + @@ -1070,7 +1070,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj index 20524735f..e64bbfb7e 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj @@ -694,7 +694,7 @@ - + @@ -754,7 +754,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj index 900155c9c..06974e04a 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj @@ -1010,7 +1010,7 @@ - + @@ -1070,7 +1070,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj index 03f4a9ca4..0a4cda519 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj @@ -1010,7 +1010,7 @@ - + @@ -1070,7 +1070,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj index 7505beba3..c0a424489 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj @@ -737,7 +737,7 @@ - + @@ -797,7 +797,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj.filters index 8a6484044..c7e6bf502 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj index 8b711b79c..53b5e8be0 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj @@ -743,7 +743,7 @@ - + @@ -803,7 +803,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj.filters index 8a6484044..c7e6bf502 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj index 326a88acb..97b59cd7f 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj @@ -758,7 +758,7 @@ - + @@ -812,7 +812,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj index c8266230e..ed34e860d 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj @@ -758,7 +758,7 @@ - + @@ -812,7 +812,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj index 4dd837fe3..7d4ae8e89 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj @@ -734,7 +734,7 @@ - + @@ -788,7 +788,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj index 81f078430..d63bbc351 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj @@ -667,7 +667,7 @@ - + @@ -727,7 +727,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2017win7/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj index 853b1b5c7..7998b4cb4 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj @@ -1399,7 +1399,7 @@ - + @@ -1453,7 +1453,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj index 678ac41b8..39ed129af 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj @@ -1399,7 +1399,7 @@ - + @@ -1453,7 +1453,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019uwp/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj index d401e47bc..44c5e176f 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj @@ -1753,7 +1753,7 @@ - + @@ -1813,7 +1813,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj index 663805ccf..bcc1b02ff 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj @@ -1305,7 +1305,7 @@ - + @@ -1365,7 +1365,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj index 5eda22ccf..145b8fdff 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj @@ -1753,7 +1753,7 @@ - + @@ -1813,7 +1813,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj index 6f65cf6cf..d095257bb 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj @@ -1753,7 +1753,7 @@ - + @@ -1813,7 +1813,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj index 374ba7650..24e9930fb 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj @@ -1432,7 +1432,7 @@ - + @@ -1492,7 +1492,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj.filters index 40575102f..06c2afc17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj index 2b7b4843b..a6bfa763e 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj @@ -1432,7 +1432,7 @@ - + @@ -1492,7 +1492,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters index 40575102f..06c2afc17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-mpg123.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-mpg123.vcxproj index 7e351f81d..f61ee7589 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-mpg123.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-mpg123.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-ogg.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-ogg.vcxproj index c4c92aa9d..3a4d4663f 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-ogg.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-ogg.vcxproj @@ -101,25 +101,25 @@ false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudio.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudio.vcxproj index 7a257237d..6265abd33 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudio.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudio.vcxproj @@ -97,25 +97,25 @@ false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudiocpp.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudiocpp.vcxproj index dd2fec579..c04d2fdfd 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudiocpp.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-portaudiocpp.vcxproj @@ -96,25 +96,25 @@ false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-vorbis.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-vorbis.vcxproj index e3e6ac20b..68781eec2 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-vorbis.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/ext/openmpt-vorbis.vcxproj @@ -101,25 +101,25 @@ false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj index 557ab8e64..224e505c1 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj @@ -1369,7 +1369,7 @@ - + @@ -1423,7 +1423,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj index cdc4c829f..a40f0c4ba 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj @@ -546,7 +546,7 @@ - + @@ -600,7 +600,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_modplug.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_modplug.vcxproj index 20b8bbe40..f6a925ce7 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_modplug.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_modplug.vcxproj @@ -100,25 +100,25 @@ false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj index 2ab299d2d..85930a909 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj @@ -1321,7 +1321,7 @@ - + @@ -1375,7 +1375,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj index b8ebaf53b..c426bbaf3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj @@ -1266,7 +1266,7 @@ - + @@ -1326,7 +1326,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win10/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj index 3320cc943..9c51d0e1d 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj index 5558a530f..24b7be0c0 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj @@ -705,7 +705,7 @@ - + @@ -765,7 +765,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj index a4d993e1e..733322aae 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj index 81dcc0141..c82e8a907 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj index 21922e1ed..39a34ea96 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj @@ -748,7 +748,7 @@ - + @@ -808,7 +808,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj.filters index 8a6484044..c7e6bf502 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj index 5e62965b2..b03e1847b 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj @@ -754,7 +754,7 @@ - + @@ -814,7 +814,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj.filters index 8a6484044..c7e6bf502 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj index 9302f2fb3..ba74863d2 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj @@ -769,7 +769,7 @@ - + @@ -823,7 +823,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt.vcxproj index 5daca601c..9c4034174 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt.vcxproj @@ -769,7 +769,7 @@ - + @@ -823,7 +823,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt_test.vcxproj index 23333b558..535708723 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt_test.vcxproj @@ -745,7 +745,7 @@ - + @@ -799,7 +799,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/updatesigntool.vcxproj index f2caf0dba..3dcdc4edb 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/updatesigntool.vcxproj @@ -678,7 +678,7 @@ - + @@ -738,7 +738,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win7/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win7/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-ANSI.vcxproj index 06a1e810f..4d4fbc9ac 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-ANSI.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters index 87abb180c..fe7440a10 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-NativeSupport.vcxproj index 2840feee9..f7f49f308 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-NativeSupport.vcxproj @@ -705,7 +705,7 @@ - + @@ -765,7 +765,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-UTF8.vcxproj index fd2e71234..18d1d57b4 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-UTF8.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters index 87abb180c..fe7440a10 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT.vcxproj index 0efa282b9..50847aa34 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT.vcxproj.filters index 87abb180c..fe7440a10 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridge.vcxproj index 38eb71018..5051868f0 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridge.vcxproj @@ -748,7 +748,7 @@ - + @@ -808,7 +808,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridge.vcxproj.filters index 5e47c3b24..a6111395c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridgeLegacy.vcxproj index 0d9bf875d..48584f713 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridgeLegacy.vcxproj @@ -754,7 +754,7 @@ - + @@ -814,7 +814,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridgeLegacy.vcxproj.filters index 5e47c3b24..a6111395c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt-small.vcxproj index 6acb315e5..087c70a0b 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt-small.vcxproj @@ -769,7 +769,7 @@ - + @@ -823,7 +823,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt.vcxproj index 535c71dbd..d3be5ee93 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt.vcxproj @@ -769,7 +769,7 @@ - + @@ -823,7 +823,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt_test.vcxproj index 423e94cd1..edbbbaeaf 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt_test.vcxproj @@ -745,7 +745,7 @@ - + @@ -799,7 +799,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/updatesigntool.vcxproj index 4396033cb..f9edd43d9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/updatesigntool.vcxproj @@ -678,7 +678,7 @@ - + @@ -738,7 +738,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2019win81/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2019win81/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt-small.vcxproj index bcb83f5a0..1d22c9f19 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt-small.vcxproj @@ -1399,7 +1399,7 @@ - + @@ -1453,7 +1453,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt.vcxproj index cbf81416a..573caf161 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt.vcxproj @@ -1399,7 +1399,7 @@ - + @@ -1453,7 +1453,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022uwp/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-ANSI.vcxproj index 5cad25452..83d059eae 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-ANSI.vcxproj @@ -1753,7 +1753,7 @@ - + @@ -1813,7 +1813,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-NativeSupport.vcxproj index c5aeda181..60895b778 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-NativeSupport.vcxproj @@ -1305,7 +1305,7 @@ - + @@ -1365,7 +1365,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-UTF8.vcxproj index 2c91f4018..b6aeb57eb 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-UTF8.vcxproj @@ -1753,7 +1753,7 @@ - + @@ -1813,7 +1813,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT.vcxproj index ca1d904be..461e20c5a 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT.vcxproj @@ -1753,7 +1753,7 @@ - + @@ -1813,7 +1813,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridge.vcxproj index 4de11e992..37dc2fb17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridge.vcxproj @@ -1432,7 +1432,7 @@ - + @@ -1492,7 +1492,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridge.vcxproj.filters index 40575102f..06c2afc17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridgeLegacy.vcxproj index 5ab767607..81d8a2a80 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridgeLegacy.vcxproj @@ -1432,7 +1432,7 @@ - + @@ -1492,7 +1492,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridgeLegacy.vcxproj.filters index 40575102f..06c2afc17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt-small.vcxproj index 192682f6b..ebed31c53 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt-small.vcxproj @@ -1369,7 +1369,7 @@ - + @@ -1423,7 +1423,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt.vcxproj index 1efc999cf..32547dc6c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt.vcxproj @@ -1369,7 +1369,7 @@ - + @@ -1423,7 +1423,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt_test.vcxproj index b369c620a..c36f16c3f 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt_test.vcxproj @@ -1321,7 +1321,7 @@ - + @@ -1375,7 +1375,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/updatesigntool.vcxproj index 02262d066..23d7c8a5a 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/updatesigntool.vcxproj @@ -1266,7 +1266,7 @@ - + @@ -1326,7 +1326,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-ANSI.vcxproj index 71b5d6489..30f0e72d9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-ANSI.vcxproj @@ -1737,7 +1737,7 @@ - + @@ -1797,7 +1797,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj index d597934e6..31745525e 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj @@ -1241,7 +1241,7 @@ - + @@ -1301,7 +1301,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-UTF8.vcxproj index 0be4a5d48..5ff0ff283 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-UTF8.vcxproj @@ -1737,7 +1737,7 @@ - + @@ -1797,7 +1797,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT.vcxproj index 8b1f38698..6a41849f6 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT.vcxproj @@ -1737,7 +1737,7 @@ - + @@ -1797,7 +1797,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT.vcxproj.filters index 56d00d8db..9088113dc 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridge.vcxproj index 5be6185e5..77c4aa46d 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridge.vcxproj @@ -1368,7 +1368,7 @@ - + @@ -1428,7 +1428,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridge.vcxproj.filters index 40575102f..06c2afc17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridgeLegacy.vcxproj index 4a5716b32..c6b3d204b 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridgeLegacy.vcxproj @@ -1368,7 +1368,7 @@ - + @@ -1428,7 +1428,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridgeLegacy.vcxproj.filters index 40575102f..06c2afc17 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt-small.vcxproj index 50bbe479d..756b23274 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt-small.vcxproj @@ -1305,7 +1305,7 @@ - + @@ -1359,7 +1359,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt.vcxproj index 5c37541dc..eda02ef7b 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt.vcxproj @@ -1305,7 +1305,7 @@ - + @@ -1359,7 +1359,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt_test.vcxproj index 9a4780be9..e5e7d2651 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt_test.vcxproj @@ -1257,7 +1257,7 @@ - + @@ -1311,7 +1311,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/updatesigntool.vcxproj index 93277705e..b7d1b1189 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/updatesigntool.vcxproj @@ -1202,7 +1202,7 @@ - + @@ -1262,7 +1262,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win10clang/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-ANSI.vcxproj index 122920e89..dd21a1024 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-ANSI.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-NativeSupport.vcxproj index 86a2d57c5..a80213636 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-NativeSupport.vcxproj @@ -705,7 +705,7 @@ - + @@ -765,7 +765,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-UTF8.vcxproj index 122b88025..dc0aa220b 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-UTF8.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT.vcxproj index 5b30080ac..697a7c303 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT.vcxproj.filters index eae69f5f4..9d8401872 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridge.vcxproj index 4de9c9641..612668fe2 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridge.vcxproj @@ -748,7 +748,7 @@ - + @@ -808,7 +808,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridge.vcxproj.filters index 8a6484044..c7e6bf502 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridgeLegacy.vcxproj index 2772b9da8..0c8bbb60a 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridgeLegacy.vcxproj @@ -754,7 +754,7 @@ - + @@ -814,7 +814,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridgeLegacy.vcxproj.filters index 8a6484044..c7e6bf502 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt-small.vcxproj index 46de4b078..61c58af77 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt-small.vcxproj @@ -769,7 +769,7 @@ - + @@ -823,7 +823,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt.vcxproj index 3cc82326c..6a7f83d51 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt.vcxproj @@ -769,7 +769,7 @@ - + @@ -823,7 +823,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt_test.vcxproj index 2bbc79aee..284f7da94 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt_test.vcxproj @@ -745,7 +745,7 @@ - + @@ -799,7 +799,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/updatesigntool.vcxproj index a2d88032c..a385521eb 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/updatesigntool.vcxproj @@ -678,7 +678,7 @@ - + @@ -738,7 +738,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win7/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win7/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-ANSI.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-ANSI.vcxproj index 4477fa50e..15d7c39ef 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-ANSI.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-ANSI.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters index 87abb180c..fe7440a10 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-NativeSupport.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-NativeSupport.vcxproj index 0615f7603..13514b390 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-NativeSupport.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-NativeSupport.vcxproj @@ -705,7 +705,7 @@ - + @@ -765,7 +765,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters index cdbf60fa7..f37cf9359 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters @@ -462,7 +462,7 @@ src\mpt\check - + src\mpt\check @@ -642,7 +642,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-UTF8.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-UTF8.vcxproj index 3f8f9bb9c..e9a9a83f3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-UTF8.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-UTF8.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters index 87abb180c..fe7440a10 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT.vcxproj index 4e8312dfc..b5d893383 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT.vcxproj @@ -1021,7 +1021,7 @@ - + @@ -1081,7 +1081,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT.vcxproj.filters index 87abb180c..fe7440a10 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/OpenMPT.vcxproj.filters @@ -1053,7 +1053,7 @@ src\mpt\check - + src\mpt\check @@ -1233,7 +1233,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridge.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridge.vcxproj index f65c485d5..6d7722833 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridge.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridge.vcxproj @@ -748,7 +748,7 @@ - + @@ -808,7 +808,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridge.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridge.vcxproj.filters index 5e47c3b24..a6111395c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridge.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridge.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridgeLegacy.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridgeLegacy.vcxproj index f684f9fd4..0c6fbf139 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridgeLegacy.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridgeLegacy.vcxproj @@ -754,7 +754,7 @@ - + @@ -814,7 +814,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridgeLegacy.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridgeLegacy.vcxproj.filters index 5e47c3b24..a6111395c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridgeLegacy.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/PluginBridgeLegacy.vcxproj.filters @@ -318,7 +318,7 @@ src\mpt\check - + src\mpt\check @@ -498,7 +498,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt-small.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt-small.vcxproj index 6102fcd30..054aeac9c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt-small.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt-small.vcxproj @@ -769,7 +769,7 @@ - + @@ -823,7 +823,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt-small.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt-small.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt-small.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt-small.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt.vcxproj index cdf2634a4..626919f33 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt.vcxproj @@ -769,7 +769,7 @@ - + @@ -823,7 +823,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt.vcxproj.filters index 5c05242a2..708a1800c 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt.vcxproj.filters @@ -621,7 +621,7 @@ src\mpt\check - + src\mpt\check @@ -783,7 +783,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt_test.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt_test.vcxproj index b3eecaf4a..7a7f1be12 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt_test.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt_test.vcxproj @@ -745,7 +745,7 @@ - + @@ -799,7 +799,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt_test.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt_test.vcxproj.filters index e425af543..34271b4e3 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt_test.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/libopenmpt_test.vcxproj.filters @@ -627,7 +627,7 @@ src\mpt\check - + src\mpt\check @@ -789,7 +789,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/updatesigntool.vcxproj b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/updatesigntool.vcxproj index 786fe0ed6..86794258f 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/updatesigntool.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/updatesigntool.vcxproj @@ -678,7 +678,7 @@ - + @@ -738,7 +738,7 @@ - + diff --git a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/updatesigntool.vcxproj.filters b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/updatesigntool.vcxproj.filters index 6c403e286..ff193b4c9 100644 --- a/Src/external_dependencies/openmpt-trunk/build/vs2022win81/updatesigntool.vcxproj.filters +++ b/Src/external_dependencies/openmpt-trunk/build/vs2022win81/updatesigntool.vcxproj.filters @@ -402,7 +402,7 @@ src\mpt\check - + src\mpt\check @@ -582,7 +582,7 @@ src\mpt\osinfo - + src\mpt\osinfo diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie.lua index 35fc92237..0748e5b32 100644 --- a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie.lua +++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie.lua @@ -12,7 +12,7 @@ newoption { newoption { trigger = "target", value = "PROJECTS", - description = "windows target platform", + description = "arch target platform", allowed = { { "macosx" , "macosx" }, { "iphoneos", "iphoneos" }, diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode9-iphoneos/libopenmpt.xcodeproj/project.pbxproj b/Src/external_dependencies/openmpt-trunk/build/xcode9-iphoneos/libopenmpt.xcodeproj/project.pbxproj index 65c3a1ac5..440233ed2 100644 --- a/Src/external_dependencies/openmpt-trunk/build/xcode9-iphoneos/libopenmpt.xcodeproj/project.pbxproj +++ b/Src/external_dependencies/openmpt-trunk/build/xcode9-iphoneos/libopenmpt.xcodeproj/project.pbxproj @@ -296,7 +296,7 @@ 17C32E5A8380D7900C4BC3F8 /* tests_binary.hpp in Headers */ = {isa = PBXBuildFile; fileRef = EF5714F9DB014A08C4D25123 /* tests_binary.hpp */; }; B447DB5EA05ADBB74944B8A4 /* libc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 638B4931CF1A0B1CD816EC33 /* libc.hpp */; }; 924830DAFEADC36087866539 /* mfc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A169CFBA8DBBA6AA76DAE3BA /* mfc.hpp */; }; - E907EB3355434BF75E38C886 /* windows.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 18DED47E04469B4C6DB1AF62 /* windows.hpp */; }; + E907EB3355434BF75E38C886 /* arch.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 18DED47E04469B4C6DB1AF62 /* arch.hpp */; }; A131EE8A0D4C512C566E61C0 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0270ACB6EE566EAE97A7D4CB /* crc.hpp */; }; B8A0AAB824BD9CA9ED940917 /* tests_crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C71C02DFB3C5690EDC5B858D /* tests_crc.hpp */; }; E7BBCE12D34FC4BA3C141E6F /* exception.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6BEB77F622FBAF82B4E3481 /* exception.hpp */; }; @@ -356,7 +356,7 @@ 862ACB1DF2F0273A3B4CB69C /* library.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 55C637D341D9372CEAC21419 /* library.hpp */; }; 1CEBDC56885BDFCF517A5958 /* mutex.hpp in Headers */ = {isa = PBXBuildFile; fileRef = AB099F81978692C4C00393D8 /* mutex.hpp */; }; DD9F3244C91D83DDB2154175 /* class.hpp in Headers */ = {isa = PBXBuildFile; fileRef = AC99CC3518B42FD761D63F6B /* class.hpp */; }; - D9421C9CC517644FEEC6A34B /* windows_version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E801BE9954136640DD64F87F /* windows_version.hpp */; }; + D9421C9CC517644FEEC6A34B /* arch_version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E801BE9954136640DD64F87F /* arch_version.hpp */; }; 8611888FF2D95513BB6A5E25 /* out_of_memory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = D5A33355C1787B08EA27BB04 /* out_of_memory.hpp */; }; 4E6F61FCBADF637583FEDDFD /* parse.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 9DA6A1DC8923951FB2A09533 /* parse.hpp */; }; C1686B342DD96DADF6F7E735 /* split.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 302CAA7A1CA99DBD45269ED1 /* split.hpp */; }; @@ -726,7 +726,7 @@ EF5714F9DB014A08C4D25123 /* tests_binary.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "tests_binary.hpp"; path = "tests_binary.hpp"; sourceTree = ""; }; 638B4931CF1A0B1CD816EC33 /* libc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "libc.hpp"; path = "libc.hpp"; sourceTree = ""; }; A169CFBA8DBBA6AA76DAE3BA /* mfc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "mfc.hpp"; path = "mfc.hpp"; sourceTree = ""; }; - 18DED47E04469B4C6DB1AF62 /* windows.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "windows.hpp"; path = "windows.hpp"; sourceTree = ""; }; + 18DED47E04469B4C6DB1AF62 /* arch.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "arch.hpp"; path = "arch.hpp"; sourceTree = ""; }; 0270ACB6EE566EAE97A7D4CB /* crc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "crc.hpp"; path = "crc.hpp"; sourceTree = ""; }; C71C02DFB3C5690EDC5B858D /* tests_crc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "tests_crc.hpp"; path = "tests_crc.hpp"; sourceTree = ""; }; F6BEB77F622FBAF82B4E3481 /* exception.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "exception.hpp"; path = "exception.hpp"; sourceTree = ""; }; @@ -786,7 +786,7 @@ 55C637D341D9372CEAC21419 /* library.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "library.hpp"; path = "library.hpp"; sourceTree = ""; }; AB099F81978692C4C00393D8 /* mutex.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "mutex.hpp"; path = "mutex.hpp"; sourceTree = ""; }; AC99CC3518B42FD761D63F6B /* class.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "class.hpp"; path = "class.hpp"; sourceTree = ""; }; - E801BE9954136640DD64F87F /* windows_version.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "windows_version.hpp"; path = "windows_version.hpp"; sourceTree = ""; }; + E801BE9954136640DD64F87F /* arch_version.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "arch_version.hpp"; path = "arch_version.hpp"; sourceTree = ""; }; D5A33355C1787B08EA27BB04 /* out_of_memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "out_of_memory.hpp"; path = "out_of_memory.hpp"; sourceTree = ""; }; 9DA6A1DC8923951FB2A09533 /* parse.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "parse.hpp"; path = "parse.hpp"; sourceTree = ""; }; 302CAA7A1CA99DBD45269ED1 /* split.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "split.hpp"; path = "split.hpp"; sourceTree = ""; }; @@ -1280,7 +1280,7 @@ children = ( 638B4931CF1A0B1CD816EC33 /* libc.hpp */, A169CFBA8DBBA6AA76DAE3BA /* mfc.hpp */, - 18DED47E04469B4C6DB1AF62 /* windows.hpp */, + 18DED47E04469B4C6DB1AF62 /* arch.hpp */, ); name = "check"; path = "check"; @@ -1497,7 +1497,7 @@ isa = PBXGroup; children = ( AC99CC3518B42FD761D63F6B /* class.hpp */, - E801BE9954136640DD64F87F /* windows_version.hpp */, + E801BE9954136640DD64F87F /* arch_version.hpp */, ); name = "osinfo"; path = "osinfo"; diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode9-macosx/libopenmpt.xcodeproj/project.pbxproj b/Src/external_dependencies/openmpt-trunk/build/xcode9-macosx/libopenmpt.xcodeproj/project.pbxproj index 65cb81094..f831aba1b 100644 --- a/Src/external_dependencies/openmpt-trunk/build/xcode9-macosx/libopenmpt.xcodeproj/project.pbxproj +++ b/Src/external_dependencies/openmpt-trunk/build/xcode9-macosx/libopenmpt.xcodeproj/project.pbxproj @@ -296,7 +296,7 @@ 17C32E5A8380D7900C4BC3F8 /* tests_binary.hpp in Headers */ = {isa = PBXBuildFile; fileRef = EF5714F9DB014A08C4D25123 /* tests_binary.hpp */; }; B447DB5EA05ADBB74944B8A4 /* libc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 638B4931CF1A0B1CD816EC33 /* libc.hpp */; }; 924830DAFEADC36087866539 /* mfc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A169CFBA8DBBA6AA76DAE3BA /* mfc.hpp */; }; - E907EB3355434BF75E38C886 /* windows.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 18DED47E04469B4C6DB1AF62 /* windows.hpp */; }; + E907EB3355434BF75E38C886 /* arch.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 18DED47E04469B4C6DB1AF62 /* arch.hpp */; }; A131EE8A0D4C512C566E61C0 /* crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0270ACB6EE566EAE97A7D4CB /* crc.hpp */; }; B8A0AAB824BD9CA9ED940917 /* tests_crc.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C71C02DFB3C5690EDC5B858D /* tests_crc.hpp */; }; E7BBCE12D34FC4BA3C141E6F /* exception.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6BEB77F622FBAF82B4E3481 /* exception.hpp */; }; @@ -356,7 +356,7 @@ 862ACB1DF2F0273A3B4CB69C /* library.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 55C637D341D9372CEAC21419 /* library.hpp */; }; 1CEBDC56885BDFCF517A5958 /* mutex.hpp in Headers */ = {isa = PBXBuildFile; fileRef = AB099F81978692C4C00393D8 /* mutex.hpp */; }; DD9F3244C91D83DDB2154175 /* class.hpp in Headers */ = {isa = PBXBuildFile; fileRef = AC99CC3518B42FD761D63F6B /* class.hpp */; }; - D9421C9CC517644FEEC6A34B /* windows_version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E801BE9954136640DD64F87F /* windows_version.hpp */; }; + D9421C9CC517644FEEC6A34B /* arch_version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E801BE9954136640DD64F87F /* arch_version.hpp */; }; 8611888FF2D95513BB6A5E25 /* out_of_memory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = D5A33355C1787B08EA27BB04 /* out_of_memory.hpp */; }; 4E6F61FCBADF637583FEDDFD /* parse.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 9DA6A1DC8923951FB2A09533 /* parse.hpp */; }; C1686B342DD96DADF6F7E735 /* split.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 302CAA7A1CA99DBD45269ED1 /* split.hpp */; }; @@ -726,7 +726,7 @@ EF5714F9DB014A08C4D25123 /* tests_binary.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "tests_binary.hpp"; path = "tests_binary.hpp"; sourceTree = ""; }; 638B4931CF1A0B1CD816EC33 /* libc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "libc.hpp"; path = "libc.hpp"; sourceTree = ""; }; A169CFBA8DBBA6AA76DAE3BA /* mfc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "mfc.hpp"; path = "mfc.hpp"; sourceTree = ""; }; - 18DED47E04469B4C6DB1AF62 /* windows.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "windows.hpp"; path = "windows.hpp"; sourceTree = ""; }; + 18DED47E04469B4C6DB1AF62 /* arch.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "arch.hpp"; path = "arch.hpp"; sourceTree = ""; }; 0270ACB6EE566EAE97A7D4CB /* crc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "crc.hpp"; path = "crc.hpp"; sourceTree = ""; }; C71C02DFB3C5690EDC5B858D /* tests_crc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "tests_crc.hpp"; path = "tests_crc.hpp"; sourceTree = ""; }; F6BEB77F622FBAF82B4E3481 /* exception.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "exception.hpp"; path = "exception.hpp"; sourceTree = ""; }; @@ -786,7 +786,7 @@ 55C637D341D9372CEAC21419 /* library.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "library.hpp"; path = "library.hpp"; sourceTree = ""; }; AB099F81978692C4C00393D8 /* mutex.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "mutex.hpp"; path = "mutex.hpp"; sourceTree = ""; }; AC99CC3518B42FD761D63F6B /* class.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "class.hpp"; path = "class.hpp"; sourceTree = ""; }; - E801BE9954136640DD64F87F /* windows_version.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "windows_version.hpp"; path = "windows_version.hpp"; sourceTree = ""; }; + E801BE9954136640DD64F87F /* arch_version.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "arch_version.hpp"; path = "arch_version.hpp"; sourceTree = ""; }; D5A33355C1787B08EA27BB04 /* out_of_memory.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "out_of_memory.hpp"; path = "out_of_memory.hpp"; sourceTree = ""; }; 9DA6A1DC8923951FB2A09533 /* parse.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "parse.hpp"; path = "parse.hpp"; sourceTree = ""; }; 302CAA7A1CA99DBD45269ED1 /* split.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = "split.hpp"; path = "split.hpp"; sourceTree = ""; }; @@ -1280,7 +1280,7 @@ children = ( 638B4931CF1A0B1CD816EC33 /* libc.hpp */, A169CFBA8DBBA6AA76DAE3BA /* mfc.hpp */, - 18DED47E04469B4C6DB1AF62 /* windows.hpp */, + 18DED47E04469B4C6DB1AF62 /* arch.hpp */, ); name = "check"; path = "check"; @@ -1497,7 +1497,7 @@ isa = PBXGroup; children = ( AC99CC3518B42FD761D63F6B /* class.hpp */, - E801BE9954136640DD64F87F /* windows_version.hpp */, + E801BE9954136640DD64F87F /* arch_version.hpp */, ); name = "osinfo"; path = "osinfo"; diff --git a/Src/external_dependencies/openmpt-trunk/common/BuildSettings.h b/Src/external_dependencies/openmpt-trunk/common/BuildSettings.h index f319b6e90..c90526fb8 100644 --- a/Src/external_dependencies/openmpt-trunk/common/BuildSettings.h +++ b/Src/external_dependencies/openmpt-trunk/common/BuildSettings.h @@ -18,7 +18,7 @@ -// set windows version early so that we can deduce dependencies from SDK version +// set arch version early so that we can deduce dependencies from SDK version #if MPT_OS_WINDOWS @@ -505,7 +505,7 @@ #define WIN32_LEAN_AND_MEAN -// windows.h excludes +// arch.h excludes #define NOMEMMGR // GMEM_*, LMEM_*, GHND, LHND, associated routines #ifndef NOMINMAX #define NOMINMAX // Macros min(a,b) and max(a,b) diff --git a/Src/external_dependencies/openmpt-trunk/common/mptFileIO.cpp b/Src/external_dependencies/openmpt-trunk/common/mptFileIO.cpp index a38dd7790..b60a6df99 100644 --- a/Src/external_dependencies/openmpt-trunk/common/mptFileIO.cpp +++ b/Src/external_dependencies/openmpt-trunk/common/mptFileIO.cpp @@ -26,7 +26,7 @@ #ifdef MODPLUG_TRACKER #if MPT_OS_WINDOWS -#include +#include #include #include #endif // MPT_OS_WINDOWS @@ -521,9 +521,9 @@ OnDiskFileWrapper::OnDiskFileWrapper(FileCursor &file, const mpt::PathString &fi HANDLE hFile = NULL; #if MPT_OS_WINDOWS_WINRT - hFile = mpt::windows::CheckFileHANDLE(CreateFile2(tempName.AsNative().c_str(), GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, NULL)); + hFile = mpt::arch::CheckFileHANDLE(CreateFile2(tempName.AsNative().c_str(), GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, NULL)); #else - hFile = mpt::windows::CheckFileHANDLE(CreateFile(tempName.AsNative().c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_TEMPORARY, NULL)); + hFile = mpt::arch::CheckFileHANDLE(CreateFile(tempName.AsNative().c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_TEMPORARY, NULL)); #endif while(!file.EndOfFile()) { @@ -536,7 +536,7 @@ OnDiskFileWrapper::OnDiskFileWrapper(FileCursor &file, const mpt::PathString &fi DWORD chunkDone = 0; try { - mpt::windows::CheckBOOL(WriteFile(hFile, view.data() + written, chunkSize, &chunkDone, NULL)); + mpt::arch::CheckBOOL(WriteFile(hFile, view.data() + written, chunkSize, &chunkDone, NULL)); } catch(...) { CloseHandle(hFile); diff --git a/Src/external_dependencies/openmpt-trunk/common/mptFileIO.h b/Src/external_dependencies/openmpt-trunk/common/mptFileIO.h index 5c0112ce4..24bdb4412 100644 --- a/Src/external_dependencies/openmpt-trunk/common/mptFileIO.h +++ b/Src/external_dependencies/openmpt-trunk/common/mptFileIO.h @@ -37,7 +37,7 @@ #ifdef MODPLUG_TRACKER #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS #endif // MODPLUG_TRACKER diff --git a/Src/external_dependencies/openmpt-trunk/common/mptPathString.cpp b/Src/external_dependencies/openmpt-trunk/common/mptPathString.cpp index d41a54941..07b938aad 100644 --- a/Src/external_dependencies/openmpt-trunk/common/mptPathString.cpp +++ b/Src/external_dependencies/openmpt-trunk/common/mptPathString.cpp @@ -17,7 +17,7 @@ #include "mptRandom.h" #if MPT_OS_WINDOWS -#include +#include #if defined(MODPLUG_TRACKER) #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/common/mptPathString.h b/Src/external_dependencies/openmpt-trunk/common/mptPathString.h index 95224c5b5..0efcc4f29 100644 --- a/Src/external_dependencies/openmpt-trunk/common/mptPathString.h +++ b/Src/external_dependencies/openmpt-trunk/common/mptPathString.h @@ -155,7 +155,7 @@ public: // Return the same path string with a different (or appended) extension (including "."), e.g. "foo.bar",".txt" -> "foo.txt" or "C:\OpenMPT\foo",".txt" -> "C:\OpenMPT\foo.txt" PathString ReplaceExt(const mpt::PathString &newExt) const; - // Removes special characters from a filename component and replaces them with a safe replacement character ("_" on windows). + // Removes special characters from a filename component and replaces them with a safe replacement character ("_" on arch). // Returns the result. // Note that this also removes path component separators, so this should only be used on single-component PathString objects. PathString SanitizeComponent() const; diff --git a/Src/external_dependencies/openmpt-trunk/common/mptString.cpp b/Src/external_dependencies/openmpt-trunk/common/mptString.cpp index 4da6ab97a..cc1a516e1 100644 --- a/Src/external_dependencies/openmpt-trunk/common/mptString.cpp +++ b/Src/external_dependencies/openmpt-trunk/common/mptString.cpp @@ -29,7 +29,7 @@ #endif // MODPLUG_TRACKER #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS @@ -61,7 +61,7 @@ List of string types reason to do so. * std::wstring (OpenMPT) - UTF16 (on windows) or UTF32 (otherwise). Do not use unless there is an + UTF16 (on arch) or UTF32 (otherwise). Do not use unless there is an obvious reason to do so. * mpt::lstring (OpenMPT) @@ -289,7 +289,7 @@ APIs only available in WCHAR variants, or use mpt::winstring and mpt::WinStringBuf helpers otherwise. Specify TCHAR string literals with _T("foo") in mptrack/, and with TEXT("foo") in common/ or sounddev/. _T() requires which is specific to the MSVC -runtime and not portable across compilers. TEXT() is from . We use +runtime and not portable across compilers. TEXT() is from . We use _T() in mptrack/ only because it is shorter. @@ -367,7 +367,7 @@ static Tdststring EncodeImpl(Charset charset, const mpt::widestring &src) case Charset::CP437: return mpt::encode(mpt::common_encoding::cp437, src); break; case Charset::CP437AMS: return mpt::encode(CharsetTableCP437AMS, src); break; case Charset::CP437AMS2: return mpt::encode(CharsetTableCP437AMS2, src); break; - case Charset::Windows1252: return mpt::encode(mpt::common_encoding::windows1252, src); break; + case Charset::Windows1252: return mpt::encode(mpt::common_encoding::arch1252, src); break; case Charset::Amiga: return mpt::encode(mpt::common_encoding::amiga, src); break; case Charset::RISC_OS: return mpt::encode(mpt::common_encoding::riscos, src); break; case Charset::ISO8859_1_no_C1: return mpt::encode(mpt::common_encoding::iso8859_1_no_c1, src); break; @@ -397,7 +397,7 @@ static mpt::widestring DecodeImpl(Charset charset, const Tsrcstring &src) case Charset::CP437: return mpt::decode(mpt::common_encoding::cp437, src); break; case Charset::CP437AMS: return mpt::decode(CharsetTableCP437AMS, src); break; case Charset::CP437AMS2: return mpt::decode(CharsetTableCP437AMS2, src); break; - case Charset::Windows1252: return mpt::decode(mpt::common_encoding::windows1252, src); break; + case Charset::Windows1252: return mpt::decode(mpt::common_encoding::arch1252, src); break; case Charset::Amiga: return mpt::decode(mpt::common_encoding::amiga, src); break; case Charset::RISC_OS: return mpt::decode(mpt::common_encoding::riscos, src); break; case Charset::ISO8859_1_no_C1: return mpt::decode(mpt::common_encoding::iso8859_1_no_c1, src); break; diff --git a/Src/external_dependencies/openmpt-trunk/common/mptString.h b/Src/external_dependencies/openmpt-trunk/common/mptString.h index c308eef94..e27e661ef 100644 --- a/Src/external_dependencies/openmpt-trunk/common/mptString.h +++ b/Src/external_dependencies/openmpt-trunk/common/mptString.h @@ -74,7 +74,7 @@ enum class Charset { Amiga_no_C1, #if defined(MPT_ENABLE_CHARSET_LOCALE) - Locale, // CP_ACP on windows, current C locale otherwise + Locale, // CP_ACP on arch, current C locale otherwise #endif // MPT_ENABLE_CHARSET_LOCALE }; diff --git a/Src/external_dependencies/openmpt-trunk/common/mptTime.cpp b/Src/external_dependencies/openmpt-trunk/common/mptTime.cpp index 70874d16f..022da723f 100644 --- a/Src/external_dependencies/openmpt-trunk/common/mptTime.cpp +++ b/Src/external_dependencies/openmpt-trunk/common/mptTime.cpp @@ -16,7 +16,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #if defined(MODPLUG_TRACKER) #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/common/stdafx.h b/Src/external_dependencies/openmpt-trunk/common/stdafx.h index 452d34a2c..10de3420c 100644 --- a/Src/external_dependencies/openmpt-trunk/common/stdafx.h +++ b/Src/external_dependencies/openmpt-trunk/common/stdafx.h @@ -43,8 +43,8 @@ #if MPT_OS_WINDOWS -#include -#include +#include +#include #include #include @@ -64,7 +64,7 @@ #include "mpt/check/mfc.hpp" #endif #if MPT_OS_WINDOWS -#include "mpt/check/windows.hpp" +#include "mpt/check/arch.hpp" #endif #include "mpt/exception_text/exception_text.hpp" #include "mpt/out_of_memory/out_of_memory.hpp" diff --git a/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.8.5/libmodplug/modplug.h b/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.8.5/libmodplug/modplug.h index 8136fa9b1..54989df4a 100644 --- a/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.8.5/libmodplug/modplug.h +++ b/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.8.5/libmodplug/modplug.h @@ -12,12 +12,12 @@ extern "C" { #endif #if defined(_WIN32) || defined(__CYGWIN__) -# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for windows */ +# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for arch */ # define MODPLUG_EXPORT __declspec(dllexport) -# elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC) /* building or using static libmodplug for windows */ +# elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC) /* building or using static libmodplug for arch */ # define MODPLUG_EXPORT # else -# define MODPLUG_EXPORT __declspec(dllimport) /* using libmodplug dll for windows */ +# define MODPLUG_EXPORT __declspec(dllimport) /* using libmodplug dll for arch */ # endif /* FIXME: USE VISIBILITY ATTRIBUTES HERE */ #elif defined(MODPLUG_BUILD) diff --git a/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.8.5/libmodplug/stdafx.h b/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.8.5/libmodplug/stdafx.h index 735b8df5b..cb71d4470 100644 --- a/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.8.5/libmodplug/stdafx.h +++ b/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.8.5/libmodplug/stdafx.h @@ -30,8 +30,8 @@ #endif #define WIN32_LEAN_AND_MEAN -#include -#include +#include +#include #include #include #include @@ -126,12 +126,12 @@ inline void ProcessPlugins(int /* n */ ) {} #endif // _WIN32 #if defined(_WIN32) || defined(__CYGWIN__) -# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for windows */ +# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for arch */ # define MODPLUG_EXPORT __declspec(dllexport) -# elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC) /* building or using static libmodplug for windows */ +# elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC) /* building or using static libmodplug for arch */ # define MODPLUG_EXPORT # else -# define MODPLUG_EXPORT __declspec(dllimport) /* using libmodplug dll for windows */ +# define MODPLUG_EXPORT __declspec(dllimport) /* using libmodplug dll for arch */ # endif /* FIXME: USE VISIBILITY ATTRIBUTES HERE */ #elif defined(MODPLUG_BUILD) diff --git a/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.9.0/libmodplug/modplug.h b/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.9.0/libmodplug/modplug.h index 62dd1f42c..db296e0d0 100644 --- a/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.9.0/libmodplug/modplug.h +++ b/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.9.0/libmodplug/modplug.h @@ -12,12 +12,12 @@ extern "C" { #endif #if defined(_WIN32) || defined(__CYGWIN__) -# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for windows */ +# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for arch */ # define MODPLUG_EXPORT __declspec(dllexport) -# elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC) /* building or using static libmodplug for windows */ +# elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC) /* building or using static libmodplug for arch */ # define MODPLUG_EXPORT # else -# define MODPLUG_EXPORT __declspec(dllimport) /* using libmodplug dll for windows */ +# define MODPLUG_EXPORT __declspec(dllimport) /* using libmodplug dll for arch */ # endif #elif defined(MODPLUG_BUILD) && defined(SYM_VISIBILITY) # define MODPLUG_EXPORT __attribute__((visibility("default"))) diff --git a/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.9.0/libmodplug/stdafx.h b/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.9.0/libmodplug/stdafx.h index 5daea9182..f4f101e01 100644 --- a/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.9.0/libmodplug/stdafx.h +++ b/Src/external_dependencies/openmpt-trunk/contrib/libmodplug-0.8.9.0/libmodplug/stdafx.h @@ -33,8 +33,8 @@ #endif #define WIN32_LEAN_AND_MEAN -#include -#include +#include +#include #include #include #include @@ -125,12 +125,12 @@ inline void ProcessPlugins(int /* n */ ) {} #endif /* _WIN32 */ #if defined(_WIN32) || defined(__CYGWIN__) -# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for windows */ +# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for arch */ # define MODPLUG_EXPORT __declspec(dllexport) -# elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC) /* building or using static libmodplug for windows */ +# elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC) /* building or using static libmodplug for arch */ # define MODPLUG_EXPORT # else -# define MODPLUG_EXPORT __declspec(dllimport) /* using libmodplug dll for windows */ +# define MODPLUG_EXPORT __declspec(dllimport) /* using libmodplug dll for arch */ # endif #elif defined(MODPLUG_BUILD) && defined(SYM_VISIBILITY) # define MODPLUG_EXPORT __attribute__((visibility("default"))) diff --git a/Src/external_dependencies/openmpt-trunk/doc/release_branches.md b/Src/external_dependencies/openmpt-trunk/doc/release_branches.md index ba59bd537..b36bf3dcb 100644 --- a/Src/external_dependencies/openmpt-trunk/doc/release_branches.md +++ b/Src/external_dependencies/openmpt-trunk/doc/release_branches.md @@ -7,7 +7,7 @@ branching release branches 2. add release build configuration to the buildbot branch configuration file, adjust buildbot config of release build configurations to output to the separate auto-release directory and change the archive format from 7z to zip - for windows binaries + for arch binaries 3. branch the nondist externals repository 4. branch the current trunk HEAD (`$VER` is the branch version): `svn copy -m "branch OpenMPT-$VER" https://source.openmpt.org/svn/openmpt/trunk/OpenMPT https://source.openmpt.org/svn/openmpt/branches/OpenMPT-$VER` diff --git a/Src/external_dependencies/openmpt-trunk/include/asiomodern/include/ASIOModern/ASIOSystemWindows.hpp b/Src/external_dependencies/openmpt-trunk/include/asiomodern/include/ASIOModern/ASIOSystemWindows.hpp index 2473dd701..b71658149 100644 --- a/Src/external_dependencies/openmpt-trunk/include/asiomodern/include/ASIOModern/ASIOSystemWindows.hpp +++ b/Src/external_dependencies/openmpt-trunk/include/asiomodern/include/ASIOModern/ASIOSystemWindows.hpp @@ -18,7 +18,7 @@ #include #if ASIO_SYSTEM_WINDOWS -#include +#include #if !defined(NTDDI_VERSION) #error "NTDDI_VERSION undefined" #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/asiomodern/include/ASIOModern/ASIOSystemWindowsSEH.hpp b/Src/external_dependencies/openmpt-trunk/include/asiomodern/include/ASIOModern/ASIOSystemWindowsSEH.hpp index e36e61bc4..d9c5754d7 100644 --- a/Src/external_dependencies/openmpt-trunk/include/asiomodern/include/ASIOModern/ASIOSystemWindowsSEH.hpp +++ b/Src/external_dependencies/openmpt-trunk/include/asiomodern/include/ASIOModern/ASIOSystemWindowsSEH.hpp @@ -15,7 +15,7 @@ #include #if ASIO_SYSTEM_WINDOWS -#include +#include #if !defined(NTDDI_VERSION) #error "NTDDI_VERSION undefined" #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/flac/include/FLAC/stream_encoder.h b/Src/external_dependencies/openmpt-trunk/include/flac/include/FLAC/stream_encoder.h index 1d7bd258f..8fe03051b 100644 --- a/Src/external_dependencies/openmpt-trunk/include/flac/include/FLAC/stream_encoder.h +++ b/Src/external_dependencies/openmpt-trunk/include/flac/include/FLAC/stream_encoder.h @@ -932,14 +932,14 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE * Specifying \c partial_tukey or \c punchout_tukey works a little * different. These do not specify a single apodization function, but * a series of them with some overlap. partial_tukey specifies a series - * of small windows (all treated separately) while punchout_tukey - * specifies a series of windows that have a hole in them. In this way, + * of small arch (all treated separately) while punchout_tukey + * specifies a series of arch that have a hole in them. In this way, * the predictor is constructed with only a part of the block, which * helps in case a block consists of dissimilar parts. * * The three parameters that can be specified for the functions are * n, ov and P. n is the number of functions to add, ov is the overlap - * of the windows in case of partial_tukey and the overlap in the gaps + * of the arch in case of partial_tukey and the overlap in the gaps * in case of punchout_tukey. P is the fraction of the window that is * tapered, like with a regular tukey window. The function can be * specified with only a number, a number and an overlap, or a number @@ -955,7 +955,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE * partial_tukey(3) and punchout_tukey(3), specifying subdivide_tukey(5) * equivalently adds partial_tukey(4), punchout_tukey(4), partial_tukey(5) * and punchout_tukey(5). To be able to reuse data as much as possible, - * the tukey taper is taken equal for all windows, and the P specified is + * the tukey taper is taken equal for all arch, and the P specified is * applied for the smallest used window. In other words, * subdivide_tukey(2/0.5) results in a taper equal to that of tukey(0.25) * and subdivide_tukey(5) in a taper equal to that of tukey(0.1). The diff --git a/Src/external_dependencies/openmpt-trunk/include/flac/include/share/win_utf8_io.h b/Src/external_dependencies/openmpt-trunk/include/flac/include/share/win_utf8_io.h index 61b8ca3f0..5a9693a4e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/flac/include/share/win_utf8_io.h +++ b/Src/external_dependencies/openmpt-trunk/include/flac/include/share/win_utf8_io.h @@ -60,7 +60,7 @@ int utime_utf8(const char *filename, struct utimbuf *times); int unlink_utf8(const char *filename); int rename_utf8(const char *oldname, const char *newname); -#include +#include HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); #ifdef __cplusplus diff --git a/Src/external_dependencies/openmpt-trunk/include/flac/include/share/windows_unicode_filenames.h b/Src/external_dependencies/openmpt-trunk/include/flac/include/share/windows_unicode_filenames.h index 94cbeb6c5..4681fc6e4 100644 --- a/Src/external_dependencies/openmpt-trunk/include/flac/include/share/windows_unicode_filenames.h +++ b/Src/external_dependencies/openmpt-trunk/include/flac/include/share/windows_unicode_filenames.h @@ -31,8 +31,8 @@ #ifdef _WIN32 -#ifndef flac__windows_unicode_filenames_h -#define flac__windows_unicode_filenames_h +#ifndef flac__arch_unicode_filenames_h +#define flac__arch_unicode_filenames_h #include #include diff --git a/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/metadata_iterators.c b/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/metadata_iterators.c index 168a3fbc2..0d0810196 100644 --- a/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/metadata_iterators.c +++ b/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/metadata_iterators.c @@ -3417,7 +3417,7 @@ FLAC__bool transport_tempfile_(const char *filename, FILE **tempfile, char **tem *tempfile = 0; #if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ || defined __EMX__ - /* on some flavors of windows, flac_rename() will fail if the destination already exists */ + /* on some flavors of arch, flac_rename() will fail if the destination already exists */ if(flac_unlink(filename) < 0) { cleanup_tempfile_(tempfile, tempfilename); *status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR; diff --git a/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/stream_encoder.c b/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/stream_encoder.c index 2879c51c2..da3bd1659 100644 --- a/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/stream_encoder.c +++ b/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/stream_encoder.c @@ -40,7 +40,7 @@ #include /* for memcpy() */ #include /* for off_t */ #ifdef _WIN32 -#include /* for GetFileType() */ +#include /* for GetFileType() */ #include /* for _get_osfhandle() */ #endif #include "share/compat.h" @@ -2633,7 +2633,7 @@ FLAC__bool resize_buffers_(FLAC__StreamEncoder *encoder, uint32_t new_blocksize) if(encoder->protected_->do_escape_coding) ok = ok && FLAC__memory_alloc_aligned_unsigned_array(new_blocksize * 2, &encoder->private_->raw_bits_per_partition_unaligned, &encoder->private_->raw_bits_per_partition); - /* now adjust the windows if the blocksize has changed */ + /* now adjust the arch if the blocksize has changed */ #ifndef FLAC__INTEGER_ONLY_LIBRARY if(ok && new_blocksize != encoder->private_->input_capacity && encoder->protected_->max_lpc_order > 0) { for(i = 0; ok && i < encoder->protected_->num_apodizations; i++) { diff --git a/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/windows_unicode_filenames.c b/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/windows_unicode_filenames.c index bf3bfe160..0ac92a34f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/windows_unicode_filenames.c +++ b/Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/windows_unicode_filenames.c @@ -34,8 +34,8 @@ #endif #include -#include -#include "share/windows_unicode_filenames.h" +#include +#include "share/arch_unicode_filenames.h" /*** FIXME: KLUDGE: export these syms for flac.exe, metaflac.exe, etc. ***/ diff --git a/Src/external_dependencies/openmpt-trunk/include/flac/src/share/win_utf8_io/win_utf8_io.c b/Src/external_dependencies/openmpt-trunk/include/flac/src/share/win_utf8_io/win_utf8_io.c index 65b569972..a58dfbddf 100644 --- a/Src/external_dependencies/openmpt-trunk/include/flac/src/share/win_utf8_io/win_utf8_io.c +++ b/Src/external_dependencies/openmpt-trunk/include/flac/src/share/win_utf8_io/win_utf8_io.c @@ -34,7 +34,7 @@ #endif #include -#include +#include #include "share/win_utf8_io.h" #define UTF8_BUFFER_SIZE 32768 diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/README.md b/Src/external_dependencies/openmpt-trunk/include/genie/README.md index ef553e18e..9b476ddaf 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/README.md +++ b/Src/external_dependencies/openmpt-trunk/include/genie/README.md @@ -34,7 +34,7 @@ OSX: https://github.com/bkaradzic/bx/raw/master/tools/bin/darwin/genie Windows: -https://github.com/bkaradzic/bx/raw/master/tools/bin/windows/genie.exe +https://github.com/bkaradzic/bx/raw/master/tools/bin/arch/genie.exe Building (dev) -------------- @@ -95,7 +95,7 @@ of Premake 4.4 beta 5, and there is no intention to keep it compatible with it. - Fixed PCH race when using concurrent Makefile build. - Added Green Hills Software compiler support. - Added edit & continue support for 64-bit builds in vs2013 upwards. - - Added `windowstargetplatformversion` to specify VS Windows target version. + - Added `archtargetplatformversion` to specify VS Windows target version. - Added `NoWinRT` flag to disable WinRT CX builds. - Added `NoBufferSecurityCheck` flag to disable security checks in VS. - Added `nopch` file list to exclude files from using PCH. diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/build/gmake.windows/genie.make b/Src/external_dependencies/openmpt-trunk/include/genie/build/gmake.windows/genie.make index 6979aab35..464a96060 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/build/gmake.windows/genie.make +++ b/Src/external_dependencies/openmpt-trunk/include/genie/build/gmake.windows/genie.make @@ -47,7 +47,7 @@ MAKEFILE = genie.make ifeq ($(config),release) OBJDIR = obj/Release - TARGETDIR = ../../bin/windows + TARGETDIR = ../../bin/arch override TARGET = $(TARGETDIR)/genie.exe DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE INCLUDES += -I"../../src/host/lua-5.3.0/src" @@ -134,7 +134,7 @@ endif ifeq ($(config),debug) OBJDIR = obj/Debug - TARGETDIR = ../../bin/windows + TARGETDIR = ../../bin/arch override TARGET = $(TARGETDIR)/genie.exe DEFINES += -D_DEBUG -DLUA_COMPAT_MODULE INCLUDES += -I"../../src/host/lua-5.3.0/src" diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/build/vs2017/genie.vcxproj b/Src/external_dependencies/openmpt-trunk/include/genie/build/vs2017/genie.vcxproj index 32d12c0a7..849322cc2 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/build/vs2017/genie.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/include/genie/build/vs2017/genie.vcxproj @@ -39,14 +39,14 @@ - ..\..\bin\windows\ + ..\..\bin\arch\ obj\Release\ genie .exe false - ..\..\bin\windows\ + ..\..\bin\arch\ obj\Debug\ genie .exe diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/build/vs2019/genie.vcxproj b/Src/external_dependencies/openmpt-trunk/include/genie/build/vs2019/genie.vcxproj index 434a81ded..b34625fd2 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/build/vs2019/genie.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/include/genie/build/vs2019/genie.vcxproj @@ -42,14 +42,14 @@ - ..\..\bin\windows\ + ..\..\bin\arch\ obj\Release\ genie .exe false - ..\..\bin\windows\ + ..\..\bin\arch\ obj\Debug\ genie .exe diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/docs/scripting-reference.md b/Src/external_dependencies/openmpt-trunk/include/genie/docs/scripting-reference.md index b4241812d..b38b92928 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/docs/scripting-reference.md +++ b/Src/external_dependencies/openmpt-trunk/include/genie/docs/scripting-reference.md @@ -269,7 +269,7 @@ Possible values: * Configuration names - configuration names passed to [configurations](#configurations) * Action names - "vs2015", "gmake", etc. -* Operating system names - "windows", "macosx", etc. +* Operating system names - "arch", "macosx", etc. * Platform names - "ps3", "xbox360", etc. * Command-line options - either built-in or custom * File names - very limited, but some settings can be applied to specific files @@ -337,7 +337,7 @@ configuration "linux or macosx" Define a symbol based on a "not" ```lua -configuration "not windows" +configuration "not arch" defines { "NOT_WINDOWS" } ``` @@ -1029,7 +1029,7 @@ When linking against system libraries, do not include any prefix or file extensi Link against some system libraries ```lua -configuration "windows" +configuration "arch" links { "user32", "gdi32" } configuration "linux" @@ -1365,10 +1365,10 @@ _commands_ - one or more shell commands #### Examples ```lua -configuration "windows" +configuration "arch" postbuildcommands { "copy default.config bin\\project.config" } -configuration "not windows" +configuration "not arch" postbuildcommands { "cp default.config bin/project.config" } ``` @@ -1404,10 +1404,10 @@ _commands_ - one or more shell commands #### Examples ```lua -configuration "windows" +configuration "arch" prebuildcommands { "copy default.config bin\\project.config" } -configuration "not windows" +configuration "not arch" prebuildcommands { "cp default.config bin/project.config" } ``` @@ -1425,10 +1425,10 @@ _commands_ - one or more shell commands #### Examples ```lua -configuration "windows" +configuration "arch" prelinkcommands { "copy default.config bin\\project.config" } -configuration "not windows" +configuration "not arch" prelinkcommands { "cp default.config bin/project.config" } ``` @@ -2072,7 +2072,7 @@ _falseval_ - value to return if _condition_ evaluates to `false` #### Examples ```lua -result = iif(os.is("windows"), "is windows", "is not windows") +result = iif(os.is("arch"), "is arch", "is not arch") ``` Note that all expressions are evaluated before the condition is checked. The following expression cannot be implemented with an `iif` because it may try to concatenate a string value. @@ -2125,15 +2125,15 @@ The path containing the library file, if found. Otherwise, `nil`. Identifies the currently-targeted operating system. #### Return Value -One of "bsd", "linux", "macosx", "solaris", or "windows" +One of "bsd", "linux", "macosx", "solaris", or "arch" **Note:** This function returns the OS being targeted, which is not necessarily the same as the OS on which GENie is being run. #### Example ```lua -if os.get() == "windows" then - -- do something windows-specific +if os.get() == "arch" then + -- do something arch-specific end ``` @@ -2184,7 +2184,7 @@ print(string.format(" %d.%d.%d (%s)", Checks the current operating system identifier against a particular value #### Arguments -_id_ - one of "bsd", "linux", "macosx", "solaris", or "windows" +_id_ - one of "bsd", "linux", "macosx", "solaris", or "arch" **Note:** This function returns the OS being targeted, which is not necessarily the same as the OS on which GENie is being run. diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/makefile b/Src/external_dependencies/openmpt-trunk/include/genie/makefile index 9df2558f2..f1170875b 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/makefile +++ b/Src/external_dependencies/openmpt-trunk/include/genie/makefile @@ -19,7 +19,7 @@ endif endif endif else -OS=windows +OS=arch endif .PHONY: release @@ -39,7 +39,7 @@ clean: $(SILENT) -rm -rf bin projgen: - $(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).windows --os=windows $(PROJECT_TYPE) + $(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).arch --os=arch $(PROJECT_TYPE) $(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).linux --os=linux $(PROJECT_TYPE) $(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).darwin --os=macosx --platform=universal32 $(PROJECT_TYPE) $(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).freebsd --os=bsd $(PROJECT_TYPE) @@ -47,7 +47,7 @@ projgen: rebuild: $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).$(OS) clean all -release-windows release-darwin: $(GENIE) +release-arch release-darwin: $(GENIE) $(GENIE) release $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).$(OS) clean all $(SILENT) git checkout src/host/version.h @@ -56,12 +56,12 @@ release-linux: $(GENIE) $(SILENT) $(GENIE) release $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).darwin clean all CC=x86_64-apple-darwin20.2-clang $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).linux clean all - $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).windows clean all CC=x86_64-w64-mingw32-gcc + $(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).arch clean all CC=x86_64-w64-mingw32-gcc $(SILENT) git checkout src/host/version.h release: release-$(OS) dist: release cp bin/linux/genie ../bx/tools/bin/linux/ - cp bin/windows/genie.exe ../bx/tools/bin/windows/ + cp bin/arch/genie.exe ../bx/tools/bin/arch/ cp bin/darwin/genie ../bx/tools/bin/darwin/ diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/scripts/genie.lua b/Src/external_dependencies/openmpt-trunk/include/genie/scripts/genie.lua index 7e64ad9a6..06b6bc92b 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/scripts/genie.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/scripts/genie.lua @@ -60,8 +60,8 @@ configuration "vs*" defines { "_CRT_SECURE_NO_WARNINGS" } - configuration "windows" - targetdir "../bin/windows" + configuration "arch" + targetdir "../bin/arch" links { "ole32" } configuration "linux" diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/scripts/release.lua b/Src/external_dependencies/openmpt-trunk/include/genie/scripts/release.lua index d1173d5f9..1b4b9f942 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/scripts/release.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/scripts/release.lua @@ -37,7 +37,7 @@ function dorelease() print("Generating project files...") - exec(_PREMAKE_COMMAND .. " /to=../build/gmake.windows /os=windows gmake") + exec(_PREMAKE_COMMAND .. " /to=../build/gmake.arch /os=arch gmake") exec(_PREMAKE_COMMAND .. " /to=../build/gmake.linux /os=linux gmake") exec(_PREMAKE_COMMAND .. " /to=../build/gmake.darwin /os=macosx /platform=universal32 gmake") diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/cmake/cmake_project.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/cmake/cmake_project.lua index 33aa3ba91..68ad92ab4 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/cmake/cmake_project.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/cmake/cmake_project.lua @@ -72,7 +72,7 @@ end function cmake.header(prj) _p('# %s project autogenerated by GENie', premake.action.current().shortname) _p('cmake_minimum_required(VERSION 3.15)') - if os.is("windows") then + if os.is("arch") then -- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html _p('cmake_policy(SET CMP0091 NEW)') end diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/cmake/cmake_workspace.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/cmake/cmake_workspace.lua index ed3c88274..43f6535d5 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/cmake/cmake_workspace.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/cmake/cmake_workspace.lua @@ -33,7 +33,7 @@ function premake.cmake.workspace(sln) ######################################################################### ]]) - if os.is("windows") then + if os.is("arch") then -- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html f:write('cmake_policy(SET CMP0091 NEW)\n') end @@ -44,7 +44,7 @@ function premake.cmake.workspace(sln) # CMakeLists autogenerated by GENie cmake_minimum_required(VERSION 3.15) ]]) - if os.is("windows") then + if os.is("arch") then -- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html _p('cmake_policy(SET CMP0091 NEW)') end diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/example/_example.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/example/_example.lua index d6a0c17bf..940cf9863 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/example/_example.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/example/_example.lua @@ -24,7 +24,7 @@ -- Some actions imply a particular operating system: Visual Studio only -- runs on Windows, and Xcode only on Mac OS X. If this is the case, - -- uncomment this line and set it to one of "windows", "linux" or "macosx". + -- uncomment this line and set it to one of "arch", "linux" or "macosx". -- Otherwise, this action will target the current operating system. -- os = "macosx", diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/ninja/ninja_cpp.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/ninja/ninja_cpp.lua index 9519fc45d..7000505ae 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/ninja/ninja_cpp.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/ninja/ninja_cpp.lua @@ -9,7 +9,7 @@ local cpp = premake.ninja.cpp local p = premake local function wrap_ninja_cmd(c) - if os.is("windows") then + if os.is("arch") then return 'cmd /c "' .. c .. '"' else return c diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/qbs/qbs_cpp.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/qbs/qbs_cpp.lua index 4d76e1787..f82d6b819 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/qbs/qbs_cpp.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/qbs/qbs_cpp.lua @@ -109,7 +109,7 @@ function qbs.generate_project(prj) _p(indent, 'cpp.cxxLanguageVersion: "c++98"') end - if os.is("windows") then + if os.is("arch") then if not cfg.flags.WinMain and (cfg.kind == 'ConsoleApp' or cfg.kind == 'WindowedApp') then if cfg.flags.Unicode then _p(indent, 'cpp.entryPoint: "wmainCRTStartup"') @@ -188,9 +188,9 @@ function qbs.generate_project(prj) end if cfg.flags.Unicode then - _p(indent, 'cpp.windowsApiCharacterSet: "unicode"') + _p(indent, 'cpp.archApiCharacterSet: "unicode"') else - _p(indent, 'cpp.windowsApiCharacterSet: ""') + _p(indent, 'cpp.archApiCharacterSet: ""') end if not cfg.pchheader or cfg.flags.NoPCH then diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/qbs/qbs_solution.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/qbs/qbs_solution.lua index d912617da..6a42323d1 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/qbs/qbs_solution.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/qbs/qbs_solution.lua @@ -66,7 +66,7 @@ function qbs.generate_user(sln) local qtcreatordir = "" - if _OS == "windows" then + if _OS == "arch" then qtcreatordir = path.join(os.getenv("APPDATA"), "QtProject/qtcreator") else qtcreatordir = path.join(os.getenv("HOME"), ".config/QtProject/qtcreator") diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2010.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2010.lua index e91d094de..7189fd11e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2010.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2010.lua @@ -16,7 +16,7 @@ trigger = "vs2010", shortname = "Visual Studio 2010", description = "Generate Microsoft Visual Studio 2010 project files", - os = "windows", + os = "arch", valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" }, diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2012.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2012.lua index 7ee903d88..ff126408b 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2012.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2012.lua @@ -18,7 +18,7 @@ trigger = "vs2012", shortname = "Visual Studio 2012", description = "Generate Microsoft Visual Studio 2012 project files", - os = "windows", + os = "arch", valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" }, diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2013.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2013.lua index a9b4d715d..28db1b4cd 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2013.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2013.lua @@ -18,7 +18,7 @@ trigger = "vs2013", shortname = "Visual Studio 2013", description = "Generate Microsoft Visual Studio 2013 project files", - os = "windows", + os = "arch", valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" }, diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2015.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2015.lua index 264a2aaac..5f2c3f415 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2015.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2015.lua @@ -17,7 +17,7 @@ trigger = "vs2015", shortname = "Visual Studio 2015", description = "Generate Microsoft Visual Studio 2015 project files", - os = "windows", + os = "arch", valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" }, @@ -57,7 +57,7 @@ solutionVersion = "12", targetFramework = "4.5", toolsVersion = "14.0", - windowsTargetPlatformVersion = "8.1", + archTargetPlatformVersion = "8.1", supports64bitEditContinue = true, intDirAbsolute = false, } diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2017.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2017.lua index ae515f43c..337478370 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2017.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2017.lua @@ -17,7 +17,7 @@ trigger = "vs2017", shortname = "Visual Studio 2017", description = "Generate Microsoft Visual Studio 2017 project files", - os = "windows", + os = "arch", valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" }, @@ -57,7 +57,7 @@ solutionVersion = "12", targetFramework = "4.5.2", toolsVersion = "15.0", - windowsTargetPlatformVersion = "8.1", + archTargetPlatformVersion = "8.1", supports64bitEditContinue = true, intDirAbsolute = false, } diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2019.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2019.lua index dbe2458bb..2ccc7e681 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2019.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vs2019.lua @@ -17,7 +17,7 @@ trigger = "vs2019", shortname = "Visual Studio 2019", description = "Generate Microsoft Visual Studio 2019 project files", - os = "windows", + os = "arch", valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" }, @@ -57,7 +57,7 @@ solutionVersion = "12", targetFramework = "4.7.2", toolsVersion = "16.0", - windowsTargetPlatformVersion = "10.0", + archTargetPlatformVersion = "10.0", supports64bitEditContinue = true, intDirAbsolute = false, } diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vstudio_vcxproj.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vstudio_vcxproj.lua index 8d769b5ba..3b62d5426 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vstudio_vcxproj.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/actions/vstudio/vstudio_vcxproj.lua @@ -35,12 +35,12 @@ _p(2, '{%s}',prj.uuid) _p(2, '%s',prj.name) if vstudio.storeapp ~= "durango" then - local windowsTargetPlatformVersion = prj.windowstargetplatformversion or action.vstudio.windowsTargetPlatformVersion - if windowsTargetPlatformVersion ~= nil then - _p(2,'%s',windowsTargetPlatformVersion) + local archTargetPlatformVersion = prj.archtargetplatformversion or action.vstudio.archTargetPlatformVersion + if archTargetPlatformVersion ~= nil then + _p(2,'%s',archTargetPlatformVersion) - if windowsTargetPlatformVersion and string.startswith(windowsTargetPlatformVersion, "10.") then - _p(2,'%s', prj.windowstargetplatformminversion or "10.0.10240.0") + if archTargetPlatformVersion and string.startswith(archTargetPlatformVersion, "10.") then + _p(2,'%s', prj.archtargetplatformminversion or "10.0.10240.0") end end end @@ -789,7 +789,7 @@ local function getcfglinks(cfg) local haswholearchive = #cfg.wholearchive > 0 - local msvcnaming = premake.getnamestyle(cfg) == "windows" + local msvcnaming = premake.getnamestyle(cfg) == "arch" local iscppprj = premake.iscppproject(cfg) local isnetprj = premake.isdotnetproject(cfg) local linkobjs = {} @@ -1734,9 +1734,9 @@ _p('') if vstudio.storeapp == "10.0" then _p('') elseif vstudio.storeapp == "durango" then _p('') diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/api.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/api.lua index fd6a095b4..3ad5ab84f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/api.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/api.lua @@ -940,13 +940,13 @@ end } newapifield { - name = "windowstargetplatformversion", + name = "archtargetplatformversion", kind = "string", scope = "project", } newapifield { - name = "windowstargetplatformminversion", + name = "archtargetplatformminversion", kind = "string", scope = "project", } diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/bake.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/bake.lua index 9d69487e6..e8cac4d0a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/bake.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/bake.lua @@ -430,7 +430,7 @@ -- build the targets cfg.buildtarget = premake.gettarget(cfg, "build", pathstyle, namestyle, cfg.system) cfg.linktarget = premake.gettarget(cfg, "link", pathstyle, namestyle, cfg.system) - if pathstyle == "windows" then + if pathstyle == "arch" then cfg.objectsdir = path.translate(cfg.objectsdir, "\\") end diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/cmdline.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/cmdline.lua index 0c124e026..cee1087ea 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/cmdline.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/cmdline.lua @@ -56,7 +56,7 @@ { "linux", "Linux" }, { "macosx", "Apple Mac OS X" }, { "solaris", "Solaris" }, - { "windows", "Microsoft Windows" }, + { "arch", "Microsoft Windows" }, } } diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/globals.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/globals.lua index fb74546b9..79c4740fa 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/globals.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/globals.lua @@ -55,7 +55,7 @@ { cfgsuffix = "xbox360", iscrosscompiler = true, - namestyle = "windows", + namestyle = "arch", }, PowerPC = { @@ -83,7 +83,7 @@ cfgsuffix = "durango", iscrosscompiler = true, nosharedlibs = true, - namestyle = "windows", + namestyle = "arch", }, TegraAndroid = { diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/os.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/os.lua index 3cddcbb45..8dce954b1 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/os.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/os.lua @@ -59,7 +59,7 @@ local path, formats -- assemble a search path, depending on the platform - if os.is("windows") then + if os.is("arch") then formats = { "%s.dll", "%s" } path = os.getenv("PATH") else @@ -135,7 +135,7 @@ -- Identify the system local arch = "" - if _OS == "windows" then + if _OS == "arch" then arch = os.getenv("PROCESSOR_ARCHITECTURE") elseif _OS == "macosx" then arch = os.outputof("echo $HOSTTYPE") diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/path.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/path.lua index d9eb936c4..c5291a03d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/path.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/path.lua @@ -311,7 +311,7 @@ return result else if (not sep) then - if (os.is("windows")) then + if (os.is("arch")) then sep = "\\" else sep = "/" diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/project.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/project.lua index 94bba705a..f6678408a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/base/project.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/base/project.lua @@ -358,7 +358,7 @@ item = path.getdirectory(link) elseif (part == "fullpath") then item = link - if namestyle == "windows" then + if namestyle == "arch" then if premake.iscppproject(cfg) then item = item .. ".lib" elseif premake.isdotnetproject(cfg) then @@ -380,7 +380,7 @@ end if item then - if pathstyle == "windows" and part ~= "object" then + if pathstyle == "arch" and part ~= "object" then item = path.translate(item, "\\") end if not table.contains(result, item) then @@ -401,7 +401,7 @@ -- @param cfg -- The configuration to check. -- @returns --- The target naming style, one of "windows", "posix", or "PS3". +-- The target naming style, one of "arch", "posix", or "PS3". -- function premake.getnamestyle(cfg) @@ -417,12 +417,12 @@ -- @param cfg -- The configuration to check. -- @returns --- The target path style, one of "windows" or "posix". +-- The target path style, one of "arch" or "posix". -- function premake.getpathstyle(cfg) - if premake.action.current().os == "windows" then - return "windows" + if premake.action.current().os == "arch" then + return "arch" else return "posix" end @@ -437,11 +437,11 @@ -- @param direction -- One of 'build' for the build target, or 'link' for the linking target. -- @param pathstyle --- The path format, one of "windows" or "posix". This comes from the current --- action: Visual Studio uses "windows", GMake uses "posix", etc. +-- The path format, one of "arch" or "posix". This comes from the current +-- action: Visual Studio uses "arch", GMake uses "posix", etc. -- @param namestyle --- The file naming style, one of "windows" or "posix". This comes from the --- current tool: GCC uses "posix", MSC uses "windows", etc. +-- The file naming style, one of "arch" or "posix". This comes from the +-- current tool: GCC uses "posix", MSC uses "arch", etc. -- @param system -- The target operating system, which can modify the naming style. For example, -- shared libraries on Mac OS X use a ".dylib" extension. @@ -465,16 +465,16 @@ local kind = cfg.kind if premake.iscppproject(cfg) or premake.isvalaproject(cfg) then -- On Windows, shared libraries link against a static import library - if (namestyle == "windows" or system == "windows") + if (namestyle == "arch" or system == "arch") and kind == "SharedLib" and direction == "link" and not cfg.flags.NoImportLib then kind = "StaticLib" end - -- Posix name conventions only apply to static libs on windows (by user request) - if namestyle == "posix" and system == "windows" and kind ~= "StaticLib" then - namestyle = "windows" + -- Posix name conventions only apply to static libs on arch (by user request) + if namestyle == "posix" and system == "arch" and kind ~= "StaticLib" then + namestyle = "arch" end end @@ -497,7 +497,7 @@ dir = path.join(dir, subdir) - if namestyle == "windows" then + if namestyle == "arch" then if kind == "ConsoleApp" or kind == "WindowedApp" then ext = ".exe" elseif kind == "SharedLib" then @@ -580,7 +580,7 @@ result.fullpath = path.join(result.directory, result.name) result.bundlepath = bundlepath or result.fullpath - if pathstyle == "windows" then + if pathstyle == "arch" then result.directory = path.translate(result.directory, "\\") result.subdirectory = path.translate(result.subdirectory, "\\") result.fullpath = path.translate(result.fullpath, "\\") diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/host/lua-5.3.0/src/loadlib.c b/Src/external_dependencies/openmpt-trunk/include/genie/src/host/lua-5.3.0/src/loadlib.c index 7f8d99029..2b60a14bc 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/host/lua-5.3.0/src/loadlib.c +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/host/lua-5.3.0/src/loadlib.c @@ -176,7 +176,7 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) { ** ======================================================================= */ -#include +#include #undef setprogdir diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/host/os_match.c b/Src/external_dependencies/openmpt-trunk/include/genie/src/host/os_match.c index a26738105..87d7c4a35 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/host/os_match.c +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/host/os_match.c @@ -12,7 +12,7 @@ #if PLATFORM_WINDOWS #define WIN32_LEAN_AND_MEAN -#include +#include typedef struct struct_MatchInfo { diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/host/os_pathsearch.c b/Src/external_dependencies/openmpt-trunk/include/genie/src/host/os_pathsearch.c index d16a53098..f4c7e6a6c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/host/os_pathsearch.c +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/host/os_pathsearch.c @@ -27,7 +27,7 @@ int os_pathsearch(lua_State* L) const char* split; /* look for the closest path separator ; or : */ - /* can't use : on windows because it breaks on C:\path */ + /* can't use : on arch because it breaks on C:\path */ const char* semi = strchr(path, ';'); #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_OS2) const char* full = strchr(path, ':'); diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/host/premake.h b/Src/external_dependencies/openmpt-trunk/include/genie/src/host/premake.h index f0782db41..170184b4d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/host/premake.h +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/host/premake.h @@ -29,14 +29,14 @@ #define PLATFORM_STRING "os2" #else #define PLATFORM_WINDOWS (1) -#define PLATFORM_STRING "windows" +#define PLATFORM_STRING "arch" #endif /* Pull in platform-specific headers required by built-in functions */ #if PLATFORM_WINDOWS #define WIN32_LEAN_AND_MEAN -#include +#include #else #include #include diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/dotnet.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/dotnet.lua index bc7ca36c9..f8ddba8e3 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/dotnet.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/dotnet.lua @@ -6,7 +6,7 @@ premake.dotnet = { } - premake.dotnet.namestyle = "windows" + premake.dotnet.namestyle = "arch" -- diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/gcc.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/gcc.lua index 55df9bae7..078e97108 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/gcc.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/gcc.lua @@ -156,7 +156,7 @@ function premake.gcc.getcflags(cfg) local result = table.translate(cfg.flags, cflags) table.insert(result, platforms[cfg.platform].flags) - if cfg.system ~= "windows" and cfg.kind == "SharedLib" then + if cfg.system ~= "arch" and cfg.kind == "SharedLib" then table.insert(result, "-fPIC") end return result @@ -203,13 +203,13 @@ table.insert(result, "-shared") end - if cfg.system == "windows" and not cfg.flags.NoImportLib then + if cfg.system == "arch" and not cfg.flags.NoImportLib then table.insert(result, '-Wl,--out-implib="' .. cfg.linktarget.fullpath .. '"') end end - if cfg.kind == "WindowedApp" and cfg.system == "windows" then - table.insert(result, "-mwindows") + if cfg.kind == "WindowedApp" and cfg.system == "arch" then + table.insert(result, "-march") end local platform = platforms[cfg.platform] diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/msc.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/msc.lua index 28e3d8b5c..05a32c45b 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/msc.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/msc.lua @@ -6,4 +6,4 @@ premake.msc = { } - premake.msc.namestyle = "windows" + premake.msc.namestyle = "arch" diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/ow.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/ow.lua index b59c8991f..917f456cf 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/ow.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/ow.lua @@ -5,7 +5,7 @@ -- premake.ow = { } - premake.ow.namestyle = "windows" + premake.ow.namestyle = "arch" -- diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/snc.lua b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/snc.lua index 455ef3847..ffba5c393 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/snc.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/src/tools/snc.lua @@ -8,7 +8,7 @@ premake.snc = { } --- TODO: Will cfg.system == "windows" ever be true for SNC? If +-- TODO: Will cfg.system == "arch" ever be true for SNC? If -- not, remove the conditional blocks that use this test. -- diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_action.lua b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_action.lua index 9250ca09f..a9316a489 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_action.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_action.lua @@ -68,6 +68,6 @@ local oldos = _OS _OS = "linux" premake.action.set("vs2008") - test.isequal(_OS, "windows") + test.isequal(_OS, "arch") _OS = oldos end diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_api.lua b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_api.lua index 3c8ac27e3..70de61cf8 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_api.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_api.lua @@ -219,14 +219,14 @@ end function suite.solution_LeavesConfigActive_OnActiveSolutionAndNoName() - local cfg = configuration "windows" + local cfg = configuration "arch" solution() test.istrue(cfg == premake.CurrentConfiguration) end function suite.solution_LeavesConfigActive_OnActiveProjectAndNoName() project "MyProject" - local cfg = configuration "windows" + local cfg = configuration "arch" solution() test.istrue(cfg == premake.CurrentConfiguration) end diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_os.lua b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_os.lua index 0efdb1ec6..8e65adf75 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_os.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_os.lua @@ -14,7 +14,7 @@ -- function suite.findlib_FindSystemLib() - if os.is("windows") then + if os.is("arch") then test.istrue(os.findlib("user32")) else test.istrue(os.findlib("m")) diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_path.lua b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_path.lua index 2332dcee6..365fb155f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_path.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_path.lua @@ -242,7 +242,7 @@ function suite.translate_ReturnsCorrectSeparator_OnMixedPath() local actual = path.translate("dir\\dir/file") - if (os.is("windows")) then + if (os.is("arch")) then test.isequal("dir\\dir\\file", actual) else test.isequal("dir/dir/file", actual) diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_premake_command.lua b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_premake_command.lua index 0c29c5f5e..085cb0f70 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_premake_command.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/tests/base/test_premake_command.lua @@ -9,6 +9,6 @@ function suite.valueIsSet() - local filename = iif(os.is("windows"), "premake4.exe", "premake4") + local filename = iif(os.is("arch"), "premake4.exe", "premake4") test.isequal(path.getabsolute("../bin/debug/" .. filename), _PREMAKE_COMMAND) end diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/tests/test_keywords.lua b/Src/external_dependencies/openmpt-trunk/include/genie/tests/test_keywords.lua index 47bb3c004..67a02fa1c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/tests/test_keywords.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/tests/test_keywords.lua @@ -33,55 +33,55 @@ -- function T.keywords.matches_simple_strings() - test.istrue(premake.iskeywordmatch("debug", { "debug", "windows", "vs2005" })) + test.istrue(premake.iskeywordmatch("debug", { "debug", "arch", "vs2005" })) end function T.keywords.match_files_with_simple_strings() - test.isfalse(premake.iskeywordmatch("release", { "debug", "windows", "vs2005" })) + test.isfalse(premake.iskeywordmatch("release", { "debug", "arch", "vs2005" })) end function T.keywords.matches_with_patterns() - test.istrue(premake.iskeywordmatch("vs20.*", { "debug", "windows", "vs2005" })) + test.istrue(premake.iskeywordmatch("vs20.*", { "debug", "arch", "vs2005" })) end function T.keywords.match_fails_with_not_term() - test.isfalse(premake.iskeywordmatch("not windows", { "debug", "windows", "vs2005" })) + test.isfalse(premake.iskeywordmatch("not arch", { "debug", "arch", "vs2005" })) end function T.keywords.match_ok_with_not_term() - test.istrue(premake.iskeywordmatch("not linux", { "debug", "windows", "vs2005" })) + test.istrue(premake.iskeywordmatch("not linux", { "debug", "arch", "vs2005" })) end function T.keywords.match_ok_with_first_or() - test.istrue(premake.iskeywordmatch("windows or linux", { "debug", "windows", "vs2005" })) + test.istrue(premake.iskeywordmatch("arch or linux", { "debug", "arch", "vs2005" })) end function T.keywords.match_ok_with_first_or() - test.istrue(premake.iskeywordmatch("windows or linux", { "debug", "linux", "vs2005" })) + test.istrue(premake.iskeywordmatch("arch or linux", { "debug", "linux", "vs2005" })) end function T.keywords.match_ok_with_not_and_or() - test.istrue(premake.iskeywordmatch("not macosx or linux", { "debug", "windows", "vs2005" })) + test.istrue(premake.iskeywordmatch("not macosx or linux", { "debug", "arch", "vs2005" })) end function T.keywords.match_fail_with_not_and_or() - test.isfalse(premake.iskeywordmatch("not macosx or windows", { "debug", "windows", "vs2005" })) + test.isfalse(premake.iskeywordmatch("not macosx or arch", { "debug", "arch", "vs2005" })) end function T.keywords.match_ok_required_term() - test.istrue(premake.iskeywordsmatch({ "debug", "hello.c" }, { "debug", "windows", "vs2005", required="hello.c" })) + test.istrue(premake.iskeywordsmatch({ "debug", "hello.c" }, { "debug", "arch", "vs2005", required="hello.c" })) end function T.keywords.match_fail_required_term() - test.isfalse(premake.iskeywordsmatch({ "debug" }, { "debug", "windows", "vs2005", required="hello.c" })) + test.isfalse(premake.iskeywordsmatch({ "debug" }, { "debug", "arch", "vs2005", required="hello.c" })) end diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/tests/test_targets.lua b/Src/external_dependencies/openmpt-trunk/include/genie/tests/test_targets.lua index 6cbe2bb28..e08ff519e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/tests/test_targets.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/tests/test_targets.lua @@ -23,10 +23,10 @@ -- -- Path Style Name Style Example Environment -- ---------- ---------- ------------------- --- windows windows VStudio with MSC +-- arch arch VStudio with MSC -- posix posix GMake with GCC --- windows posix VStudio for PS3 --- posix windows GMake for .NET +-- arch posix VStudio for PS3 +-- posix arch GMake for .NET -- @@ -38,13 +38,13 @@ function T.targets.ConsoleApp_Build_WindowsNames() cfg.kind = "ConsoleApp" - result = premake.gettarget(cfg, "build", "posix", "windows", "macosx") + result = premake.gettarget(cfg, "build", "posix", "arch", "macosx") test.isequal([[../bin/MyProject.exe]], result.fullpath) end function T.targets.ConsoleApp_Build_PosixNames_OnWindows() cfg.kind = "ConsoleApp" - result = premake.gettarget(cfg, "build", "posix", "posix", "windows") + result = premake.gettarget(cfg, "build", "posix", "posix", "arch") test.isequal([[../bin/MyProject.exe]], result.fullpath) end @@ -74,13 +74,13 @@ function T.targets.WindowedApp_Build_WindowsNames() cfg.kind = "WindowedApp" - result = premake.gettarget(cfg, "build", "posix", "windows", "macosx") + result = premake.gettarget(cfg, "build", "posix", "arch", "macosx") test.isequal([[../bin/MyProject.exe]], result.fullpath) end function T.targets.WindowedApp_Build_PosixNames_OnWindows() cfg.kind = "WindowedApp" - result = premake.gettarget(cfg, "build", "posix", "posix", "windows") + result = premake.gettarget(cfg, "build", "posix", "posix", "arch") test.isequal([[../bin/MyProject.exe]], result.fullpath) end @@ -109,25 +109,25 @@ function T.targets.SharedLib_Build_WindowsNames() cfg.kind = "SharedLib" - result = premake.gettarget(cfg, "build", "posix", "windows", "macosx") + result = premake.gettarget(cfg, "build", "posix", "arch", "macosx") test.isequal([[../bin/MyProject.dll]], result.fullpath) end function T.targets.SharedLib_Link_WindowsNames() cfg.kind = "SharedLib" - result = premake.gettarget(cfg, "link", "posix", "windows", "macosx") + result = premake.gettarget(cfg, "link", "posix", "arch", "macosx") test.isequal([[../bin/MyProject.lib]], result.fullpath) end function T.targets.SharedLib_Build_PosixNames_OnWindows() cfg.kind = "SharedLib" - result = premake.gettarget(cfg, "build", "posix", "posix", "windows") + result = premake.gettarget(cfg, "build", "posix", "posix", "arch") test.isequal([[../bin/MyProject.dll]], result.fullpath) end function T.targets.SharedLib_Link_PosixNames_OnWindows() cfg.kind = "SharedLib" - result = premake.gettarget(cfg, "link", "posix", "posix", "windows") + result = premake.gettarget(cfg, "link", "posix", "posix", "arch") test.isequal([[../bin/libMyProject.a]], result.fullpath) end @@ -162,25 +162,25 @@ function T.targets.Bundle_Build_WindowsNames() cfg.kind = "Bundle" - result = premake.gettarget(cfg, "build", "posix", "windows", "macosx") + result = premake.gettarget(cfg, "build", "posix", "arch", "macosx") test.isequal([[../bin/MyProject.dll]], result.fullpath) end function T.targets.Bundle_Link_WindowsNames() cfg.kind = "Bundle" - result = premake.gettarget(cfg, "link", "posix", "windows", "macosx") + result = premake.gettarget(cfg, "link", "posix", "arch", "macosx") test.isequal([[../bin/MyProject.lib]], result.fullpath) end function T.targets.Bundle_Build_PosixNames_OnWindows() cfg.kind = "Bundle" - result = premake.gettarget(cfg, "build", "posix", "posix", "windows") + result = premake.gettarget(cfg, "build", "posix", "posix", "arch") test.isequal([[../bin/MyProject.dll]], result.fullpath) end function T.targets.Bundle_Link_PosixNames_OnWindows() cfg.kind = "Bundle" - result = premake.gettarget(cfg, "link", "posix", "posix", "windows") + result = premake.gettarget(cfg, "link", "posix", "posix", "arch") test.isequal([[../bin/libMyProject.a]], result.fullpath) end @@ -215,25 +215,25 @@ function T.targets.StaticLib_Build_WindowsNames() cfg.kind = "StaticLib" - result = premake.gettarget(cfg, "build", "posix", "windows", "macosx") + result = premake.gettarget(cfg, "build", "posix", "arch", "macosx") test.isequal([[../bin/MyProject.lib]], result.fullpath) end function T.targets.StaticLib_Link_WindowsNames() cfg.kind = "StaticLib" - result = premake.gettarget(cfg, "link", "posix", "windows", "macosx") + result = premake.gettarget(cfg, "link", "posix", "arch", "macosx") test.isequal([[../bin/MyProject.lib]], result.fullpath) end function T.targets.StaticLib_Build_PosixNames_OnWindows() cfg.kind = "StaticLib" - result = premake.gettarget(cfg, "build", "posix", "posix", "windows") + result = premake.gettarget(cfg, "build", "posix", "posix", "arch") test.isequal([[../bin/libMyProject.a]], result.fullpath) end function T.targets.StaticLib_Link_PosixNames_OnWindows() cfg.kind = "StaticLib" - result = premake.gettarget(cfg, "link", "posix", "posix", "windows") + result = premake.gettarget(cfg, "link", "posix", "posix", "arch") test.isequal([[../bin/libMyProject.a]], result.fullpath) end @@ -288,7 +288,7 @@ function T.targets.WindowsPaths() cfg.kind = "ConsoleApp" - result = premake.gettarget(cfg, "build", "windows", "windows", "linux") + result = premake.gettarget(cfg, "build", "arch", "arch", "linux") test.isequal([[..\bin]], result.directory) test.isequal([[..\bin\MyProject.exe]], result.fullpath) end diff --git a/Src/external_dependencies/openmpt-trunk/include/genie/tests/tools/test_gcc.lua b/Src/external_dependencies/openmpt-trunk/include/genie/tests/tools/test_gcc.lua index 2e78cb6c8..dd35d8381 100644 --- a/Src/external_dependencies/openmpt-trunk/include/genie/tests/tools/test_gcc.lua +++ b/Src/external_dependencies/openmpt-trunk/include/genie/tests/tools/test_gcc.lua @@ -28,7 +28,7 @@ -- function suite.cppflags_OnWindows() - cfg.system = "windows" + cfg.system = "arch" local r = premake.gcc.getcppflags(cfg) test.isequal("-MMD -MP", table.concat(r, " ")) end @@ -39,7 +39,7 @@ function suite.cflags_SharedLib_Windows() cfg.kind = "SharedLib" - cfg.system = "windows" + cfg.system = "arch" local r = premake.gcc.getcflags(cfg) test.isequal('', table.concat(r,"|")) end @@ -65,7 +65,7 @@ function suite.ldflags_SharedLib_Windows() cfg.kind = "SharedLib" - cfg.system = "windows" + cfg.system = "arch" local r = premake.gcc.getldflags(cfg) test.isequal('-s|-shared|-Wl,--out-implib="libMyProject.a"', table.concat(r,"|")) end diff --git a/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/encoder.c b/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/encoder.c index 48f46c7bf..fb4238d12 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/encoder.c +++ b/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/encoder.c @@ -255,7 +255,7 @@ lame_encode_frame() inbuf: |--------------|--------------|--------------| -Polyphase (18 windows, each shifted 32) +Polyphase (18 arch, each shifted 32) gr 0: window1 <----512----> window18 <----512----> diff --git a/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/machine.h b/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/machine.h index bf6fff21a..e72064240 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/machine.h +++ b/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/machine.h @@ -123,7 +123,7 @@ char *strchr(), *strrchr(); #if ( defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) ) # define WIN32_LEAN_AND_MEAN -# include +# include # include # define FLOAT_MAX FLT_MAX #else diff --git a/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/quantize.c b/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/quantize.c index 9ba9c16d6..add6417ab 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/quantize.c +++ b/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/quantize.c @@ -299,7 +299,7 @@ init_outer_loop(lame_internal_flags const *gfc, gr_info * const cod_info) /* By Takehiro TOMINAGA */ /* Within each scalefactor band, data is given for successive - time windows, beginning with window 0 and ending with window 2. + time arch, beginning with window 0 and ending with window 2. Within each window, the quantized values are then arranged in order of increasing frequency... */ diff --git a/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/util.h b/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/util.h index 13f0cd42a..5239a5f03 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/util.h +++ b/Src/external_dependencies/openmpt-trunk/include/lame/libmp3lame/util.h @@ -250,7 +250,7 @@ extern "C" { FLOAT amp_filter[32]; /* variables used by util.c */ - /* BPC = maximum number of filter convolution windows to precompute */ + /* BPC = maximum number of filter convolution arch to precompute */ #define BPC 320 double itime[2]; /* float precision seems to be not enough */ sample_t *inbuf_old[2]; diff --git a/Src/external_dependencies/openmpt-trunk/include/lame/mpglib/layer3.c b/Src/external_dependencies/openmpt-trunk/include/lame/mpglib/layer3.c index af5b69e7c..17ab142b0 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lame/mpglib/layer3.c +++ b/Src/external_dependencies/openmpt-trunk/include/lame/mpglib/layer3.c @@ -1275,7 +1275,7 @@ maybe still wrong??? (copy 12 to 13?) */ } /* end for(lwin; .. ; . ) */ if (do_l) { -/* also check l-part, if ALL bands in the three windows are 'empty' +/* also check l-part, if ALL bands in the three arch are 'empty' * and mode = mixed_mode */ int sfb = gr_infos->maxbandl; diff --git a/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/ext_header.c b/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/ext_header.c index e7e92bd59..6d7599fd9 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/ext_header.c +++ b/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/ext_header.c @@ -212,7 +212,7 @@ static LHAExtHeaderType lha_ext_header_path = { // Windows FILETIME format. The timestamps have 100ns accuracy, which is // much more accurate than the normal Unix time_t format. -static int ext_header_windows_timestamps(LHAFileHeader *header, +static int ext_header_arch_timestamps(LHAFileHeader *header, uint8_t *data, size_t data_len) { @@ -224,9 +224,9 @@ static int ext_header_windows_timestamps(LHAFileHeader *header, return 1; } -static LHAExtHeaderType lha_ext_header_windows_timestamps = { +static LHAExtHeaderType lha_ext_header_arch_timestamps = { LHA_EXT_HEADER_WINDOWS_TIMESTAMPS, - ext_header_windows_timestamps, + ext_header_arch_timestamps, 24 }; @@ -388,7 +388,7 @@ static const LHAExtHeaderType *ext_header_types[] = { &lha_ext_header_unix_username, &lha_ext_header_unix_group, &lha_ext_header_unix_timestamp, - &lha_ext_header_windows_timestamps, + &lha_ext_header_arch_timestamps, &lha_ext_header_os9, }; diff --git a/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_arch.h b/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_arch.h index 41b4e37cb..30edb7e16 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_arch.h +++ b/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_arch.h @@ -116,7 +116,7 @@ int lha_arch_utime(char *filename, unsigned int timestamp); * @return Non-zero if set successfully. */ -int lha_arch_set_windows_timestamps(char *filename, +int lha_arch_set_arch_timestamps(char *filename, uint64_t creation_time, uint64_t modification_time, uint64_t access_time); diff --git a/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_arch_win32.c b/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_arch_win32.c index ac8ee331a..bef78576c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_arch_win32.c +++ b/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_arch_win32.c @@ -28,7 +28,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #if LHA_ARCH == LHA_ARCH_WINDOWS #define WIN32_LEAN_AND_MEAN -#include +#include #include #include @@ -106,7 +106,7 @@ static int set_timestamps(char *filename, return result != 0; } -int lha_arch_set_windows_timestamps(char *filename, +int lha_arch_set_arch_timestamps(char *filename, uint64_t creation_time, uint64_t modification_time, uint64_t access_time) diff --git a/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_reader.c b/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_reader.c index 267b68f5f..abab0704f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_reader.c +++ b/Src/external_dependencies/openmpt-trunk/include/lhasa/lib/lha_reader.c @@ -466,7 +466,7 @@ static int set_timestamps_from_header(char *path, LHAFileHeader *header) { #if LHA_ARCH == LHA_ARCH_WINDOWS if (LHA_FILE_HAVE_EXTRA(header, LHA_FILE_WINDOWS_TIMESTAMPS)) { - return lha_arch_set_windows_timestamps( + return lha_arch_set_arch_timestamps( path, header->win_creation_time, header->win_modification_time, diff --git a/Src/external_dependencies/openmpt-trunk/include/miniz/OpenMPT.txt b/Src/external_dependencies/openmpt-trunk/include/miniz/OpenMPT.txt index eae92ddd1..8e4b34004 100644 --- a/Src/external_dependencies/openmpt-trunk/include/miniz/OpenMPT.txt +++ b/Src/external_dependencies/openmpt-trunk/include/miniz/OpenMPT.txt @@ -3,7 +3,7 @@ https://github.com/richgel999/miniz 2.2.0 Modifications for OpenMPT: * #define MINIZ_NO_STDIO has been set because OpenMPT does not need stdio - functionality and miniz relies on secure-CRT file i/o functions in windows + functionality and miniz relies on secure-CRT file i/o functions in arch builds which are not available on all mingw64 versions. * #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 is used unconditionally, because unaligned access is undefined behaviour. diff --git a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat.c b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat.c index dacc77bef..00f5ef343 100644 --- a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat.c +++ b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat.c @@ -31,10 +31,10 @@ /* Win32 is only supported with unicode now. These headers also cover module stuff. The WANT_WIN32_UNICODE macro is synonymous with - "want windows-specific API, and only the unicode variants of which". */ + "want arch-specific API, and only the unicode variants of which". */ #ifdef WANT_WIN32_UNICODE #include -#include +#include #include #include #endif @@ -183,7 +183,7 @@ char* compat_catpath(const char *prefix, const char* path) { char *ret = NULL; #ifdef WANT_WIN32_UNICODE - wchar_t *wprefix = NULL; /* Wide windows versions of */ + wchar_t *wprefix = NULL; /* Wide arch versions of */ wchar_t *wpath = NULL; /* input arguments. */ wchar_t *locwret = NULL; /* Tmp return value from LocalAlloc */ /* diff --git a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat_str.c b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat_str.c index 2bda8131b..a6948e59f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat_str.c +++ b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat_str.c @@ -13,10 +13,10 @@ /* Win32 is only supported with unicode now. These headers also cover module stuff. The WANT_WIN32_UNICODE macro is synonymous with - "want windows-specific API, and only the unicode variants of which". */ + "want arch-specific API, and only the unicode variants of which". */ #if defined (_WIN32) || defined (__CYGWIN__) #include -#include +#include #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/wpathconv.h b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/wpathconv.h index 78b4294c2..d1fb94840 100644 --- a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/wpathconv.h +++ b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/wpathconv.h @@ -1,5 +1,5 @@ /* - wpathconv: static functions for windows file path conversions + wpathconv: static functions for arch file path conversions This file is intended to be included in libcompat sources for internal use. It is separated out to be able to split off the dlopen functions into a @@ -50,7 +50,7 @@ static int wpath_need_elongation(wchar_t *wpath) return 0; } -/* Take any wide windows path and turn it into a path that is allowed +/* Take any wide arch path and turn it into a path that is allowed to be longer than MAX_PATH, if it is not already. */ static wchar_t* wlongpath(wchar_t *wpath) { @@ -86,7 +86,7 @@ static wchar_t* wlongpath(wchar_t *wpath) return wlpath; } -/* Convert unix path to wide windows path, optionally marking +/* Convert unix path to wide arch path, optionally marking it as long path if necessary. */ static wchar_t* u2wlongpath(const char *upath) { diff --git a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/icy2utf8.c b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/icy2utf8.c index 71605d2ac..0603cdc59 100644 --- a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/icy2utf8.c +++ b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/icy2utf8.c @@ -23,7 +23,7 @@ * damage or existence of a defect, except proven that it results out * of said person's immediate fault when using the work as intended. *- - * Convert from ICY encoding (windows-1252 codepage) to UTF-8 + * Convert from ICY encoding (arch-1252 codepage) to UTF-8 */ #include "config.h" diff --git a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/layer3.c b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/layer3.c index a25ef0982..2f7c2689e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/layer3.c +++ b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/layer3.c @@ -1115,7 +1115,7 @@ maybe still wrong??? (copy 12 to 13?) */ } } /* end for(lwin; .. ; . ) */ - /* also check l-part, if ALL bands in the three windows are 'empty' and mode = mixed_mode */ + /* also check l-part, if ALL bands in the three arch are 'empty' and mode = mixed_mode */ if(do_l) { int sfb = gr_info->maxbandl; diff --git a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/mpg123.h.in b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/mpg123.h.in index 1fca4585b..cae90871d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/mpg123.h.in +++ b/Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/mpg123.h.in @@ -1796,7 +1796,7 @@ MPG123_EXPORT int mpg123_id3_raw( mpg123_handle *mh */ MPG123_EXPORT int mpg123_icy(mpg123_handle *mh, char **icy_meta); -/** Decode from windows-1252 (the encoding ICY metainfo used) to UTF-8. +/** Decode from arch-1252 (the encoding ICY metainfo used) to UTF-8. * Note that this is very similar to mpg123_store_utf8(&sb, mpg123_text_icy, icy_text, strlen(icy_text+1)) . * \param icy_text The input data in ICY encoding * \return pointer to newly allocated buffer with UTF-8 data (You free() it!) */ diff --git a/Src/external_dependencies/openmpt-trunk/include/ogg/README.md b/Src/external_dependencies/openmpt-trunk/include/ogg/README.md index 0101cb14d..380d40b34 100644 --- a/Src/external_dependencies/openmpt-trunk/include/ogg/README.md +++ b/Src/external_dependencies/openmpt-trunk/include/ogg/README.md @@ -65,9 +65,9 @@ Use the project file in the win32 directory. It should compile out of the box. #### Cross-compiling from Linux to Windows #### -It is also possible to cross compile from Linux to windows using the MinGW +It is also possible to cross compile from Linux to arch using the MinGW cross tools and even to run the test suite under Wine, the Linux/*nix -windows emulator. +arch emulator. On Debian and Ubuntu systems, these cross compiler tools can be installed by doing: diff --git a/Src/external_dependencies/openmpt-trunk/include/opus/celt/arm/armcpu.c b/Src/external_dependencies/openmpt-trunk/include/opus/celt/arm/armcpu.c index 694a63b78..265c8da26 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opus/celt/arm/armcpu.c +++ b/Src/external_dependencies/openmpt-trunk/include/opus/celt/arm/armcpu.c @@ -48,7 +48,7 @@ /*For GetExceptionCode() and EXCEPTION_ILLEGAL_INSTRUCTION.*/ # define WIN32_LEAN_AND_MEAN # define WIN32_EXTRA_LEAN -# include +# include static OPUS_INLINE opus_uint32 opus_cpu_capabilities(void){ opus_uint32 flags; diff --git a/Src/external_dependencies/openmpt-trunk/include/opus/celt/arm/celt_mdct_ne10.c b/Src/external_dependencies/openmpt-trunk/include/opus/celt/arm/celt_mdct_ne10.c index 3531d02d1..64238de37 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opus/celt/arm/celt_mdct_ne10.c +++ b/Src/external_dependencies/openmpt-trunk/include/opus/celt/arm/celt_mdct_ne10.c @@ -216,7 +216,7 @@ void clt_mdct_backward_neon(const mdct_lookup *l, im = yp0[1]; t0 = t[i]; t1 = t[N4+i]; - /* We'd scale up by 2 here, but instead it's done when mixing the windows */ + /* We'd scale up by 2 here, but instead it's done when mixing the arch */ yr = S_MUL(re,t0) + S_MUL(im,t1); yi = S_MUL(re,t1) - S_MUL(im,t0); re = yp1[0]; @@ -226,7 +226,7 @@ void clt_mdct_backward_neon(const mdct_lookup *l, t0 = t[(N4-i-1)]; t1 = t[(N2-i-1)]; - /* We'd scale up by 2 here, but instead it's done when mixing the windows */ + /* We'd scale up by 2 here, but instead it's done when mixing the arch */ yr = S_MUL(re,t0) + S_MUL(im,t1); yi = S_MUL(re,t1) - S_MUL(im,t0); yp1[0] = yr; diff --git a/Src/external_dependencies/openmpt-trunk/include/opus/celt/mdct.c b/Src/external_dependencies/openmpt-trunk/include/opus/celt/mdct.c index 5c6dab5b7..93ef2a142 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opus/celt/mdct.c +++ b/Src/external_dependencies/openmpt-trunk/include/opus/celt/mdct.c @@ -300,7 +300,7 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca im = yp0[0]; t0 = t[i]; t1 = t[N4+i]; - /* We'd scale up by 2 here, but instead it's done when mixing the windows */ + /* We'd scale up by 2 here, but instead it's done when mixing the arch */ yr = ADD32_ovflw(S_MUL(re,t0), S_MUL(im,t1)); yi = SUB32_ovflw(S_MUL(re,t1), S_MUL(im,t0)); /* We swap real and imag because we're using an FFT instead of an IFFT. */ @@ -311,7 +311,7 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca t0 = t[(N4-i-1)]; t1 = t[(N2-i-1)]; - /* We'd scale up by 2 here, but instead it's done when mixing the windows */ + /* We'd scale up by 2 here, but instead it's done when mixing the arch */ yr = ADD32_ovflw(S_MUL(re,t0), S_MUL(im,t1)); yi = SUB32_ovflw(S_MUL(re,t1), S_MUL(im,t0)); yp1[0] = yr; diff --git a/Src/external_dependencies/openmpt-trunk/include/opus/celt/mips/mdct_mipsr1.h b/Src/external_dependencies/openmpt-trunk/include/opus/celt/mips/mdct_mipsr1.h index 2934dab77..c24b4f7a7 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opus/celt/mips/mdct_mipsr1.h +++ b/Src/external_dependencies/openmpt-trunk/include/opus/celt/mips/mdct_mipsr1.h @@ -245,7 +245,7 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala im = yp0[0]; t0 = t[i]; t1 = t[N4+i]; - /* We'd scale up by 2 here, but instead it's done when mixing the windows */ + /* We'd scale up by 2 here, but instead it's done when mixing the arch */ yr = S_MUL_ADD(re,t0 , im,t1); yi = S_MUL_SUB(re,t1 , im,t0); /* We swap real and imag because we're using an FFT instead of an IFFT. */ @@ -256,7 +256,7 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala t0 = t[(N4-i-1)]; t1 = t[(N2-i-1)]; - /* We'd scale up by 2 here, but instead it's done when mixing the windows */ + /* We'd scale up by 2 here, but instead it's done when mixing the arch */ yr = S_MUL_ADD(re,t0,im,t1); yi = S_MUL_SUB(re,t1,im,t0); yp1[0] = yr; diff --git a/Src/external_dependencies/openmpt-trunk/include/opus/silk/debug.c b/Src/external_dependencies/openmpt-trunk/include/opus/silk/debug.c index 9253faf71..9028f01db 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opus/silk/debug.c +++ b/Src/external_dependencies/openmpt-trunk/include/opus/silk/debug.c @@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifdef _WIN32 #if (defined(_WIN32) || defined(_WINCE)) -#include /* timer */ +#include /* timer */ #else /* Linux or Mac*/ #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/opus/silk/debug.h b/Src/external_dependencies/openmpt-trunk/include/opus/silk/debug.h index 6f68c1ca0..f459706fe 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opus/silk/debug.h +++ b/Src/external_dependencies/openmpt-trunk/include/opus/silk/debug.h @@ -51,7 +51,7 @@ unsigned long GetHighResolutionTime(void); /* O time in usec*/ #if SILK_TIC_TOC #if (defined(_WIN32) || defined(_WINCE)) -#include /* timer */ +#include /* timer */ #else /* Linux or Mac*/ #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/opusenc/src/unicode_support.c b/Src/external_dependencies/openmpt-trunk/include/opusenc/src/unicode_support.c index e4f6f3e79..237c3f0bf 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opusenc/src/unicode_support.c +++ b/Src/external_dependencies/openmpt-trunk/include/opusenc/src/unicode_support.c @@ -32,7 +32,7 @@ #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64 -#include +#include #include static wchar_t *utf8_to_utf16(const char *input) diff --git a/Src/external_dependencies/openmpt-trunk/include/opusfile/src/stream.c b/Src/external_dependencies/openmpt-trunk/include/opusfile/src/stream.c index 6559e1dbc..1b96d5624 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opusfile/src/stream.c +++ b/Src/external_dependencies/openmpt-trunk/include/opusfile/src/stream.c @@ -244,7 +244,7 @@ static wchar_t *op_utf8_to_utf16(const char *_src){ common case. Hopefully the return value of GetFileType() cannot actually change for the lifetime of a file handle. - [0] https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-setfilepointer + [0] https://docs.microsoft.com/en-us/arch/desktop/api/fileapi/nf-fileapi-setfilepointer */ static int op_fseek_fail(void *_stream,opus_int64 _offset,int _whence){ (void)_stream; @@ -262,7 +262,7 @@ static const OpusFileCallbacks OP_UNSEEKABLE_FILE_CALLBACKS={ # define WIN32_LEAN_AND_MEAN # define WIN32_EXTRA_LEAN -# include +# include static const OpusFileCallbacks *op_get_file_callbacks(FILE *_fp){ intptr_t h_file; diff --git a/Src/external_dependencies/openmpt-trunk/include/opusfile/src/wincerts.c b/Src/external_dependencies/openmpt-trunk/include/opusfile/src/wincerts.c index 409a4e096..9dd47aeaf 100644 --- a/Src/external_dependencies/openmpt-trunk/include/opusfile/src/wincerts.c +++ b/Src/external_dependencies/openmpt-trunk/include/opusfile/src/wincerts.c @@ -22,10 +22,10 @@ #include "internal.h" #if defined(OP_ENABLE_HTTP)&&defined(_WIN32) -/*You must include windows.h before wincrypt.h and x509.h.*/ +/*You must include arch.h before wincrypt.h and x509.h.*/ # define WIN32_LEAN_AND_MEAN # define WIN32_EXTRA_LEAN -# include +# include /*You must include wincrypt.h before x509.h, too, or X509_NAME doesn't get defined properly.*/ # include diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/include/pa_win_waveformat.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/include/pa_win_waveformat.h index 251562d0f..0630eb8ca 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/include/pa_win_waveformat.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/include/pa_win_waveformat.h @@ -130,7 +130,7 @@ typedef unsigned long PaWinWaveFormatChannelMask; The fields for WAVEFORMATEX and WAVEFORMATEXTENSIBLE are declared as an unsigned char array here to avoid clients who include this file having - a dependency on windows.h and mmsystem.h, and also to to avoid having + a dependency on arch.h and mmsystem.h, and also to to avoid having to write separate packing pragmas for each compiler. */ #define PAWIN_SIZEOF_WAVEFORMATEX 18 diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/include/pa_win_wdmks.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/include/pa_win_wdmks.h index bc2f6897c..69bf87d26 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/include/pa_win_wdmks.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/include/pa_win_wdmks.h @@ -46,7 +46,7 @@ #include "portaudio.h" -#include +#include #ifdef __cplusplus extern "C" diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/common/pa_debugprint.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/common/pa_debugprint.c index 3e4024c48..d5db9adcb 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/common/pa_debugprint.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/common/pa_debugprint.c @@ -58,7 +58,7 @@ // for OutputDebugStringA #if defined(_MSC_VER) && defined(PA_ENABLE_MSVC_DEBUG_OUTPUT) #define WIN32_LEAN_AND_MEAN // exclude rare headers - #include "windows.h" + #include "arch.h" #endif // User callback diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/asio/iasiothiscallresolver.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/asio/iasiothiscallresolver.h index 21d53b320..2c2fce9dd 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/asio/iasiothiscallresolver.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/asio/iasiothiscallresolver.h @@ -19,7 +19,7 @@ // Note that this #include must come after the other ASIO SDK // #includes, for example: // -// #include +// #include // #include // #include // #include @@ -129,7 +129,7 @@ #endif #endif -#include +#include #include /* From ASIO SDK */ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/asio/pa_asio.cpp b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/asio/pa_asio.cpp index bc5f0e415..ae0006f74 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/asio/pa_asio.cpp +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/asio/pa_asio.cpp @@ -87,7 +87,7 @@ //#include #include -#include +#include #include #include "portaudio.h" @@ -126,7 +126,7 @@ */ /* #include -#include +#include #include */ /* diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/dsound/pa_win_ds.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/dsound/pa_win_ds.c index cd8dac2d5..63390c68b 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/dsound/pa_win_ds.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/dsound/pa_win_ds.c @@ -55,7 +55,7 @@ #define _WIN32_WINNT 0x0400 /* required to get waitable timer APIs */ #endif // OpenMPT #include /* make sure ds guids get defined */ -#include +#include #include @@ -325,7 +325,7 @@ NOTE: GetVersionEx() is deprecated as of Windows 8.1 and can not be used to reli versions of Windows higher than Windows 8 (due to manifest requirements for reporting higher versions). Microsoft recommends switching to VerifyVersionInfo (available on Win 2k and later), however GetVersionEx is faster, for now we just disable the deprecation warning. -See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx +See: https://msdn.microsoft.com/en-us/library/arch/desktop/ms724451(v=vs.85).aspx See: http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe */ #pragma warning (disable : 4996) /* use of GetVersionEx */ @@ -787,7 +787,7 @@ static PaError AddOutputDeviceInfoFromDirectSound( } /* Create a DirectSound object for the specified GUID - Note that using CoCreateInstance doesn't work on windows CE. + Note that using CoCreateInstance doesn't work on arch CE. */ hr = paWinDsDSoundEntryPoints.DirectSoundCreate( lpGUID, &lpDirectSound, NULL ); @@ -2990,7 +2990,7 @@ static PaError StartStream( PaStream *s ) if( timerPeriodMs < 1 ) timerPeriodMs = 1; - /* set windows scheduler granularity only as fine as needed, no finer */ + /* set arch scheduler granularity only as fine as needed, no finer */ /* Although this is not fully documented by MS, it appears that timeBeginPeriod() affects the scheduling granulatity of all timers including Waitable Timer Objects. So we always call timeBeginPeriod, whether diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/PropIdl.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/PropIdl.h index 84832d9b4..3caf5b2c8 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/PropIdl.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/PropIdl.h @@ -6,7 +6,7 @@ #define _INC_PROPIDL_PA #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/ShTypes.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/ShTypes.h index cd1118670..89b682c56 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/ShTypes.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/ShTypes.h @@ -9,7 +9,7 @@ #endif #ifndef COM_NO_WINDOWS_H -#include +#include #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h index 60db0cdcb..6096d5e4c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/audioclient.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/devicetopology.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/devicetopology.h index 7a1f75c4e..cff414ee2 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/devicetopology.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/devicetopology.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/endpointvolume.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/endpointvolume.h index 81155d7a9..ddb6e128e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/endpointvolume.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/endpointvolume.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/mmdeviceapi.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/mmdeviceapi.h index a75e4758e..0de1303a2 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/mmdeviceapi.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/mmdeviceapi.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/propsys.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/propsys.h index 5ed560803..ed5d3381b 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/propsys.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/propsys.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/structuredquery.h b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/structuredquery.h index bca20a9ad..ab58518d5 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/structuredquery.h +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/mingw-include/structuredquery.h @@ -35,7 +35,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/pa_win_wasapi.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/pa_win_wasapi.c index c76f302e6..68cffffa7 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/pa_win_wasapi.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wasapi/pa_win_wasapi.c @@ -43,7 +43,7 @@ @note pa_wasapi currently requires minimum VC 2005, and the latest Vista SDK */ -#include +#include #include #include #include @@ -756,7 +756,7 @@ static HRESULT __LogHostError(HRESULT res, const char *func, const char *file, i case AUDCLNT_S_THREAD_ALREADY_REGISTERED :text ="AUDCLNT_S_THREAD_ALREADY_REGISTERED"; break; case AUDCLNT_S_POSITION_STALLED :text ="AUDCLNT_S_POSITION_STALLED"; break; - // other windows common errors: + // other arch common errors: case CO_E_NOTINITIALIZED :text ="CO_E_NOTINITIALIZED: you must call CoInitialize() before Pa_OpenStream()"; break; default: @@ -894,7 +894,7 @@ static inline LONGLONG SystemTimer_GetTime(SystemTimer *timer) { (void)timer; - // QPC: https://docs.microsoft.com/en-us/windows/win32/sysinfo/acquiring-high-resolution-time-stamps + // QPC: https://docs.microsoft.com/en-us/arch/win32/sysinfo/acquiring-high-resolution-time-stamps if (g_SystemTimerUseQpc) { LARGE_INTEGER now; diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wdmks/pa_win_wdmks.c index 484fd304c..b0ef900b4 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wdmks/pa_win_wdmks.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wdmks/pa_win_wdmks.c @@ -93,7 +93,7 @@ of a device for the duration of active stream using those devices #define DRV_QUERYDEVICEINTERFACESIZE (DRV_RESERVED + 13) #endif -#include +#include #ifndef __GNUC__ /* Fix for ticket #257: MinGW-w64: Inclusion of triggers multiple redefinition errors. */ #include #endif @@ -665,7 +665,7 @@ NOTE: GetVersionEx() is deprecated as of Windows 8.1 and can not be used to reli versions of Windows higher than Windows 8 (due to manifest requirements for reporting higher versions). Microsoft recommends switching to VerifyVersionInfo (available on Win 2k and later), however GetVersionEx is faster, for now we just disable the deprecation warning. -See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx +See: https://msdn.microsoft.com/en-us/library/arch/desktop/ms724451(v=vs.85).aspx See: http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe */ #pragma warning (disable : 4996) /* use of GetVersionEx */ @@ -1811,7 +1811,7 @@ static PaWinWdmPin* PinNew(PaWinWdmFilter* parentFilter, unsigned long pinId, Pa #endif /* Set endpoint pin ID (this is the topology INPUT pin, since portmixer will always traverse the - filter in audio streaming direction, see http://msdn.microsoft.com/en-us/library/windows/hardware/ff536331(v=vs.85).aspx + filter in audio streaming direction, see http://msdn.microsoft.com/en-us/library/arch/hardware/ff536331(v=vs.85).aspx for more information) */ pin->endpointPinId = pcPin; diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wmme/pa_win_wmme.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wmme/pa_win_wmme.c index f8b1d7e4e..b60575424 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wmme/pa_win_wmme.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/hostapi/wmme/pa_win_wmme.c @@ -88,7 +88,7 @@ #include #include #include -#include +#include #include #ifndef UNDER_CE #include @@ -214,7 +214,7 @@ static char *CopyWCharStringToUtf8CString(char *destination, size_t destLengthBy size for lpMultiByteStr and makes no use of the output parameter itself. """ Source: WideCharToMultiByte at MSDN: - http://msdn.microsoft.com/en-us/library/windows/desktop/dd374130(v=vs.85).aspx + http://msdn.microsoft.com/en-us/library/arch/desktop/dd374130(v=vs.85).aspx */ int intDestLengthBytes; /* cbMultiByte */ /* intDestLengthBytes is an int, destLengthBytes is a size_t. Ensure that we don't overflow @@ -479,7 +479,7 @@ static void InitializeDefaultDeviceIdsFromEnv( PaWinMmeHostApiRepresentation *ho } -/** Convert external PA ID to a windows multimedia device ID +/** Convert external PA ID to a arch multimedia device ID */ static UINT LocalDeviceIndexToWinMmeDeviceId( PaWinMmeHostApiRepresentation *hostApi, PaDeviceIndex device ) { @@ -916,7 +916,7 @@ NOTE: GetVersionEx() is deprecated as of Windows 8.1 and can not be used to reli versions of Windows higher than Windows 8 (due to manifest requirements for reporting higher versions). Microsoft recommends switching to VerifyVersionInfo (available on Win 2k and later), however GetVersionEx is faster, for now we just disable the deprecation warning. -See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx +See: https://msdn.microsoft.com/en-us/library/arch/desktop/ms724451(v=vs.85).aspx See: http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe */ #pragma warning (disable : 4996) /* use of GetVersionEx */ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_coinitialize.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_coinitialize.c index cdb1fb970..91af67540 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_coinitialize.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_coinitialize.c @@ -42,7 +42,7 @@ @brief Microsoft COM initialization routines. */ -#include +#include #include #include "portaudio.h" diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_util.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_util.c index b86f7afab..ae78591ad 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_util.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_util.c @@ -43,7 +43,7 @@ @brief Win32 implementation of platform-specific PaUtil support functions. */ -#include +#include #if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) #include /* for _ftime_s() */ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_waveformat.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_waveformat.c index 0436a399b..1d07a2756 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_waveformat.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_waveformat.c @@ -36,7 +36,7 @@ * license above. */ -#include +#include #include #if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) #include /* for WAVEFORMATEX */ diff --git a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_wdmks_utils.c b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_wdmks_utils.c index 337314693..0592b5f16 100644 --- a/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_wdmks_utils.c +++ b/Src/external_dependencies/openmpt-trunk/include/portaudio/src/os/win/pa_win_wdmks_utils.c @@ -35,7 +35,7 @@ * license above. */ -#include +#include #include #ifndef WAVE_FORMAT_IEEE_FLOAT #define WAVE_FORMAT_IEEE_FLOAT 0x0003 // MinGW32 does not define this diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/.github/workflows/ci-workflow.yml b/Src/external_dependencies/openmpt-trunk/include/premake/.github/workflows/ci-workflow.yml index 4c7672952..b50a648f3 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/.github/workflows/ci-workflow.yml +++ b/Src/external_dependencies/openmpt-trunk/include/premake/.github/workflows/ci-workflow.yml @@ -45,8 +45,8 @@ jobs: with: name: premake-macosx-${{ matrix.platform }} path: bin/${{ matrix.config }}/ - windows: - runs-on: windows-latest + arch: + runs-on: arch-latest strategy: matrix: config: [debug, release] @@ -57,7 +57,7 @@ jobs: - name: Build run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - nmake -f Bootstrap.mak MSDEV=vs2019 windows-msbuild PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }} + nmake -f Bootstrap.mak MSDEV=vs2019 arch-msbuild PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }} shell: cmd - name: Test run: bin\${{ matrix.config }}\premake5 test --test-all @@ -69,5 +69,5 @@ jobs: if: matrix.config == 'release' uses: actions/upload-artifact@v2 with: - name: premake-windows-${{ matrix.platform }} + name: premake-arch-${{ matrix.platform }} path: bin\${{ matrix.config }}\ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/BUILD.txt b/Src/external_dependencies/openmpt-trunk/include/premake/BUILD.txt index 336cc5cbf..8e88dad53 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/BUILD.txt +++ b/Src/external_dependencies/openmpt-trunk/include/premake/BUILD.txt @@ -34,7 +34,7 @@ BUILDING FROM THE REPOSITORY Where PLATFORM can be osx or linux. On Windows with Visual Studio use nmake: - $ nmake -f Bootstrap.mak windows + $ nmake -f Bootstrap.mak arch Or on Windows with MinGW use mingw32-make: diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/Bootstrap.bat b/Src/external_dependencies/openmpt-trunk/include/premake/Bootstrap.bat index 2eae39c7d..d7d45a06c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/Bootstrap.bat +++ b/Src/external_dependencies/openmpt-trunk/include/premake/Bootstrap.bat @@ -67,7 +67,7 @@ IF NOT EXIST "%VsPath%vsdevcmd.bat" ( EXIT /B 2 ) -CALL "%VsPath%vsdevcmd.bat" && nmake MSDEV="%~1" -f Bootstrap.mak windows +CALL "%VsPath%vsdevcmd.bat" && nmake MSDEV="%~1" -f Bootstrap.mak arch EXIT /B %ERRORLEVEL% REM :LegacyVisualBootstrap @@ -95,7 +95,7 @@ SET VsWhereCmdLine="!VsWherePath! -nologo -latest -version [%VsVersionMin%,%VsVe FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO ( IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" ( - CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows + CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak arch EXIT /B %ERRORLEVEL% ) ) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/Bootstrap.mak b/Src/external_dependencies/openmpt-trunk/include/premake/Bootstrap.mak index 9c6c32b33..4549c8ee0 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/Bootstrap.mak +++ b/Src/external_dependencies/openmpt-trunk/include/premake/Bootstrap.mak @@ -40,16 +40,16 @@ SRC = src/host/*.c \ HOST_PLATFORM= none -.PHONY: default none clean nix-clean windows-clean \ +.PHONY: default none clean nix-clean arch-clean \ mingw-clean mingw macosx macosx-clean osx-clean osx \ linux-clean linux bsd-clean bsd solaris-clean solaris \ - haiku-clean haiku windows-base windows windows-msbuild + haiku-clean haiku arch-base arch arch-msbuild default: $(HOST_PLATFORM) none: @echo "Please do" - @echo " nmake -f Bootstrap.mak windows" + @echo " nmake -f Bootstrap.mak arch" @echo "or" @echo " CC=mingw32-gcc mingw32-make -f Bootstrap.mak mingw CONFIG=x64" @echo "or" @@ -63,7 +63,7 @@ none: clean: @echo "Please run the same command used for building by adding a '-clean' suffix to the target name." - @echo " nmake -f Bootstrap.mak windows-clean" + @echo " nmake -f Bootstrap.mak arch-clean" @echo "or" @echo " CC=mingw32-gcc mingw32-make -f Bootstrap.mak mingw-clean CONFIG=x64" @echo "or" @@ -76,18 +76,18 @@ nix-clean: $(SILENT) rm -rf ./build $(SILENT) rm -rf ./obj -windows-clean: +arch-clean: $(SILENT) if exist .\bin rmdir /s /q .\bin $(SILENT) if exist .\build rmdir /s /q .\build $(SILENT) if exist .\obj rmdir /s /q .\obj -mingw-clean: windows-clean +mingw-clean: arch-clean mingw: mingw-clean if not exist build\bootstrap (mkdir build\bootstrap) $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lole32 -lversion ./build/bootstrap/premake_bootstrap embed - ./build/bootstrap/premake_bootstrap --arch=$(PLATFORM) --os=windows --to=build/bootstrap --cc=mingw gmake2 + ./build/bootstrap/premake_bootstrap --arch=$(PLATFORM) --os=arch --to=build/bootstrap --cc=mingw gmake2 $(MAKE) -C build/bootstrap config=$(CONFIG)_$(PLATFORM) macosx: osx @@ -139,15 +139,15 @@ haiku: haiku-clean ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG) -windows-base: windows-clean +arch-base: arch-clean if not exist build\bootstrap (mkdir build\bootstrap) cl /Fo.\build\bootstrap\ /Fe.\build\bootstrap\premake_bootstrap.exe /DPREMAKE_NO_BUILTIN_SCRIPTS /I"$(LUA_DIR)" /I"$(LUASHIM_DIR)" user32.lib ole32.lib advapi32.lib $(SRC) .\build\bootstrap\premake_bootstrap.exe embed .\build\bootstrap\premake_bootstrap --arch=$(PLATFORM) --to=build/bootstrap $(MSDEV) -windows: windows-base +arch: arch-base devenv .\build\bootstrap\Premake5.sln /Upgrade devenv .\build\bootstrap\Premake5.sln /Build "$(CONFIG)|$(PLATFORM:x86=win32)" -windows-msbuild: windows-base +arch-msbuild: arch-base msbuild /p:Configuration=$(CONFIG) /p:Platform=$(PLATFORM:x86=win32) .\build\bootstrap\Premake5.sln diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/CHANGES.txt b/Src/external_dependencies/openmpt-trunk/include/premake/CHANGES.txt index a1b68b39c..3dca719fa 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/CHANGES.txt +++ b/Src/external_dependencies/openmpt-trunk/include/premake/CHANGES.txt @@ -237,7 +237,7 @@ Since 5.0-alpha12: * PR #958 fix context.addFilter (@Blizzard) * PR #959 Multiple gmake2 fixes (@Blizzard) * PR #960 Improve determinism in sln output. (@Blizzard) -* PR #961 add 64-bit support on windows (@Blizzard) +* PR #961 add 64-bit support on arch (@Blizzard) * PR #962 fix table.insertkeyed (@Blizzard) * PR #964 Add support for wildcards in mapconfig. (@Blizzard) * PR #965 Move part of the workspace baking up (@premake) @@ -297,7 +297,7 @@ Since 5.0-alpha12: * PR #1103 gmake*: fix shell type identification (@tdesveauxPKFX) * PR #1104 Xcode Fixes (@erincatto) * PR #1105 gmake: Add rules and dependencies for directory creation (@tdesveauxPKFX) -* PR #1107 Only set WindowsSDKDesktopARMSupport for windows systems (#172) (@Blizzard) +* PR #1107 Only set WindowsSDKDesktopARMSupport for arch systems (#172) (@Blizzard) * PR #1108 Fix gmake2 (@Blizzard) * PR #1113 Support buildaction for C++ projects (@Blizzard) * PR #1115 Remove Xbox 360 code from core to move and expand onto a standalone module (@redorav) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/README.md b/Src/external_dependencies/openmpt-trunk/include/premake/README.md index ce44564e8..9050afb88 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/README.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/README.md @@ -14,7 +14,7 @@ Linux - Windows + Windows Contributors diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/example/premake5.lua b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/example/premake5.lua index 0be5c17c6..4f2705002 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/example/premake5.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/example/premake5.lua @@ -16,7 +16,7 @@ project "example" "*.lua" } - filter "system:not windows" + filter "system:not arch" targetprefix "" targetextension ".so" pic "on" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/premake5.lua b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/premake5.lua index b60be72f6..33ab17d9e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/premake5.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/premake5.lua @@ -19,7 +19,7 @@ project "luasocket" "*.c" } - filter "system:windows" + filter "system:arch" removefiles { "src/serial.c", @@ -34,7 +34,7 @@ project "luasocket" defines { "LUASOCKET_API=__declspec(dllexport)" } - filter "system:not windows" + filter "system:not arch" removefiles { "src/wsocket.*", diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/ltn12.lua b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/ltn12.lua index 575c5a7f1..6948c3ba8 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/ltn12.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/ltn12.lua @@ -25,7 +25,7 @@ _M.pump = pump local unpack = unpack or table.unpack local select = base.select --- 2048 seems to be better in windows... +-- 2048 seems to be better in arch... _M.BLOCKSIZE = 2048 _M._VERSION = "LTN12 1.0.3" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/options.c b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/options.c index fabfe8ce3..65875d208 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/options.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/options.c @@ -291,7 +291,7 @@ static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name) /* By default we listen to interface on default route * (sigh). However, interface= can override it. We should * support either number, or name for it. Waiting for - * windows port of if_nametoindex */ + * arch port of if_nametoindex */ if (!lua_isnil(L, -1)) { if (lua_isnumber(L, -1)) { val.ipv6mr_interface = (unsigned int) lua_tonumber(L, -1); diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/timeout.c b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/timeout.c index 5a601d541..7494881e3 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/timeout.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/timeout.c @@ -14,7 +14,7 @@ #include "timeout.h" #ifdef _WIN32 -#include +#include #else #include #include diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/wsocket.c b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/wsocket.c index 16901863d..62ab161cc 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/wsocket.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/binmodules/luasocket/src/wsocket.c @@ -132,7 +132,7 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { err = socket_waitfd(ps, WAITFD_C, tm); if (err == IO_CLOSED) { int err_len = sizeof(err); - /* give windows time to set the error (yes, disgusting) */ + /* give arch time to set the error (yes, disgusting) */ Sleep(10); /* find out why we failed */ getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &err_len); @@ -186,7 +186,7 @@ int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, /*-------------------------------------------------------------------------*\ * Send with timeout -* On windows, if you try to send 10MB, the OS will buffer EVERYTHING +* On arch, if you try to send 10MB, the OS will buffer EVERYTHING * this can take an awful lot of time and we will end up blocked. * Therefore, whoever calls this function should not pass a huge buffer. \*-------------------------------------------------------------------------*/ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/include/curl/curlbuild.h.cmake b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/include/curl/curlbuild.h.cmake index bbb31a940..db73f7113 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/include/curl/curlbuild.h.cmake +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/include/curl/curlbuild.h.cmake @@ -118,7 +118,7 @@ # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# include +# include # include # include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/include/curl/curlbuild.h.in b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/include/curl/curlbuild.h.in index ffab35670..aae222933 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/include/curl/curlbuild.h.in +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/include/curl/curlbuild.h.in @@ -118,7 +118,7 @@ # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# include +# include # include # include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/checksrc.pl b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/checksrc.pl index 7857bbfc7..0674c4bd3 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/checksrc.pl +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/checksrc.pl @@ -30,7 +30,7 @@ my $supressed; # whitelisted problems my $file; my $dir="."; my $wlist; -my $windows_os = $^O eq 'MSWin32' || $^O eq 'msys' || $^O eq 'cygwin'; +my $arch_os = $^O eq 'MSWin32' || $^O eq 'msys' || $^O eq 'cygwin'; my $verbose; my %whitelist; @@ -65,7 +65,7 @@ sub readwhitelist { open(W, "<$dir/checksrc.whitelist"); my @all=; for(@all) { - $windows_os ? $_ =~ s/\r?\n$// : chomp; + $arch_os ? $_ =~ s/\r?\n$// : chomp; $whitelist{$_}=1; } close(W); @@ -263,7 +263,7 @@ sub scanfile { checksrc_clear(); # for file based ignores while() { - $windows_os ? $_ =~ s/\r?\n$// : chomp; + $arch_os ? $_ =~ s/\r?\n$// : chomp; my $l = $_; my $ol = $l; # keep the unmodified line for error reporting my $column = 0; diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-linux.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-linux.h index b8a4640fc..7844e50f4 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-linux.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-linux.h @@ -698,7 +698,7 @@ /* Define to 1 if you have the winber.h header file. */ /* #undef HAVE_WINBER_H */ -/* Define to 1 if you have the windows.h header file. */ +/* Define to 1 if you have the arch.h header file. */ /* #undef HAVE_WINDOWS_H */ /* Define to 1 if you have the winldap.h header file. */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-osx.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-osx.h index 8ce602442..0f59da0e1 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-osx.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-osx.h @@ -698,7 +698,7 @@ /* Define to 1 if you have the winber.h header file. */ /* #undef HAVE_WINBER_H */ -/* Define to 1 if you have the windows.h header file. */ +/* Define to 1 if you have the arch.h header file. */ /* #undef HAVE_WINDOWS_H */ /* Define to 1 if you have the winldap.h header file. */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-symbian.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-symbian.h index 92983d242..6136ec79e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-symbian.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-symbian.h @@ -610,7 +610,7 @@ /* Define to 1 if you have the winber.h header file. */ /* #undef HAVE_WINBER_H */ -/* Define to 1 if you have the windows.h header file. */ +/* Define to 1 if you have the arch.h header file. */ /* #undef HAVE_WINDOWS_H */ /* Define to 1 if you have the winldap.h header file. */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-vxworks.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-vxworks.h index 780a4a225..c96073034 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-vxworks.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-vxworks.h @@ -697,7 +697,7 @@ /* Define to 1 if you have the winber.h header file. */ /* #undef HAVE_WINBER_H */ -/* Define to 1 if you have the windows.h header file. */ +/* Define to 1 if you have the arch.h header file. */ /* #undef HAVE_WINDOWS_H */ /* Define to 1 if you have the winldap.h header file. */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-win32.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-win32.h index af7bb1fb0..5d3149e4a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-win32.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-win32.h @@ -141,7 +141,7 @@ #define HAVE_UNISTD_H 1 #endif -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_WINDOWS_H 1 /* Define if you have the header file. */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-win32ce.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-win32ce.h index 383948576..0917280b5 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-win32ce.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/config-win32ce.h @@ -23,7 +23,7 @@ ***************************************************************************/ /* ================================================================ */ -/* lib/config-win32ce.h - Hand crafted config file for windows ce */ +/* lib/config-win32ce.h - Hand crafted config file for arch ce */ /* ================================================================ */ /* ---------------------------------------------------------------- */ @@ -119,7 +119,7 @@ #define HAVE_UNISTD_H 1 #endif -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_WINDOWS_H 1 /* Define if you have the header file. */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/connect.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/connect.c index 524d885eb..4d3e48dd9 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/connect.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/connect.c @@ -954,7 +954,7 @@ void Curl_sndbufset(curl_socket_t sockfd) static int detectOsState = DETECT_OS_NONE; if(detectOsState == DETECT_OS_NONE) { - if(Curl_verify_windows_version(6, 0, PLATFORM_WINNT, + if(Curl_verify_arch_version(6, 0, PLATFORM_WINNT, VERSION_GREATER_THAN_EQUAL)) detectOsState = DETECT_OS_VISTA_OR_LATER; else diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_config.h.cmake b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_config.h.cmake index 49c1b8a2d..223428e06 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_config.h.cmake +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_config.h.cmake @@ -728,7 +728,7 @@ /* Define to 1 if you have the winber.h header file. */ #cmakedefine HAVE_WINBER_H 1 -/* Define to 1 if you have the windows.h header file. */ +/* Define to 1 if you have the arch.h header file. */ #cmakedefine HAVE_WINDOWS_H 1 /* Define to 1 if you have the winldap.h header file. */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_setup.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_setup.h index 5b20ad780..145d69a1e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_setup.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_setup.h @@ -248,9 +248,9 @@ #endif /* - * Include header files for windows builds before redefining anything. - * Use this preprocessor block only to include or exclude windows.h, - * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs + * Include header files for arch builds before redefining anything. + * Use this preprocessor block only to include or exclude arch.h, + * winsock2.h, ws2tcpip.h or winsock.h. Any other arch thing belongs * to any other further and independent block. Under Cygwin things work * just as under linux (e.g. ) and the winsock headers should * never be included when __CYGWIN__ is defined. configure script takes @@ -268,7 +268,7 @@ # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# include +# include # ifdef HAVE_WINSOCK2_H # include # ifdef HAVE_WS2TCPIP_H diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_sspi.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_sspi.c index 11a7120a9..15be597ac 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_sspi.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/curl_sspi.c @@ -82,7 +82,7 @@ CURLcode Curl_sspi_global_init(void) * have both these DLLs (security.dll forwards calls to secur32.dll) */ /* Load SSPI dll into the address space of the calling process */ - if(Curl_verify_windows_version(4, 0, PLATFORM_WINNT, VERSION_EQUAL)) + if(Curl_verify_arch_version(4, 0, PLATFORM_WINNT, VERSION_EQUAL)) s_hSecDll = Curl_load_library(TEXT("security.dll")); else s_hSecDll = Curl_load_library(TEXT("secur32.dll")); diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/mk-ca-bundle.vbs b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/mk-ca-bundle.vbs index da7a577ea..1f3d347d3 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/mk-ca-bundle.vbs +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/mk-ca-bundle.vbs @@ -396,7 +396,7 @@ End Function ' Use Win32_ComputerSystem CurrentTimeZone property, because it automatically ' adjusts the Time Zone bias for daylight saving time; Win32_Time Zone Bias ' property does not. -' https://msdn.microsoft.com/en-us/library/windows/desktop/ms696015.aspx +' https://msdn.microsoft.com/en-us/library/arch/desktop/ms696015.aspx Function LocalDateToUTC(localdate) Dim item, offset For Each item In GetObject("winmgmts:").InstancesOf("Win32_ComputerSystem") diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/system_win32.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/system_win32.c index 78737593a..5d60f4581 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/system_win32.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/system_win32.c @@ -60,9 +60,9 @@ typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD); #endif /* USE_WINDOWS_SSPI || (!CURL_DISABLE_TELNET && USE_WINSOCK) */ /* - * Curl_verify_windows_version() + * Curl_verify_arch_version() * - * This is used to verify if we are running on a specific windows version. + * This is used to verify if we are running on a specific arch version. * * Parameters: * @@ -76,7 +76,7 @@ typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD); * * Returns TRUE if matched; otherwise FALSE. */ -bool Curl_verify_windows_version(const unsigned int majorVersion, +bool Curl_verify_arch_version(const unsigned int majorVersion, const unsigned int minorVersion, const PlatformIdentifier platform, const VersionCondition condition) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/system_win32.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/system_win32.h index 1e772856b..1ab4b21e8 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/system_win32.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/system_win32.h @@ -42,8 +42,8 @@ typedef enum { PLATFORM_WINNT } PlatformIdentifier; -/* This is used to verify if we are running on a specific windows version */ -bool Curl_verify_windows_version(const unsigned int majorVersion, +/* This is used to verify if we are running on a specific arch version */ +bool Curl_verify_arch_version(const unsigned int majorVersion, const unsigned int minorVersion, const PlatformIdentifier platform, const VersionCondition condition); diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/url.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/url.c index 38b9552f7..a2bbc2fcb 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/url.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/url.c @@ -2227,7 +2227,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option, * Set CA path info for SSL connection. Specify directory name of the CA * certificates which have been prepared using openssl c_rehash utility. */ - /* This does not work on windows. */ + /* This does not work on arch. */ result = setstropt(&data->set.str[STRING_SSL_CAPATH_ORIG], va_arg(param, char *)); #else @@ -2240,7 +2240,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option, * Set CA path info for SSL connection proxy. Specify directory name of the * CA certificates which have been prepared using openssl c_rehash utility. */ - /* This does not work on windows. */ + /* This does not work on arch. */ result = setstropt(&data->set.str[STRING_SSL_CAPATH_PROXY], va_arg(param, char *)); #else diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/urldata.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/urldata.h index 7f87913a9..05f2cda62 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/urldata.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/urldata.h @@ -353,7 +353,7 @@ struct ssl_primary_config { bool verifypeer; /* set TRUE if this is desired */ bool verifyhost; /* set TRUE if CN/SAN must match hostname */ bool verifystatus; /* set TRUE if certificate status must be checked */ - char *CApath; /* certificate dir (doesn't work on windows) */ + char *CApath; /* certificate dir (doesn't work on arch) */ char *CAfile; /* certificate to verify peer against */ char *clientcert; char *random_file; /* path to file containing "random" data */ @@ -1480,8 +1480,8 @@ enum dupstring { STRING_SET_RANGE, /* range, if used */ STRING_SET_REFERER, /* custom string for the HTTP referer field */ STRING_SET_URL, /* what original URL to work on */ - STRING_SSL_CAPATH_ORIG, /* CA directory name (doesn't work on windows) */ - STRING_SSL_CAPATH_PROXY, /* CA directory name (doesn't work on windows) */ + STRING_SSL_CAPATH_ORIG, /* CA directory name (doesn't work on arch) */ + STRING_SSL_CAPATH_PROXY, /* CA directory name (doesn't work on arch) */ STRING_SSL_CAFILE_ORIG, /* certificate file to verify peer against */ STRING_SSL_CAFILE_PROXY, /* certificate file to verify peer against */ STRING_SSL_PINNEDPUBLICKEY_ORIG, /* public key file to verify peer against */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/vtls/schannel.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/vtls/schannel.c index bd9239956..bf7c14e30 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/vtls/schannel.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/lib/vtls/schannel.c @@ -130,7 +130,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) infof(data, "schannel: SSL/TLS connection with %s port %hu (step 1/3)\n", hostname, conn->remote_port); - if(Curl_verify_windows_version(5, 1, PLATFORM_WINNT, + if(Curl_verify_arch_version(5, 1, PLATFORM_WINNT, VERSION_LESS_THAN_EQUAL)) { /* SChannel in Windows XP (OS version 5.1) uses legacy handshakes and algorithms that may not be supported by all servers. */ @@ -144,7 +144,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) connssl->use_alpn = conn->bits.tls_enable_alpn && !GetProcAddress(GetModuleHandleA("ntdll"), "wine_get_version") && - Curl_verify_windows_version(6, 3, PLATFORM_WINNT, + Curl_verify_arch_version(6, 3, PLATFORM_WINNT, VERSION_GREATER_THAN_EQUAL); #else connssl->use_alpn = false; @@ -248,7 +248,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) memset(connssl->cred, 0, sizeof(struct curl_schannel_cred)); connssl->cred->refcount = 1; - /* https://msdn.microsoft.com/en-us/library/windows/desktop/aa374716.aspx + /* https://msdn.microsoft.com/en-us/library/arch/desktop/aa374716.aspx */ sspi_status = s_pSecFn->AcquireCredentialsHandle(NULL, (TCHAR *)UNISP_NAME, @@ -355,7 +355,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) return CURLE_OUT_OF_MEMORY; /* Schannel InitializeSecurityContext: - https://msdn.microsoft.com/en-us/library/windows/desktop/aa375924.aspx + https://msdn.microsoft.com/en-us/library/arch/desktop/aa375924.aspx At the moment we don't pass inbuf unless we're using ALPN since we only use it for that, and Wine (for which we currently disable ALPN) is giving @@ -529,7 +529,7 @@ schannel_connect_step2(struct connectdata *conn, int sockindex) if(!host_name) return CURLE_OUT_OF_MEMORY; - /* https://msdn.microsoft.com/en-us/library/windows/desktop/aa375924.aspx + /* https://msdn.microsoft.com/en-us/library/arch/desktop/aa375924.aspx */ sspi_status = s_pSecFn->InitializeSecurityContext( &connssl->cred->cred_handle, &connssl->ctxt->ctxt_handle, @@ -950,7 +950,7 @@ schannel_send(struct connectdata *conn, int sockindex, /* copy data into output buffer */ memcpy(outbuf[1].pvBuffer, buf, len); - /* https://msdn.microsoft.com/en-us/library/windows/desktop/aa375390.aspx */ + /* https://msdn.microsoft.com/en-us/library/arch/desktop/aa375390.aspx */ sspi_status = s_pSecFn->EncryptMessage(&connssl->ctxt->ctxt_handle, 0, &outbuf_desc, 0); @@ -1163,7 +1163,7 @@ schannel_recv(struct connectdata *conn, int sockindex, InitSecBuffer(&inbuf[3], SECBUFFER_EMPTY, NULL, 0); InitSecBufferDesc(&inbuf_desc, inbuf, 4); - /* https://msdn.microsoft.com/en-us/library/windows/desktop/aa375348.aspx + /* https://msdn.microsoft.com/en-us/library/arch/desktop/aa375348.aspx */ sspi_status = s_pSecFn->DecryptMessage(&connssl->ctxt->ctxt_handle, &inbuf_desc, 0, NULL); @@ -1311,7 +1311,7 @@ cleanup: */ if(len && !connssl->decdata_offset && connssl->recv_connection_closed && !connssl->recv_sspi_close_notify) { - bool isWin2k = Curl_verify_windows_version(5, 0, PLATFORM_WINNT, + bool isWin2k = Curl_verify_arch_version(5, 0, PLATFORM_WINNT, VERSION_EQUAL); if(isWin2k && sspi_status == SEC_E_OK) @@ -1394,7 +1394,7 @@ void Curl_schannel_close(struct connectdata *conn, int sockindex) int Curl_schannel_shutdown(struct connectdata *conn, int sockindex) { - /* See https://msdn.microsoft.com/en-us/library/windows/desktop/aa380138.aspx + /* See https://msdn.microsoft.com/en-us/library/arch/desktop/aa380138.aspx * Shutting Down an Schannel Connection */ struct Curl_easy *data = conn->data; @@ -1618,7 +1618,7 @@ static CURLcode verify_certificate(struct connectdata *conn, int sockindex) Right now we're only asking for the first preferred alternative name. Instead we'd need to do all via CERT_NAME_SEARCH_ALL_NAMES_FLAG (if WinCE supports that?) and run this section in a loop for each. - https://msdn.microsoft.com/en-us/library/windows/desktop/aa376086.aspx + https://msdn.microsoft.com/en-us/library/arch/desktop/aa376086.aspx curl: (51) schannel: CertGetNameString() certificate hostname (.google.com) did not match connection (google.com) */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/premake5.lua b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/premake5.lua index 5a49939d1..41cfac878 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/premake5.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/curl/premake5.lua @@ -17,14 +17,14 @@ project "curl-lib" "**.c" } - filter { "system:windows" } + filter { "system:arch" } defines { "USE_SCHANNEL", "USE_WINDOWS_SSPI" } links "crypt32" filter { "system:macosx" } defines { "USE_DARWINSSL" } - filter { "system:not windows", "system:not macosx" } + filter { "system:not arch", "system:not macosx" } defines { "USE_MBEDTLS" } filter { "system:linux or bsd or solaris" } diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/include/zconf.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/include/zconf.h index c37d056aa..077a5aa00 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/include/zconf.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/include/zconf.h @@ -329,7 +329,7 @@ # ifdef FAR # undef FAR # endif -# include +# include /* No need for _export, use ZLIB.DEF instead. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ # define ZEXPORT WINAPI diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/premake5.lua b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/premake5.lua index 1532d5182..5162a58b1 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/premake5.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/premake5.lua @@ -14,9 +14,9 @@ project "zip-lib" filter "system:linux or bsd or solaris or haiku" defines { "HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H" } - filter "system:windows" + filter "system:arch" defines { "_WINDOWS" } - filter { "system:windows", "toolset:mingw" } + filter { "system:arch", "toolset:mingw" } defines { "HAVE_SSIZE_T_LIBZIP" } filter "system:macosx" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/zconf.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/zconf.h index 9ccbb0a6f..5c139d677 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/zconf.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/zconf.h @@ -328,7 +328,7 @@ # ifdef FAR # undef FAR # endif -# include +# include /* No need for _export, use ZLIB.DEF instead. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ # define ZEXPORT WINAPI diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/zipint.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/zipint.h index 5061ee9c6..007f3f47a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/zipint.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/libzip/zipint.h @@ -54,7 +54,7 @@ #include "config.h" #ifdef HAVE_MOVEFILEEXA -#include +#include #define _zip_rename(s, t) (!MoveFileExA((s), (t), MOVEFILE_COPY_ALLOWED|MOVEFILE_REPLACE_EXISTING)) #else #define _zip_rename rename diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/liolib.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/liolib.c index e20339409..8ce0c6f6d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/liolib.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/liolib.c @@ -23,10 +23,10 @@ #include "lualib.h" /* -* PREMAKE change: UTF-8 character support on windows. +* PREMAKE change: UTF-8 character support on arch. */ #if defined(LUA_WIN) -#include +#include #endif @@ -267,7 +267,7 @@ static int io_open (lua_State *L) { luaL_argcheck(L, l_checkmode(md), 2, "invalid mode"); /* - * PREMAKE change: UTF-8 character support on windows. + * PREMAKE change: UTF-8 character support on arch. */ #if defined(LUA_WIN) wchar_t wide_path[4096]; diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/loadlib.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/loadlib.c index 45f44d322..ca7a65348 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/loadlib.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/loadlib.c @@ -147,7 +147,7 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) { ** ======================================================================= */ -#include +#include /* diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/lua.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/lua.c index ca5b29852..d646ec013 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/lua.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/lua/src/lua.c @@ -55,7 +55,7 @@ #elif defined(LUA_USE_WINDOWS) /* }{ */ #include -#include +#include #define lua_stdin_is_tty() _isatty(_fileno(stdin)) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/configs/config-psa-crypto.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/configs/config-psa-crypto.h index b98fc9cde..635d47601 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/configs/config-psa-crypto.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/configs/config-psa-crypto.h @@ -3074,7 +3074,7 @@ */ /* MPI / BIGNUM options */ -//#define MBEDTLS_MPI_WINDOW_SIZE 6 /**< Maximum windows size used. */ +//#define MBEDTLS_MPI_WINDOW_SIZE 6 /**< Maximum arch size used. */ //#define MBEDTLS_MPI_MAX_SIZE 1024 /**< Maximum number of bytes for usable MPIs. */ /* CTR_DRBG options */ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/entropy_poll.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/entropy_poll.c index 5250a7bfe..4d1d8c470 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/entropy_poll.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/entropy_poll.c @@ -55,7 +55,7 @@ #if !defined(_WIN32_WINNT) #define _WIN32_WINNT 0x0400 #endif -#include +#include #include int mbedtls_platform_entropy_poll( void *data, unsigned char *output, size_t len, diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/net_sockets.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/net_sockets.c index 54c2b472f..afed744ad 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/net_sockets.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/net_sockets.c @@ -57,7 +57,7 @@ #include #include -#include +#include #if (_WIN32_WINNT < 0x0501) #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/psa_its_file.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/psa_its_file.c index 2fbff20ef..678572ba3 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/psa_its_file.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/psa_its_file.c @@ -33,7 +33,7 @@ #endif #if defined(_WIN32) -#include +#include #endif #include "psa_crypto_its.h" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/timing.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/timing.c index eb4146132..5d808f6a9 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/timing.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/timing.c @@ -44,7 +44,7 @@ #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) -#include +#include #include struct _hr_time diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/x509_crl.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/x509_crl.c index edeb39b02..961d1afde 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/x509_crl.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/x509_crl.c @@ -53,7 +53,7 @@ #endif #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) -#include +#include #else #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/x509_crt.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/x509_crt.c index a623c57a6..f92094d7c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/x509_crt.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/library/x509_crt.c @@ -64,7 +64,7 @@ #endif #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) -#include +#include #else #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/aes/aescrypt2.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/aes/aescrypt2.c index 95d64d911..dcb3b1ccf 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/aes/aescrypt2.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/aes/aescrypt2.c @@ -49,7 +49,7 @@ #include #if defined(_WIN32) -#include +#include #if !defined(_WIN32_WCE) #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/aes/crypt_and_hash.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/aes/crypt_and_hash.c index 63a12480f..7d1d3197a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/aes/crypt_and_hash.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/aes/crypt_and_hash.c @@ -53,7 +53,7 @@ #endif #if defined(_WIN32) -#include +#include #if !defined(_WIN32_WCE) #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/dtls_server.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/dtls_server.c index 22e3fc5db..bdfc31b9d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/dtls_server.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/dtls_server.c @@ -65,7 +65,7 @@ int main( void ) #else #if defined(_WIN32) -#include +#include #endif #include diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_mail_client.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_mail_client.c index fb965f672..037276cf6 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_mail_client.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_mail_client.c @@ -79,7 +79,7 @@ int main( void ) #if defined(_WIN32) || defined(_WIN32_WCE) #include -#include +#include #if defined(_MSC_VER) #if defined(_WIN32_WCE) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_pthread_server.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_pthread_server.c index c8ab21522..787c8ffd9 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_pthread_server.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_pthread_server.c @@ -60,7 +60,7 @@ int main( void ) #include #if defined(_WIN32) -#include +#include #endif #include "mbedtls/entropy.h" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_server.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_server.c index 012433822..a20bdf121 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_server.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_server.c @@ -58,7 +58,7 @@ int main( void ) #include #if defined(_WIN32) -#include +#include #endif #include "mbedtls/entropy.h" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_server2.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_server2.c index ceeb2245e..5a9501ae0 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_server2.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/ssl/ssl_server2.c @@ -106,7 +106,7 @@ int main( void ) #endif #if defined(_WIN32) -#include +#include #endif /* Size of memory to be allocated for the heap, when using the library's memory diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/test/udp_proxy.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/test/udp_proxy.c index 0b1bfd738..91055d720 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/test/udp_proxy.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/test/udp_proxy.c @@ -64,7 +64,7 @@ int main( void ) #if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \ !defined(EFI32) #include -#include +#include #if defined(_MSC_VER) #if defined(_WIN32_WCE) #pragma comment( lib, "ws2.lib" ) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/wince_main.c b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/wince_main.c index 851012c13..95929a502 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/wince_main.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/programs/wince_main.c @@ -19,7 +19,7 @@ #if defined(_WIN32_WCE) -#include +#include extern int main( int, const char ** ); diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/scripts/generate_visualc_files.pl b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/scripts/generate_visualc_files.pl index 6c2b5e4ab..96058e4fa 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/scripts/generate_visualc_files.pl +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/scripts/generate_visualc_files.pl @@ -78,7 +78,7 @@ my @excluded_files = qw( my %excluded_files = (); foreach (@excluded_files) { $excluded_files{$_} = 1 } -# Need windows line endings! +# Need arch line endings! my $vsx_hdr_tpl = <\r EOT diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/scripts/windows_msbuild.bat b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/scripts/windows_msbuild.bat index cfb5f013f..39f06ee2c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/scripts/windows_msbuild.bat +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/scripts/windows_msbuild.bat @@ -1,5 +1,5 @@ @rem Build and test Mbed TLS with Visual Studio using msbuild. -@rem Usage: windows_msbuild [RETARGET] +@rem Usage: arch_msbuild [RETARGET] @rem RETARGET: version of Visual Studio to emulate @rem https://docs.microsoft.com/en-us/cpp/build/how-to-modify-the-target-framework-and-platform-toolset diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/tests/scripts/check_files.py b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/tests/scripts/check_files.py index 13fee9d76..4f34111f2 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/tests/scripts/check_files.py +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/mbedtls/tests/scripts/check_files.py @@ -149,7 +149,7 @@ class LineIssueTracker(FileIssueTracker): self.check_file_line(filepath, line, i + 1) -def is_windows_file(filepath): +def is_arch_file(filepath): _root, ext = os.path.splitext(filepath) return ext in ('.bat', '.dsp', '.dsw', '.sln', '.vcxproj') @@ -212,7 +212,7 @@ class UnixLineEndingIssueTracker(LineIssueTracker): def should_check_file(self, filepath): if not super().should_check_file(filepath): return False - return not is_windows_file(filepath) + return not is_arch_file(filepath) def issue_with_line(self, line, _filepath): return b"\r" in line @@ -226,7 +226,7 @@ class WindowsLineEndingIssueTracker(LineIssueTracker): def should_check_file(self, filepath): if not super().should_check_file(filepath): return False - return is_windows_file(filepath) + return is_arch_file(filepath) def issue_with_line(self, line, _filepath): return not line.endswith(b"\r\n") or b"\r" in line[:-2] diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/gzguts.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/gzguts.h index d87659d03..7963d9264 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/gzguts.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/gzguts.h @@ -116,7 +116,7 @@ /* get errno and strerror definition */ #if defined UNDER_CE -# include +# include # define zstrerror() gz_strwinerror((DWORD)GetLastError()) #else # ifndef NO_STRERROR diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/premake5.lua b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/premake5.lua index e1bb429b7..6482756f1 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/premake5.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/premake5.lua @@ -10,8 +10,8 @@ project "zlib-lib" "**.c" } - filter "system:windows" + filter "system:arch" defines { "_WINDOWS" } - filter "system:not windows" + filter "system:not arch" defines { 'HAVE_UNISTD_H' } diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/zconf.h b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/zconf.h index 9ccbb0a6f..5c139d677 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/zconf.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/contrib/zlib/zconf.h @@ -328,7 +328,7 @@ # ifdef FAR # undef FAR # endif -# include +# include /* No need for _export, use ZLIB.DEF instead. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ # define ZEXPORT WINAPI diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/mobdebug.lua b/Src/external_dependencies/openmpt-trunk/include/premake/mobdebug.lua index 6834ab2d9..cee1e8c16 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/mobdebug.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/mobdebug.lua @@ -83,7 +83,7 @@ if not setfenv then -- Lua 5.2+ return f end end --- check for OS and convert file names to lower case on windows +-- check for OS and convert file names to lower case on arch -- (its file system is case insensitive, but case preserving), as setting a -- breakpoint on x:\Foo.lua will not work if the file was loaded as X:\foo.lua. -- OSX and Windows behave the same way (case insensitive, but case preserving). @@ -1415,7 +1415,7 @@ local function handle(params, client, options) local file = io.open(exp, "r") if not file and pcall(require, "winapi") then -- if file is not open and winapi is there, try with a short path; - -- this may be needed for unicode paths on windows + -- this may be needed for unicode paths on arch winapi.set_encoding(winapi.CP_UTF8) local shortp = winapi.short_path(exp) file = shortp and io.open(shortp, "r") diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/android/vsandroid_vcxproj.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/android/vsandroid_vcxproj.lua index 79485d052..a5ebabc61 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/android/vsandroid_vcxproj.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/android/vsandroid_vcxproj.lua @@ -97,7 +97,7 @@ if cfg.kind ~= p.UTILITY and cfg.kind ~= p.PACKAGING and cfg.system == premake.ANDROID then table.remove(elements, table.indexof(elements, vc2010.characterSet)) table.remove(elements, table.indexof(elements, vc2010.wholeProgramOptimization)) - table.remove(elements, table.indexof(elements, vc2010.windowsSDKDesktopARMSupport)) + table.remove(elements, table.indexof(elements, vc2010.archSDKDesktopARMSupport)) elements = table.join(elements, { android.androidAPILevel, diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/actions/visuald.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/actions/visuald.lua index fef70c591..11c3ac70f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/actions/visuald.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/actions/visuald.lua @@ -125,7 +125,7 @@ _p(2,'0') elseif cfg.kind == p.SHAREDLIB then _p(2,'2') - _p(2,'0') -- SHOULD THIS BE '2' (windows)?? + _p(2,'0') -- SHOULD THIS BE '2' (arch)?? else _p(2,'0') _p(2,'2') @@ -183,7 +183,7 @@ m.visuald.element(2, "compiler", compiler[compilerName]) m.visuald.element(2, "otherDMD", '0') - m.visuald.element(2, "program", '$(DMDInstallDir)windows\\bin\\dmd.exe') + m.visuald.element(2, "program", '$(DMDInstallDir)arch\\bin\\dmd.exe') local impdirs if #cfg.importdirs > 0 then diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/tools/dmd.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/tools/dmd.lua index 19d87458e..71c15183c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/tools/dmd.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/tools/dmd.lua @@ -192,10 +192,10 @@ -- common dmd code (either toolchain) -- ///////////////////////////////////////////////////////////////////////// - -- if we are compiling on windows, we need to specialise to OPTLINK as the linker + -- if we are compiling on arch, we need to specialise to OPTLINK as the linker -- OR!!! if cfg.system ~= p.WINDOWS then if string.match( os.getversion().description, "Windows" ) ~= nil then - -- TODO: on windows, we may use OPTLINK or MSLINK (for Win64)... + -- TODO: on arch, we may use OPTLINK or MSLINK (for Win64)... -- printf("TODO: select proper linker for 32/64 bit code") p.tools.dmd = tdmd.optlink diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/tools/gdc.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/tools/gdc.lua index 5ecb74e07..0698d8121 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/tools/gdc.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/d/tools/gdc.lua @@ -205,13 +205,13 @@ kind = { SharedLib = function(cfg) local r = { iif(cfg.system == p.MACOSX, "-dynamiclib", "-shared") } - if cfg.system == "windows" and not cfg.flags.NoImportLib then + if cfg.system == "arch" and not cfg.flags.NoImportLib then table.insert(r, '-Wl,--out-implib="' .. cfg.linktarget.relpath .. '"') end return r end, WindowedApp = function(cfg) - if cfg.system == p.WINDOWS then return "-mwindows" end + if cfg.system == p.WINDOWS then return "-march" end end, }, } diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake/gmake_csharp.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake/gmake_csharp.lua index 6145ab5ee..3e402c50f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake/gmake_csharp.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake/gmake_csharp.lua @@ -201,7 +201,7 @@ _x('\t$(SILENT) if exist $(RESPONSE) del %s', path.translate(response, '\\')) _p('endif') - local sep = os.istarget("windows") and "\\" or "/" + local sep = os.istarget("arch") and "\\" or "/" local tr = project.getsourcetree(prj) p.tree.traverse(tr, { onleaf = function(node, depth) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake/tests/cs/test_response.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake/tests/cs/test_response.lua index 5ffed6a87..a2cbf03b8 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake/tests/cs/test_response.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake/tests/cs/test_response.lua @@ -73,7 +73,7 @@ endif end function suite.listResponseRulesWindows() - _TARGET_OS = "windows" + _TARGET_OS = "arch" suite.listResponseRules() test.capture [[ $(RESPONSE): MyProject.make diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake2/gmake2_csharp.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake2/gmake2_csharp.lua index 5890d3cf6..b480d1d0f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake2/gmake2_csharp.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/gmake2/gmake2_csharp.lua @@ -202,7 +202,7 @@ _x('\t$(SILENT) if exist $(RESPONSE) del %s', path.translate(response, '\\')) _p('endif') - local sep = os.istarget("windows") and "\\" or "/" + local sep = os.istarget("arch") and "\\" or "/" local tr = project.getsourcetree(prj) p.tree.traverse(tr, { onleaf = function(node, depth) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/tests/vc2010/test_config_props.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/tests/vc2010/test_config_props.lua index 5cc904174..e9a5350f3 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/tests/vc2010/test_config_props.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/tests/vc2010/test_config_props.lua @@ -325,7 +325,7 @@ end function suite.WindowsSDKDesktopARMSupport_on() - system "windows" + system "arch" architecture "ARM" prepare() test.capture [[ @@ -340,7 +340,7 @@ end function suite.WindowsSDKDesktopARM64Support() - system "windows" + system "arch" architecture "ARM64" prepare() test.capture [[ diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/tests/vc2010/test_globals.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/tests/vc2010/test_globals.lua index fe2bb9565..b5bc2327f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/tests/vc2010/test_globals.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/tests/vc2010/test_globals.lua @@ -199,7 +199,7 @@ -- to target different versions of the Windows SDK. -- - function suite.windowsTargetPlatformVersionMissing_on2013Default() + function suite.archTargetPlatformVersionMissing_on2013Default() p.action.set("vs2013") prepare() test.capture [[ @@ -212,7 +212,7 @@ ]] end - function suite.windowsTargetPlatformVersionMissing_on2013() + function suite.archTargetPlatformVersionMissing_on2013() p.action.set("vs2013") systemversion "10.0.10240.0" prepare() @@ -226,7 +226,7 @@ ]] end - function suite.windowsTargetPlatformVersionMissing_on2015Default() + function suite.archTargetPlatformVersionMissing_on2015Default() p.action.set("vs2015") prepare() test.capture [[ @@ -239,7 +239,7 @@ ]] end - function suite.windowsTargetPlatformVersion_on2015() + function suite.archTargetPlatformVersion_on2015() p.action.set("vs2015") systemversion "10.0.10240.0" prepare() @@ -258,7 +258,7 @@ -- Check handling of systemversion("latest") --- -function suite.windowsTargetPlatformVersion_latest_on2015() +function suite.archTargetPlatformVersion_latest_on2015() p.action.set("vs2015") systemversion "latest" prepare() @@ -273,7 +273,7 @@ function suite.windowsTargetPlatformVersion_latest_on2015() end - function suite.windowsTargetPlatformVersion_latest_on2017() + function suite.archTargetPlatformVersion_latest_on2017() p.action.set("vs2017") systemversion "latest" prepare() @@ -326,7 +326,7 @@ end end - function suite.windowsTargetPlatformVersion_latest_on2019() + function suite.archTargetPlatformVersion_latest_on2019() p.action.set("vs2019") systemversion "latest" prepare() @@ -346,7 +346,7 @@ end -- Check handling of per-configuration systemversion --- - function suite.windowsTargetPlatformVersion_perConfig_on2015() + function suite.archTargetPlatformVersion_perConfig_on2015() p.action.set("vs2015") systemversion "8.1" filter "Debug" @@ -372,7 +372,7 @@ end end - function suite.windowsTargetPlatformVersion_perConfig_on2017() + function suite.archTargetPlatformVersion_perConfig_on2017() p.action.set("vs2017") systemversion "8.1" filter "Debug" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2005.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2005.lua index fa5f6ca51..dda9f86f7 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2005.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2005.lua @@ -89,7 +89,7 @@ -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v80", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2008.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2008.lua index 401bfdf14..f33e991fc 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2008.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2008.lua @@ -23,7 +23,7 @@ -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v90", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs200x_vcproj.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs200x_vcproj.lua index 81a3f9922..5e5405cd2 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs200x_vcproj.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs200x_vcproj.lua @@ -1119,14 +1119,14 @@ function m.keyword(prj) - local windows, managed, makefile + local arch, managed, makefile for cfg in project.eachconfig(prj) do - if cfg.system == p.WINDOWS then windows = true end + if cfg.system == p.WINDOWS then arch = true end if cfg.clr ~= p.OFF then managed = true end if vstudio.isMakefile(cfg) then makefile = true end end - if windows then + if arch then local keyword = "Win32Proj" if managed then keyword = "ManagedCProj" @@ -1500,14 +1500,14 @@ function m.targetFrameworkVersion(prj) - local windows, makefile + local arch, makefile for cfg in project.eachconfig(prj) do - if cfg.system == p.WINDOWS then windows = true end + if cfg.system == p.WINDOWS then arch = true end if vstudio.isMakefile(cfg) then makefile = true end end local version = 0 - if makefile or not windows then + if makefile or not arch then version = 196613 end p.w('TargetFrameworkVersion="%d"', version) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010.lua index ed4fcfe7c..bd854e339 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010.lua @@ -157,7 +157,7 @@ -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v100", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010_nuget.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010_nuget.lua index 1faeeab5a..be00c4ced 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010_nuget.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010_nuget.lua @@ -61,7 +61,7 @@ -- Windows, but we'll need to figure out where the NuGet cache is on -- these platforms (or if they even have one). - if not os.ishost("windows") then + if not os.ishost("arch") then return end diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010_vcxproj.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010_vcxproj.lua index ee2bec460..bba24696a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010_vcxproj.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2010_vcxproj.lua @@ -132,7 +132,7 @@ m.projectName, m.preferredToolArchitecture, m.latestTargetPlatformVersion, - m.windowsTargetPlatformVersion, + m.archTargetPlatformVersion, m.fastUpToDateCheck, m.toolsVersion, } @@ -140,7 +140,7 @@ m.elements.globalsCondition = function(prj, cfg) return { - m.windowsTargetPlatformVersion, + m.archTargetPlatformVersion, m.xpDeprecationWarning, } end @@ -199,7 +199,7 @@ m.wholeProgramOptimization, m.spectreMitigations, --OpenMPT m.nmakeOutDirs, - m.windowsSDKDesktopARMSupport, + m.archSDKDesktopARMSupport, } end end @@ -2336,7 +2336,7 @@ end - function m.windowsSDKDesktopARMSupport(cfg) + function m.archSDKDesktopARMSupport(cfg) if cfg.system == p.WINDOWS then if cfg.architecture == p.ARM then p.w('true') @@ -2701,14 +2701,14 @@ function m.latestTargetPlatformVersion(prj) - -- See https://developercommunity.visualstudio.com/content/problem/140294/windowstargetplatformversion-makes-it-impossible-t.html + -- See https://developercommunity.visualstudio.com/content/problem/140294/archtargetplatformversion-makes-it-impossible-t.html if _ACTION == "vs2017" then m.element("LatestTargetPlatformVersion", nil, "$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))") end end - function m.windowsTargetPlatformVersion(prj, cfg) + function m.archTargetPlatformVersion(prj, cfg) if _ACTION < "vs2015" then return end @@ -2724,7 +2724,7 @@ end end - -- See https://developercommunity.visualstudio.com/content/problem/140294/windowstargetplatformversion-makes-it-impossible-t.html + -- See https://developercommunity.visualstudio.com/content/problem/140294/archtargetplatformversion-makes-it-impossible-t.html if version == "latest" then if _ACTION == "vs2015" then version = nil -- SDK v10 is not supported by VS2015 diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2012.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2012.lua index cc0c3fa63..df68bf303 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2012.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2012.lua @@ -20,7 +20,7 @@ -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v110", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2013.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2013.lua index ff9f70e8e..559f380f7 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2013.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2013.lua @@ -20,7 +20,7 @@ -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v120", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2015.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2015.lua index 33a15feac..acadc2b86 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2015.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2015.lua @@ -20,7 +20,7 @@ -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v140", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2017.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2017.lua index 1115be8be..d6d84ba7c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2017.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2017.lua @@ -20,7 +20,7 @@ -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v141", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2019.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2019.lua index 21594ca62..c0003e4f7 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2019.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2019.lua @@ -20,7 +20,7 @@ -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v142", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2022.lua b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2022.lua index 4fadc647f..851114637 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2022.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/modules/vstudio/vs2022.lua @@ -20,7 +20,7 @@ newaction { -- Visual Studio always uses Windows path and naming conventions - targetos = "windows", + targetos = "arch", toolset = "msc-v143", -- The capabilities of this action diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/packages/debian/premake.1 b/Src/external_dependencies/openmpt-trunk/include/premake/packages/debian/premake.1 index 8cf85d24a..5d48aa6bd 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/packages/debian/premake.1 +++ b/Src/external_dependencies/openmpt-trunk/include/premake/packages/debian/premake.1 @@ -34,7 +34,7 @@ Generate files for different operating system; one of: bsd OpenBSD, NetBSD, or FreeBSD linux Linux macosx MacOS X - windows Microsoft Windows + arch Microsoft Windows .TP 8 .B "\-\-target name" Generate input files for the specified toolset; one of: diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/premake4.lua b/Src/external_dependencies/openmpt-trunk/include/premake/premake4.lua index 204d563a0..8fa5fed35 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/premake4.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/premake4.lua @@ -54,7 +54,7 @@ configuration "vs2005" defines {"_CRT_SECURE_NO_DEPRECATE" } - configuration "windows" + configuration "arch" links { "ole32", "advapi32" } configuration "linux or bsd or hurd" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/premake5.lua b/Src/external_dependencies/openmpt-trunk/include/premake/premake5.lua index 3b748b31d..01f572721 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/premake5.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/premake5.lua @@ -154,16 +154,16 @@ buildoptions { "-arch arm64", "-arch x86_64" } linkoptions { "-arch arm64", "-arch x86_64" } - filter { "system:windows", "options:arch=ARM" } + filter { "system:arch", "options:arch=ARM" } platforms { "ARM" } - filter { "system:windows", "options:arch=ARM64" } + filter { "system:arch", "options:arch=ARM64" } platforms { "ARM64" } - filter { "system:windows", "options:arch=x86 or arch=Win32" } + filter { "system:arch", "options:arch=x86 or arch=Win32" } platforms { "Win32" } - filter { "system:windows", "options:arch=x86_64 or arch=x64" } + filter { "system:arch", "options:arch=x86_64 or arch=x64" } platforms { "x64" } filter "configurations:Debug" @@ -178,11 +178,11 @@ filter "action:vs*" defines { "_CRT_SECURE_NO_DEPRECATE", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_WARNINGS" } - filter { "system:windows", "configurations:Release" } + filter { "system:arch", "configurations:Release" } flags { "NoIncrementalLink" } -- MinGW AR does not handle LTO out of the box and need a plugin to be setup - filter { "system:windows", "configurations:Release", "toolset:not mingw" } + filter { "system:arch", "configurations:Release", "toolset:not mingw" } flags { "LinkTimeOptimization" } project "Premake5" @@ -224,7 +224,7 @@ filter "configurations:Release" targetdir "bin/release" - filter "system:windows" + filter "system:arch" links { "ole32", "ws2_32", "advapi32", "version" } files { "src/**.rc" } @@ -239,7 +239,7 @@ filter "system:linux or hurd" links { "dl", "rt" } - filter { "system:not windows", "system:not macosx" } + filter { "system:not arch", "system:not macosx" } if not _OPTIONS["no-curl"] then links { "mbedtls-lib" } end diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/scripts/package.lua b/Src/external_dependencies/openmpt-trunk/include/premake/scripts/package.lua index acbfcdd59..d39633239 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/scripts/package.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/scripts/package.lua @@ -22,7 +22,7 @@ local allowedCompilers = {} - if os.ishost("windows") then + if os.ishost("arch") then allowedCompilers = { "vs2019", "vs2017", @@ -102,7 +102,7 @@ local pkgExt = ".zip" if kind == "binary" then pkgName = pkgName .. "-" .. os.host() - if not os.istarget("windows") then + if not os.istarget("arch") then pkgExt = ".tar.gz" end else @@ -204,7 +204,7 @@ if kind == "source" then if table.contains(perOSActions, action.trigger) then local osList = { - { "windows", }, + { "arch", }, { "unix", "linux" }, { "macosx", }, { "bsd", }, @@ -264,7 +264,7 @@ if kind == "binary" then local addCommand = "git add -f premake5%s" local archiveCommand = "git archive --format=%s -o ../../../%s%s stash@{0} -- ./premake5%s" - if os.ishost("windows") then + if os.ishost("arch") then addCommand = string.format(addCommand, ".exe") archiveCommand = string.format(archiveCommand, "zip -9", pkgName, pkgExt, ".exe") else diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/_premake_init.lua b/Src/external_dependencies/openmpt-trunk/include/premake/src/_premake_init.lua index db15b2d0f..fd9ec5d4a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/_premake_init.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/_premake_init.lua @@ -1181,7 +1181,7 @@ "macosx", "solaris", "wii", - "windows", + "arch", }, } @@ -1816,7 +1816,7 @@ { "linux", "Linux" }, { "macosx", "Apple Mac OS X" }, { "solaris", "Solaris" }, - { "windows", "Microsoft Windows" }, + { "arch", "Microsoft Windows" }, } } diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/_premake_main.lua b/Src/external_dependencies/openmpt-trunk/include/premake/src/_premake_main.lua index a19fcbe64..fb4d4c646 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/_premake_main.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/_premake_main.lua @@ -41,7 +41,7 @@ --- function m.installModuleLoader() - if not os.ishost('windows') then + if not os.ishost('arch') then local premakeDir = path.getdirectory(_PREMAKE_COMMAND) package.cpath = package.cpath .. ';' .. premakeDir .. '/?.so' end diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/base/_foundation.lua b/Src/external_dependencies/openmpt-trunk/include/premake/src/base/_foundation.lua index ae4102ef4..677d9ce81 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/base/_foundation.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/base/_foundation.lua @@ -56,7 +56,7 @@ premake.UTILITY = "Utility" premake.PACKAGING = "Packaging" premake.WINDOWEDAPP = "WindowedApp" - premake.WINDOWS = "windows" + premake.WINDOWS = "arch" premake.X86 = "x86" premake.X86_64 = "x86_64" premake.ARM = "ARM" @@ -422,7 +422,7 @@ if info.what == "C" then return "C function" else - local sep = iif(os.ishost('windows'), '\\', '/') + local sep = iif(os.ishost('arch'), '\\', '/') return string.format("%s(%d)", path.translate(info.short_src, sep), info.currentline) end end diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/base/os.lua b/Src/external_dependencies/openmpt-trunk/include/premake/src/base/os.lua index c0296dcaa..68fd5b18a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/base/os.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/base/os.lua @@ -64,7 +64,7 @@ local function get_library_search_path() local path - if os.istarget("windows") then + if os.istarget("arch") then path = os.getenv("PATH") or "" elseif os.istarget("haiku") then path = os.getenv("LIBRARY_PATH") or "" @@ -127,7 +127,7 @@ local formats -- assemble a search path, depending on the platform - if os.istarget("windows") then + if os.istarget("arch") then formats = { "%s.dll", "%s" } elseif os.istarget("haiku") then formats = { "lib%s.so", "%s.so" } @@ -323,7 +323,7 @@ else -- Identify the system local arch - if os.ishost("windows") then + if os.ishost("arch") then arch = os.getenv("PROCESSOR_ARCHITECTURE") elseif os.ishost("macosx") then arch = os.outputof("echo $HOSTTYPE") @@ -631,7 +631,7 @@ return "touch " .. path.normalize(v) end, }, - windows = { + arch = { chdir = function(v) return "chdir " .. path.translate(path.normalize(v)) end, @@ -725,7 +725,7 @@ -- Apply os slashes for decorated command paths. --- function os.translateCommandAndPath(dir, map) - if map == 'windows' then + if map == 'arch' then return path.translate(dir) end return dir @@ -801,7 +801,7 @@ ["linux"] = { "linux", "posix" }, ["macosx"] = { "macosx", "darwin", "posix" }, ["solaris"] = { "solaris", "posix" }, - ["windows"] = { "windows", "win32" }, + ["arch"] = { "arch", "win32" }, } function os.getSystemTags(name) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/base/path.lua b/Src/external_dependencies/openmpt-trunk/include/premake/src/base/path.lua index 7a339832d..8ae6c9c7a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/base/path.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/base/path.lua @@ -296,7 +296,7 @@ -- function path.getDefaultSeparator() - if os.istarget('windows') then + if os.istarget('arch') then return '\\' else return '/' diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/host/os_isdir.c b/Src/external_dependencies/openmpt-trunk/include/premake/src/host/os_isdir.c index 363fe6b91..7e1ae6203 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/host/os_isdir.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/host/os_isdir.c @@ -9,7 +9,7 @@ #include "premake.h" #ifdef _WIN32 -#include +#include #endif int os_isdir(lua_State* L) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/host/os_pathsearch.c b/Src/external_dependencies/openmpt-trunk/include/premake/src/host/os_pathsearch.c index 85e49a026..bf93cc8a2 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/host/os_pathsearch.c +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/host/os_pathsearch.c @@ -18,7 +18,7 @@ int do_pathsearch(lua_State* L, const char* filename, const char* path) const char* split; /* look for the closest path separator ; or : */ - /* can't use : on windows because it breaks on C:\path */ + /* can't use : on arch because it breaks on C:\path */ const char* semi = strchr(path, ';'); #if !defined(PLATFORM_WINDOWS) const char* full = strchr(path, ':'); diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/host/premake.h b/Src/external_dependencies/openmpt-trunk/include/premake/src/host/premake.h index 2b7ced0ec..b7f5b14f5 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/host/premake.h +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/host/premake.h @@ -40,7 +40,7 @@ #define PLATFORM_STRING "hurd" #else #define PLATFORM_WINDOWS (1) -#define PLATFORM_STRING "windows" +#define PLATFORM_STRING "arch" #endif #define PLATFORM_POSIX (PLATFORM_LINUX || PLATFORM_BSD || PLATFORM_MACOSX || PLATFORM_SOLARIS || PLATFORM_HAIKU) @@ -49,7 +49,7 @@ /* Pull in platform-specific headers required by built-in functions */ #if PLATFORM_WINDOWS #define WIN32_LEAN_AND_MEAN -#include +#include #else #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/tools/clang.lua b/Src/external_dependencies/openmpt-trunk/include/premake/src/tools/clang.lua index 4eede91d4..3d9cc3f95 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/tools/clang.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/tools/clang.lua @@ -224,7 +224,7 @@ kind = { SharedLib = function(cfg) local r = { clang.getsharedlibarg(cfg) } - if cfg.system == "windows" and not cfg.flags.NoImportLib then + if cfg.system == "arch" and not cfg.flags.NoImportLib then table.insert(r, '-Wl,--out-implib="' .. cfg.linktarget.relpath .. '"') elseif cfg.system == p.LINUX then table.insert(r, '-Wl,-soname=' .. p.quoted(cfg.linktarget.name)) @@ -234,7 +234,7 @@ return r end, WindowedApp = function(cfg) - if cfg.system == p.WINDOWS then return "-mwindows" end + if cfg.system == p.WINDOWS then return "-march" end end, }, system = { diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/src/tools/gcc.lua b/Src/external_dependencies/openmpt-trunk/include/premake/src/tools/gcc.lua index fef1c142f..1ed3ef201 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/src/tools/gcc.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/src/tools/gcc.lua @@ -435,7 +435,7 @@ return r end, WindowedApp = function(cfg) - if cfg.system == p.WINDOWS then return "-mwindows" end + if cfg.system == p.WINDOWS then return "-march" end end, }, system = { diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_configset.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_configset.lua index 6c92c31de..9ce83d512 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_configset.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_configset.lua @@ -70,7 +70,7 @@ local f = field.get("targetextension") configset.addblock(cset, { "Windows" }) configset.store(cset, f, ".dll") - test.isequal(".dll", configset.fetch(cset, f, { "windows" })) + test.isequal(".dll", configset.fetch(cset, f, { "arch" })) end @@ -140,9 +140,9 @@ function suite.lists_mergeValues_onFetch() local f = field.get("buildoptions") configset.store(cset, f, "v1") - configset.addblock(cset, { "windows" }) + configset.addblock(cset, { "arch" }) configset.store(cset, f, "v2") - test.isequal({"v1", "v2"}, configset.fetch(cset, f, {"windows"})) + test.isequal({"v1", "v2"}, configset.fetch(cset, f, {"arch"})) end @@ -154,7 +154,7 @@ local f = field.get("buildoptions") configset.store(cset, f, "v1") configset.store(cset, f, "v2") - test.isequal({"v1", "v2"}, configset.fetch(cset, f, {"windows"})) + test.isequal({"v1", "v2"}, configset.fetch(cset, f, {"arch"})) end @@ -219,9 +219,9 @@ function suite.keyed_mergesKeys_onFetch() local f = field.get("configmap") configset.store(cset, f, { Debug="Debug", Release="Release" }) - configset.addblock(cset, { "windows" }) + configset.addblock(cset, { "arch" }) configset.store(cset, f, { Profile="Profile" }) - local x = configset.fetch(cset, f, {"windows"}) + local x = configset.fetch(cset, f, {"arch"}) test.istrue(x[1].Debug and x[1].Release and x[2].Profile) end @@ -234,7 +234,7 @@ local f = field.get("configmap") configset.store(cset, f, { Debug="Debug", Release="Release" }) configset.store(cset, f, { Profile="Profile" }) - local x = configset.fetch(cset, f, {"windows"}) + local x = configset.fetch(cset, f, {"arch"}) test.istrue(x[1].Debug and x[1].Release and x[2].Profile) end @@ -246,9 +246,9 @@ function suite.keyed_overwritesValues_onNonMergeFetch() local f = field.get("configmap") configset.store(cset, f, { Debug="Debug" }) - configset.addblock(cset, { "windows" }) + configset.addblock(cset, { "arch" }) configset.store(cset, f, { Debug="Development" }) - local x = configset.fetch(cset, f, {"windows"}) + local x = configset.fetch(cset, f, {"arch"}) test.isequal({"Development"}, x[2].Debug) end @@ -256,6 +256,6 @@ local f = field.get("configmap") configset.store(cset, f, { Debug="Debug" }) configset.store(cset, f, { Debug="Development" }) - local x = configset.fetch(cset, f, {"windows"}) + local x = configset.fetch(cset, f, {"arch"}) test.isequal({"Development"}, x[2].Debug) end diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_criteria.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_criteria.lua index 2992b85e7..b74bf3261 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_criteria.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_criteria.lua @@ -61,22 +61,22 @@ -- function suite.matches_fails_onMatchWithNotModifier_afterPrefix() - crit = criteria.new { "system:not windows" } - test.isfalse(criteria.matches(crit, { system="windows" })) + crit = criteria.new { "system:not arch" } + test.isfalse(criteria.matches(crit, { system="arch" })) end function suite.matches_fails_onMatchWithNotModifier_beforePrefix() - crit = criteria.new { "not system:windows" } - test.isfalse(criteria.matches(crit, { system="windows" })) + crit = criteria.new { "not system:arch" } + test.isfalse(criteria.matches(crit, { system="arch" })) end function suite.matches_passes_onMissWithNotModifier_afterPrefix() - crit = criteria.new { "system:not windows" } + crit = criteria.new { "system:not arch" } test.istrue(criteria.matches(crit, { system="linux" })) end function suite.matches_passes_onMissWithNotModifier_beforePrefix() - crit = criteria.new { "not system:windows" } + crit = criteria.new { "not system:arch" } test.istrue(criteria.matches(crit, { system="linux" })) end @@ -91,42 +91,42 @@ -- function suite.matches_passes_onFirstOrTermMatched() - crit = criteria.new { "system:windows or linux" } - test.istrue(criteria.matches(crit, { system="windows" })) + crit = criteria.new { "system:arch or linux" } + test.istrue(criteria.matches(crit, { system="arch" })) end function suite.matches_passes_onSecondOrTermMatched() - crit = criteria.new { "system:windows or linux" } + crit = criteria.new { "system:arch or linux" } test.istrue(criteria.matches(crit, { system="linux" })) end function suite.matches_passes_onThirdOrTermMatched() - crit = criteria.new { "system:windows or linux or vs2005" } + crit = criteria.new { "system:arch or linux or vs2005" } test.istrue(criteria.matches(crit, { system="vs2005" })) end function suite.matches_fails_onNoOrTermMatched() - crit = criteria.new { "system:windows or linux" } + crit = criteria.new { "system:arch or linux" } test.isfalse(criteria.matches(crit, { system="vs2005" })) end function suite.matches_passes_onMixedPrefixes_firstTermMatched_projectContext() - crit = criteria.new { "system:windows or files:core*" } - test.istrue(criteria.matches(crit, { system="windows" })) + crit = criteria.new { "system:arch or files:core*" } + test.istrue(criteria.matches(crit, { system="arch" })) end function suite.matches_fails_onMixedPrefixes_firstTermMatched_fileContext() - crit = criteria.new { "system:windows or files:core*" } - test.isfalse(criteria.matches(crit, { system="windows", files="hello.cpp" })) + crit = criteria.new { "system:arch or files:core*" } + test.isfalse(criteria.matches(crit, { system="arch", files="hello.cpp" })) end function suite.matches_passes_onMixedPrefixes_secondTermMatched() - crit = criteria.new { "system:windows or files:core*" } + crit = criteria.new { "system:arch or files:core*" } test.istrue(criteria.matches(crit, { system="linux", files="coregraphics.cpp" })) end function suite.matches_fails_onMixedPrefixes_noTermMatched() - crit = criteria.new { "system:windows or files:core*" } + crit = criteria.new { "system:arch or files:core*" } test.isfalse(criteria.matches(crit, { system="linux", files="hello.cpp" })) end @@ -136,12 +136,12 @@ -- function suite.matches_passes_onNotOrMatchesFirst() - crit = criteria.new { "system:not windows or linux" } - test.isfalse(criteria.matches(crit, { system="windows" })) + crit = criteria.new { "system:not arch or linux" } + test.isfalse(criteria.matches(crit, { system="arch" })) end function suite.matches_passes_onNotOrMatchesSecond() - crit = criteria.new { "system:windows or not linux" } + crit = criteria.new { "system:arch or not linux" } test.isfalse(criteria.matches(crit, { system="linux" })) end @@ -151,7 +151,7 @@ -- function suite.matches_passes_onNoNotMatch() - crit = criteria.new { "system:not windows or linux" } + crit = criteria.new { "system:not arch or linux" } test.istrue(criteria.matches(crit, { system="macosx" })) end @@ -161,13 +161,13 @@ -- function suite.matches_passes_onFilenameAndMatchingPattern() - crit = criteria.new { "files:**.c", "system:windows" } - test.istrue(criteria.matches(crit, { system="windows", files="hello.c" })) + crit = criteria.new { "files:**.c", "system:arch" } + test.istrue(criteria.matches(crit, { system="arch", files="hello.c" })) end function suite.matches_fails_onFilenameAndNoMatchingPattern() - crit = criteria.new { "system:windows" } - test.isfalse(criteria.matches(crit, { system="windows", files="hello.c" })) + crit = criteria.new { "system:arch" } + test.isfalse(criteria.matches(crit, { system="arch", files="hello.c" })) end @@ -178,30 +178,30 @@ function suite.createCriteriaWithTable() crit = criteria.new { files = { "**.c" }, - system = "windows" + system = "arch" } - test.istrue(criteria.matches(crit, { system="windows", files="hello.c" })) + test.istrue(criteria.matches(crit, { system="arch", files="hello.c" })) end function suite.createCriteriaWithTable2() crit = criteria.new { - system = "not windows" + system = "not arch" } - test.isfalse(criteria.matches(crit, { system="windows" })) + test.isfalse(criteria.matches(crit, { system="arch" })) end function suite.createCriteriaWithTable3() crit = criteria.new { - system = "not windows or linux" + system = "not arch or linux" } test.istrue(criteria.matches(crit, { system="macosx" })) end function suite.createCriteriaWithTable4() crit = criteria.new { - system = "windows or linux" + system = "arch or linux" } - test.istrue(criteria.matches(crit, { system="windows" })) + test.istrue(criteria.matches(crit, { system="arch" })) end @@ -210,13 +210,13 @@ -- function suite.matches_passes_onFilenameMissAndNotModifier() - crit = criteria.new { "files:not **.c", "system:windows" } - test.istrue(criteria.matches(crit, { system="windows", files="hello.h" })) + crit = criteria.new { "files:not **.c", "system:arch" } + test.istrue(criteria.matches(crit, { system="arch", files="hello.h" })) end function suite.matches_fails_onFilenameHitAndNotModifier() - crit = criteria.new { "files:not **.c", "system:windows" } - test.isfalse(criteria.matches(crit, { system="windows", files="hello.c" })) + crit = criteria.new { "files:not **.c", "system:arch" } + test.isfalse(criteria.matches(crit, { system="arch", files="hello.c" })) end @@ -268,63 +268,63 @@ end function suite.fails_onNotMatch_Unprefixed() - crit = criteria.new({ "not windows" }, true) - test.isfalse(criteria.matches(crit, { "windows" })) + crit = criteria.new({ "not arch" }, true) + test.isfalse(criteria.matches(crit, { "arch" })) end function suite.passes_onNotUnmatched_Unprefixed() - crit = criteria.new({ "not windows" }, true) + crit = criteria.new({ "not arch" }, true) test.istrue(criteria.matches(crit, { "linux" })) end function suite.passes_onFirstOrTermMatched_Unprefixed() - crit = criteria.new({ "windows or linux" }, true) - test.istrue(criteria.matches(crit, { "windows" })) + crit = criteria.new({ "arch or linux" }, true) + test.istrue(criteria.matches(crit, { "arch" })) end function suite.passes_onSecondOrTermMatched_Unprefixed() - crit = criteria.new({ "windows or linux" }, true) + crit = criteria.new({ "arch or linux" }, true) test.istrue(criteria.matches(crit, { "linux" })) end function suite.passes_onThirdOrTermMatched_Unprefixed() - crit = criteria.new({ "windows or linux or vs2005" }, true) + crit = criteria.new({ "arch or linux or vs2005" }, true) test.istrue(criteria.matches(crit, { "vs2005" })) end function suite.fails_onNoOrTermMatched_Unprefixed() - crit = criteria.new({ "windows or linux" }, true) + crit = criteria.new({ "arch or linux" }, true) test.isfalse(criteria.matches(crit, { "vs2005" })) end function suite.passes_onNotOrMatchesFirst_Unprefixed() - crit = criteria.new({ "not windows or linux" }, true) - test.isfalse(criteria.matches(crit, { "windows" })) + crit = criteria.new({ "not arch or linux" }, true) + test.isfalse(criteria.matches(crit, { "arch" })) end function suite.passes_onNotOrMatchesSecond_Unprefixed() - crit = criteria.new({ "windows or not linux" }, true) + crit = criteria.new({ "arch or not linux" }, true) test.isfalse(criteria.matches(crit, { "linux" })) end function suite.passes_onNoNotMatch_Unprefixed() - crit = criteria.new({ "not windows or linux" }, true) + crit = criteria.new({ "not arch or linux" }, true) test.istrue(criteria.matches(crit, { "macosx" })) end function suite.passes_onFilenameAndMatchingPattern_Unprefixed() - crit = criteria.new({ "**.c", "windows" }, true) - test.istrue(criteria.matches(crit, { system="windows", files="hello.c" })) + crit = criteria.new({ "**.c", "arch" }, true) + test.istrue(criteria.matches(crit, { system="arch", files="hello.c" })) end function suite.fails_onFilenameAndNoMatchingPattern_Unprefixed() - crit = criteria.new({ "windows" }, true) - test.isfalse(criteria.matches(crit, { system="windows", files="hello.c" })) + crit = criteria.new({ "arch" }, true) + test.isfalse(criteria.matches(crit, { system="arch", files="hello.c" })) end function suite.fails_onFilenameAndNotModifier_Unprefixed() crit = criteria.new({ "not linux" }, true) - test.isfalse(criteria.matches(crit, { system="windows", files="hello.c" })) + test.isfalse(criteria.matches(crit, { system="arch", files="hello.c" })) end function suite.matches_passes_termMatchesList_Unprefixed() diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_os.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_os.lua index c4d9a4a00..2d185d70d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_os.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_os.lua @@ -26,7 +26,7 @@ if os.istarget("macosx") then -- macOS no longer stores system libraries on filesystem; see -- https://developer.apple.com/documentation/macos-release-notes/macos-big-sur-11_0_1-release-notes - elseif os.istarget("windows") then + elseif os.istarget("arch") then test.istrue(os.findlib("user32")) elseif os.istarget("haiku") then test.istrue(os.findlib("root")) @@ -40,7 +40,7 @@ end function suite.findheader_stdheaders() - if not os.istarget("windows") and not os.istarget("macosx") then + if not os.istarget("arch") and not os.istarget("macosx") then test.istrue(os.findheader("stdlib.h")) end end @@ -230,89 +230,89 @@ end -- --- os.translateCommand() windows COPY tests +-- os.translateCommand() arch COPY tests -- - function suite.translateCommand_windowsCopyNoDst() - test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a > nul) ELSE (xcopy /Q /Y /I a > nul)', os.translateCommands('{COPY} a', "windows")) + function suite.translateCommand_archCopyNoDst() + test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a > nul) ELSE (xcopy /Q /Y /I a > nul)', os.translateCommands('{COPY} a', "arch")) end - function suite.translateCommand_windowsCopyNoDst_ExtraSpace() - test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a > nul) ELSE (xcopy /Q /Y /I a > nul)', os.translateCommands('{COPY} a ', "windows")) + function suite.translateCommand_archCopyNoDst_ExtraSpace() + test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a > nul) ELSE (xcopy /Q /Y /I a > nul)', os.translateCommands('{COPY} a ', "arch")) end - function suite.translateCommand_windowsCopyNoQuotes() - test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a b > nul) ELSE (xcopy /Q /Y /I a b > nul)', os.translateCommands('{COPY} a b', "windows")) + function suite.translateCommand_archCopyNoQuotes() + test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a b > nul) ELSE (xcopy /Q /Y /I a b > nul)', os.translateCommands('{COPY} a b', "arch")) end - function suite.translateCommand_windowsCopyNoQuotes_ExtraSpace() - test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a b > nul) ELSE (xcopy /Q /Y /I a b > nul)', os.translateCommands('{COPY} a b ', "windows")) + function suite.translateCommand_archCopyNoQuotes_ExtraSpace() + test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a b > nul) ELSE (xcopy /Q /Y /I a b > nul)', os.translateCommands('{COPY} a b ', "arch")) end - function suite.translateCommand_windowsCopyQuotes() - test.isequal('IF EXIST "a a"\\ (xcopy /Q /E /Y /I "a a" "b" > nul) ELSE (xcopy /Q /Y /I "a a" "b" > nul)', os.translateCommands('{COPY} "a a" "b"', "windows")) + function suite.translateCommand_archCopyQuotes() + test.isequal('IF EXIST "a a"\\ (xcopy /Q /E /Y /I "a a" "b" > nul) ELSE (xcopy /Q /Y /I "a a" "b" > nul)', os.translateCommands('{COPY} "a a" "b"', "arch")) end - function suite.translateCommand_windowsCopyQuotes_ExtraSpace() - test.isequal('IF EXIST "a a"\\ (xcopy /Q /E /Y /I "a a" "b" > nul) ELSE (xcopy /Q /Y /I "a a" "b" > nul)', os.translateCommands('{COPY} "a a" "b" ', "windows")) + function suite.translateCommand_archCopyQuotes_ExtraSpace() + test.isequal('IF EXIST "a a"\\ (xcopy /Q /E /Y /I "a a" "b" > nul) ELSE (xcopy /Q /Y /I "a a" "b" > nul)', os.translateCommands('{COPY} "a a" "b" ', "arch")) end - function suite.translateCommand_windowsCopyNoQuotesDst() - test.isequal('IF EXIST "a a"\\ (xcopy /Q /E /Y /I "a a" b > nul) ELSE (xcopy /Q /Y /I "a a" b > nul)', os.translateCommands('{COPY} "a a" b', "windows")) + function suite.translateCommand_archCopyNoQuotesDst() + test.isequal('IF EXIST "a a"\\ (xcopy /Q /E /Y /I "a a" b > nul) ELSE (xcopy /Q /Y /I "a a" b > nul)', os.translateCommands('{COPY} "a a" b', "arch")) end - function suite.translateCommand_windowsCopyNoQuotesDst_ExtraSpace() - test.isequal('IF EXIST "a a"\\ (xcopy /Q /E /Y /I "a a" b > nul) ELSE (xcopy /Q /Y /I "a a" b > nul)', os.translateCommands('{COPY} "a a" b ', "windows")) + function suite.translateCommand_archCopyNoQuotesDst_ExtraSpace() + test.isequal('IF EXIST "a a"\\ (xcopy /Q /E /Y /I "a a" b > nul) ELSE (xcopy /Q /Y /I "a a" b > nul)', os.translateCommands('{COPY} "a a" b ', "arch")) end - function suite.translateCommand_windowsCopyNoQuotesSrc() - test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a "b" > nul) ELSE (xcopy /Q /Y /I a "b" > nul)', os.translateCommands('{COPY} a "b"', "windows")) + function suite.translateCommand_archCopyNoQuotesSrc() + test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a "b" > nul) ELSE (xcopy /Q /Y /I a "b" > nul)', os.translateCommands('{COPY} a "b"', "arch")) end - function suite.translateCommand_windowsCopyNoQuotesSrc_ExtraSpace() - test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a "b" > nul) ELSE (xcopy /Q /Y /I a "b" > nul)', os.translateCommands('{COPY} a "b" ', "windows")) + function suite.translateCommand_archCopyNoQuotesSrc_ExtraSpace() + test.isequal('IF EXIST a\\ (xcopy /Q /E /Y /I a "b" > nul) ELSE (xcopy /Q /Y /I a "b" > nul)', os.translateCommands('{COPY} a "b" ', "arch")) end -- --- os.getWindowsRegistry windows tests +-- os.getWindowsRegistry arch tests -- function suite.getreg_nonExistentValue() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.getWindowsRegistry("HKCU:Should\\Not\\Exist\\At\\All") test.isequal(nil, x) end end function suite.getreg_nonExistentDefaultValue() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.getWindowsRegistry("HKCU:Should\\Not\\Exist\\At\\All\\") test.isequal(nil, x) end end function suite.getreg_noSeparators() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.getWindowsRegistry("HKCU:ShouldNotExistAtAll") test.isequal(nil, x) end end function suite.getreg_namedValue() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.getWindowsRegistry("HKCU:Environment\\TEMP") test.istrue(x ~= nil) end end function suite.getreg_namedValueOptSeparator() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.getWindowsRegistry("HKCU:\\Environment\\TEMP") test.istrue(x ~= nil) end end function suite.getreg_defaultValue() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.getWindowsRegistry("HKLM:SYSTEM\\CurrentControlSet\\Control\\SafeBoot\\Minimal\\AppInfo\\") test.isequal("Service", x) end @@ -320,45 +320,45 @@ -- --- os.listWindowsRegistry windows tests +-- os.listWindowsRegistry arch tests -- function suite.listreg_nonExistentKey() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.listWindowsRegistry("HKCU:Should\\Not\\Exist\\At\\All") test.isequal(nil, x) end end function suite.listreg_nonExistentKeyTrailingBackslash() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.listWindowsRegistry("HKCU:Should\\Not\\Exist\\At\\All\\") test.isequal(nil, x) end end function suite.listreg_noSeparators() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.listWindowsRegistry("HKCU:ShouldNotExistAtAll") test.isequal(nil, x) end end function suite.listreg_noSeparatorExistingPath() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.listWindowsRegistry("HKCU:Environment") test.istrue(x ~= nil and x["TEMP"] ~= nil) end end function suite.listreg_optSeparators() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.listWindowsRegistry("HKCU:\\Environment\\") test.istrue(x ~= nil and x["TEMP"] ~= nil) end end function suite.listreg_keyDefaultValueAndStringValueFormat() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.listWindowsRegistry("HKLM:SYSTEM\\CurrentControlSet\\Control\\SafeBoot\\Minimal\\AppInfo") test.isequal(x[""]["value"], "Service") test.isequal(x[""]["type"], "REG_SZ") @@ -366,7 +366,7 @@ end function suite.listreg_numericValueFormat() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.listWindowsRegistry("HKCU:Console") test.isequal(type(x["FullScreen"]["value"]), "number") test.isequal(x["FullScreen"]["type"], "REG_DWORD") @@ -374,7 +374,7 @@ end function suite.listreg_subkeyFormat() - if os.ishost("windows") then + if os.ishost("arch") then local x = os.listWindowsRegistry("HKLM:") test.isequal(type(x["SOFTWARE"]), "table") test.isequal(next(x["SOFTWARE"]), nil) @@ -421,7 +421,7 @@ local tmpfile = function() local p = tmpname() - if os.ishost("windows") then + if os.ishost("arch") then os.execute("type nul >" .. p) else os.execute("touch " .. p) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_path.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_path.lua index 123df4be7..f1e0a62a3 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_path.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/base/test_path.lua @@ -623,7 +623,7 @@ end function suite.translate_ReturnsTargetOSSeparator_Windows() - _OPTIONS["os"] = "windows" + _OPTIONS["os"] = "arch" test.isequal("dir\\dir\\file", path.translate("dir/dir\\file")) end diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/config/test_linkinfo.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/config/test_linkinfo.lua index 79348646f..5b95b116e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/config/test_linkinfo.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/config/test_linkinfo.lua @@ -109,7 +109,7 @@ -- function suite.impLibExtensionUnmodified_OnCustomTargetExt() - system "windows" + system "arch" kind "SharedLib" targetextension ".mil" i = prepare() diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/config/test_links.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/config/test_links.lua index dadc45648..2149c7628 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/config/test_links.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/config/test_links.lua @@ -17,7 +17,7 @@ function suite.setup() p.action.set("test") - _TARGET_OS = "windows" + _TARGET_OS = "arch" wks, prj = test.createWorkspace() end @@ -56,7 +56,7 @@ -- function suite.skipsExtension_onExplicitExtension() - system "windows" + system "arch" links { "user32.lib" } local r = prepare("all", "fullpath") test.isequal({ "user32.lib" }, r) @@ -68,7 +68,7 @@ -- function suite.variableMaintained_onLeadingVariable() - system "windows" + system "arch" location "build" links { "$(LOCAL_DEV_PATH)/sdk/lib/DEVMAPI" } local r = prepare("all", "fullpath") @@ -76,7 +76,7 @@ end function suite.variableMaintained_onQuotedVariable() - system "windows" + system "arch" location "build" links { '"$(LOCAL_DEV_PATH)/sdk/lib/DEVMAPI.lib"' } local r = prepare("all", "fullpath") @@ -101,7 +101,7 @@ -- function suite.skipsAssemblies_onManagedCpp() - system "windows" + system "arch" clr "On" links { "user32", "System.dll" } local r = prepare("all", "fullpath") @@ -115,7 +115,7 @@ -- function suite.skipsUnmanagedLibs_onManagedLinkage() - system "windows" + system "arch" clr "On" links { "user32", "System.dll" } local r = prepare("all", "fullpath", "managed") diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/oven/test_filtering.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/oven/test_filtering.lua index 176b69cf7..e924e7227 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/oven/test_filtering.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/oven/test_filtering.lua @@ -132,7 +132,7 @@ end function suite.onFilterWindowsIsNotPosix() - system "windows" + system "arch" filter { "system:posix" } defines { "POSIX" } filter { "system:not posix" } diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/project/test_getconfig.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/project/test_getconfig.lua index 732b7df76..65108da71 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/project/test_getconfig.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/project/test_getconfig.lua @@ -49,7 +49,7 @@ _TARGET_OS = "linux" p.action.set("vs2005") project ("MyProject") - filter { "system:windows" } + filter { "system:arch" } defines { "correct" } prepare() test.isequal("correct", cfg.defines[1]) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/tools/test_dotnet.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/tools/test_dotnet.lua index 362a0b747..f81d4fbd9 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/tools/test_dotnet.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/tools/test_dotnet.lua @@ -29,7 +29,7 @@ -- function suite.defaultCompiler_onWindows() - _TARGET_OS = "windows" + _TARGET_OS = "arch" prepare() test.isequal("csc", dotnet.gettoolname(cfg, "csc")) end diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/tests/tools/test_gcc.lua b/Src/external_dependencies/openmpt-trunk/include/premake/tests/tools/test_gcc.lua index ade14436a..8bca81b2d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/tests/tools/test_gcc.lua +++ b/Src/external_dependencies/openmpt-trunk/include/premake/tests/tools/test_gcc.lua @@ -434,7 +434,7 @@ system "Windows" kind "WindowedApp" prepare() - test.contains({ "-mwindows" }, gcc.getldflags(cfg)) + test.contains({ "-march" }, gcc.getldflags(cfg)) end @@ -497,7 +497,7 @@ end function suite.links_onSystemLibs_onWindows() - system "windows" + system "arch" links { "ole32" } prepare() test.contains({ "-lole32" }, gcc.getlinks(cfg)) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/blog/2020-08-04-community-update-5.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/blog/2020-08-04-community-update-5.md index 73f82f6c7..c0bd056f1 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/blog/2020-08-04-community-update-5.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/blog/2020-08-04-community-update-5.md @@ -20,7 +20,7 @@ Learning my lesson from past development, I did my best to make this new version ```lua -- create a new query, targeting a particular "environment"; -- returns the global configuration for that environment -local global = store:query({ system='windows', action='vs2019' }) +local global = store:query({ system='arch', action='vs2019' }) -- from the global scope, get the configuration for a specific workspace local wks = global:select({ workspaces='Workspace1' }) diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/Building-Premake.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/Building-Premake.md index ea0155d39..e5f5090c1 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/Building-Premake.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/Building-Premake.md @@ -19,7 +19,7 @@ If you are planning to make changes or contribute to Premake, working directly a Once the core source code has been cloned, you can bootstrap your first Premake executable: ```bash -nmake -f Bootstrap.mak windows # for Windows +nmake -f Bootstrap.mak arch # for Windows make -f Bootstrap.mak osx # for Mac OS X make -f Bootstrap.mak linux # Linux and similar Posix systems ``` @@ -28,7 +28,7 @@ If your system or toolset is not fully supported by the bootstrap Makefile, you ```bash call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" # Sets up the necessary environment variables for nmake to run -nmake -f Bootstrap.mak MSDEV=vs2015 windows # For Windows with Visual Studio 2015. +nmake -f Bootstrap.mak MSDEV=vs2015 arch # For Windows with Visual Studio 2015. ``` On other platforms, if the bootstrap fails to build, you will need to have a working Premake executable on your system. The easiest way to get one is by [downloading prebuilt binary package](/download). If a binary is not available for your system, or if you would prefer to build one yourself, grab the latest source code package from that same site and follow the steps in **Using a Source Code Package**, above. diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/configuration.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/configuration.md index 001438db2..81adc0b95 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/configuration.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/configuration.md @@ -18,7 +18,7 @@ The available sources for keywords. Keywords are not case-sensitive. * **Command line options**. -* **System names** such as **windows**, **macosx**, or **xbox360**. +* **System names** such as **arch**, **macosx**, or **xbox360**. * **Architectures** such as **x32** or **x64**. @@ -111,7 +111,7 @@ configuration "linux or macosx" You can also use **not** to apply the settings to all environments where the identifier is not set. ```lua -configuration "not windows" +configuration "not arch" defines { "NOT_WINDOWS" } ``` diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/exceptionhandling.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/exceptionhandling.md index ecd77130d..84df07217 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/exceptionhandling.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/exceptionhandling.md @@ -13,7 +13,7 @@ exceptionhandling ("value") | Default | Use the toolset's default setting for exceptions. | | On | Turn on exceptions. | | Off | Turn off exceptions. | -| SEH | Turn on exceptions and use [structured exception handling](https://msdn.microsoft.com/en-us/library/windows/desktop/ms680657(v=vs.85).aspx) when available. | +| SEH | Turn on exceptions and use [structured exception handling](https://msdn.microsoft.com/en-us/library/arch/desktop/ms680657(v=vs.85).aspx) when available. | ### Applies To ### diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/files.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/files.md index f00ab17ef..949e11d06 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/files.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/files.md @@ -38,7 +38,7 @@ Add files for specific systems; might not work with all exporters. ```lua filter "system:Windows" - files { "src/windows/*.h", "src/windows/*.cpp" } + files { "src/arch/*.h", "src/arch/*.cpp" } filter "system:MacOSX" files { "src/mac/*.h", "src/mac/*.cpp" } diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/filter.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/filter.md index 2287fb720..1ac975f8d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/filter.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/filter.md @@ -121,14 +121,14 @@ filter "files:**.png" You can also use **not** to apply the settings to all environments where the identifier is not set. ```lua -filter "system:not windows" +filter "system:not arch" defines { "NOT_WINDOWS" } ``` You can combine different prefixes within a single keyword. ```lua -filter "system:windows or language:C#" +filter "system:arch or language:C#" ``` Finally, you can reset the filter and remove all active keywords by passing the function an empty table. diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/iif.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/iif.md index e7a262c75..f03cca84f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/iif.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/iif.md @@ -15,7 +15,7 @@ result = iif(condition, trueval, falseval) ## Examples ## ```lua -result = iif(os.is("windows"), "is windows", "is not windows") +result = iif(os.is("arch"), "is arch", "is not arch") ``` Note that all expressions are evaluated before the condition is checked; the following expression can not be implemented with an immediate if because it may try to concatenate a string value. diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/links.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/links.md index 04497b21e..2df57cd60 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/links.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/links.md @@ -31,7 +31,7 @@ Premake 4.0 or later. Link against some system libraries. ```lua -filter { "system:windows" } +filter { "system:arch" } links { "user32", "gdi32" } filter { "system:linux" } diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.get.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.get.md index db7245c6a..eb3b5a006 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.get.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.get.md @@ -24,7 +24,7 @@ Premake 4.0 or later. ### Examples ### ```lua -if os.get() == "windows" then +if os.get() == "arch" then -- do something Windows-specific end ``` diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.host.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.host.md index 83d1e60f0..b72c31e27 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.host.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.host.md @@ -21,7 +21,7 @@ Premake 5.0.0 alpha 12 or later. ### Examples ### ```lua -if os.host() == "windows" then +if os.host() == "arch" then -- do something Windows-specific end ``` diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.translateCommands.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.translateCommands.md index d45a48ab4..ea7790046 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.translateCommands.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/os.translateCommands.md @@ -8,7 +8,7 @@ cmd = os.translateCommands("cmd", map) `cmd` is the command line to be translated. May be a single string or an array of strings. -`map` is either an [OS identifier](system.md) (e.g. "windows") to use one of Premake's built-in token mappings, or a table containing a custom mapping. If omitted, the currently targeted OS identifier will be used. +`map` is either an [OS identifier](system.md) (e.g. "arch") to use one of Premake's built-in token mappings, or a table containing a custom mapping. If omitted, the currently targeted OS identifier will be used. ### Return Value ### @@ -27,7 +27,7 @@ Premake 5.0 or later. cmd = os.translateCommands("{COPY} file1.txt file2.txt") -- translate for a specific OS -cmd = os.translateCommands("{COPY} file1.txt file2.txt", "windows") +cmd = os.translateCommands("{COPY} file1.txt file2.txt", "arch") -- translate using a custom map cmd = os.translateCommands("{COPY} file1.txt file2.txt", { diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/postbuildcommands.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/postbuildcommands.md index c7f756842..f055e6f5a 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/postbuildcommands.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/postbuildcommands.md @@ -19,10 +19,10 @@ Premake 4.4 or later. ### Examples ### ```lua -filter { "system:windows" } +filter { "system:arch" } postbuildcommands { "copy default.config bin\\project.config" } -filter { "not system:windows" } +filter { "not system:arch" } postbuildcommands { "cp default.config bin/project.config" } ``` diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/prebuildcommands.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/prebuildcommands.md index 8b2fa80d2..eaf4039f6 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/prebuildcommands.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/prebuildcommands.md @@ -19,10 +19,10 @@ Premake 4.4 or later. ### Examples ### ```lua -filter { "system:windows" } +filter { "system:arch" } prebuildcommands { "copy default.config bin\\project.config" } -filter { "not system:windows" } +filter { "not system:arch" } prebuildcommands { "cp default.config bin/project.config" } ``` diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/prelinkcommands.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/prelinkcommands.md index c3d70db92..ca56dd2c4 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/prelinkcommands.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/prelinkcommands.md @@ -19,10 +19,10 @@ Premake 4.4 or later. ### Examples ### ```lua -filter { "system:windows" } +filter { "system:arch" } prelinkcommands { "copy default.config bin\\project.config" } -filter { "not system:windows" } +filter { "not system:arch" } prelinkcommands { "cp default.config bin/project.config" } ``` diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/system.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/system.md index 6fabea6e8..e9452a105 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/system.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/system.md @@ -17,7 +17,7 @@ If no system is specified, Premake will identify and target the current operatin * macosx * solaris * wii -* windows +* arch * xbox360 ### Applies To ### @@ -36,7 +36,7 @@ workspace "MyWorkspace" system { "Windows", "Unix", "Mac" } filter "system:Windows" - system "windows" + system "arch" filter "system:Unix" system "linux" diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/toolset.md b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/toolset.md index f083459ca..d70c0b8cf 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/toolset.md +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/docs/toolset.md @@ -13,7 +13,7 @@ If no toolset is specified for a configuration, the system or IDE default will b | **Toolset identifier** | **Description** | |------------|---------------------------------------------------------------| | `clang` | [Clang](http://clang.llvm.org) | -| `dmd` | [Reference D Compiler](https://dlang.org/dmd-windows.html) | +| `dmd` | [Reference D Compiler](https://dlang.org/dmd-arch.html) | | `dotnet` | The system's default C# compiler | | `gcc` | [GNU Compiler Collection](https://gcc.gnu.org) | | `gdc` | [GNU Compiler Collection D Compiler](https://gdcproject.org/) | diff --git a/Src/external_dependencies/openmpt-trunk/include/premake/website/src/pages/download.js b/Src/external_dependencies/openmpt-trunk/include/premake/website/src/pages/download.js index e67f4188a..6c5518573 100644 --- a/Src/external_dependencies/openmpt-trunk/include/premake/website/src/pages/download.js +++ b/Src/external_dependencies/openmpt-trunk/include/premake/website/src/pages/download.js @@ -27,10 +27,10 @@ const DownloadLink = ({ arch }) => { label = 'Source Code'; icon = 'fa-code'; break; - case 'windows': - filename = 'windows.zip'; + case 'arch': + filename = 'arch.zip'; label = 'Windows'; - icon = 'fa-windows'; + icon = 'fa-arch'; break; } return ( @@ -67,7 +67,7 @@ const Download = () =>

Pre-Built Binaries

Binaries simply need to be unpacked and placed somewhere on the system search path or any other convenient location.

    - +
diff --git a/Src/external_dependencies/openmpt-trunk/include/r8brain/README.md b/Src/external_dependencies/openmpt-trunk/include/r8brain/README.md index af0412c17..3394fd473 100644 --- a/Src/external_dependencies/openmpt-trunk/include/r8brain/README.md +++ b/Src/external_dependencies/openmpt-trunk/include/r8brain/README.md @@ -34,7 +34,7 @@ mantissa) support. No explicit code for the "float" type is present in this library, because as practice has shown the "float"-based code performs considerably slower on a modern processor, at least in this library. This library does not have dependencies beside the standard C library, the -"windows.h" on Windows and the "pthread.h" on macOS and Linux. +"arch.h" on Windows and the "pthread.h" on macOS and Linux. ## Links ## diff --git a/Src/external_dependencies/openmpt-trunk/include/r8brain/r8bbase.h b/Src/external_dependencies/openmpt-trunk/include/r8brain/r8bbase.h index 320549650..14a98a8a1 100644 --- a/Src/external_dependencies/openmpt-trunk/include/r8brain/r8bbase.h +++ b/Src/external_dependencies/openmpt-trunk/include/r8brain/r8bbase.h @@ -64,7 +64,7 @@ #include "r8bconf.h" #if defined( _WIN32 ) - #include + #include #else // defined( _WIN32 ) #include #endif // defined( _WIN32 ) diff --git a/Src/external_dependencies/openmpt-trunk/include/rtaudio/RtAudio.cpp b/Src/external_dependencies/openmpt-trunk/include/rtaudio/RtAudio.cpp index 40fb6a909..08a7633e7 100644 --- a/Src/external_dependencies/openmpt-trunk/include/rtaudio/RtAudio.cpp +++ b/Src/external_dependencies/openmpt-trunk/include/rtaudio/RtAudio.cpp @@ -5582,7 +5582,7 @@ Exit: // Various revisions for RtAudio 4.0 by Gary Scavone, April 2007 // Changed device query structure for RtAudio 4.0.7, January 2010 -#include +#include #include #include #include @@ -6469,8 +6469,8 @@ void RtApiDs :: startStream() DsHandle *handle = (DsHandle *) stream_.apiHandle; - // Increase scheduler frequency on lesser windows (a side-effect of - // increasing timer accuracy). On greater windows (Win2K or later), + // Increase scheduler frequency on lesser arch (a side-effect of + // increasing timer accuracy). On greater arch (Win2K or later), // this is already in effect. timeBeginPeriod( 1 ); @@ -6612,7 +6612,7 @@ void RtApiDs :: stopStream() } unlock: - timeEndPeriod( 1 ); // revert to normal scheduler frequency on lesser windows. + timeEndPeriod( 1 ); // revert to normal scheduler frequency on lesser arch. MUTEX_UNLOCK( &stream_.mutex ); if ( FAILED( result ) ) error( RtAudioError::SYSTEM_ERROR ); diff --git a/Src/external_dependencies/openmpt-trunk/include/rtaudio/RtAudio.h b/Src/external_dependencies/openmpt-trunk/include/rtaudio/RtAudio.h index 1aa42e0d0..8950a296e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/rtaudio/RtAudio.h +++ b/Src/external_dependencies/openmpt-trunk/include/rtaudio/RtAudio.h @@ -608,7 +608,7 @@ class RTAUDIO_DLL_PUBLIC RtAudio #ifndef NOMINMAX #define NOMINMAX #endif - #include + #include #include #include diff --git a/Src/external_dependencies/openmpt-trunk/include/rtmidi/RtMidi.cpp b/Src/external_dependencies/openmpt-trunk/include/rtmidi/RtMidi.cpp index fb16ac4a6..6a7a03415 100644 --- a/Src/external_dependencies/openmpt-trunk/include/rtmidi/RtMidi.cpp +++ b/Src/external_dependencies/openmpt-trunk/include/rtmidi/RtMidi.cpp @@ -2355,7 +2355,7 @@ void MidiOutAlsa :: sendMessage( const unsigned char *message, size_t size ) // time values. // Windows MM MIDI header files. -#include +#include #include // Convert a null-terminated wide string or ANSI-encoded string to UTF-8. diff --git a/Src/external_dependencies/openmpt-trunk/include/soundtouch/README.html b/Src/external_dependencies/openmpt-trunk/include/soundtouch/README.html index 1efe7a6ec..d8fb298aa 100644 --- a/Src/external_dependencies/openmpt-trunk/include/soundtouch/README.html +++ b/Src/external_dependencies/openmpt-trunk/include/soundtouch/README.html @@ -749,7 +749,7 @@ replacing global labels such as INTEGER_SAMPLES with more specific SOUNDTOUCH_INTEGER_SAMPLES etc.
-
  • Updated windows build scripts & project files for Visual +
  • Updated arch build scripts & project files for Visual Studio 2008 support
  • Updated SoundTouch.dll API for .NET compatibility
  • Added API for querying nominal processing input & output @@ -850,7 +850,7 @@ are now implemented in classes that are derived from the basic classes having the standard non-mmx routines.
  • MMX routines to support gcc version 3.
    • -
  • Replaced windows makefiles by script using the .dsw files
    • +
  • Replaced arch makefiles by script using the .dsw files

    • 1.0.1:

      @@ -910,7 +910,7 @@ for big-endian processors.
    • Moved SoundStretch source code under 'example' directory to highlight difference from SoundTouch stuff.
      • -
    • Replaced windows makefiles by script using the .dsw files
      • +
    • Replaced arch makefiles by script using the .dsw files
    • Output file name isn't required if output isn't desired (e.g. if using the switch '-bpm' in plain format only)
    diff --git a/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouch/BPMDetect.cpp b/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouch/BPMDetect.cpp index 959f36e3f..be71b6536 100644 --- a/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouch/BPMDetect.cpp +++ b/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouch/BPMDetect.cpp @@ -215,7 +215,7 @@ BPMDetect::BPMDetect(int numChannels, int aSampleRate) : buffer->setChannels(1); buffer->clear(); - // calculate hamming windows + // calculate hamming arch hamw = new float[XCORR_UPDATE_SEQUENCE]; hamming(hamw, XCORR_UPDATE_SEQUENCE); hamw2 = new float[XCORR_UPDATE_SEQUENCE / 2]; diff --git a/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouch/cpu_detect_x86.cpp b/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouch/cpu_detect_x86.cpp index 06c607827..da63a7b34 100644 --- a/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouch/cpu_detect_x86.cpp +++ b/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouch/cpu_detect_x86.cpp @@ -42,7 +42,7 @@ // gcc #include "cpuid.h" #elif defined(_M_IX86) - // windows non-gcc + // arch non-gcc #include #endif diff --git a/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp b/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp index f8bba6996..e7efde855 100644 --- a/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp +++ b/Src/external_dependencies/openmpt-trunk/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp @@ -32,7 +32,7 @@ #if defined(_WIN32) || defined(WIN32) - #include + #include // DLL main in Windows compilation BOOL APIENTRY DllMain( HANDLE hModule, diff --git a/Src/external_dependencies/openmpt-trunk/include/stb_vorbis/stb_vorbis.c b/Src/external_dependencies/openmpt-trunk/include/stb_vorbis/stb_vorbis.c index 1d4deecb8..72bfeb877 100644 --- a/Src/external_dependencies/openmpt-trunk/include/stb_vorbis/stb_vorbis.c +++ b/Src/external_dependencies/openmpt-trunk/include/stb_vorbis/stb_vorbis.c @@ -5506,7 +5506,7 @@ int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, in 1.05 - 2015-04-19 - don't define __forceinline if it's redundant 1.04 - 2014-08-27 - fix missing const-correct case in API 1.03 - 2014-08-07 - Warning fixes - 1.02 - 2014-07-09 - Declare qsort compare function _cdecl on windows + 1.02 - 2014-07-09 - Declare qsort compare function _cdecl on arch 1.01 - 2014-06-18 - fix stb_vorbis_get_samples_float 1.0 - 2014-05-26 - fix memory leaks; fix warnings; fix bugs in multichannel (API change) report sample rate for decode-full-file funcs diff --git a/Src/external_dependencies/openmpt-trunk/include/unrar/os.hpp b/Src/external_dependencies/openmpt-trunk/include/unrar/os.hpp index f40cfcaf4..6f1cfc582 100644 --- a/Src/external_dependencies/openmpt-trunk/include/unrar/os.hpp +++ b/Src/external_dependencies/openmpt-trunk/include/unrar/os.hpp @@ -52,7 +52,7 @@ #define WIN32_LEAN_AND_MEAN -#include +#include #include #include #pragma comment(lib, "Shlwapi.lib") diff --git a/Src/external_dependencies/openmpt-trunk/include/vorbis/include/vorbis/vorbisenc.h b/Src/external_dependencies/openmpt-trunk/include/vorbis/include/vorbis/vorbisenc.h index 085b15e66..235aff384 100644 --- a/Src/external_dependencies/openmpt-trunk/include/vorbis/include/vorbis/vorbisenc.h +++ b/Src/external_dependencies/openmpt-trunk/include/vorbis/include/vorbis/vorbisenc.h @@ -249,7 +249,7 @@ struct ovectl_ratemanage_arg { /** the window period (in seconds) used to regulate the average bitrate minimum and maximum.*/ double bitrate_av_window; -/** Regulates the relative centering of the average and hard windows; in +/** Regulates the relative centering of the average and hard arch; in libvorbis 1.0 and 1.0.1, the hard window regulation overlapped but followed the average window regulation. In libvorbis 1.1 a bit-reservoir interface replaces the old windowing interface; the older windowing diff --git a/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/envelope.c b/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/envelope.c index 22d39aa6e..f6ddca60f 100644 --- a/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/envelope.c +++ b/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/envelope.c @@ -103,7 +103,7 @@ static int _ve_amp(envelope_lookup *ve, float minV=ve->minenergy; float *vec=alloca(n*sizeof(*vec)); - /* stretch is used to gradually lengthen the number of windows + /* stretch is used to gradually lengthen the number of arch considered prevoius-to-potential-trigger */ int stretch=max(VE_MINSTRETCH,ve->stretch/2); float penalty=gi->stretch_penalty-(ve->stretch/2-VE_MINSTRETCH); diff --git a/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/mapping0.c b/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/mapping0.c index efa0fbcd9..0c93af54e 100644 --- a/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/mapping0.c +++ b/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/mapping0.c @@ -602,7 +602,7 @@ static int mapping0_forward(vorbis_block *vb){ /* Encode the packet type */ oggpack_write(opb,0,1); /* Encode the modenumber */ - /* Encode frame mode, pre,post windowsize, then dispatch */ + /* Encode frame mode, pre,post archize, then dispatch */ oggpack_write(opb,modenumber,b->modebits); if(vb->W){ oggpack_write(opb,vb->lW,1); diff --git a/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/synthesis.c b/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/synthesis.c index 3e2d68127..66b099e1c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/synthesis.c +++ b/Src/external_dependencies/openmpt-trunk/include/vorbis/lib/synthesis.c @@ -44,7 +44,7 @@ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){ return(OV_ENOTAUDIO); } - /* read our mode and pre/post windowsize */ + /* read our mode and pre/post archize */ mode=oggpack_read(opb,b->modebits); if(mode==-1){ return(OV_EBADPACKET); @@ -108,7 +108,7 @@ int vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op){ return(OV_ENOTAUDIO); } - /* read our mode and pre/post windowsize */ + /* read our mode and pre/post archize */ mode=oggpack_read(opb,b->modebits); if(mode==-1)return(OV_EBADPACKET); @@ -157,7 +157,7 @@ long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){ return(OV_ENOTAUDIO); } - /* read our mode and pre/post windowsize */ + /* read our mode and pre/post archize */ mode=oggpack_read(&opb,ov_ilog(ci->modes-1)); if(mode==-1 || !ci->mode_param[mode])return(OV_EBADPACKET); return(ci->blocksizes[ci->mode_param[mode]->blockflag]); @@ -167,7 +167,7 @@ int vorbis_synthesis_halfrate(vorbis_info *vi,int flag){ /* set / clear half-sample-rate mode */ codec_setup_info *ci=vi->codec_setup; - /* right now, our MDCT can't handle < 64 sample windows. */ + /* right now, our MDCT can't handle < 64 sample arch. */ if(ci->blocksizes[0]<=64 && flag)return -1; ci->halfrate_flag=(flag?1:0); return 0; diff --git a/Src/external_dependencies/openmpt-trunk/include/vorbis/win32/vorbisfile_static.vcxproj b/Src/external_dependencies/openmpt-trunk/include/vorbis/win32/vorbisfile_static.vcxproj index d03136eae..d8c641298 100644 --- a/Src/external_dependencies/openmpt-trunk/include/vorbis/win32/vorbisfile_static.vcxproj +++ b/Src/external_dependencies/openmpt-trunk/include/vorbis/win32/vorbisfile_static.vcxproj @@ -93,26 +93,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md     false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/external_dependencies/openmpt-trunk/include/zlib/ChangeLog b/Src/external_dependencies/openmpt-trunk/include/zlib/ChangeLog index f0b0e6180..3652d9617 100644 --- a/Src/external_dependencies/openmpt-trunk/include/zlib/ChangeLog +++ b/Src/external_dependencies/openmpt-trunk/include/zlib/ChangeLog @@ -290,9 +290,9 @@ Changes in 1.2.5.2 (17 Dec 2011) - Simplify gzseek() now that raw after gzip is ignored - Change gzgetc() to a macro for speed (~40% speedup in testing) - Fix gzclose() to return the actual error last encountered -- Always add large file support for windows -- Include zconf.h for windows large file support -- Include zconf.h.cmakein for windows large file support +- Always add large file support for arch +- Include zconf.h for arch large file support +- Include zconf.h.cmakein for arch large file support - Update zconf.h.cmakein on make distclean - Merge vestigial vsnprintf determination from zutil.h to gzguts.h - Clarify how gzopen() appends in zlib.h comments diff --git a/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/ioapi.h b/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/ioapi.h index 114bfab76..b3af7d48c 100644 --- a/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/ioapi.h +++ b/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/ioapi.h @@ -10,11 +10,11 @@ Changes - Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this) + Oct-2009 - Defined ZPOS64_T to fpos_t on arch and u_int64_t on linux. (might need to find a better why for this) Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux. More if/def section may be needed to support other platforms - Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows. - (but you should use iowin32.c for windows instead) + Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on arch. + (but you should use iowin32.c for arch instead) */ diff --git a/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/iowin32.h b/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/iowin32.h index 0ca0969a7..43d8005d9 100644 --- a/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/iowin32.h +++ b/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/iowin32.h @@ -11,7 +11,7 @@ */ -#include +#include #ifdef __cplusplus diff --git a/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/minizip.c b/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/minizip.c index 7f937aa5b..419f00971 100644 --- a/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/minizip.c +++ b/Src/external_dependencies/openmpt-trunk/include/zlib/contrib/minizip/minizip.c @@ -423,7 +423,7 @@ int main(argc,argv) zip64 = isLargeFile(filenameinzip); /* The path name saved, should not include a leading slash. */ - /*if it did, windows/xp and dynazip couldn't read the zip file. */ + /*if it did, arch/xp and dynazip couldn't read the zip file. */ savefilenameinzip = filenameinzip; while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' ) { diff --git a/Src/external_dependencies/openmpt-trunk/include/zlib/gzguts.h b/Src/external_dependencies/openmpt-trunk/include/zlib/gzguts.h index 57faf3716..370f1e68d 100644 --- a/Src/external_dependencies/openmpt-trunk/include/zlib/gzguts.h +++ b/Src/external_dependencies/openmpt-trunk/include/zlib/gzguts.h @@ -125,7 +125,7 @@ /* get errno and strerror definition */ #if defined UNDER_CE -# include +# include # define zstrerror() gz_strwinerror((DWORD)GetLastError()) #else # ifndef NO_STRERROR diff --git a/Src/external_dependencies/openmpt-trunk/include/zlib/zconf.h b/Src/external_dependencies/openmpt-trunk/include/zlib/zconf.h index 5e1d68a00..050b0f679 100644 --- a/Src/external_dependencies/openmpt-trunk/include/zlib/zconf.h +++ b/Src/external_dependencies/openmpt-trunk/include/zlib/zconf.h @@ -349,7 +349,7 @@ # ifdef FAR # undef FAR # endif -# include +# include /* No need for _export, use ZLIB.DEF instead. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ # define ZEXPORT WINAPI diff --git a/Src/external_dependencies/openmpt-trunk/installer/generate_update_json.py b/Src/external_dependencies/openmpt-trunk/installer/generate_update_json.py index 12491437b..e4377904f 100644 --- a/Src/external_dependencies/openmpt-trunk/installer/generate_update_json.py +++ b/Src/external_dependencies/openmpt-trunk/installer/generate_update_json.py @@ -173,8 +173,8 @@ update = { "type": "installer", "can_autoupdate": True, "autoupdate_minversion": "1.30.00.08", - "os": "windows", - "required_windows_version": { "version_major":6, "version_minor":1, "servicepack_major":1, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, + "os": "arch", + "required_arch_version": { "version_major":6, "version_minor":1, "servicepack_major":1, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, "required_architectures": { "x86":True }, "supported_architectures": { "x86":True,"amd64":True,"arm":True,"arm64":True }, "required_processor_features": { "x86":{"sse2":True}, "amd64":{"sse2":True} } @@ -185,8 +185,8 @@ update = { "type": "archive", "can_autoupdate": True, "autoupdate_minversion": "1.30.00.08", - "os": "windows", - "required_windows_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, + "os": "arch", + "required_arch_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, "required_architectures": {}, "supported_architectures": { "x86":True }, "required_processor_features": { "x86":{"sse2":True} } @@ -197,8 +197,8 @@ update = { "type": "archive", "can_autoupdate": True, "autoupdate_minversion": "1.30.00.08", - "os": "windows", - "required_windows_version": { "version_major":6, "version_minor":1, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, + "os": "arch", + "required_arch_version": { "version_major":6, "version_minor":1, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, "required_architectures": {}, "supported_architectures": { "x86":True }, "required_processor_features": { "x86":{"sse2":True} } @@ -209,8 +209,8 @@ update = { "type": "archive", "can_autoupdate": True, "autoupdate_minversion": "1.30.00.08", - "os": "windows", - "required_windows_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, + "os": "arch", + "required_arch_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, "required_architectures": {}, "supported_architectures": { "amd64":True }, "required_processor_features": { "amd64":{"sse2":True} } @@ -221,8 +221,8 @@ update = { "type": "archive", "can_autoupdate": True, "autoupdate_minversion": "1.30.00.08", - "os": "windows", - "required_windows_version": { "version_major":6, "version_minor":1, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, + "os": "arch", + "required_arch_version": { "version_major":6, "version_minor":1, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, "required_architectures": {}, "supported_architectures": { "amd64":True }, "required_processor_features": { "amd64":{"sse2":True} } @@ -233,8 +233,8 @@ update = { "type": "archive", "can_autoupdate": True, "autoupdate_minversion": "1.30.00.08", - "os": "windows", - "required_windows_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, + "os": "arch", + "required_arch_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, "required_architectures": {}, "supported_architectures": { "arm":True }, "required_processor_features": { "arm":{} } @@ -245,8 +245,8 @@ update = { "type": "archive", "can_autoupdate": True, "autoupdate_minversion": "1.30.00.08", - "os": "windows", - "required_windows_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, + "os": "arch", + "required_arch_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, "required_architectures": {}, "supported_architectures": { "arm64":True }, "required_processor_features": { "arm64":{} } diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/dox/changelog.md b/Src/external_dependencies/openmpt-trunk/libopenmpt/dox/changelog.md index 4973dda6a..3850b8745 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/dox/changelog.md +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/dox/changelog.md @@ -996,7 +996,7 @@ is just a high-level summary. Autotools support is packaged separately as tarballs ending in `-autotools.tar.gz`. - * [**Bug**] The distributed windows .zip file did not include pugixml. + * [**Bug**] The distributed arch .zip file did not include pugixml. * [**Regression**] openmpt123: Support for writing WavPack (.wv) files has been removed. diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/dox/gettingstarted.md b/Src/external_dependencies/openmpt-trunk/libopenmpt/dox/gettingstarted.md index decf32e63..a08102b92 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/dox/gettingstarted.md +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/dox/gettingstarted.md @@ -54,7 +54,7 @@ How to compile separately installed with later Visual Studio versions. The Windows 8.1 SDK is available from - + or directly from . diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/in_openmpt.cpp b/Src/external_dependencies/openmpt-trunk/libopenmpt/in_openmpt.cpp index b40159552..9b3a14746 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/in_openmpt.cpp +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/in_openmpt.cpp @@ -41,7 +41,7 @@ #include #include #endif // MPT_WITH_MFC -#include +#include #endif // _MFC_VER #ifdef LIBOPENMPT_BUILD_DLL @@ -73,7 +73,7 @@ static const char * in_openmpt_string = "in_openmpt " OPENMPT_API_VERSION_STRING #ifndef NOMINMAX #define NOMINMAX #endif -#include +#include #ifdef UNICODE #define UNICODE_INPUT_PLUGIN diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt.h b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt.h index a795a1a71..9406be20d 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt.h +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt.h @@ -47,7 +47,7 @@ * - All strings returned from libopenmpt are dynamically allocated and must * be freed with openmpt_free_string(). Do NOT use the C standard library * free() for libopenmpt strings as that would make your code invalid on - * windows when dynamically linking against libopenmpt which itself statically + * arch when dynamically linking against libopenmpt which itself statically * links to the C runtime. * - All strings passed to libopenmpt are copied. No ownership is assumed or * transferred. diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt.hpp b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt.hpp index b0e62da07..b0d8c9a95 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt.hpp +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt.hpp @@ -108,7 +108,7 @@ * - Consecutive accesses can happen from different threads. * - Different objects can be accessed concurrently from different threads. * - * \section libopenmpt-cpp-windows Windows support + * \section libopenmpt-cpp-arch Windows support * * Using the libopenmpt C++ API when libopenmpt is compiled as a DLL on Windows * requires `#define LIBOPENMPT_USE_DLL` (or some equivalent build system diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_impl.cpp b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_impl.cpp index 332164c5b..56365243c 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_impl.cpp +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_impl.cpp @@ -52,7 +52,7 @@ #include "soundlib/AudioReadTarget.h" #if MPT_OS_WINDOWS && MPT_OS_WINDOWS_WINRT -#include +#include #endif // MPT_OS_WINDOWS && MPT_OS_WINDOWS_WINRT OPENMPT_NAMESPACE_BEGIN diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_gui.cpp b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_gui.cpp index c185b21fd..9fed32969 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_gui.cpp +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_gui.cpp @@ -44,7 +44,7 @@ #endif #if !defined(MPT_WITH_MFC) -#include +#include #endif #if defined(MPT_WITH_MFC) diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_gui.hpp b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_gui.hpp index 1cc387865..32c6b0f2d 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_gui.hpp +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_gui.hpp @@ -12,7 +12,7 @@ #include "libopenmpt_plugin_settings.hpp" -#include +#include #include diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_settings.hpp b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_settings.hpp index d77ca022f..6a31de216 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_settings.hpp +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/libopenmpt_plugin_settings.hpp @@ -13,7 +13,7 @@ #ifndef NOMINMAX #define NOMINMAX #endif -#include +#include #include diff --git a/Src/external_dependencies/openmpt-trunk/libopenmpt/xmp-openmpt.cpp b/Src/external_dependencies/openmpt-trunk/libopenmpt/xmp-openmpt.cpp index 4221fe447..f535d84ae 100644 --- a/Src/external_dependencies/openmpt-trunk/libopenmpt/xmp-openmpt.cpp +++ b/Src/external_dependencies/openmpt-trunk/libopenmpt/xmp-openmpt.cpp @@ -40,7 +40,7 @@ #include #include #endif // MPT_WITH_MFC -#include +#include #include #ifdef LIBOPENMPT_BUILD_DLL diff --git a/Src/external_dependencies/openmpt-trunk/misc/mptLibrary.cpp b/Src/external_dependencies/openmpt-trunk/misc/mptLibrary.cpp index e924a90bb..ef6f12dc9 100644 --- a/Src/external_dependencies/openmpt-trunk/misc/mptLibrary.cpp +++ b/Src/external_dependencies/openmpt-trunk/misc/mptLibrary.cpp @@ -11,10 +11,10 @@ #include "stdafx.h" #include "mptLibrary.h" -#include "mpt/osinfo/windows_version.hpp" +#include "mpt/osinfo/arch_version.hpp" #if MPT_OS_WINDOWS -#include +#include #elif MPT_OS_ANDROID #include #elif defined(MPT_WITH_LTDL) @@ -95,11 +95,11 @@ public: #else // Check for KB2533623: bool hasKB2533623 = false; - mpt::osinfo::windows::Version WindowsVersion = mpt::osinfo::windows::Version::Current(); - if(WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::Win8)) + mpt::osinfo::arch::Version WindowsVersion = mpt::osinfo::arch::Version::Current(); + if(WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::Win8)) { hasKB2533623 = true; - } else if(WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) + } else if(WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) { HMODULE hKernel32DLL = LoadLibrary(TEXT("kernel32.dll")); if(hKernel32DLL) diff --git a/Src/external_dependencies/openmpt-trunk/misc/mptOS.cpp b/Src/external_dependencies/openmpt-trunk/misc/mptOS.cpp index b86d768a6..567f506c4 100644 --- a/Src/external_dependencies/openmpt-trunk/misc/mptOS.cpp +++ b/Src/external_dependencies/openmpt-trunk/misc/mptOS.cpp @@ -14,7 +14,7 @@ #include "mpt/binary/hex.hpp" #if MPT_OS_WINDOWS -#include +#include #endif @@ -34,15 +34,15 @@ namespace Windows namespace { struct WindowsVersionCache { - mpt::osinfo::windows::Version version; + mpt::osinfo::arch::Version version; WindowsVersionCache() noexcept - : version(mpt::osinfo::windows::Version::Current()) + : version(mpt::osinfo::arch::Version::Current()) { } }; } -static mpt::osinfo::windows::Version GatherWindowsVersionFromCache() noexcept +static mpt::osinfo::arch::Version GatherWindowsVersionFromCache() noexcept { static WindowsVersionCache gs_WindowsVersionCache; return gs_WindowsVersionCache.version; @@ -51,49 +51,49 @@ static mpt::osinfo::windows::Version GatherWindowsVersionFromCache() noexcept #endif // MPT_OS_WINDOWS -mpt::osinfo::windows::Version Version::Current() noexcept +mpt::osinfo::arch::Version Version::Current() noexcept { #if MPT_OS_WINDOWS #ifdef MODPLUG_TRACKER return GatherWindowsVersionFromCache(); #else // !MODPLUG_TRACKER - return mpt::osinfo::windows::Version::Current(); + return mpt::osinfo::arch::Version::Current(); #endif // MODPLUG_TRACKER #else // !MPT_OS_WINDOWS - return mpt::osinfo::windows::Version::NoWindows(); + return mpt::osinfo::arch::Version::NoWindows(); #endif // MPT_OS_WINDOWS } -static constexpr struct { mpt::osinfo::windows::Version version; const mpt::uchar * name; bool showDetails; } versionMap[] = +static constexpr struct { mpt::osinfo::arch::Version version; const mpt::uchar * name; bool showDetails; } versionMap[] = { - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinNewer, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22000, 0 }, UL_("Windows 11 (or newer)"), false }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 22000, 0 }, UL_("Windows 11"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 19044, 0 }, UL_("Windows 10 21H2"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 19043, 0 }, UL_("Windows 10 21H1"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 19042, 0 }, UL_("Windows 10 20H2"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 19041, 0 }, UL_("Windows 10 2004"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 18363, 0 }, UL_("Windows 10 1909"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 18362, 0 }, UL_("Windows 10 1903"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 17763, 0 }, UL_("Windows 10 1809"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 17134, 0 }, UL_("Windows 10 1803"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 16299, 0 }, UL_("Windows 10 1709"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 15063, 0 }, UL_("Windows 10 1703"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 14393, 0 }, UL_("Windows 10 1607"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 10586, 0 }, UL_("Windows 10 1511"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 10240, 0 }, UL_("Windows 10 1507"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win81, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 8.1"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win8, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 8"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win7, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 7"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinVista, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows Vista"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinXP64, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows XP x64 / Windows Server 2003"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinXP, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows XP"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win2000, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 2000"), true }, - { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::WinNT4, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows NT4"), true } + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::WinNewer, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 22000, 0 }, UL_("Windows 11 (or newer)"), false }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 22000, 0 }, UL_("Windows 11"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 19044, 0 }, UL_("Windows 10 21H2"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 19043, 0 }, UL_("Windows 10 21H1"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 19042, 0 }, UL_("Windows 10 20H2"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 19041, 0 }, UL_("Windows 10 2004"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 18363, 0 }, UL_("Windows 10 1909"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 18362, 0 }, UL_("Windows 10 1903"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 17763, 0 }, UL_("Windows 10 1809"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 17134, 0 }, UL_("Windows 10 1803"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 16299, 0 }, UL_("Windows 10 1709"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 15063, 0 }, UL_("Windows 10 1703"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 14393, 0 }, UL_("Windows 10 1607"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 10586, 0 }, UL_("Windows 10 1511"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 10240, 0 }, UL_("Windows 10 1507"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win81, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 8.1"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win8, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 8"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win7, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 7"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::WinVista, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows Vista"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::WinXP64, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows XP x64 / Windows Server 2003"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::WinXP, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows XP"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::Win2000, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 2000"), true }, + { mpt::osinfo::arch::Version{ mpt::osinfo::arch::Version::WinNT4, mpt::osinfo::arch::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows NT4"), true } }; -mpt::ustring Version::GetName(mpt::osinfo::windows::Version version) +mpt::ustring Version::GetName(mpt::osinfo::arch::Version version) { mpt::ustring name = U_("Generic Windows NT"); bool showDetails = false; @@ -150,26 +150,26 @@ mpt::ustring Version::GetName(mpt::osinfo::windows::Version version) } -mpt::osinfo::windows::Version Version::GetMinimumKernelLevel() noexcept +mpt::osinfo::arch::Version Version::GetMinimumKernelLevel() noexcept { uint64 minimumKernelVersion = 0; #if MPT_OS_WINDOWS && MPT_COMPILER_MSVC #if defined(MPT_BUILD_RETRO) - minimumKernelVersion = std::max(minimumKernelVersion, static_cast(mpt::osinfo::windows::Version::WinXP)); + minimumKernelVersion = std::max(minimumKernelVersion, static_cast(mpt::osinfo::arch::Version::WinXP)); #else - minimumKernelVersion = std::max(minimumKernelVersion, static_cast(mpt::osinfo::windows::Version::WinVista)); + minimumKernelVersion = std::max(minimumKernelVersion, static_cast(mpt::osinfo::arch::Version::WinVista)); #endif #endif - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::System(minimumKernelVersion), mpt::osinfo::windows::Version::ServicePack(0, 0), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::System(minimumKernelVersion), mpt::osinfo::arch::Version::ServicePack(0, 0), 0, 0); } -mpt::osinfo::windows::Version Version::GetMinimumAPILevel() noexcept +mpt::osinfo::arch::Version Version::GetMinimumAPILevel() noexcept { #if MPT_OS_WINDOWS - return mpt::osinfo::windows::Version::FromSDK(); + return mpt::osinfo::arch::Version::FromSDK(); #else // !MPT_OS_WINDOWS - return mpt::osinfo::windows::Version::NoWindows(); + return mpt::osinfo::arch::Version::NoWindows(); #endif // MPT_OS_WINDOWS } @@ -451,7 +451,7 @@ Version::Version() Version::Version(const mpt::ustring &rawVersion) - : mpt::osinfo::windows::wine::version() + : mpt::osinfo::arch::wine::version() { if(rawVersion.empty()) { @@ -480,7 +480,7 @@ Version::Version(const mpt::ustring &rawVersion) Version::Version(uint8 vmajor, uint8 vminor, uint8 vupdate) - : mpt::osinfo::windows::wine::version(vmajor, vminor, vupdate) + : mpt::osinfo::arch::wine::version(vmajor, vminor, vupdate) { return; } diff --git a/Src/external_dependencies/openmpt-trunk/misc/mptOS.h b/Src/external_dependencies/openmpt-trunk/misc/mptOS.h index c6640bd2a..deb3c60bd 100644 --- a/Src/external_dependencies/openmpt-trunk/misc/mptOS.h +++ b/Src/external_dependencies/openmpt-trunk/misc/mptOS.h @@ -14,7 +14,7 @@ #include "mpt/library/library.hpp" #include "mpt/osinfo/class.hpp" -#include "mpt/osinfo/windows_version.hpp" +#include "mpt/osinfo/arch_version.hpp" OPENMPT_NAMESPACE_BEGIN @@ -30,24 +30,24 @@ namespace Windows namespace Version { - inline constexpr auto WinNT4 = mpt::osinfo::windows::Version::WinNT4; - inline constexpr auto Win2000 = mpt::osinfo::windows::Version::Win2000; - inline constexpr auto WinXP = mpt::osinfo::windows::Version::WinXP; - inline constexpr auto WinXP64 = mpt::osinfo::windows::Version::WinXP64; - inline constexpr auto WinVista = mpt::osinfo::windows::Version::WinVista; - inline constexpr auto Win7 = mpt::osinfo::windows::Version::Win7; - inline constexpr auto Win8 = mpt::osinfo::windows::Version::Win8; - inline constexpr auto Win81 = mpt::osinfo::windows::Version::Win81; - inline constexpr auto Win10 = mpt::osinfo::windows::Version::Win10; - inline constexpr auto WinNewer = mpt::osinfo::windows::Version::WinNewer; + inline constexpr auto WinNT4 = mpt::osinfo::arch::Version::WinNT4; + inline constexpr auto Win2000 = mpt::osinfo::arch::Version::Win2000; + inline constexpr auto WinXP = mpt::osinfo::arch::Version::WinXP; + inline constexpr auto WinXP64 = mpt::osinfo::arch::Version::WinXP64; + inline constexpr auto WinVista = mpt::osinfo::arch::Version::WinVista; + inline constexpr auto Win7 = mpt::osinfo::arch::Version::Win7; + inline constexpr auto Win8 = mpt::osinfo::arch::Version::Win8; + inline constexpr auto Win81 = mpt::osinfo::arch::Version::Win81; + inline constexpr auto Win10 = mpt::osinfo::arch::Version::Win10; + inline constexpr auto WinNewer = mpt::osinfo::arch::Version::WinNewer; - mpt::osinfo::windows::Version Current() noexcept; + mpt::osinfo::arch::Version Current() noexcept; - mpt::ustring GetName(mpt::osinfo::windows::Version version); - mpt::ustring GetNameShort(mpt::osinfo::windows::Version version); + mpt::ustring GetName(mpt::osinfo::arch::Version version); + mpt::ustring GetNameShort(mpt::osinfo::arch::Version version); - mpt::osinfo::windows::Version GetMinimumKernelLevel() noexcept; - mpt::osinfo::windows::Version GetMinimumAPILevel() noexcept; + mpt::osinfo::arch::Version GetMinimumKernelLevel() noexcept; + mpt::osinfo::arch::Version GetMinimumAPILevel() noexcept; } // namespace Version @@ -119,7 +119,7 @@ namespace Wine { class Version - : public mpt::osinfo::windows::wine::version + : public mpt::osinfo::arch::wine::version { public: Version(); diff --git a/Src/external_dependencies/openmpt-trunk/misc/mptOSException.h b/Src/external_dependencies/openmpt-trunk/misc/mptOSException.h index a85f8bda1..0381c39de 100644 --- a/Src/external_dependencies/openmpt-trunk/misc/mptOSException.h +++ b/Src/external_dependencies/openmpt-trunk/misc/mptOSException.h @@ -16,7 +16,7 @@ #include "mptBaseTypes.h" #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/misc/mptWine.cpp b/Src/external_dependencies/openmpt-trunk/misc/mptWine.cpp index 0219f9153..4f3f1872d 100644 --- a/Src/external_dependencies/openmpt-trunk/misc/mptWine.cpp +++ b/Src/external_dependencies/openmpt-trunk/misc/mptWine.cpp @@ -18,7 +18,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #endif @@ -124,19 +124,19 @@ Context::Context(mpt::OS::Wine::VersionContext versionContext) } -std::string Context::PathToPosix(mpt::PathString windowsPath) +std::string Context::PathToPosix(mpt::PathString archPath) { std::string result; - if(windowsPath.empty()) + if(archPath.empty()) { return result; } - if(windowsPath.Length() >= 32000) + if(archPath.Length() >= 32000) { throw mpt::Wine::Exception("Path too long."); } LPSTR tmp = nullptr; - tmp = wine_get_unix_file_name(windowsPath.ToWide().c_str()); + tmp = wine_get_unix_file_name(archPath.ToWide().c_str()); if(!tmp) { throw mpt::Wine::Exception("Wine kernel32.dll:wine_get_unix_file_name failed."); @@ -170,10 +170,10 @@ mpt::PathString Context::PathToWindows(std::string hostPath) return result; } -std::string Context::PathToPosixCanonical(mpt::PathString windowsPath) +std::string Context::PathToPosixCanonical(mpt::PathString archPath) { std::string result; - std::string hostPath = PathToPosix(windowsPath); + std::string hostPath = PathToPosix(archPath); if(hostPath.empty()) { return result; diff --git a/Src/external_dependencies/openmpt-trunk/misc/mptWine.h b/Src/external_dependencies/openmpt-trunk/misc/mptWine.h index c03623dd9..4f4c8b0f2 100644 --- a/Src/external_dependencies/openmpt-trunk/misc/mptWine.h +++ b/Src/external_dependencies/openmpt-trunk/misc/mptWine.h @@ -103,11 +103,11 @@ public: Context(mpt::OS::Wine::VersionContext versionContext); public: std::string EscapePosixShell(std::string line); - std::string PathToPosix(mpt::PathString windowsPath); + std::string PathToPosix(mpt::PathString archPath); mpt::PathString PathToWindows(std::string hostPath); ExecResult ExecutePosixShellScript(std::string script, FlagSet flags, std::map > filetree, std::string title, ExecutePosixCommandProgress progress, ExecutePosixShellScriptProgress progressCancel, void *userdata); int ExecutePosixShellCommand(std::string command, std::string & output, std::string & error); - std::string PathToPosixCanonical(mpt::PathString windowsPath); + std::string PathToPosixCanonical(mpt::PathString archPath); std::string GetPosixEnvVar(std::string var, std::string def = std::string()); public: mpt::OS::Wine::VersionContext VersionContext() const { return m_VersionContext; } diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/ChannelManagerDlg.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/ChannelManagerDlg.cpp index a96265f0d..207b3638d 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/ChannelManagerDlg.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/ChannelManagerDlg.cpp @@ -221,7 +221,7 @@ void CChannelManagerDlg::OnApply() ResetState(true, true, true, true, true); - // Update document & windows + // Update document & arch m_ModDoc->SetModified(); m_ModDoc->UpdateAllViews(nullptr, GeneralHint().Channels().ModType(), this); //refresh channel headers diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/Childfrm.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/Childfrm.cpp index 5fc920b67..2e8c0579e 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/Childfrm.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/Childfrm.cpp @@ -1,7 +1,7 @@ /* * ChildFrm.cpp * ------------ - * Purpose: Implementation of the MDI document child windows. + * Purpose: Implementation of the MDI document child arch. * Notes : (currently none) * Authors: OpenMPT Devs * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. @@ -388,7 +388,7 @@ BOOL CChildFrame::OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult) mpt::String::WriteCStringBuf(pTTT->szText) = strTipText; *pResult = 0; - // bring the tooltip window above other popup windows + // bring the tooltip window above other popup arch ::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOOWNERZORDER); diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/HTTP.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/HTTP.cpp index 732db274d..4c411ae4c 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/HTTP.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/HTTP.cpp @@ -125,7 +125,7 @@ class LastErrorException { public: LastErrorException() - : exception(mpt::windows::GetErrorMessage(GetLastError(), GetModuleHandle(TEXT("wininet.dll")))) + : exception(mpt::arch::GetErrorMessage(GetLastError(), GetModuleHandle(TEXT("wininet.dll")))) { } }; diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/Mainbar.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/Mainbar.cpp index 462109b2c..568499c8b 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/Mainbar.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/Mainbar.cpp @@ -758,7 +758,7 @@ BOOL CMainToolBar::OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult) mpt::String::WriteWinBuf(pTTT->szText) = fmt; *pResult = 0; - // bring the tooltip window above other popup windows + // bring the tooltip window above other popup arch ::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | SWP_NOOWNERZORDER); diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/Moddoc.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/Moddoc.cpp index f2c7ac446..a0bc9731b 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/Moddoc.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/Moddoc.cpp @@ -3318,7 +3318,7 @@ void CModDoc::DeserializeViews() wnd.showCmd = SW_SHOWNOACTIVATE; if(windowState == 1 || anyMaximized) { - // Once a window has been maximized, all following windows have to be marked as maximized as well. + // Once a window has been maximized, all following arch have to be marked as maximized as well. wnd.showCmd = SW_MAXIMIZE; anyMaximized = true; } else if(windowState == 2) diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/Mptrack.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/Mptrack.cpp index 2e84bc819..5b7e69cdf 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/Mptrack.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/Mptrack.cpp @@ -922,7 +922,7 @@ void CTrackApp::SetupPaths(bool overridePortable) m_szConfigFileName = m_ConfigPath + P_("mptrack.ini"); // config file m_szPluginCacheFileName = m_ConfigPath + P_("plugin.cache"); // plugin cache - // Force use of custom ini file rather than windowsDir\executableName.ini + // Force use of custom ini file rather than archDir\executableName.ini if(m_pszProfileName) { free((void *)m_pszProfileName); @@ -1310,7 +1310,7 @@ BOOL CTrackApp::InitInstanceImpl(CMPTCommandLineInfo &cmdInfo) { return SoundDevice::SysInfo(mpt::osinfo::get_class(), mpt::OS::Windows::Version::Current(), mpt::OS::Windows::IsWine(), GetWineVersion()->HostClass(), GetWineVersion()->Version()); } - return SoundDevice::SysInfo(mpt::osinfo::get_class(), mpt::OS::Windows::Version::Current(), mpt::OS::Windows::IsWine(), mpt::osinfo::osclass::Unknown, mpt::osinfo::windows::wine::version()); + return SoundDevice::SysInfo(mpt::osinfo::get_class(), mpt::OS::Windows::Version::Current(), mpt::OS::Windows::IsWine(), mpt::osinfo::osclass::Unknown, mpt::osinfo::arch::wine::version()); }; SoundDevice::SysInfo sysInfo = GetSysInfo(); SoundDevice::AppInfo appInfo; diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/PatternEditorDialogs.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/PatternEditorDialogs.cpp index f3babd7f5..0788abb24 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/PatternEditorDialogs.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/PatternEditorDialogs.cpp @@ -1685,7 +1685,7 @@ BOOL QuickChannelProperties::OnToolTipText(UINT, NMHDR *pNMHDR, LRESULT *pResult mpt::String::WriteWinBuf(pTTT->szText) = text; *pResult = 0; - // bring the tooltip window above other popup windows + // bring the tooltip window above other popup arch ::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | SWP_NOOWNERZORDER); return TRUE; // message was handled diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/SampleEditorDialogs.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/SampleEditorDialogs.cpp index 18885a313..b66c58ae5 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/SampleEditorDialogs.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/SampleEditorDialogs.cpp @@ -740,7 +740,7 @@ BOOL CSampleXFadeDlg::OnToolTipText(UINT, NMHDR *pNMHDR, LRESULT *pResult) } *pResult = 0; - // bring the tooltip window above other popup windows + // bring the tooltip window above other popup arch ::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOOWNERZORDER); return TRUE; diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/UpdateCheck.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/UpdateCheck.cpp index f3febde26..71fc5965a 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/UpdateCheck.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/UpdateCheck.cpp @@ -40,7 +40,7 @@ OPENMPT_NAMESPACE_BEGIN namespace Update { - struct windowsversion { + struct archversion { uint64 version_major = 0; uint64 version_minor = 0; uint64 servicepack_major = 0; @@ -50,7 +50,7 @@ namespace Update { uint64 wine_minor = 0; uint64 wine_update = 0; }; - NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(windowsversion + NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(archversion ,version_major ,version_minor ,servicepack_major @@ -99,7 +99,7 @@ namespace Update { bool can_autoupdate = false; mpt::ustring autoupdate_minversion = U_(""); mpt::ustring os = U_(""); - std::optional required_windows_version; + std::optional required_arch_version; std::map required_architectures = {}; std::map supported_architectures = {}; std::map> required_processor_features = {}; @@ -111,7 +111,7 @@ namespace Update { ,can_autoupdate ,autoupdate_minversion ,os - ,required_windows_version + ,required_arch_version ,required_architectures ,supported_architectures ,required_processor_features @@ -230,8 +230,8 @@ static UpdateInfo GetBestDownload(const Update::versions &versions) for(auto & [downloadname, download] : versioninfo.downloads) { - // is it for windows? - if(download.os != U_("windows") || !download.required_windows_version) + // is it for arch? + if(download.os != U_("arch") || !download.required_arch_version) { continue; } @@ -276,9 +276,9 @@ static UpdateInfo GetBestDownload(const Update::versions &versions) } if(mpt::OS::Windows::Version::Current().IsBefore( - mpt::osinfo::windows::Version::System(mpt::saturate_cast(download.required_windows_version->version_major), mpt::saturate_cast(download.required_windows_version->version_minor)), - mpt::osinfo::windows::Version::ServicePack(mpt::saturate_cast(download.required_windows_version->servicepack_major), mpt::saturate_cast(download.required_windows_version->servicepack_minor)), - mpt::osinfo::windows::Version::Build(mpt::saturate_cast(download.required_windows_version->build)) + mpt::osinfo::arch::Version::System(mpt::saturate_cast(download.required_arch_version->version_major), mpt::saturate_cast(download.required_arch_version->version_minor)), + mpt::osinfo::arch::Version::ServicePack(mpt::saturate_cast(download.required_arch_version->servicepack_major), mpt::saturate_cast(download.required_arch_version->servicepack_minor)), + mpt::osinfo::arch::Version::Build(mpt::saturate_cast(download.required_arch_version->build)) )) { download_supported = false; @@ -286,7 +286,7 @@ static UpdateInfo GetBestDownload(const Update::versions &versions) if(mpt::OS::Windows::IsWine() && theApp.GetWineVersion()->Version().IsValid()) { - if(theApp.GetWineVersion()->Version().IsBefore(mpt::OS::Wine::Version(mpt::saturate_cast(download.required_windows_version->wine_major), mpt::saturate_cast(download.required_windows_version->wine_minor), mpt::saturate_cast(download.required_windows_version->wine_update)))) + if(theApp.GetWineVersion()->Version().IsBefore(mpt::OS::Wine::Version(mpt::saturate_cast(download.required_arch_version->wine_major), mpt::saturate_cast(download.required_arch_version->wine_minor), mpt::saturate_cast(download.required_arch_version->wine_update)))) { download_supported = false; } @@ -1436,7 +1436,7 @@ CString CUpdateCheck::Error::GetMessage() const CString CUpdateCheck::Error::FormatErrorCode(CString errorMessage, DWORD errorCode) { - errorMessage += mpt::ToCString(mpt::windows::GetErrorMessage(errorCode, GetModuleHandle(TEXT("wininet.dll")))); + errorMessage += mpt::ToCString(mpt::arch::GetErrorMessage(errorCode, GetModuleHandle(TEXT("wininet.dll")))); return errorMessage; } diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/View_gen.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/View_gen.cpp index 253bc4eec..7c09b988d 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/View_gen.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/View_gen.cpp @@ -1806,7 +1806,7 @@ BOOL CViewGlobals::OnToolTipText(UINT, NMHDR *pNMHDR, LRESULT *pResult) mpt::String::WriteWinBuf(pTTT->szText) = text; *pResult = 0; - // bring the tooltip window above other popup windows + // bring the tooltip window above other popup arch ::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | SWP_NOOWNERZORDER); return TRUE; // message was handled diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/Vstplug.cpp b/Src/external_dependencies/openmpt-trunk/mptrack/Vstplug.cpp index 54a8e058a..8098ecf79 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/Vstplug.cpp +++ b/Src/external_dependencies/openmpt-trunk/mptrack/Vstplug.cpp @@ -194,7 +194,7 @@ AEffect *CVstPlugin::LoadPlugin(bool maskCrashes, VSTPluginLib &plugin, HMODULE #ifdef _DEBUG mpt::ustring buf = MPT_UFORMAT("Warning: encountered problem when loading plugin dll. Error {}: {}") ( mpt::ufmt::hex(error) - , mpt::ToUnicode(mpt::windows::GetErrorMessage(error)) + , mpt::ToUnicode(mpt::arch::GetErrorMessage(error)) ); Reporting::Error(buf, "DEBUG: Error when loading plugin dll"); #endif //_DEBUG diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/mptrack.rc b/Src/external_dependencies/openmpt-trunk/mptrack/mptrack.rc index d6419d597..232f3763b 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/mptrack.rc +++ b/Src/external_dependencies/openmpt-trunk/mptrack/mptrack.rc @@ -2988,7 +2988,7 @@ BEGIN ID_HELP_INDEX "Opens Help\nHelp Topics" ID_HELP_FINDER "List Help topics\nHelp Topics" ID_HELP_USING "Display instructions about how to use help\nHelp" - ID_CONTEXT_HELP "Display help for buttons, menus and windows\nHelp" + ID_CONTEXT_HELP "Display help for buttons, menus and arch\nHelp" ID_HELP "Display help for current task or command\nHelp" END @@ -3002,9 +3002,9 @@ STRINGTABLE BEGIN ID_WINDOW_NEW "Open another window for the active song\nNew Window" ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons" - ID_WINDOW_CASCADE "Arrange windows so they overlap\nCascade Windows" - ID_WINDOW_TILE_HORZ "Arrange windows as non-overlapping tiles\nTile Windows" - ID_WINDOW_TILE_VERT "Arrange windows as non-overlapping tiles\nTile Windows" + ID_WINDOW_CASCADE "Arrange arch so they overlap\nCascade Windows" + ID_WINDOW_TILE_HORZ "Arrange arch as non-overlapping tiles\nTile Windows" + ID_WINDOW_TILE_VERT "Arrange arch as non-overlapping tiles\nTile Windows" ID_WINDOW_SPLIT "Split the active window into panes\nSplit" END diff --git a/Src/external_dependencies/openmpt-trunk/mptrack/wine/WineWrapper.c b/Src/external_dependencies/openmpt-trunk/mptrack/wine/WineWrapper.c index 019f408e1..aa7537d43 100644 --- a/Src/external_dependencies/openmpt-trunk/mptrack/wine/WineWrapper.c +++ b/Src/external_dependencies/openmpt-trunk/mptrack/wine/WineWrapper.c @@ -3,7 +3,7 @@ #include "NativeConfig.h" -#include +#include #include diff --git a/Src/external_dependencies/openmpt-trunk/openmpt123/openmpt123.cpp b/Src/external_dependencies/openmpt-trunk/openmpt123/openmpt123.cpp index 065225f61..df059765e 100644 --- a/Src/external_dependencies/openmpt-trunk/openmpt123/openmpt123.cpp +++ b/Src/external_dependencies/openmpt-trunk/openmpt123/openmpt123.cpp @@ -81,7 +81,7 @@ static const char * const license = #endif #include #include -#include +#include #include #include #else diff --git a/Src/external_dependencies/openmpt-trunk/packageTemplate/History.txt b/Src/external_dependencies/openmpt-trunk/packageTemplate/History.txt index bf0c08261..2c70faabe 100644 --- a/Src/external_dependencies/openmpt-trunk/packageTemplate/History.txt +++ b/Src/external_dependencies/openmpt-trunk/packageTemplate/History.txt @@ -1206,7 +1206,7 @@ Misc - [Imp] Show keyboard shortcuts in various tooltips (http://bugs.openmpt.org/view.php?id=980). - [Imp] Try to figure out when a USB MIDI device is disconnected and disable the MIDI record button if this device was being used for recording. - [Imp] In addition to checking for the latest development builds, it is now also possible to receive update notifications for upcoming minor updates. -- [Fix] In High-DPI mode, scale initial size of the upper panel of child windows properly. +- [Fix] In High-DPI mode, scale initial size of the upper panel of child arch properly. Bundled plugins - [Fix] MIDI I/O Plugin: Do not crash when sending a MIDI message fails (e.g. with Coolsoft Virtual MIDI Synth, http://bugs.openmpt.org/view.php?id=1219). @@ -1947,7 +1947,7 @@ v1.26.14.00 (14 August 2017, revision 8772) ------------------------------------------- Pattern tab - [Fix] Changing the octave of notes below middle-C was broken in OpenMPT 1.26.13.00. -- [Fix] Resizing a pattern did not properly redraw the row numbers in other pattern windows. +- [Fix] Resizing a pattern did not properly redraw the row numbers in other pattern arch. v1.26.13.00 (12 August 2017, revision 8759) @@ -2150,7 +2150,7 @@ General tab Pattern tab - [Mod] Do not wrap around the spin wheel for the edit spacing box from 0 to 64. - [Fix] Correctly center active row when switching to a pattern that has less rows than the previously edited pattern (http://bugs.openmpt.org/view.php?id=899). -- [Fix] Moving channels did not update the channel names in other windows. +- [Fix] Moving channels did not update the channel names in other arch. - [Fix] The "switch to order list" shortcut also toggled overflow paste. - [Fix] Quick Channel Settings: Entering a panning value manually did not reset the surround setting visually. - [Fix] Trying to play a part of a pattern that is not part of the regular play sequence (e.g. rows after a pattern break) caused the pattern to be played from the first row instead. @@ -2181,7 +2181,7 @@ Other formats Misc - [Fix] Configuring chords with a relative base note was broken since OpenMPT 1.26.01.00. - [Fix] Tempo Swing dialog: A swing amount of 100% is now displayed correctly on Wine prior to version 2.0. -- [Fix] When switching between multiple windows of a single module, sample and instrument editors are now receiving playback updates instantly. +- [Fix] When switching between multiple arch of a single module, sample and instrument editors are now receiving playback updates instantly. - [Fix] SF2: Some stereo sample pairs were mismatched. - [Fix] Running OpenMPT with a relative path to a module file as a parameter did not work as intended. @@ -2762,7 +2762,7 @@ Misc - [Fix] Crash in 64-bit builds when trying to append a module. - [Fix] After changing the default rows per beat, the new value was not used in tempo approximation for classic and alternative tempo mode if the song was not currently playing. - [Fix] Some menu items were not greyed out when they should have been (http://bugs.openmpt.org/view.php?id=710). -- [Fix] Fix resource exhaustion on Wine when invoking any popup windows via a keyboard hotkey (http://bugs.openmpt.org/view.php?id=713). +- [Fix] Fix resource exhaustion on Wine when invoking any popup arch via a keyboard hotkey (http://bugs.openmpt.org/view.php?id=713). - [Reg] Remove hidden setting "Misc.ShowHackControls". All it did was showing an input field for changing the sequence margins, which can already be controlled through a different setting "Pattern Editor.DefaultSequenceMargins". Third-Party Libraries @@ -3055,7 +3055,7 @@ Misc - [Mod] No longer mark module as modified when switching between sequences (http://bugs.openmpt.org/view.php?id=141). - [Fix] The bold and italic styles were ignored on custom pattern and comments fonts. - [Fix] It was possible to switch song tabs while being in a modal dialog, which could lead to crashes when exiting the dialog. -- [Fix] Tooltips were missing in some windows in the 32-bit build (http://bugs.openmpt.org/view.php?id=646). +- [Fix] Tooltips were missing in some arch in the 32-bit build (http://bugs.openmpt.org/view.php?id=646). - [Fix] Channel Manager window was not sized properly. - [Fix] OpenMPT 1.24 was previously no longer running on Windows 98 + KernelEx. @@ -3522,7 +3522,7 @@ VST / DMO Plugins - [Imp] Implemented audioMasterGetChunkFile opcode. - [Imp] Implemented more timing information for plugins that want it. - [Imp] When rescanning plugins on startup is taking too long, show a progress dialog. -- [Mod] Optimize VST window redrawing a little bit by not filling the window with the default background colour (removes flicker when resizing plugin windows). +- [Mod] Optimize VST window redrawing a little bit by not filling the window with the default background colour (removes flicker when resizing plugin arch). - [Fix] OpenMPT should no longer "forget" plugins randomly (http://bugs.openmpt.org/view.php?id=18). - [Fix] Plugins with same internal ID should no longer confuse OpenMPT's plugin cache (http://bugs.openmpt.org/view.php?id=25). - [Fix] Some plugins could produce a crash when using the buffer clearing option in export (tx coda). @@ -5298,7 +5298,7 @@ Sample tab Instrument tab - [Fix] When playing an instrument and disabling its envelopes at the same time, the toggled envelopes are stopped (prevents filter envelope from turning into a pitch envelope). - [Fix] Sample map was broken when dealing with sample indexes greater than 255. -- [Fix] Update plugin list properly when cleaning up plugins while being on the instrument tab (possibly also improves instrument tab behaviour when working with multiple windows). +- [Fix] Update plugin list properly when cleaning up plugins while being on the instrument tab (possibly also improves instrument tab behaviour when working with multiple arch). Instrument tab::Envelope editor - [New] Envelopes can be edited using keyboard. Various keyboard shortcuts have been added to move and edit envelope points. This uses a common "drag and drop" node with mouse editing, so a point can first be clicked and the be moved with e.g. cursor keys. @@ -5519,7 +5519,7 @@ Instrument tab - [Fix] No relative values are shown for envelopes with no release node (status bar) (tx xaimus). - [Fix] Remove special chars from sample filenames so the "save as" dialog will show up on OSs < Vista. - [Fix] Fixed crash in instrument view that occurred if RowsPerBeat was 0. -- [Fix] Fix to crash that occurred when multiple windows had instrument tab of the same document open. +- [Fix] Fix to crash that occurred when multiple arch had instrument tab of the same document open. Comments tab - [Imp] Default view mode is instruments instead of samples for XM files. diff --git a/Src/external_dependencies/openmpt-trunk/pluginBridge/Bridge.cpp b/Src/external_dependencies/openmpt-trunk/pluginBridge/Bridge.cpp index e819c97f8..06e35615d 100644 --- a/Src/external_dependencies/openmpt-trunk/pluginBridge/Bridge.cpp +++ b/Src/external_dependencies/openmpt-trunk/pluginBridge/Bridge.cpp @@ -157,7 +157,7 @@ void PluginBridge::MainLoop(TCHAR *argv[]) owner = GetParent(GetParent(hwnd)); break; } - // Does the message come from a top-level window? This is required e.g. for the slider pop-up windows and patch browser in Synth1. + // Does the message come from a top-level window? This is required e.g. for the slider pop-up arch and patch browser in Synth1. if(!(GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD)) { owner = GetWindow(hwnd, GW_OWNER); @@ -486,7 +486,7 @@ void PluginBridge::DispatchToPlugin(DispatchMsg &msg) break; case effEditOpen: - // HWND in [ptr] - Note: Window handles are interoperable between 32-bit and 64-bit applications in Windows (http://msdn.microsoft.com/en-us/library/windows/desktop/aa384203%28v=vs.85%29.aspx) + // HWND in [ptr] - Note: Window handles are interoperable between 32-bit and 64-bit applications in Windows (http://msdn.microsoft.com/en-us/library/arch/desktop/aa384203%28v=vs.85%29.aspx) { TCHAR str[_MAX_PATH]; GetModuleFileName(m_library, str, mpt::saturate_cast(std::size(str))); @@ -1253,7 +1253,7 @@ LRESULT CALLBACK PluginBridge::WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, L PluginBridge *that = nullptr; if(hwnd == m_communicationWindow && wParam < m_plugins.size()) that = static_cast(m_plugins[wParam]); - else // Editor windows + else // Editor arch that = reinterpret_cast(GetWindowLongPtr(hwnd, GWLP_USERDATA)); if(that == nullptr) diff --git a/Src/external_dependencies/openmpt-trunk/pluginBridge/BridgeWrapper.cpp b/Src/external_dependencies/openmpt-trunk/pluginBridge/BridgeWrapper.cpp index 4693a3236..f7d9e235b 100644 --- a/Src/external_dependencies/openmpt-trunk/pluginBridge/BridgeWrapper.cpp +++ b/Src/external_dependencies/openmpt-trunk/pluginBridge/BridgeWrapper.cpp @@ -698,7 +698,7 @@ intptr_t BridgeWrapper::DispatchToPlugin(VstOpcodeToPlugin opcode, int32 index, break; case effEditOpen: - // HWND in [ptr] - Note: Window handles are interoperable between 32-bit and 64-bit applications in Windows (http://msdn.microsoft.com/en-us/library/windows/desktop/aa384203%28v=vs.85%29.aspx) + // HWND in [ptr] - Note: Window handles are interoperable between 32-bit and 64-bit applications in Windows (http://msdn.microsoft.com/en-us/library/arch/desktop/aa384203%28v=vs.85%29.aspx) ptrOut = reinterpret_cast(ptr); ptrIsSize = false; m_cachedProgNames.clear(); diff --git a/Src/external_dependencies/openmpt-trunk/soundlib/ITTools.h b/Src/external_dependencies/openmpt-trunk/soundlib/ITTools.h index 4176df70a..5e4fda77d 100644 --- a/Src/external_dependencies/openmpt-trunk/soundlib/ITTools.h +++ b/Src/external_dependencies/openmpt-trunk/soundlib/ITTools.h @@ -275,7 +275,7 @@ struct FileHistory; // IT Header extension: Save history struct ITHistoryStruct { - uint16le fatdate; // DOS / FAT date when the file was opened / created in the editor. For details, read https://docs.microsoft.com/de-de/windows/win32/api/winbase/nf-winbase-dosdatetimetofiletime + uint16le fatdate; // DOS / FAT date when the file was opened / created in the editor. For details, read https://docs.microsoft.com/de-de/arch/win32/api/winbase/nf-winbase-dosdatetimetofiletime uint16le fattime; // DOS / FAT time when the file was opened / created in the editor. uint32le runtime; // The time how long the file was open in the editor, in 1/18.2th seconds. (= ticks of the DOS timer) diff --git a/Src/external_dependencies/openmpt-trunk/soundlib/SampleFormatMediaFoundation.cpp b/Src/external_dependencies/openmpt-trunk/soundlib/SampleFormatMediaFoundation.cpp index 07348ec0c..710625058 100644 --- a/Src/external_dependencies/openmpt-trunk/soundlib/SampleFormatMediaFoundation.cpp +++ b/Src/external_dependencies/openmpt-trunk/soundlib/SampleFormatMediaFoundation.cpp @@ -23,7 +23,7 @@ #include "../soundlib/ModSampleCopy.h" #include "../common/ComponentManager.h" #if defined(MPT_WITH_MEDIAFOUNDATION) -#include +#include #include #include #include diff --git a/Src/external_dependencies/openmpt-trunk/soundlib/WAVTools.cpp b/Src/external_dependencies/openmpt-trunk/soundlib/WAVTools.cpp index eebe2c98f..0c7f4ab03 100644 --- a/Src/external_dependencies/openmpt-trunk/soundlib/WAVTools.cpp +++ b/Src/external_dependencies/openmpt-trunk/soundlib/WAVTools.cpp @@ -168,7 +168,7 @@ uint16 WAVReader::GetFileCodePage(FileReader::ChunkList &chunks) Version version = Version::Parse(mpt::ToUnicode(mpt::Charset::ISO8859_1, versionString)); if(version && version < MPT_V("1.28.00.02")) { - return 1252; // mpt::Charset::Windows1252; // OpenMPT up to and including 1.28.00.01 wrote metadata in windows-1252 encoding + return 1252; // mpt::Charset::Windows1252; // OpenMPT up to and including 1.28.00.01 wrote metadata in arch-1252 encoding } else { return 28591; // mpt::Charset::ISO8859_1; // as per spec diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/base/macros.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/base/macros.hpp index c54ebf92c..ea70d2122 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/base/macros.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/base/macros.hpp @@ -10,7 +10,7 @@ #include #if MPT_COMPILER_MSVC && MPT_OS_WINDOWS -#include +#include #endif // MPT_COMPILER_MSVC && MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/check/windows.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/check/windows.hpp index b6a05f924..8c5a9c1ad 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/check/windows.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/check/windows.hpp @@ -10,13 +10,13 @@ #ifndef UNICODE #ifndef MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE -MPT_WARNING("windows.h uses MBCS TCHAR. Please #define UNICODE.") +MPT_WARNING("arch.h uses MBCS TCHAR. Please #define UNICODE.") #endif #endif #ifndef NOMINMAX #ifndef MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_NOMINMAX -MPT_WARNING("windows.h defines min and max which conflicts with C++. Please #define NOMINMAX.") +MPT_WARNING("arch.h defines min and max which conflicts with C++. Please #define NOMINMAX.") #endif #endif diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/exception.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/exception.hpp index 6e7de5103..2532fcb7a 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/exception.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/exception.hpp @@ -14,7 +14,7 @@ #include #if MPT_OS_WINDOWS -#include // must be before wincrypt.h for clang-cl +#include // must be before wincrypt.h for clang-cl #include // must be before ncrypt.h #include #endif // MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/hash.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/hash.hpp index e8b4d4cb8..283d484e9 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/hash.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/hash.hpp @@ -19,7 +19,7 @@ #include #if MPT_OS_WINDOWS -#include // must be before wincrypt.h for clang-cl +#include // must be before wincrypt.h for clang-cl #include #endif // MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/jwk.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/jwk.hpp index dd54cb04c..44caa5442 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/jwk.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/crypto/jwk.hpp @@ -31,7 +31,7 @@ #include #if MPT_OS_WINDOWS -#include // must be before wincrypt.h for clang-cl +#include // must be before wincrypt.h for clang-cl #include #include // must be before ncrypt.h #include diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/environment/environment.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/environment/environment.hpp index 4fb021b15..245212dee 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/environment/environment.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/environment/environment.hpp @@ -20,7 +20,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS @@ -38,7 +38,7 @@ inline std::optional getenv(const mpt::ustring & env_var) { std::vector buf(32767); DWORD size = GetEnvironmentVariable(mpt::transcode(env_var).c_str(), buf.data(), 32767); if (size == 0) { - mpt::windows::ExpectError(ERROR_ENVVAR_NOT_FOUND); + mpt::arch::ExpectError(ERROR_ENVVAR_NOT_FOUND); return std::nullopt; } return mpt::transcode(buf.data()); diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/library/library.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/library/library.hpp index 1b20277af..8a265b8d1 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/library/library.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/library/library.hpp @@ -22,7 +22,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #elif MPT_OS_ANDROID #elif defined(MPT_WITH_DL) #include diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/mutex/mutex.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/mutex/mutex.hpp index 2a38eacd2..5274960c9 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/mutex/mutex.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/mutex/mutex.hpp @@ -42,7 +42,7 @@ #endif #endif #elif MPT_MUTEX_WIN32 -#include +#include #endif // MPT_MUTEX diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/osinfo/windows_version.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/osinfo/windows_version.hpp index 33c046eb4..aec33ad66 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/osinfo/windows_version.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/osinfo/windows_version.hpp @@ -10,7 +10,7 @@ #include "mpt/base/namespace.hpp" #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS @@ -22,7 +22,7 @@ inline namespace MPT_INLINE_NS { namespace osinfo { -namespace windows { +namespace arch { @@ -111,7 +111,7 @@ public: return Version(); } - constexpr Version(mpt::osinfo::windows::Version::System system, mpt::osinfo::windows::Version::ServicePack servicePack, mpt::osinfo::windows::Version::Build build, mpt::osinfo::windows::Version::TypeId type) noexcept + constexpr Version(mpt::osinfo::arch::Version::System system, mpt::osinfo::arch::Version::ServicePack servicePack, mpt::osinfo::arch::Version::Build build, mpt::osinfo::arch::Version::TypeId type) noexcept : m_SystemIsWindows(true) , m_System(system) , m_ServicePack(servicePack) @@ -122,64 +122,64 @@ public: public: #if MPT_OS_WINDOWS - static mpt::osinfo::windows::Version FromSDK() noexcept { + static mpt::osinfo::arch::Version FromSDK() noexcept { // Initialize to used SDK version #if defined(NTDDI_VERSION) #if NTDDI_VERSION >= 0x0A00000B // NTDDI_WIN10_CO Win11 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 22000, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 22000, 0); #elif NTDDI_VERSION >= 0x0A00000A // NTDDI_WIN10_FE 21H2 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19044, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 19044, 0); //#elif // NTDDI_WIN10_FE 21H1 -// return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19043, 0); +// return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 19043, 0); //#elif // NTDDI_WIN10_FE 20H2 -// return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19042, 0); +// return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 19042, 0); #elif NTDDI_VERSION >= 0x0A000009 // NTDDI_WIN10_MN 2004/20H1 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 19041, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 19041, 0); #elif NTDDI_VERSION >= 0x0A000008 // NTDDI_WIN10_VB 1909/19H2 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 18363, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 18363, 0); #elif NTDDI_VERSION >= 0x0A000007 // NTDDI_WIN10_19H1 1903/19H1 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 18362, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 18362, 0); #elif NTDDI_VERSION >= 0x0A000006 // NTDDI_WIN10_RS5 1809 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 17763, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 17763, 0); #elif NTDDI_VERSION >= 0x0A000005 // NTDDI_WIN10_RS4 1803 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 17134, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 17134, 0); #elif NTDDI_VERSION >= 0x0A000004 // NTDDI_WIN10_RS3 1709 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 16299, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 16299, 0); #elif NTDDI_VERSION >= 0x0A000003 // NTDDI_WIN10_RS2 1703 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 15063, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 15063, 0); #elif NTDDI_VERSION >= 0x0A000002 // NTDDI_WIN10_RS1 1607 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 14393, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 14393, 0); #elif NTDDI_VERSION >= 0x0A000001 // NTDDI_WIN10_TH2 1511 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 10586, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 10586, 0); #elif NTDDI_VERSION >= 0x0A000000 // NTDDI_WIN10 1507 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 10240, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win10, mpt::osinfo::arch::Version::ServicePack(0, 0), 10240, 0); #elif NTDDI_VERSION >= 0x06030000 // NTDDI_WINBLUE - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win81, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win81, mpt::osinfo::arch::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); #elif NTDDI_VERSION >= 0x06020000 // NTDDI_WIN8 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win8, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win8, mpt::osinfo::arch::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); #elif NTDDI_VERSION >= 0x06010000 // NTDDI_WIN7 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win7, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win7, mpt::osinfo::arch::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); #elif NTDDI_VERSION >= 0x06000000 // NTDDI_VISTA - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::WinVista, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::WinVista, mpt::osinfo::arch::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); #elif NTDDI_VERSION >= 0x05020000 // NTDDI_WS03 - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::WinXP64, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::WinXP64, mpt::osinfo::arch::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); #elif NTDDI_VERSION >= NTDDI_WINXP - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::WinXP, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::WinXP, mpt::osinfo::arch::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); #elif NTDDI_VERSION >= NTDDI_WIN2K - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win2000, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::Win2000, mpt::osinfo::arch::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); #else - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::WinNT4, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::WinNT4, mpt::osinfo::arch::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0); #endif #elif defined(_WIN32_WINNT) - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::System((static_cast(_WIN32_WINNT) & 0xff00u) >> 8, (static_cast(_WIN32_WINNT) & 0x00ffu) >> 0), mpt::osinfo::windows::Version::ServicePack(0, 0), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::System((static_cast(_WIN32_WINNT) & 0xff00u) >> 8, (static_cast(_WIN32_WINNT) & 0x00ffu) >> 0), mpt::osinfo::arch::Version::ServicePack(0, 0), 0, 0); #else - return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::System(0, 0), mpt::osinfo::windows::Version::ServicePack(0, 0), 0, 0); + return mpt::osinfo::arch::Version(mpt::osinfo::arch::Version::System(0, 0), mpt::osinfo::arch::Version::ServicePack(0, 0), 0, 0); #endif } - static mpt::osinfo::windows::Version GatherWindowsVersion() noexcept { + static mpt::osinfo::arch::Version GatherWindowsVersion() noexcept { #if MPT_OS_WINDOWS_WINRT - return mpt::osinfo::windows::Version::FromSDK(); + return mpt::osinfo::arch::Version::FromSDK(); #else // !MPT_OS_WINDOWS_WINRT OSVERSIONINFOEXW versioninfoex{}; versioninfoex.dwOSVersionInfoSize = sizeof(versioninfoex); @@ -193,7 +193,7 @@ public: #pragma clang diagnostic ignored "-Wdeprecated-declarations" #endif // MPT_COMPILER_CLANG if (GetVersionExW((LPOSVERSIONINFOW)&versioninfoex) == FALSE) { - return mpt::osinfo::windows::Version::FromSDK(); + return mpt::osinfo::arch::Version::FromSDK(); } #if MPT_COMPILER_MSVC #pragma warning(pop) @@ -202,7 +202,7 @@ public: #pragma clang diagnostic pop #endif // MPT_COMPILER_CLANG if (versioninfoex.dwPlatformId != VER_PLATFORM_WIN32_NT) { - return mpt::osinfo::windows::Version::FromSDK(); + return mpt::osinfo::arch::Version::FromSDK(); } DWORD dwProductType = 0; #if (_WIN32_WINNT >= 0x0600) // _WIN32_WINNT_VISTA @@ -211,9 +211,9 @@ public: dwProductType = PRODUCT_UNDEFINED; } #endif - return mpt::osinfo::windows::Version( - mpt::osinfo::windows::Version::System(versioninfoex.dwMajorVersion, versioninfoex.dwMinorVersion), - mpt::osinfo::windows::Version::ServicePack(versioninfoex.wServicePackMajor, versioninfoex.wServicePackMinor), + return mpt::osinfo::arch::Version( + mpt::osinfo::arch::Version::System(versioninfoex.dwMajorVersion, versioninfoex.dwMinorVersion), + mpt::osinfo::arch::Version::ServicePack(versioninfoex.wServicePackMajor, versioninfoex.wServicePackMinor), versioninfoex.dwBuildNumber, dwProductType); #endif // MPT_OS_WINDOWS_WINRT @@ -222,11 +222,11 @@ public: #endif // MPT_OS_WINDOWS public: - static mpt::osinfo::windows::Version Current() noexcept { + static mpt::osinfo::arch::Version Current() noexcept { #if MPT_OS_WINDOWS return GatherWindowsVersion(); #else // !MPT_OS_WINDOWS - return mpt::osinfo::windows::Version::NoWindows(); + return mpt::osinfo::arch::Version::NoWindows(); #endif // MPT_OS_WINDOWS } @@ -235,14 +235,14 @@ public: return m_SystemIsWindows; } - bool IsBefore(mpt::osinfo::windows::Version::System version) const noexcept { + bool IsBefore(mpt::osinfo::arch::Version::System version) const noexcept { if (!m_SystemIsWindows) { return false; } return m_System < version; } - bool IsBefore(mpt::osinfo::windows::Version::System version, mpt::osinfo::windows::Version::ServicePack servicePack) const noexcept { + bool IsBefore(mpt::osinfo::arch::Version::System version, mpt::osinfo::arch::Version::ServicePack servicePack) const noexcept { if (!m_SystemIsWindows) { return false; } @@ -255,7 +255,7 @@ public: return m_ServicePack < servicePack; } - bool IsBefore(mpt::osinfo::windows::Version::System version, mpt::osinfo::windows::Version::Build build) const noexcept { + bool IsBefore(mpt::osinfo::arch::Version::System version, mpt::osinfo::arch::Version::Build build) const noexcept { if (!m_SystemIsWindows) { return false; } @@ -268,7 +268,7 @@ public: return m_Build < build; } - bool IsBefore(mpt::osinfo::windows::Version::System version, mpt::osinfo::windows::Version::ServicePack servicePack, mpt::osinfo::windows::Version::Build build) const noexcept { + bool IsBefore(mpt::osinfo::arch::Version::System version, mpt::osinfo::arch::Version::ServicePack servicePack, mpt::osinfo::arch::Version::Build build) const noexcept { if (!m_SystemIsWindows) { return false; } @@ -287,18 +287,18 @@ public: return m_Build < build; } - bool IsBefore(mpt::osinfo::windows::Version version) const noexcept { + bool IsBefore(mpt::osinfo::arch::Version version) const noexcept { return IsBefore(version.GetSystem(), version.GetServicePack(), version.GetBuild()); } - bool IsAtLeast(mpt::osinfo::windows::Version::System version) const noexcept { + bool IsAtLeast(mpt::osinfo::arch::Version::System version) const noexcept { if (!m_SystemIsWindows) { return false; } return m_System >= version; } - bool IsAtLeast(mpt::osinfo::windows::Version::System version, mpt::osinfo::windows::Version::ServicePack servicePack) const noexcept { + bool IsAtLeast(mpt::osinfo::arch::Version::System version, mpt::osinfo::arch::Version::ServicePack servicePack) const noexcept { if (!m_SystemIsWindows) { return false; } @@ -311,7 +311,7 @@ public: return m_ServicePack >= servicePack; } - bool IsAtLeast(mpt::osinfo::windows::Version::System version, mpt::osinfo::windows::Version::Build build) const noexcept { + bool IsAtLeast(mpt::osinfo::arch::Version::System version, mpt::osinfo::arch::Version::Build build) const noexcept { if (!m_SystemIsWindows) { return false; } @@ -324,7 +324,7 @@ public: return m_Build >= build; } - bool IsAtLeast(mpt::osinfo::windows::Version::System version, mpt::osinfo::windows::Version::ServicePack servicePack, mpt::osinfo::windows::Version::Build build) const noexcept { + bool IsAtLeast(mpt::osinfo::arch::Version::System version, mpt::osinfo::arch::Version::ServicePack servicePack, mpt::osinfo::arch::Version::Build build) const noexcept { if (!m_SystemIsWindows) { return false; } @@ -343,23 +343,23 @@ public: return m_Build >= build; } - bool IsAtLeast(mpt::osinfo::windows::Version version) const noexcept { + bool IsAtLeast(mpt::osinfo::arch::Version version) const noexcept { return IsAtLeast(version.GetSystem(), version.GetServicePack(), version.GetBuild()); } - mpt::osinfo::windows::Version::System GetSystem() const noexcept { + mpt::osinfo::arch::Version::System GetSystem() const noexcept { return m_System; } - mpt::osinfo::windows::Version::ServicePack GetServicePack() const noexcept { + mpt::osinfo::arch::Version::ServicePack GetServicePack() const noexcept { return m_ServicePack; } - mpt::osinfo::windows::Version::Build GetBuild() const noexcept { + mpt::osinfo::arch::Version::Build GetBuild() const noexcept { return m_Build; } - mpt::osinfo::windows::Version::TypeId GetTypeId() const noexcept { + mpt::osinfo::arch::Version::TypeId GetTypeId() const noexcept { return m_Type; } @@ -394,8 +394,8 @@ public: } private: - static mpt::osinfo::windows::wine::version FromInteger(uint32 version) { - mpt::osinfo::windows::wine::version result; + static mpt::osinfo::arch::wine::version FromInteger(uint32 version) { + mpt::osinfo::arch::wine::version result; result.valid = (version <= 0xffffff); result.vmajor = static_cast(version >> 16); result.vminor = static_cast(version >> 8); @@ -411,13 +411,13 @@ private: } public: - bool IsBefore(mpt::osinfo::windows::wine::version other) const { + bool IsBefore(mpt::osinfo::arch::wine::version other) const { if (!IsValid()) { return false; } return (AsInteger() < other.AsInteger()); } - bool IsAtLeast(mpt::osinfo::windows::wine::version other) const { + bool IsAtLeast(mpt::osinfo::arch::wine::version other) const { if (!IsValid()) { return false; } @@ -438,7 +438,7 @@ public: -} // namespace windows +} // namespace arch } // namespace osinfo diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/path/path.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/path/path.hpp index 96f88f85a..71552acc9 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/path/path.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/path/path.hpp @@ -15,7 +15,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/string/buffer.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/string/buffer.hpp index 1f032bae3..dd05fc480 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/string/buffer.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/string/buffer.hpp @@ -160,28 +160,28 @@ inline StringBufRefImpl -inline StringBufRefImpl::type>::string_type, typename std::add_const::type> ReadWinBuf(const std::array & buf) { - return StringBufRefImpl::type>::string_type, typename std::add_const::type>(buf.data(), size); +inline StringBufRefImpl::type>::string_type, typename std::add_const::type> ReadWinBuf(const std::array & buf) { + return StringBufRefImpl::type>::string_type, typename std::add_const::type>(buf.data(), size); } template -inline StringBufRefImpl::type>::string_type, typename std::add_const::type> ReadWinBuf(const Tchar (&buf)[size]) { - return StringBufRefImpl::type>::string_type, typename std::add_const::type>(buf, size); +inline StringBufRefImpl::type>::string_type, typename std::add_const::type> ReadWinBuf(const Tchar (&buf)[size]) { + return StringBufRefImpl::type>::string_type, typename std::add_const::type>(buf, size); } template -inline StringBufRefImpl::type>::string_type, typename std::add_const::type> ReadWinBuf(const Tchar * buf, std::size_t size) { - return StringBufRefImpl::type>::string_type, typename std::add_const::type>(buf, size); +inline StringBufRefImpl::type>::string_type, typename std::add_const::type> ReadWinBuf(const Tchar * buf, std::size_t size) { + return StringBufRefImpl::type>::string_type, typename std::add_const::type>(buf, size); } template -inline StringBufRefImpl::type>::string_type, Tchar> WriteWinBuf(std::array & buf) { - return StringBufRefImpl::type>::string_type, Tchar>(buf.data(), size); +inline StringBufRefImpl::type>::string_type, Tchar> WriteWinBuf(std::array & buf) { + return StringBufRefImpl::type>::string_type, Tchar>(buf.data(), size); } template -inline StringBufRefImpl::type>::string_type, Tchar> WriteWinBuf(Tchar (&buf)[size]) { - return StringBufRefImpl::type>::string_type, Tchar>(buf, size); +inline StringBufRefImpl::type>::string_type, Tchar> WriteWinBuf(Tchar (&buf)[size]) { + return StringBufRefImpl::type>::string_type, Tchar>(buf, size); } template -inline StringBufRefImpl::type>::string_type, Tchar> WriteWinBuf(Tchar * buf, std::size_t size) { - return StringBufRefImpl::type>::string_type, Tchar>(buf, size); +inline StringBufRefImpl::type>::string_type, Tchar> WriteWinBuf(Tchar * buf, std::size_t size) { + return StringBufRefImpl::type>::string_type, Tchar>(buf, size); } #endif // MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/string/types.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/string/types.hpp index 64df0c203..14baaf740 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/string/types.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/string/types.hpp @@ -17,7 +17,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS @@ -34,7 +34,7 @@ enum class common_encoding { iso8859_15, cp850, cp437, - windows1252, + arch1252, amiga, riscos, iso8859_1_no_c1, @@ -44,7 +44,7 @@ enum class common_encoding { enum class logical_encoding { - locale, // CP_ACP on windows, system configured C locale otherwise + locale, // CP_ACP on arch, system configured C locale otherwise active_locale, // active C/C++ global locale }; @@ -204,13 +204,13 @@ using exception_string = std::basic_string -struct windows_char_traits { }; +struct arch_char_traits { }; template <> -struct windows_char_traits { using string_type = mpt::lstring; }; +struct arch_char_traits { using string_type = mpt::lstring; }; template <> -struct windows_char_traits { using string_type = std::wstring; }; +struct arch_char_traits { using string_type = std::wstring; }; -using tstring = windows_char_traits::string_type; +using tstring = arch_char_traits::string_type; using winstring = mpt::tstring; diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/string_transcode/transcode.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/string_transcode/transcode.hpp index cdb53b611..218eb44c8 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/string_transcode/transcode.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/string_transcode/transcode.hpp @@ -29,7 +29,7 @@ #endif // MPT_OS_DJGPP #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS #if MPT_OS_DJGPP @@ -538,7 +538,7 @@ inline bool has_codepage(UINT cp) { return IsValidCodePage(cp) ? true : false; } -inline bool windows_has_encoding(common_encoding encoding) { +inline bool arch_has_encoding(common_encoding encoding) { bool result = false; switch (encoding) { case common_encoding::utf8: @@ -559,7 +559,7 @@ inline bool windows_has_encoding(common_encoding encoding) { case common_encoding::cp437: result = has_codepage(437); break; - case common_encoding::windows1252: + case common_encoding::arch1252: result = has_codepage(1252); break; case common_encoding::amiga: @@ -581,7 +581,7 @@ inline bool windows_has_encoding(common_encoding encoding) { return result; } -inline bool windows_has_encoding(logical_encoding encoding) { +inline bool arch_has_encoding(logical_encoding encoding) { bool result = false; switch (encoding) { case logical_encoding::locale: @@ -628,7 +628,7 @@ inline UINT codepage_from_encoding(common_encoding encoding) { case common_encoding::cp437: result = 437; break; - case common_encoding::windows1252: + case common_encoding::arch1252: result = 1252; break; case common_encoding::amiga: @@ -923,7 +923,7 @@ inline Tdststring encode(common_encoding encoding, const mpt::widestring & src) static_assert(sizeof(typename Tdststring::value_type) == sizeof(char)); static_assert(mpt::is_character::value); #if MPT_OS_WINDOWS - if (windows_has_encoding(encoding)) { + if (arch_has_encoding(encoding)) { return encode_codepage(codepage_from_encoding(encoding), src); } #endif @@ -946,7 +946,7 @@ inline Tdststring encode(common_encoding encoding, const mpt::widestring & src) case common_encoding::cp850: return encode_8bit(src, CharsetTableCP850); break; - case common_encoding::windows1252: + case common_encoding::arch1252: return encode_8bit(src, CharsetTableWindows1252); break; case common_encoding::amiga: @@ -973,7 +973,7 @@ inline Tdststring encode(logical_encoding encoding, const mpt::widestring & src) static_assert(sizeof(typename Tdststring::value_type) == sizeof(char)); static_assert(mpt::is_character::value); #if MPT_OS_WINDOWS - if (windows_has_encoding(encoding)) { + if (arch_has_encoding(encoding)) { return encode_codepage(codepage_from_encoding(encoding), src); } #endif @@ -1032,7 +1032,7 @@ inline mpt::widestring decode(common_encoding encoding, const Tsrcstring & src) static_assert(sizeof(typename Tsrcstring::value_type) == sizeof(char)); static_assert(mpt::is_character::value); #if MPT_OS_WINDOWS - if (windows_has_encoding(encoding)) { + if (arch_has_encoding(encoding)) { return decode_codepage(codepage_from_encoding(encoding), src); } #endif @@ -1055,7 +1055,7 @@ inline mpt::widestring decode(common_encoding encoding, const Tsrcstring & src) case common_encoding::cp850: return decode_8bit(src, CharsetTableCP850); break; - case common_encoding::windows1252: + case common_encoding::arch1252: return decode_8bit(src, CharsetTableWindows1252); break; case common_encoding::amiga: @@ -1082,7 +1082,7 @@ inline mpt::widestring decode(logical_encoding encoding, const Tsrcstring & src) static_assert(sizeof(typename Tsrcstring::value_type) == sizeof(char)); static_assert(mpt::is_character::value); #if MPT_OS_WINDOWS - if (windows_has_encoding(encoding)) { + if (arch_has_encoding(encoding)) { return decode_codepage(codepage_from_encoding(encoding), src); } #endif diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/system_error/system_error.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/system_error/system_error.hpp index c15b5bd62..aeb1b6cf1 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/system_error/system_error.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/system_error/system_error.hpp @@ -22,7 +22,7 @@ #endif // MPT_OS_WINDOWS #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS @@ -36,7 +36,7 @@ inline namespace MPT_INLINE_NS { -namespace windows { +namespace arch { @@ -113,7 +113,7 @@ inline HANDLE CheckFileHANDLE(HANDLE handle) { if ((err == ERROR_NOT_ENOUGH_MEMORY) || (err == ERROR_OUTOFMEMORY)) { mpt::throw_out_of_memory(); } - throw windows::error(err); + throw arch::error(err); } return handle; } @@ -125,7 +125,7 @@ inline HANDLE CheckHANDLE(HANDLE handle) { if ((err == ERROR_NOT_ENOUGH_MEMORY) || (err == ERROR_OUTOFMEMORY)) { mpt::throw_out_of_memory(); } - throw windows::error(err); + throw arch::error(err); } return handle; } @@ -137,7 +137,7 @@ inline void CheckBOOL(BOOL result) { if ((err == ERROR_NOT_ENOUGH_MEMORY) || (err == ERROR_OUTOFMEMORY)) { mpt::throw_out_of_memory(); } - throw windows::error(err); + throw arch::error(err); } } @@ -148,13 +148,13 @@ inline void ExpectError(DWORD expected) { if ((err == ERROR_NOT_ENOUGH_MEMORY) || (err == ERROR_OUTOFMEMORY)) { mpt::throw_out_of_memory(); } - throw windows::error(err); + throw arch::error(err); } } -} // namespace windows +} // namespace arch diff --git a/Src/external_dependencies/openmpt-trunk/src/mpt/uuid/guid.hpp b/Src/external_dependencies/openmpt-trunk/src/mpt/uuid/guid.hpp index b941b7536..0c6917a1c 100644 --- a/Src/external_dependencies/openmpt-trunk/src/mpt/uuid/guid.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/mpt/uuid/guid.hpp @@ -37,7 +37,7 @@ inline namespace MPT_INLINE_NS { // COM CLSID<->string conversion // A CLSID string is not necessarily a standard UUID string, // it might also be a symbolic name for the interface. -// (see CLSIDFromString ( http://msdn.microsoft.com/en-us/library/windows/desktop/ms680589%28v=vs.85%29.aspx )) +// (see CLSIDFromString ( http://msdn.microsoft.com/en-us/library/arch/desktop/ms680589%28v=vs.85%29.aspx )) inline mpt::winstring CLSIDToString(CLSID clsid) { std::wstring str; diff --git a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDevice.hpp b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDevice.hpp index 0f08534f4..20df54400 100644 --- a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDevice.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDevice.hpp @@ -12,7 +12,7 @@ #include "mpt/base/detect.hpp" #include "mpt/base/saturate_round.hpp" #include "mpt/osinfo/class.hpp" -#include "mpt/osinfo/windows_version.hpp" +#include "mpt/osinfo/arch_version.hpp" #include "mpt/string/types.hpp" #include "openmpt/base/FlagSet.hpp" #include "openmpt/base/Types.hpp" @@ -28,7 +28,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS #if defined(MODPLUG_TRACKER) @@ -308,10 +308,10 @@ struct SysInfo { public: mpt::osinfo::osclass SystemClass = mpt::osinfo::osclass::Unknown; - mpt::osinfo::windows::Version WindowsVersion = mpt::osinfo::windows::Version::NoWindows(); + mpt::osinfo::arch::Version WindowsVersion = mpt::osinfo::arch::Version::NoWindows(); bool IsWine = false; mpt::osinfo::osclass WineHostClass = mpt::osinfo::osclass::Unknown; - mpt::osinfo::windows::wine::version WineVersion; + mpt::osinfo::arch::wine::version WineVersion; public: bool IsOriginal() const { return !IsWine; } @@ -326,15 +326,15 @@ public: assert(SystemClass != mpt::osinfo::osclass::Windows); return; } - SysInfo(mpt::osinfo::osclass systemClass, mpt::osinfo::windows::Version windowsVersion) + SysInfo(mpt::osinfo::osclass systemClass, mpt::osinfo::arch::Version archVersion) : SystemClass(systemClass) - , WindowsVersion(windowsVersion) + , WindowsVersion(archVersion) { return; } - SysInfo(mpt::osinfo::osclass systemClass, mpt::osinfo::windows::Version windowsVersion, bool isWine, mpt::osinfo::osclass wineHostClass, mpt::osinfo::windows::wine::version wineVersion) + SysInfo(mpt::osinfo::osclass systemClass, mpt::osinfo::arch::Version archVersion, bool isWine, mpt::osinfo::osclass wineHostClass, mpt::osinfo::arch::wine::version wineVersion) : SystemClass(systemClass) - , WindowsVersion(windowsVersion) + , WindowsVersion(archVersion) , IsWine(isWine) , WineHostClass(wineHostClass) , WineVersion(wineVersion) @@ -461,7 +461,7 @@ struct Flags // wide audio engine. It does not happen for exclusive mode WASAPI streams // or direct WaveRT (labeled WDM-KS in PortAudio) streams. As there is no // known way to disable this annoying behavior, avoid unclipped samples on - // affected windows versions and clip them ourselves before handing them to + // affected arch versions and clip them ourselves before handing them to // the APIs. bool WantsClippedOutput; Flags() diff --git a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceDirectSound.cpp b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceDirectSound.cpp index 5785d4bb2..1ca2da1a4 100644 --- a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceDirectSound.cpp +++ b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceDirectSound.cpp @@ -27,7 +27,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS @@ -86,10 +86,10 @@ static BOOL WINAPI DSEnumCallback(GUID *lpGuid, LPCTSTR lpstrDescription, LPCTST info.useNameAsIdentifier = false; // clang-format off info.flags = { - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::windows::Version::Win7) ? Info::Usability::Usable : Info::Usability::Deprecated : Info::Usability::NotAvailable, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::arch::Version::Win7) ? Info::Usability::Usable : Info::Usability::Deprecated : Info::Usability::NotAvailable, Info::Level::Primary, sysInfo.SystemClass == mpt::osinfo::osclass::Windows && sysInfo.IsWindowsWine() ? Info::Compatible::Yes : Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, Info::Io::OutputOnly, Info::Mixing::Software, Info::Implementor::OpenMPT @@ -143,7 +143,7 @@ SoundDevice::Caps CDSoundDevice::InternalGetDeviceCaps() caps.HasNamedInputSources = false; caps.CanDriverPanel = false; caps.ExclusiveModeDescription = MPT_USTRING("Use primary buffer"); - caps.DefaultSettings.sampleFormat = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) ? SampleFormat::Float32 : SampleFormat::Int16; + caps.DefaultSettings.sampleFormat = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) ? SampleFormat::Float32 : SampleFormat::Int16; IDirectSound *dummy = nullptr; IDirectSound *ds = nullptr; if(m_piDS) @@ -220,7 +220,7 @@ SoundDevice::DynamicCaps CDSoundDevice::GetDeviceDynamicCaps(const std::vector -#include +#include #endif #endif @@ -189,10 +189,10 @@ bool CPortaudioDevice::InternalOpen() framesPerBuffer = paFramesPerBufferUnspecified; // let portaudio choose } else if(m_HostApiType == paMME) { - m_Flags.WantsClippedOutput = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)); + m_Flags.WantsClippedOutput = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)); } else if(m_HostApiType == paDirectSound) { - m_Flags.WantsClippedOutput = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)); + m_Flags.WantsClippedOutput = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)); } else { m_Flags.WantsClippedOutput = false; @@ -219,7 +219,7 @@ bool CPortaudioDevice::InternalOpen() } } else { - if(!GetSysInfo().IsWine && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::Win7)) + if(!GetSysInfo().IsWine && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::Win7)) { // retry with automatic stream format conversion (i.e. resampling) #if MPT_OS_WINDOWS m_WasapiStreamInfo.flags |= paWinWasapiAutoConvert; @@ -452,7 +452,7 @@ SoundDevice::Caps CPortaudioDevice::InternalGetDeviceCaps() caps.DefaultSettings.sampleFormat = SampleFormat::Int32; } else if(m_HostApiType == paDirectSound) { - if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) + if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) { caps.DefaultSettings.sampleFormat = SampleFormat::Float32; } else @@ -464,7 +464,7 @@ SoundDevice::Caps CPortaudioDevice::InternalGetDeviceCaps() if(GetSysInfo().IsWine) { caps.DefaultSettings.sampleFormat = SampleFormat::Int16; - } else if(GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) + } else if(GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) { caps.DefaultSettings.sampleFormat = SampleFormat::Float32; } else @@ -477,13 +477,13 @@ SoundDevice::Caps CPortaudioDevice::InternalGetDeviceCaps() } if(m_HostApiType == paDirectSound) { - if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) + if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) { caps.HasInternalDither = false; } } else if(m_HostApiType == paMME) { - if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) + if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) { caps.HasInternalDither = false; } @@ -529,13 +529,13 @@ SoundDevice::DynamicCaps CPortaudioDevice::GetDeviceDynamicCaps(const std::vecto } if(m_HostApiType == paDirectSound) { - if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) + if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) { caps.supportedSampleFormats = {SampleFormat::Float32}; } } else if(m_HostApiType == paMME) { - if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) + if(GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) { caps.supportedSampleFormats = {SampleFormat::Float32}; } @@ -633,7 +633,7 @@ SoundDevice::DynamicCaps CPortaudioDevice::GetDeviceDynamicCaps(const std::vecto } #endif // MPT_OS_WINDOWS #if MPT_OS_WINDOWS - if((m_HostApiType == paWASAPI) && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::Win7)) + if((m_HostApiType == paWASAPI) && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::Win7)) { caps.supportedSampleRates = baseSampleRates; } @@ -660,7 +660,7 @@ bool CPortaudioDevice::OpenDriverSettings() { return false; } - bool hasVista = GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista); + bool hasVista = GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista); mpt::winstring controlEXE; TCHAR systemDir[MAX_PATH] = {}; if(GetSystemDirectory(systemDir, mpt::saturate_cast(std::size(systemDir))) > 0) @@ -808,10 +808,10 @@ std::vector CPortaudioDevice::EnumerateDevices(ILogger &logge result.apiName = MPT_USTRING("DirectSound"); result.default_ = ((Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == static_cast(dev)) ? Info::Default::Managed : Info::Default::None); result.flags = { - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::windows::Version::Win7) ? Info::Usability::Usable : Info::Usability::Deprecated : Info::Usability::NotAvailable, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::arch::Version::Win7) ? Info::Usability::Usable : Info::Usability::Deprecated : Info::Usability::NotAvailable, Info::Level::Secondary, Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, Info::Io::FullDuplex, Info::Mixing::Software, Info::Implementor::External @@ -821,10 +821,10 @@ std::vector CPortaudioDevice::EnumerateDevices(ILogger &logge result.apiName = MPT_USTRING("MME"); result.default_ = ((Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == static_cast(dev)) ? Info::Default::Named : Info::Default::None); result.flags = { - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::windows::Version::Win7) ? Info::Usability::Usable : Info::Usability::Legacy : Info::Usability::NotAvailable, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::arch::Version::Win7) ? Info::Usability::Usable : Info::Usability::Legacy : Info::Usability::NotAvailable, Info::Level::Secondary, Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, Info::Io::FullDuplex, Info::Mixing::Software, Info::Implementor::External @@ -889,20 +889,20 @@ std::vector CPortaudioDevice::EnumerateDevices(ILogger &logge Info::Usability::Usable, Info::Level::Primary, Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::Windows && sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::windows::Version::WinVista) ? Info::Api::Native : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows && sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::arch::Version::WinVista) ? Info::Api::Native : Info::Api::Emulated, Info::Io::FullDuplex, - sysInfo.SystemClass == mpt::osinfo::osclass::Windows && sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::windows::Version::WinVista) ? Info::Mixing::Hardware : Info::Mixing::Software, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows && sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::arch::Version::WinVista) ? Info::Mixing::Hardware : Info::Mixing::Software, Info::Implementor::External }; break; case paWDMKS: - result.apiName = sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? MPT_USTRING("WaveRT") : MPT_USTRING("WDM-KS"); + result.apiName = sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista) ? MPT_USTRING("WaveRT") : MPT_USTRING("WDM-KS"); result.default_ = ((Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == static_cast(dev)) ? Info::Default::Named : Info::Default::None); result.flags = { - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() ? sysInfo.WindowsVersion.IsBefore(mpt::osinfo::windows::Version::WinVista) ? Info::Usability::Usable : Info::Usability::Usable : Info::Usability::Broken : Info::Usability::NotAvailable, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() ? sysInfo.WindowsVersion.IsBefore(mpt::osinfo::arch::Version::WinVista) ? Info::Usability::Usable : Info::Usability::Usable : Info::Usability::Broken : Info::Usability::NotAvailable, Info::Level::Primary, Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() ? sysInfo.WindowsVersion.IsBefore(mpt::osinfo::windows::Version::WinVista) ? Info::Api::Native : Info::Api::Native : Info::Api::Emulated : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() ? sysInfo.WindowsVersion.IsBefore(mpt::osinfo::arch::Version::WinVista) ? Info::Api::Native : Info::Api::Native : Info::Api::Emulated : Info::Api::Emulated, Info::Io::FullDuplex, Info::Mixing::Hardware, Info::Implementor::External @@ -927,10 +927,10 @@ std::vector CPortaudioDevice::EnumerateDevices(ILogger &logge result.flags = { sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() ? - sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::Win7) ? + sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::Win7) ? Info::Usability::Usable : - sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? + sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista) ? Info::Usability::Experimental : Info::Usability::NotAvailable diff --git a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp index 6f1e1d6fb..cb1ad5434 100644 --- a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp +++ b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp @@ -282,7 +282,7 @@ bool CRtAudioDevice::InternalOpen() m_Flags.WantsClippedOutput = true; } else if(m_RtAudio->getCurrentApi() == RtAudio::Api::WINDOWS_DS) { - m_Flags.WantsClippedOutput = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)); + m_Flags.WantsClippedOutput = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)); } m_RtAudio->openStream((m_OutputStreamParameters.nChannels > 0) ? &m_OutputStreamParameters : nullptr, (m_InputStreamParameters.nChannels > 0) ? &m_InputStreamParameters : nullptr, SampleFormatToRtAudioFormat(m_Settings.sampleFormat), m_Settings.Samplerate, &m_FramesPerChunk, &RtAudioCallback, this, &m_StreamOptions, nullptr); } catch(const RtAudioError &e) @@ -708,10 +708,10 @@ std::vector CRtAudioDevice::EnumerateDevices(ILogger &logger, info.flags = { sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() ? - sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::Win7) ? + sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::Win7) ? Info::Usability::Usable : - sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? + sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista) ? Info::Usability::Experimental : Info::Usability::NotAvailable @@ -747,7 +747,7 @@ std::vector CRtAudioDevice::EnumerateDevices(ILogger &logger, Info::Usability::Broken, // sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::Windows::Version::Win7) ? Info::Usability:Usable : Info::Usability::Deprecated : Info::Usability::NotAvailable, Info::Level::Secondary, Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, Info::Io::FullDuplex, Info::Mixing::Software, Info::Implementor::External diff --git a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceUtilities.cpp b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceUtilities.cpp index 67efc310d..4923f995e 100644 --- a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceUtilities.cpp +++ b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceUtilities.cpp @@ -28,7 +28,7 @@ #include #endif #include -#include +#include #endif // MPT_OS_WINDOWS #if !MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceUtilities.hpp b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceUtilities.hpp index 682348743..de8c2dd31 100644 --- a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceUtilities.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceUtilities.hpp @@ -24,7 +24,7 @@ #if MPT_OS_WINDOWS #include -#include +#include #endif // MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceWaveout.cpp b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceWaveout.cpp index 6665a4bbc..c790843ac 100644 --- a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceWaveout.cpp +++ b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceWaveout.cpp @@ -31,7 +31,7 @@ #include #if MPT_OS_WINDOWS -#include +#include #endif // MPT_OS_WINDOWS @@ -111,7 +111,7 @@ SoundDevice::Caps CWaveDevice::InternalGetDeviceCaps() if(GetSysInfo().IsWine) { caps.DefaultSettings.sampleFormat = SampleFormat::Int16; - } else if(GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) + } else if(GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) { caps.DefaultSettings.sampleFormat = SampleFormat::Float32; } else @@ -126,7 +126,7 @@ SoundDevice::DynamicCaps CWaveDevice::GetDeviceDynamicCaps(const std::vector 0) { // direct mode - if((GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)) || !GetSysInfo().IsOriginal()) + if((GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)) || !GetSysInfo().IsOriginal()) { // emulated on WASAPI, or Wine WAVEOUTCAPS woc = {}; caps.supportedExclusiveModeSampleFormats.clear(); @@ -293,7 +293,7 @@ bool CWaveDevice::InternalOpen() } SetWakeupEvent(m_ThreadWakeupEvent); SetWakeupInterval(m_nWaveBufferSize * 1.0 / m_Settings.GetBytesPerSecond()); - m_Flags.WantsClippedOutput = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista)); + m_Flags.WantsClippedOutput = (GetSysInfo().IsOriginal() && GetSysInfo().WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista)); return true; } @@ -684,10 +684,10 @@ std::vector CWaveDevice::EnumerateDevices(ILogger &logger, So info.default_ = ((index == 0) ? Info::Default::Managed : Info::Default::None); // clang-format off info.flags = { - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::windows::Version::Win7) ? Info::Usability::Usable : Info::Usability::Legacy : Info::Usability::NotAvailable, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsOriginal() && sysInfo.WindowsVersion.IsBefore(mpt::osinfo::arch::Version::Win7) ? Info::Usability::Usable : Info::Usability::Legacy : Info::Usability::NotAvailable, Info::Level::Primary, sysInfo.SystemClass == mpt::osinfo::osclass::Windows && sysInfo.IsWindowsOriginal() ? Info::Compatible::Yes : Info::Compatible::No, - sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, + sysInfo.SystemClass == mpt::osinfo::osclass::Windows ? sysInfo.IsWindowsWine() ? Info::Api::Emulated : sysInfo.WindowsVersion.IsAtLeast(mpt::osinfo::arch::Version::WinVista) ? Info::Api::Emulated : Info::Api::Native : Info::Api::Emulated, Info::Io::OutputOnly, Info::Mixing::Software, Info::Implementor::OpenMPT diff --git a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceWaveout.hpp b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceWaveout.hpp index bf65dfdec..b45dcc32a 100644 --- a/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceWaveout.hpp +++ b/Src/external_dependencies/openmpt-trunk/src/openmpt/sounddevice/SoundDeviceWaveout.hpp @@ -22,7 +22,7 @@ #if MPT_OS_WINDOWS #include -#include +#include #endif // MPT_OS_WINDOWS diff --git a/Src/external_dependencies/openmpt-trunk/test/test.cpp b/Src/external_dependencies/openmpt-trunk/test/test.cpp index 5f226885a..e2f817d39 100644 --- a/Src/external_dependencies/openmpt-trunk/test/test.cpp +++ b/Src/external_dependencies/openmpt-trunk/test/test.cpp @@ -79,7 +79,7 @@ #include #endif #if MPT_OS_WINDOWS -#include +#include #endif #if defined(MPT_WITH_ZLIB) #include @@ -248,7 +248,7 @@ static void RemoveFile(const mpt::PathString &filename) { break; } - // wait for windows virus scanners + // wait for arch virus scanners Sleep(10); } #else diff --git a/Src/external_dependencies/openmpt-trunk/unarchiver/unrar.cpp b/Src/external_dependencies/openmpt-trunk/unarchiver/unrar.cpp index 5aa0491f7..e80b3c624 100644 --- a/Src/external_dependencies/openmpt-trunk/unarchiver/unrar.cpp +++ b/Src/external_dependencies/openmpt-trunk/unarchiver/unrar.cpp @@ -15,7 +15,7 @@ #include "../common/mptFileIO.h" #if MPT_OS_WINDOWS - #include + #include #else // !MPT_OS_WINDOWS #ifdef _UNIX #define MPT_UNRAR_UNIX_WAS_DEFINED diff --git a/Src/f263/f263_static.vcxproj b/Src/f263/f263_static.vcxproj index d8f02e6eb..b776721dd 100644 --- a/Src/f263/f263_static.vcxproj +++ b/Src/f263/f263_static.vcxproj @@ -86,17 +86,17 @@     Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/f263/f263w5s.vcxproj b/Src/f263/f263w5s.vcxproj index 6fbfc2a2a..fb707ff85 100644 --- a/Src/f263/f263w5s.vcxproj +++ b/Src/f263/f263w5s.vcxproj @@ -113,26 +113,26 @@ false - x86-windows-static-md + x86-arch-static-md     false - x86-windows-static-md + x86-arch-static-md false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/filereader/ProgressiveHTTPReader.cpp b/Src/filereader/ProgressiveHTTPReader.cpp index 16ad697ab..e98186992 100644 --- a/Src/filereader/ProgressiveHTTPReader.cpp +++ b/Src/filereader/ProgressiveHTTPReader.cpp @@ -14,7 +14,7 @@ use content-disposition for filename, if available (instead of temp filename) */ #include "ProgressiveHTTPReader.h" -#include +#include int ProgressiveHTTPReader::isMine(const wchar_t *filename, int mode) { diff --git a/Src/filereader/ProgressiveHTTPReader.h b/Src/filereader/ProgressiveHTTPReader.h index 7f4e61595..8adc7c3f3 100644 --- a/Src/filereader/ProgressiveHTTPReader.h +++ b/Src/filereader/ProgressiveHTTPReader.h @@ -2,7 +2,7 @@ #define NULLSOFT_PROGRESSIVEHTTPREADER_H #include -#include +#include class ProgressiveHTTPReader : public svc_fileReader { diff --git a/Src/filereader/filereader.vcxproj b/Src/filereader/filereader.vcxproj index c7a506304..06a3ffc55 100644 --- a/Src/filereader/filereader.vcxproj +++ b/Src/filereader/filereader.vcxproj @@ -91,17 +91,17 @@ false Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/freetypewac/freetypewac.vcxproj b/Src/freetypewac/freetypewac.vcxproj index 674390d59..a06d67e61 100644 --- a/Src/freetypewac/freetypewac.vcxproj +++ b/Src/freetypewac/freetypewac.vcxproj @@ -100,26 +100,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md     false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/gif/gif.vcxproj b/Src/gif/gif.vcxproj index b8b9ff186..c55fc363a 100644 --- a/Src/gif/gif.vcxproj +++ b/Src/gif/gif.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/gracenote/gracenote.vcxproj b/Src/gracenote/gracenote.vcxproj index af2d048a0..0f83b077e 100644 --- a/Src/gracenote/gracenote.vcxproj +++ b/Src/gracenote/gracenote.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/h264/h264.vcxproj b/Src/h264/h264.vcxproj index 8aa88689a..513299efe 100644 --- a/Src/h264/h264.vcxproj +++ b/Src/h264/h264.vcxproj @@ -90,16 +90,16 @@ Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/h264dec/lcommon/inc/win32.h b/Src/h264dec/lcommon/inc/win32.h index 09ffef61f..3009d267e 100644 --- a/Src/h264dec/lcommon/inc/win32.h +++ b/Src/h264dec/lcommon/inc/win32.h @@ -25,7 +25,7 @@ # include # include # include -# include +# include #ifndef strcasecmp # define strcasecmp _strcmpi #endif diff --git a/Src/h264dec/ldecod_vc9.vcxproj b/Src/h264dec/ldecod_vc9.vcxproj index ad81b0c30..8a6cc0b94 100644 --- a/Src/h264dec/ldecod_vc9.vcxproj +++ b/Src/h264dec/ldecod_vc9.vcxproj @@ -135,17 +135,17 @@ Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/id3v2/id3_field.cpp b/Src/id3v2/id3_field.cpp index 4b21cb777..6d3ccc0fc 100644 --- a/Src/id3v2/id3_field.cpp +++ b/Src/id3v2/id3_field.cpp @@ -12,7 +12,7 @@ // improved/optimized/whatever 10/30/00 JF -#include +#include #include #include "id3_field.h" diff --git a/Src/id3v2/id3_field_binary.cpp b/Src/id3v2/id3_field_binary.cpp index 47c51be63..e05091144 100644 --- a/Src/id3v2/id3_field_binary.cpp +++ b/Src/id3v2/id3_field_binary.cpp @@ -11,7 +11,7 @@ // Mon Nov 23 18:34:01 1998 // improved/optimized/whatever 10/30/00 JF -#include +#include #include #include #include "id3_field.h" diff --git a/Src/id3v2/id3_field_string_unicode.cpp b/Src/id3v2/id3_field_string_unicode.cpp index 4e84943d3..6db50e87d 100644 --- a/Src/id3v2/id3_field_string_unicode.cpp +++ b/Src/id3v2/id3_field_string_unicode.cpp @@ -17,7 +17,7 @@ #include #include #include "id3_field.h" -#include +#include #include "../Plugins/Input/in_mp3/config.h" // TODO: cut #include "id3_misc_support.h" diff --git a/Src/id3v2/id3_tag.h b/Src/id3v2/id3_tag.h index cb2192974..a9ced1005 100644 --- a/Src/id3v2/id3_tag.h +++ b/Src/id3v2/id3_tag.h @@ -14,7 +14,7 @@ #ifndef ID3LIB_TAG_H #define ID3LIB_TAG_H -#include +#include #include #include #include "id3_types.h" diff --git a/Src/id3v2/id3_tag_file.cpp b/Src/id3v2/id3_tag_file.cpp index 984be30eb..dd6fb95eb 100644 --- a/Src/id3v2/id3_tag_file.cpp +++ b/Src/id3v2/id3_tag_file.cpp @@ -10,7 +10,7 @@ // // Mon Nov 23 18:34:01 1998 -#include +#include #include #include "id3_tag.h" diff --git a/Src/id3v2/id3_tag_parse.cpp b/Src/id3v2/id3_tag_parse.cpp index 77734bcf8..80a631049 100644 --- a/Src/id3v2/id3_tag_parse.cpp +++ b/Src/id3v2/id3_tag_parse.cpp @@ -11,7 +11,7 @@ // Mon Nov 23 18:34:01 1998 -#include +#include #include #include #include diff --git a/Src/id3v2/id3_tag_render.cpp b/Src/id3v2/id3_tag_render.cpp index 3e30167f1..57998600c 100644 --- a/Src/id3v2/id3_tag_render.cpp +++ b/Src/id3v2/id3_tag_render.cpp @@ -15,7 +15,7 @@ #include #include "id3_tag.h" #include "id3_misc_support.h" -#include +#include diff --git a/Src/id3v2/id3v2.vcxproj b/Src/id3v2/id3v2.vcxproj index 1ec49196d..d3e9cd964 100644 --- a/Src/id3v2/id3v2.vcxproj +++ b/Src/id3v2/id3v2.vcxproj @@ -89,26 +89,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md false diff --git a/Src/ie_plugin/IWinamp.h b/Src/ie_plugin/IWinamp.h index 40fd1a81f..f2bffea72 100644 --- a/Src/ie_plugin/IWinamp.h +++ b/Src/ie_plugin/IWinamp.h @@ -32,7 +32,7 @@ #endif // __RPCNDR_H_VERSION__ #ifndef COM_NO_WINDOWS_H -#include "windows.h" +#include "arch.h" #include "ole2.h" #endif /*COM_NO_WINDOWS_H*/ diff --git a/Src/ie_plugin/main.cpp b/Src/ie_plugin/main.cpp index 4a8a8f7b7..55f59be4a 100644 --- a/Src/ie_plugin/main.cpp +++ b/Src/ie_plugin/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Winamp.h" #include "resource.h" #include "WinampFactory.h" diff --git a/Src/installer/shared/ui/miniui/resource.h b/Src/installer/shared/ui/miniui/resource.h index baeee9361..ac0df2cab 100644 --- a/Src/installer/shared/ui/miniui/resource.h +++ b/Src/installer/shared/ui/miniui/resource.h @@ -1,4 +1,4 @@ -#include +#include #ifndef IDC_STATIC #define IDC_STATIC (-1) diff --git a/Src/installer/shared/ui/miniui/ui.c b/Src/installer/shared/ui/miniui/ui.c index a426499de..7b87e4f83 100644 --- a/Src/installer/shared/ui/miniui/ui.c +++ b/Src/installer/shared/ui/miniui/ui.c @@ -1,13 +1,13 @@ // ui.cpp : Defines the entry point for the application. // -#include +#include #include "resource.h" HINSTANCE g_hInstance; HWND m_curwnd; -LPTSTR windows[] = { +LPTSTR arch[] = { MAKEINTRESOURCE(IDD_LICENSE), MAKEINTRESOURCE(IDD_SELCOM), MAKEINTRESOURCE(IDD_DIR), @@ -45,12 +45,12 @@ BOOL CALLBACK DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { i++; break; } - if (i >= (int)sizeof(windows)/sizeof(char*)) { + if (i >= (int)sizeof(arch)/sizeof(char*)) { i--; break; } if (m_curwnd) DestroyWindow(m_curwnd); - m_curwnd=CreateDialog(g_hInstance,windows[i],hwndDlg,GenericProc); + m_curwnd=CreateDialog(g_hInstance,arch[i],hwndDlg,GenericProc); if (m_curwnd) { RECT r; diff --git a/Src/installer/winamp/languages/installer_de-de.nsh b/Src/installer/winamp/languages/installer_de-de.nsh index 4d92d6066..c28e69694 100644 --- a/Src/installer/winamp/languages/installer_de-de.nsh +++ b/Src/installer/winamp/languages/installer_de-de.nsh @@ -51,7 +51,7 @@ ${LangFileString} secAACE "HE-AAC-Enkoder" ${LangFileString} secMP3E "MP3-Enkoder" ${LangFileString} secMP4E "MP4-Unterstützung" ${LangFileString} secWMAE "WMA-Enkoder" -${LangFileString} msgWMAError "Beim Installieren der Komponenten ist ein Problem aufgetreten. Der WMA Kodierer wird nicht installiert. Bitte besuchen Sie http://www.microsoft.com/windows/windowsmedia/9series/encoder/, laden Sie den Kodierer herunter und versuchen Sie es erneut." +${LangFileString} msgWMAError "Beim Installieren der Komponenten ist ein Problem aufgetreten. Der WMA Kodierer wird nicht installiert. Bitte besuchen Sie http://www.microsoft.com/arch/archmedia/9series/encoder/, laden Sie den Kodierer herunter und versuchen Sie es erneut." ${LangFileString} secCDDA "CD Wiedergabe und Extraktion" ${LangFileString} msgCDError "Beim Installieren der Komponenten ist ein Problem aufgetreten. Das CD Rippen/Brennen funktioniert möglicherweise nicht richtig. " ${LangFileString} secCDDB "CDDB für Audio-CDs" diff --git a/Src/installer/winamp/languages/installer_en-us.nsh b/Src/installer/winamp/languages/installer_en-us.nsh index 99d3214a6..7501d1ff1 100644 --- a/Src/installer/winamp/languages/installer_en-us.nsh +++ b/Src/installer/winamp/languages/installer_en-us.nsh @@ -67,7 +67,7 @@ ${LangFileString} secAACE "HE-AAC encoding" ${LangFileString} secMP3E "MP3 encoding" ${LangFileString} secMP4E "MP4 support" ${LangFileString} secWMAE "WMA encoding" -${LangFileString} msgWMAError "There was a problem installing components. WMA Encoder will not be installed. Please visit http://www.microsoft.com/windows/windowsmedia/9series/encoder/ , download the encoder and try again." +${LangFileString} msgWMAError "There was a problem installing components. WMA Encoder will not be installed. Please visit http://www.microsoft.com/arch/archmedia/9series/encoder/ , download the encoder and try again." ${LangFileString} secCDDA "CD playback and extraction" ${LangFileString} msgCDError "There was a problem installing components. CD Ripping/Burning may not function properly." ${LangFileString} secCDDB "CDDB for recognizing CDs" diff --git a/Src/installer/winamp/languages/installer_es-us.nsh b/Src/installer/winamp/languages/installer_es-us.nsh index c009b619e..386c734f7 100644 --- a/Src/installer/winamp/languages/installer_es-us.nsh +++ b/Src/installer/winamp/languages/installer_es-us.nsh @@ -84,7 +84,7 @@ ${LangFileString} secAACE "Codificación de HE-AAC" ${LangFileString} secMP3E "Codificación MP3" ${LangFileString} secMP4E "Compatibilidad con MP4" ${LangFileString} secWMAE "Codificación WMA" -${LangFileString} msgWMAError "Se ha producido un problema al instalar los componentes. No se instalará el codificador de WMA. Visite la página http://www.microsoft.com/windows/windowsmedia/9series/encoder/ , descargue el codificador e inténtelo de nuevo." +${LangFileString} msgWMAError "Se ha producido un problema al instalar los componentes. No se instalará el codificador de WMA. Visite la página http://www.microsoft.com/arch/archmedia/9series/encoder/ , descargue el codificador e inténtelo de nuevo." ${LangFileString} secCDDA "Extracción y reproducción de CD" ${LangFileString} msgCDError "Se ha producido un problema en la instalación de los componentes. Es posible que la grabación de CD no funcione correctamente." ${LangFileString} secCDDB "CDDB para reconocer CDs" diff --git a/Src/installer/winamp/languages/installer_fr-fr-cmty.nsh b/Src/installer/winamp/languages/installer_fr-fr-cmty.nsh index bc3f52edc..14bef489e 100644 --- a/Src/installer/winamp/languages/installer_fr-fr-cmty.nsh +++ b/Src/installer/winamp/languages/installer_fr-fr-cmty.nsh @@ -44,7 +44,7 @@ ${LangFileString} secAACE "Encodage AAC/aacPlus" ${LangFileString} secMP3E "Encodage MP3" ${LangFileString} secMP4E "Support du MP4" ${LangFileString} secWMAE "Encodage WMA" -${LangFileString} msgWMAError "Un problème est survenu lors de l'installation des composants. L'encodage WMA ne sera pas installé. Veuillez visiter http://www.microsoft.com/windows/windowsmedia/forpros/encoder/default.mspx , téléchargez l'encodeur et réessayez." +${LangFileString} msgWMAError "Un problème est survenu lors de l'installation des composants. L'encodage WMA ne sera pas installé. Veuillez visiter http://www.microsoft.com/arch/archmedia/forpros/encoder/default.mspx , téléchargez l'encodeur et réessayez." ${LangFileString} secCDDA "Lecture et extraction de CD" ${LangFileString} msgCDError "Un problème est survenu lors de l'installation des composants. L'extraction/gravure CD peut ne pas fonctionner correctement. " ${LangFileString} secCDDB "CDDB pour la reconnaissance des CDs" diff --git a/Src/installer/winamp/languages/installer_fr-fr.nsh b/Src/installer/winamp/languages/installer_fr-fr.nsh index 88c0888fa..a1a621a42 100644 --- a/Src/installer/winamp/languages/installer_fr-fr.nsh +++ b/Src/installer/winamp/languages/installer_fr-fr.nsh @@ -124,7 +124,7 @@ ${LangFileString} secAACE "Encodage HE-AAC" ${LangFileString} secMP3E "Encodage MP3" ${LangFileString} secMP4E "Support du MP4" ${LangFileString} secWMAE "Encodage WMA" -${LangFileString} msgWMAError "Un problème est survenu lors de l'installation des composants. L'encodage WMA ne sera pas installé. Veuillez visiter http://www.microsoft.com/windows/windowsmedia/forpros/encoder/default.mspx , téléchargez l'encodeur et réessayez." +${LangFileString} msgWMAError "Un problème est survenu lors de l'installation des composants. L'encodage WMA ne sera pas installé. Veuillez visiter http://www.microsoft.com/arch/archmedia/forpros/encoder/default.mspx , téléchargez l'encodeur et réessayez." ${LangFileString} secCDDA "Lecture et extraction de CD" ${LangFileString} msgCDError "Un problème est survenu lors de l'installation des composants. L'extraction/gravure CD peut ne pas fonctionner correctement. " ${LangFileString} secCDDB "CDDB pour la reconnaissance des CD" diff --git a/Src/installer/winamp/languages/installer_id-id.nsh b/Src/installer/winamp/languages/installer_id-id.nsh index e34b5c8d5..4078990c8 100644 --- a/Src/installer/winamp/languages/installer_id-id.nsh +++ b/Src/installer/winamp/languages/installer_id-id.nsh @@ -54,7 +54,7 @@ ${LangFileString} secAACE "Pengkodean HE-AAC" ${LangFileString} secMP3E "Pengkodean MP3" ${LangFileString} secMP4E "Dukungan MP4" ${LangFileString} secWMAE "Pengkodean WMA" -${LangFileString} msgWMAError "Ada masalah memasang komponen. Pengkodean WMA tidak akan dipasang. Mohon kunjungi http://www.microsoft.com/windows/windowsmedia/9series/encoder/ , unduh pengkodean dan coba lagi." +${LangFileString} msgWMAError "Ada masalah memasang komponen. Pengkodean WMA tidak akan dipasang. Mohon kunjungi http://www.microsoft.com/arch/archmedia/9series/encoder/ , unduh pengkodean dan coba lagi." ${LangFileString} secCDDA "Pemutaran dan extraksi CD" ${LangFileString} msgCDError "Ada masalah memasang komponen. Perobekan/Pembakaran CD mungkin tidak berfungsi dengan baik." ${LangFileString} secCDDB "CDDB untuk mengenali CD" diff --git a/Src/installer/winamp/languages/installer_it-it.nsh b/Src/installer/winamp/languages/installer_it-it.nsh index 36bbec611..362bf677a 100644 --- a/Src/installer/winamp/languages/installer_it-it.nsh +++ b/Src/installer/winamp/languages/installer_it-it.nsh @@ -114,7 +114,7 @@ ${LangFileString} secAACE "Codifica HE-AAC" ${LangFileString} secMP3E "Codifica MP3" ${LangFileString} secMP4E "Supporto MP4" ${LangFileString} secWMAE "Codifica WMA" -${LangFileString} msgWMAError "Si era verificato un problema durante l'installazione dei componenti. Il codificatore WMA non sarà installato. Si prega di visitare il sito http://www.microsoft.com/windows/windowsmedia/9series/encoder/ , scarica il codificatore e riprova di nuovo." +${LangFileString} msgWMAError "Si era verificato un problema durante l'installazione dei componenti. Il codificatore WMA non sarà installato. Si prega di visitare il sito http://www.microsoft.com/arch/archmedia/9series/encoder/ , scarica il codificatore e riprova di nuovo." ${LangFileString} secCDDA "Riproduzione ed estrazione di CD" ${LangFileString} msgCDError "Si è verificato un problema durante l'installazione dei componenti. L'estrazione/masterizzazione del CD potrebbe non funzionare correttamente. " ${LangFileString} secCDDB "CDDB per il riconoscimento dei CD" diff --git a/Src/installer/winamp/languages/installer_ja-jp.nsh b/Src/installer/winamp/languages/installer_ja-jp.nsh index 670d94b5b..97576d411 100644 --- a/Src/installer/winamp/languages/installer_ja-jp.nsh +++ b/Src/installer/winamp/languages/installer_ja-jp.nsh @@ -53,7 +53,7 @@ ${LangFileString} secAACE "HE-AAC エンコード" ${LangFileString} secMP3E "MP3 エンコード" ${LangFileString} secMP4E "MP4 サポート" ${LangFileString} secWMAE "WMA エンコード" -${LangFileString} msgWMAError "コンポーネントのインストール中に問題が発生しました。WMA エンコーダはインストールされませんでした。http://www.microsoft.com/windows/windowsmedia/9series/encoder/ を参照してエンコーダをダウンロードしてもう一度試してください。" +${LangFileString} msgWMAError "コンポーネントのインストール中に問題が発生しました。WMA エンコーダはインストールされませんでした。http://www.microsoft.com/arch/archmedia/9series/encoder/ を参照してエンコーダをダウンロードしてもう一度試してください。" ${LangFileString} secCDDA "CDの再生とリッピング" ${LangFileString} msgCDError "コンポーネントのインストール中に問題が発生しました。リッピング/CD書き込みはきちんと機能しないかもしれません。" ${LangFileString} secCDDB "CD識別のためのCDDB" diff --git a/Src/installer/winamp/languages/installer_ko-kr.nsh b/Src/installer/winamp/languages/installer_ko-kr.nsh index 0c0457eee..b7b22c546 100644 --- a/Src/installer/winamp/languages/installer_ko-kr.nsh +++ b/Src/installer/winamp/languages/installer_ko-kr.nsh @@ -69,7 +69,7 @@ ${LangFileString} secAACE "AAC/aacPlus 인코딩" ${LangFileString} secMP3E "MP3 인코딩" ${LangFileString} secMP4E "MP4 지원" ${LangFileString} secWMAE "WMA 인코딩" -${LangFileString} msgWMAError "구성요소를 설치하는 데 문제가 발생했습니다. WMA 인코더가 설치되지 않습니다. http://www.microsoft.com/windows/windowsmedia/9series/encoder/에서 인코더를 다운로드한 후 다시 시도하십시오." +${LangFileString} msgWMAError "구성요소를 설치하는 데 문제가 발생했습니다. WMA 인코더가 설치되지 않습니다. http://www.microsoft.com/arch/archmedia/9series/encoder/에서 인코더를 다운로드한 후 다시 시도하십시오." ${LangFileString} secCDDA "CD 재생 및 추출" ${LangFileString} msgCDError "구성요소를 설치하는 데 문제가 발생했습니다. CD 변환/굽기가 올바로 작동하지 않을 수 있습니다. " ${LangFileString} secCDDB "CD를 인식하기 위한 CDDB" diff --git a/Src/installer/winamp/languages/installer_nl-nl.nsh b/Src/installer/winamp/languages/installer_nl-nl.nsh index 6a006676c..36668e28e 100644 --- a/Src/installer/winamp/languages/installer_nl-nl.nsh +++ b/Src/installer/winamp/languages/installer_nl-nl.nsh @@ -90,7 +90,7 @@ ${LangFileString} secAACE "HE-AAC-codering" ${LangFileString} secMP3E "MP3-codering" ${LangFileString} secMP4E "MP4-ondersteuning" ${LangFileString} secWMAE "WMA-codering" -${LangFileString} msgWMAError "Er is een probleem opgetreden bij de installatie van bepaalde componenten. De WMA-encoder zal niet worden geïnstalleerd. Ga naar http://www.microsoft.com/windows/windowsmedia/9series/encoder/ , download de encoder en probeer het opnieuw." +${LangFileString} msgWMAError "Er is een probleem opgetreden bij de installatie van bepaalde componenten. De WMA-encoder zal niet worden geïnstalleerd. Ga naar http://www.microsoft.com/arch/archmedia/9series/encoder/ , download de encoder en probeer het opnieuw." ${LangFileString} secCDDA "Afspelen en extraheren van cd's" ${LangFileString} msgCDError "Er is een probleem opgetreden bij de installatie van bepaalde componenten. Het rippen en branden van cd's zal mogelijk niet correct functioneren. " ${LangFileString} secCDDB "CDDB voor herkenning van cd's" diff --git a/Src/installer/winamp/languages/installer_pl-pl.nsh b/Src/installer/winamp/languages/installer_pl-pl.nsh index c1abb50a9..d1bc332c3 100644 --- a/Src/installer/winamp/languages/installer_pl-pl.nsh +++ b/Src/installer/winamp/languages/installer_pl-pl.nsh @@ -66,7 +66,7 @@ ${LangFileString} secAACE "Kodowanie HE-AAC" ${LangFileString} secMP3E "Kodowanie MP3" ${LangFileString} secMP4E "Obsługa formatu MP4" ${LangFileString} secWMAE "Kodowanie WMA" -${LangFileString} msgWMAError "Wystąpiły błędy podczas instalacji składników. Koder WMA nie zostanie zainstalowany. Odwiedź stronę http://www.microsoft.com/windows/windowsmedia/9series/encoder/ , pobierz koder i spróbuj ponownie." +${LangFileString} msgWMAError "Wystąpiły błędy podczas instalacji składników. Koder WMA nie zostanie zainstalowany. Odwiedź stronę http://www.microsoft.com/arch/archmedia/9series/encoder/ , pobierz koder i spróbuj ponownie." ${LangFileString} secCDDA "Odtwarzanie i zgrywanie płyt CD" ${LangFileString} msgCDError "Wystąpiły błędy podczas instalowania składników. Zgrywanie/nagrywanie płyt CD może działać nieprawidłowo. " ${LangFileString} secCDDB "Baza CDDB do rozpoznawania płyt CD" diff --git a/Src/installer/winamp/languages/installer_pt-br.nsh b/Src/installer/winamp/languages/installer_pt-br.nsh index f07aa6614..d5a4ab97c 100644 --- a/Src/installer/winamp/languages/installer_pt-br.nsh +++ b/Src/installer/winamp/languages/installer_pt-br.nsh @@ -65,7 +65,7 @@ ${LangFileString} secAACE "Codificação HE-AAC" ${LangFileString} secMP3E "Codificação MP3" ${LangFileString} secMP4E "Suporte MP4" ${LangFileString} secWMAE "Codificação WMA" -${LangFileString} msgWMAError "Há um problema nos componentes instalados. Codificador WMA não está instalado. Por favor visite http://www.microsoft.com/windows/windowsmedia/9series/encoder/ , baixe o codificador e tente novamente." +${LangFileString} msgWMAError "Há um problema nos componentes instalados. Codificador WMA não está instalado. Por favor visite http://www.microsoft.com/arch/archmedia/9series/encoder/ , baixe o codificador e tente novamente." ${LangFileString} secCDDA "Reprodução e extração do CD" ${LangFileString} msgCDError "Há um problema nos componentes instalados. Gravar/Ripar CD pode não funcionar corretamente." ${LangFileString} secCDDB "CDDB para identificar CDs" diff --git a/Src/installer/winamp/languages/installer_ro-ro.nsh b/Src/installer/winamp/languages/installer_ro-ro.nsh index 13807eca3..502a19bce 100644 --- a/Src/installer/winamp/languages/installer_ro-ro.nsh +++ b/Src/installer/winamp/languages/installer_ro-ro.nsh @@ -114,7 +114,7 @@ ${LangFileString} secAACE "HE-AAC" ${LangFileString} secMP3E "MP3" ${LangFileString} secMP4E "MP4" ${LangFileString} secWMAE "WMA" -${LangFileString} msgWMAError "A survenit o problemă în timpul instalării componentelor. Codorul WMA nu va fi instalat. Vizitați http://www.microsoft.com/windows/windowsmedia/9series/encoder/, descărcați codorul și încercați din nou." +${LangFileString} msgWMAError "A survenit o problemă în timpul instalării componentelor. Codorul WMA nu va fi instalat. Vizitați http://www.microsoft.com/arch/archmedia/9series/encoder/, descărcați codorul și încercați din nou." ${LangFileString} secCDDA "CDA (CD audio)" ${LangFileString} msgCDError "A survenit o problemă în timpul instalării componentelor. E posibil ca extragerea/inscripționarea CD-urilor să nu funcționeze corespunzător." ${LangFileString} secCDDB "Recunoaștere CD-uri" diff --git a/Src/installer/winamp/languages/installer_ru-ru.nsh b/Src/installer/winamp/languages/installer_ru-ru.nsh index 7df9c46f5..7bba42875 100644 --- a/Src/installer/winamp/languages/installer_ru-ru.nsh +++ b/Src/installer/winamp/languages/installer_ru-ru.nsh @@ -66,7 +66,7 @@ ${LangFileString} secAACE "HE-AAC" ${LangFileString} secMP3E "MP3" ${LangFileString} secMP4E "MP4" ${LangFileString} secWMAE "WMA" -${LangFileString} msgWMAError "При установке некоторых компонентов возникли проблемы. Не удалось установить кодер Windows Media Audio. Чтобы загрузить и установить его вручную, перейдите по адресу http://www.microsoft.com/windows/windowsmedia/9series/encoder и повторите попытку" +${LangFileString} msgWMAError "При установке некоторых компонентов возникли проблемы. Не удалось установить кодер Windows Media Audio. Чтобы загрузить и установить его вручную, перейдите по адресу http://www.microsoft.com/arch/archmedia/9series/encoder и повторите попытку" ${LangFileString} secCDDA "Аудиодиски" ${LangFileString} msgCDError "При установке некоторых компонентов возникли проблемы. Не исключено, что при копировании или записи аудиодисков могут происходить ошибки" ${LangFileString} secCDDB "CDDB для распознавания аудиодисков" diff --git a/Src/installer/winamp/languages/installer_sv-se.nsh b/Src/installer/winamp/languages/installer_sv-se.nsh index e8f4f21cf..5ab0f8f6c 100644 --- a/Src/installer/winamp/languages/installer_sv-se.nsh +++ b/Src/installer/winamp/languages/installer_sv-se.nsh @@ -49,7 +49,7 @@ ${LangFileString} secAACE "HE-AAC-kodning" ${LangFileString} secMP3E "MP3-kodning" ${LangFileString} secMP4E "MP4-stöd" ${LangFileString} secWMAE "WMA-kodning" -${LangFileString} msgWMAError "Det inträffade ett fel när komponenter installerades. WMA Encoder installeras inte. Gå till http://www.microsoft.com/windows/windowsmedia/9series/encoder/, hämta kodaren och försök igen." +${LangFileString} msgWMAError "Det inträffade ett fel när komponenter installerades. WMA Encoder installeras inte. Gå till http://www.microsoft.com/arch/archmedia/9series/encoder/, hämta kodaren och försök igen." ${LangFileString} secCDDA "Uppspelning och extrahering av CD-skivor" ${LangFileString} msgCDError "Det inträffade ett fel när komponenter installerades. CD Rip Burn kanske inte fungerar korrekt." ${LangFileString} secCDDB "CDDB för identifiering av CD-skivor" diff --git a/Src/installer/winamp/languages/installer_tr-tr.nsh b/Src/installer/winamp/languages/installer_tr-tr.nsh index 4966c00fc..53da6569c 100644 --- a/Src/installer/winamp/languages/installer_tr-tr.nsh +++ b/Src/installer/winamp/languages/installer_tr-tr.nsh @@ -53,7 +53,7 @@ ${LangFileString} secAACE "AAC/aacPlus biçiminde dosya oluşturma desteği" ${LangFileString} secMP3E "MP3 biçiminde dosya oluşturma desteği" ${LangFileString} secMP4E "MP4 desteği" ${LangFileString} secWMAE "WMA biçiminde dosya oluşturma desteği" -${LangFileString} msgWMAError "Bileşenler kurulurken bir sorun oluştu. WMA Kodlayıcı kurulamadı. Lütfen http://www.microsoft.com/windows/windowsmedia/9series/encoder/ web sitesinden kodlayıcıyı indirin ve tekrar deneyin." +${LangFileString} msgWMAError "Bileşenler kurulurken bir sorun oluştu. WMA Kodlayıcı kurulamadı. Lütfen http://www.microsoft.com/arch/archmedia/9series/encoder/ web sitesinden kodlayıcıyı indirin ve tekrar deneyin." ${LangFileString} secCDDA "CD yürütme ve çıkarma" ${LangFileString} msgCDError "Bileşenler yüklenirken bir sorun oluştu. CD Kopyalama/Yazma tam anlamıyla çalışmadı." ${LangFileString} secCDDB "CD'ler için CDDB desteği" diff --git a/Src/installer/winamp/languages/installer_zh-cn.nsh b/Src/installer/winamp/languages/installer_zh-cn.nsh index 5de0706af..60a41474f 100644 --- a/Src/installer/winamp/languages/installer_zh-cn.nsh +++ b/Src/installer/winamp/languages/installer_zh-cn.nsh @@ -58,7 +58,7 @@ ${LangFileString} secAACE "AAC/aacPlus 编码" ${LangFileString} secMP3E "MP3 编码" ${LangFileString} secMP4E "MP4 支持" ${LangFileString} secWMAE "WMA 编码" -${LangFileString} msgWMAError "安装组件时出现问题。将不会安装 WMA 编码器。请访问 http://www.microsoft.com/windows/windowsmedia/9series/encoder/，下载该编码器并重试。" +${LangFileString} msgWMAError "安装组件时出现问题。将不会安装 WMA 编码器。请访问 http://www.microsoft.com/arch/archmedia/9series/encoder/，下载该编码器并重试。" ${LangFileString} secCDDA "CD 播放和提取" ${LangFileString} msgCDError "安装组件时出现问题。CD 翻录/刻录可能无法正常运行。" ${LangFileString} secCDDB "用于识别 CD 的 CDDB" diff --git a/Src/installer/winamp/languages/installer_zh-tw.nsh b/Src/installer/winamp/languages/installer_zh-tw.nsh index 934b66f8a..89a19253a 100644 --- a/Src/installer/winamp/languages/installer_zh-tw.nsh +++ b/Src/installer/winamp/languages/installer_zh-tw.nsh @@ -68,7 +68,7 @@ ${LangFileString} secAACE "AAC/aacPlus 編碼" ${LangFileString} secMP3E "MP3 編碼" ${LangFileString} secMP4E "支援 MP4" ${LangFileString} secWMAE "WMA 編碼" -${LangFileString} msgWMAError "安裝元件時出現問題。不會安裝 WMA Encoder。 請造訪 http://www.microsoft.com/windows/windowsmedia/9series/encoder/，下載編碼器並再試一次。" +${LangFileString} msgWMAError "安裝元件時出現問題。不會安裝 WMA Encoder。 請造訪 http://www.microsoft.com/arch/archmedia/9series/encoder/，下載編碼器並再試一次。" ${LangFileString} secCDDA "CD 播放和擷取" ${LangFileString} msgCDError "安裝元件時出現問題。CD 擷取/燒錄可能未正常運作。" ${LangFileString} secCDDB "辨識 CD 的 CDDB" diff --git a/Src/installer/winamp/sections/grp_walib_pmp.nsh b/Src/installer/winamp/sections/grp_walib_pmp.nsh index 51a6720c1..80acdd57e 100644 --- a/Src/installer/winamp/sections/grp_walib_pmp.nsh +++ b/Src/installer/winamp/sections/grp_walib_pmp.nsh @@ -48,7 +48,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\${WINAMP}MTPHandler" "CLSIDForCancel" "{7DE5C6C7-DAF2-42F9-9324-C8CF4E7E8AC5}" WriteRegStr HKEY_CLASSES_ROOT "AppID\{7DE5C6C7-DAF2-42F9-9324-C8CF4E7E8AC5}" "" "${WINAMP}" WriteRegStr HKEY_CLASSES_ROOT "AppID\{7DE5C6C7-DAF2-42F9-9324-C8CF4E7E8AC5}" "RunAs" "Interactive User" - ; If no "AccessPermission" & "LaunchPermission" RegStr (REG_BINARY) values exist, then Windows will use default values instead ~ Ref: http://msdn.microsoft.com/en-gb/library/windows/desktop/ms688679%28v%3Dvs.85%29.aspx + ; If no "AccessPermission" & "LaunchPermission" RegStr (REG_BINARY) values exist, then Windows will use default values instead ~ Ref: http://msdn.microsoft.com/en-gb/library/arch/desktop/ms688679%28v%3Dvs.85%29.aspx ${WinampSectionEnd} ; <<< [PlayForSure] !endif !endif ; WINAMP64 diff --git a/Src/installer/winamp/sections/winamp.nsh b/Src/installer/winamp/sections/winamp.nsh index 266742ce8..bbd2129f7 100644 --- a/Src/installer/winamp/sections/winamp.nsh +++ b/Src/installer/winamp/sections/winamp.nsh @@ -189,9 +189,9 @@ ${WinampSection} "winampApplication" $(secWinamp) IDX_SEC_WINAMP ; <<< ; delete the Qt5 engine files Delete "$INSTDIR\Qt5Core.dll" Delete "$INSTDIR\Qt5Network.dll" - Delete "$INSTDIR\platforms\qwindows.dll" + Delete "$INSTDIR\platforms\qarch.dll" RMDir "$INSTDIR\platforms" - Delete "$INSTDIR\printsupport\windowsprintersupport.dll" + Delete "$INSTDIR\printsupport\archprintersupport.dll" RMDir "$INSTDIR\printsupport" Delete "$INSTDIR\QtPositioning\declarative_positioning.dll" RMDir "$INSTDIR\QtPositioning" diff --git a/Src/installer/winamp/uninstall/player.nsh b/Src/installer/winamp/uninstall/player.nsh index 049abdaf2..a27d75d6e 100644 --- a/Src/installer/winamp/uninstall/player.nsh +++ b/Src/installer/winamp/uninstall/player.nsh @@ -441,9 +441,9 @@ Section "un.$(IDS_UNINSTALL_MEDIA_PLAYER)" IDX_UNINSTALL_MEDIA_PLAYER ; Qt Components Delete "$INSTDIR\Qt5Core.dll" Delete "$INSTDIR\Qt5Network.dll" - Delete "$INSTDIR\platforms\qwindows.dll" + Delete "$INSTDIR\platforms\qarch.dll" RMDir "$INSTDIR\platforms" - Delete "$INSTDIR\printsupport\windowsprintersupport.dll" + Delete "$INSTDIR\printsupport\archprintersupport.dll" RMDir "$INSTDIR\printsupport" Delete "$INSTDIR\QtPositioning\declarative_positioning.dll" RMDir "$INSTDIR\QtPositioning" diff --git a/Src/jpeg/jpeg.vcxproj b/Src/jpeg/jpeg.vcxproj index bd373cc77..5614d4d72 100644 --- a/Src/jpeg/jpeg.vcxproj +++ b/Src/jpeg/jpeg.vcxproj @@ -90,17 +90,17 @@ Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/jpeg/w5s.cpp b/Src/jpeg/w5s.cpp index 13478e900..d3693feb8 100644 --- a/Src/jpeg/w5s.cpp +++ b/Src/jpeg/w5s.cpp @@ -1,5 +1,5 @@ #define WIN32_LEAN_AND_MEAN -#include +#include #include "api__jpeg.h" #include "main.h" #include "w5s.h" diff --git a/Src/libvp6/config_dlg.cpp b/Src/libvp6/config_dlg.cpp index cd3c8712f..acdd97484 100644 --- a/Src/libvp6/config_dlg.cpp +++ b/Src/libvp6/config_dlg.cpp @@ -9,7 +9,7 @@ /**************************************************************************** * Header Files ****************************************************************************/ -#include +#include #include #include #include "type_aliases.h" diff --git a/Src/libvp6/corelibs/include/duck_hfb.h b/Src/libvp6/corelibs/include/duck_hfb.h index 04407bd10..c5f6e91bc 100644 --- a/Src/libvp6/corelibs/include/duck_hfb.h +++ b/Src/libvp6/corelibs/include/duck_hfb.h @@ -767,7 +767,7 @@ libFunc int HFB_WhatsAhead( -/* windows 95 dll system abstraction functions */ +/* arch 95 dll system abstraction functions */ libFunc void HFB_Setmalloc( void *(*mallocFuncPtr)(unsigned int size) diff --git a/Src/libvp6/corelibs/include/nethfb.h b/Src/libvp6/corelibs/include/nethfb.h index 85a705f40..db31f707c 100644 --- a/Src/libvp6/corelibs/include/nethfb.h +++ b/Src/libvp6/corelibs/include/nethfb.h @@ -301,7 +301,7 @@ int lHFB_GetStreamSampleSize(HFB_STREAM_HANDLE xStream); int lHFB_WhatsAhead(HFB_STREAM_HANDLE ,int ,int *); -/* windows 95 dll system abstraction functions */ +/* arch 95 dll system abstraction functions */ void lHFB_Setmalloc( void *(*mallocFuncPtr)(unsigned int size) diff --git a/Src/libvp6/corelibs/on2_common/src/on2_mem/on2_mem_tracker.c b/Src/libvp6/corelibs/on2_common/src/on2_mem/on2_mem_tracker.c index 4021dd2d2..a914828ad 100644 --- a/Src/libvp6/corelibs/on2_common/src/on2_mem/on2_mem_tracker.c +++ b/Src/libvp6/corelibs/on2_common/src/on2_mem/on2_mem_tracker.c @@ -16,7 +16,7 @@ #if defined(LINUX) #include #elif defined(WIN32) || defined(_WIN32_WCE) -#include +#include #include #elif defined(VXWORKS) #include diff --git a/Src/libvp6/corelibs/sal/generic/on2_timer.c b/Src/libvp6/corelibs/sal/generic/on2_timer.c index 66a1c834d..d1d0ed49a 100644 --- a/Src/libvp6/corelibs/sal/generic/on2_timer.c +++ b/Src/libvp6/corelibs/sal/generic/on2_timer.c @@ -1,7 +1,7 @@ #include "on2_timer.h" #if defined(WIN32) -#include +#include #include #else #include diff --git a/Src/libvp6/corelibs/sal/win32/duck_io32.c b/Src/libvp6/corelibs/sal/win32/duck_io32.c index b8b312604..5e38d253b 100644 --- a/Src/libvp6/corelibs/sal/win32/duck_io32.c +++ b/Src/libvp6/corelibs/sal/win32/duck_io32.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "duck_io.h" diff --git a/Src/libvp6/corelibs/sal/win32/duck_str.c b/Src/libvp6/corelibs/sal/win32/duck_str.c index 934c67322..63c871737 100644 --- a/Src/libvp6/corelibs/sal/win32/duck_str.c +++ b/Src/libvp6/corelibs/sal/win32/duck_str.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "duck_io.h" #include "duck_hfb.h" diff --git a/Src/libvp6/include/AC3.hpp b/Src/libvp6/include/AC3.hpp index 60b24515f..ec45da514 100644 --- a/Src/libvp6/include/AC3.hpp +++ b/Src/libvp6/include/AC3.hpp @@ -10,7 +10,7 @@ #pragma warning(disable:4786) -#include +#include #include #include #include diff --git a/Src/libvp6/include/ACM.hpp b/Src/libvp6/include/ACM.hpp index 0bdb4feb6..9827eb78a 100644 --- a/Src/libvp6/include/ACM.hpp +++ b/Src/libvp6/include/ACM.hpp @@ -1,7 +1,7 @@ #ifndef ACM_HPP #define ACM_HPP -#include +#include #include #include #include diff --git a/Src/libvp6/include/AVI.hpp b/Src/libvp6/include/AVI.hpp index 3860db890..c3d901307 100644 --- a/Src/libvp6/include/AVI.hpp +++ b/Src/libvp6/include/AVI.hpp @@ -26,7 +26,7 @@ #include #if defined WIN32 -#include +#include #endif namespace AVI diff --git a/Src/libvp6/include/MP3.hpp b/Src/libvp6/include/MP3.hpp index 1ac9ede03..bc74c74b4 100644 --- a/Src/libvp6/include/MP3.hpp +++ b/Src/libvp6/include/MP3.hpp @@ -11,7 +11,7 @@ #pragma warning(disable:4786) #include "mp3header.hpp" -#include +#include #include #include #include diff --git a/Src/libvp6/include/Rvd.hpp b/Src/libvp6/include/Rvd.hpp index 078d6e324..76598d37c 100644 --- a/Src/libvp6/include/Rvd.hpp +++ b/Src/libvp6/include/Rvd.hpp @@ -5,7 +5,7 @@ #include "FourCC.hpp" //#include -#include +#include #include #include #include diff --git a/Src/libvp6/include/Vid.hpp b/Src/libvp6/include/Vid.hpp index beb336b88..d31371390 100644 --- a/Src/libvp6/include/Vid.hpp +++ b/Src/libvp6/include/Vid.hpp @@ -3,7 +3,7 @@ #pragma warning (disable:4786) -#include +#include #include #include #include diff --git a/Src/libvp6/include/duck_dxl.h b/Src/libvp6/include/duck_dxl.h index 942090b9a..ffa0e4fa8 100644 --- a/Src/libvp6/include/duck_dxl.h +++ b/Src/libvp6/include/duck_dxl.h @@ -485,7 +485,7 @@ int DXL_CheckVScreenXImageBlit(DXL_VSCREEN_HANDLE dst,DXL_XIMAGE_HANDLE src); -/* windows 95 dll system abstraction functions */ +/* arch 95 dll system abstraction functions */ /* set memory allocator function */ void DXV_Setmalloc( diff --git a/Src/libvpShared/corelibs/CpuID/CPUIdLib.vcxproj b/Src/libvpShared/corelibs/CpuID/CPUIdLib.vcxproj index c95896c53..2dab8d321 100644 --- a/Src/libvpShared/corelibs/CpuID/CPUIdLib.vcxproj +++ b/Src/libvpShared/corelibs/CpuID/CPUIdLib.vcxproj @@ -106,26 +106,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/libvpShared/corelibs/CpuID/Win32/D9xOSSupXMM.asm b/Src/libvpShared/corelibs/CpuID/Win32/D9xOSSupXMM.asm index 35594cafc..de0fc79e3 100644 --- a/Src/libvpShared/corelibs/CpuID/Win32/D9xOSSupXMM.asm +++ b/Src/libvpShared/corelibs/CpuID/Win32/D9xOSSupXMM.asm @@ -30,7 +30,7 @@ ; ; * * * N O T E * * * * * * N O T E * * * * * * N O T E * * * * * * N O T E * * * * * * N O T E * * * * * * N O T E * * * ; -; This function will NOT run on windows NT systems. The function reads control registers +; This function will NOT run on arch NT systems. The function reads control registers ; which are protected under Windows NT. If you attempt to run this function under Windows NT a ; protected mode access violation will be generated. ; diff --git a/Src/libvpShared/corelibs/CpuID/Win32/cid.c b/Src/libvpShared/corelibs/CpuID/Win32/cid.c index 988d625c3..72e3eb42d 100644 --- a/Src/libvpShared/corelibs/CpuID/Win32/cid.c +++ b/Src/libvpShared/corelibs/CpuID/Win32/cid.c @@ -10,7 +10,7 @@ //-------------------------------------------------------------------------- -#include +#include #include #include "cpuidlib.h" #include "cidasm.h" @@ -57,7 +57,7 @@ int DoesOSSupportXMM( void ) // if( 1 ) { /* - * If we are on a windows NT system we cannot directly + * If we are on a arch NT system we cannot directly * read the control registers to see if the OS supports * the XMM instructions. We will just check to see if * service pack 4 is installed. diff --git a/Src/libvpShared/corelibs/cdxv/VP60/vp60/cx/Generic/vfw_comp_main.c b/Src/libvpShared/corelibs/cdxv/VP60/vp60/cx/Generic/vfw_comp_main.c index 965f8e268..15a2e514b 100644 --- a/Src/libvpShared/corelibs/cdxv/VP60/vp60/cx/Generic/vfw_comp_main.c +++ b/Src/libvpShared/corelibs/cdxv/VP60/vp60/cx/Generic/vfw_comp_main.c @@ -21,7 +21,7 @@ #define STRICT /* Strict type checking. */ #define INC_WIN_HEADER 1 -#include +#include /**************************************************************************** * Module constants. diff --git a/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win32/dsystemdependant.c b/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win32/dsystemdependant.c index 3ec9dcb0e..a7f4b0942 100644 --- a/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win32/dsystemdependant.c +++ b/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win32/dsystemdependant.c @@ -10,7 +10,7 @@ /**************************************************************************** * Header Files ****************************************************************************/ -#include +#include #include "pbdll.h" #include "math.h" diff --git a/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win32/timer.c b/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win32/timer.c index 8df2b37ff..22fd0d91f 100644 --- a/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win32/timer.c +++ b/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win32/timer.c @@ -22,7 +22,7 @@ #define STRICT /* Strict type checking. */ #define INC_WIN_HEADER 1 -#include +#include #include "type_aliases.h" #include diff --git a/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win64/dsystemdependant.c b/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win64/dsystemdependant.c index d4c0dfe23..842a1c591 100644 --- a/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win64/dsystemdependant.c +++ b/Src/libvpShared/corelibs/cdxv/VP60/vp60/dx/Win64/dsystemdependant.c @@ -10,7 +10,7 @@ /**************************************************************************** * Header Files ****************************************************************************/ -#include +#include #include "pbdll.h" #include "math.h" diff --git a/Src/libvpShared/corelibs/cdxv/VP60/vp60/vp6d.vcxproj b/Src/libvpShared/corelibs/cdxv/VP60/vp60/vp6d.vcxproj index 73a81a5a6..b5fc6d968 100644 --- a/Src/libvpShared/corelibs/cdxv/VP60/vp60/vp6d.vcxproj +++ b/Src/libvpShared/corelibs/cdxv/VP60/vp60/vp6d.vcxproj @@ -106,26 +106,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/libvpShared/corelibs/cdxv/VP60/vp60/xprintf/xprintf.cpp b/Src/libvpShared/corelibs/cdxv/VP60/vp60/xprintf/xprintf.cpp index d775bf723..e281748d4 100644 --- a/Src/libvpShared/corelibs/cdxv/VP60/vp60/xprintf/xprintf.cpp +++ b/Src/libvpShared/corelibs/cdxv/VP60/vp60/xprintf/xprintf.cpp @@ -11,7 +11,7 @@ ****************************************************************************/ #include #include -#include +#include #include "xprintf.h" /**************************************************************************** diff --git a/Src/libvpShared/corelibs/cdxv/dxv/dxv.vcxproj b/Src/libvpShared/corelibs/cdxv/dxv/dxv.vcxproj index 413368c74..83c61b28a 100644 --- a/Src/libvpShared/corelibs/cdxv/dxv/dxv.vcxproj +++ b/Src/libvpShared/corelibs/cdxv/dxv/dxv.vcxproj @@ -105,26 +105,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/libvpShared/corelibs/cdxv/dxv/win32/dxv.cpp b/Src/libvpShared/corelibs/cdxv/dxv/win32/dxv.cpp index 342717ce4..437872202 100644 --- a/Src/libvpShared/corelibs/cdxv/dxv/win32/dxv.cpp +++ b/Src/libvpShared/corelibs/cdxv/dxv/win32/dxv.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include // ************************************************************************ diff --git a/Src/libvpShared/corelibs/cdxv/dxv/win32/dxv_mem.c b/Src/libvpShared/corelibs/cdxv/dxv/win32/dxv_mem.c index a86d620b7..4b6fe562d 100644 --- a/Src/libvpShared/corelibs/cdxv/dxv/win32/dxv_mem.c +++ b/Src/libvpShared/corelibs/cdxv/dxv/win32/dxv_mem.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include "dkpltfrm.h" #include "duck_mem.h" diff --git a/Src/libvpShared/corelibs/cdxv/dxv/win32/icmdxv.c b/Src/libvpShared/corelibs/cdxv/dxv/win32/icmdxv.c index 85d9d04b3..f8bd16fef 100644 --- a/Src/libvpShared/corelibs/cdxv/dxv/win32/icmdxv.c +++ b/Src/libvpShared/corelibs/cdxv/dxv/win32/icmdxv.c @@ -9,7 +9,7 @@ #include "duck_mem.h" /* interface to memory manager */ #include "dxl_main.h" /* interface to dxv */ -#include +#include #include #include diff --git a/Src/libvpShared/corelibs/cdxv/dxv/win32/makefile b/Src/libvpShared/corelibs/cdxv/dxv/win32/makefile index 8547cbbc5..5e13a8243 100644 --- a/Src/libvpShared/corelibs/cdxv/dxv/win32/makefile +++ b/Src/libvpShared/corelibs/cdxv/dxv/win32/makefile @@ -157,7 +157,7 @@ C_FLAGS = $(C_FLAGS) -Gy -W3 -nologo -DWIN32 -D_MBCS -D_AFXDLL -D_WINDOWS -DHIRE -DDOS32 -c $(M_INCLUDES:/=\) #-WX -L_FLAGS = $(L_FLAGS) /SUBSYSTEM:windows /INCREMENTAL:no /MACHINE:I386 +L_FLAGS = $(L_FLAGS) /SUBSYSTEM:arch /INCREMENTAL:no /MACHINE:I386 ############################################################ # Locally Overridable Flags diff --git a/Src/libvpShared/corelibs/cdxv/dxv2/dxv2.vcxproj b/Src/libvpShared/corelibs/cdxv/dxv2/dxv2.vcxproj index f852c980e..907a40f39 100644 --- a/Src/libvpShared/corelibs/cdxv/dxv2/dxv2.vcxproj +++ b/Src/libvpShared/corelibs/cdxv/dxv2/dxv2.vcxproj @@ -106,26 +106,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/libvpShared/corelibs/cdxv/vp50/dx/Win32/dsystemdependant.c b/Src/libvpShared/corelibs/cdxv/vp50/dx/Win32/dsystemdependant.c index b5486f059..872d1223a 100644 --- a/Src/libvpShared/corelibs/cdxv/vp50/dx/Win32/dsystemdependant.c +++ b/Src/libvpShared/corelibs/cdxv/vp50/dx/Win32/dsystemdependant.c @@ -45,7 +45,7 @@ #include "pbdll.h" #pragma warning(disable:4115) -#include +#include extern void GetProcessorFlags(INT32 *MmxEnabled, INT32 *XmmEnabled, INT32 *WmtEnabled); diff --git a/Src/libvpShared/corelibs/cdxv/vp50/dx/Win32/timer.c b/Src/libvpShared/corelibs/cdxv/vp50/dx/Win32/timer.c index 8df2b37ff..22fd0d91f 100644 --- a/Src/libvpShared/corelibs/cdxv/vp50/dx/Win32/timer.c +++ b/Src/libvpShared/corelibs/cdxv/vp50/dx/Win32/timer.c @@ -22,7 +22,7 @@ #define STRICT /* Strict type checking. */ #define INC_WIN_HEADER 1 -#include +#include #include "type_aliases.h" #include diff --git a/Src/libvpShared/corelibs/cdxv/vp50/dx/generic/quantize.c b/Src/libvpShared/corelibs/cdxv/vp50/dx/generic/quantize.c index 15df1f30d..e9365e5c5 100644 --- a/Src/libvpShared/corelibs/cdxv/vp50/dx/generic/quantize.c +++ b/Src/libvpShared/corelibs/cdxv/vp50/dx/generic/quantize.c @@ -28,7 +28,7 @@ * 1.05 JBB 27/01/99 Globals Removed, use of QUANTIZER, Dequant no longer * used * 1.04 PGW 05/11/99 Changes to support AC range entropy tables -* 1.03 PGW 12/10/99 Removal of spurious windows dependancies. +* 1.03 PGW 12/10/99 Removal of spurious arch dependancies. * 1.02 PGW 14/09/99 Removal of some floating point code. * 1.01 PGW 13/07/99 Changes to keep dequant output to 16 bit * 1.01 PGW 07/07/99 Tweaks to baseline matrix. diff --git a/Src/libvpShared/corelibs/cdxv/vp50/vp5d.vcxproj b/Src/libvpShared/corelibs/cdxv/vp50/vp5d.vcxproj index c9f9a51e4..bc9f76870 100644 --- a/Src/libvpShared/corelibs/cdxv/vp50/vp5d.vcxproj +++ b/Src/libvpShared/corelibs/cdxv/vp50/vp5d.vcxproj @@ -105,26 +105,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/libvpShared/corelibs/cdxv/vp50/xprintf/xprintf.cpp b/Src/libvpShared/corelibs/cdxv/vp50/xprintf/xprintf.cpp index 298264618..0f9b11f71 100644 --- a/Src/libvpShared/corelibs/cdxv/vp50/xprintf/xprintf.cpp +++ b/Src/libvpShared/corelibs/cdxv/vp50/xprintf/xprintf.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include "xprintf.h" diff --git a/Src/libvpShared/corelibs/cdxv/vppp/vppp.vcxproj b/Src/libvpShared/corelibs/cdxv/vppp/vppp.vcxproj index b78564bc2..5b155d1cb 100644 --- a/Src/libvpShared/corelibs/cdxv/vppp/vppp.vcxproj +++ b/Src/libvpShared/corelibs/cdxv/vppp/vppp.vcxproj @@ -106,26 +106,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/libvpShared/corelibs/cdxv/vputil/vputil.vcxproj b/Src/libvpShared/corelibs/cdxv/vputil/vputil.vcxproj index ca32aed6f..ac64b2d7f 100644 --- a/Src/libvpShared/corelibs/cdxv/vputil/vputil.vcxproj +++ b/Src/libvpShared/corelibs/cdxv/vputil/vputil.vcxproj @@ -106,26 +106,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/libvpShared/corelibs/on2_common/src/on2_mem/build/win32/on2_mem.vcxproj b/Src/libvpShared/corelibs/on2_common/src/on2_mem/build/win32/on2_mem.vcxproj index 1eb11535e..98de1b295 100644 --- a/Src/libvpShared/corelibs/on2_common/src/on2_mem/build/win32/on2_mem.vcxproj +++ b/Src/libvpShared/corelibs/on2_common/src/on2_mem/build/win32/on2_mem.vcxproj @@ -106,26 +106,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/libvpShared/corelibs/on2_common/src/on2_mem/on2_mem_tracker.c b/Src/libvpShared/corelibs/on2_common/src/on2_mem/on2_mem_tracker.c index cf3d0e24e..3db2a7c23 100644 --- a/Src/libvpShared/corelibs/on2_common/src/on2_mem/on2_mem_tracker.c +++ b/Src/libvpShared/corelibs/on2_common/src/on2_mem/on2_mem_tracker.c @@ -16,7 +16,7 @@ #if defined(LINUX) #include #elif defined(WIN32) || defined(_WIN32_WCE) -#include +#include #include #elif defined(VXWORKS) #include diff --git a/Src/mp3-mpg123/mp3-mpg123.vcxproj b/Src/mp3-mpg123/mp3-mpg123.vcxproj index 08f3abb94..cbde89e6a 100644 --- a/Src/mp3-mpg123/mp3-mpg123.vcxproj +++ b/Src/mp3-mpg123/mp3-mpg123.vcxproj @@ -100,26 +100,26 @@ Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/mp3-mpg123/test/catch.hpp b/Src/mp3-mpg123/test/catch.hpp index de61226cf..ecfa18eb0 100644 --- a/Src/mp3-mpg123/test/catch.hpp +++ b/Src/mp3-mpg123/test/catch.hpp @@ -6274,7 +6274,7 @@ namespace Catch { #ifdef __AFXDLL #include #else -#include +#include #endif namespace Catch { @@ -6938,7 +6938,7 @@ namespace Catch #endif #ifdef CATCH_PLATFORM_WINDOWS -#include +#include #else #include #endif diff --git a/Src/mp4v/mpeg4vid.vcxproj b/Src/mp4v/mpeg4vid.vcxproj index bb899fb81..996fcc806 100644 --- a/Src/mp4v/mpeg4vid.vcxproj +++ b/Src/mp4v/mpeg4vid.vcxproj @@ -90,17 +90,17 @@ .w5s - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md Debug diff --git a/Src/mpeg4dec/mp4def.h b/Src/mpeg4dec/mp4def.h index 603ebf2d7..a97ae3b6c 100644 --- a/Src/mpeg4dec/mp4def.h +++ b/Src/mpeg4dec/mp4def.h @@ -65,7 +65,7 @@ extern "C" { /* Timer Info */ #if defined(_WIN32) || defined(_WIN64) || defined(WIN32) || defined(WIN64) -#include +#include typedef struct _mp4_Timer { LARGE_INTEGER count; diff --git a/Src/nde/DBUtils.h b/Src/nde/DBUtils.h index 7a446d5ac..8946e4d6e 100644 --- a/Src/nde/DBUtils.h +++ b/Src/nde/DBUtils.h @@ -46,7 +46,7 @@ size_t utf16BE_to_utf8(const uint16_t *src, size_t source_len, char *dst, size_t #endif #ifdef _WIN32 -#include +#include int WINAPI NDE_FindNLSString(LCID Locale, DWORD dwFindNLSStringFlags, LPCWSTR lpStringSource, int cchSource, LPCWSTR lpStringValue, int cchValue, LPINT pcchFound); extern int (WINAPI *findNLSString)(LCID Locale, DWORD dwFindNLSStringFlags, LPCWSTR lpStringSource, int cchSource, LPCWSTR lpStringValue, int cchValue, LPINT pcchFound); bool nde_wcsbegins(const wchar_t *a, const wchar_t *b); diff --git a/Src/nde/NDEString.cpp b/Src/nde/NDEString.cpp index 8c20ef997..6d2330636 100644 --- a/Src/nde/NDEString.cpp +++ b/Src/nde/NDEString.cpp @@ -1,7 +1,7 @@ #include "NDEString.h" #include "foundation/error.h" -#include +#include typedef BOOL (WINAPI *HEAPSETINFORMATION)(HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, PVOID HeapInformation, SIZE_T HeapInformationLength); diff --git a/Src/nde/android/Table.cpp b/Src/nde/android/Table.cpp index 315d62cfd..a57f3582b 100644 --- a/Src/nde/android/Table.cpp +++ b/Src/nde/android/Table.cpp @@ -662,7 +662,7 @@ void Table::Compact(int *progress) { if (progress != NULL) *progress = 100; return; } - // create a temporary table in windows temp dir + // create a temporary table in arch temp dir wchar_t temp_table[MAX_PATH+12]; wchar_t temp_index[MAX_PATH+12]; wchar_t old_table[MAX_PATH+12]; diff --git a/Src/nde/android/nde_c.h b/Src/nde/android/nde_c.h index c75542625..51c5f1018 100644 --- a/Src/nde/android/nde_c.h +++ b/Src/nde/android/nde_c.h @@ -106,7 +106,7 @@ NDE_API int NDE_IntegerField_GetValue(nde_field_t field); NDE_API nde_field_t NDE_IntegerField_Create(int value); /* mainly used for NDE_Scanner_AddFilterByID */ /* BinaryField functions */ -// on windows, the data pointer is optionally reference counted via ndestring (ndestring_retain if you plan on keeping it) +// on arch, the data pointer is optionally reference counted via ndestring (ndestring_retain if you plan on keeping it) NDE_API void *NDE_BinaryField_GetData(nde_field_t field, size_t *length); NDE_API void NDE_BinaryField_SetData(nde_field_t field, const void *data, size_t length); diff --git a/Src/nde/nde.vcxproj b/Src/nde/nde.vcxproj index 8cbd95f32..66d8cb2cc 100644 --- a/Src/nde/nde.vcxproj +++ b/Src/nde/nde.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/nde/osx/nde_c.h b/Src/nde/osx/nde_c.h index b0b4244fd..aa4f083dd 100644 --- a/Src/nde/osx/nde_c.h +++ b/Src/nde/osx/nde_c.h @@ -123,7 +123,7 @@ NDE_API int NDE_IntegerField_GetValue(nde_field_t field); NDE_API nde_field_t NDE_IntegerField_Create(int value); /* mainly used for NDE_Scanner_AddFilterByID */ /* BinaryField functions */ -// on windows, the data pointer is optionally reference counted via ndestring (ndestring_retain if you plan on keeping it) +// on arch, the data pointer is optionally reference counted via ndestring (ndestring_retain if you plan on keeping it) NDE_API void *NDE_BinaryField_GetData(nde_field_t field, size_t *length); NDE_API void NDE_BinaryField_SetData(nde_field_t field, const void *data, size_t length); diff --git a/Src/nde/win/Table.cpp b/Src/nde/win/Table.cpp index 0631ec279..c965889fd 100644 --- a/Src/nde/win/Table.cpp +++ b/Src/nde/win/Table.cpp @@ -702,7 +702,7 @@ void Table::Compact(int *progress) { if (progress != NULL) *progress = 100; return; } - // create a temporary table in windows temp dir + // create a temporary table in arch temp dir wchar_t temp_table[MAX_PATH+12] = {0}; wchar_t temp_index[MAX_PATH+12] = {0}; wchar_t old_table[MAX_PATH+12] = {0}; diff --git a/Src/nde/win/Vfs.h b/Src/nde/win/Vfs.h index 50490b835..30fb1c21b 100644 --- a/Src/nde/win/Vfs.h +++ b/Src/nde/win/Vfs.h @@ -2,7 +2,7 @@ #define __NDE_VFS_H #include -#include +#include //#define NDE_ALLOW_NONCACHED diff --git a/Src/nde/win/nde_c.h b/Src/nde/win/nde_c.h index a7faae66f..c8235b255 100644 --- a/Src/nde/win/nde_c.h +++ b/Src/nde/win/nde_c.h @@ -112,7 +112,7 @@ NDE_API __int64 NDE_Int64Field_GetValue(nde_field_t field); NDE_API nde_field_t NDE_Int64Field_Create(__int64 value); /* BinaryField functions */ -// on windows, the data pointer is optionally reference counted via ndestring (ndestring_retain if you plan on keeping it) +// on arch, the data pointer is optionally reference counted via ndestring (ndestring_retain if you plan on keeping it) NDE_API void *NDE_BinaryField_GetData(nde_field_t field, size_t *length); NDE_API void NDE_BinaryField_SetData(nde_field_t field, const void *data, size_t length); diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindow.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindow.idl index 1cbfd7e5f..f1c81729a 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindow.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindow.idl @@ -44,7 +44,7 @@ interface nsISelection; /** * The nsIDOMWindow interface is the primary interface for a DOM * window object. It represents a single window object that may - * contain child windows if the document in the window contains a + * contain child arch if the document in the window contains a * HTML frameset document or if the document contains iframe elements. * * This interface is not officially defined by any standard bodies, it @@ -69,7 +69,7 @@ interface nsIDOMWindow : nsISupports readonly attribute nsIDOMWindow parent; /** - * Accessor for the root of this hierarchy of windows. This root may + * Accessor for the root of this hierarchy of arch. This root may * be the window itself if there is no parent, or if the parent is * of different type (i.e. this does not cross chrome-content * boundaries). @@ -86,7 +86,7 @@ interface nsIDOMWindow : nsISupports readonly attribute nsIDOMBarProp scrollbars; /** - * Accessor for the child windows in this window. + * Accessor for the child arch in this window. */ [noscript] readonly attribute nsIDOMWindowCollection frames; diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindowCollection.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindowCollection.idl index e12b26c74..6f751db7f 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindowCollection.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindowCollection.idl @@ -50,7 +50,7 @@ interface nsIDOMWindowCollection : nsISupports { /** - * Accessor for the number of windows in this collection. + * Accessor for the number of arch in this collection. */ readonly attribute unsigned long length; diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindowUtils.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindowUtils.idl index 41f6178da..4ec08edfb 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindowUtils.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIDOMWindowUtils.idl @@ -60,7 +60,7 @@ interface nsIDOMWindowUtils : nsISupports { * for example continue to report kDontAnimMode after all images * have subsequently been individually animated. * @note Only images immediately in this window are affected; - * this is not recursive to subwindows. + * this is not recursive to subarch. * @see imgIContainer */ attribute unsigned short imageAnimationMode; diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIFile.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIFile.idl index 7057253bf..3582f58d6 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIFile.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIFile.idl @@ -45,7 +45,7 @@ interface nsISimpleEnumerator; /** * This is the only correct cross-platform way to specify a file. - * Strings are not such a way. If you grew up on windows or unix, you + * Strings are not such a way. If you grew up on arch or unix, you * may think they are. Welcome to reality. * * All methods with string parameters have two forms. The preferred diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIProfileChangeStatus.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIProfileChangeStatus.idl index dc0850e8c..b5d41076a 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIProfileChangeStatus.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIProfileChangeStatus.idl @@ -50,13 +50,13 @@ * Called before a profile change is attempted. Typically, * the application level observer will ask the user if * he/she wants to stop all network activity, close all open - * windows, etc. If the user says NO, the observer should + * arch, etc. If the user says NO, the observer should * call the subject's vetoChange(). If any observer does * this, the profile will not be changed. * * "profile-change-teardown" * All async activity must be stopped in this phase. Typically, - * the application level observer will close all open windows. + * the application level observer will close all open arch. * This is the last phase in which the subject's vetoChange() * method may still be called. * The next notification will be either diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIPromptService.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIPromptService.idl index cc2da4c39..9c5d31cf5 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIPromptService.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIPromptService.idl @@ -50,7 +50,7 @@ interface nsIDOMWindow; * label of a button.) * * One note: in all cases, the parent window parameter can be null. However, - * these windows are all intended to have parents. So when no parent is + * these arch are all intended to have parents. So when no parent is * specified, the implementation should try hard to find a suitable foster * parent. * diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIURIContentListener.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIURIContentListener.idl index e4c7a2940..6a2f67553 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIURIContentListener.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIURIContentListener.idl @@ -45,7 +45,7 @@ interface nsIURI; * nsIURIContentListener is an interface used by components which * want to know (and have a chance to handle) a particular content type. * Typical usage scenarios will include running applications which register - * a nsIURIContentListener for each of its content windows with the uri + * a nsIURIContentListener for each of its content arch with the uri * dispatcher service. * * @status FROZEN diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebBrowserFocus.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebBrowserFocus.idl index 322a82106..3be2275ff 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebBrowserFocus.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebBrowserFocus.idl @@ -76,7 +76,7 @@ interface nsIWebBrowserFocus : nsISupports * MANDATORY * deactivate() is a mandatory call that must be made to the browser * when the embedding application's window is deactivated *and* the - * browser area was the last thing in focus. On non-windows platforms, + * browser area was the last thing in focus. On non-arch platforms, * deactivate() should also be called when focus moves from the browser * to the embedding chrome. * diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebProgress.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebProgress.idl index de39ac329..52efb315f 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebProgress.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebProgress.idl @@ -50,7 +50,7 @@ interface nsIWebProgressListener; * * nsIWebProgress instances may be arranged in a parent-child configuration, * corresponding to the parent-child configuration of their respective DOM - * windows. However, in some cases a nsIWebProgress instance may not have an + * arch. However, in some cases a nsIWebProgress instance may not have an * associated DOM window. The parent-child relationship of nsIWebProgress * instances is not made explicit by this interface, but the relationship may * exist in some implementations. diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebProgressListener.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebProgressListener.idl index 169ae7d1d..93432701d 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebProgressListener.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWebProgressListener.idl @@ -142,7 +142,7 @@ interface nsIWebProgressListener : nsISupports * with the STATE_IS_NETWORK flag set to indicate the start and stop of * said navigation. In other words, an observer of an outer window can * determine when activity, that may be constrained to a child window or - * set of child windows, starts and stops. + * set of child arch, starts and stops. * * STATE_IS_WINDOW * This flag indicates that the state transition corresponds to the start diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWindowCreator.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWindowCreator.idl index c42f88638..ad1122c8b 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWindowCreator.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWindowCreator.idl @@ -39,7 +39,7 @@ /** * nsIWindowCreator is a callback interface used by Gecko to create - * new browser windows. The application, either Mozilla or an embedding app, + * new browser arch. The application, either Mozilla or an embedding app, * must provide an implementation of the Window Watcher component and * notify the WindowWatcher during application initialization. * @see nsIWindowWatcher @@ -56,7 +56,7 @@ interface nsIWebBrowserChrome; interface nsIWindowCreator : nsISupports { /** Create a new window. Gecko will/may call this method, if made - available to it, to create new windows. + available to it, to create new arch. @param parent parent window, if any. null if not. the newly created window should be made a child/dependent window of the parent, if any (and if the concept applies diff --git a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWindowWatcher.idl b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWindowWatcher.idl index 6ecca1244..f2784f6ea 100644 --- a/Src/nprt_plugin/gecko/1.8/win/idl/nsIWindowWatcher.idl +++ b/Src/nprt_plugin/gecko/1.8/win/idl/nsIWindowWatcher.idl @@ -38,7 +38,7 @@ /** * nsIWindowWatcher is the keeper of Gecko/DOM Windows. It maintains - * a list of open top-level windows, and allows some operations on them. + * a list of open top-level arch, and allows some operations on them. * Usage notes: @@ -46,7 +46,7 @@ * this property to be always current, so to properly integrate this component * the application will need to keep it current by setting the property * as the active window changes. - * This component should not keep a (XPCOM) reference to any windows; + * This component should not keep a (XPCOM) reference to any arch; * the implementation will claim no ownership. Windows must notify * this component when they are created or destroyed, so only a weak * reference is kept. Note that there is no interface for such notifications @@ -96,7 +96,7 @@ interface nsIWindowWatcher : nsISupports { when a window is opened or closed (added to or removed from this service). This method adds an aObserver to the list of objects to be notified. - @param aObserver the object to be notified when windows are + @param aObserver the object to be notified when arch are opened or closed. Its Observe method will be called with the following parameters: @@ -116,7 +116,7 @@ interface nsIWindowWatcher : nsISupports { */ void unregisterNotification(in nsIObserver aObserver); - /** Get an iterator for currently open windows in the order they were opened, + /** Get an iterator for currently open arch in the order they were opened, guaranteeing that each will be visited exactly once. @return an enumerator which will itself return nsISupports objects which can be QIed to an nsIDOMWindow @@ -139,7 +139,7 @@ interface nsIWindowWatcher : nsISupports { nsIAuthPrompt getNewAuthPrompter(in nsIDOMWindow aParent); /** Set the window creator callback. It must be filled in by the app. - openWindow will use it to create new windows. + openWindow will use it to create new arch. @param creator the callback. if null, the callback will be cleared and window creation capabilities lost. */ @@ -147,7 +147,7 @@ interface nsIWindowWatcher : nsISupports { /** Retrieve the chrome window mapped to the given DOM window. Window - Watcher keeps a list of all top-level DOM windows currently open, + Watcher keeps a list of all top-level DOM arch currently open, along with their corresponding chrome interfaces. Since DOM Windows lack a (public) means of retrieving their corresponding chrome, this method will do that. @@ -163,7 +163,7 @@ interface nsIWindowWatcher : nsISupports { begin the search. If null, each toplevel window will be searched. - Note: This method will search all open windows for any window or + Note: This method will search all open arch for any window or frame with the given window name. Make sure you understand the security implications of this before using this method! */ @@ -174,7 +174,7 @@ interface nsIWindowWatcher : nsISupports { (frontmost non-floating-palette-type) window, storing and returning it on demand. Users must keep this attribute current, including after the topmost window is closed. This attribute obviously can return null - if no windows are open, but should otherwise always return a valid + if no arch are open, but should otherwise always return a valid window. */ attribute nsIDOMWindow activeWindow; diff --git a/Src/nprt_plugin/gecko/1.8/win/include/jni_md.h b/Src/nprt_plugin/gecko/1.8/win/include/jni_md.h index d3e96ab4d..c887914e6 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/jni_md.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/jni_md.h @@ -95,7 +95,7 @@ # endif /* Win32 */ #elif defined(XP_WIN) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) -# include +# include # if defined(_MSC_VER) || defined(__GNUC__) # if defined(WIN32) || defined(_WIN32) # define JNI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType __stdcall diff --git a/Src/nprt_plugin/gecko/1.8/win/include/jri_md.h b/Src/nprt_plugin/gecko/1.8/win/include/jri_md.h index f18093cdd..94bcbdc7b 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/jri_md.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/jri_md.h @@ -80,7 +80,7 @@ extern "C" { # define JRI_CALLBACK # endif #elif defined(XP_WIN) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) -# include +# include # if defined(_MSC_VER) || defined(__GNUC__) # if defined(WIN32) || defined(_WIN32) # define JRI_PUBLIC_API(ResultType) __declspec(dllexport) ResultType diff --git a/Src/nprt_plugin/gecko/1.8/win/include/md/_solaris.h b/Src/nprt_plugin/gecko/1.8/win/include/md/_solaris.h index aed078fcb..9657413ab 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/md/_solaris.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/md/_solaris.h @@ -492,9 +492,9 @@ NSPR_API(void) _MD_SolarisInit(); #define _PR_CONTEXT_TYPE ucontext_t #define _MD_GET_SP(_t) (_t)->md.context.uc_mcontext.gregs[REG_SP] /* -** Sparc's use register windows. the _MD_GetRegisters for the sparc's +** Sparc's use register arch. the _MD_GetRegisters for the sparc's ** doesn't actually store anything into the argument buffer; instead the -** register windows are homed to the stack. I assume that the stack +** register arch are homed to the stack. I assume that the stack ** always has room for the registers to spill to... */ #define PR_NUM_GCREGS 0 diff --git a/Src/nprt_plugin/gecko/1.8/win/include/md/_win16.h b/Src/nprt_plugin/gecko/1.8/win/include/md/_win16.h index d7e79c222..178a51ef9 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/md/_win16.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/md/_win16.h @@ -38,7 +38,7 @@ #ifndef nspr_win16_defs_h___ #define nspr_win16_defs_h___ -#include +#include #include #include #include diff --git a/Src/nprt_plugin/gecko/1.8/win/include/md/_win32_errors.h b/Src/nprt_plugin/gecko/1.8/win/include/md/_win32_errors.h index d5d8b7142..8bb7c20c5 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/md/_win32_errors.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/md/_win32_errors.h @@ -38,7 +38,7 @@ #ifndef nspr_win32_errors_h___ #define nspr_win32_errors_h___ -#include +#include #include #include diff --git a/Src/nprt_plugin/gecko/1.8/win/include/md/_win95.h b/Src/nprt_plugin/gecko/1.8/win/include/md/_win95.h index cd26bd633..65a870520 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/md/_win95.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/md/_win95.h @@ -40,7 +40,7 @@ #include "prio.h" -#include +#include #include #include diff --git a/Src/nprt_plugin/gecko/1.8/win/include/md/_winnt.h b/Src/nprt_plugin/gecko/1.8/win/include/md/_winnt.h index 0e6ce819d..114c7f851 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/md/_winnt.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/md/_winnt.h @@ -48,7 +48,7 @@ #define _WIN32_WINNT 0x0400 #endif /* _WIN32_WINNT */ -#include +#include #include #ifdef __MINGW32__ #include diff --git a/Src/nprt_plugin/gecko/1.8/win/include/mozilla-config.h b/Src/nprt_plugin/gecko/1.8/win/include/mozilla-config.h index f0b67a5ec..00927013e 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/mozilla-config.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/mozilla-config.h @@ -18,7 +18,7 @@ #define MOZILLA_VERSION "1.8" #define MOZILLA_VERSION_U 1.8 #define MOZ_BUILD_APP browser -#define MOZ_DEFAULT_TOOLKIT "windows" +#define MOZ_DEFAULT_TOOLKIT "arch" #define MOZ_DISTRIBUTION_ID "org.mozilla" #define MOZ_DLL_SUFFIX ".dll" #define MOZ_JSLOADER 1 diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsEmbedAPI.h b/Src/nprt_plugin/gecko/1.8/win/include/nsEmbedAPI.h index a50a76627..b583cf56c 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsEmbedAPI.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsEmbedAPI.h @@ -116,7 +116,7 @@ NS_TermEmbedding(); /* Win32 specific stuff */ #if defined (WIN32) || defined (WINCE) -#include "windows.h" +#include "arch.h" /** * @var typedef MSG nsEmbedNativeEvent * diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindow.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindow.h index 71fcde771..e5f8599a0 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindow.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindow.h @@ -32,7 +32,7 @@ class NS_NO_VTABLE nsIDOMWindow : public nsISupports { /** * The nsIDOMWindow interface is the primary interface for a DOM * window object. It represents a single window object that may - * contain child windows if the document in the window contains a + * contain child arch if the document in the window contains a * HTML frameset document or if the document contains iframe elements. * * This interface is not officially defined by any standard bodies, it @@ -55,7 +55,7 @@ class NS_NO_VTABLE nsIDOMWindow : public nsISupports { NS_IMETHOD GetParent(nsIDOMWindow * *aParent) = 0; /** - * Accessor for the root of this hierarchy of windows. This root may + * Accessor for the root of this hierarchy of arch. This root may * be the window itself if there is no parent, or if the parent is * of different type (i.e. this does not cross chrome-content * boundaries). @@ -74,7 +74,7 @@ class NS_NO_VTABLE nsIDOMWindow : public nsISupports { NS_IMETHOD GetScrollbars(nsIDOMBarProp * *aScrollbars) = 0; /** - * Accessor for the child windows in this window. + * Accessor for the child arch in this window. */ /* [noscript] readonly attribute nsIDOMWindowCollection frames; */ NS_IMETHOD GetFrames(nsIDOMWindowCollection * *aFrames) = 0; diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindowCollection.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindowCollection.h index fca08e092..d9f63c5d2 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindowCollection.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindowCollection.h @@ -34,7 +34,7 @@ class NS_NO_VTABLE nsIDOMWindowCollection : public nsISupports { * @status FROZEN */ /** - * Accessor for the number of windows in this collection. + * Accessor for the number of arch in this collection. */ /* readonly attribute unsigned long length; */ NS_IMETHOD GetLength(PRUint32 *aLength) = 0; diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindowUtils.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindowUtils.h index 8c28e0cb1..750d1ffe3 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindowUtils.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIDOMWindowUtils.h @@ -46,7 +46,7 @@ class NS_NO_VTABLE nsIDOMWindowUtils : public nsISupports { * for example continue to report kDontAnimMode after all images * have subsequently been individually animated. * @note Only images immediately in this window are affected; - * this is not recursive to subwindows. + * this is not recursive to subarch. * @see imgIContainer */ /* attribute unsigned short imageAnimationMode; */ diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIFile.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIFile.h index 9e772621a..e9d393a27 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIFile.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIFile.h @@ -26,7 +26,7 @@ class nsISimpleEnumerator; /* forward declaration */ /** * This is the only correct cross-platform way to specify a file. - * Strings are not such a way. If you grew up on windows or unix, you + * Strings are not such a way. If you grew up on arch or unix, you * may think they are. Welcome to reality. * * All methods with string parameters have two forms. The preferred diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIProfileChangeStatus.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIProfileChangeStatus.h index 4db996b19..cddd161d5 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIProfileChangeStatus.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIProfileChangeStatus.h @@ -24,13 +24,13 @@ * Called before a profile change is attempted. Typically, * the application level observer will ask the user if * he/she wants to stop all network activity, close all open - * windows, etc. If the user says NO, the observer should + * arch, etc. If the user says NO, the observer should * call the subject's vetoChange(). If any observer does * this, the profile will not be changed. * * "profile-change-teardown" * All async activity must be stopped in this phase. Typically, - * the application level observer will close all open windows. + * the application level observer will close all open arch. * This is the last phase in which the subject's vetoChange() * method may still be called. * The next notification will be either diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIPromptService.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIPromptService.h index 62cccce1c..e9f215fc1 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIPromptService.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIPromptService.h @@ -35,7 +35,7 @@ class nsIDOMWindow; /* forward declaration */ * label of a button.) * * One note: in all cases, the parent window parameter can be null. However, - * these windows are all intended to have parents. So when no parent is + * these arch are all intended to have parents. So when no parent is * specified, the implementation should try hard to find a suitable foster * parent. * diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIURIContentListener.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIURIContentListener.h index 032b5b0c1..275fd908a 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIURIContentListener.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIURIContentListener.h @@ -32,7 +32,7 @@ class nsIURI; /* forward declaration */ * nsIURIContentListener is an interface used by components which * want to know (and have a chance to handle) a particular content type. * Typical usage scenarios will include running applications which register - * a nsIURIContentListener for each of its content windows with the uri + * a nsIURIContentListener for each of its content arch with the uri * dispatcher service. * * @status FROZEN diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIWebBrowserFocus.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIWebBrowserFocus.h index 56c721ffd..f73109f40 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIWebBrowserFocus.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIWebBrowserFocus.h @@ -61,7 +61,7 @@ class NS_NO_VTABLE nsIWebBrowserFocus : public nsISupports { * MANDATORY * deactivate() is a mandatory call that must be made to the browser * when the embedding application's window is deactivated *and* the - * browser area was the last thing in focus. On non-windows platforms, + * browser area was the last thing in focus. On non-arch platforms, * deactivate() should also be called when focus moves from the browser * to the embedding chrome. * diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIWebProgress.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIWebProgress.h index 74cda74fe..46b9429c2 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIWebProgress.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIWebProgress.h @@ -33,7 +33,7 @@ class nsIWebProgressListener; /* forward declaration */ * * nsIWebProgress instances may be arranged in a parent-child configuration, * corresponding to the parent-child configuration of their respective DOM - * windows. However, in some cases a nsIWebProgress instance may not have an + * arch. However, in some cases a nsIWebProgress instance may not have an * associated DOM window. The parent-child relationship of nsIWebProgress * instances is not made explicit by this interface, but the relationship may * exist in some implementations. diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIWebProgressListener.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIWebProgressListener.h index c13c0eec9..603c05dcc 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIWebProgressListener.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIWebProgressListener.h @@ -131,7 +131,7 @@ class NS_NO_VTABLE nsIWebProgressListener : public nsISupports { * with the STATE_IS_NETWORK flag set to indicate the start and stop of * said navigation. In other words, an observer of an outer window can * determine when activity, that may be constrained to a child window or - * set of child windows, starts and stops. + * set of child arch, starts and stops. * * STATE_IS_WINDOW * This flag indicates that the state transition corresponds to the start diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIWindowCreator.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIWindowCreator.h index 04356b02d..5c65376d4 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIWindowCreator.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIWindowCreator.h @@ -30,7 +30,7 @@ class NS_NO_VTABLE nsIWindowCreator : public nsISupports { NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWINDOWCREATOR_IID) /** Create a new window. Gecko will/may call this method, if made - available to it, to create new windows. + available to it, to create new arch. @param parent parent window, if any. null if not. the newly created window should be made a child/dependent window of the parent, if any (and if the concept applies diff --git a/Src/nprt_plugin/gecko/1.8/win/include/nsIWindowWatcher.h b/Src/nprt_plugin/gecko/1.8/win/include/nsIWindowWatcher.h index 82041a7bc..3ef9e736d 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/nsIWindowWatcher.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/nsIWindowWatcher.h @@ -63,7 +63,7 @@ class NS_NO_VTABLE nsIWindowWatcher : public nsISupports { when a window is opened or closed (added to or removed from this service). This method adds an aObserver to the list of objects to be notified. - @param aObserver the object to be notified when windows are + @param aObserver the object to be notified when arch are opened or closed. Its Observe method will be called with the following parameters: @@ -85,7 +85,7 @@ class NS_NO_VTABLE nsIWindowWatcher : public nsISupports { /* void unregisterNotification (in nsIObserver aObserver); */ NS_IMETHOD UnregisterNotification(nsIObserver *aObserver) = 0; - /** Get an iterator for currently open windows in the order they were opened, + /** Get an iterator for currently open arch in the order they were opened, guaranteeing that each will be visited exactly once. @return an enumerator which will itself return nsISupports objects which can be QIed to an nsIDOMWindow @@ -108,7 +108,7 @@ class NS_NO_VTABLE nsIWindowWatcher : public nsISupports { NS_IMETHOD GetNewAuthPrompter(nsIDOMWindow *aParent, nsIAuthPrompt **_retval) = 0; /** Set the window creator callback. It must be filled in by the app. - openWindow will use it to create new windows. + openWindow will use it to create new arch. @param creator the callback. if null, the callback will be cleared and window creation capabilities lost. */ @@ -116,7 +116,7 @@ class NS_NO_VTABLE nsIWindowWatcher : public nsISupports { NS_IMETHOD SetWindowCreator(nsIWindowCreator *creator) = 0; /** Retrieve the chrome window mapped to the given DOM window. Window - Watcher keeps a list of all top-level DOM windows currently open, + Watcher keeps a list of all top-level DOM arch currently open, along with their corresponding chrome interfaces. Since DOM Windows lack a (public) means of retrieving their corresponding chrome, this method will do that. @@ -133,7 +133,7 @@ class NS_NO_VTABLE nsIWindowWatcher : public nsISupports { begin the search. If null, each toplevel window will be searched. - Note: This method will search all open windows for any window or + Note: This method will search all open arch for any window or frame with the given window name. Make sure you understand the security implications of this before using this method! */ @@ -144,7 +144,7 @@ class NS_NO_VTABLE nsIWindowWatcher : public nsISupports { (frontmost non-floating-palette-type) window, storing and returning it on demand. Users must keep this attribute current, including after the topmost window is closed. This attribute obviously can return null - if no windows are open, but should otherwise always return a valid + if no arch are open, but should otherwise always return a valid window. */ /* attribute nsIDOMWindow activeWindow; */ diff --git a/Src/nprt_plugin/gecko/1.8/win/include/prshm.h b/Src/nprt_plugin/gecko/1.8/win/include/prshm.h index 098566ec7..e3e6ca517 100644 --- a/Src/nprt_plugin/gecko/1.8/win/include/prshm.h +++ b/Src/nprt_plugin/gecko/1.8/win/include/prshm.h @@ -119,7 +119,7 @@ ** system. Set permissions and or access controls at create and attach ** time to ensure you get the desired security. ** -** On windows platforms, no special security measures are provided. +** On arch platforms, no special security measures are provided. ** ** Example: ** The test case pr/tests/nameshm1.c provides an example of use as diff --git a/Src/nprt_plugin/plugin.cpp b/Src/nprt_plugin/plugin.cpp index 4dd0c980c..4cc648dc6 100644 --- a/Src/nprt_plugin/plugin.cpp +++ b/Src/nprt_plugin/plugin.cpp @@ -39,8 +39,8 @@ // // CPlugin class implementation // -#include -#include +#include +#include #include "plugin.h" #include "npupp.h" #include "nsError.h" diff --git a/Src/ns-eel/megabuf.c b/Src/ns-eel/megabuf.c index bfee8f7ba..c761210e6 100644 --- a/Src/ns-eel/megabuf.c +++ b/Src/ns-eel/megabuf.c @@ -1,4 +1,4 @@ -#include +#include #include "../ns-eel/ns-eel.h" #include "../ns-eel/ns-eel-int.h" #include "megabuf.h" diff --git a/Src/ns-eel/nseel-cfunc.c b/Src/ns-eel/nseel-cfunc.c index 919f94074..3a21db270 100644 --- a/Src/ns-eel/nseel-cfunc.c +++ b/Src/ns-eel/nseel-cfunc.c @@ -23,7 +23,7 @@ */ -#include +#include #include #include "ns-eel-int.h" diff --git a/Src/ns-eel/nseel-compiler.c b/Src/ns-eel/nseel-compiler.c index eb25ec5c3..b3a0dfae1 100644 --- a/Src/ns-eel/nseel-compiler.c +++ b/Src/ns-eel/nseel-compiler.c @@ -22,7 +22,7 @@ */ -#include +#include #include "ns-eel-int.h" #ifdef NSEEL_REENTRANT_EXECUTION diff --git a/Src/ns-eel/nseel-eval.c b/Src/ns-eel/nseel-eval.c index 2259fca4e..abca3be59 100644 --- a/Src/ns-eel/nseel-eval.c +++ b/Src/ns-eel/nseel-eval.c @@ -21,7 +21,7 @@ 3. This notice may not be removed or altered from any source distribution. */ -#include +#include #include "ns-eel-int.h" #define NSEEL_VARS_PER_BLOCK 64 diff --git a/Src/ns-eel2/ns-eel-int.h b/Src/ns-eel2/ns-eel-int.h index a13478e06..e30d9d300 100644 --- a/Src/ns-eel2/ns-eel-int.h +++ b/Src/ns-eel2/ns-eel-int.h @@ -25,7 +25,7 @@ #define __NS_EELINT_H__ #ifdef _WIN32 -#include +#include #else #include "../wdltypes.h" #endif diff --git a/Src/ns-eel2/wdltypes.h b/Src/ns-eel2/wdltypes.h index b839094d5..79b7de190 100644 --- a/Src/ns-eel2/wdltypes.h +++ b/Src/ns-eel2/wdltypes.h @@ -30,7 +30,7 @@ typedef unsigned long long WDL_UINT64; #ifdef _WIN32 -#include +#include #else #include typedef intptr_t INT_PTR; diff --git a/Src/ns-eel2/y.tab.c b/Src/ns-eel2/y.tab.c index d6a3c2949..58513828e 100644 --- a/Src/ns-eel2/y.tab.c +++ b/Src/ns-eel2/y.tab.c @@ -136,7 +136,7 @@ extern void nseelerror(YYLTYPE* pos, compileContext* ctx, const char* str); #line 13 "eel2.y" #ifdef _WIN32 -#include +#include #endif #include #include diff --git a/Src/nsavi/main.cpp b/Src/nsavi/main.cpp index b17c47f8a..6de3978b2 100644 --- a/Src/nsavi/main.cpp +++ b/Src/nsavi/main.cpp @@ -1,6 +1,6 @@ #include #include -#include // evil, i know +#include // evil, i know #include #include "avi_header.h" #include "file_avi_reader.h" diff --git a/Src/nsavi/nsavi.vcxproj b/Src/nsavi/nsavi.vcxproj index 8a68e1c1d..47d1adecd 100644 --- a/Src/nsavi/nsavi.vcxproj +++ b/Src/nsavi/nsavi.vcxproj @@ -92,16 +92,16 @@ $(LibraryPath) - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/nsmkv/nsmkv.vcxproj b/Src/nsmkv/nsmkv.vcxproj index 080bcd8c6..e696d827a 100644 --- a/Src/nsmkv/nsmkv.vcxproj +++ b/Src/nsmkv/nsmkv.vcxproj @@ -93,26 +93,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/nsmkv/read.h b/Src/nsmkv/read.h index 5277ecc62..2cb09eea1 100644 --- a/Src/nsmkv/read.h +++ b/Src/nsmkv/read.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include "mkv_reader.h" diff --git a/Src/nsutil/nsutil.vcxproj b/Src/nsutil/nsutil.vcxproj index 44351fe57..6a3417d57 100644 --- a/Src/nsutil/nsutil.vcxproj +++ b/Src/nsutil/nsutil.vcxproj @@ -103,26 +103,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/nsv/nsvplay/audiostub.cpp b/Src/nsv/nsvplay/audiostub.cpp index 83794693e..88a69ac82 100644 --- a/Src/nsv/nsvplay/audiostub.cpp +++ b/Src/nsv/nsvplay/audiostub.cpp @@ -1,4 +1,4 @@ -#include +#include #include "audiostub.h" #define CAPTION "NSV Player Sound Output Error" diff --git a/Src/nsv/nsvplay/decoders.cpp b/Src/nsv/nsvplay/decoders.cpp index 82cba2bd0..b3ad406ff 100644 --- a/Src/nsv/nsvplay/decoders.cpp +++ b/Src/nsv/nsvplay/decoders.cpp @@ -1,4 +1,4 @@ -#include +#include #include "api.h" #include "main.h" #include "vfw.h" diff --git a/Src/nsv/nsvplay/main.cpp b/Src/nsv/nsvplay/main.cpp index 76f2f5c13..c1336df61 100644 --- a/Src/nsv/nsvplay/main.cpp +++ b/Src/nsv/nsvplay/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "main.h" #include "video.h" diff --git a/Src/nsv/nsvplay/nsvplay.dsp b/Src/nsv/nsvplay/nsvplay.dsp index 4b49c0b14..e21070b90 100644 --- a/Src/nsv/nsvplay/nsvplay.dsp +++ b/Src/nsv/nsvplay/nsvplay.dsp @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ddraw.lib wsock32.lib vfw32.lib /nologo /subsystem:windows /machine:I386 /out:"c:\nsv\nsvplay.exe" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:arch /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ddraw.lib wsock32.lib vfw32.lib /nologo /subsystem:arch /machine:I386 /out:"c:\nsv\nsvplay.exe" !ELSEIF "$(CFG)" == "nsvplay - Win32 Debug" @@ -79,8 +79,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ddraw.lib winmm.lib wsock32.lib vfw32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"c:\nsv\nsvplay.exe" /pdbtype:sept +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:arch /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ddraw.lib winmm.lib wsock32.lib vfw32.lib /nologo /subsystem:arch /debug /machine:I386 /out:"c:\nsv\nsvplay.exe" /pdbtype:sept !ENDIF diff --git a/Src/nsv/nsvplay/readers.cpp b/Src/nsv/nsvplay/readers.cpp index ff048e709..a097b0e5f 100644 --- a/Src/nsv/nsvplay/readers.cpp +++ b/Src/nsv/nsvplay/readers.cpp @@ -1,4 +1,4 @@ -#include +#include #include "main.h" #include diff --git a/Src/nsv/nsvplay/vid_ddraw.cpp b/Src/nsv/nsvplay/vid_ddraw.cpp index b4c0af689..3465af351 100644 --- a/Src/nsv/nsvplay/vid_ddraw.cpp +++ b/Src/nsv/nsvplay/vid_ddraw.cpp @@ -620,7 +620,7 @@ void DDrawVideoOutput::displayFrame(const char *buf, int size, int time) { ClientToScreen(hwnd,(LPPOINT)&r); ClientToScreen(hwnd,((LPPOINT)&r) + 1); - // transform coords from windows desktop coords (where 0,0==upper-left corner of box encompassing all monitors) + // transform coords from arch desktop coords (where 0,0==upper-left corner of box encompassing all monitors) // to the coords for the monitor we're displaying on: r.left-=m_mon_x; r.right-=m_mon_x; diff --git a/Src/nsv/nsvplay/video.cpp b/Src/nsv/nsvplay/video.cpp index 8a6532c76..2c657e010 100644 --- a/Src/nsv/nsvplay/video.cpp +++ b/Src/nsv/nsvplay/video.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "main.h" #include "video.h" @@ -723,7 +723,7 @@ void VideoOutput::drawOSD(HDC hdc, RECT *rg) { GetClientRect(video_hwnd,&fullr); ClientToScreen(video_hwnd,(LPPOINT)&fullr); ClientToScreen(video_hwnd,((LPPOINT)&fullr) + 1); - // transform coords from windows desktop coords (where 0,0==upper-left corner of the primary monitor) + // transform coords from arch desktop coords (where 0,0==upper-left corner of the primary monitor) // to the coords for the monitor we're displaying on: fullr.top -= m_video_output->m_mon_y; fullr.left -= m_video_output->m_mon_x; diff --git a/Src/nsv/nsvplay/video.h b/Src/nsv/nsvplay/video.h index 535cee242..f651f4f82 100644 --- a/Src/nsv/nsvplay/video.h +++ b/Src/nsv/nsvplay/video.h @@ -1,7 +1,7 @@ #ifndef _VIDEO_H #define _VIDEO_H -#include +#include #include #include diff --git a/Src/nsv/nsvplay/vp5stub.cpp b/Src/nsv/nsvplay/vp5stub.cpp index 9c49c359d..f97f30201 100644 --- a/Src/nsv/nsvplay/vp5stub.cpp +++ b/Src/nsv/nsvplay/vp5stub.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../nsvlib.h" #include "../dec_if.h" diff --git a/Src/nsvdec_vp5/nsvdec_vp5.vcxproj b/Src/nsvdec_vp5/nsvdec_vp5.vcxproj index 89238d6ba..04ca29f5b 100644 --- a/Src/nsvdec_vp5/nsvdec_vp5.vcxproj +++ b/Src/nsvdec_vp5/nsvdec_vp5.vcxproj @@ -99,26 +99,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/nsvdec_vp5/vp5stub.cpp b/Src/nsvdec_vp5/vp5stub.cpp index 9bd0e1d04..2e28cb09e 100644 --- a/Src/nsvdec_vp5/vp5stub.cpp +++ b/Src/nsvdec_vp5/vp5stub.cpp @@ -20,7 +20,7 @@ ** */ -#include +#include #include "../nsv/nsvlib.h" #include "../nsv/dec_if.h" #include "../libvp6/include/duck_dxl.h" diff --git a/Src/nsvdec_vp6/vp6stub.cpp b/Src/nsvdec_vp6/vp6stub.cpp index 31d2326a1..55cc1a4b2 100644 --- a/Src/nsvdec_vp6/vp6stub.cpp +++ b/Src/nsvdec_vp6/vp6stub.cpp @@ -22,7 +22,7 @@ ** */ #ifdef _WIN32 -#include +#include #endif #include #include "../nsv/nsvlib.h" diff --git a/Src/nu/AutoChar.h b/Src/nu/AutoChar.h index 0e3e0ea22..5e4e06da1 100644 --- a/Src/nu/AutoChar.h +++ b/Src/nu/AutoChar.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_AUTOCHARH #define NULLSOFT_AUTOCHARH #ifdef WIN32 -#include +#include inline char *AutoCharDupN(const wchar_t *convert, size_t len, UINT codePage = CP_ACP, UINT flags=0) diff --git a/Src/nu/AutoCharFn.h b/Src/nu/AutoCharFn.h index 3b5b77503..d3d86c106 100644 --- a/Src/nu/AutoCharFn.h +++ b/Src/nu/AutoCharFn.h @@ -8,7 +8,7 @@ #endif -#include +#include #include class AutoCharFn diff --git a/Src/nu/AutoHeader.h b/Src/nu/AutoHeader.h index 366b169d6..2a56baf7c 100644 --- a/Src/nu/AutoHeader.h +++ b/Src/nu/AutoHeader.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_AUTOHEADERH #define NULLSOFT_AUTOHEADERH -#include +#include #include "AutoChar.h" diff --git a/Src/nu/AutoLock.h b/Src/nu/AutoLock.h index 92c9524bf..d8134b9a9 100644 --- a/Src/nu/AutoLock.h +++ b/Src/nu/AutoLock.h @@ -3,7 +3,7 @@ #define AUTOLOCKH #ifdef _WIN32 -#include +#include #else #include #endif @@ -22,7 +22,7 @@ any threads using the mutex, and their function stack #include // we make a list of the recursive function stack for each thread #include // and map #include // we output to std::cerr -#include +#include /***** diff --git a/Src/nu/AutoUrl.h b/Src/nu/AutoUrl.h index 2431d9ce3..c190225ee 100644 --- a/Src/nu/AutoUrl.h +++ b/Src/nu/AutoUrl.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_AUTOURLH #define NULLSOFT_AUTOURLH -#include +#include #include "AutoChar.h" /* benski> i'm sure there's a nice optimized way of doing this, but I need to implement it _right now_ */ diff --git a/Src/nu/AutoWide.h b/Src/nu/AutoWide.h index 505bfb248..53f68d525 100644 --- a/Src/nu/AutoWide.h +++ b/Src/nu/AutoWide.h @@ -1,7 +1,7 @@ #ifndef AUTOWIDEH #define AUTOWIDEH #ifdef WIN32 -#include +#include inline wchar_t *AutoWideDup( const char *convert, UINT codePage = CP_ACP ) { diff --git a/Src/nu/AutoWideFn.h b/Src/nu/AutoWideFn.h index 5d44dee33..dfbb47861 100644 --- a/Src/nu/AutoWideFn.h +++ b/Src/nu/AutoWideFn.h @@ -8,7 +8,7 @@ #define REMOVE_FILENAME_SIZE #endif -#include +#include #include "AutoWide.h" #include "AutoChar.h" #include diff --git a/Src/nu/CCVersion.cpp b/Src/nu/CCVersion.cpp index 8d0b52c21..4752fdaa7 100644 --- a/Src/nu/CCVersion.cpp +++ b/Src/nu/CCVersion.cpp @@ -1,5 +1,5 @@ #include "CCVersion.h" -#include +#include #include #include diff --git a/Src/nu/CCVersion.h b/Src/nu/CCVersion.h index aba59014f..1cdfe09d7 100644 --- a/Src/nu/CCVersion.h +++ b/Src/nu/CCVersion.h @@ -1,6 +1,6 @@ #ifndef NULLSOFT_CCVERSIONH #define NULLSOFT_CCVERSIONH -#include +#include DWORD GetCommCtrlDllVersion(LPCTSTR); #define PACKVERSION(major,minor) MAKELONG(minor,major) #endif \ No newline at end of file diff --git a/Src/nu/CGlobalAtom.h b/Src/nu/CGlobalAtom.h index b9fbd89a0..8c671d358 100644 --- a/Src/nu/CGlobalAtom.h +++ b/Src/nu/CGlobalAtom.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class CGlobalAtom { public: diff --git a/Src/nu/ComboBox.h b/Src/nu/ComboBox.h index 150d6a6bf..47cbee45b 100644 --- a/Src/nu/ComboBox.h +++ b/Src/nu/ComboBox.h @@ -1,6 +1,6 @@ #ifndef NULLSOFT_UTILITY_COMBOBOX_H #define NULLSOFT_UTILITY_COMBOBOX_H -#include +#include class ComboBox { public: diff --git a/Src/nu/Config.h b/Src/nu/Config.h index ddc992ded..2bf400450 100644 --- a/Src/nu/Config.h +++ b/Src/nu/Config.h @@ -2,7 +2,7 @@ #define NULLSOFT_UTILITY_CONFIGH #include #include -#include +#include typedef std::wstring tstring; diff --git a/Src/nu/LockFreeItem.h b/Src/nu/LockFreeItem.h index b3cc06498..ce64b4424 100644 --- a/Src/nu/LockFreeItem.h +++ b/Src/nu/LockFreeItem.h @@ -1,5 +1,5 @@ #pragma once -#include +#include /* This data structure holds one item, and returns you the old item when you replace it it's sort of a "stack of 1" */ diff --git a/Src/nu/LockFreeStack.h b/Src/nu/LockFreeStack.h index 7c1d1b1e1..c68897d1f 100644 --- a/Src/nu/LockFreeStack.h +++ b/Src/nu/LockFreeStack.h @@ -1,5 +1,5 @@ #pragma once -#include +#include /* lock free stack object multiple threads can push and pop without locking diff --git a/Src/nu/MainThread.h b/Src/nu/MainThread.h index 0d3e84d13..001c2cfc5 100644 --- a/Src/nu/MainThread.h +++ b/Src/nu/MainThread.h @@ -1,6 +1,6 @@ #ifndef NULLSOFT_MAINTHREADH #define NULLSOFT_MAINTHREADH -#include +#include class Lambda { public: diff --git a/Src/nu/MediaLibraryInterface.h b/Src/nu/MediaLibraryInterface.h index 45e6d2f9f..2273d11ae 100644 --- a/Src/nu/MediaLibraryInterface.h +++ b/Src/nu/MediaLibraryInterface.h @@ -2,7 +2,7 @@ #ifndef MEDIALIBRARYINTERFACEH #define MEDIALIBRARYINTERFACEH -#include +#include #include #include "..\Plugins\General\gen_ml/ml.h" diff --git a/Src/nu/NonBlockLock.h b/Src/nu/NonBlockLock.h index c9dbb2c18..989906d56 100644 --- a/Src/nu/NonBlockLock.h +++ b/Src/nu/NonBlockLock.h @@ -1,7 +1,7 @@ #pragma warning (disable:4786) #ifndef NONBLOCKLOCKH #define NONBLOCKLOCKH -#include +#include /* @@ -20,7 +20,7 @@ any threads using the mutex, and their function stack #include // we make a list of the recursive function stack for each thread #include // and map #include // we output to std::cerr -#include +#include #endif /***** diff --git a/Src/nu/Slider.h b/Src/nu/Slider.h index 8db42a6eb..87d7e6e53 100644 --- a/Src/nu/Slider.h +++ b/Src/nu/Slider.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include class Slider { diff --git a/Src/nu/VideoClock.h b/Src/nu/VideoClock.h index 0ff82cf0a..92133d0c4 100644 --- a/Src/nu/VideoClock.h +++ b/Src/nu/VideoClock.h @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace nu { diff --git a/Src/nu/comboskin.h b/Src/nu/comboskin.h index 39f7bb4e3..e7459c1ed 100644 --- a/Src/nu/comboskin.h +++ b/Src/nu/comboskin.h @@ -1,7 +1,7 @@ #ifndef _COMBOSKIN_H #define _COMBOSKIN_H -#include +#include class ComboSkin { diff --git a/Src/nu/cstrlib.cpp b/Src/nu/cstrlib.cpp index be23972ac..726ddca5f 100644 --- a/Src/nu/cstrlib.cpp +++ b/Src/nu/cstrlib.cpp @@ -1,6 +1,6 @@ /* Utility library for C strings */ -#include +#include extern "C" char *scanstr_back(char *str, char *toscan, char *defval) diff --git a/Src/nu/listview.cpp b/Src/nu/listview.cpp index 05e60efb9..8b113592c 100644 --- a/Src/nu/listview.cpp +++ b/Src/nu/listview.cpp @@ -16,7 +16,7 @@ ** */ -#include +#include #include #include "listview.h" diff --git a/Src/nu/listview.h b/Src/nu/listview.h index d29db58aa..c59d8e00e 100644 --- a/Src/nu/listview.h +++ b/Src/nu/listview.h @@ -19,8 +19,8 @@ #ifndef _LISTVIEW_H_ #define _LISTVIEW_H_ -#include -#include +#include +#include #include #ifndef LVS_EX_DOUBLEBUFFER //this will work XP only diff --git a/Src/nu/menushortcuts.h b/Src/nu/menushortcuts.h index b9c9127a7..b23f64e48 100644 --- a/Src/nu/menushortcuts.h +++ b/Src/nu/menushortcuts.h @@ -5,7 +5,7 @@ #pragma once #endif -#include +#include #define MSF_REPLACE 0x0000 #define MSF_APPEND 0x0001 diff --git a/Src/nu/ns_wc.h b/Src/nu/ns_wc.h index 5d3fecfd1..6300cd24c 100644 --- a/Src/nu/ns_wc.h +++ b/Src/nu/ns_wc.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #ifdef __cplusplus extern "C" diff --git a/Src/nu/refcount.h b/Src/nu/refcount.h index 9ab52f4eb..d2d10277f 100644 --- a/Src/nu/refcount.h +++ b/Src/nu/refcount.h @@ -1,6 +1,6 @@ #pragma once #define WIN32_LEAN_AND_MEAN -#include +#include template class Countable : public ifc_t { diff --git a/Src/nu/simple_rwlock.h b/Src/nu/simple_rwlock.h index f9952959a..0254bb363 100644 --- a/Src/nu/simple_rwlock.h +++ b/Src/nu/simple_rwlock.h @@ -6,7 +6,7 @@ not meant for high-throughput uses this is useful when writes are very infrequent */ #include -#include +#include typedef size_t simple_rwlock_t; static const size_t simple_rwlock_writer_active = 1; // writer active flag diff --git a/Src/nu/smalheap.c b/Src/nu/smalheap.c index de8a1bed1..4cd6cbe5c 100644 --- a/Src/nu/smalheap.c +++ b/Src/nu/smalheap.c @@ -9,7 +9,7 @@ *******************************************************************************/ #include #include -#include +#include #define BYTES_PER_PARA 16 #define DWORDS_PER_PARA 4 diff --git a/Src/nu/strsafe.h b/Src/nu/strsafe.h index 39fae5ead..51b598dd2 100644 --- a/Src/nu/strsafe.h +++ b/Src/nu/strsafe.h @@ -6400,7 +6400,7 @@ STRSAFE_INLINE_API StringGetsExWorkerW(wchar_t* pszDest, size_t cchDest, size_t #pragma deprecated(gets) #pragma deprecated(_getws) -// Then all the windows.h names - we need to undef and redef based on UNICODE setting +// Then all the arch.h names - we need to undef and redef based on UNICODE setting #undef lstrcpy #undef lstrcat #undef wsprintf diff --git a/Src/nu/threadname.h b/Src/nu/threadname.h index d89b5beae..fdd23145b 100644 --- a/Src/nu/threadname.h +++ b/Src/nu/threadname.h @@ -2,7 +2,7 @@ #define NULLSOFT_UTILITY_THREADNAME_H #ifdef _DEBUG -#include +#include typedef struct tagTHREADNAME_INFO { diff --git a/Src/nu/threadpool/ThreadID.h b/Src/nu/threadpool/ThreadID.h index e5d1e09ec..f5f4b8aed 100644 --- a/Src/nu/threadpool/ThreadID.h +++ b/Src/nu/threadpool/ThreadID.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "ThreadFunctions.h" #include "threadpool_types.h" #include diff --git a/Src/nu/threadpool/ThreadPool.h b/Src/nu/threadpool/ThreadPool.h index f68efc125..b9b3fbf01 100644 --- a/Src/nu/threadpool/ThreadPool.h +++ b/Src/nu/threadpool/ThreadPool.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include "../autolock.h" diff --git a/Src/nu/threadpool/TimerHandle.hpp b/Src/nu/threadpool/TimerHandle.hpp index ccbb6ef64..daa127fe5 100644 --- a/Src/nu/threadpool/TimerHandle.hpp +++ b/Src/nu/threadpool/TimerHandle.hpp @@ -5,7 +5,7 @@ #error Must define _WIN32_WINNT >= 0x400 to use TimerHandle #endif -#include +#include #include /* TimerHandle() constructor will make a new timer handle diff --git a/Src/nu/threadpool/api_threadpool.h b/Src/nu/threadpool/api_threadpool.h index 4cf5ab4f6..65324eeb1 100644 --- a/Src/nu/threadpool/api_threadpool.h +++ b/Src/nu/threadpool/api_threadpool.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/Src/nu/threadpool/threadpool_types.h b/Src/nu/threadpool/threadpool_types.h index 9a23e8332..3cd47f3c9 100644 --- a/Src/nu/threadpool/threadpool_types.h +++ b/Src/nu/threadpool/threadpool_types.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include namespace ThreadPoolTypes { typedef std::deque HandleList; diff --git a/Src/nu/windowsTheme.cpp b/Src/nu/windowsTheme.cpp index 2085e30cb..a7e705f68 100644 --- a/Src/nu/windowsTheme.cpp +++ b/Src/nu/windowsTheme.cpp @@ -1,4 +1,4 @@ -#include "./windowsTheme.h" +#include "./archTheme.h" #include diff --git a/Src/nu/winstr.c b/Src/nu/winstr.c index 1a97df28c..915b1d4b9 100644 --- a/Src/nu/winstr.c +++ b/Src/nu/winstr.c @@ -1,4 +1,4 @@ -#include +#include #ifdef __cplusplus extern "C" { #endif diff --git a/Src/omBrowser/curtain.cpp b/Src/omBrowser/curtain.cpp index 4057fcc3d..de41a08d0 100644 --- a/Src/omBrowser/curtain.cpp +++ b/Src/omBrowser/curtain.cpp @@ -10,7 +10,7 @@ #include "./ifc_skinhelper.h" #include -#include +#include #define WIDGET_MINWIDTH_UNITS 60 #define WIDGET_MAXWIDTH_UNITS 200 diff --git a/Src/omBrowser/ifc_ombrowserwndmngr.h b/Src/omBrowser/ifc_ombrowserwndmngr.h index e333ae0d7..dc1d6da00 100644 --- a/Src/omBrowser/ifc_ombrowserwndmngr.h +++ b/Src/omBrowser/ifc_ombrowserwndmngr.h @@ -22,7 +22,7 @@ protected: public: HRESULT RegisterWindow(HWND hwnd, const GUID *windowType); HRESULT UnregisterWindow(HWND hwnd); - HRESULT Enumerate(const GUID *windowType, unsigned int *serviceIdFilter, ifc_ombrowserwndenum **enumerator); // serviceIdFilter can be NULL if you want to get all windows + HRESULT Enumerate(const GUID *windowType, unsigned int *serviceIdFilter, ifc_ombrowserwndenum **enumerator); // serviceIdFilter can be NULL if you want to get all arch public: DISPATCH_CODES diff --git a/Src/omBrowser/localization/localization.vcxproj b/Src/omBrowser/localization/localization.vcxproj index dd9f9dde4..ccb642d98 100644 --- a/Src/omBrowser/localization/localization.vcxproj +++ b/Src/omBrowser/localization/localization.vcxproj @@ -104,26 +104,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/omBrowser/omBrowser.vcxproj b/Src/omBrowser/omBrowser.vcxproj index b66a6ac90..23c85514c 100644 --- a/Src/omBrowser/omBrowser.vcxproj +++ b/Src/omBrowser/omBrowser.vcxproj @@ -89,16 +89,16 @@ .w5s - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/omBrowser/options.cpp b/Src/omBrowser/options.cpp index 5a6f94a78..010e93c60 100644 --- a/Src/omBrowser/options.cpp +++ b/Src/omBrowser/options.cpp @@ -10,7 +10,7 @@ #include "../winamp/wa_ipc.h" -#include +#include #include #include #include diff --git a/Src/omBrowser/optionsDebug.cpp b/Src/omBrowser/optionsDebug.cpp index 2f7984935..acffc8d7a 100644 --- a/Src/omBrowser/optionsDebug.cpp +++ b/Src/omBrowser/optionsDebug.cpp @@ -6,7 +6,7 @@ #include "./ifc_omconfig.h" #include "./ifc_omdebugconfig.h" -#include +#include #include #include #include diff --git a/Src/omBrowser/optionsInfo.cpp b/Src/omBrowser/optionsInfo.cpp index b92d9017f..db659b905 100644 --- a/Src/omBrowser/optionsInfo.cpp +++ b/Src/omBrowser/optionsInfo.cpp @@ -7,7 +7,7 @@ #include "./ifc_ombrowserclass.h" #include "./ieversion.h" -#include +#include #include #include diff --git a/Src/omBrowser/optionsUi.cpp b/Src/omBrowser/optionsUi.cpp index c0dd4f5a0..86ed67116 100644 --- a/Src/omBrowser/optionsUi.cpp +++ b/Src/omBrowser/optionsUi.cpp @@ -7,7 +7,7 @@ #include "./ifc_omtoolbarconfig.h" #include "./ifc_omstatusbarconfig.h" -#include +#include #include #include #include diff --git a/Src/omBrowser/skinHelper.cpp b/Src/omBrowser/skinHelper.cpp index 8f4ecdfbf..801859f51 100644 --- a/Src/omBrowser/skinHelper.cpp +++ b/Src/omBrowser/skinHelper.cpp @@ -8,7 +8,7 @@ #include "./skinHelper.h" #include "./ratingMenuCustomizer.h" #include "./ifc_menucustomizer.h" -#include +#include #include #include diff --git a/Src/omBrowser/statusbar.cpp b/Src/omBrowser/statusbar.cpp index 97818d3ab..c8a9f2d4f 100644 --- a/Src/omBrowser/statusbar.cpp +++ b/Src/omBrowser/statusbar.cpp @@ -8,7 +8,7 @@ #include "./ifc_skinhelper.h" #include "./ifc_wasabihelper.h" -#include +#include #include #include diff --git a/Src/omBrowser/toolbar.cpp b/Src/omBrowser/toolbar.cpp index d1a0d78cd..1dd167dd8 100644 --- a/Src/omBrowser/toolbar.cpp +++ b/Src/omBrowser/toolbar.cpp @@ -20,7 +20,7 @@ #include "./browserUiCommon.h" -#include +#include #include #include #include diff --git a/Src/omBrowser/winampHook.cpp b/Src/omBrowser/winampHook.cpp index ba4604be0..b80271e62 100644 --- a/Src/omBrowser/winampHook.cpp +++ b/Src/omBrowser/winampHook.cpp @@ -3,7 +3,7 @@ #include "./ifc_winamphook.h" #include "../winamp/wa_ipc.h" -#include +#include #define WINAMP_REFRESHSKIN 40291 #define WHPROCRECOVERY L"WaHookProcRecovery" diff --git a/Src/pcm/pcm.vcxproj b/Src/pcm/pcm.vcxproj index 194781052..b85f4e889 100644 --- a/Src/pcm/pcm.vcxproj +++ b/Src/pcm/pcm.vcxproj @@ -89,16 +89,16 @@ .w5s - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/pfc/cfg_var.cpp b/Src/pfc/cfg_var.cpp index 58ca463e0..f15c3bc1a 100644 --- a/Src/pfc/cfg_var.cpp +++ b/Src/pfc/cfg_var.cpp @@ -1,5 +1,5 @@ #define STRICT -#include +#include #include "cfg_var.h" #include "string_unicode.h" diff --git a/Src/pfc/pfc.h b/Src/pfc/pfc.h index c6472d57b..eececc5a5 100644 --- a/Src/pfc/pfc.h +++ b/Src/pfc/pfc.h @@ -1,7 +1,7 @@ #ifndef STRICT #define STRICT #endif -#include +#include #ifndef NOVTABLE #define NOVTABLE _declspec(novtable) diff --git a/Src/pfc/string.cpp b/Src/pfc/string.cpp index bdf796073..6f804c1a9 100644 --- a/Src/pfc/string.cpp +++ b/Src/pfc/string.cpp @@ -1,5 +1,5 @@ #define STRICT -#include +#include #include #include "string_unicode.h" diff --git a/Src/pfc/string_unicode.cpp b/Src/pfc/string_unicode.cpp index 8952b888f..d1d7a051b 100644 --- a/Src/pfc/string_unicode.cpp +++ b/Src/pfc/string_unicode.cpp @@ -1,5 +1,5 @@ #define STRICT -#include +#include #include #include "string_unicode.h" diff --git a/Src/playlist/PLSLoader.h b/Src/playlist/PLSLoader.h index ebff25a0b..fd1008f9e 100644 --- a/Src/playlist/PLSLoader.h +++ b/Src/playlist/PLSLoader.h @@ -2,7 +2,7 @@ #define NULLSOFT_PLAYLIST_PLSLOADER_H #include "ifc_playlistloader.h" -#include +#include class PLSLoader : public ifc_playlistloader { diff --git a/Src/playlist/Playlist.h b/Src/playlist/Playlist.h index 0368b57c6..9300cf642 100644 --- a/Src/playlist/Playlist.h +++ b/Src/playlist/Playlist.h @@ -3,7 +3,7 @@ #include "ifc_playlist.h" -#include // for MAX_PATH +#include // for MAX_PATH #include "pl_entry.h" #include "ifc_playlistT.h" #include "ifc_playlistloadercallbackT.h" diff --git a/Src/playlist/main.h b/Src/playlist/main.h index 62b603345..7bc70e404 100644 --- a/Src/playlist/main.h +++ b/Src/playlist/main.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_PLAYLIST_MAIN_H #define NULLSOFT_PLAYLIST_MAIN_H -#include +#include #include #include "..\Components\wac_network\wac_network_http_receiver_api.h" diff --git a/Src/playlist/pl_entry.h b/Src/playlist/pl_entry.h index 852b584d9..4848d10f5 100644 --- a/Src/playlist/pl_entry.h +++ b/Src/playlist/pl_entry.h @@ -2,7 +2,7 @@ #define NULLSOFT_ML_PLAYLISTS_PL_ENTRY_H #include "ifc_plentryinfo.h" -#include +#include #include #include diff --git a/Src/playlist/playlist.vcxproj b/Src/playlist/playlist.vcxproj index f0bfa185a..c67196a80 100644 --- a/Src/playlist/playlist.vcxproj +++ b/Src/playlist/playlist.vcxproj @@ -92,18 +92,18 @@ false - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md Debug - x86-windows-static-md + x86-arch-static-md - x86-windows-static-md + x86-arch-static-md diff --git a/Src/plist/loader.cpp b/Src/plist/loader.cpp index c36755930..35dd969e7 100644 --- a/Src/plist/loader.cpp +++ b/Src/plist/loader.cpp @@ -6,7 +6,7 @@ //------------------------------------------------------------------------ #include "loader.h" -#include +#include #include #include diff --git a/Src/plist/plist.vcxproj b/Src/plist/plist.vcxproj index 44a2c2786..b0ffa954b 100644 --- a/Src/plist/plist.vcxproj +++ b/Src/plist/plist.vcxproj @@ -93,26 +93,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/png/png.vcxproj b/Src/png/png.vcxproj index c6aabdb89..0d3d5b46f 100644 --- a/Src/png/png.vcxproj +++ b/Src/png/png.vcxproj @@ -97,26 +97,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/replicant/Wasabi/Wasabi-replicant.vcxproj b/Src/replicant/Wasabi/Wasabi-replicant.vcxproj index 90d69db53..54a1ae634 100644 --- a/Src/replicant/Wasabi/Wasabi-replicant.vcxproj +++ b/Src/replicant/Wasabi/Wasabi-replicant.vcxproj @@ -97,7 +97,7 @@ false - x86-windows-static-md + x86-arch-static-md @@ -109,7 +109,7 @@ false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/replicant/component/ifc_component.h b/Src/replicant/component/ifc_component.h index 370c45805..cb681ce62 100644 --- a/Src/replicant/component/ifc_component.h +++ b/Src/replicant/component/ifc_component.h @@ -6,7 +6,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #endif #ifdef __APPLE__ diff --git a/Src/replicant/foundation/win-amd64/types.h b/Src/replicant/foundation/win-amd64/types.h index 2b176f0f8..e8344c2a0 100644 --- a/Src/replicant/foundation/win-amd64/types.h +++ b/Src/replicant/foundation/win-amd64/types.h @@ -2,7 +2,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #include // first, some standard int types @@ -33,7 +33,7 @@ typedef int socklen_t; #include #include - // since windows doesn't have stdint.h + // since arch doesn't have stdint.h typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; diff --git a/Src/replicant/foundation/win-x86/types.h b/Src/replicant/foundation/win-x86/types.h index 156f009a2..cc8af962b 100644 --- a/Src/replicant/foundation/win-x86/types.h +++ b/Src/replicant/foundation/win-x86/types.h @@ -2,7 +2,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #include // first, some standard int types @@ -34,7 +34,7 @@ typedef int socklen_t; #if _MSC_VER >= 1600 #include #else - // since windows doesn't have stdint.h + // since arch doesn't have stdint.h typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; diff --git a/Src/replicant/jnetlib/jnetlib.vcxproj b/Src/replicant/jnetlib/jnetlib.vcxproj index c0913b228..1b535b88f 100644 --- a/Src/replicant/jnetlib/jnetlib.vcxproj +++ b/Src/replicant/jnetlib/jnetlib.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/replicant/jnetlib/netinc.h b/Src/replicant/jnetlib/netinc.h index 1952d3d7d..3d9df5fc9 100644 --- a/Src/replicant/jnetlib/netinc.h +++ b/Src/replicant/jnetlib/netinc.h @@ -15,7 +15,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #include #include #include diff --git a/Src/replicant/nsapev2/nsapev2.h b/Src/replicant/nsapev2/nsapev2.h index 1b703d1e6..b0f2f524c 100644 --- a/Src/replicant/nsapev2/nsapev2.h +++ b/Src/replicant/nsapev2/nsapev2.h @@ -6,7 +6,7 @@ #ifdef __ANDROID__ #include "android/nsapev2.h" #elif defined(_WIN32) -#include "windows/nsapev2.h" +#include "arch/nsapev2.h" #elif defined(__linux__) #include "linux/nsapev2.h" #elif defined (__APPLE__) diff --git a/Src/replicant/nsapev2/nsapev2.vcxproj b/Src/replicant/nsapev2/nsapev2.vcxproj index cf514039d..cd68b6664 100644 --- a/Src/replicant/nsapev2/nsapev2.vcxproj +++ b/Src/replicant/nsapev2/nsapev2.vcxproj @@ -154,7 +154,7 @@ - +     @@ -164,7 +164,7 @@ - + diff --git a/Src/replicant/nsid3v2/nsid3v2.h b/Src/replicant/nsid3v2/nsid3v2.h index b656c07d3..a623edc4a 100644 --- a/Src/replicant/nsid3v2/nsid3v2.h +++ b/Src/replicant/nsid3v2/nsid3v2.h @@ -4,7 +4,7 @@ #ifdef __ANDROID__ #include "android/nsid3v2.h" #elif defined(_WIN32) -#include "windows/nsid3v2.h" +#include "arch/nsid3v2.h" #elif defined(__linux__) #include "linux/nsid3v2.h" #elif defined(__APPLE__) diff --git a/Src/replicant/nsmp3dec/regtypes.h b/Src/replicant/nsmp3dec/regtypes.h index 5de3c2cf2..e6a347c5f 100644 --- a/Src/replicant/nsmp3dec/regtypes.h +++ b/Src/replicant/nsmp3dec/regtypes.h @@ -13,7 +13,7 @@ * \***************************************************************************/ -/* the typedefs should be in place if we already got windows.h included */ +/* the typedefs should be in place if we already got arch.h included */ #ifndef _INC_WINDOWS diff --git a/Src/replicant/nu/AutoChar.h b/Src/replicant/nu/AutoChar.h index b89bfa316..3014582e8 100644 --- a/Src/replicant/nu/AutoChar.h +++ b/Src/replicant/nu/AutoChar.h @@ -1,7 +1,7 @@ #ifndef NULLSOFT_AUTOCHARH #define NULLSOFT_AUTOCHARH #ifdef WIN32 -#include +#include #include inline char *AutoCharDupN(const wchar_t *convert, size_t len, UINT codePage = CP_ACP, UINT flags=0) diff --git a/Src/replicant/nu/AutoLock.h b/Src/replicant/nu/AutoLock.h index 02370cfce..cfcb0ca10 100644 --- a/Src/replicant/nu/AutoLock.h +++ b/Src/replicant/nu/AutoLock.h @@ -3,7 +3,7 @@ #ifdef _WIN32 #pragma warning (disable:4786) -#include +#include #elif defined(__linux__) || defined(__APPLE__) #include #else @@ -24,7 +24,7 @@ any threads using the mutex, and their function stack #include // we make a list of the recursive function stack for each thread #include // and map #include // we output to std::cerr -#include +#include /***** diff --git a/Src/replicant/nu/AutoWide.h b/Src/replicant/nu/AutoWide.h index 7897aa99a..10d76bb3a 100644 --- a/Src/replicant/nu/AutoWide.h +++ b/Src/replicant/nu/AutoWide.h @@ -1,7 +1,7 @@ #ifndef AUTOWIDEH #define AUTOWIDEH #ifdef WIN32 -#include +#include #include inline wchar_t *AutoWideDup(const char *convert, UINT codePage=CP_ACP) diff --git a/Src/replicant/nu/LockFreeLIFO.c b/Src/replicant/nu/LockFreeLIFO.c index eb9c1eb1f..5ac6fc984 100644 --- a/Src/replicant/nu/LockFreeLIFO.c +++ b/Src/replicant/nu/LockFreeLIFO.c @@ -1,7 +1,7 @@ #include "LockFreeLIFO.h" #include "foundation/atomics.h" -/* TODO: on windows, replace with InitializeSListHead/InterlockedPushEntrySList/InterlockedPopEntrySList just to be safe */ +/* TODO: on arch, replace with InitializeSListHead/InterlockedPushEntrySList/InterlockedPopEntrySList just to be safe */ void lifo_init(lifo_t *lifo) { lifo->head = 0; diff --git a/Src/replicant/nu/ns_wc.h b/Src/replicant/nu/ns_wc.h index 0520f7dad..62c244586 100644 --- a/Src/replicant/nu/ns_wc.h +++ b/Src/replicant/nu/ns_wc.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #ifdef __cplusplus extern "C" diff --git a/Src/replicant/nu/nu.vcxproj b/Src/replicant/nu/nu.vcxproj index 25e634f8b..30fbbedc8 100644 --- a/Src/replicant/nu/nu.vcxproj +++ b/Src/replicant/nu/nu.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/replicant/nu/precomp.h b/Src/replicant/nu/precomp.h index f19fd91ac..2126f6d28 100644 --- a/Src/replicant/nu/precomp.h +++ b/Src/replicant/nu/precomp.h @@ -12,7 +12,7 @@ #include #ifdef WIN32 -#include +#include #else #include #endif //WIN32 diff --git a/Src/replicant/nu/win-amd64/LockFreeLIFO.h b/Src/replicant/nu/win-amd64/LockFreeLIFO.h index 5cf087e7f..cf9d4d7ce 100644 --- a/Src/replicant/nu/win-amd64/LockFreeLIFO.h +++ b/Src/replicant/nu/win-amd64/LockFreeLIFO.h @@ -2,7 +2,7 @@ #include "nu/queue_node.h" -#include +#include #include /* lock free stack object diff --git a/Src/replicant/nu/win-amd64/ThreadLoop.h b/Src/replicant/nu/win-amd64/ThreadLoop.h index f1552b51e..046ceff71 100644 --- a/Src/replicant/nu/win-amd64/ThreadLoop.h +++ b/Src/replicant/nu/win-amd64/ThreadLoop.h @@ -2,7 +2,7 @@ #include "nu/lfmpscq.h" #include "nu/LockFreeLIFO.h" #define WIN32_LEAN_AND_MEAN -#include +#include struct threadloop_node_t : public queue_node_t { diff --git a/Src/replicant/nu/win-x86/ThreadLoop.h b/Src/replicant/nu/win-x86/ThreadLoop.h index cc412386f..d18b98d98 100644 --- a/Src/replicant/nu/win-x86/ThreadLoop.h +++ b/Src/replicant/nu/win-x86/ThreadLoop.h @@ -1,7 +1,7 @@ #pragma once #include "nu/lfmpscq.h" #include "nu/LockFreeLIFO.h" -#include +#include struct threadloop_node_t : public queue_node_t { diff --git a/Src/replicant/nu/win/MessageLoop.h b/Src/replicant/nu/win/MessageLoop.h index 88e4520f3..445567970 100644 --- a/Src/replicant/nu/win/MessageLoop.h +++ b/Src/replicant/nu/win/MessageLoop.h @@ -2,7 +2,7 @@ #include "foundation/types.h" #include "nu/lfmpscq.h" #include "nu/LockFreeLIFO.h" -#include +#include namespace nu { diff --git a/Src/replicant/nu/win/ThreadLoop.h b/Src/replicant/nu/win/ThreadLoop.h index 22f16c3da..252cb7ddc 100644 --- a/Src/replicant/nu/win/ThreadLoop.h +++ b/Src/replicant/nu/win/ThreadLoop.h @@ -1,7 +1,7 @@ #pragma once #include "nu/lfmpscq.h" #include "nu/LockFreeLIFO.h" -#include +#include struct threadloop_node_t : public queue_node_t { diff --git a/Src/replicant/nx/nx.vcxproj b/Src/replicant/nx/nx.vcxproj index 2dc85a2dd..e3ca7121e 100644 --- a/Src/replicant/nx/nx.vcxproj +++ b/Src/replicant/nx/nx.vcxproj @@ -96,26 +96,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/replicant/nx/win/NXFileObject.cpp b/Src/replicant/nx/win/NXFileObject.cpp index 8f1255dbf..b0e3715a5 100644 --- a/Src/replicant/nx/win/NXFileObject.cpp +++ b/Src/replicant/nx/win/NXFileObject.cpp @@ -1,7 +1,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #include "NXFileObject.h" #include "nx/nxfile.h" diff --git a/Src/replicant/nx/win/NXFileProgressiveDownloader.cpp b/Src/replicant/nx/win/NXFileProgressiveDownloader.cpp index a8452c726..521655188 100644 --- a/Src/replicant/nx/win/NXFileProgressiveDownloader.cpp +++ b/Src/replicant/nx/win/NXFileProgressiveDownloader.cpp @@ -12,7 +12,7 @@ /* TODO: benski> test this with a server that does not return content-length. I bet we could get it to work */ -/* TODO: benski> on windows, we can use a single CreateFile HANDLE for both reading and writing +/* TODO: benski> on arch, we can use a single CreateFile HANDLE for both reading and writing and use ReadFile(..., &overlapped) to maintain two separate file pointers this should improve performance as they will share the same cache _might_ have to use async I/O to get it to work (but use it synchronously by waiting on the handle after making the call @@ -625,7 +625,7 @@ ns_error_t NXFileObject_ProgressiveDownloader::Read(void *buffer, size_t bytes_r } /* TODO: benski> if r < bytes_requested, then we need to flush the buffer. - on windows, we can use fflush(progressive_file_read) + on arch, we can use fflush(progressive_file_read) on other platforms it's not guaranteed! */ size_t r = fread(buffer, 1, bytes_requested, progressive_file_read); this->position += r; diff --git a/Src/replicant/nx/win/nxcondition.h b/Src/replicant/nx/win/nxcondition.h index 42a634aa1..627270680 100644 --- a/Src/replicant/nx/win/nxcondition.h +++ b/Src/replicant/nx/win/nxcondition.h @@ -3,7 +3,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/replicant/nx/win/nxdata.c b/Src/replicant/nx/win/nxdata.c index 065eddbe4..9ff331393 100644 --- a/Src/replicant/nx/win/nxdata.c +++ b/Src/replicant/nx/win/nxdata.c @@ -4,7 +4,7 @@ #include "nx/nxfile.h" #include -/* windows implementation */ +/* arch implementation */ struct nx_data_struct_t { volatile size_t ref_count; diff --git a/Src/replicant/nx/win/nxdata.h b/Src/replicant/nx/win/nxdata.h index 1a5eee947..56eef8c05 100644 --- a/Src/replicant/nx/win/nxdata.h +++ b/Src/replicant/nx/win/nxdata.h @@ -5,7 +5,7 @@ #include "../../nx/nxfile.h" #include "../../nx/nxstring.h" -/* windows implementation */ +/* arch implementation */ #ifdef __cplusplus extern "C" { #endif diff --git a/Src/replicant/nx/win/nxfile.h b/Src/replicant/nx/win/nxfile.h index d7d943e26..55ecb17ce 100644 --- a/Src/replicant/nx/win/nxfile.h +++ b/Src/replicant/nx/win/nxfile.h @@ -2,7 +2,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #include "../../nx/nxapi.h" #include // for FILE diff --git a/Src/replicant/nx/win/nxlog.c b/Src/replicant/nx/win/nxlog.c index 7e8da01b5..3321ae36b 100644 --- a/Src/replicant/nx/win/nxlog.c +++ b/Src/replicant/nx/win/nxlog.c @@ -1,7 +1,7 @@ #include "nxlog.h" #include #include -//#include +//#include static char *nx_log_tag = "libreplicant"; #define MAX_FMT_SIZE 512 diff --git a/Src/replicant/nx/win/nxonce.h b/Src/replicant/nx/win/nxonce.h index 7cdd53a64..0a70603cc 100644 --- a/Src/replicant/nx/win/nxonce.h +++ b/Src/replicant/nx/win/nxonce.h @@ -3,7 +3,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/replicant/nx/win/nxsemaphore.h b/Src/replicant/nx/win/nxsemaphore.h index 9509fe5a3..60f1ad5ce 100644 --- a/Src/replicant/nx/win/nxsemaphore.h +++ b/Src/replicant/nx/win/nxsemaphore.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "nx/nxapi.h" #ifdef __cplusplus diff --git a/Src/replicant/nx/win/nxsleep.h b/Src/replicant/nx/win/nxsleep.h index 98da22f0f..ec081f237 100644 --- a/Src/replicant/nx/win/nxsleep.h +++ b/Src/replicant/nx/win/nxsleep.h @@ -3,7 +3,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/replicant/nx/win/nxstring.h b/Src/replicant/nx/win/nxstring.h index 5e07777a1..18e619a69 100644 --- a/Src/replicant/nx/win/nxstring.h +++ b/Src/replicant/nx/win/nxstring.h @@ -1,6 +1,6 @@ #pragma once #include "../../foundation/types.h" -#include +#include #include "../../nx/nxapi.h" #ifdef __cplusplus diff --git a/Src/replicant/nx/win/nxthread.h b/Src/replicant/nx/win/nxthread.h index 5b2c25616..51ef6494a 100644 --- a/Src/replicant/nx/win/nxthread.h +++ b/Src/replicant/nx/win/nxthread.h @@ -4,7 +4,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/Src/replicant/nx/win/nxuri.h b/Src/replicant/nx/win/nxuri.h index c4a7bd1ae..2a6d79310 100644 --- a/Src/replicant/nx/win/nxuri.h +++ b/Src/replicant/nx/win/nxuri.h @@ -22,7 +22,7 @@ extern "C" { NX_API nx_uri_t NXURIMalloc(size_t characters); NX_API int NXURICreateWithNXString(nx_uri_t *uri, nx_string_t string); - NX_API int NXURICreateFromPath(nx_uri_t *uri, const wchar_t *filename, const nx_uri_t path); // windows only + NX_API int NXURICreateFromPath(nx_uri_t *uri, const wchar_t *filename, const nx_uri_t path); // arch only NX_API int NXURICreateWithPath(nx_uri_t *uri, const nx_uri_t filename, const nx_uri_t path); NX_API int NXURICreateWithNXString(nx_uri_t *new_value, nx_string_t string); NX_API int NXURICreateTempForFilepath(nx_uri_t *out_temp, nx_uri_t filename); diff --git a/Src/replicant/replicant/metadata/metadata.vcxproj b/Src/replicant/replicant/metadata/metadata.vcxproj index df9572787..4115e6e61 100644 --- a/Src/replicant/replicant/metadata/metadata.vcxproj +++ b/Src/replicant/replicant/metadata/metadata.vcxproj @@ -92,26 +92,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/replicant/ssdp/ssdp.vcxproj b/Src/replicant/ssdp/ssdp.vcxproj index 1c55a8dcd..d0102877a 100644 --- a/Src/replicant/ssdp/ssdp.vcxproj +++ b/Src/replicant/ssdp/ssdp.vcxproj @@ -105,26 +105,26 @@ false Debug - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md false - x86-windows-static-md + x86-arch-static-md Debug false - x86-windows-static-md + x86-arch-static-md diff --git a/Src/resources/data/Milkdrop2/docs/milkdrop.html b/Src/resources/data/Milkdrop2/docs/milkdrop.html index 5d12d5a82..f15fbe08c 100644 --- a/Src/resources/data/Milkdrop2/docs/milkdrop.html +++ b/Src/resources/data/Milkdrop2/docs/milkdrop.html @@ -15,7 +15,7 @@ Useful Links: online forums - for preset sharing, troubleshooting, comments, and feature requests Nullsoft Winamp - Microsoft DirectX + Microsoft DirectX milkdrop.co.uk - an excellent third-party preset community site @@ -67,7 +67,7 @@ presets from MilkDrop 1. however, we strongly recommend a GeForce 5700 (or better), or a Radeon 9600 (or better). 3. Winamp 5.12 or later ( http://www.winamp.com/ ). - 4. DirectX 9.0 or later ( http://www.microsoft.com/windows/directx/ ). + 4. DirectX 9.0 or later ( http://www.microsoft.com/arch/directx/ ). @@ -151,7 +151,7 @@ presets from MilkDrop 1. The answer, nowadays, is a resounding "32". Video memory is plentiful these days; use 32 bit color, for both your - windows desktop (...so that MilkDrop's windowed mode can + arch desktop (...so that MilkDrop's windowed mode can run at 32 bits) and for MilkDrop's Fullscreen Display Mode setting (where "8888" denotes 32 bits). @@ -545,7 +545,7 @@ presets from MilkDrop 1. 2. [RE]INSTALL DIRECTX - Make sure you have a quasi-recent version of Microsoft DirectX + Make sure you have a quasi-recent version of Microsoft DirectX installed. In reality, though, almost every PC in the world has DirectX 9 on it at this point, so this shouldn't be a problem. If you go to download it, you'll only be able to find DirectX 10 - @@ -1236,7 +1236,7 @@ presets from MilkDrop 1. -tightened A/V sync by 5 ms (raised audio latency from 25 to 30 ms). -fixed &'s in song titles (as displayed when you hit F2) -F7,F8 were switched in the help screen (F1) - -when running in desktop mode, if you have a pattern on your windows + -when running in desktop mode, if you have a pattern on your arch background, it gets nuked. Before, if you had a pattern, the pattern would remain and you'd only be able to see milkdrop through the small boxes of your desktop icons' background text. I didn't @@ -1270,7 +1270,7 @@ presets from MilkDrop 1. (before, software blit was really only available for YUV-type overlays.) -desktop mode compatibility improved: more likely to work at higher resolutions now -desktop mode: fixed YUV-type *non-mmx* software blits when Windows is in 16-bit color. - (weren't implemented before; it just assumed windows was in 32-bit color, + (weren't implemented before; it just assumed arch was in 32-bit color, and the result would look munged.) -improved mmx memcpy: will now copy as long as the (difference between two pointers) % 8 is zero. (before, they both had to be a multiple of 8). diff --git a/Src/resources/data/avs/Community Picks/Shock Value - Architectural Design (v.1.01).avs b/Src/resources/data/avs/Community Picks/Shock Value - Architectural Design (v.1.01).avs index 09cbfa3df..1e19ee791 100644 Binary files a/Src/resources/data/avs/Community Picks/Shock Value - Architectural Design (v.1.01).avs and b/Src/resources/data/avs/Community Picks/Shock Value - Architectural Design (v.1.01).avs differ diff --git a/Src/resources/data/avs/Community Picks/fUk - afterburner remix.avs b/Src/resources/data/avs/Community Picks/fUk - afterburner remix.avs index da0188b3f..f0fd5fcea 100644 Binary files a/Src/resources/data/avs/Community Picks/fUk - afterburner remix.avs and b/Src/resources/data/avs/Community Picks/fUk - afterburner remix.avs differ diff --git a/Src/resources/data/freeform/xml/wasabi/xml/components.xml b/Src/resources/data/freeform/xml/wasabi/xml/components.xml index c73ecc1e9..d91b6570d 100644 --- a/Src/resources/data/freeform/xml/wasabi/xml/components.xml +++ b/Src/resources/data/freeform/xml/wasabi/xml/components.xml @@ -31,7 +31,7 @@ - Resizable windows with a status bar, ie: playlist editor, media library + Resizable arch with a status bar, ie: playlist editor, media library @@ -50,7 +50,7 @@ - Resizable windows without a status bar + Resizable arch without a status bar @@ -69,7 +69,7 @@ - modal windows, window intended to look like dialog boxes or messageboxes + modal arch, window intended to look like dialog boxes or messageboxes @@ -87,7 +87,7 @@ - static windows, ie: preferences + static arch, ie: preferences diff --git a/Src/resources/data/freeform/xml/wasabi/xml/old.system-colors.xml b/Src/resources/data/freeform/xml/wasabi/xml/old.system-colors.xml index 685c26767..883847b16 100644 --- a/Src/resources/data/freeform/xml/wasabi/xml/old.system-colors.xml +++ b/Src/resources/data/freeform/xml/wasabi/xml/old.system-colors.xml @@ -37,7 +37,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/Src/resources/data/freeform/xml/wasabi/xml/old.system-elements.xml b/Src/resources/data/freeform/xml/wasabi/xml/old.system-elements.xml index 4d4744404..47f90d7f4 100644 --- a/Src/resources/data/freeform/xml/wasabi/xml/old.system-elements.xml +++ b/Src/resources/data/freeform/xml/wasabi/xml/old.system-elements.xml @@ -11,13 +11,13 @@ - + diff --git a/Src/resources/data/freeform/xml/wasabi/xml/system-colors.xml b/Src/resources/data/freeform/xml/wasabi/xml/system-colors.xml index a4c1d37f0..e23bc3d92 100644 --- a/Src/resources/data/freeform/xml/wasabi/xml/system-colors.xml +++ b/Src/resources/data/freeform/xml/wasabi/xml/system-colors.xml @@ -50,7 +50,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/Src/resources/data/freeform/xml/wasabi/xml/system-element-aliases.xml b/Src/resources/data/freeform/xml/wasabi/xml/system-element-aliases.xml index 027226c84..7eb1e839e 100644 --- a/Src/resources/data/freeform/xml/wasabi/xml/system-element-aliases.xml +++ b/Src/resources/data/freeform/xml/wasabi/xml/system-element-aliases.xml @@ -10,12 +10,12 @@ - + - + @@ -164,7 +164,7 @@ - + diff --git a/Src/resources/data/freeform/xml/wasabi/xml/system-elements.xml b/Src/resources/data/freeform/xml/wasabi/xml/system-elements.xml index 04d4ed5da..80a9b4fc5 100644 --- a/Src/resources/data/freeform/xml/wasabi/xml/system-elements.xml +++ b/Src/resources/data/freeform/xml/wasabi/xml/system-elements.xml @@ -19,12 +19,12 @@ - + - + diff --git a/Src/resources/data/freeform/xml/wasabi/xml/xui/browser/browser.m b/Src/resources/data/freeform/xml/wasabi/xml/xui/browser/browser.m index 6ba413ef8..730580d2d 100644 --- a/Src/resources/data/freeform/xml/wasabi/xml/xui/browser/browser.m +++ b/Src/resources/data/freeform/xml/wasabi/xml/xui/browser/browser.m @@ -1048,7 +1048,7 @@ sm_edit_ok.onLeftClick () } -// Is one of the edit windows closed? +// Is one of the edit arch closed? system.onHideLayout (Layout _layout) { if (_layout == quicklink_name_layout) diff --git a/Src/resources/data/freeform/xml/wasabi/xml/xui/browser/gen_pageguids.m b/Src/resources/data/freeform/xml/wasabi/xml/xui/browser/gen_pageguids.m index 502df0121..459352369 100644 --- a/Src/resources/data/freeform/xml/wasabi/xml/xui/browser/gen_pageguids.m +++ b/Src/resources/data/freeform/xml/wasabi/xml/xui/browser/gen_pageguids.m @@ -29,9 +29,9 @@ Function initPages(); #define CUSTOM_OPTIONSMENU_ITEMS "{1828D28F-78DD-4647-8532-EBA504B8FC04}" Global ConfigItem optionsmenu_page; -// this is the page that maps its items to the windows menu (aka View), you can add attribs or more pages (submenus) +// this is the page that maps its items to the arch menu (aka View), you can add attribs or more pages (submenus) #define CUSTOM_WINDOWSMENU_ITEMS "{6559CA61-7EB2-4415-A8A9-A2AEEF762B7F}" -Global ConfigItem custom_windows_page; +Global ConfigItem custom_arch_page; // non exposed attribs page #define CUSTOM_PAGE_NONEXPOSED "{E9C2D926-53CA-400f-9A4D-85E31755A4CF}" @@ -51,7 +51,7 @@ initPages() // load up the cfgpage in which we'll insert our custom page optionsmenu_page = Config.getItem(CUSTOM_OPTIONSMENU_ITEMS); - custom_windows_page = Config.getItem(CUSTOM_WINDOWSMENU_ITEMS); + custom_arch_page = Config.getItem(CUSTOM_WINDOWSMENU_ITEMS); #endif diff --git a/Src/resources/data/milkdrop.html b/Src/resources/data/milkdrop.html index e61ab3298..b3cfc4600 100644 --- a/Src/resources/data/milkdrop.html +++ b/Src/resources/data/milkdrop.html @@ -12,7 +12,7 @@ Useful Links: feature requests: www.milkdrop.co.uk, an excellent third-party site Nullsoft Winamp - Microsoft DirectX + Microsoft DirectX @@ -50,7 +50,7 @@ journey through sound. 1. Windows 98, ME, 2000, or XP. 2. Hardware-based 3D graphics acceleration (i.e. a video card with 3D support) with at least 8 MB of video memory; however, 32 MB or more is recommended. - 3. DirectX 8.0 or later ( http://www.microsoft.com/windows/directx/ ) + 3. DirectX 8.0 or later ( http://www.microsoft.com/arch/directx/ ) 4. Winamp 2.72 or later ( http://classic.winamp.com/ ), or Winamp 3.xx with the Classic Visualization component installed. @@ -406,7 +406,7 @@ journey through sound. 1. [RE]INSTALL DIRECTX - Make sure you have the latest version of Microsoft DirectX + Make sure you have the latest version of Microsoft DirectX (9.x at the time this documentation was written). Even if you already have it, consider re-installing it, since files can be corrupted over time, and because poorly-written video @@ -946,7 +946,7 @@ journey through sound. -tightened A/V sync by 5 ms (raised audio latency from 25 to 30 ms). -fixed &'s in song titles (as displayed when you hit F2) -F7,F8 were switched in the help screen (F1) - -when running in desktop mode, if you have a pattern on your windows + -when running in desktop mode, if you have a pattern on your arch background, it gets nuked. Before, if you had a pattern, the pattern would remain and you'd only be able to see milkdrop through the small boxes of your desktop icons' background text. I didn't @@ -980,7 +980,7 @@ journey through sound. (before, software blit was really only available for YUV-type overlays.) -desktop mode compatibility improved: more likely to work at higher resolutions now -desktop mode: fixed YUV-type *non-mmx* software blits when Windows is in 16-bit color. - (weren't implemented before; it just assumed windows was in 32-bit color, + (weren't implemented before; it just assumed arch was in 32-bit color, and the result would look munged.) -improved mmx memcpy: will now copy as long as the (difference between two pointers) % 8 is zero. (before, they both had to be a multiple of 8). diff --git a/Src/resources/data/whatsnew.txt b/Src/resources/data/whatsnew.txt index 832e3e3d4..7cab5e45e 100644 --- a/Src/resources/data/whatsnew.txt +++ b/Src/resources/data/whatsnew.txt @@ -443,7 +443,7 @@ Winamp 5.6 [Nov 27 2010] Winamp 5.5.81 [Jul 12 2010] * Improved: [pmp_android/usb] Disk-performance of metadata cache * Fixed: [gen_ml] Minor resource leak fix, plus other optimizations -* Fixed: [gen_ff] Tooltip issue causing dialog windows to vanish underneath Winamp +* Fixed: [gen_ff] Tooltip issue causing dialog arch to vanish underneath Winamp * Fixed: [ml_disc] CD drives not appearing in ML tree when ML starts not-visible * Fixed: [ml_wire] Sort by date before auto-downloading podcasts * Fixed: [pmp_android] Settings not being saved @@ -694,16 +694,16 @@ Winamp 5.5.5 [Feb 27 2009] Winamp 5.5.41 [Aug 4 2008] * Improved: [pmp_ipod] Better auto-detection of newer iPod models * Fixed: Filetype icons in Windows Explorer not updating when changed in Prefs -* Fixed: ML & Vis appear under other overlapping modern skin windows +* Fixed: ML & Vis appear under other overlapping modern skin arch * Fixed: No error message when trying to edit metadata for Read-Only files * Fixed: Potential security vulnerability in NowPlaying -* Fixed: [gen_ff] Keyboard shortcuts in modern skin playlist windowshade mode +* Fixed: [gen_ff] Keyboard shortcuts in modern skin playlist archhade mode * Fixed: [gen_ml] Scrolling to bottom of AlbumArt pane & other misc scrollbar issues * Fixed: [in_mp3] Broken '307 - Temporary Redirect' url's * Fixed: [ml_local] AlbumArt icon selection glitch * Fixed: [ml_playlists] Play and Enqueue actions reversed if Enqueue is set as default * Fixed: [ml_rg] ReplayGain analysis of 20bit files -* Misc: Double-click Modern pledit songticker now toggles windowshade mode again +* Misc: Double-click Modern pledit songticker now toggles archhade mode again * Misc: More miscellaneous general tweaks, improvements, fixes and optimizations Winamp 5.5.4 [Jul 8 2008] @@ -728,7 +728,7 @@ Winamp 5.5.4 [Jul 8 2008] * Fixed: Alt+F4 closing Winamp instead of individual dialogs * Fixed: Bento browser redirecting network drive url's to Winamp Search * Fixed: Blank playlist when in docked toolbar mode and Winamp is minimized -* Fixed: Modern skin component windows appearing individually in Alt+Tab +* Fixed: Modern skin component arch appearing individually in Alt+Tab * Fixed: Multi-flashing on startup when previously closed whilst minimized to systray * Fixed: Pure Virtual Function Call runtime crash errors * Fixed: Redraw issue when built-in classic vis is disabled @@ -755,7 +755,7 @@ Winamp 5.5.4 [Jul 8 2008] * Fixed: [ml_disc] Small resource leak * Fixed: [ml_playlists] Autoscroll broken when dragging items in large playlists * Fixed: [ml_playlists] Enter/Shift+Enter broken for selected ML Playlist items -* Fixed: [ml_playlists] Not respecting overlapping external windows on item drag+drop +* Fixed: [ml_playlists] Not respecting overlapping external arch on item drag+drop * Fixed: [ml_playlists / ml_transcode] Sending playlists from ML tree to Transcoder * Fixed: [ml_wire] 404/timeout with valid rss feeds on Vista * Misc: Miscellaneous localization tweaks, fixes & updates @@ -1110,7 +1110,7 @@ Winamp 5.3.4 [Apr 20 2007] * Fixed: Folder locking bug after using Open Files/Folder dialog * Fixed: Installation of Sonic Engine on systems with other Sonic/Roxio products * Fixed: Installer resets cwd= to the install dir -* Fixed: Redraw bug when moving external windows over Pledit +* Fixed: Redraw bug when moving external arch over Pledit * Fixed: Tab orders in Preferences * Fixed: Various media library accessibility/focus issues * Fixed: Video crash when using WinKey+L @@ -1228,7 +1228,7 @@ Winamp 5.3.2 [Nov 21 2006] * Fixed: [in_mp4] unable to play truncated M4A files * Fixed: [in_vorbis] crash with very short files * Fixed: [jnetlib] HTTP timeouts on streams with character 255 in HTTP headers -* Fixed: [ml_disc] CD View sometimes causing flickering of all open windows +* Fixed: [ml_disc] CD View sometimes causing flickering of all open arch * Fixed: [ml_history] crash when disabling & re-enabling view * Fixed: [ml_playlists] corrupt display when scrolling * Fixed: [ml_wire] crash when parsing podcasts with badly formed dates @@ -1568,7 +1568,7 @@ Winamp 5.1.2 [Dec 12 2005] * Fixed: [in_mp4] unicode metadata writing * Fixed: [in_wm/in_dshow] mms:// streaming video playback * Fixed: [in_cdda] audio cd bitrate display -* Fixed: [in_cdda] Sonic engine on 64bit windows (thanks STanger) +* Fixed: [in_cdda] Sonic engine on 64bit arch (thanks STanger) * Fixed: lots of small bugs ... * Updated: Sonic CD Engine 2.2.50 * Updated: libmp4v2 1.4.1 @@ -1726,7 +1726,7 @@ Winamp 5.0.4 [Jul 28 2004] * Added screenshots of classic/modern mode in installer * Fixed MP3 bitrate calculation (in_mp3 was reporting incorrect lengths on some MP3s) * Fixed incorrect length reporting on long WMA files -* Better fix for pledit/video windows showing up at startup when minimized +* Better fix for pledit/video arch showing up at startup when minimized * Fixed db text bug when moving EQ sliders * Upgraded MP3 encoding to LAME v3.96 * Fixed crash in WMA playback when using WMA v8 codecs @@ -1760,7 +1760,7 @@ Winamp 5.0.4 [Jul 28 2004] * Added sdk support for multiple audio/video tracks in video input plug-ins (see wa_ipc.h for ITrackSelector class) * Added multiple audio avi support (right click video window, select "Audio Tracks") -* Fixed multimonitor problem when toggling a windowshade on one monitor while playing +* Fixed multimonitor problem when toggling a archhade on one monitor while playing a fullscreen video on the other * Added ML_IPC_EDITQUERY and ML_IPC_EDITVIEW * Fixed pledit drawing bug under winxp/cleartype @@ -1775,12 +1775,12 @@ Winamp 5.0.4 [Jul 28 2004] * Made ui:preferences global hotkey open the prefs to the previously opened page * Fixed a few preferences cosmetic 'bugs' * Modern skin updates : - - Fixed windowshade repeat-track button state + - Fixed archhade repeat-track button state - Fixed scaling docked toolbars - Fixed 5.03 assert on deletion of newGroupAsLayout() - - Fixed floating video windows coordinates dropping to 0,0 + - Fixed floating video arch coordinates dropping to 0,0 - Fixed auto opaque when layouts are loaded already docked as toolbars - - Fixed fadein/fadeout not used on notification window when linking all normal windows' + - Fixed fadein/fadeout not used on notification window when linking all normal arch' alpha - Fixed docked toolbars moving when some other window docked to them switches to an alternative layout @@ -1801,7 +1801,7 @@ Winamp 5.0.4 [Jul 28 2004] proportions - Fixed docking bug when using snapadjustleft - Fixed buggy calculation of time display default width conflicting with right text alignment - - Fixed windows moving after changing screen resolution + - Fixed arch moving after changing screen resolution - Fixed rare always on top desync with classic skins Winamp 5.0.3 [Mar 24 2004] @@ -1827,7 +1827,7 @@ Winamp 5.0.3 [Mar 24 2004] * Updated VP6 video decoder to latest VP6.2 code * Fixed crash when launching Winamp with very long filenames from explorer * Made registration dialog to appear in Explorer's taskbar when installing pro version -* Fixed pledit/video windows showing up at startup when minimized +* Fixed pledit/video arch showing up at startup when minimized * Modern skins updates : - Winamp modern skin now uses a 3 state repeat button: no repeat/repeat all/repeat track - Added appplication desktop toolbars capabilities for layouts, add @@ -1837,7 +1837,7 @@ Winamp 5.0.3 [Mar 24 2004] of course we continue to support 0.8 to 1.1) - (Very) limited maki debugger (for now you can bring it up with invokeDebugger(); in a script then use 'x' to continue and 'i' to trace into) - - Fixed obscure capture problem with dragging windows + - Fixed obscure capture problem with dragging arch - Fixed rectrgn being forced to 1 in xml xuiobject buttons that are originally imageless - Fixed hilited state not on after clicking on buttons while the mouse stays in area - Fixed scripted onEnterArea/onLeaveArea not being always correctly called while mouse diff --git a/Src/resources/languages/Winamp-id-id.wlz b/Src/resources/languages/Winamp-id-id.wlz index f792f6c5a..494ff8211 100644 Binary files a/Src/resources/languages/Winamp-id-id.wlz and b/Src/resources/languages/Winamp-id-id.wlz differ diff --git a/Src/resources/languages/Winamp-it-it.wlz b/Src/resources/languages/Winamp-it-it.wlz index 872d0cdd3..47d1f3103 100644 Binary files a/Src/resources/languages/Winamp-it-it.wlz and b/Src/resources/languages/Winamp-it-it.wlz differ diff --git a/Src/resources/languages/Winamp-ja-jp.wlz b/Src/resources/languages/Winamp-ja-jp.wlz index ffc79c2ec..6850cace1 100644 Binary files a/Src/resources/languages/Winamp-ja-jp.wlz and b/Src/resources/languages/Winamp-ja-jp.wlz differ diff --git a/Src/resources/languages/Winamp-pl-pl.wlz b/Src/resources/languages/Winamp-pl-pl.wlz index 032eaff4a..6e7a76a5a 100644 Binary files a/Src/resources/languages/Winamp-pl-pl.wlz and b/Src/resources/languages/Winamp-pl-pl.wlz differ diff --git a/Src/resources/languages/Winamp-pt-br.wlz b/Src/resources/languages/Winamp-pt-br.wlz index 43e4b83a9..64eb86e7a 100644 Binary files a/Src/resources/languages/Winamp-pt-br.wlz and b/Src/resources/languages/Winamp-pt-br.wlz differ diff --git a/Src/resources/languages/Winamp-ro-ro.wlz b/Src/resources/languages/Winamp-ro-ro.wlz index 3490eabae..bbca2eb3d 100644 Binary files a/Src/resources/languages/Winamp-ro-ro.wlz and b/Src/resources/languages/Winamp-ro-ro.wlz differ diff --git a/Src/resources/languages/Winamp-zh-cn.wlz b/Src/resources/languages/Winamp-zh-cn.wlz index 1f022b02f..3f272b4af 100644 Binary files a/Src/resources/languages/Winamp-zh-cn.wlz and b/Src/resources/languages/Winamp-zh-cn.wlz differ diff --git a/Src/resources/languages/Winamp-zh-tw.wlz b/Src/resources/languages/Winamp-zh-tw.wlz index 313556b0e..6e354629f 100644 Binary files a/Src/resources/languages/Winamp-zh-tw.wlz and b/Src/resources/languages/Winamp-zh-tw.wlz differ diff --git a/Src/resources/plugins/French Radio/UserData/LMP_default.rtv b/Src/resources/plugins/French Radio/UserData/LMP_default.rtv index 85ea5953f..7b5cf4e5d 100644 Binary files a/Src/resources/plugins/French Radio/UserData/LMP_default.rtv and b/Src/resources/plugins/French Radio/UserData/LMP_default.rtv differ diff --git a/Src/resources/plugins/French Radio/UserData/lmpv3.xml b/Src/resources/plugins/French Radio/UserData/lmpv3.xml index c2a16e117..592bbac35 100644 --- a/Src/resources/plugins/French Radio/UserData/lmpv3.xml +++ b/Src/resources/plugins/French Radio/UserData/lmpv3.xml @@ -6,7 +6,7 @@ rtl RTL radio - http://radio.rtl.fr/windowsmediacenter/ + http://radio.rtl.fr/archmediacenter/ 256x256/todae_radio_rtl.png http://streaming.radio.rtl.fr:80/rtl-1-44-96 La première radio de France @@ -17,7 +17,7 @@ nrj NRJ radio - http://ops.nrj.fr/windows-media-center/ + http://ops.nrj.fr/arch-media-center/ 256x256/todae_radio_nrj.png http://mp3.live.tv-radio.com/nrj/all/nrj_113225.mp3 HIT MUSIC ONLY diff --git a/Src/resources/skins/Bento/xml/config.xml b/Src/resources/skins/Bento/xml/config.xml index ab5e92804..8e2bccf36 100644 --- a/Src/resources/skins/Bento/xml/config.xml +++ b/Src/resources/skins/Bento/xml/config.xml @@ -45,7 +45,7 @@ downImage="config.button.selected" activeImage="config.button.selected" /> - + @@ -90,39 +90,39 @@ - + - + @@ -323,7 +323,7 @@ hoverImage="config.notifier.sub.hover" /> -