March 2019 - Wine-Devel - list.winehq.org

[PATCH] jscript: Use parse_decimal for parsing JSON numeric literals starting with 0.
by Jacek Caban March 21, 2019

March 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/json.c | 15 ++++----------- dlls/jscript/tests/api.js | 5 ++++- 2 files changed, 8 insertions(+), 12 deletions(-)

1 0

[PATCH 4/5] mshtml: Use get_parentWindow for IHTMLDocument2::get_Script implementation.
by Jacek Caban March 21, 2019

March 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[PATCH 3/5] mshtml: Return NULL for document not attached to window in IHTMLDocument7::get_defaultView.
by Jacek Caban March 21, 2019

March 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 14 ++++++++++---- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-)

1 0

[PATCH 2/5] mshtml: Remove selection and range objects from document list when detaching.
by Jacek Caban March 21, 2019

March 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/selection.c | 5 +++-- dlls/mshtml/txtrange.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH 1/5] mshtml: Set elem_vars to NULL when detaching.
by Jacek Caban March 21, 2019

March 21, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] advapi32/tests: Accept failure-code from recent win10
by Detlef Riekenberg March 21, 2019

March 21, 2019

Example failure: (full report with 90 failures after upgrading from win7 to win10) http://test.winehq.org/queue/errksCfJ/report patch tested: https://testbot.winehq.org/JobDetails.pl?Key=49694 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/advapi32/tests/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6043cab184..d1fe3f05fe 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1951,7 +1951,8 @@ static void test_reg_query_info(void) memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = 1; ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); + /* failure-code changed to ERROR_MORE_DATA in recent win10 */ + ok((ret == ERROR_INSUFFICIENT_BUFFER) || (ret == ERROR_MORE_DATA), "ret = %d\n", ret); ok(classlen == 0 /* win8 */ || classlen == strlen(subkey_class), "classlen = %u\n", classlen); memset(expectbufferW, 0x55, sizeof(expectbufferW)); -- 2.21.0.windows.1

1 0

[PATCH] schedsvc/tests: Avoid a crash in a SchRpcRegisterTask test
by Detlef Riekenberg March 21, 2019

March 21, 2019

Example failures: (full report with 90 failures after upgrading from win7 to win10) http://test.winehq.org/queue/errksCfJ/report cw1 (1709): http://test.winehq.org/data/6325d85406fbf7f46770bc739da4b7e2c9b199d7/win10_… patch tested: https://testbot.winehq.org/JobDetails.pl?Key=49726 The test crashed on some win10 systems since a long time, but some old win10 machines works. Microsoft proably changed something. -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/schedsvc/tests/rpcapi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 4aaafb60f1..c15ef131ff 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -526,6 +526,11 @@ todo_wine path = NULL; info = NULL; hr = SchRpcRegisterTask(NULL, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + if (hr == E_ACCESSDENIED) + { + skip("Access denied for TASK_CREATE with a NULL path\n"); + goto done; + } ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!info, "expected NULL, info %p\n", info); hr = IIDFromString(path, &iid); @@ -534,6 +539,7 @@ todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); MIDL_user_free(path); +done: hr = RpcBindingFree(&rpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } -- 2.21.0.windows.1

1 0

[PATCH 2/2] winebus.sys: Handle create existent device failure.
by Zhiyi Zhang March 21, 2019

