Mirrors/winamp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

publish changes

Browse source
This commit is contained in:
Archie 2024-09-29 02:04:03 +00:00
parent afc5064a7b
commit ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Src/Plugins/DSP/dsp_sc/Include/c_wavein.h
View file

@ -1,7 +1,7 @@
#ifndef __C_WAVEIN_H__
#define __C_WAVEIN_H__
#include <windows.h>
#include <arch.h>
#include <mmsystem.h>
#define EXIT_ON_ERROR(hr) \
if (FAILED(hr)) { goto Exit; }

2
Src/Plugins/DSP/dsp_sc/NSIS/dsp_sc_v2.nsi
View file

@ -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"

8
Src/Plugins/DSP/dsp_sc/dsp_sc.vcxproj
View file

@ -109,16 +109,16 @@
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

4
Src/Plugins/DSP/dsp_sc/main.cpp
View file

@ -12,7 +12,7 @@
#define APP_VersionW L"2.4.2"
#define APP_Build "449"
#include <windows.h>
#include <arch.h>
#include <commctrl.h>
#include <stdio.h>
#include <shlobj.h>
@ -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, "," );

2
Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include "c_encoder.h"
C_ENCODER::C_ENCODER(int ExtInfoSize) {

2
Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_mp3dll.h
View file

@ -5,7 +5,7 @@
#include "c_encoder.h"
#include "../lame/include/lame.h"
#include "../lame/libmp3lame/lame_global_flags.h"
#include <windows.h>
#include <arch.h>
// Defaults for this encoder
#define MP3_DEFAULT_INPUTSAMPLERATE 44100

2
Src/Plugins/DSP/dsp_sc/sc2srclib/Encoders/c_encoder_nsv.h
View file

@ -6,7 +6,7 @@
#include "c_encoder.h"
#include "enc_if.h"
#include <windows.h>
#include <arch.h>
#include <Shlobj.h>
#include "../../Resource/resource.h"

2
Src/Plugins/DSP/dsp_sc/sc2srclib/Include/c_jobmanager.h
View file

@ -8,7 +8,7 @@
#include <winbase.h> // 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 T> class C_JOBMANAGER {

2
Src/Plugins/DSP/dsp_sc/sc2srclib/shoutcast_output.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include <Ws2tcpip.h>
#include "../api.h"
#include "Include/shoutcast_output.h"

2
Src/Plugins/DSP/dsp_sc/utils.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include <uxtheme.h>
#include "utils.h"
#include "api.h"

2
Src/Plugins/DSP/dsp_sps/dsp_sps.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include <commctrl.h>
#include "../winamp/dsp.h"
#include "resource.h"

8
Src/Plugins/DSP/dsp_sps/dsp_sps.vcxproj
View file

@ -90,17 +90,17 @@
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

8
Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.dsp
View file

@ -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

4
Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.mak
View file

@ -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= \

4
Src/Plugins/DSP/dsp_sps/dxi/AudioPlugIn.rc
View file

@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h>
#include <arch.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@ -34,7 +34,7 @@ END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include <windows.h>\r\n"
"#include <arch.h>\r\n"
"\0"
END

4
Src/Plugins/DSP/dsp_sps/dxi/StdAfx.h
View file

@ -12,8 +12,8 @@
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h>
#include <windowsx.h>
#include <arch.h>
#include <archx.h>
#ifdef _DEBUG
#define DEBUG // the DirectShow headers use this symbol

2
Src/Plugins/DSP/dsp_sps/dxi/include/CakeMedParam.h
View file

@ -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*/

2
Src/Plugins/DSP/dsp_sps/sps_common.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include "resource.h"
#include "..\..\..\winamp\dsp.h"
#include "sps_common.h"

2
Src/Plugins/Encoder/enc_fhgaac/config.cpp
View file

@ -1,5 +1,5 @@
#include "config.h"
#include <windows.h>
#include <arch.h>
#include <strsafe.h>
#include <assert.h>
#include "mp4FastAAClib.h"

2
Src/Plugins/Encoder/enc_fhgaac/config.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "mp4FastAAClib.h"
#include <windows.h> // or MAX_PATH
#include <arch.h> // or MAX_PATH
#define ENCODER_TYPE_MPEG4 (mmioFOURCC('A','A','C','f'))

2
Src/Plugins/Encoder/enc_fhgaac/link_control.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include "link_control.h"
static HCURSOR link_hand_cursor;

2
Src/Plugins/Encoder/enc_fhgaac/link_control.h
View file

@ -1,5 +1,5 @@
#pragma once
#include <windows.h>
#include <arch.h>
extern "C" {
void link_startsubclass(HWND hwndDlg, UINT id);

2
Src/Plugins/Encoder/enc_fhgaac/main.cpp
View file

@ -2,7 +2,7 @@
#pragma message(__FILE__": telling linker to ignore libmmd.lib")
#include "FhGAACEncoder.h"
#include <windows.h>
#include <arch.h>
#include <mmsystem.h>
#include <stdio.h>
#include "../nsv/enc_if.h"

2
Src/Plugins/Encoder/enc_fhgaac/preferences.h
View file

@ -1,5 +1,5 @@
#pragma once
#include <windows.h>
#include <arch.h>
#include "config.h"
extern HINSTANCE enc_fhg_HINST;

2
Src/Plugins/Encoder/enc_fhgaac/preferences_adts.cpp
View file

@ -2,7 +2,7 @@
#include "config.h"
#include "preferences.h"
#include "../Winamp/wa_ipc.h"
#include <windows.h>
#include <arch.h>
#include <assert.h>
#include "resource.h"
#include "link_control.h"

2
Src/Plugins/Encoder/enc_fhgaac/preferences_mp4.cpp
View file

@ -2,7 +2,7 @@
#include "config.h"
#include "preferences.h"
#include "../Winamp/wa_ipc.h"
#include <windows.h>
#include <arch.h>
#include <assert.h>
#include "resource.h"
#include "link_control.h"

2
Src/Plugins/Encoder/enc_flac/StreamFileWin32.h
View file

@ -1,7 +1,7 @@
#pragma once
#include <FLAC/all.h>
#include <windows.h>
#include <arch.h>
struct Win32_State
{

8
Src/Plugins/Encoder/enc_flac/enc_flac2.vcxproj
View file

@ -93,26 +93,26 @@
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

2
Src/Plugins/Encoder/enc_flac/main.cpp
View file

@ -5,7 +5,7 @@
#include "AudioCoderFlac.h"
#include "resource.h"
#include <commctrl.h>
#include <windows.h>
#include <arch.h>
#include <Uxtheme.h>
#include <api/service/waservicefactory.h>
#include <api/application/api_application.h>

2
Src/Plugins/Encoder/enc_lame/BladeMP3EncDLL.c
View file

@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
#include <windows.h>
#include <arch.h>
#include <Windef.h>
#include "BladeMP3EncDLL.h"
#include <assert.h>

2
Src/Plugins/Encoder/enc_lame/MP3Coder.h
View file

@ -1,7 +1,7 @@
#ifndef NULLSOFT_MP3_CODER_H
#define NULLSOFT_MP3_CODER_H
#include <windows.h>
#include <arch.h>
#include "../nsv/enc_if.h"
#include "BladeMP3EncDLL.h"
#ifndef _BLADEDLL

28
Src/Plugins/Encoder/enc_lame/enc_lame.vcxproj
View file

@ -96,31 +96,31 @@
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\lame</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\lame</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_USRDLL;_BLADEDLL;NSV_CODER_MP3_EXPORTS;WINDOWS_IGNORE_PACKING_MISMATCH;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -144,7 +144,7 @@
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\debug\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\debug\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>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
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\lame</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\lame</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_BLADEDLL;NSV_CODER_MP3_EXPORTS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -171,14 +171,14 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>shlwapi.lib;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\debug\lib\libmp3lame-static.lib</AdditionalDependencies>
<AdditionalDependencies>shlwapi.lib;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\debug\lib\libmp3lame-static.lib</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\debug\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\debug\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>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
<Optimization>MinSpace</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\lame</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\lame</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_USRDLL;_BLADEDLL;NSV_CODER_MP3_EXPORTS;WINDOWS_IGNORE_PACKING_MISMATCH;NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -218,7 +218,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>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
<Optimization>MinSpace</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\lame</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\lame</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;NSV_CODER_MP3_EXPORTS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -246,7 +246,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>shlwapi.lib;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\lib\libmp3lame-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>shlwapi.lib;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\lib\libmp3lame-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
@ -255,7 +255,7 @@ if exist ..\..\..\resources\libraries\lame_enc.dll xcopy /Y /D ..\..\..\resource
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\debug\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\debug\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Plugins\

8
Src/Plugins/Encoder/enc_vorbis/enc_vorbis.vcxproj
View file

@ -91,26 +91,26 @@
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

2
Src/Plugins/Encoder/enc_vorbis/main.cpp
View file

@ -18,7 +18,7 @@
#define ENC_VERSION "v1.58"
#include <windows.h>
#include <arch.h>
#include <commctrl.h>
#include <uxtheme.h>
#include <strsafe.h>

2
Src/Plugins/Encoder/enc_wav/ACMEncoder.h
View file

@ -1,7 +1,7 @@
#ifndef NULLSOFT_ENC_ACM_ACMENCODER_H
#define NULLSOFT_ENC_ACM_ACMENCODER_H
#include <windows.h>
#include <arch.h>
#include <mmreg.h>
#include <msacm.h>
#include "../nsv/enc_if.h"

2
Src/Plugins/Encoder/enc_wav/Config.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include <mmreg.h>
#include <msacm.h>
#include "Config.h"

2
Src/Plugins/Encoder/enc_wav/Config.h
View file

@ -1,7 +1,7 @@
#ifndef NULLSOFT_ENC_ACM_CONFIG_H
#define NULLSOFT_ENC_ACM_CONFIG_H
#include <windows.h>
#include <arch.h>
#include <mmreg.h>
#include <msacm.h>

2
Src/Plugins/Encoder/enc_wav/WAVEncoder.h
View file

@ -2,7 +2,7 @@
#define NULLSOFT_ENC_WAV_WAVENCODER_H
#include <windows.h>
#include <arch.h>
#include <mmreg.h>
#include <msacm.h>
#include "../nsv/enc_if.h"

2
Src/Plugins/Encoder/enc_wma/AudioCoderWMA.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include <mmreg.h>
#include <msacm.h>
#include "../nu/ns_wc.h"

2
Src/Plugins/Encoder/enc_wma/config.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
// LGIVEN Mods 4-10-05
#include "main.h"

2
Src/Plugins/Encoder/enc_wma/main.cpp
View file

@ -19,7 +19,7 @@
#define ENC_VERSION "v1.23"
#include <windows.h>
#include <arch.h>
#include <stdio.h>
#include <wmsdk.h>

2
Src/Plugins/Encoder/enc_wma/main.h
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include <stdio.h>
#include "../nsv/enc_if.h"

2
Src/Plugins/Encoder/enc_wma/wmaudiosdk.h
View file

@ -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*/

2
Src/Plugins/General/gen_crasher/ExceptionHandler.cpp
View file

@ -30,7 +30,7 @@
#define _WIN32_WINDOWS 0x0500 // for IsDebuggerPresent
#include "windows.h"
#include "arch.h"
#include <tchar.h>
#include "GetWinVer.h"
#include "miniversion.h"

2
Src/Plugins/General/gen_crasher/ExceptionHandler.h
View file

@ -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"
{

2
Src/Plugins/General/gen_crasher/GetWinVer.h
View file

@ -11,7 +11,7 @@
// damage or loss of business that this software may cause.
//
///////////////////////////////////////////////////////////////////////////////
#include <windows.h>
#include <arch.h>
#ifndef GETWINVER_H
#define GETWINVER_H

2
Src/Plugins/General/gen_crasher/MiniVersion.h
View file

@ -16,7 +16,7 @@
#ifndef MINIVERSION_H
#define MINIVERSION_H
#include <windows.h>
#include <arch.h>
#include <TCHAR.h>
class CMiniVersion

2
Src/Plugins/General/gen_crasher/config.h
View file

@ -1,7 +1,7 @@
#ifndef NULLSOFT_CONFIG_H_
#define NULLSOFT_CONFIG_H_
#include <windows.h>
#include <arch.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

2
Src/Plugins/General/gen_crasher/configDlg.cpp
View file

@ -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);

2
Src/Plugins/General/gen_crasher/configDlg.h
View file

@ -1,5 +1,5 @@
#pragma once
#include <windows.h>
#include <arch.h>
int SelectComboBoxItem(const HWND hwCombo, int data);
BOOL OpenFolderDialog(HWND parent, LPWSTR pathBuffer);

2
Src/Plugins/General/gen_crasher/crashDlg.h
View file

@ -1,5 +1,5 @@
#pragma once
#include <windows.h>
#include <arch.h>
#include <commctrl.h>
BOOL CALLBACK CrashDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

2
Src/Plugins/General/gen_crasher/feedback/email/SendEmail.h
View file

@ -17,7 +17,7 @@
#define SENDEMAIL_H
#include <tchar.h>
#include <windows.h>
#include <arch.h>
const wchar_t* GetFilePart(LPCWSTR lpszFile);

4
Src/Plugins/General/gen_crasher/feedback/feedback.rc
View file

@ -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

2
Src/Plugins/General/gen_crasher/feedback/main.h
View file

@ -1,7 +1,7 @@
#ifndef FEEDBACK_H
#define FEEDBACK_H
#include <windows.h>
#include <arch.h>
#include "resource.h"
#include "..\settings.h"

4
Src/Plugins/General/gen_crasher/feedback/manifest.xml
View file

@ -29,8 +29,8 @@
</security>
</trustInfo>
<asmv3:application>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<asmv3:archSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
</asmv3:windowsSettings>
</asmv3:archSettings>
</asmv3:application>
</assembly>

2
Src/Plugins/General/gen_crasher/feedback/smtp/Base64.h
View file

@ -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 <windows.h>
#include <arch.h>
#define lCONTEXT char
#define PlCONTEXT lCONTEXT*

6
Src/Plugins/General/gen_crasher/feedback/xzip/XZip.cpp
View file

@ -86,7 +86,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <windows.h>
#include <arch.h>
#include <time.h>
#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;

2
Src/Plugins/General/gen_crasher/main.h
View file

@ -1,7 +1,7 @@
#ifndef NULLSOFT_CRASHER_MAIN_H
#define NULLSOFT_CRASHER_MAIN_H
#include <windows.h>
#include <arch.h>
#include <dbghelp.h>
#include "resource.h"
#define NO_IVIDEO_DECLARE

2
Src/Plugins/General/gen_crasher/smtpDlg.h
View file

@ -1,5 +1,5 @@
#pragma once
#include <windows.h>
#include <arch.h>
void CenterDialog(HWND hwndDlg);
BOOL CALLBACK smtpDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

2
Src/Plugins/General/gen_ff/ff_ipc.cpp
View file

@ -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);
}
}

