From b4c7e329caf1be86dd153d0a299c0615b10b337e Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Tue, 11 Nov 2003 01:57:32 +0000 Subject: [PATCH] caught up .NET --- Cxbe.dsp | 4 +- Cxbe.vcproj | 6 +- Cxbx.opt | Bin 67072 -> 64512 bytes Cxbx.sln | 32 ++--- Cxbx.suo | Bin 0 -> 11264 bytes Cxbx.vcproj | 2 +- CxbxKrnl.vcproj | 201 ++++++++++++++++------------ Include/Win32/CxbxKrnl/Emu.h | 5 +- Include/Win32/CxbxKrnl/EmuXOnline.h | 33 ++--- Source/Win32/CxbxKrnl/Emu.cpp | 1 + Source/Win32/CxbxKrnl/EmuD3D8.cpp | 12 +- Source/Win32/CxbxKrnl/EmuDSound.cpp | 31 ----- Source/Win32/Mutex.cpp | 12 +- 13 files changed, 176 insertions(+), 163 deletions(-) create mode 100644 Cxbx.suo diff --git a/Cxbe.dsp b/Cxbe.dsp index 2e50824b7..fec5f6a5d 100644 --- a/Cxbe.dsp +++ b/Cxbe.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /O2 /I "Include" /I "Include/Core/" /I "Include/Standard" /I "Include/Standard/Cxbe" /I "Include/Win32/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /O2 /I "Include" /I "Include/Core/" /I "Include/Standard" /I "Include/Standard/Cxbe" /I "Include/Win32/" /I "Include/Win32/CxbxKrnl/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /Zi /Od /I "Include" /I "Include/Core/" /I "Include/Standard" /I "Include/Standard/Cxbe" /I "Include/Win32/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /Zi /Od /I "Include" /I "Include/Core/" /I "Include/Standard" /I "Include/Standard/Cxbe" /I "Include/Win32/" /I "Include/Win32/CxbxKrnl/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/Cxbe.vcproj b/Cxbe.vcproj index b4bc7027d..277bede18 100644 --- a/Cxbe.vcproj +++ b/Cxbe.vcproj @@ -21,7 +21,7 @@ diff --git a/Cxbx.opt b/Cxbx.opt index 86f452e15dd19e6f7e1a1fba25aea069267332d1..580b62044264d65e35509b4fb034a4a379dc6b98 100644 GIT binary patch literal 64512 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 literal 67072 zcmeHQU2GiJbzc6-)Y_IMTaq2Sj&JDNrfg~Xv$RApDr<6gDXq2q>5>xZm@YFrGbG2H zo!QLHic7V1l%n-hn}q#)DhdQ>YqUjy_N_n))NNjxph<%QMPHMLz8GkOq9{;qsyXTzy!+$>Uqi_B7vpP8atxI zcO%>t@yBCGzkQq7=t|*j5Tg0GPkP{E+^4{p^?-UoeIOe1M?n3cqo6qGQ4o#u{25_Aega!=#>4Cr&9XF<<_eh&0J=<}c#KqPk+*8$Lrpq~f51bP|t z3TO~?2J|Y3WY6My4wL{5frddNpixi~GzKEM^SE9Bje{||AXc9znZ{Ruw zng*pnX;20<1G)^l0?LBk1d;p=TxUUZpn1>&=$Alw&?0CFbPaSJv<#v=Z{hkS(A%I@ z&^w@C2Cad<4AMX(r{ijXOwc-L1GEXUK<|RKKqObh)d9Jn66h-+59EUaP#HvWL^QTL z;BSI{1@x<+Ujw}d`YPxaD36j{

