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

fix some warnings

Browse Source
This commit is contained in:
FunkyFr3sh 2023-10-22 11:46:13 +02:00
parent 9b259d4ec6
commit 589b422d93
8 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/IDirectDraw/IDirectDraw.c
View File

@ -159,7 +159,13 @@ ULONG __stdcall IDirectDraw__AddRef(IDirectDrawImpl* This)
{ {
TRACE("-> %s(This=%p)\n", __FUNCTION__, This); TRACE("-> %s(This=%p)\n", __FUNCTION__, This);
ULONG ret = ++This->ref; ULONG ret = ++This->ref;
#ifdef _DEBUG
ULONG glob_ref = dd_AddRef(); ULONG glob_ref = dd_AddRef();
#else
dd_AddRef();
#endif
TRACE("<- %s(This ref=%u, global ref=%u)\n", __FUNCTION__, ret, glob_ref); TRACE("<- %s(This ref=%u, global ref=%u)\n", __FUNCTION__, ret, glob_ref);
return ret; return ret;
} }
@ -177,7 +183,11 @@ ULONG __stdcall IDirectDraw__Release(IDirectDrawImpl* This)
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
#ifdef _DEBUG
ULONG glob_ref = dd_Release(); ULONG glob_ref = dd_Release();
#else
dd_Release();
#endif
TRACE("<- %s(This ref=%u, global ref=%u)\n", __FUNCTION__, ret, glob_ref); TRACE("<- %s(This ref=%u, global ref=%u)\n", __FUNCTION__, ret, glob_ref);
return ret; return ret;

8
src/ddsurface.c
View File

