wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zhiyi Zhang : winex11.drv: Migrate XVidMode display settings handler to a new interface.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 2116b49717f26802b51e2904de8d74651da33545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2116b49717f26802b51e2904… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 27 16:01:38 2020 +0800 winex11.drv: Migrate XVidMode display settings handler to a new interface. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xvidmode.c | 255 +++++++++++++++++++++++++++++--------------- 1 file changed, 167 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2116b49717f26802b51e…

1 0

Zhiyi Zhang : winex11.drv: Migrate XRandR 1.0 display settings handler to a new interface.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 5491e939bc22f0ab479aec6b8a525be9c5ff5e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5491e939bc22f0ab479aec6b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 27 16:01:15 2020 +0800 winex11.drv: Migrate XRandR 1.0 display settings handler to a new interface. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 278 ++++++++++++++++++++++++++-------------------- 1 file changed, 155 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5491e939bc22f0ab479a…

1 0

Zhiyi Zhang : winex11.drv: Support detaching adapters.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: d13b61b7385a6a380fb91720c511b194926fa0ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=d13b61b7385a6a380fb91720… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 27 16:01:04 2020 +0800 winex11.drv: Support detaching adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 4 ++-- dlls/winex11.drv/settings.c | 56 ++++++++++++++++++++++++++++++++++----------- dlls/winex11.drv/xrandr.c | 21 +++++++++++++++++ 3 files changed, 66 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0d32dbfeef..85fb2f080a 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -612,10 +612,10 @@ static void test_ChangeDisplaySettingsEx(void) dd.cb = sizeof(dd); res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[device].name, GetLastError()); - todo_wine ok(!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP), "Expect device %s detached.\n", devices[device].name); + ok(!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP), "Expect device %s detached.\n", devices[device].name); count = GetSystemMetrics(SM_CMONITORS); - todo_wine ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); + ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); } /* Test changing each adapter to every available mode */ diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 56f55e78b4..7c7d950718 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -805,27 +805,33 @@ static void place_all_displays(struct x11drv_display_setting *displays, INT disp } } -static LONG apply_display_settings(struct x11drv_display_setting *displays, INT display_count) +static LONG apply_display_settings(struct x11drv_display_setting *displays, INT display_count, BOOL do_attach) { DEVMODEW *full_mode; + BOOL attached_mode; INT display_idx; LONG ret; for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (is_detached_mode(&displays[display_idx].desired_mode)) - { - FIXME("Detaching %s is currently unsupported.\n", - wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName)); + attached_mode = !is_detached_mode(&displays[display_idx].desired_mode); + if ((attached_mode && !do_attach) || (!attached_mode && do_attach)) continue; - } - full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); - if (!full_mode) - return DISP_CHANGE_BADMODE; + if (attached_mode) + { + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + return DISP_CHANGE_BADMODE; + + full_mode->dmFields |= DM_POSITION; + full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; + } + else + { + full_mode = &displays[display_idx].desired_mode; + } - full_mode->dmFields |= DM_POSITION; - full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " "depth:%ubits orientation:%#x.\n", handler.name, wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName), @@ -834,7 +840,8 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); - heap_free(full_mode); + if (attached_mode) + heap_free(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret; } @@ -842,6 +849,19 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT return DISP_CHANGE_SUCCESSFUL; } +static BOOL all_detached_settings(const struct x11drv_display_setting *displays, INT display_count) +{ + INT display_idx; + + for (display_idx = 0; display_idx < display_count; ++display_idx) + { + if (!is_detached_mode(&displays[display_idx].desired_mode)) + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -888,9 +908,19 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } + if (all_detached_settings(displays, display_count)) + { + WARN("Detaching all displays is not permitted.\n"); + heap_free(displays); + return DISP_CHANGE_SUCCESSFUL; + } + place_all_displays(displays, display_count); - ret = apply_display_settings(displays, display_count); + /* Detach displays first to free up CRTCs */ + ret = apply_display_settings(displays, display_count, FALSE); + if (ret == DISP_CHANGE_SUCCESSFUL) + ret = apply_display_settings(displays, display_count, TRUE); if (ret == DISP_CHANGE_SUCCESSFUL) X11DRV_DisplayDevices_Update(TRUE); heap_free(displays); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 4fbb2e540d..67fd285182 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1306,6 +1306,27 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) if (!output_info || output_info->connection != RR_Connected) goto done; + if (is_detached_mode(mode)) + { + /* Already detached */ + if (!output_info->crtc) + { + ret = DISP_CHANGE_SUCCESSFUL; + goto done; + } + + /* Execute detach operation */ + status = pXRRSetCrtcConfig( gdi_display, screen_resources, output_info->crtc, + CurrentTime, 0, 0, None, RR_Rotate_0, NULL, 0 ); + if (status == RRSetConfigSuccess) + { + get_screen_size( screen_resources, &screen_width, &screen_height ); + set_screen_size( screen_width, screen_height ); + ret = DISP_CHANGE_SUCCESSFUL; + } + goto done; + } + /* Attached */ if (output_info->crtc) {

