publish changes

Src/Plugins/Input/in_avi/ExtendedFileInfo.cpp

@@ -1,5 +1,5 @@
 #include <bfc/platform/types.h>
-#include <windows.h>
+#include <arch.h>
 #include "api__in_avi.h"
 #include "win32_avi_reader.h"
 #include "../nsavi/metadata.h"

Src/Plugins/Input/in_cdda/AUDIO.Cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "Audio.h"
 #include "main.h"
 #include "api__in_cdda.h"

Src/Plugins/Input/in_cdda/MAIN.H

@@ -1,6 +1,6 @@
 #ifndef NULLSOFT_MAINH
 #define NULLSOFT_MAINH
-#include <windows.h>
+#include <arch.h>
 #include <stdio.h>
 #include "../Winamp/in2.h"
 #include "audio.h"

Src/Plugins/Input/in_cdda/VeritasPlay.cpp

@@ -1,5 +1,5 @@
 #include "Main.h"
-#include <windows.h>
+#include <arch.h>
 #include "VeritasPlay.h"
 #include "CDDB.h"
 #include "workorder.h"

Src/Plugins/Input/in_cdda/VeritasPlay.h

@@ -2,7 +2,7 @@
 #define NULLSOFT_VERITASPLAYH
 
 #include "CDPlay.h"
-#include <windows.h>
+#include <arch.h>
 #include "SpeedLimiter.h"
 #include "main.h"
 

Src/Plugins/Input/in_cdda/cddbevnt.h

@@ -6,7 +6,7 @@
 #pragma once
 #endif
 
-#include <windows.h>
+#include <arch.h>
 
 // callbacks
 typedef void (CALLBACK *CDDB_CMDCOMPLETED)(LONG /*lCommandCode*/, HRESULT /*hCommandResult*/, VARIANT* /*pCommandData*/, ULONG_PTR /*user*/);

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;
 

Src/Plugins/Input/in_cdda/cddbui.h

@@ -6,7 +6,7 @@
 #pragma once
 #endif
 
-#include <windows.h>
+#include <arch.h>
 
 #define AUTOCLOSE_NOW		0x00000000
 #define AUTOCLOSE_NEVER		0xFFFFFFFF

Src/Plugins/Input/in_cdda/grabwnd.h

@@ -6,7 +6,7 @@
 #pragma once
 #endif
 
-#include <windows.h>
+#include <arch.h>
 
 typedef void (CALLBACK *GRABCB)(HWND /*hwnd*/, CREATESTRUCT* /*lpcs*/, HWND* /*phwndInsertAfter*/, ULONG_PTR /*user*/);
 

Src/Plugins/Input/in_cdda/in_cdda.vcxproj

@@ -92,26 +92,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>

Src/Plugins/Input/in_cdda/scsi_id.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include <winioctl.h>
 
 //functions to get the SCSI ID from a drive letter

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

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 <windows.h>
+#include <arch.h>
 #include <stdio.h>
 #include <winioctl.h>
 

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 

Src/Plugins/Input/in_cdda/windac/Dac32.h

@@ -86,7 +86,7 @@
 #define WIN32_LEAN_AND_MEAN  // compile only important Headerfiles
 #endif
 
-#include <windows.h>
+#include <arch.h>
 #include <stdio.h>
 #include "aspifunc.h"
 

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

Src/Plugins/Input/in_cdda/windac/NTScsi.h

@@ -5,7 +5,7 @@
 #ifndef NTSCSI_H_INCLUDED
 #define NTSCSI_H_INCLUDED
 
