July 2020 - Wine-commits - list.winehq.org

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

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

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: 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: 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 NoRes display settings handler to a new interface.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 9c99d9bceba34559a32f1e5906a6fcbcf91b0004 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c99d9bceba34559a32f1e59… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 27 16:01:55 2020 +0800 winex11.drv: Migrate NoRes 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/settings.c | 93 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 7c7d950718..57b7faba8e 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -169,30 +169,99 @@ void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handle * Default handlers if resolution switching is not enabled * */ -static int X11DRV_nores_GetCurrentMode(void) +static BOOL nores_get_id(const WCHAR *device_name, ULONG_PTR *id) { - return 0; + WCHAR primary_adapter[CCHDEVICENAME]; + + if (!get_primary_adapter( primary_adapter )) + return FALSE; + + *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + return TRUE; +} + +static BOOL nores_get_modes(ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count) +{ + RECT primary = get_host_primary_monitor_rect(); + DEVMODEW *modes; + + modes = heap_calloc(1, sizeof(*modes)); + if (!modes) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + modes[0].dmSize = sizeof(*modes); + modes[0].dmDriverExtra = 0; + modes[0].dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + modes[0].u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + modes[0].dmBitsPerPel = screen_bpp; + modes[0].dmPelsWidth = primary.right; + modes[0].dmPelsHeight = primary.bottom; + modes[0].u2.dmDisplayFlags = 0; + modes[0].dmDisplayFrequency = 60; + + *new_modes = modes; + *mode_count = 1; + return TRUE; } -static LONG X11DRV_nores_SetCurrentMode(int mode) +static void nores_free_modes(DEVMODEW *modes) { - if (mode == 0) return DISP_CHANGE_SUCCESSFUL; - TRACE("Ignoring mode change request mode=%d\n", mode); - return DISP_CHANGE_FAILED; + heap_free(modes); +} + +static BOOL nores_get_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + RECT primary = get_host_primary_monitor_rect(); + + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u2.dmDisplayFlags = 0; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; + + if (id != 1) + { + FIXME("Non-primary adapters are unsupported.\n"); + mode->dmBitsPerPel = 0; + mode->dmPelsWidth = 0; + mode->dmPelsHeight = 0; + mode->dmDisplayFrequency = 0; + return TRUE; + } + + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = primary.right; + mode->dmPelsHeight = primary.bottom; + mode->dmDisplayFrequency = 60; + return TRUE; +} + +static LONG nores_set_current_mode(ULONG_PTR id, DEVMODEW *mode) +{ + WARN("NoRes settings handler, ignoring mode change request.\n"); + return DISP_CHANGE_SUCCESSFUL; } /* default handler only gets the current X desktop resolution */ void X11DRV_Settings_Init(void) { - RECT primary = get_host_primary_monitor_rect(); + struct x11drv_settings_handler nores_handler; depths = screen_bpp == 32 ? depths_32 : depths_24; - X11DRV_Settings_SetHandlers("NoRes", - X11DRV_nores_GetCurrentMode, - X11DRV_nores_SetCurrentMode, - 1, 0); - X11DRV_Settings_AddOneMode( primary.right - primary.left, primary.bottom - primary.top, 0, 60); + nores_handler.name = "NoRes"; + nores_handler.priority = 0; + nores_handler.get_id = nores_get_id; + nores_handler.get_modes = nores_get_modes; + nores_handler.free_modes = nores_free_modes; + nores_handler.get_current_mode = nores_get_current_mode; + nores_handler.set_current_mode = nores_set_current_mode; + X11DRV_Settings_SetHandler(&nores_handler); } static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len)

1 0

Zhiyi Zhang : winex11.drv: Remove the old display settings handler interface.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: b45c04f4c352ef81df5312684008839f4eeee03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b45c04f4c352ef81df531268… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 27 16:02:17 2020 +0800 winex11.drv: Remove the old display settings handler interface. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 228 -------------------------------------------- dlls/winex11.drv/x11drv.h | 16 ---- 2 files changed, 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b45c04f4c352ef81df53…

1 0