March 21, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winebus.sys/main.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index fd68833ac3..f9675b3a23 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -207,6 +207,8 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, UNICODE_STRING nameW; WCHAR dev_name[256]; HDEVINFO devinfo; + SP_DEVINFO_DATA data = {sizeof(data)}; + WCHAR *instance = NULL; NTSTATUS status; DWORD length; @@ -258,26 +260,31 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, LeaveCriticalSection(&device_list_cs); - devinfo = SetupDiGetClassDevsW(class, NULL, NULL, DIGCF_DEVICEINTERFACE); - if (devinfo) + devinfo = SetupDiCreateDeviceInfoList(class, NULL); + if (devinfo == INVALID_HANDLE_VALUE) { - SP_DEVINFO_DATA data; - WCHAR *instance; - - data.cbSize = sizeof(data); - if (!(instance = get_instance_id(device))) - ERR("failed to generate instance id\n"); - else if (!SetupDiCreateDeviceInfoW(devinfo, instance, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &data)) - ERR("failed to create device info: %x\n", GetLastError()); - else if (!SetupDiRegisterDeviceInfo(devinfo, &data, 0, NULL, NULL, NULL)) - ERR("failed to register device info: %x\n", GetLastError()); - - HeapFree(GetProcessHeap(), 0, instance); - SetupDiDestroyDeviceInfoList(devinfo); + ERR("failed to create device info list, error %#x\n", GetLastError()); + goto error; } - else - ERR("failed to get ClassDevs: %x\n", GetLastError()); + instance = get_instance_id(device); + if (!instance) + { + ERR("failed to generate instance id\n"); + goto error; + } + + if (SetupDiCreateDeviceInfoW(devinfo, instance, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &data)) + { + if (!SetupDiRegisterDeviceInfo(devinfo, &data, 0, NULL, NULL, NULL)) + ERR("failed to register device info, error %#x\n", GetLastError()); + } + else if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) + ERR("failed to create device info, error %#x\n", GetLastError()); + +error: + HeapFree(GetProcessHeap(), 0, instance); + SetupDiDestroyDeviceInfoList(devinfo); return device; } -- 2.20.1

2 1

[PATCH 1/2] hidclass.sys: Handle create existent device failure.
by Zhiyi Zhang March 21, 2019

March 21, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 161283 dlls/hidclass.sys/device.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 547c355410..81d5c3c670 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -90,26 +90,24 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) RtlInitUnicodeString( &nameW, ext->device_name); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); - if (!devinfo) + devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_HIDCLASS, NULL); + if (devinfo == INVALID_HANDLE_VALUE) { FIXME( "failed to get ClassDevs %x\n", GetLastError()); return STATUS_UNSUCCESSFUL; } Data.cbSize = sizeof(Data); - if (!SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) + if (SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) { - if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) + if (!SetupDiRegisterDeviceInfo(devinfo, &Data, 0, NULL, NULL, NULL)) { - SetupDiDestroyDeviceInfoList(devinfo); - return STATUS_SUCCESS; + FIXME( "failed to register device info %x\n", GetLastError()); + goto error; } - FIXME( "failed to Create Device Info %x\n", GetLastError()); - goto error; } - if (!SetupDiRegisterDeviceInfo( devinfo, &Data, 0, NULL, NULL, NULL )) + else if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) { - FIXME( "failed to Register Device Info %x\n", GetLastError()); + FIXME( "failed to create device info %x\n", GetLastError()); goto error; } SetupDiDestroyDeviceInfoList(devinfo); -- 2.20.1

2 1

[PATCH 1/2] include/winuser: Add PtInRect as inline version of common RECT helpers
by Gabriel Ivăncescu March 21, 2019

March 21, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This one is used in a lot of code so it makes sense to be just like the others. include/winuser.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 6300cc9..3cffaa1 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4052,7 +4052,6 @@ WINUSERAPI UINT WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UIN WINUSERAPI UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI HWND WINAPI RealChildWindowFromPoint(HWND,POINT); WINUSERAPI UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); WINUSERAPI UINT WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT); @@ -4281,6 +4280,7 @@ WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI BOOL WINAPI InflateRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI OffsetRect(LPRECT,INT,INT); +WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4321,6 +4321,13 @@ static inline BOOL WINAPI OffsetRect(LPRECT rect, INT x, INT y) return TRUE; } +static inline BOOL WINAPI PtInRect(const RECT *rect, POINT pt) +{ + if (!rect) return FALSE; + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) { if (!rect) return FALSE; -- 2.20.1

2 3