PRgR2*#9GxGhF=J4TJZR3eJO1jsUwFFs!FRgo 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 diff --git a/Cxbx.sln b/Cxbx.sln index c52cea430..5449d5186 100644 --- a/Cxbx.sln +++ b/Cxbx.sln @@ -1,9 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{F6656053-E173-4BFC-BC4F-A4539910E72E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{47E018FF-BC97-4BC1-9565-8D1B5EF5739A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{09283643-8783-476C-9A8A-CA8D582C9C5B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{32D9FF15-9484-4C74-866B-E336EDCF1669}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{017929D0-1B96-400E-AF89-09CB8BA40BF9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{134EEF58-6EBA-458A-8D9E-EDFE79650036}" EndProject Global GlobalSection(SolutionConfiguration) = preSolution @@ -11,21 +11,21 @@ Global ConfigName.1 = Release EndGlobalSection GlobalSection(ProjectDependencies) = postSolution - {09283643-8783-476C-9A8A-CA8D582C9C5B}.0 = {017929D0-1B96-400E-AF89-09CB8BA40BF9} + {32D9FF15-9484-4C74-866B-E336EDCF1669}.0 = {134EEF58-6EBA-458A-8D9E-EDFE79650036} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution - {F6656053-E173-4BFC-BC4F-A4539910E72E}.Debug.ActiveCfg = Debug|Win32 - {F6656053-E173-4BFC-BC4F-A4539910E72E}.Debug.Build.0 = Debug|Win32 - {F6656053-E173-4BFC-BC4F-A4539910E72E}.Release.ActiveCfg = Release|Win32 - {F6656053-E173-4BFC-BC4F-A4539910E72E}.Release.Build.0 = Release|Win32 - {09283643-8783-476C-9A8A-CA8D582C9C5B}.Debug.ActiveCfg = Debug|Win32 - {09283643-8783-476C-9A8A-CA8D582C9C5B}.Debug.Build.0 = Debug|Win32 - {09283643-8783-476C-9A8A-CA8D582C9C5B}.Release.ActiveCfg = Release|Win32 - {09283643-8783-476C-9A8A-CA8D582C9C5B}.Release.Build.0 = Release|Win32 - {017929D0-1B96-400E-AF89-09CB8BA40BF9}.Debug.ActiveCfg = Debug|Win32 - {017929D0-1B96-400E-AF89-09CB8BA40BF9}.Debug.Build.0 = Debug|Win32 - {017929D0-1B96-400E-AF89-09CB8BA40BF9}.Release.ActiveCfg = Release|Win32 - {017929D0-1B96-400E-AF89-09CB8BA40BF9}.Release.Build.0 = Release|Win32 + {47E018FF-BC97-4BC1-9565-8D1B5EF5739A}.Debug.ActiveCfg = Debug|Win32 + {47E018FF-BC97-4BC1-9565-8D1B5EF5739A}.Debug.Build.0 = Debug|Win32 + {47E018FF-BC97-4BC1-9565-8D1B5EF5739A}.Release.ActiveCfg = Release|Win32 + {47E018FF-BC97-4BC1-9565-8D1B5EF5739A}.Release.Build.0 = Release|Win32 + {32D9FF15-9484-4C74-866B-E336EDCF1669}.Debug.ActiveCfg = Debug|Win32 + {32D9FF15-9484-4C74-866B-E336EDCF1669}.Debug.Build.0 = Debug|Win32 + {32D9FF15-9484-4C74-866B-E336EDCF1669}.Release.ActiveCfg = Release|Win32 + {32D9FF15-9484-4C74-866B-E336EDCF1669}.Release.Build.0 = Release|Win32 + {134EEF58-6EBA-458A-8D9E-EDFE79650036}.Debug.ActiveCfg = Debug|Win32 + {134EEF58-6EBA-458A-8D9E-EDFE79650036}.Debug.Build.0 = Debug|Win32 + {134EEF58-6EBA-458A-8D9E-EDFE79650036}.Release.ActiveCfg = Release|Win32 + {134EEF58-6EBA-458A-8D9E-EDFE79650036}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/Cxbx.suo b/Cxbx.suo new file mode 100644 index 0000000000000000000000000000000000000000..6e65881de59e1bf64288be799ad750436f534e67 GIT binary patch literal 11264 zcmeI2O>9(E6vuBV2rWK%9luMYiVhzDD6xsA1#FzC`$d9w$m~&otd;#C_#1_ z6IZT`J7Z$vQr)=JL|3jbtX)W=aj6SMRG|L;?_<80nZ9X<5<>6f-*?}e^X@tK+;h%7 z_e_7hw(93kzuIuaWVKgJxw$)CVIE6+UPfQA+7resqNDq})6>)TLu2SJw1-FocaU|l zvxZB!YQ2|&O0W!6faPE%SOKcQD)2bK1k7rn^?#D<8mIpdP5+S>wb#V>B#h5=m?+nA zbD352-qx8VNuQV96lz}{S$qBF=iir=Lv&!hO?lD;&4jsNx=fgB!kpr72r1m>6NLuk zyRBwXne0=xtHqpwJo&Y3TP*;$K{IJa`G{{n@+8cVImg{hy!E~h{^Be9_sU-}Q@)~> z&A%NPLdbBz#95cHwI+q+*y-?>-+JY*xc#!2)8xD9NRI)o|0@=VM*g2ptG;4^Vu0qa zIjsfjz*9g={504AHiAvy8L$~V3w+=?umx0utza8C26h0A|2)@S;05por~$R$MNkLo z!Aqb4>;a8H@9pK<3|hcG&8*LL6s0nh;sf=+M<90sBjy6AU1_dQ&X zgAOMREbfDiMW*X-W$sdKfP}}arAJ>2j(YoJB*ZJbFG#y2Eeej;N~~~|nM--Ku$wGcaZg_4mB02Y#R@g) zI|0veW-aSUSz4z3`>nMQrFQAmn(Sl#(q%FFS1uWEl;28;! ztJT6^`AISSb#`&>UvVbF{M|X)em26aN3HlH&UPHk#oZYBzspQS6EZF^=hR9*q8$Cey+*_jax2G9$0N0-sXJ=4!rl zBi5!_f2P)p_nP^Ts<18CUQ z^)ITcJHP(*#?>8zV|%QJRX=Qq+^(qZ`EdIETi3q(tivj$X#2B|MoN{>rfwDEH|lWi z9-NL^X=a2cIu2XSkDtrSC#*9}h*(_QE=2vsstGEm^t%7(4D7H^?lH=P)6Ir4_b&81NxpwY)uax#YPD9m>)I(%_sxpQ+iK+supkRzV zLv>)~Jv#f_W7$3txA6S zHU2e0>&73Ke`;&;%Gst{J&X8vAdSEKJA?cCLm!#H_8^@BbSj)_2hjd!1%Bs`7wL~c z|50e)bB11sKaWnt&Sg!CKMRpunki=Q zTgVt@lQHD7zcbf#UYUJU8EtVOmpnQx{W3textks%DMU%hXe) zw}t1bnguvnc2G@gfwGZmah+8~^IG$5L-kjvwUv%*{xe?Tx^I5}oGN(+R^^fMmDXJ>qTOjA8S_x&sEV6r3zzEcxiU+BiH{ZxF?(J iT7*67G2|%bKOWrC+;dX)s48cbdQ30#U!ZxoHSj-US=H$P literal 0 HcmV?d00001 diff --git a/Cxbx.vcproj b/Cxbx.vcproj index 38cea407b..b38b00b0d 100644 --- a/Cxbx.vcproj +++ b/Cxbx.vcproj @@ -96,7 +96,7 @@ upxCxbx.bat BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/CxbxKrnl.vcproj b/CxbxKrnl.vcproj index 80b190594..70bfca414 100644 --- a/CxbxKrnl.vcproj +++ b/CxbxKrnl.vcproj @@ -21,7 +21,7 @@ - - - - - - - - - - - - + + @@ -253,30 +238,64 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - @@ -381,27 +382,61 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Include/Win32/CxbxKrnl/Emu.h b/Include/Win32/CxbxKrnl/Emu.h index bf70d9456..2fdd81236 100644 --- a/Include/Win32/CxbxKrnl/Emu.h +++ b/Include/Win32/CxbxKrnl/Emu.h @@ -38,6 +38,7 @@ #undef FIELD_OFFSET // prevent macro redefinition warnings #include +#include // pointless function extern "C" CXBXKRNL_API void NTAPI EmuNoFunc(); @@ -115,7 +116,7 @@ extern struct XInputSetStateStatus PVOID pFeedback; } g_pXInputSetStateStatus[8]; - +/* // extra stuff for multimonitors (win95+) typedef struct _MONITORINFO { @@ -125,5 +126,5 @@ typedef struct _MONITORINFO DWORD dwFlags; } MONITORINFO, *LPMONITORINFO; - +*/ #endif diff --git a/Include/Win32/CxbxKrnl/EmuXOnline.h b/Include/Win32/CxbxKrnl/EmuXOnline.h index eac886aea..b372dbbfb 100644 --- a/Include/Win32/CxbxKrnl/EmuXOnline.h +++ b/Include/Win32/CxbxKrnl/EmuXOnline.h @@ -54,25 +54,26 @@ // ****************************************************************** class EmuThis { - // ****************************************************************** - // * func: Emusocket - // ****************************************************************** - SOCKET Emusocket(int af, int type, int protocol); + public: + // ****************************************************************** + // * func: Emusocket + // ****************************************************************** + SOCKET Emusocket(int af, int type, int protocol); - // ****************************************************************** - // * func: Emubind - // ****************************************************************** - int Emubind(SOCKET s, const struct sockaddr FAR *name, int namelen); + // ****************************************************************** + // * func: Emubind + // ****************************************************************** + int Emubind(SOCKET s, const struct sockaddr FAR *name, int namelen); - // ****************************************************************** - // * func: Emulisten - // ****************************************************************** - int Emulisten(SOCKET s, int backlog); + // ****************************************************************** + // * func: Emulisten + // ****************************************************************** + int Emulisten(SOCKET s, int backlog); - // ****************************************************************** - // * func: Emuioctlsocket - // ****************************************************************** - int Emuioctlsocket(SOCKET s, long cmd, u_long FAR *argp); + // ****************************************************************** + // * func: Emuioctlsocket + // ****************************************************************** + int Emuioctlsocket(SOCKET s, long cmd, u_long FAR *argp); }; // ****************************************************************** diff --git a/Source/Win32/CxbxKrnl/Emu.cpp b/Source/Win32/CxbxKrnl/Emu.cpp index 2dd0b40e9..76bf4e581 100644 --- a/Source/Win32/CxbxKrnl/Emu.cpp +++ b/Source/Win32/CxbxKrnl/Emu.cpp @@ -40,6 +40,7 @@ namespace xboxkrnl #include }; +#define COMPILE_MULTIMON_STUBS #include "Emu.h" #include "EmuFS.h" diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.cpp b/Source/Win32/CxbxKrnl/EmuD3D8.cpp index 53e70ac11..b99756721 100644 --- a/Source/Win32/CxbxKrnl/EmuD3D8.cpp +++ b/Source/Win32/CxbxKrnl/EmuD3D8.cpp @@ -60,7 +60,7 @@ extern HWND g_hEmuWindow = NULL; // rendering window extern XTL::LPDIRECT3DDEVICE8 g_pD3DDevice8 = NULL; // Direct3D8 Device // Static Function(s) -static BOOL WINAPI EmuEnumDisplayDevices(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, XTL::HMONITOR hm); +static BOOL WINAPI EmuEnumDisplayDevices(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm); static DWORD WINAPI EmuRenderWindow(LPVOID); static DWORD WINAPI EmuCreateDeviceProxy(LPVOID); static LRESULT WINAPI EmuMsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -69,13 +69,13 @@ static inline void EmuVerifyResourceIsRegistered(XTL::X_D3DReso static void EmuAdjustPower2(UINT *dwWidth, UINT *dwHeight); static void EmuUpdateDeferredStates(); -typedef BOOL (WINAPI *pfGetMonitorInfo)(XTL::HMONITOR hMonitor, LPMONITORINFO lpmi); -static pfGetMonitorInfo GetMonitorInfo = (pfGetMonitorInfo)GetProcAddress(LoadLibrary("user32.dll"), "GetMonitorInfoA"); +//typedef BOOL (WINAPI *pfGetMonitorInfo)(HMONITOR hMonitor, LPMONITORINFO lpmi); +//static pfGetMonitorInfo GetMonitorInfo = (pfGetMonitorInfo)GetProcAddress(LoadLibrary("user32.dll"), "GetMonitorInfoA"); // Static Variable(s) static GUID g_ddguid; // DirectDraw driver GUID -static XTL::HMONITOR g_hMonitor = NULL; // Handle to DirectDraw monitor -static XTL::LPDIRECT3D8 g_pD3D8 = NULL; // Direct3D8 +static HMONITOR g_hMonitor = NULL; // Handle to DirectDraw monitor +static XTL::LPDIRECT3D8 g_pD3D8 = NULL; // Direct3D8 static BOOL g_bSupportsYUY2 = FALSE;// Does device support YUY2 overlays? static XTL::LPDIRECTDRAW7 g_pDD7 = NULL; // DirectDraw7 static XTL::LPDIRECTDRAWSURFACE7 g_pDDSPrimary = NULL; // DirectDraw7 Primary Surface @@ -244,7 +244,7 @@ VOID XTL::EmuD3DCleanup() } // enumeration procedure for locating display device GUIDs -static BOOL WINAPI EmuEnumDisplayDevices(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, XTL::HMONITOR hm) +static BOOL WINAPI EmuEnumDisplayDevices(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm) { static DWORD dwEnumCount = 0; diff --git a/Source/Win32/CxbxKrnl/EmuDSound.cpp b/Source/Win32/CxbxKrnl/EmuDSound.cpp index 53c979e08..c1bf50bc3 100644 --- a/Source/Win32/CxbxKrnl/EmuDSound.cpp +++ b/Source/Win32/CxbxKrnl/EmuDSound.cpp @@ -1189,37 +1189,6 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_GetStatus return hRet; } - -// ****************************************************************** -// * func: EmuIDirectSoundBuffer8_SetVolume -// ****************************************************************** -HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_SetVolume -( - X_CDirectSoundBuffer *pThis, - LONG lVolume -) -{ - EmuSwapFS(); // Win2k/XP FS - - // debug trace - #ifdef _DEBUG_TRACE - { - printf("EmuDSound (0x%X): EmuIDirectSoundBuffer8_SetVolume\n" - "(\n" - " pThis : 0x%.08X\n" - " lVolume : 0x%.08X\n" - ");\n", - GetCurrentThreadId(), pThis, lVolume); - } - #endif - - // TODO: Translate params, then make the PC DirectSound call - - EmuSwapFS(); // XBox FS - - return DS_OK; -} - // ****************************************************************** // * func: EmuIDirectSoundBuffer8_SetCurrentPosition // ****************************************************************** diff --git a/Source/Win32/Mutex.cpp b/Source/Win32/Mutex.cpp index 6ac299eb1..fa72f37b8 100644 --- a/Source/Win32/Mutex.cpp +++ b/Source/Win32/Mutex.cpp @@ -52,9 +52,12 @@ void Mutex::Lock() while(true) { // Grab the lock, letting us look at the variables +#if (_MSC_VER < 1300) // We are not using VC++.NET while(InterlockedCompareExchange((LPVOID*)&m_MutexLock, (LPVOID)1, (LPVOID)0)) -// while(InterlockedCompareExchange((LPLONG)&m_MutexLock, (LONG)1, (LONG)0)) - Sleep(1); +#else + while(InterlockedCompareExchange((LPLONG)&m_MutexLock, (LONG)1, (LONG)0)) +#endif + Sleep(1); // Are we the the new owner? if (!m_OwnerProcess) @@ -99,8 +102,11 @@ void Mutex::Lock() void Mutex::Unlock() { // Grab the lock, letting us look at the variables +#if (_MSC_VER < 1300) // We are not using VC++.NET while(InterlockedCompareExchange((LPVOID*)&m_MutexLock, (LPVOID)1, (LPVOID)0)) -// while (InterlockedCompareExchange((LPLONG)&m_MutexLock, (LONG)1, (LONG)0)) +#else + while (InterlockedCompareExchange((LPLONG)&m_MutexLock, (LONG)1, (LONG)0)) +#endif Sleep(1); // Decrement the lock count