Jacek Caban : wineconsole: Use renderer handle instead of hConIn where possible.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 78831ae9d044ffb824e72cb8952f3eb25140c7c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78831ae9d044ffb824e72cb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 17:15:08 2020 +0200 wineconsole: Use renderer handle instead of hConIn where possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 4 ++-- programs/wineconsole/user.c | 10 +++++----- programs/wineconsole/wineconsole.c | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 3f56bdb0ca..3ddd22387f 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -339,7 +339,7 @@ static void WCCURSES_SetTitle(const struct inner_data* data) { WCHAR wbuf[256]; - if (WINECON_GetConsoleTitle(data->hConIn, wbuf, ARRAY_SIZE(wbuf))) + if (WINECON_GetConsoleTitle(data->console, wbuf, ARRAY_SIZE(wbuf))) { char buffer[256]; @@ -965,7 +965,7 @@ static DWORD CALLBACK input_thread( void *arg ) else numEvent = WCCURSES_FillSimpleChar(ir, inchar); - if (numEvent) WriteConsoleInputW(data->hConIn, ir, numEvent, &n); + if (numEvent) WriteConsoleInputW(data->console, ir, numEvent, &n); } LeaveCriticalSection(&PRIVATE(data)->lock); } diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 4476845154..bbaffd3c2a 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -267,7 +267,7 @@ static void WCUSER_SetTitle(const struct inner_data* data) { WCHAR buffer[256]; - if (WINECON_GetConsoleTitle(data->hConIn, buffer, sizeof(buffer))) + if (WINECON_GetConsoleTitle(data->console, buffer, sizeof(buffer))) SetWindowTextW(data->hWnd, buffer); } @@ -738,7 +738,7 @@ static void WCUSER_PasteFromClipboard(struct inner_data* data) ir[1] = ir[0]; ir[1].Event.KeyEvent.bKeyDown = FALSE; - WriteConsoleInputW(data->hConIn, ir, 2, &n); + WriteConsoleInputW(data->console, ir, 2, &n); } GlobalUnlock(h); } @@ -1052,7 +1052,7 @@ static void WCUSER_GenerateKeyInputRecord(struct inner_data* data, BOOL down, ir.Event.KeyEvent.uChar.UnicodeChar = last; /* FIXME: HACKY... and buggy because it should be a stack, not a single value */ if (!down) last = 0; - WriteConsoleInputW(data->hConIn, &ir, 1, &n); + WriteConsoleInputW(data->console, &ir, 1, &n); } /****************************************************************** @@ -1068,7 +1068,7 @@ static void WCUSER_GenerateMouseInputRecord(struct inner_data* data, COORD c, DWORD mode, n; /* MOUSE_EVENTs shouldn't be sent unless ENABLE_MOUSE_INPUT is active */ - if (!GetConsoleMode(data->hConIn, &mode) || !(mode & ENABLE_MOUSE_INPUT)) + if (!GetConsoleMode(data->console, &mode) || !(mode & ENABLE_MOUSE_INPUT)) return; ir.EventType = MOUSE_EVENT; @@ -1083,7 +1083,7 @@ static void WCUSER_GenerateMouseInputRecord(struct inner_data* data, COORD c, ir.Event.MouseEvent.dwControlKeyState = WCUSER_GetCtrlKeyState(keyState); ir.Event.MouseEvent.dwEventFlags = event; - WriteConsoleInputW(data->hConIn, &ir, 1, &n); + WriteConsoleInputW(data->console, &ir, 1, &n); } /****************************************************************** diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index a61aad5293..8752ec6b13 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -374,17 +374,17 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf if (data->curcfg.history_size != cfg->history_size) { data->curcfg.history_size = cfg->history_size; - WINECON_SetHistorySize(data->hConIn, cfg->history_size); + WINECON_SetHistorySize(data->console, cfg->history_size); } if (data->curcfg.history_nodup != cfg->history_nodup) { data->curcfg.history_nodup = cfg->history_nodup; - WINECON_SetHistoryMode(data->hConIn, cfg->history_nodup); + WINECON_SetHistoryMode(data->console, cfg->history_nodup); } if (data->curcfg.insert_mode != cfg->insert_mode) { data->curcfg.insert_mode = cfg->insert_mode; - WINECON_SetInsertMode(data->hConIn, cfg->insert_mode); + WINECON_SetInsertMode(data->console, cfg->insert_mode); } data->curcfg.menu_mask = cfg->menu_mask; data->curcfg.quick_edit = cfg->quick_edit; @@ -511,7 +511,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf if (data->curcfg.edition_mode != cfg->edition_mode) { data->curcfg.edition_mode = cfg->edition_mode; - WINECON_SetEditionMode(data->hConIn, cfg->edition_mode); + WINECON_SetEditionMode(data->console, cfg->edition_mode); } /* we now need to gather all events we got from the operations above, * in order to get data correctly updated @@ -553,14 +553,14 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) struct condrv_output_info output_info; DWORD mode; - if (!DeviceIoControl(data->hConIn, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, + if (!DeviceIoControl(data->console, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &input_info, sizeof(input_info), NULL, NULL)) return FALSE; data->curcfg.history_size = input_info.history_size; data->curcfg.history_nodup = input_info.history_mode; data->curcfg.edition_mode = input_info.edition_mode; - GetConsoleMode(data->hConIn, &mode); + GetConsoleMode(data->console, &mode); data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); @@ -700,11 +700,11 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna memset(&input_params, 0, sizeof(input_params)); input_params.mask = SET_CONSOLE_INPUT_INFO_WIN; input_params.info.win = condrv_handle(data->hWnd); - ret = DeviceIoControl(data->hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &input_params, sizeof(input_params), + ret = DeviceIoControl(data->console, IOCTL_CONDRV_SET_INPUT_INFO, &input_params, sizeof(input_params), NULL, 0, NULL, NULL); if (!ret) goto error; - ret = DeviceIoControl(data->hConIn, IOCTL_CONDRV_SET_TITLE, (void *)appname, + ret = DeviceIoControl(data->console, IOCTL_CONDRV_SET_TITLE, (void *)appname, lstrlenW(appname) * sizeof(WCHAR), NULL, 0, NULL, NULL); if (!ret) goto error;

1 0

Jacek Caban : wineconsole: Move WINECON_Spawn call to WINECON_Init.
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: wine Branch: master Commit: 504d6eaa9a0642e6c71aa320cb5ac1e88dc44a01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=504d6eaa9a0642e6c71aa320… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 17:15:19 2020 +0200 wineconsole: Move WINECON_Spawn call to WINECON_Init. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 113 +++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 60 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 8752ec6b13..c78a7f814b 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -579,6 +579,53 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) return TRUE; } +/****************************************************************** + * WINECON_Spawn + * + * Spawn the child process when invoked with wineconsole foo bar + */ +static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) +{ + PROCESS_INFORMATION info; + STARTUPINFOW startup; + BOOL done; + + /* we're in the case wineconsole <exe> <options>... spawn the new process */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESTDHANDLES; + + /* the attributes of wineconsole's handles are not adequate for inheritance, so + * get them with the correct attributes before process creation + */ + if (!DuplicateHandle(GetCurrentProcess(), data->hConIn, GetCurrentProcess(), + &startup.hStdInput, GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, TRUE, 0) || + !DuplicateHandle(GetCurrentProcess(), data->hConOut, GetCurrentProcess(), + &startup.hStdOutput, GENERIC_READ|GENERIC_WRITE, TRUE, 0) || + !DuplicateHandle(GetCurrentProcess(), data->hConOut, GetCurrentProcess(), + &startup.hStdError, GENERIC_READ|GENERIC_WRITE, TRUE, 0)) + { + WINE_ERR("Can't dup handles\n"); + /* no need to delete handles, we're exiting the program anyway */ + return FALSE; + } + + done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); + if (done) + { + data->hProcess = info.hProcess; + CloseHandle(info.hThread); + } + else printf_res(IDS_CMD_LAUNCH_FAILED, wine_dbgstr_w(cmdLine)); + + /* we no longer need the handles passed to the child for the console */ + CloseHandle(startup.hStdInput); + CloseHandle(startup.hStdOutput); + CloseHandle(startup.hStdError); + + return done; +} + /****************************************************************** * WINECON_Init * @@ -587,7 +634,7 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) */ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appname, enum init_return (*backend)(struct inner_data*), - INT nCmdShow) + INT nCmdShow, WCHAR *cmdline) { struct condrv_input_info_params input_params; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; @@ -708,7 +755,9 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna lstrlenW(appname) * sizeof(WCHAR), NULL, 0, NULL, NULL); if (!ret) goto error; + if (cmdline && !WINECON_Spawn(data, cmdline)) goto error; return data; + case init_failed: break; } @@ -720,52 +769,6 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna return NULL; } -/****************************************************************** - * WINECON_Spawn - * - * Spawn the child process when invoked with wineconsole foo bar - */ -static int WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) -{ - PROCESS_INFORMATION info; - STARTUPINFOW startup; - BOOL done; - - /* we're in the case wineconsole <exe> <options>... spawn the new process */ - memset(&startup, 0, sizeof(startup)); - startup.cb = sizeof(startup); - startup.dwFlags = STARTF_USESTDHANDLES; - - /* the attributes of wineconsole's handles are not adequate for inheritance, so - * get them with the correct attributes before process creation - */ - if (!DuplicateHandle(GetCurrentProcess(), data->hConIn, GetCurrentProcess(), - &startup.hStdInput, GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, TRUE, 0) || - !DuplicateHandle(GetCurrentProcess(), data->hConOut, GetCurrentProcess(), - &startup.hStdOutput, GENERIC_READ|GENERIC_WRITE, TRUE, 0) || - !DuplicateHandle(GetCurrentProcess(), data->hConOut, GetCurrentProcess(), - &startup.hStdError, GENERIC_READ|GENERIC_WRITE, TRUE, 0)) - { - WINE_ERR("Can't dup handles\n"); - /* no need to delete handles, we're exiting the program anyway */ - return 1; - } - - done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); - if (done) - { - data->hProcess = info.hProcess; - CloseHandle(info.hThread); - } - - /* we no longer need the handles passed to the child for the console */ - CloseHandle(startup.hStdInput); - CloseHandle(startup.hStdOutput); - CloseHandle(startup.hStdError); - - return !done; -} - struct wc_init { LPCSTR ptr; enum {from_event, from_process_name} mode; @@ -859,7 +862,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh { case from_event: /* case of wineconsole <evt>, signal process that created us that we're up and running */ - if (!(data = WINECON_Init(hInst, 0, NULL, wci.backend, nCmdShow))) return 1; + if (!(data = WINECON_Init(hInst, 0, NULL, wci.backend, nCmdShow, NULL))) return 1; ret = !SetEvent(wci.event); if (ret != 0) WINE_ERR("SetEvent failed.\n"); break; @@ -876,19 +879,9 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, len); - if (!(data = WINECON_Init(hInst, GetCurrentProcessId(), buffer, wci.backend, nCmdShow))) - { - HeapFree(GetProcessHeap(), 0, buffer); - return 1; - } - ret = WINECON_Spawn(data, buffer); + data = WINECON_Init(hInst, GetCurrentProcessId(), buffer, wci.backend, nCmdShow, buffer); HeapFree(GetProcessHeap(), 0, buffer); - if (ret != 0) - { - WINECON_Delete(data); - printf_res(IDS_CMD_LAUNCH_FAILED, wine_dbgstr_a(wci.ptr)); - return ret; - } + if (!data) return 1; } break; default:

1 0

Henri Verbeet : vkd3d-shader: Validate control flow instructions in vkd3d_shader_scan_dxbc().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: 1c8077546ef3d7ea787b6622ea456951f6bd2cfd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c8077546ef3d7ea787b662… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:54 2020 +0430 vkd3d-shader: Validate control flow instructions in vkd3d_shader_scan_dxbc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 276 +++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 259 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=1c8077546ef3d7ea787…

1 0