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

Revert "force "adjmouse = TRUE" when downscaling was detected"

Browse Source 
This reverts commit f468788a9dc59243e49fa6eb2e982a9a629aa664.
This commit is contained in:
FunkyFr3sh 2023-09-13 19:04:44 +02:00
parent f468788a9d
commit c73d1c43f7
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/IDirectDrawSurface.h
View File

@ -42,7 +42,6 @@ typedef struct IDirectDrawSurfaceImpl
DWORD last_flip_tick; DWORD last_flip_tick;
DWORD last_blt_tick; DWORD last_blt_tick;
BOOL queried; BOOL queried;
BOOL locked;
struct IDirectDrawSurfaceImpl* backbuffer; struct IDirectDrawSurfaceImpl* backbuffer;
struct IDirectDrawClipperImpl* clipper; struct IDirectDrawClipperImpl* clipper;

10
src/dd.c
View File

@ -713,13 +713,6 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
if (!found_res || if (!found_res ||
ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL)
{ {
if (g_ddraw->width > g_ddraw->mode.dmPelsWidth ||
g_ddraw->height > g_ddraw->mode.dmPelsHeight)
{
/* Downscaling requires adjmouse to be enabled */
g_ddraw->adjmouse = TRUE;
}
/* try current display settings */ /* try current display settings */
g_ddraw->render.width = g_ddraw->mode.dmPelsWidth; g_ddraw->render.width = g_ddraw->mode.dmPelsWidth;
g_ddraw->render.height = g_ddraw->mode.dmPelsHeight; g_ddraw->render.height = g_ddraw->mode.dmPelsHeight;
@ -1178,9 +1171,6 @@ HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags)
HRESULT dd_WaitForVerticalBlank(DWORD dwFlags, HANDLE hEvent) HRESULT dd_WaitForVerticalBlank(DWORD dwFlags, HANDLE hEvent)
{ {
Sleep(5);
return DD_OK;
if (g_ddraw->maxgameticks == -2) if (g_ddraw->maxgameticks == -2)
{ {
if (fpsl_dwm_flush() || fpsl_wait_for_vblank(g_ddraw->render.maxfps >= 0 && !g_ddraw->vsync)) if (fpsl_dwm_flush() || fpsl_wait_for_vblank(g_ddraw->render.maxfps >= 0 && !g_ddraw->vsync))

13
src/ddsurface.c
View File

@ -700,7 +700,7 @@ HRESULT dds_GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC lpDDSur
if (This->flags & DDSD_BACKBUFFERCOUNT) if (This->flags & DDSD_BACKBUFFERCOUNT)
{ {
lpDDSurfaceDesc->dwFlags |= DDSD_BACKBUFFERCOUNT; lpDDSurfaceDesc->dwFlags |= DDSD_BACKBUFFERCOUNT;
lpDDSurfaceDesc->dwBackBufferCount = This->backbuffer_count; lpDDSurfaceDesc->dwBackBufferCount = This->backbuffer_count;
} }
if (This->bpp == 8) if (This->bpp == 8)
@ -952,8 +952,6 @@ HRESULT dds_Lock(
if (g_ddraw && g_ddraw->lock_surfaces) if (g_ddraw && g_ddraw->lock_surfaces)
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
This->locked = TRUE;
dbg_dump_dds_lock_flags(dwFlags); dbg_dump_dds_lock_flags(dwFlags);
if (g_ddraw && g_ddraw->fixnotresponding && !g_ddraw->wine) if (g_ddraw && g_ddraw->fixnotresponding && !g_ddraw->wine)
@ -980,11 +978,6 @@ HRESULT dds_Lock(
(char*)dds_GetBuffer(This) + (lpDestRect->left * This->bytes_pp) + (lpDestRect->top * This->pitch); (char*)dds_GetBuffer(This) + (lpDestRect->left * This->bytes_pp) + (lpDestRect->top * This->pitch);
} }
if ((This->caps & DDSCAPS_PRIMARYSURFACE) && (dwFlags & DDLOCK_WAIT))
{
Sleep(5);
}
return ret; return ret;
} }
@ -1077,8 +1070,6 @@ HRESULT dds_SetPalette(IDirectDrawSurfaceImpl* This, IDirectDrawPaletteImpl* lpD
HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect) HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect)
{ {
if (!This->locked) return DDERR_NOTLOCKED;
/* Hack for Warcraft II BNE and Diablo */ /* Hack for Warcraft II BNE and Diablo */
HWND hwnd = g_ddraw && g_ddraw->bnet_active ? FindWindowEx(HWND_DESKTOP, NULL, "SDlgDialog", NULL) : NULL; HWND hwnd = g_ddraw && g_ddraw->bnet_active ? FindWindowEx(HWND_DESKTOP, NULL, "SDlgDialog", NULL) : NULL;
@ -1189,8 +1180,6 @@ HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect)
} }
} }
This->locked = FALSE;
if (g_ddraw && g_ddraw->lock_surfaces) if (g_ddraw && g_ddraw->lock_surfaces)
LeaveCriticalSection(&This->cs); LeaveCriticalSection(&This->cs);