4
Src/Plugins/General/gen_ff/ff_ipc.h
View file

@ -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

8
Src/Plugins/General/gen_ff/gen_ff.rc
View file

@ -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"

6
Src/Plugins/General/gen_ff/gen_ff.vcxproj
View file

@ -93,19 +93,19 @@
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

50
Src/Plugins/General/gen_ff/main.cpp
View file

@ -1,5 +1,5 @@
#include "precomp__gen_ff.h"
#include <windows.h>
#include <arch.h>
#include <commctrl.h>
#include "main.h"
@ -53,7 +53,7 @@
#include "../nu/AutoWide.h"
#include <shlwapi.h>
#include <windowsx.h>
#include <archx.h>
//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<StringW, StringWComparator> 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();
}

14
Src/Plugins/General/gen_ff/menuactions.cpp
View file

@ -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);

2
Src/Plugins/General/gen_ff/prefs.cpp
View file

@ -7,7 +7,7 @@
#include "../Agave/Language/api_language.h"
#include "gen.h"
#include <commctrl.h>
#include <windowsx.h>
#include <archx.h>
void turnonoff(HWND wnd, int *t, int n, int v) {
for (int i=0;i<n;i++) {

2
Src/Plugins/General/gen_ff/prefs_colorthemes.cpp
View file

@ -1,6 +1,6 @@
#include "precomp__gen_ff.h"
#include "resource.h"
#include <windowsx.h>
#include <archx.h>
extern int m_are_we_loaded;
extern int toggle_from_wa2;

4
Src/Plugins/General/gen_ff/prefs_font.cpp
View file

@ -1,7 +1,7 @@
#include "precomp__gen_ff.h"
#include <commctrl.h>
#include <windows.h>
#include <windowsx.h>
#include <arch.h>
#include <archx.h>
#include "resource.h"
#include <api/font/font.h>
#include <bfc/parse/paramparser.h>

12
Src/Plugins/General/gen_ff/wa2cfgitems.cpp
View file

@ -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;

2
Src/Plugins/General/gen_ff/wa2cfgitems.h
View file

@ -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;

2
Src/Plugins/General/gen_ff/wa2frontend.h
View file

@ -40,7 +40,7 @@
//-----------------------------------------------------------------------------------------------
#include <windows.h>
#include <arch.h>
#include "../gen_ml/ml.h"
#include "../winamp/wa_ipc.h"
#include "../winamp/ipc_pe.h"

16
Src/Plugins/General/gen_ff/wa2wndembed.cpp
View file

@ -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)

2
Src/Plugins/General/gen_hotkeys/Configdlg.h
View file

@ -1,7 +1,7 @@
#ifndef __CONFIG_DIALOG_H__
#define __CONFIG_DIALOG_H__
#include <windows.h>
#include <arch.h>
#include "resource.h"
BOOL CALLBACK ConfigProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);

2
Src/Plugins/General/gen_hotkeys/HotKeyCtl.h
View file

@ -1,7 +1,7 @@
#ifndef ____HOTKEY_CTL___H____
#define ____HOTKEY_CTL___H____
#include <windows.h>
#include <arch.h>
#define HOTKEYF_WIN 0x10

2
Src/Plugins/General/gen_hotkeys/gen_hotkeys.h
View file

@ -1,7 +1,7 @@
#ifndef ___HOTAMP3_H___
#define ___HOTAMP3_H___
#include <windows.h>
#include <arch.h>
#include <commctrl.h>
#include "winamp.h"
#include "wa_hotkeys.h"

4
Src/Plugins/General/gen_hotkeys/gen_hotkeys.rc
View file

@ -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"

2
Src/Plugins/General/gen_ml/banner.h
View file

@ -1,7 +1,7 @@
#ifndef NULLSOFT_ML_BANNER_HEADER
#define NULLSOFT_ML_BANNER_HEADER
#include <windows.h>
#include <arch.h>
class MLBanner
{

2
Src/Plugins/General/gen_ml/colors.h
View file

@ -5,7 +5,7 @@
#pragma once
#endif
#include <windows.h>
#include <arch.h>
//******************************* Window
#define MLSO_WINDOW 0

2
Src/Plugins/General/gen_ml/comboskin.h
View file

@ -1,7 +1,7 @@
#ifndef _COMBOSKIN_H
#define _COMBOSKIN_H
#include <windows.h>
#include <arch.h>
//class ScrollWnd;

2
Src/Plugins/General/gen_ml/config.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include <strsafe.h>
#include "config.h"

2
Src/Plugins/General/gen_ml/fileview.h
View file

@ -5,7 +5,7 @@
#pragma once
#endif
#include <windows.h>
#include <arch.h>
#ifdef __cplusplus
extern "C" {

2
Src/Plugins/General/gen_ml/fileview_columns.cpp
View file

@ -2,7 +2,7 @@
#include "./fileview_internal.h"
#include "./resource.h"
#include "../nu/menushortcuts.h"
#include <windowsx.h>
#include <archx.h>
#include <strsafe.h>
#define COLUMN_WIDTH_MIN 16

2
Src/Plugins/General/gen_ml/fileview_internal.h
View file

@ -5,7 +5,7 @@
#pragma once
#endif
#include <windows.h>
#include <arch.h>
#include "../winamp/gen.h"
#include "api__gen_ml.h"
#include "./ml_ipc_0313.h"

2
Src/Plugins/General/gen_ml/fileview_menu.cpp
View file

@ -2,7 +2,7 @@
#include "./fileview_internal.h"
#include "./resource.h"
#include "../nu/menushortcuts.h"
#include <windowsx.h>
#include <archx.h>
#include <strsafe.h>
#define SUBMENU_VIEWMODE 0

2
Src/Plugins/General/gen_ml/fileview_toolbar.cpp
View file

@ -2,7 +2,7 @@
#include "./fileview_internal.h"
#include "./resource.h"
#include "../nu/menushortcuts.h"
#include <windowsx.h>
#include <archx.h>
#include <strsafe.h>
#define FVTOOLBAR_DATAW L"FVTOOLBAR"

2
Src/Plugins/General/gen_ml/flickerfix.cpp
View file

@ -1,4 +1,4 @@
#include <windows.h>
#include <arch.h>
#include "ml.h"
#include "../nu/CGlobalAtom.h"

2
Src/Plugins/General/gen_ml/folderbrowser.cpp
View file

@ -6,7 +6,7 @@
#include "./skinnedlistbox.h"
#include "./colors.h"
#include <windowsx.h>
#include <archx.h>
#include <strsafe.h>

2
Src/Plugins/General/gen_ml/folderbrowser.h
View file

@ -5,7 +5,7 @@
#pragma once
#endif
#include <windows.h>
#include <arch.h>
#ifdef __cplusplus
extern "C" {

2
Src/Plugins/General/gen_ml/folderbrowser_internal.h
View file

@ -5,7 +5,7 @@
#pragma once
#endif
#include <windows.h>
#include <arch.h>
#include "./ml_ipc_0313.h"
#include "../nu/trace.h"

2
Src/Plugins/General/gen_ml/gaystring.h
View file

@ -1,7 +1,7 @@
#ifndef _GAYSTRING_H_
#define _GAYSTRING_H_
#include <windows.h>
#include <arch.h>
class GayString
{

16
Src/Plugins/General/gen_ml/gen_ml.vcxproj
View file

@ -93,26 +93,26 @@
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>false</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>true</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
<VcpkgConfiguration>Debug</VcpkgConfiguration>
</PropertyGroup>
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgInstalledDir>
</VcpkgInstalledDir>
<VcpkgUseStatic>true</VcpkgUseStatic>
<VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
<VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -152,7 +152,7 @@
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -205,7 +205,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN
</SupportUnloadOfDelayLoadedDLL>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -256,7 +256,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<StackReserveSize>0x8000</StackReserveSize>
<LargeAddressAware>true</LargeAddressAware>
@ -300,7 +300,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>

2
Src/Plugins/General/gen_ml/graphics.h
View file

@ -5,7 +5,7 @@
#pragma once
#endif
#include <windows.h>
#include <arch.h>
typedef struct _COLOR24 COLOR24;

2
Src/Plugins/General/gen_ml/itemlist.cpp
View file

@ -16,7 +16,7 @@
**
*/
#include <windows.h>
#include <arch.h>
#include "itemlist.h"
C_ItemList::C_ItemList()

4
Src/Plugins/General/gen_ml/listheader.cpp
View file

@ -1,5 +1,5 @@
#include "main.h"
#include <windowsx.h>
#include <archx.h>
#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:
{

2
Src/Plugins/General/gen_ml/listskin.h
View file

@ -1,7 +1,7 @@
#ifndef _LISTSKIN_H
#define _LISTSKIN_H
#include <windows.h>
#include <arch.h>
class ScrollWnd;

2
Src/Plugins/General/gen_ml/listview.cpp
View file

@ -16,7 +16,7 @@
**
*/
#include <windows.h>
#include <arch.h>
#include <commctrl.h>
#include "listview.h"

4
Src/Plugins/General/gen_ml/listview.h
View file

@ -19,8 +19,8 @@
#ifndef _LISTVIEW_H_
#define _LISTVIEW_H_
#include <windows.h>
#include <windowsx.h>
#include <arch.h>
#include <archx.h>
#include <commctrl.h>
class W_ListView

16
Src/Plugins/General/gen_ml/main.cpp
View file

@ -1,5 +1,5 @@
#include "main.h"
#include <windowsx.h>
#include <archx.h>
#include <time.h>
#include <rpc.h>
#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);
}
}

4
Src/Plugins/General/gen_ml/main.h
View file

@ -1,8 +1,8 @@
#ifndef _MAIN_H
#define _MAIN_H
#include <windows.h>
#include <windowsx.h>
#include <arch.h>
#include <archx.h>
#include <commctrl.h>
#include "../winamp/wa_dlg.h"

10
Src/Plugins/General/gen_ml/ml.h
View file

@ -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 <windows.h>
#include <arch.h>
#include <commctrl.h>
#include <stddef.h>
#include <api/service/api_service.h>
@ -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 <stddef.h> and use intptr_t
// if you don't like arch types or caps, you can #include <stddef.h> 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

Some files were not shown because too many files have changed in this diff Show more