@ -753,13 +753,13 @@ HRESULT dds_Flip(IDirectDrawSurfaceImpl* This, IDirectDrawSurfaceImpl* lpDDSurfa
IDirectDrawSurfaceImpl* backbuffer = lpDDSurfaceTargetOverride ? lpDDSurfaceTargetOverride : This->backbuffer; IDirectDrawSurfaceImpl* backbuffer = lpDDSurfaceTargetOverride ? lpDDSurfaceTargetOverride : This->backbuffer;
void* buf = InterlockedExchangePointer(&This->surface, backbuffer->surface); void* buf = InterlockedExchangePointer(&This->surface, backbuffer->surface);
HBITMAP bitmap = (HBITMAP)InterlockedExchangePointer(&This->bitmap, backbuffer->bitmap); HBITMAP bitmap = (HBITMAP)InterlockedExchangePointer((void*)&This->bitmap, backbuffer->bitmap);
HDC dc = (HDC)InterlockedExchangePointer(&This->hdc, backbuffer->hdc); HDC dc = (HDC)InterlockedExchangePointer((void*)&This->hdc, backbuffer->hdc);
HANDLE map = (HANDLE)InterlockedExchangePointer(&This->mapping, backbuffer->mapping); HANDLE map = (HANDLE)InterlockedExchangePointer(&This->mapping, backbuffer->mapping);
InterlockedExchangePointer(&backbuffer->surface, buf); InterlockedExchangePointer(&backbuffer->surface, buf);
InterlockedExchangePointer(&backbuffer->bitmap, bitmap); InterlockedExchangePointer((void*)&backbuffer->bitmap, bitmap);
InterlockedExchangePointer(&backbuffer->hdc, dc); InterlockedExchangePointer((void*)&backbuffer->hdc, dc);
InterlockedExchangePointer(&backbuffer->mapping, map); InterlockedExchangePointer(&backbuffer->mapping, map);
if (g_config.flipclear) if (g_config.flipclear)

5
src/debug.c
View File

@ -16,11 +16,12 @@ LPTOP_LEVEL_EXCEPTION_FILTER g_dbg_exception_filter;
static LONGLONG g_dbg_counter_start_time = 0; static LONGLONG g_dbg_counter_start_time = 0;
static double g_dbg_counter_freq = 0.0; static double g_dbg_counter_freq = 0.0;
static int g_dbg_crash_count = 0;
static FILE* g_dbg_log_file; static FILE* g_dbg_log_file;
static BOOL g_dbg_log_rotate; static BOOL g_dbg_log_rotate;
#if _DEBUG #ifdef _DEBUG
static int g_dbg_crash_count = 0;
int dbg_exception_handler(EXCEPTION_POINTERS* exception) int dbg_exception_handler(EXCEPTION_POINTERS* exception)
{ {
g_dbg_crash_count++; g_dbg_crash_count++;

2
src/render_d3d9.c
View File

@ -617,7 +617,7 @@ DWORD WINAPI d3d9_render_main(void)
if (g_config.fixchilds) if (g_config.fixchilds)
{ {
g_ddraw->child_window_exists = FALSE; g_ddraw->child_window_exists = FALSE;
InterlockedExchangePointer(&g_ddraw->video_window_hwnd, NULL); InterlockedExchangePointer((void*)&g_ddraw->video_window_hwnd, NULL);
EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary); EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary);
if (g_ddraw->render.width != g_ddraw->width || g_ddraw->render.height != g_ddraw->height) if (g_ddraw->render.width != g_ddraw->width || g_ddraw->render.height != g_ddraw->height)

2
src/render_gdi.c
View File

@ -84,7 +84,7 @@ DWORD WINAPI gdi_render_main(void)
if (g_config.fixchilds) if (g_config.fixchilds)
{ {
g_ddraw->child_window_exists = FALSE; g_ddraw->child_window_exists = FALSE;
InterlockedExchangePointer(&g_ddraw->video_window_hwnd, NULL); InterlockedExchangePointer((void*)&g_ddraw->video_window_hwnd, NULL);
EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary); EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary);
} }

4
src/render_ogl.c
View File

@ -156,7 +156,7 @@ static void ogl_build_programs()
{ {
char shader_path[MAX_PATH] = { 0 }; char shader_path[MAX_PATH] = { 0 };
strncpy(shader_path, g_config.shader, sizeof(shader_path) - 1); strncpy(shader_path, g_config.shader, sizeof(shader_path));
if (GetFileAttributes(shader_path) == INVALID_FILE_ATTRIBUTES) if (GetFileAttributes(shader_path) == INVALID_FILE_ATTRIBUTES)
{ {
@ -770,7 +770,7 @@ static void ogl_render()
if (g_config.fixchilds) if (g_config.fixchilds)
{ {
g_ddraw->child_window_exists = FALSE; g_ddraw->child_window_exists = FALSE;
InterlockedExchangePointer(&g_ddraw->video_window_hwnd, NULL); InterlockedExchangePointer((void*)&g_ddraw->video_window_hwnd, NULL);
EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary); EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary);
if (g_ddraw->render.width != g_ddraw->width || g_ddraw->render.height != g_ddraw->height) if (g_ddraw->render.width != g_ddraw->width || g_ddraw->render.height != g_ddraw->height)

4
src/screenshot.c
View File

@ -162,7 +162,7 @@ BOOL ss_take_screenshot(IDirectDrawSurfaceImpl* src)
} }
else if (src->bpp == 16) else if (src->bpp == 16)
{ {
if (!ss_screenshot_bmp(filename, src)) if (!ss_screenshot_16bit(filename, src))
return ss_screenshot_bmp(filename, src); return ss_screenshot_bmp(filename, src);
return TRUE; return TRUE;
@ -187,7 +187,7 @@ static BOOL ss_screenshot_bmp(char* filename, IDirectDrawSurfaceImpl* src)
if (_strcmpi(ext, ".png") == 0) if (_strcmpi(ext, ".png") == 0)
{ {
strncpy(ext, ".bmp", 4); strncpy(ext, ".bmp", 5);
} }
// Create the .BMP file. // Create the .BMP file.

2
src/utils.c
View File

@ -501,7 +501,7 @@ BOOL CALLBACK util_enum_child_proc(HWND hwnd, LPARAM lparam)
{ {
if (g_config.fixchilds != FIX_CHILDS_DETECT_HIDE) if (g_config.fixchilds != FIX_CHILDS_DETECT_HIDE)
{ {
InterlockedExchangePointer(&g_ddraw->video_window_hwnd, hwnd); InterlockedExchangePointer((void*)&g_ddraw->video_window_hwnd, hwnd);
} }
LONG style = real_GetWindowLongA(hwnd, GWL_EXSTYLE); LONG style = real_GetWindowLongA(hwnd, GWL_EXSTYLE);