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

Call window procedures through CallWindowProc

Browse Source
This commit is contained in:
narzoul 2016-12-20 17:13:18 +01:00
parent 26995d6108
commit 1c82165214
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
DDrawCompat/Gdi/PaintHandlers.cpp
View File

@ -67,7 +67,7 @@ namespace
break; break;
default: default:
result = origWndProc(hwnd, msg, wParam, lParam); result = CallWindowProc(origWndProc, hwnd, msg, wParam, lParam);
break; break;
} }
@ -146,7 +146,7 @@ namespace
// fall through to default // fall through to default
default: default:
result = g_origMenuWndProc(hwnd, msg, wParam, lParam); result = CallWindowProc(g_origMenuWndProc, hwnd, msg, wParam, lParam);
break; break;
} }
@ -158,14 +158,14 @@ namespace
{ {
if (!hwnd || !Gdi::beginGdiRendering()) if (!hwnd || !Gdi::beginGdiRendering())
{ {
return origWndProc(hwnd, WM_ERASEBKGND, reinterpret_cast<WPARAM>(dc), 0); return CallWindowProc(origWndProc, hwnd, WM_ERASEBKGND, reinterpret_cast<WPARAM>(dc), 0);
} }
LRESULT result = 0; LRESULT result = 0;
HDC compatDc = Gdi::Dc::getDc(dc); HDC compatDc = Gdi::Dc::getDc(dc);
if (compatDc) if (compatDc)
{ {
result = origWndProc(hwnd, WM_ERASEBKGND, reinterpret_cast<WPARAM>(compatDc), 0); result = CallWindowProc(origWndProc, hwnd, WM_ERASEBKGND, reinterpret_cast<WPARAM>(compatDc), 0);
Gdi::Dc::releaseDc(dc); Gdi::Dc::releaseDc(dc);
if (result) if (result)
{ {
@ -174,7 +174,7 @@ namespace
} }
else else
{ {
result = origWndProc(hwnd, WM_ERASEBKGND, reinterpret_cast<WPARAM>(dc), 0); result = CallWindowProc(origWndProc, hwnd, WM_ERASEBKGND, reinterpret_cast<WPARAM>(dc), 0);
} }
Gdi::endGdiRendering(); Gdi::endGdiRendering();
@ -192,7 +192,7 @@ namespace
{ {
if (!hwnd || !Gdi::beginGdiRendering()) if (!hwnd || !Gdi::beginGdiRendering())
{ {
return origWndProc(hwnd, WM_PAINT, 0, 0); return CallWindowProc(origWndProc, hwnd, WM_PAINT, 0, 0);
} }
HDC dc = GetWindowDC(hwnd); HDC dc = GetWindowDC(hwnd);
@ -200,14 +200,14 @@ namespace
HDC compatDc = Gdi::Dc::getDc(dc, isMenuPaintDc); HDC compatDc = Gdi::Dc::getDc(dc, isMenuPaintDc);
if (compatDc) if (compatDc)
{ {
origWndProc(hwnd, WM_PRINT, reinterpret_cast<WPARAM>(compatDc), CallWindowProc(origWndProc, hwnd, WM_PRINT, reinterpret_cast<WPARAM>(compatDc),
PRF_NONCLIENT | PRF_ERASEBKGND | PRF_CLIENT); PRF_NONCLIENT | PRF_ERASEBKGND | PRF_CLIENT);
ValidateRect(hwnd, nullptr); ValidateRect(hwnd, nullptr);
Gdi::Dc::releaseDc(dc); Gdi::Dc::releaseDc(dc);
} }
else else
{ {
origWndProc(hwnd, WM_PAINT, 0, 0); CallWindowProc(origWndProc, hwnd, WM_PAINT, 0, 0);
} }
ReleaseDC(hwnd, dc); ReleaseDC(hwnd, dc);
@ -219,7 +219,7 @@ namespace
{ {
if (!hwnd || !Gdi::beginGdiRendering()) if (!hwnd || !Gdi::beginGdiRendering())
{ {
return origWndProc(hwnd, WM_NCPAINT, wParam, 0); return CallWindowProc(origWndProc, hwnd, WM_NCPAINT, wParam, 0);
} }
HDC windowDc = GetWindowDC(hwnd); HDC windowDc = GetWindowDC(hwnd);
@ -249,7 +249,7 @@ namespace
{ {
if (!hwnd || !Gdi::beginGdiRendering()) if (!hwnd || !Gdi::beginGdiRendering())
{ {
return origWndProc(hwnd, WM_PAINT, 0, 0); return CallWindowProc(origWndProc, hwnd, WM_PAINT, 0, 0);
} }
PAINTSTRUCT paint = {}; PAINTSTRUCT paint = {};
@ -258,12 +258,13 @@ namespace
if (compatDc) if (compatDc)
{ {
origWndProc(hwnd, WM_PRINTCLIENT, reinterpret_cast<WPARAM>(compatDc), PRF_CLIENT); CallWindowProc(origWndProc, hwnd, WM_PRINTCLIENT,
reinterpret_cast<WPARAM>(compatDc), PRF_CLIENT);
Gdi::Dc::releaseDc(dc); Gdi::Dc::releaseDc(dc);
} }
else else
{ {
origWndProc(hwnd, WM_PRINTCLIENT, reinterpret_cast<WPARAM>(dc), PRF_CLIENT); CallWindowProc(origWndProc, hwnd, WM_PRINTCLIENT, reinterpret_cast<WPARAM>(dc), PRF_CLIENT);
} }
EndPaint(hwnd, &paint); EndPaint(hwnd, &paint);
@ -276,19 +277,19 @@ namespace
{ {
if (!Gdi::beginGdiRendering()) if (!Gdi::beginGdiRendering())
{ {
return origWndProc(hwnd, msg, reinterpret_cast<WPARAM>(dc), flags); return CallWindowProc(origWndProc, hwnd, msg, reinterpret_cast<WPARAM>(dc), flags);
} }
LRESULT result = 0; LRESULT result = 0;
HDC compatDc = Gdi::Dc::getDc(dc); HDC compatDc = Gdi::Dc::getDc(dc);
if (compatDc) if (compatDc)
{ {
result = origWndProc(hwnd, msg, reinterpret_cast<WPARAM>(compatDc), flags); result = CallWindowProc(origWndProc, hwnd, msg, reinterpret_cast<WPARAM>(compatDc), flags);
Gdi::Dc::releaseDc(dc); Gdi::Dc::releaseDc(dc);
} }
else else
{ {
result = origWndProc(hwnd, msg, reinterpret_cast<WPARAM>(dc), flags); result = CallWindowProc(origWndProc, hwnd, msg, reinterpret_cast<WPARAM>(dc), flags);
} }
Gdi::endGdiRendering(); Gdi::endGdiRendering();
@ -315,7 +316,7 @@ namespace
break; break;
default: default:
result = g_origScrollBarWndProc(hwnd, msg, wParam, lParam); result = CallWindowProc(g_origScrollBarWndProc, hwnd, msg, wParam, lParam);
break; break;
} }