ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated

This commit is contained in:
Aaron Robinson 2003-05-24 07:30:34 +00:00
parent 7dcef0fae2
commit 0275cf63d7
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/Todo.txt
View File

@ -1,7 +1,5 @@
Cxbx Todo (* denotes high priority)
* XAPILIB XapiThreadStartup for 4627
* Stabilize Heap Allocation (i.e. operator new) -> Crashes after initial commit is full
* Stabilize TLS (it's close...)

2
Include/Cxbx.h
View File

@ -66,7 +66,7 @@ typedef signed long sint32;
// ******************************************************************
// * Define this to trace intercepted function calls
// ******************************************************************
#define _DEBUG_TRACE
//#define _DEBUG_TRACE
// ******************************************************************
// * Round up dwValue to nearest multiple of dwMult

1
Resource/Cxbx.rc
View File

@ -158,6 +158,7 @@ BEGIN
MENUITEM "Config &Controller...", ID_SETTINGS_CONFIG_CONTROLLER
MENUITEM "Config &Audio...", ID_SETTINGS_CONFIGURESOUND
, GRAYED
MENUITEM "Config &Video...", ID_SETTINGS_CONFIGUREGRAPHICS
MENUITEM "", 1

6
Source/Win32/Cxbx/EmuExe.cpp
View File

@ -516,8 +516,8 @@ EmuExe::EmuExe(Xbe *x_Xbe, DebugMode x_debug_mode, char *x_debug_filename) : Exe
{
memcpy(pWriteCursor, x_Xbe->m_TLS, sizeof(Xbe::TLS));
pWriteCursor += sizeof(Xbe::TLS);
memcpy(pWriteCursor, x_Xbe->GetTLSData(), RoundUp(x_Xbe->m_TLS->dwDataEndAddr - x_Xbe->m_TLS->dwDataStartAddr, 0x04));
pWriteCursor += RoundUp(x_Xbe->m_TLS->dwDataEndAddr - x_Xbe->m_TLS->dwDataStartAddr, 0x04);
memcpy(pWriteCursor, x_Xbe->GetTLSData(), x_Xbe->m_TLS->dwDataEndAddr - x_Xbe->m_TLS->dwDataStartAddr);
pWriteCursor += x_Xbe->m_TLS->dwDataEndAddr - x_Xbe->m_TLS->dwDataStartAddr;
}
// ******************************************************************
@ -571,7 +571,7 @@ EmuExe::EmuExe(Xbe *x_Xbe, DebugMode x_debug_mode, char *x_debug_filename) : Exe
if(x_Xbe->m_TLS != 0)
{
*(uint32 *)((uint32)m_bzSection[i] + 41) = WriteCursor;
WriteCursor += RoundUp(x_Xbe->m_TLS->dwDataEndAddr - x_Xbe->m_TLS->dwDataStartAddr, 0x04);
WriteCursor += x_Xbe->m_TLS->dwDataEndAddr - x_Xbe->m_TLS->dwDataStartAddr;
}
else
{

8
Source/Win32/CxbxKrnl/EmuD3D8.cpp
View File

@ -404,8 +404,8 @@ HRESULT WINAPI xd3d8::EmuIDirect3D8_CreateDevice
{
Adapter = D3DADAPTER_DEFAULT;
pPresentationParameters->Windowed = TRUE;
//pPresentationParameters->SwapEffect = D3DSWAPEFFECT_COPY_VSYNC;
//pPresentationParameters->Windowed = TRUE;
pPresentationParameters->SwapEffect = D3DSWAPEFFECT_COPY_VSYNC;
hFocusWindow = g_hEmuWindow;
@ -428,8 +428,8 @@ HRESULT WINAPI xd3d8::EmuIDirect3D8_CreateDevice
// ******************************************************************
// * TODO: Query for Software Vertex Processing abilities!!
// ******************************************************************
BehaviorFlags = D3DCREATE_SOFTWARE_VERTEXPROCESSING;
// BehaviorFlags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
// BehaviorFlags = D3DCREATE_SOFTWARE_VERTEXPROCESSING;
BehaviorFlags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
// ******************************************************************
// * redirect to windows d3d

2
Source/Win32/CxbxKrnl/EmuFS.cpp
View File

@ -96,7 +96,7 @@ void EmuGenerateFS(Xbe::TLS *pTLS, void *pTLSData)
{
printf("EmuFS (0x%X): TLS Data Dump... \n 0x%.08X: ", GetCurrentThreadId(), pNewTLS);
uint32 stop = pTLS->dwDataEndAddr - pTLS->dwDataStartAddr;
uint32 stop = pTLS->dwDataEndAddr - pTLS->dwDataStartAddr + pTLS->dwSizeofZeroFill;
for(uint32 v=0;v<stop;v++)
{