-#include <windows.h>
+#include <arch.h>
 #include "Aspi.h"
 
 typedef struct {

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

Src/Plugins/Input/in_dshow/Header.cpp

@@ -1,5 +1,5 @@
 #include "Header.h"
-#include <windows.h>
+#include <arch.h>
 #include "header_avi.h"
 #include "header_mpg.h"
 #include "header_asf.h"

Src/Plugins/Input/in_dshow/Main.cpp

@@ -2,7 +2,7 @@
 #define PLUGIN_VERSION L"1.15"
 
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <arch.h>
 #include <math.h>
 #include <assert.h>
 #include "../Agave/Language/api_language.h"

Src/Plugins/Input/in_dshow/Main.h

@@ -2,7 +2,7 @@
 
 extern class CWAAudioRenderer *nullfilter;
 
-#include <windows.h>
+#include <arch.h>
 #include <streams.h>
 #include <strsafe.h>
 

Src/Plugins/Input/in_dshow/audioswitch.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include <AtlBase.h>
 #include <streams.h>
 #include <strsafe.h>

Src/Plugins/Input/in_dshow/base/perflog.cpp

@@ -9,7 +9,7 @@
 #pragma warning (disable:4201)
 
 #include <streams.h>
-#include <windows.h>
+#include <arch.h>
 #include <tchar.h>
 #include <winperf.h>
 #include <wmistr.h>

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

Src/Plugins/Input/in_dshow/base/streams.h

@@ -36,8 +36,8 @@
 #endif
 
 
-#include <windows.h>
-#include <windowsx.h>
+#include <arch.h>
+#include <archx.h>
 #include <olectl.h>
 #include <ddraw.h>
 #include <mmsystem.h>
@@ -179,7 +179,7 @@ LONG_PTR _SetWindowLongPtr(HWND hwnd, int nIndex, T p)
 #include <outputq.h>    // Output pin queueing
 #include <errors.h>     // HRESULT status and error definitions
 #include <renbase.h>    // Base class for writing ActiveX renderers
-#include <winutil.h>    // Helps with filters that manage windows
+#include <winutil.h>    // Helps with filters that manage arch
 #include <winctrl.h>    // Implements the IVideoWindow interface
 #include <videoctl.h>   // Specifically video related classes
 #include <refclock.h>	// Base clock class

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

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

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

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,

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,

Src/Plugins/Input/in_dshow/config.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "resource.h"
 #include "../Agave/Language/api_language.h"
 #include "main.h"

Src/Plugins/Input/in_dshow/dshowrender.cpp

@@ -5,7 +5,7 @@
 //
 #ifdef WINAMPX
 
-#include <windows.h>
+#include <arch.h>
 #include <math.h>
 
 #include "message.h"

Src/Plugins/Input/in_dshow/header_asf.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "header_asf.h"
 #include <mmsystem.h>
 #include <stdio.h>

Src/Plugins/Input/in_dshow/header_avi.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "header_avi.h"
 #include <mmsystem.h>
 #include <bfc/platform/types.h>

Src/Plugins/Input/in_dshow/header_avi.h

@@ -1,7 +1,7 @@
 #ifndef _HEADER_AVI_H
 #define _HEADER_AVI_H
 
-#include <windows.h>
+#include <arch.h>
 
 #include "Header.h"
 

Src/Plugins/Input/in_dshow/header_mpg.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "header_mpg.h"
 #include <bfc/platform/types.h>
 

Src/Plugins/Input/in_dshow/header_wav.cpp

@@ -1,5 +1,5 @@
 #include "header_wav.h"
-#include <windows.h>
+#include <arch.h>
 #include "header_avi.h"
 #include <mmsystem.h>
 #include <bfc/platform/types.h>

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 <windows.h>
+#include <arch.h>
 
 #include "Header.h"
 

Src/Plugins/Input/in_flac/DecodeThread.cpp

@@ -22,7 +22,7 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include "main.h"
-#include <windows.h>
+#include <arch.h>
 #include <math.h>
 #include <assert.h>
 #include <locale.h>

Src/Plugins/Input/in_flac/FileInfo.cpp

@@ -22,7 +22,7 @@
 #include <FLAC/all.h>
 #include "main.h"
 #include "../nu/ns_wc.h"
-#include <windows.h>
+#include <arch.h>
 #include "resource.h"
 #include "Metadata.h"
 #include "../nu/AutoWide.h"

Src/Plugins/Input/in_flac/StreamFileWin32.cpp

@@ -18,7 +18,7 @@
 ** Created: March 1, 2007
 **
 */
-#include <windows.h>
+#include <arch.h>
 #include <FLAC/all.h>
 #include <assert.h>
 #include "StreamFileWin32.h"

Src/Plugins/Input/in_flac/StreamFileWin32.h

@@ -2,7 +2,7 @@
 #define NULLSOFT_IN_FLAC_STREAMFILEWIN32_H
 
 #include <FLAC/all.h>
-#include <windows.h>
+#include <arch.h>
 
 struct Win32_State
 {

Src/Plugins/Input/in_flac/in_flac.vcxproj

@@ -92,26 +92,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>

Src/Plugins/Input/in_flac/main.h

@@ -3,7 +3,7 @@
 
 #define PLUGIN_VER L"3.2"
 
-#include <windows.h>
+#include <arch.h>
 extern HANDLE killswitch;
 
 #include "../Winamp/in2.h"

Src/Plugins/Input/in_flv/AMFObject.h

@@ -2,7 +2,7 @@
 #define NULLSOFT_AMFOBJECT_H
 
 #include "FLVUtil.h"
-#include <windows.h>
+#include <arch.h>
 #include <map>
 #include <string>
 #include <vector>

Src/Plugins/Input/in_flv/ExtendedInfo.cpp

@@ -1,5 +1,5 @@
 #include <bfc/platform/types.h>
-#include <windows.h>
+#include <arch.h>
 #include <strsafe.h>
 #include "api__in_flv.h"
 #include "resource.h"

Src/Plugins/Input/in_flv/FLVMetadata.cpp

@@ -1,6 +1,6 @@
 #include "FLVMetadata.h"
 #include "FLVUtil.h"
-#include <windows.h>
+#include <arch.h>
 
 /*
 (c) 2006 Nullsoft, Inc.

Src/Plugins/Input/in_flv/FLVReader.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_IN_FLV_FLVREADER_H
 #define NULLSOFT_IN_FLV_FLVREADER_H
 
-#include <windows.h>
+#include <arch.h>
 #include <bfc/platform/types.h>
 #include "FLVStreamheader.h"
 #include "../nu/AutoLock.h"

Src/Plugins/Input/in_flv/FileProcessor.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "FLVProcessor.h"
-#include <windows.h>
+#include <arch.h>
 #include <vector>
 #include "../nu/AutoLock.h"
 

Src/Plugins/Input/in_flv/PlayThread.cpp

@@ -1,5 +1,5 @@
 #include "main.h"
-#include <windows.h>
+#include <arch.h>
 #include "api__in_flv.h"
 #include "../Winamp/wa_ipc.h"
 #include "FLVHeader.h"

Src/Plugins/Input/in_flv/VideoThread.cpp

@@ -3,7 +3,7 @@
 #include "api__in_flv.h"
 #include "FLVVideoHeader.h"
 #include <shlwapi.h>
-#include <windows.h>
+#include <arch.h>
 #include "../nu/threadname.h"
 #include <api/service/waservicefactory.h>
 #include "../nu/AutoLock.h"

Src/Plugins/Input/in_flv/main.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_IN_FLV_MAIN_H
 #define NULLSOFT_IN_FLV_MAIN_H
 
-#include <windows.h>
+#include <arch.h>
 #include "../Winamp/in2.h"
 #include "../nu/VideoClock.h"
 #include "../nu/AutoLock.h"

Src/Plugins/Input/in_linein/audio.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "Audio.h"
 #include "main.h"
 #pragma intrinsic(memcpy, memset)

Src/Plugins/Input/in_linein/in_linein.cpp

@@ -2,7 +2,7 @@
 #define PLUGIN_VERSION L"3.16"
 
 #include "main.h"
-#include <windows.h>
+#include <arch.h>
 #include "LineIn.h"
 #include <api/service/waServiceFactory.h>
 #include "../Agave/Language/api_language.h"

Src/Plugins/Input/in_midi/cvt.h

@@ -1,7 +1,7 @@
 #ifndef STRICT
 #define STRICT 1
 #endif
-#include <windows.h>
+#include <arch.h>
 #include <math.h>
 
 #include <malloc.h>

Src/Plugins/Input/in_midi/dmplugin.h

@@ -10,7 +10,7 @@
 #ifndef _DMPLUGIN_
 #define _DMPLUGIN_
 
-#include <windows.h>
+#include <arch.h>
 
 #define COM_NO_WINDOWS_H
 #include <objbase.h>

Src/Plugins/Input/in_midi/dmusicc.h

@@ -9,7 +9,7 @@
 #ifndef _DMUSICC_
 #define _DMUSICC_
 
-#include <windows.h>
+#include <arch.h>
 
 #define COM_NO_WINDOWS_H
 #include <objbase.h>

Src/Plugins/Input/in_midi/dmusicf.h

@@ -10,7 +10,7 @@
 #define _DMUSICF_
 
 
-#include <windows.h>
+#include <arch.h>
 
 #define COM_NO_WINDOWS_H
 #include <objbase.h>

Src/Plugins/Input/in_midi/dmusici.h

@@ -10,7 +10,7 @@
 #ifndef _DMUSICI_
 #define _DMUSICI_
 
-#include <windows.h>
+#include <arch.h>
 
 #define COM_NO_WINDOWS_H
 #include <objbase.h>

Src/Plugins/Input/in_midi/genres.c

@@ -1,5 +1,5 @@
 #define STRICT
-#include <windows.h>
+#include <arch.h>
 
 #include "genres.h"
 

Src/Plugins/Input/in_midi/in_midi.vcxproj

@@ -92,26 +92,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)'=='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'">
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
     <VcpkgConfiguration>Debug</VcpkgConfiguration>
   </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>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\minizip;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\minizip;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IN_MIDI_EXPORTS;IN_MIDI;WINVER=0x601;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -192,7 +192,7 @@ xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\..\..\Build\Winamp_$(PlatformShortN
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-windows-static\include\minizip;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Wasabi;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include;..\..\..\external_dependencies\vcpkg\$(PlatformShortName)-arch-static\include\minizip;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IN_MIDI_EXPORTS;IN_MIDI;WINVER=0x601;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

Src/Plugins/Input/in_midi/main.h

@@ -2,7 +2,7 @@
 #define STRICT
 #endif
 #include "../Agave/Language/api_language.h"
-#include <windows.h>
+#include <arch.h>
 #include <malloc.h>
 
 #ifndef NOVTABLE

Src/Plugins/Input/in_mkv/ExtendedFileInfo.cpp

@@ -1,5 +1,5 @@
 #include <bfc/platform/types.h>
-#include <windows.h>
+#include <arch.h>
 #include "api__in_mkv.h"
 #include "MKVInfo.h"
 #include <strsafe.h>

Src/Plugins/Input/in_mkv/MKVPlayer.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <windows.h>
+#include <arch.h>
 #include <bfc/platform/types.h>
 
 // nsmkv stuff

Src/Plugins/Input/in_mkv/PlayThread.cpp

@@ -15,7 +15,7 @@
 #include "../nsmkv/file_mkv_reader.h"
 #include <api/service/waservicefactory.h>
 #include <api/service/services.h>
-#include <windows.h>
+#include <arch.h>
 #include <strsafe.h>
 
 // {B6CB4A7C-A8D0-4c55-8E60-9F7A7A23DA0F}

Src/Plugins/Input/in_mod-openmpt/ExtendedInfo.cpp

@@ -1,5 +1,5 @@
 #include <bfc/platform/types.h>
-#include <windows.h>
+#include <arch.h>
 #include <strsafe.h>
 #include "api__in_mod.h"
 #include "resource.h"

Src/Plugins/Input/in_mod-openmpt/in_mod-openmpt.vcxproj

@@ -96,26 +96,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>

Src/Plugins/Input/in_mod/mikamp/include/Main.h

@@ -1,7 +1,7 @@
 #ifndef __MIKAMP_MAIN_H__
 #define __MIKAMP_MAIN_H__
 
-#include <windows.h>
+#include <arch.h>
 #include <stdio.h>
 #include "mikmod.h"
 #include "mplayer.h"

Src/Plugins/Input/in_mod/mikamp/src/drv_amp.c

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include <malloc.h>
 #include "mikmod.h"
 #include "virtch.h"

Src/Plugins/Input/in_mod/mikamp/src/drv_buffer.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include <malloc.h>
 #include "mikmod.h"
 #include "virtch.h"

Src/Plugins/Input/in_mod/mikamp/src/rf_wrapper.c

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include <mmio.h>
 #include <shlwapi.h>
 #include "../../winamp/wa_ipc.h"

Src/Plugins/Input/in_mp3/CVbriHeader.cpp

@@ -14,7 +14,7 @@
 //
 //--------------------------------------------------------------------------/
 
-#include <windows.h>
+#include <arch.h>
 
 #include "CVbriHeader.h"
 #include "LAMEInfo.h"

Src/Plugins/Input/in_mp3/DXHEAD.C

@@ -10,7 +10,7 @@ mod 12/7/98 add vbr scale
  
 Copyright 1998 Xing Technology Corp.
 -----------------------------------------------------------*/
-#include <windows.h>
+#include <arch.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <float.h>

Src/Plugins/Input/in_mp3/DecodeThread.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_DECODETHREADH
 #define NULLSOFT_DECODETHREADH
 
-#include <windows.h>
+#include <arch.h>
 
 DWORD WINAPI DecodeThread(LPVOID b);
 

Src/Plugins/Input/in_mp3/ID3v1.cpp

@@ -1,6 +1,6 @@
 #include "ID3v1.h"
 #include "../nu/ns_wc.h"
-#include <windows.h>
+#include <arch.h>
 #include "config.h"
 #include <strsafe.h>
 

Src/Plugins/Input/in_mp3/LAMEinfo.cpp

@@ -1,5 +1,5 @@
 #include "LAMEinfo.h"
-#include <windows.h>
+#include <arch.h>
 #include <memory.h>
 #include <math.h>
 #include "api__in_mp3.h"

Src/Plugins/Input/in_mp3/Lyrics3.cpp

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

Src/Plugins/Input/in_mp3/MP3Info.h

@@ -2,7 +2,7 @@
 #define NULLSOFT_IN_MP3_MP3_INFO_H
 
 #include "Metadata.h"
-#include <windows.h>
+#include <arch.h>
 
 class MP3Info 
 {

Src/Plugins/Input/in_mp3/about.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "main.h"
 #if 1
 BOOL CALLBACK AboutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,LPARAM lParam)

Src/Plugins/Input/in_mp3/config.cpp

@@ -1,7 +1,7 @@
 #include "main.h"
 #include <shlobj.h>
 #include <commctrl.h>
-#include <windows.h>
+#include <arch.h>
 #include "../winamp/wa_ipc.h"
 #include "config.h"
 #include "api__in_mp3.h"

Src/Plugins/Input/in_mp3/giofile.h

@@ -17,7 +17,7 @@
 #define _GIOFILE_H
 
 /* ------------------------ includes --------------------------------------*/
-#include <windows.h>
+#include <arch.h>
 
 #include "CVbriHeader.h"
 #include "jnetlib/jnetlib.h"

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 <windows.h>
+#include <arch.h>
 #include ".\image.h"
 
 class MLImageFilterWater

Src/Plugins/Input/in_mp3/graphics/image.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_ML_IMAGE_HEADER
 #define NULLSOFT_ML_IMAGE_HEADER
 
-#include <windows.h>
+#include <arch.h>
 
 #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)

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 <windows.h>
+#include <arch.h>
 #include ".\image.h"
 #include ".\filterwater.h"
 

Src/Plugins/Input/in_mp3/in_mp3.vcxproj

@@ -92,26 +92,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>

Src/Plugins/Input/in_mp3/main.h

@@ -2,7 +2,7 @@
 #ifndef  WIN32_LEAN_AND_MEAN
 	#define WIN32_LEAN_AND_MEAN
 #endif
-#include <windows.h>
+#include <arch.h>
 #include "giofile.h"
 #include "dxhead.h"
 #include "CVbriHeader.h"

Src/Plugins/Input/in_mp3/pdtimer.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_PDTIMERH
 #define NULLSOFT_PDTIMERH
 
-#include <windows.h>
+#include <arch.h>
 
 __int64 pdReadResolution(void);
 __int64 pdReadTimer(void);

Src/Plugins/Input/in_mp3/tagz.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

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 #

Src/Plugins/Input/in_mp4/Main.cpp

@@ -1,6 +1,6 @@
 #define PLUGIN_VERSION L"2.70"
 #include "Main.h"
-#include <windows.h>
+#include <arch.h>
 #include <stdio.h>
 #include <locale.h>
 #include "resource.h"

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

Src/Plugins/Input/in_nsv/BigLib.cpp

@@ -1,6 +1,6 @@
 #ifdef WINAMPX
 #define WIN32_LEAN_AND_MEAN	1
-#include <windows.h>
+#include <arch.h>
 #include "stdio.h"
 #include "proxydt.h"
 #include <winsock2.h>
@@ -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;

Src/Plugins/Input/in_nsv/Main.cpp

@@ -1,7 +1,7 @@
 #define PLUGIN_NAME "Nullsoft NSV Decoder"
 #define PLUGIN_VERSION L"1.76"
 
-#include <windows.h>
+#include <arch.h>
 #include "../Winamp/in2.h"
 #include "../nsv/nsvplay/main.h"
 #include "resource.h"

Src/Plugins/Input/in_nsv/config.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "api.h"
 #include "resource.h"
 #include "../Winamp/wa_ipc.h"

Src/Plugins/Input/in_nsv/infodlg.cpp

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

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

Src/Plugins/Input/in_swf/main.h

@@ -3,7 +3,7 @@
 #include "../Winamp/in2.h"
 extern In_Module plugin;
 
-#include <windows.h>
+#include <arch.h>
 
 #include "../Winamp/wa_ipc.h"
 extern IVideoOutput *videoOutput;

Src/Plugins/Input/in_wave/AudioThread.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "main.h"
 #include "../Winamp/wa_ipc.h"
 #include "config.h"

Src/Plugins/Input/in_wave/AudioThread.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_AUDIOTHREADH
 #define NULLSOFT_AUDIOTHREADH
 
-#include <windows.h>
+#include <arch.h>
 
 VOID CALLBACK APCSeek( ULONG_PTR p_data );
 VOID CALLBACK APCPause( ULONG_PTR p_data );

Src/Plugins/Input/in_wave/VirtualIO.cpp

@@ -3,7 +3,7 @@
 #include <api/service/waservicefactory.h>
 #include "../nu/AutoWide.h"
 #include <assert.h>
-#include <windows.h>
+#include <arch.h>
 
 // TODO: extend this to use api_filereader
 // instead of just the HTTP reader directly