May 2019 - Wine-Commits - list.winehq.org

Sven Baars : taskschd: Fix some memory leaks (Valgrind).
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 1d47e2bc99769d3596f73a95b69dff4fb0ddcfbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d47e2bc99769d3596f73a95… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Feb 6 11:48:21 2019 +0100 taskschd: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bff3918553eafc80366731b6d60c42151a298856) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/regtask.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 5c81821..74f95d9 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -350,6 +350,7 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit SysFreeString(xml); return hr; } + SysFreeString(xml); heap_free(full_name); full_name = heap_strdupW(actual_path); @@ -366,6 +367,7 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit { heap_free(full_name); heap_free(regtask); + MIDL_user_free(xml); return hr; } MIDL_user_free(xml);

1 0

Sven Baars : ole32: Fix some memory leaks (Valgrind).
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: ddc0167d6aee4fd631b2ea01716bfb53b74174ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddc0167d6aee4fd631b2ea01… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Jan 30 11:35:23 2019 +0100 ole32: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e32b30c323340e3f35b030e82b8a93427c5c4b5c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/compositemoniker.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 75d97fa..94f4a72 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -433,6 +433,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { + HRESULT res; IMoniker *tempMk,*antiMk,*rightMostMk,*leftReducedComposedMk,*rightMostReducedMk; IEnumMoniker *enumMoniker; @@ -453,7 +454,11 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - return IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); + res = IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); + + return res; } else if (*ppmkToLeft==NULL) @@ -473,13 +478,16 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar /* If any of the components reduces itself, the method returns S_OK and passes back a composite */ /* of the reduced components */ if (IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,NULL,&rightMostReducedMk) && - IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) - ) + IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) ){ + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); return CreateGenericComposite(leftReducedComposedMk,rightMostReducedMk,ppmkReduced); - + } else{ /* If no reduction occurred, the method passes back the same moniker and returns MK_S_REDUCED_TO_SELF.*/ + IMoniker_Release(tempMk); + IMoniker_Release(rightMostMk); IMoniker_AddRef(iface);

1 0

Sven Baars : gdiplus: Fix a memory leak on error path (Valgrind).
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 66529e3f22df5af58f92cb862e52ae726e9d427e URL: https://source.winehq.org/git/wine.git/?a=commit;h=66529e3f22df5af58f92cb86… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 24 11:59:47 2019 +0100 gdiplus: Fix a memory leak on error path (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85630593b87a031f9858a5bcadaed9621ef326bb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/image.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e844cf..8a136ef 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3570,7 +3570,11 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB if (FAILED(hr)) return hresult_to_status(hr); hr = IWICBitmapDecoder_Initialize(*decoder, stream, WICDecodeMetadataCacheOnLoad); - if (FAILED(hr)) return hresult_to_status(hr); + if (FAILED(hr)) + { + IWICBitmapDecoder_Release(*decoder); + return hresult_to_status(hr); + } return Ok; }

1 0

Andrew Eikum : winhttp: Don't crash setting up secure proxy.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 4614f5acb67e9e822f45e7a17a4be3ae6a273913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4614f5acb67e9e822f45e7a1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 8 11:52:01 2019 -0600 winhttp: Don't crash setting up secure proxy. Signed-off-by: Andrew Eikum <aeikum(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 e87f2c399dc9cf0666ef7d4e5e41548bef2e8169) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5525c1c..1a03f5c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1670,6 +1670,9 @@ static BOOL open_connection( struct request *request ) } netconn_set_timeout( netconn, TRUE, request->send_timeout ); netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); + + request->netconn = netconn; + if (is_secure) { if (connect->session->proxy_server && @@ -1677,6 +1680,7 @@ static BOOL open_connection( struct request *request ) { if (!secure_proxy_connect( request )) { + request->netconn = NULL; heap_free( addressW ); netconn_close( netconn ); return FALSE; @@ -1690,13 +1694,13 @@ static BOOL open_connection( struct request *request ) !netconn_secure_connect( netconn, connect->hostname, request->security_flags, &connect->session->cred_handle, request->check_revocation )) { + request->netconn = NULL; heap_free( addressW ); netconn_close( netconn ); return FALSE; } } - request->netconn = netconn; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, addressW, strlenW(addressW) + 1 ); } else

1 0

Zhiyi Zhang : kernel32: Add DECLSPEC_HOTPATCH to VirtualAllocEx().
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 1d6a633a26aad5525ab2928201d000a25e96c9d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d6a633a26aad5525ab29282… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Mar 24 18:47:06 2019 +0800 kernel32: Add DECLSPEC_HOTPATCH to VirtualAllocEx(). Fix Tom Clancy's The Devision uplay version startup crash. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit df3dd6612c2098e347cad88c90853cf3892e4301) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 7f0a562..42da7f0 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -86,7 +86,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc( void *addr, SIZE_T size, DWORD typ * Success: Base address of allocated region of pages. * Failure: NULL. */ -LPVOID WINAPI VirtualAllocEx( HANDLE hProcess, LPVOID addr, SIZE_T size, +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE hProcess, LPVOID addr, SIZE_T size, DWORD type, DWORD protect ) { LPVOID ret = addr;

1 0

Sven Baars : strmbase: Fix some memory leaks (Valgrind).
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 427b8c679172ad750e7e5772d2f2124fc2c061b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=427b8c679172ad750e7e5772… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 29 20:28:58 2019 +0100 strmbase: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c7f51d85ecf0ee63a3c4a818c3c1c9727562b0a7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/strmbase/mediatype.c | 9 ++++++--- dlls/strmbase/renderer.c | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 91c0ddc..1ad4d3b 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -264,14 +264,17 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) CoTaskMemFree(This->enumMediaDetails.pMediaTypes); i = 0; - while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) i++; + while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) + { + FreeMediaType(&amt); + i++; + } This->enumMediaDetails.cMediaTypes = i; This->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) { - This->enumMediaFunction(This->basePin, i,&amt); - if (FAILED(CopyMediaType(&This->enumMediaDetails.pMediaTypes[i], &amt))) + if (FAILED(This->enumMediaFunction(This->basePin, i, &This->enumMediaDetails.pMediaTypes[i]))) { while (i--) FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c06661c..3d5e4b5 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -346,6 +346,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp { return VFW_E_TYPE_NOT_ACCEPTED; } + DeleteMediaType(pmt); } This->pMediaSample = pSample;

1 0

Sven Baars : wsdapi: Fix some memory leaks (Valgrind).
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: a754861ef7c3ada4f5ff9a947c0e22baabe80cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a754861ef7c3ada4f5ff9a94… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 24 11:59:45 2019 +0100 wsdapi: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18ac7e15aab3343b6c6d4dc56a33ea7d24e84f0f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wsdapi/soap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 2ecc013..aa8d15f 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1426,6 +1426,9 @@ static HRESULT ws_element_to_wsdxml_element(WS_XML_READER *reader, IWSDXMLContex if (FAILED(ret)) goto cleanup; WSDXMLAddChild(cur_element, element); + WSDFreeLinkedMemory(name); + name = NULL; + cur_wsd_attrib = NULL; /* Add attributes */ @@ -1462,6 +1465,9 @@ static HRESULT ws_element_to_wsdxml_element(WS_XML_READER *reader, IWSDXMLContex new_wsd_attrib->Element = cur_element; new_wsd_attrib->Next = NULL; + WSDAttachLinkedMemory(new_wsd_attrib, name); + name = NULL; + if (cur_wsd_attrib == NULL) element->FirstAttribute = new_wsd_attrib; else @@ -1524,6 +1530,7 @@ outofmemory: cleanup: /* Free uri and element_name if applicable */ WSDFreeLinkedMemory(uri); + WSDFreeLinkedMemory(name); return ret; } @@ -1712,10 +1719,10 @@ HRESULT read_message(IWSDiscoveryPublisherImpl *impl, const char *xml, int xml_l IWSDXMLContext *context = NULL; WS_XML_STRING *soap_uri = NULL; const WS_XML_NODE *node; - WS_XML_READER *reader; + WS_XML_READER *reader = NULL; LPCWSTR value = NULL; LPWSTR uri, prefix; - WS_HEAP *heap; + WS_HEAP *heap = NULL; HRESULT ret; int i; @@ -1945,6 +1952,8 @@ cleanup: free_xml_string(soap_uri); WSDFreeLinkedMemory(soap_msg); if (context != NULL) IWSDXMLContext_Release(context); + if (reader != NULL) WsFreeReader(reader); + if (heap != NULL) WsFreeHeap(heap); return ret; }

1 0

Zebediah Figura : ntdll: Avoid crashing while tracing parameters to NtCreateNamedPipeFile().
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: e4b249f2e1c9ad9f267e1433092b68c6ba9bcddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4b249f2e1c9ad9f267e1433… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 15:54:31 2019 -0500 ntdll: Avoid crashing while tracing parameters to NtCreateNamedPipeFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7dc459f3d131fd6343d4137df9fa5be1eb79e8b4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1cf3ae2..a26c855 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3479,13 +3479,13 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access, data_size_t len; struct object_attributes *objattr; + if (!attr) return STATUS_INVALID_PARAMETER; + TRACE("(%p %x %s %p %x %d %x %d %d %d %d %d %d %p)\n", - handle, access, debugstr_w(attr->ObjectName->Buffer), iosb, sharing, dispo, + handle, access, debugstr_us(attr->ObjectName), iosb, sharing, dispo, options, pipe_type, read_mode, completion_mode, max_inst, inbound_quota, outbound_quota, timeout); - if (!attr) return STATUS_INVALID_PARAMETER; - /* assume we only get relative timeout */ if (timeout->QuadPart > 0) FIXME("Wrong time %s\n", wine_dbgstr_longlong(timeout->QuadPart));

1 0

Hans Leidekker : msi: Avoid a crash in RemoveFiles if the component directory is invalid.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 8ebf718134ad9744354a87c9f964e8f7766dedf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ebf718134ad9744354a87c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 21:12:04 2019 +0100 msi: Avoid a crash in RemoveFiles if the component directory is invalid. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46907 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c7f323107b3b956d206d8d0ee28851d60f19841c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 5a88c14..07f737d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1444,7 +1444,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) else { MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory ); - remove_folder( folder ); + if (folder) remove_folder( folder ); } } return ERROR_SUCCESS;

1 0

Zebediah Figura : hid: Handle overlapped file handles.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 3b051c8e4e85003db74e11853810a7058707cb9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b051c8e4e85003db74e1185… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 23:52:09 2019 -0500 hid: Handle overlapped file handles. This fixes a crash in the hid:device tests for me, and likely helps with bug 46711. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ea7b8ad9241559d5b9a0ab9082a7665928f86c9d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hid/hidd.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 614e7c4..4b703ca 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,6 +38,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +{ + OVERLAPPED ovl = {0}; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + CloseHandle(ovl.hEvent); + return ret; +} + BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) { TRACE("(%p)\n", PreparsedData); @@ -52,7 +65,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); if (ret) { @@ -66,7 +79,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -78,43 +91,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -124,14 +137,14 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, + &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, + data, info.DescriptorSize, NULL)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -143,5 +156,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); }

1 0