backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

set timeBeignPeriod in DllMain - Add SetProcessPriorityBoost

Browse Source
This commit is contained in:
FunkyFr3sh 2017-11-13 13:50:54 +01:00
parent bfb0edd2c6
commit c44055a214
5 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ddraw.dll
View File

Binary file not shown.

99
main.c
View File

@ -44,17 +44,39 @@ DWORD WINAPI render_main(void);
DWORD WINAPI render_soft_main(void); DWORD WINAPI render_soft_main(void);
DWORD WINAPI render_dummy_main(void); DWORD WINAPI render_dummy_main(void);
void SaveWindowPosition() int WindowPosX;
int WindowPosY;
char SettingsIniPath[MAX_PATH];
BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
{ {
if (ddraw->windowed) switch (dwReason)
{ {
char buf[16]; case DLL_PROCESS_ATTACH:
sprintf(buf, "%d", ddraw->posX); {
WritePrivateProfileString("ddraw", "posX", buf, ddraw->ini_path); printf("cnc-ddraw DLL_PROCESS_ATTACH");
sprintf(buf, "%d", ddraw->posY); SetProcessPriorityBoost(GetCurrentProcess(), TRUE);
WritePrivateProfileString("ddraw", "posY", buf, ddraw->ini_path); timeBeginPeriod(1);
break;
}
case DLL_PROCESS_DETACH:
{
printf("cnc-ddraw DLL_PROCESS_DETACH");
char buf[16];
sprintf(buf, "%d", WindowPosX);
WritePrivateProfileString("ddraw", "posX", buf, SettingsIniPath);
sprintf(buf, "%d", WindowPosY);
WritePrivateProfileString("ddraw", "posY", buf, SettingsIniPath);
timeEndPeriod(1);
break;
}
} }
return TRUE;
} }
HRESULT __stdcall ddraw_Compact(IDirectDrawImpl *This) HRESULT __stdcall ddraw_Compact(IDirectDrawImpl *This)
@ -234,8 +256,8 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
} }
/* center the window with correct dimensions */ /* center the window with correct dimensions */
int x = (This->posX != -1) ? This->posX : (This->mode.dmPelsWidth / 2) - (This->render.width / 2); int x = (WindowPosX != -1) ? WindowPosX : (This->mode.dmPelsWidth / 2) - (This->render.width / 2);
int y = (This->posY != -1) ? This->posY : (This->mode.dmPelsHeight / 2) - (This->render.height / 2); int y = (WindowPosY != -1) ? WindowPosY : (This->mode.dmPelsHeight / 2) - (This->render.height / 2);
RECT dst = { x, y, This->render.width+x, This->render.height+y }; RECT dst = { x, y, This->render.width+x, This->render.height+y };
AdjustWindowRect(&dst, GetWindowLong(This->hWnd, GWL_STYLE), FALSE); AdjustWindowRect(&dst, GetWindowLong(This->hWnd, GWL_STYLE), FALSE);
SetWindowPos(This->hWnd, HWND_NOTOPMOST, dst.left, dst.top, (dst.right - dst.left), (dst.bottom - dst.top), SWP_SHOWWINDOW); SetWindowPos(This->hWnd, HWND_NOTOPMOST, dst.left, dst.top, (dst.right - dst.left), (dst.bottom - dst.top), SWP_SHOWWINDOW);
@ -316,10 +338,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
int y = (int)(short)HIWORD(lParam); int y = (int)(short)HIWORD(lParam);
if (x != -32000) if (x != -32000)
ddraw->posX = x; // -32000 = Exit/Minimize WindowPosX = x; // -32000 = Exit/Minimize
if (y != -32000) if (y != -32000)
ddraw->posY = y; WindowPosY = y;
} }
break; break;
} }
@ -333,10 +355,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
if (wParam == SC_CLOSE) if (wParam == SC_CLOSE)
{ {
if (ddraw->windowed)
{
SaveWindowPosition();
}
exit(0); exit(0);
} }
return DefWindowProc(hWnd, uMsg, wParam, lParam); return DefWindowProc(hWnd, uMsg, wParam, lParam);
@ -554,11 +572,6 @@ ULONG __stdcall ddraw_Release(IDirectDrawImpl *This)
{ {
FreeLibrary(This->real_dll); FreeLibrary(This->real_dll);
} }
if (ddraw->windowed)
{
SaveWindowPosition();
}
DeleteCriticalSection(&This->cs); DeleteCriticalSection(&This->cs);
@ -656,11 +669,11 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
char cwd[MAX_PATH]; char cwd[MAX_PATH];
char tmp[256]; char tmp[256];
GetCurrentDirectoryA(sizeof(cwd), cwd); GetCurrentDirectoryA(sizeof(cwd), cwd);
snprintf(This->ini_path, sizeof(This->ini_path), "%s\\ddraw.ini", cwd); snprintf(SettingsIniPath, sizeof(SettingsIniPath), "%s\\ddraw.ini", cwd);
if(GetFileAttributes(This->ini_path) == 0xFFFFFFFF) if(GetFileAttributes(SettingsIniPath) == 0xFFFFFFFF)
{ {
FILE *fh = fopen(This->ini_path, "w"); FILE *fh = fopen(SettingsIniPath, "w");
fputs( fputs(
"[ddraw]\n" "[ddraw]\n"
"; width and height of the window, defaults to the size game requests\r\n" "; width and height of the window, defaults to the size game requests\r\n"
@ -700,7 +713,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
fclose(fh); fclose(fh);
} }
GetPrivateProfileStringA("ddraw", "windowed", "TRUE", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "windowed", "TRUE", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'n' || tolower(tmp[0]) == 'f' || tolower(tmp[0]) == 'd' || tmp[0] == '0') if (tolower(tmp[0]) == 'n' || tolower(tmp[0]) == 'f' || tolower(tmp[0]) == 'd' || tmp[0] == '0')
{ {
This->windowed = FALSE; This->windowed = FALSE;
@ -710,7 +723,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->windowed = TRUE; This->windowed = TRUE;
} }
GetPrivateProfileStringA("ddraw", "border", "TRUE", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "border", "TRUE", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'n' || tolower(tmp[0]) == 'f' || tolower(tmp[0]) == 'd' || tmp[0] == '0') if (tolower(tmp[0]) == 'n' || tolower(tmp[0]) == 'f' || tolower(tmp[0]) == 'd' || tmp[0] == '0')
{ {
This->border = FALSE; This->border = FALSE;
@ -720,7 +733,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->border = TRUE; This->border = TRUE;
} }
GetPrivateProfileStringA("ddraw", "boxing", "FALSE", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "boxing", "FALSE", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'n' || tolower(tmp[0]) == 'f' || tolower(tmp[0]) == 'd' || tmp[0] == '0') if (tolower(tmp[0]) == 'n' || tolower(tmp[0]) == 'f' || tolower(tmp[0]) == 'd' || tmp[0] == '0')
{ {
This->boxing = FALSE; This->boxing = FALSE;
@ -730,22 +743,22 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->boxing = TRUE; This->boxing = TRUE;
} }
GetPrivateProfileStringA("ddraw", "screenshotKey", "G", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "screenshotKey", "G", tmp, sizeof(tmp), SettingsIniPath);
ddraw->screenshotKey = toupper(tmp[0]); ddraw->screenshotKey = toupper(tmp[0]);
This->render.maxfps = GetPrivateProfileIntA("ddraw", "max_fps", 120, This->ini_path); This->render.maxfps = GetPrivateProfileIntA("ddraw", "max_fps", 120, SettingsIniPath);
This->render.width = GetPrivateProfileIntA("ddraw", "width", 0, This->ini_path); This->render.width = GetPrivateProfileIntA("ddraw", "width", 0, SettingsIniPath);
This->render.height = GetPrivateProfileIntA("ddraw", "height", 0, This->ini_path); This->render.height = GetPrivateProfileIntA("ddraw", "height", 0, SettingsIniPath);
This->posX = GetPrivateProfileIntA("ddraw", "posX", 0, This->ini_path); WindowPosX = GetPrivateProfileIntA("ddraw", "posX", 0, SettingsIniPath);
This->posY = GetPrivateProfileIntA("ddraw", "posY", 0, This->ini_path); WindowPosY = GetPrivateProfileIntA("ddraw", "posY", 0, SettingsIniPath);
This->render.bpp = GetPrivateProfileIntA("ddraw", "bpp", 32, This->ini_path); This->render.bpp = GetPrivateProfileIntA("ddraw", "bpp", 32, SettingsIniPath);
if (This->render.bpp != 16 && This->render.bpp != 24 && This->render.bpp != 32) if (This->render.bpp != 16 && This->render.bpp != 24 && This->render.bpp != 32)
{ {
This->render.bpp = 0; This->render.bpp = 0;
} }
GetPrivateProfileStringA("ddraw", "filter", tmp, tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "filter", tmp, tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'l' || tolower(tmp[3]) == 'l') if (tolower(tmp[0]) == 'l' || tolower(tmp[3]) == 'l')
{ {
This->render.filter = 1; This->render.filter = 1;
@ -755,7 +768,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->render.filter = 0; This->render.filter = 0;
} }
GetPrivateProfileStringA("ddraw", "adjmouse", "FALSE", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "adjmouse", "FALSE", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1') if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1')
{ {
This->adjmouse = TRUE; This->adjmouse = TRUE;
@ -765,7 +778,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->adjmouse = FALSE; This->adjmouse = FALSE;
} }
GetPrivateProfileStringA("ddraw", "mhack", "TRUE", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "mhack", "TRUE", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1') if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1')
{ {
This->mhack = TRUE; This->mhack = TRUE;
@ -775,7 +788,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->mhack = FALSE; This->mhack = FALSE;
} }
GetPrivateProfileStringA("ddraw", "devmode", "FALSE", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "devmode", "FALSE", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1') if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1')
{ {
This->devmode = TRUE; This->devmode = TRUE;
@ -786,7 +799,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->devmode = FALSE; This->devmode = FALSE;
} }
GetPrivateProfileStringA("ddraw", "vsync", "FALSE", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "vsync", "FALSE", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1') if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1')
{ {
This->vsync = TRUE; This->vsync = TRUE;
@ -796,10 +809,10 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->vsync = FALSE; This->vsync = FALSE;
} }
GetPrivateProfileStringA("ddraw", "sensitivity", "0", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "sensitivity", "0", tmp, sizeof(tmp), SettingsIniPath);
This->sensitivity = strtof(tmp, NULL); This->sensitivity = strtof(tmp, NULL);
GetPrivateProfileStringA("ddraw", "vhack", "false", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "vhack", "false", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1') if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1')
{ {
This->vhack = 2; This->vhack = 2;
@ -813,7 +826,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->vhack = 0; This->vhack = 0;
} }
GetPrivateProfileStringA("ddraw", "renderer", "gdi", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "renderer", "gdi", tmp, sizeof(tmp), SettingsIniPath);
if(tolower(tmp[0]) == 'd' || tolower(tmp[0]) == 'd') if(tolower(tmp[0]) == 'd' || tolower(tmp[0]) == 'd')
{ {
printf("DirectDrawCreate: Using dummy renderer\n"); printf("DirectDrawCreate: Using dummy renderer\n");
@ -830,7 +843,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->renderer = render_main; This->renderer = render_main;
} }
GetPrivateProfileStringA("ddraw", "singlecpu", "true", tmp, sizeof(tmp), This->ini_path); GetPrivateProfileStringA("ddraw", "singlecpu", "true", tmp, sizeof(tmp), SettingsIniPath);
if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1') if (tolower(tmp[0]) == 'y' || tolower(tmp[0]) == 't' || tolower(tmp[0]) == 'e' || tmp[0] == '1')
{ {
printf("DirectDrawCreate: Setting CPU0 affinity\n"); printf("DirectDrawCreate: Setting CPU0 affinity\n");

7
main.h
View File

@ -22,6 +22,10 @@
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#ifndef _DEBUG
#define printf(format, ...)
#endif
struct IDirectDrawImpl; struct IDirectDrawImpl;
struct IDirectDrawImplVtbl; struct IDirectDrawImplVtbl;
struct IDirectDrawSurfaceImpl; struct IDirectDrawSurfaceImpl;
@ -83,9 +87,6 @@ typedef struct IDirectDrawImpl
BOOL vhack; BOOL vhack;
BOOL isredalert; BOOL isredalert;
DWORD WINAPI (*renderer)(void); DWORD WINAPI (*renderer)(void);
int posX;
int posY;
char ini_path[MAX_PATH];
char screenshotKey; char screenshotKey;
} IDirectDrawImpl; } IDirectDrawImpl;

8
render.c
View File

@ -88,10 +88,7 @@ DWORD WINAPI render_main(void)
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
timeBeginPeriod(1);
while(ddraw->render.thread) while(ddraw->render.thread)
{ {
scale_w = (float)ddraw->width/tex_width; scale_w = (float)ddraw->width/tex_width;
@ -162,8 +159,7 @@ DWORD WINAPI render_main(void)
} }
} }
} }
timeEndPeriod(1);
HeapFree(GetProcessHeap(), 0, tex); HeapFree(GetProcessHeap(), 0, tex);
wglMakeCurrent(NULL, NULL); wglMakeCurrent(NULL, NULL);

3
render_soft.c
View File

@ -68,8 +68,6 @@ DWORD WINAPI render_soft_main(void)
DWORD tick_start = 0; DWORD tick_start = 0;
DWORD tick_end = 0; DWORD tick_end = 0;
DWORD frame_len = 0; DWORD frame_len = 0;
timeBeginPeriod(1);
if (ddraw->boxing) if (ddraw->boxing)
{ {
@ -163,7 +161,6 @@ DWORD WINAPI render_soft_main(void)
} }
} }
} }
timeEndPeriod(1);
HeapFree(GetProcessHeap(), 0, bmi); HeapFree(GetProcessHeap(), 0, bmi);