backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Fixed invisible cursor when changing to native resolution in Red Alert 2

Browse Source
This commit is contained in:
narzoul 2022-11-12 19:18:02 +01:00
parent 8e4741ab70
commit ac1eccd79f
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DDrawCompat/D3dDdi/FormatInfo.cpp
View File

@ -200,7 +200,7 @@ namespace D3dDdi
if (info.bitsPerPixel > info.alpha.bitCount) if (info.bitsPerPixel > info.alpha.bitCount)
{ {
pf.dwFlags = DDPF_RGB; pf.dwFlags = DDPF_RGB;
pf.dwRBitMask = getMask(info.red);; pf.dwRBitMask = getMask(info.red);
pf.dwGBitMask = getMask(info.green); pf.dwGBitMask = getMask(info.green);
pf.dwBBitMask = getMask(info.blue); pf.dwBBitMask = getMask(info.blue);
} }

2
DDrawCompat/DDraw/RealPrimarySurface.cpp
View File

@ -215,7 +215,7 @@ namespace
CompatPtr<IDirectDrawSurface7> getLastSurface() CompatPtr<IDirectDrawSurface7> getLastSurface()
{ {
DDSCAPS2 caps = {}; DDSCAPS2 caps = {};
caps.dwCaps = DDSCAPS_FLIP;; caps.dwCaps = DDSCAPS_FLIP;
CompatPtr<IDirectDrawSurface7> backBuffer(getBackBuffer()); CompatPtr<IDirectDrawSurface7> backBuffer(getBackBuffer());
CompatPtr<IDirectDrawSurface7> lastSurface; CompatPtr<IDirectDrawSurface7> lastSurface;
if (backBuffer) if (backBuffer)

2
DDrawCompat/DDraw/Surfaces/SurfaceImpl.cpp
View File

@ -225,7 +225,7 @@ namespace DDraw
template <typename TSurface> template <typename TSurface>
HRESULT SurfaceImpl<TSurface>::QueryInterface(TSurface* This, REFIID riid, LPVOID* obp) HRESULT SurfaceImpl<TSurface>::QueryInterface(TSurface* This, REFIID riid, LPVOID* obp)
{ {
auto& iid = Direct3d::replaceDevice(riid);; auto& iid = Direct3d::replaceDevice(riid);
HRESULT result = getOrigVtable(This).QueryInterface(This, iid, obp); HRESULT result = getOrigVtable(This).QueryInterface(This, iid, obp);
if (DDERR_INVALIDOBJECT == result) if (DDERR_INVALIDOBJECT == result)
{ {

3
DDrawCompat/Gdi/Cursor.cpp
View File

@ -54,7 +54,8 @@ namespace
{ {
LOG_FUNC("GetCursor"); LOG_FUNC("GetCursor");
Compat::ScopedCriticalSection lock(g_cs); Compat::ScopedCriticalSection lock(g_cs);
return LOG_RESULT(g_cursor != INVALID_CURSOR ? g_cursor : CALL_ORIG_FUNC(GetCursor)()); auto cursor = CALL_ORIG_FUNC(GetCursor)();
return LOG_RESULT(cursor == g_nullCursor ? g_cursor : cursor);
} }
BOOL WINAPI getCursorInfo(PCURSORINFO pci) BOOL WINAPI getCursorInfo(PCURSORINFO pci)

2
DDrawCompat/Gdi/WinProc.cpp
View File

@ -194,7 +194,7 @@ namespace
break; break;
case WM_SETCURSOR: case WM_SETCURSOR:
SetCursor(CALL_ORIG_FUNC(GetCursor)()); SetCursor(GetCursor());
break; break;
case WM_STYLECHANGED: case WM_STYLECHANGED: