February 2019 - Wine-devel - list.winehq.org

[PATCH] comctl32: fix a memory leak (valgrind)
by Austin English 21 Feb '19

21 Feb '19

-- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

1 0

[PATCH] ntoskrnl.exe: Implement ExUuidCreate().
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 2 ++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b62660750..1d36620fc4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3983,3 +3983,36 @@ void WINAPI KeLeaveGuardedRegion(void) { FIXME("\n"); } + +/************************************************************************* + * ExUuidCreate (NTOSKRNL.@) + * + * Creates a 128bit UUID. + * + * RETURNS + * + * STATUS_SUCCESS if successful. + * RPC_NT_UUID_LOCAL_ONLY if UUID is only locally unique. + * + * NOTES + * + * Follows RFC 4122, section 4.4 (Algorithms for Creating a UUID from + * Truly Random or Pseudo-Random Numbers) + */ +NTSTATUS WINAPI ExUuidCreate(UUID *uuid) +{ + /* RtlGenRandom */ + SystemFunction036(uuid, sizeof(*uuid)); + /* Clear the version bits and set the version (4) */ + uuid->Data3 &= 0x0fff; + uuid->Data3 |= (4 << 12); + /* Set the topmost bits of Data4 (clock_seq_hi_and_reserved) as + * specified in RFC 4122, section 4.4. + */ + uuid->Data4[0] &= 0x3f; + uuid->Data4[0] |= 0x80; + + TRACE("%s\n", debugstr_guid(uuid)); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d087422605..73ebbd91ef 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -185,7 +185,7 @@ @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime @ stub ExUnregisterCallback -@ stub ExUuidCreate +@ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType @ stub Exi386InterlockedDecrementLong diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 452e510fdc..fb8cacc188 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -202,7 +202,9 @@ typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERF PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; +typedef GUID UUID; +NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); -- 2.15.2 (Apple Git-101.1)

2 2

[PATCH] wineandroid.drv: Remove redundant not-NULL checks (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Return if win is NULL. *Not compile tested*. dlls/wineandroid.drv/device.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 0800ad7947..0b8bf67ef1 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -520,8 +520,8 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR if (!data || data->parent == win) { - if (win) pANativeWindow_release( win ); - if (data && win) PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); + pANativeWindow_release( win ); + if (data) PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p (unchanged)\n", hwnd, data, win ); return; } @@ -529,15 +529,12 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR release_native_window( data ); data->parent = win; data->generation++; - if (win) - { - wrap_java_call(); - if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); - win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); - win->setSwapInterval( win, data->swap_interval ); - unwrap_java_call(); - PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); - } + wrap_java_call(); + if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); + win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); + win->setSwapInterval( win, data->swap_interval ); + unwrap_java_call(); + PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p\n", hwnd, data, win ); } -- 2.20.1

1 0

[PATCH] kernel32: Remove redundant not 0 check (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Return with ERROR_INVALID_PARAMETER if size is 0. dlls/kernel32/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 3419898407..eb0471cc8e 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1612,7 +1612,7 @@ DWORD WINAPI K32GetModuleFileNameExA(HANDLE process, HMODULE module, if ( process == GetCurrentProcess() ) { len = GetModuleFileNameA( module, file_name, size ); - if (size) file_name[size - 1] = '\0'; + file_name[size - 1] = '\0'; return len; } -- 2.20.1

1 0

[PATCH] shell32: Remove superfluous continue (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/xdg.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 781902a238..0351699912 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -939,14 +939,10 @@ HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_d /* Parse the value */ hr = parse_config2(p, home_dir, &out[idx]); - if (FAILED(hr)) + if (hr == E_OUTOFMEMORY) { - if (hr == E_OUTOFMEMORY) - { - fclose(file); - goto xdg_user_dir_lookup_error; - } - continue; + fclose(file); + goto xdg_user_dir_lookup_error; } } fclose (file); -- 2.20.1

1 0

[PATCH] secur32: Remove dead code (Coverity).
by Sven Baars 20 Feb '19

20 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- NULL is returned when !ret, so this part is never reached. dlls/secur32/schannel_gnutls.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ea116e81da..857b7e7090 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -602,8 +602,8 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) DWORD size; CERT_KEY_CONTEXT keyctx; CRYPT_KEY_PROV_INFO *prov; - WCHAR username[UNLEN + 1], *ret = NULL; - DWORD len = ARRAY_SIZE(username); + WCHAR *ret = NULL; + DWORD len; size = sizeof(keyctx); if (CertGetCertificateContextProperty(ctx, CERT_KEY_CONTEXT_PROP_ID, &keyctx, &size)) @@ -643,12 +643,6 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) heap_free(prov); } - if (!ret && GetUserNameW(username, &len) && (ret = heap_alloc(sizeof(rsabaseW) + len * sizeof(WCHAR)))) - { - strcpyW(ret, rsabaseW); - strcatW(ret, username); - } - return ret; } -- 2.17.1

2 1

[PATCH v2 1/5] kernel32/tests: Test ReadFileScatter() completion status with FILE_SKIP_COMPLETION_PORT_ON_SUCCESS.
by Paul Gofman 20 Feb '19

