July 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : wineandroid: Forward the destroy window ioctl to Java even if the window was freed already.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 5b056f61cf0d5b9e0d3af71877d6a319200e5e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b056f61cf0d5b9e0d3af7187… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 20:57:24 2017 +0200 wineandroid: Forward the destroy window ioctl to Java even if the window was freed already. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 3 ++- dlls/wineandroid.drv/device.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 6c6edd5..16857f2 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -358,7 +358,8 @@ public class WineActivity extends Activity { if (window_group != null) { - if (parent != null) parent.client_group.removeView( window_group ); + if (parent != null && parent.client_group != null) + parent.client_group.removeView( window_group ); window_group.destroy_view(); } if (client_group != null) client_group.destroy_view(); diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 472f4ba..09ac4f4 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -604,7 +604,7 @@ static NTSTATUS destroyWindow_ioctl( void *data, DWORD in_size, DWORD out_size, if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; - if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + win_data = get_ioctl_native_win_data( &res->hdr ); TRACE( "hwnd %08x opengl %u\n", res->hdr.hwnd, res->hdr.opengl ); @@ -613,7 +613,7 @@ static NTSTATUS destroyWindow_ioctl( void *data, DWORD in_size, DWORD out_size, wrap_java_call(); (*jni_env)->CallVoidMethod( jni_env, object, method, res->hdr.hwnd ); unwrap_java_call(); - free_native_win_data( win_data ); + if (win_data) free_native_win_data( win_data ); return STATUS_SUCCESS; }

1 0

Owen Rudge : wsdapi: Implement WSDXMLGetValueFromAny.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 760190b524ab5c0e6f6804ed195ff8e626d6aa53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760190b524ab5c0e6f6804ed1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:26 2017 +0100 wsdapi: Implement WSDXMLGetValueFromAny. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/wsdapi.spec | 2 +- dlls/wsdapi/xml.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/wsdutil.h | 1 + 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 41d62bb..22457c9 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -42,4 +42,4 @@ @ stdcall WSDXMLCleanupElement(ptr) @ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace -@ stub WSDXMLGetValueFromAny +@ stdcall WSDXMLGetValueFromAny(wstr wstr ptr wstr) diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 71e9661..145c394 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -238,6 +238,46 @@ HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny) return S_OK; } +HRESULT WINAPI WSDXMLGetValueFromAny(const WCHAR *pszNamespace, const WCHAR *pszName, WSDXML_ELEMENT *pAny, LPCWSTR *ppszValue) +{ + WSDXML_ELEMENT *element; + WSDXML_TEXT *text; + + if (pAny == NULL) + return E_INVALIDARG; + + if (ppszValue == NULL) + return E_POINTER; + + if ((pszNamespace == NULL) || (pszName == NULL) || (lstrlenW(pszNamespace) > WSD_MAX_TEXT_LENGTH) || (lstrlenW(pszName) > WSD_MAX_TEXT_LENGTH)) + return E_INVALIDARG; + + element = pAny; + + while (element != NULL) + { + if (element->Node.Type == ElementType) + { + if ((lstrcmpW(element->Name->LocalName, pszName) == 0) && (lstrcmpW(element->Name->Space->Uri, pszNamespace) == 0)) + { + if ((element->FirstChild == NULL) || (element->FirstChild->Type != TextType)) + { + return E_FAIL; + } + + text = (WSDXML_TEXT *) element->FirstChild; + *ppszValue = (LPCWSTR) text->Text; + + return S_OK; + } + } + + element = (WSDXML_ELEMENT *) element->Node.Next; + } + + return E_FAIL; +} + /* IWSDXMLContext implementation */ struct xmlNamespace diff --git a/include/wsdutil.h b/include/wsdutil.h index 2980d40..402a413 100644 --- a/include/wsdutil.h +++ b/include/wsdutil.h @@ -28,5 +28,6 @@ HRESULT WINAPI WSDXMLAddChild(WSDXML_ELEMENT *pParent, WSDXML_ELEMENT *pChild); HRESULT WINAPI WSDXMLAddSibling(WSDXML_ELEMENT *pFirst, WSDXML_ELEMENT *pSecond); HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR pszText, WSDXML_ELEMENT **ppAny); HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny); +HRESULT WINAPI WSDXMLGetValueFromAny(const WCHAR *pszNamespace, const WCHAR *pszName, WSDXML_ELEMENT *pAny, LPCWSTR *ppszValue); #endif

1 0

Alexandre Julliard : wineandroid: Add networking permissions.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: bc70768c981c60e8583c5c7e99b15a372de45fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc70768c981c60e8583c5c7e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 20:57:50 2017 +0200 wineandroid: Add networking permissions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineandroid.drv/AndroidManifest.xml b/dlls/wineandroid.drv/AndroidManifest.xml index 631cc1a..c4c83d6 100644 --- a/dlls/wineandroid.drv/AndroidManifest.xml +++ b/dlls/wineandroid.drv/AndroidManifest.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.winehq.wine"> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <application android:icon="@drawable/wine" android:label="Wine" >

