Max/djhackersdev_bemanitools
1
0
Fork 0
Code Issues 72 Pull Requests 15 Actions Packages Projects Releases 20 Wiki Activity

d3d9ex: revert previous window size fix, and fix it properly

Browse Source
This commit is contained in:
Will Xyen
2021-02-04 23:04:56 -08:00
parent 636f776abc
commit 6b6fbfa5fc
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/d3d9exhook/d3d9ex.c
+14 -23
View File
@@ -162,11 +162,7 @@ static HWND STDCALL my_CreateWindowExA(
static BOOL STDCALL static BOOL STDCALL
my_MoveWindow(HWND hWnd, int X, int Y, int nWidth, int nHeight, BOOL bRepaint) my_MoveWindow(HWND hWnd, int X, int Y, int nWidth, int nHeight, BOOL bRepaint)
{ {
if (d3d9ex_windowed && d3d9ex_window_framed) { if (d3d9ex_windowed) {
/* we have to adjust the window size, because the window needs to be a
slightly bigger than the rendering resolution (window caption and
stuff is included in the window size) */
if (d3d9ex_window_width != -1 && d3d9ex_window_height != -1) { if (d3d9ex_window_width != -1 && d3d9ex_window_height != -1) {
log_misc( log_misc(
"Overriding window size from %dx%d with %dx%d", "Overriding window size from %dx%d with %dx%d",
@@ -179,13 +175,19 @@ my_MoveWindow(HWND hWnd, int X, int Y, int nWidth, int nHeight, BOOL bRepaint)
nHeight = d3d9ex_window_height; nHeight = d3d9ex_window_height;
} }
WINDOWPOS wp; if (d3d9ex_window_framed) {
calc_win_size_with_framed(hWnd, X, Y, nWidth, nHeight, &wp); /* we have to adjust the window size, because the window needs to
SetWindowPos(hWnd, 0, wp.x, wp.y, wp.cx, wp.cy, 0); be a slightly bigger than the rendering resolution (window caption
X = wp.x; and stuff is included in the window size) */
Y = wp.y;
nWidth = wp.cx; WINDOWPOS wp;
nHeight = wp.cy; calc_win_size_with_framed(hWnd, X, Y, nWidth, nHeight, &wp);
SetWindowPos(hWnd, 0, wp.x, wp.y, wp.cx, wp.cy, 0);
X = wp.x;
Y = wp.y;
nWidth = wp.cx;
nHeight = wp.cy;
}
} }
BOOL result = real_MoveWindow(hWnd, X, Y, nWidth, nHeight, bRepaint); BOOL result = real_MoveWindow(hWnd, X, Y, nWidth, nHeight, bRepaint);
@@ -394,17 +396,6 @@ static HRESULT STDCALL my_CreateDeviceEx(
SetWindowLongPtr(hwnd, GWLP_WNDPROC, (uintptr_t) my_WndProc); SetWindowLongPtr(hwnd, GWLP_WNDPROC, (uintptr_t) my_WndProc);
} }
if (d3d9ex_windowed) {
if (d3d9ex_window_width > 0 && d3d9ex_window_height > 0) {
// set window size
RECT rect;
GetWindowRect(hwnd, &rect);
log_info("Calling SetWindowPos to fix window size: %dx%d", d3d9ex_window_width, d3d9ex_window_height);
SetWindowPos(hwnd, 0, rect.left, rect.top, d3d9ex_window_width, d3d9ex_window_height, 0);
}
}
return hr; return hr;
} }