March 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : wbemprox: Report 4095MiB video memory if it overflows.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 658c62c606e4c73d78dc6c0eb4e24c458b934c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=658c62c606e4c73d78dc6c0e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 30 12:37:40 2020 +0200 wbemprox: Report 4095MiB video memory if it overflows. That's what Windows do apparently. Anything with more than 4GiB of VRAM would report less otherwise, confusing the VRAM detection in some games. The Mafia III launcher is trying to open a warning popup with a 8GiB VRAM GPU for instance, as the reported value overflows to 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c63029180bd86011b34b530e754dffdf532752d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fcabd068371..32f521df1dd 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4409,8 +4409,9 @@ static enum fill_status fill_videocontroller( struct table *table, const struct hr = IDXGIAdapter_GetDesc( adapter, &desc ); if (SUCCEEDED(hr)) { - vidmem = desc.DedicatedVideoMemory; - name = desc.Description; + if (desc.DedicatedVideoMemory > UINT_MAX) vidmem = 0xfff00000; + else vidmem = desc.DedicatedVideoMemory; + name = desc.Description; } done:

1 0

Brendan Shanks : winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 52b820c34613361936b00b97e643cd7652b27522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52b820c34613361936b00b97… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 23 16:48:44 2020 -0800 winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50153 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9c0c0e2b57e0a5e27a1e0a8d1d2ca4660a0e4a86) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index df578b4b9d6..ee6225bf398 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -297,6 +297,13 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) + { + ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, vid, pid); + return; + } + IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) { @@ -365,6 +372,8 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); /* Note: Yes, we leak the buffer. But according to research there is no safe way to deallocate that buffer. */ + IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + IOHIDDeviceClose(IOHIDDevice, 0); device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) { @@ -383,13 +392,6 @@ static DWORD CALLBACK runloop_thread(void *args) IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, handle_RemovalCallback, NULL); IOHIDManagerScheduleWithRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) - { - ERR("Couldn't open IOHIDManager.\n"); - IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - CFRelease(hid_manager); - return 0; - } CFRunLoopRun(); TRACE("Run Loop exiting\n");

1 0

Zebediah Figura : user32/tests: Add some tests for release of capture via modal dialogs.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 3af67c2c6381afcfa9fa2598181ea8f360853f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3af67c2c6381afcfa9fa2598… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:47 2021 -0600 user32/tests: Add some tests for release of capture via modal dialogs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c75e06528830fb882f2664d42c1d1802707bc766) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/dialog.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 2a7d71f67a2..c7f80c7b734 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2176,6 +2176,89 @@ static void test_dialog_custom_data(void) DialogBoxA(g_hinst, "CUSTOM_TEST_DIALOG", NULL, custom_test_dialog_proc); } +static INT_PTR CALLBACK capture_release_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_USER, 0, (LPARAM)child); + } + else if (message == WM_USER) + { + HWND child = (HWND)lparam; + DWORD style; + + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + EndDialog(dialog, 1); + } + return FALSE; +} + +static INT_PTR CALLBACK capture_release_modeless_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_QUIT, 0, 0); + } + return FALSE; +} + +static void test_capture_release(void) +{ + HWND window, child, dialog; + INT_PTR ret; + MSG msg; + + /* Set the capture to a child window. The main window will receive + * WM_CANCELMODE when being disabled, but the child window will retain + * capture. */ + + window = CreateWindowA("static", "parent", 0, 100, 200, 300, 400, NULL, NULL, NULL, NULL); + child = CreateWindowA("static", "child", WS_CHILD, 10, 20, 100, 100, window, NULL, NULL, NULL); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", NULL, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", window, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + dialog = CreateDialogParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", + window, capture_release_modeless_proc, (LPARAM)child); + ok(!!dialog, "failed to create dialog\n"); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + ShowWindow(dialog, SW_SHOWNORMAL); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + while (GetMessageA(&msg, NULL, 0, 0)) + DispatchMessageA(&msg); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + DestroyWindow(dialog); + + DestroyWindow(child); + DestroyWindow(window); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -2195,4 +2278,5 @@ START_TEST(dialog) test_SaveRestoreFocus(); test_timer_message(); test_MessageBox(); + test_capture_release(); }

1 0

Arkadiusz Hiler : user32: Fix WM_DEVICECHANGE handling.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 01f17546c491d0709012e96a55e1c5ac175dba72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01f17546c491d0709012e96a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Nov 25 17:04:14 2020 +0200 user32: Fix WM_DEVICECHANGE handling. WM_DEVICECHANGE's lParam can be either a pointer to a variant of DEV_BROADCAST_HDR or an immediate value (usually 0) depending on the wParam's value. This fixes a crash when broadcasting WM_DEVICECHANGE with wParam = DBT_DEVNODES_CHANGED, lParam = 0. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b4abe3889f95e74df77f9fac117b30d236b2b2cc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2ab82837d1b..37e7cb7735d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1028,7 +1028,7 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara case WM_DEVICECHANGE: { DEV_BROADCAST_HDR *header = (DEV_BROADCAST_HDR *)lparam; - push_data( data, header, header->dbch_size ); + if ((wparam & 0x8000) && header) push_data( data, header, header->dbch_size ); return 0; } case WM_WINE_KEYBOARD_LL_HOOK: @@ -1431,6 +1431,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!get_buffer_space( buffer, sizeof(BOOL) )) return FALSE; break; case WM_DEVICECHANGE: + if (!(*wparam & 0x8000)) return TRUE; minsize = sizeof(DEV_BROADCAST_HDR); break; case WM_WINE_KEYBOARD_LL_HOOK:

1 0

Hans Leidekker : msado15: Avoid a crash with tracing on.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 40514b8a280d3089a3f3f32d9d0c3a8b3ef9cd14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40514b8a280d3089a3f3f32d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 11:47:13 2020 +0200 msado15: Avoid a crash with tracing on. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 45295c5e07f13c7ff98e73e5e0134b19d8f8aa17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index b90486b7cd9..1361f6490c5 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -179,7 +179,7 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR struct connection *connection = impl_from_Connection( iface ); WCHAR *source = NULL; - TRACE( "%p, %s\n", connection, debugstr_w( !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); + TRACE( "%p, %s\n", connection, debugstr_w( str && !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); if (str && !(source = strdupW( str ))) return E_OUTOFMEMORY; heap_free( connection->datasource );

1 0

Gijs Vermeulen : quartz: Only return S_FALSE in IEnumFilters::Skip() if count goes past the end of the sequence.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 9167d99c9b1bddf212098d05f223f130ae06f7fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9167d99c9b1bddf212098d05… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Nov 23 17:29:28 2020 +0100 quartz: Only return S_FALSE in IEnumFilters::Skip() if count goes past the end of the sequence. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28332 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4807a8f588c67e2296474399368a96c0046120fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/tests/filtergraph.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ffd481fb171..7114d47753c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -318,7 +318,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) while (count--) { if (!(enum_filters->cursor = list_next(&enum_filters->graph->filters, enum_filters->cursor))) - return S_FALSE; + return count ? S_FALSE : S_OK; } return S_OK; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index ab573b74008..b76e6fcbe23 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -692,6 +692,30 @@ static void test_enum_filters(void) hr = IEnumFilters_Reset(enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumFilters_Skip(enum1, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumFilters_Next(enum1, 1, filters, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(filters[0] == filter2, "Got filter %p.\n", filters[0]);

1 0

Robert Wilhelm : vbscript: Support properties with parameters.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 673810f0f631fc9d40d4bf046eb11775216d399a URL: https://source.winehq.org/git/wine.git/?a=commit;h=673810f0f631fc9d40d4bf04… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Nov 17 21:11:32 2020 +0100 vbscript: Support properties with parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a839ac952a8d5673b0aff6307cc7ecc0eabb3d99) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 21 +++++++++++++++++++++ dlls/vbscript/vbdisp.c | 35 +++++++++++++++++++++++++---------- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2e329fd0ad6..390a42f7fad 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -450,7 +450,7 @@ ClassBody PropertyDecl : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4fd4291e621..dd6012bbd35 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1695,6 +1695,27 @@ class TestPropSyntax end property end class +Class TestPropParam + Public oDict + Public Property Let Key(oldKey,newKey) + oDict = oldKey & newKey + End Property + Public Property Let three(uno,due,tre) + oDict = uno & due & tre + End Property + Public Property Let ten(a,b,c,d,e,f,g,h,i,j) + oDict = a & b & c & d & e & f & g & h & i & j + End Property +End Class + +Set x = new TestPropParam +x.key("old") = "new" +call ok(x.oDict = "oldnew","x.oDict = " & x.oDict & " expected oldnew") +x.three(1,2) = 3 +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +x.ten(1,2,3,4,5,6,7,8,9) = 0 +call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") + set x = new TestPropSyntax set x.prop = new TestPropSyntax set x.prop.prop = new TestPropSyntax diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 33366b9de51..556ea144ff6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -197,28 +197,43 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { DISPPARAMS dp = {NULL, NULL, 1, 0}; BOOL needs_release; - VARIANT put_val; + VARIANT buf[6]; HRESULT hres; - - if(arg_cnt(params)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + INT i; + + dp.cArgs = arg_cnt(params) + 1; + if(dp.cArgs > ARRAY_SIZE(buf)) { + dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); + if(!dp.rgvarg) + return E_OUTOFMEMORY; + }else { + dp.rgvarg = buf; } - hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); - if(FAILED(hres)) + hres = get_propput_arg(This->desc->ctx, params, flags, dp.rgvarg, &needs_release); + if(FAILED(hres)) { + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; + } - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + func = This->desc->funcs[id].entries[V_VT(dp.rgvarg) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return DISP_E_MEMBERNOTFOUND; } + for(i=1; i < dp.cArgs; i++) { + dp.rgvarg[i]=params->rgvarg[params->cNamedArgs+i-1]; + } + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) - VariantClear(&put_val); + VariantClear(dp.rgvarg); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; } default:

1 0

Robert Wilhelm : vbscript: Support property set with parameters.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: be8ffcef055071315a0771fcd7c9106759bece3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8ffcef055071315a0771fc… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sat Nov 21 10:27:32 2020 +0100 vbscript: Support property set with parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c39cd37383f402286c79a58e064adb98c0e7c6dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/interp.c | 11 +++-------- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a3d37d23dd5..9723d332d0e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -963,12 +963,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } - - hres = stack_assume_disp(ctx, 1, &obj); + hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -977,7 +972,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_assume_disp(ctx, 0, NULL); + hres = stack_assume_disp(ctx, arg_cnt, NULL); if(FAILED(hres)) return hres; @@ -989,7 +984,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - stack_popn(ctx, 2); + stack_popn(ctx, arg_cnt+2); return S_OK; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 390a42f7fad..b4ec921a188 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -452,7 +452,7 @@ PropertyDecl { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dd6012bbd35..1ab3b6274e6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1697,6 +1697,17 @@ end class Class TestPropParam Public oDict + Public gotNothing + Public m_obj + + Public Property Set bar(obj) + Set m_obj = obj + End Property + Public Property Set foo(par,obj) + Set m_obj = obj + if obj is Nothing Then gotNothing = True + oDict = par + End Property Public Property Let Key(oldKey,newKey) oDict = oldKey & newKey End Property @@ -1715,6 +1726,11 @@ x.three(1,2) = 3 call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") x.ten(1,2,3,4,5,6,7,8,9) = 0 call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") +Set x.bar = Nothing +call ok(x.gotNothing=Empty,"x.gotNothing = " & x.gotNothing & " expected Empty") +Set x.foo("123") = Nothing +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +call ok(x.gotNothing=True,"x.gotNothing = " & x.gotNothing & " expected true") set x = new TestPropSyntax set x.prop = new TestPropSyntax

1 0

Piotr Caban : msvcrt: Implement opening Unicode files with no BOM in _wsopen_dispatch.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: e26155371b257d35c5795ee80ee1e3991470a559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e26155371b257d35c5795ee8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 15:26:35 2020 +0100 msvcrt: Implement opening Unicode files with no BOM in _wsopen_dispatch. Spotted by Alistair Leslie-Hughes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0ab1b76029eaface724a28483fe8b0ea36029dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 8 ++------ dlls/msvcrt/tests/file.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d5aff642904..71c8ab2e788 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2178,17 +2178,15 @@ static int check_bom(HANDLE h, int oflags, BOOL seek) char bom[sizeof(utf8_bom)]; DWORD r; - oflags &= ~(MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT); - if (!ReadFile(h, bom, sizeof(utf8_bom), &r, NULL)) return oflags; if (r==sizeof(utf8_bom) && !memcmp(bom, utf8_bom, sizeof(utf8_bom))) { - oflags |= MSVCRT__O_U8TEXT; + oflags = (oflags & ~(MSVCRT__O_WTEXT | MSVCRT__O_U16TEXT)) | MSVCRT__O_U8TEXT; }else if (r>=sizeof(utf16_bom) && !memcmp(bom, utf16_bom, sizeof(utf16_bom))) { if (seek && r>2) SetFilePointer(h, 2, NULL, FILE_BEGIN); - oflags |= MSVCRT__O_U16TEXT; + oflags = (oflags & ~(MSVCRT__O_WTEXT | MSVCRT__O_U8TEXT)) | MSVCRT__O_U16TEXT; }else if (seek) { SetFilePointer(h, 0, NULL, FILE_BEGIN); } @@ -2288,8 +2286,6 @@ int CDECL MSVCRT__wsopen_dispatch( const MSVCRT_wchar_t* path, int oflags, int s oflags = check_bom(hand, oflags, FALSE); CloseHandle(hand); } - else - oflags &= ~(MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT); } hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 63d5100de28..767be3a8be5 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -955,6 +955,38 @@ static void test_fgetwc_unicode(void) ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + tempfh = fopen(tempfile, "r,ccs=utf-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "a,ccs=utf-16le"); + ok(tempfh != NULL, "can't open tempfile\n"); + ch = fputwc('a', tempfh); + ok(ch == 'a', "fputwc returned %x\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "a+,ccs=utf-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == 'a', "got %04x, expected 'a'\n", ch); + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + tempfh = fopen(tempfile, "wb"); ok(tempfh != NULL, "can't open tempfile\n"); ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text, ARRAY_SIZE(wchar_text), @@ -974,6 +1006,23 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(wchar_text+1, 1, sizeof(wchar_text)-1, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt,ccs=utf-16le"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); unlink(temppath); }

1 0

Brendan Shanks : winebrowser: Prefix an invalid URL with 'http://' before opening with a browser.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: d86e328001975a47a78c9ef638aa601660f9ca3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86e328001975a47a78c9ef6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 24 15:16:39 2020 -0800 winebrowser: Prefix an invalid URL with 'http://' before opening with a browser. Fixes usage like 'winebrowser winehq.org' when xdg-open or macOS 'open' is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50094 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a688cb6971525e49ffd029161b9007cd748ad42f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winebrowser/main.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..c70457e50b3 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -184,6 +184,29 @@ static int open_mailto_url( const WCHAR *url ) return launch_app( mailers, url ); } +static int open_invalid_url( const WCHAR *url ) +{ + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; + + WCHAR *url_prefixed; + int ret; + + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = open_http_url( url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + return ret; +} + /***************************************************************************** * DDE helper functions. */ @@ -448,8 +471,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); if(FAILED(hres)) { - WINE_ERR("Failed to parse URL\n"); - ret = open_http_url(url); + WINE_ERR("Failed to parse URL %s, treating as HTTP\n", wine_dbgstr_w(url)); + ret = open_invalid_url(url); HeapFree(GetProcessHeap(), 0, ddeString); return ret; }

1 0