1 0

Owen Rudge : wsdapi: Implement IWSDUdpAddress_Get/SetPort.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 52ad4d0e6624041ccc8c13504e4d8480fc92ff9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ad4d0e6624041ccc8c13504… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:18 2017 +0100 wsdapi: Implement IWSDUdpAddress_Get/SetPort. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/address.c | 22 ++++++++++++++++++---- dlls/wsdapi/tests/address.c | 22 +++++++++++----------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 05c4bb9..f225930 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -37,6 +37,7 @@ typedef struct IWSDUdpAddressImpl { SOCKADDR_STORAGE sockAddr; WCHAR ipv4Address[25]; WCHAR ipv6Address[64]; + WORD port; } IWSDUdpAddressImpl; static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) @@ -113,14 +114,27 @@ static HRESULT WINAPI IWSDUdpAddressImpl_Deserialize(IWSDUdpAddress *This, LPCWS static HRESULT WINAPI IWSDUdpAddressImpl_GetPort(IWSDUdpAddress *This, WORD *pwPort) { - FIXME("(%p, %p)\n", This, pwPort); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + + TRACE("(%p, %p)\n", This, pwPort); + + if (pwPort == NULL) + { + return E_POINTER; + } + + *pwPort = impl->port; + return S_OK; } static HRESULT WINAPI IWSDUdpAddressImpl_SetPort(IWSDUdpAddress *This, WORD wPort) { - FIXME("(%p, %d)\n", This, wPort); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + + TRACE("(%p, %d)\n", This, wPort); + + impl->port = wPort; + return S_OK; } static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 2142045..1a18f02 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -164,32 +164,32 @@ static void GetSetPort_udp_tests(void) /* No test for GetPort(NULL) as this causes an access violation exception on Windows */ rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); /* Try setting a zero port */ rc = IWSDUdpAddress_SetPort(udpAddress, 0); - todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); /* Set a real port */ rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort1); - todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); - todo_wine ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); /* Now set a different port */ rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort2); - todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); - todo_wine ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); /* Release the object */ ret = IWSDUdpAddress_Release(udpAddress); @@ -330,7 +330,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetPort doesn't return the port set via the socket */ rc = IWSDUdpAddress_GetPort(udpAddress, &port); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); /* Try setting an IPv4 address without a port */ @@ -370,7 +370,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetPort doesn't return the port set via the socket */ rc = IWSDUdpAddress_GetPort(udpAddress, &port); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); /* Try setting an IPv6 address without a port */

1 0

Hugh McMaster : regedit: Remove un-necessary parser state assignment if we are returning to the same state.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: c750c2a98d20ed5bb91ccbe380fd9fb44975f832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c750c2a98d20ed5bb91ccbe38… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:43 2017 +0000 regedit: Remove un-necessary parser state assignment if we are returning to the same state. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d6ea5c7..e5a4f74 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -532,7 +532,7 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) return NULL; if (strncmpW(line, hkcr, ARRAY_SIZE(hkcr))) - goto invalid; + return line; /* get key name */ while (line[key_end] && !isspaceW(line[key_end])) key_end++; @@ -548,7 +548,7 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) if (open_key(parser, line) != ERROR_SUCCESS) { output_message(STRING_OPEN_KEY_FAILED, line); - goto invalid; + return line; } parser->value_name = NULL; @@ -558,10 +558,6 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) set_state(parser, SET_VALUE); return value; - -invalid: - set_state(parser, PARSE_WIN31_LINE); - return line; } /* handler for parser LINE_START state */ @@ -589,7 +585,6 @@ static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) case '\t': break; default: - set_state(parser, LINE_START); return p; } }

1 0