1 0

Zhiyi Zhang : winex11.drv: Support automatic display position adjustment.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 4a2481631331e2743476ea4e1b0005f8f5024242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a2481631331e2743476ea4e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 27 16:00:43 2020 +0800 winex11.drv: Support automatic display position adjustment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 36 +---- dlls/winex11.drv/settings.c | 374 ++++++++++++++++++++++++++++++++++++++------ dlls/winex11.drv/xrandr.c | 7 +- 3 files changed, 333 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a2481631331e2743476…

1 0

Dmitry Kislyuk : vbscript: Implement case insensitive comparison.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 00b64430e82fd1234f64d39a4bb2b4d44e47cfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b64430e82fd1234f64d39a… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Wed Jul 29 14:36:35 2020 -0500 vbscript: Implement case insensitive comparison. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 42 ++++++++++++++++++++++++------------------ dlls/vbscript/tests/api.vbs | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a4442960d9..e41c2ff7b3 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1624,10 +1624,10 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, { VARIANT *startv, *str1v, *str2v; BSTR str1, str2; - int start, ret; + int ret, start = 0, mode = 0; HRESULT hres; - TRACE("\n"); + TRACE("args_cnt=%u\n", args_cnt); assert(2 <= args_cnt && args_cnt <= 4); @@ -1643,8 +1643,21 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, str2v = args+2; break; case 4: - FIXME("unsupported compare argument %s\n", debugstr_variant(args)); - return E_NOTIMPL; + startv = args; + str1v = args+1; + str2v = args+2; + + if(V_VT(args+3) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args+3, &mode); + if(FAILED(hres)) + return hres; + + if (mode != 0 && mode != 1) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + + break; DEFAULT_UNREACHABLE; } @@ -1652,12 +1665,8 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, hres = to_int(startv, &start); if(FAILED(hres)) return hres; - if(--start < 0) { - FIXME("start %d\n", start); - return E_FAIL; - } - }else { - start = 0; + if(--start < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); } if(V_VT(str1v) == VT_NULL || V_VT(str2v) == VT_NULL) @@ -1675,16 +1684,13 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, } str2 = V_BSTR(str2v); - if(start < SysStringLen(str1)) { - WCHAR *ptr; + if(start >= SysStringLen(str1)) + return return_int(res, 0); - ptr = wcsstr(str1+start, str2); - ret = ptr ? ptr-str1+1 : 0; - }else { - ret = 0; - } + ret = FindStringOrdinal(FIND_FROMSTART, str1 + start, SysStringLen(str1)-start, + str2, SysStringLen(str2), mode); - return return_int(res, ret); + return return_int(res, ++ret ? ret+start : 0); } static HRESULT Global_InStrB(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0a65984483..3f50195bdc 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -390,6 +390,45 @@ Call ok(x = 2, "InStr returned " & x) x = InStr(2.6, "abcd", "bc") Call ok(x = 0, "InStr returned " & x) +x = InStr(3, "abcdefgh", "fg", 0) +Call ok(x = 6, "InStr returned " & x) + +x = InStr(3, "abcdefgh", "FG", 0) +Call ok(x = 0, "InStr returned " & x) + +x = InStr(3, "abcdefgh", "FG", 1) +Call ok(x = 6, "InStr returned " & x) + +x = InStr(3, "abcdefgh", "FG", 1.4) +Call ok(x = 6, "InStr returned " & x) + +x = InStr(3, "abcdefgh", "FG", -0.3) +Call ok(x = 0, "InStr returned " & x) + +x = InStr(1, "abcABC", "aB", 0) +Call ok(x = 0, "InStr returned " & x) + +x = InStr(1, "abcABC", "aB", 1) +Call ok(x = 1, "InStr returned " & x) + +x = InStr(2, "abcABC", "aB", 1) +Call ok(x = 4, "InStr returned " & x) + +x = InStr(5, "abcABC", "aB", 1) +Call ok(x = 0, "InStr returned " & x) + +x = InStr(2, "abcABC", "ab", 1) +Call ok(x = 4, "InStr returned " & x) + +x = InStr(6, "abcABC", "c", 1) +Call ok(x = 6, "InStr returned " & x) + +x = InStr(2, "abc" & Chr(0) & "A" & Chr(0) & "BC", "C", 0) +Call ok(x = 8, "InStr returned " & x) + +x = InStr(1, "abc" & Chr(0) & "ABC", Chr(0) & "a", 1) +Call ok(x = 4, "InStr returned " & x) + x = InStrRev("bcabcd", "bc") Call ok(x = 4, "InStrRev returned " & x)

1 0

Piotr Caban : user32: Support undocumented SC_SIZE flag that can be used to move window.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 5bb4e4b36ce4073854944d98ddd3e5ef2484b28f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb4e4b36ce4073854944d98… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 29 19:07:40 2020 +0200 user32: Support undocumented SC_SIZE flag that can be used to move window. Fixes main window moving in Quicken 2020. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 4 ++-- dlls/winex11.drv/window.c | 1 + 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 700e60db17..843da8900f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11800,6 +11800,45 @@ static void other_process_proc(HWND hwnd) CloseHandle(test_done_event); } +static void test_SC_SIZE(void) +{ + HWND hwnd; + RECT rect; + MSG msg; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 100, 100, 100, 100, 0, 0, NULL, NULL); + ok(!!hwnd, "CreateWindowEx failed.\n"); + + GetWindowRect(hwnd, &rect); + ok(rect.left == 100, "rect.left = %d\n", rect.left); + ok(rect.top == 100, "rect.top = %d\n", rect.top); + ok(rect.right == 200, "rect.right = %d\n", rect.right); + ok(rect.bottom == 200, "rect.bottom = %d\n", rect.bottom); + + SetCursorPos(100, 100); + PostMessageA(hwnd, WM_SYSCOMMAND, SC_SIZE | 9, MAKELONG(100, 100)); + SetCursorPos(110, 100); + PostMessageA(hwnd, WM_MOUSEMOVE, 0, MAKELONG(110, 100)); + PostMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + + if (msg.message == WM_SYSCOMMAND) break; + } + + GetWindowRect(hwnd, &rect); + ok(rect.left == 110, "rect.left = %d\n", rect.left); + ok(rect.top == 100, "rect.top = %d\n", rect.top); + ok(rect.right == 210, "rect.right = %d\n", rect.right); + ok(rect.bottom == 200, "rect.bottom = %d\n", rect.bottom); + + DestroyWindow(hwnd); +} + static void test_other_process_window(const char *argv0) { HANDLE window_ready_event, test_done_event; @@ -12022,6 +12061,7 @@ START_TEST(win) test_window_placement(); test_arrange_iconic_windows(); test_other_process_window(argv[0]); + test_SC_SIZE(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b92a20df18..b45b74ce82 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2894,7 +2894,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else { if (!DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); - if (hittest == HTCAPTION) OffsetRect( &sizingRect, dx, dy ); + if (hittest == HTCAPTION || hittest == HTBORDER) OffsetRect( &sizingRect, dx, dy ); if (ON_LEFT_BORDER(hittest)) sizingRect.left += dx; else if (ON_RIGHT_BORDER(hittest)) sizingRect.right += dx; if (ON_TOP_BORDER(hittest)) sizingRect.top += dy; @@ -2902,7 +2902,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) capturePoint = pt; /* determine the hit location */ - if (syscommand == SC_SIZE) + if (syscommand == SC_SIZE && hittest != HTBORDER) { WPARAM wpSizingHit = 0; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a16b835424..f4920b802e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2851,6 +2851,7 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) case WMSZ_BOTTOM: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOM; break; case WMSZ_BOTTOMLEFT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT; break; case WMSZ_BOTTOMRIGHT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT; break; + case 9: dir = _NET_WM_MOVERESIZE_MOVE; break; default: dir = _NET_WM_MOVERESIZE_SIZE_KEYBOARD; break; } break;

1 0

Gabriel Ivăncescu : ddraw: Check the foreground window in addition to the device state in ddraw_update_lost_surfaces().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 992e3055b53b00ca290d8ffbec4923f155fe5726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=992e3055b53b00ca290d8ffb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 30 17:00:29 2020 +0430 ddraw: Check the foreground window in addition to the device state in ddraw_update_lost_surfaces(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3cbde6ea84..d7545e5c82 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4975,6 +4975,19 @@ void ddraw_update_lost_surfaces(struct ddraw *ddraw) { struct ddraw_surface *surface; + /* Railroad Tycoon 2 tries to restore surfaces from within a + * WM_QUERYNEWPALETTE message handler and expects it to succeed. We + * haven't received the WM_ACTIVATEAPP message by that point, so the + * device state is still DDRAW_DEVICE_STATE_LOST, even though we are in + * the foreground. */ + if (ddraw->device_state == DDRAW_DEVICE_STATE_LOST) + { + HWND window = ddraw->focuswindow ? ddraw->focuswindow : ddraw->dest_window; + + if (window && GetForegroundWindow() == window) + ddraw->device_state = DDRAW_DEVICE_STATE_NOT_RESTORED; + } + if (ddraw->device_state != DDRAW_DEVICE_STATE_NOT_RESTORED) return;

1 0

Gabriel Ivăncescu : ddraw: Return DDERR_WRONGMODE when attempting to restore surfaces of a lost device.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 6179ac14cbd80ab94d9ff7f3fee0866e7bc74479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6179ac14cbd80ab94d9ff7f3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 30 17:00:28 2020 +0430 ddraw: Return DDERR_WRONGMODE when attempting to restore surfaces of a lost device. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 +++++- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw4.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw7.c | 12 ++++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7b7f16e2a3..a5f032eabf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3785,9 +3785,13 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) } } + if (!ddraw_surface_can_be_lost(surface)) + return DD_OK; ddraw_update_lost_surfaces(surface->ddraw); - surface->is_lost = FALSE; + if (surface->ddraw->device_state == DDRAW_DEVICE_STATE_LOST) + return DDERR_WRONGMODE; + surface->is_lost = FALSE; for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) { if (surface->complex_array[i]) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2fc454a606..532065a479 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7381,12 +7381,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 311c7a159d..800dab0fe8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8334,12 +8334,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8eee655bba..d4f4f08e39 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9731,12 +9731,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface4_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 778b1738fa..5ea81903c4 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9489,12 +9489,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface7_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1);

1 0

Gabriel Ivăncescu : ddraw/tests: Test non-primary video memory surface in test_lost_device().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 7e56c12c0f560fceb6dd7ac465ff63108c29f799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e56c12c0f560fceb6dd7ac4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 30 17:00:27 2020 +0430 ddraw/tests: Test non-primary video memory surface in test_lost_device(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 99 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 99 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 104 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 104 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 402 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e56c12c0f560fceb6dd…

1 0

Henri Verbeet : vkd3d-shader: Report error messages from vkd3d_shader_serialize_root_signature().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: 1279d5df9eddcb99a90c77813a96a228da47c6a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1279d5df9eddcb99a90c778… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:58 2020 +0430 vkd3d-shader: Report error messages from vkd3d_shader_serialize_root_signature(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 6 +- libs/vkd3d-shader/dxbc.c | 221 +++++++++++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 21 ++- libs/vkd3d/vkd3d_main.c | 26 +++- tests/vkd3d_shader_api.c | 2 +- 5 files changed, 192 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=1279d5df9eddcb99a90…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020