20 Feb '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - no changes. dlls/kernel32/tests/file.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 18cd18d154..a4fba43242 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -61,6 +61,7 @@ static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CL static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static char filename[MAX_PATH]; static const char sillytext[] = @@ -109,6 +110,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); } static void test__hread( void ) @@ -4565,6 +4567,31 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, "invalid data was read into buffer\n" ); + if (pSetFileCompletionNotificationModes) + { + br = pSetFileCompletionNotificationModes(hfile, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + + br = ReadFileScatter(hfile, fse, si.dwPageSize, NULL, &ovl); + ok(br == FALSE, "ReadFileScatter should be asynchronous.\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed, error %u.\n", GetLastError()); + + br = GetQueuedCompletionStatus(hiocp2, &size, &key, &povl, 1000); + todo_wine ok(br, "GetQueuedCompletionStatus failed, err %u.\n", GetLastError()); + todo_wine ok(povl == &ovl, "Wrong ovl %p.\n", povl); + + br = GetOverlappedResult(hfile, &ovl, &tx, TRUE); + ok(br, "GetOverlappedResult failed, err %u.\n", GetLastError()); + ok(tx == si.dwPageSize, "Got unexpected size %u.\n", tx); + + ResetEvent(evt); + + br = pSetFileCompletionNotificationModes(hfile, 0); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + } + else + win_skip("SetFileCompletionNotificationModes not available.\n"); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); -- 2.20.1

2 8

[PATCH] mshtml: Remove useless casts to self
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/editor.c | 8 ++++---- dlls/mshtml/htmlelem.c | 6 +++--- dlls/mshtml/tests/htmldoc.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6838433985..c901592352 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -295,7 +295,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) TRACE("found font tag %p\n", elem); - get_elem_attr_value((nsIDOMElement*)elem, sizeW, &val_str, &val); + get_elem_attr_value(elem, sizeW, &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); strcpyW(ret, val); @@ -366,7 +366,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsISelection_Collapse(nsselection, (nsIDOMNode*)elem, 0); }else { /* Remove all size attributes from the range */ - remove_child_attr((nsIDOMElement*)elem, fontW, &size_str); + remove_child_attr(elem, fontW, &size_str); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)elem); } @@ -1174,10 +1174,10 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if (insert_link_at_caret) { /* add them to the document at the caret position */ - nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, (nsIDOMElement*)anchor_elem, FALSE); + nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); }else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ - nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, (nsIDOMElement*)anchor_elem); + nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); nsIHTMLEditor_Release(html_editor); hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4da01560e2..d490030ef3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5597,14 +5597,14 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g tag = get_tag_desc(tag_name); if(tag) { - hres = tag->constructor(doc, (nsIDOMElement*)nselem, &elem); + hres = tag->constructor(doc, nselem, &elem); }else if(use_generic) { - hres = HTMLGenericElement_Create(doc, (nsIDOMElement*)nselem, &elem); + hres = HTMLGenericElement_Create(doc, nselem, &elem); }else { elem = heap_alloc_zero(sizeof(HTMLElement)); if(elem) { elem->node.vtbl = &HTMLElementImplVtbl; - HTMLElement_Init(elem, doc, (nsIDOMElement*)nselem, &HTMLElement_dispex); + HTMLElement_Init(elem, doc, nselem, &HTMLElement_dispex); hres = S_OK; }else { hres = E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 25cdf802b1..52e6fe71b3 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -7543,7 +7543,7 @@ static void test_QueryInterface(IHTMLDocument2 *htmldoc) hres = IUnknown_QueryInterface(doc, &IID_IDispatch, (void**)&qi); ok(hres == S_OK, "Could not get IDispatch interface: %08x\n", hres); - ok(qi != (IUnknown*)doc, "disp == doc\n"); + ok(qi != doc, "disp == doc\n"); IUnknown_Release(qi); } -- 2.20.1

2 1

[PATCH] d3d11: Change assert and return in unsafe_impl_from_ID3D11ShaderResourceView().
by Andrey Gusev 20 Feb '19

20 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46686 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d11/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 93d0b78655..43ec357340 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -2291,8 +2291,8 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D11ShaderResourceView(ID3D1 { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d11_shader_resource_view_vtbl); - return impl_from_ID3D11ShaderResourceView(iface); + assert(iface->lpVtbl == (ID3D11ShaderResourceViewVtbl *)&d3d11_shader_resource_view_vtbl); + return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D11ShaderResourceView_iface); } struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) -- 2.20.1

3 2

[PATCH] wined3d: Pass d3d_info instead of the device to wined3d_stateblock_state_init.
by Sven Baars 20 Feb '19

20 Feb '19

This fixes a NULL pointer dereference in device_init found by Coverity. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d9d6cf2676..d1ab739c77 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5093,7 +5093,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); - wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); + wined3d_stateblock_state_init(&device->stateblock_state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; device_init_swapchain_state(device, swapchain); @@ -5368,7 +5368,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, } state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); - wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); + wined3d_stateblock_state_init(&device->stateblock_state, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; device->max_frame_latency = 3; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cd72209391..e66f6ab036 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1536,7 +1536,7 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state } void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, - const struct wined3d_device *device, DWORD flags) + const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; @@ -1546,7 +1546,7 @@ void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, } if (flags & WINED3D_STATE_INIT_DEFAULT) - stateblock_state_init_default(state, &device->adapter->d3d_info); + stateblock_state_init_default(state, d3d_info); } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, @@ -1556,7 +1556,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - wined3d_stateblock_state_init(&stateblock->stateblock_state, device, 0); + wined3d_stateblock_state_init(&stateblock->stateblock_state, d3d_info, 0); if (type == WINED3D_SBT_RECORDED) return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57df9f1eb2..c722d6dab2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3632,7 +3632,7 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, - const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; void wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, -- 2.17.1

2 5