Hugh McMaster : regedit/tests: Test the effect of whitespace-only lines during hex data concatenation.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 2db2a7aeefb27144cca9fb353900627a2b5ba1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db2a7aeefb27144cca9fb353… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:34 2017 +0000 regedit/tests: Test the effect of whitespace-only lines during hex data concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 71d0f14..3b5a7f5 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1464,12 +1464,21 @@ static void test_import_with_whitespace(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine10\"=hex(7):4c,69,6e,65,20,\\\n" + "\"Wine10a\"=hex(7):4c,69,6e,65,20,\\\n" " 63,6f,6e,\\\n\n" " 63,61,74,\\\n\n\n" " 65,6e,\\\n\n\n\n" " 61,74,69,6f,6e,00,00\n\n"); - verify_reg(hkey, "Wine10", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n \n" + " 63,61,74,\\\n\t\n\t\n" + " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Akihiro Sagawa : ntdll/tests: Add more tests if we have real VM counters.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 7c06d99e83b1df153d307332def29c299ebe2eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c06d99e83b1df153d307332d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 3 23:24:35 2017 +0900 ntdll/tests: Add more tests if we have real VM counters. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f1de206..e90e4a7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1069,6 +1069,9 @@ static void test_query_process_vm(void) VM_COUNTERS pvi; ULONG old_size = FIELD_OFFSET(VM_COUNTERS,PrivatePageCount); HANDLE process; + SIZE_T prev_size; + const SIZE_T alloc_size = 16 * 1024 * 1024; + void *ptr; status = pNtQueryInformationProcess(NULL, ProcessVmCounters, NULL, sizeof(pvi), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, @@ -1119,6 +1122,47 @@ static void test_query_process_vm(void) ok( pvi.PagefileUsage > 0, "Expected a PagefileUsage > 0\n"); CloseHandle(process); + + /* Check if we have real counters */ + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + prev_size = pvi.VirtualSize; + if (winetest_debug > 1) + dump_vm_counters("VM counters before VirtualAlloc", &pvi); + ptr = VirtualAlloc(NULL, alloc_size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); + ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + if (winetest_debug > 1) + dump_vm_counters("VM counters after VirtualAlloc", &pvi); + todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, + "Expected to be greater than %lu, got %lu\n", prev_size + alloc_size, pvi.VirtualSize); + VirtualFree( ptr, 0, MEM_RELEASE); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + prev_size = pvi.VirtualSize; + if (winetest_debug > 1) + dump_vm_counters("VM counters before VirtualAlloc", &pvi); + ptr = VirtualAlloc(NULL, alloc_size, MEM_RESERVE, PAGE_READWRITE); + ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + if (winetest_debug > 1) + dump_vm_counters("VM counters after VirtualAlloc(MEM_RESERVE)", &pvi); + todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, + "Expected to be greater than %lu, got %lu\n", prev_size + alloc_size, pvi.VirtualSize); + prev_size = pvi.VirtualSize; + + ptr = VirtualAlloc(ptr, alloc_size, MEM_COMMIT, PAGE_READWRITE); + ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + if (winetest_debug > 1) + dump_vm_counters("VM counters after VirtualAlloc(MEM_COMMIT)", &pvi); + ok( pvi.VirtualSize == prev_size, + "Expected to equal to %lu, got %lu\n", prev_size, pvi.VirtualSize); + VirtualFree( ptr, 0, MEM_RELEASE); } static void test_query_process_io(void)

1 0

Jacek Caban : server: Associate named pipe device waiters queue with its fd.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 54234b8a47065b33df9a6a38b9f6ceec4bbdd472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54234b8a47065b33df9a6a38b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 15:07:54 2017 +0200 server: Associate named pipe device waiters queue with its fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index c0bfc2a..97ded91 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1231,7 +1231,7 @@ static int named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, struct asy if (!(server = find_available_server( pipe ))) { - if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; + if (!pipe->waiters && !(pipe->waiters = create_async_queue( fd ))) goto done; queue_async( pipe->waiters, async ); when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout;

1 0

Jacek Caban : server: Use default poll only for default read and write queue asyncs.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 328f178c2519d51eda4992b07c514670f8d46385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=328f178c2519d51eda4992b07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 15:06:43 2017 +0200 server: Use default poll only for default read and write queue asyncs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index f64c8c9..baf7e8d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2101,7 +2101,7 @@ void default_fd_queue_async( struct fd *fd, struct async *async, int type, int c /* default reselect_async() fd routine */ void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ) { - if (queue != fd->wait_q) + if (queue == fd->read_q || queue == fd->write_q) { int poll_events = fd->fd_ops->get_poll_events( fd ); int events = check_fd_events( fd, poll_events );

1 0

Alistair Leslie-Hughes : propsys/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: b2f266906ba8e24e9adb438a99b2e2b55e0826be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f266906ba8e24e9adb438a9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:43:58 2017 +0000 propsys/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 54b45ac..776ccd0 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -763,16 +763,6 @@ static void test_PropVariantCompare(void) SysFreeString(str_b.u.bstrVal); } -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - static void test_intconversions(void) { PROPVARIANT propvar; @@ -796,7 +786,7 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); @@ -818,11 +808,11 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 5, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 5, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == S_OK, "hr=%x\n", hr); - ok(ullval == 5, "got wrong value %s\n", debugstr_longlong(ullval)); + ok(ullval == 5, "got wrong value %s\n", wine_dbgstr_longlong(ullval)); hr = PropVariantToInt32(&propvar, &lval); ok(hr == S_OK, "hr=%x\n", hr); @@ -845,7 +835,7 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -5, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -5, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); @@ -869,28 +859,28 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 6, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 6, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_I4; propvar.u.lVal = -6; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -6, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -6, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_UI2; propvar.u.uiVal = 7; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 7, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_I2; propvar.u.iVal = -7; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -7, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); } static void test_PropVariantChangeType_LPWSTR(void)

1 0