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

Alistair Leslie-Hughes : include: Support wine_dbgstr_longlong in tests.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 87b72098c3a1e4b60b21d9a5703870e3a30fc89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b72098c3a1e4b60b21d9a57… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 23:08:09 2017 +0000 include: Support wine_dbgstr_longlong in tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index af602c0..4ec66d5 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -68,6 +68,7 @@ extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); extern const char *wine_dbgstr_guid( const GUID *guid ); extern const char *wine_dbgstr_rect( const RECT *rect ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } +extern const char *wine_dbgstr_longlong( ULONGLONG ll ); /* strcmpW is available for tests compiled under Wine, but not in standalone * builds under Windows, so we reimplement it under a different name. */ @@ -541,6 +542,19 @@ const char *wine_dbgstr_rect( const RECT *rect ) return res; } +const char *wine_dbgstr_longlong( ULONGLONG ll ) +{ + char *res; + + res = get_temp_buffer( 17 ); + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf( res, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll ); + else + sprintf( res, "%lx", (unsigned long)ll ); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Owen Rudge : wsdapi: Implement IWSDUdpAddress_GetTransportAddress[Ex].
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: d140cd504ab7d0c0d3e9a07668138a9bec80df28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d140cd504ab7d0c0d3e9a0766… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:15 2017 +0100 wsdapi: Implement IWSDUdpAddress_GetTransportAddress[Ex]. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/address.c | 57 ++++++++++++++++++++++++++++++++++++++++----- dlls/wsdapi/tests/address.c | 28 +++++++++++----------- 2 files changed, 65 insertions(+), 20 deletions(-) diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 587d090..05c4bb9 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -35,6 +35,8 @@ typedef struct IWSDUdpAddressImpl { IWSDUdpAddress IWSDUdpAddress_iface; LONG ref; SOCKADDR_STORAGE sockAddr; + WCHAR ipv4Address[25]; + WCHAR ipv6Address[64]; } IWSDUdpAddressImpl; static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) @@ -121,16 +123,59 @@ static HRESULT WINAPI IWSDUdpAddressImpl_SetPort(IWSDUdpAddress *This, WORD wPor return E_NOTIMPL; } -static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddress(IWSDUdpAddress *This, LPCWSTR *ppszAddress) +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) { - FIXME("(%p, %p)\n", This, ppszAddress); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + SOCKADDR_STORAGE storage; + DWORD size; + + TRACE("(%p, %d, %p)\n", This, fSafe, ppszAddress); + + if (ppszAddress == NULL) + return E_POINTER; + + *ppszAddress = NULL; + + switch (((SOCKADDR_IN *) &impl->sockAddr)->sin_family) + { + case AF_INET: + size = sizeof(impl->ipv4Address) / sizeof(WCHAR); + + if (WSAAddressToStringW((LPSOCKADDR) &impl->sockAddr, sizeof(SOCKADDR_IN), NULL, impl->ipv4Address, &size) == 0) + { + *ppszAddress = impl->ipv4Address; + return S_OK; + } + + break; + + case AF_INET6: + size = sizeof(impl->ipv6Address) / sizeof(WCHAR); + + /* Copy the SOCKADDR structure so we can remove the scope ID if not required */ + memcpy(&storage, &impl->sockAddr, sizeof(SOCKADDR_IN6)); + + if (!fSafe) + ((SOCKADDR_IN6 *) &storage)->sin6_scope_id = 0; + + if (WSAAddressToStringW((LPSOCKADDR) &storage, sizeof(SOCKADDR_IN6), NULL, impl->ipv6Address, &size) == 0) + { + *ppszAddress = impl->ipv6Address; + return S_OK; + } + + break; + + default: + return S_OK; + } + + return HRESULT_FROM_WIN32(WSAGetLastError()); } -static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddress(IWSDUdpAddress *This, LPCWSTR *ppszAddress) { - FIXME("(%p, %d, %p)\n", This, fSafe, ppszAddress); - return E_NOTIMPL; + return IWSDUdpAddressImpl_GetTransportAddressEx(This, FALSE, ppszAddress); } static HRESULT WINAPI IWSDUdpAddressImpl_SetTransportAddress(IWSDUdpAddress *This, LPCWSTR pszAddress) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index b26a3b9..2142045 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -95,7 +95,7 @@ static void GetSetTransportAddress_udp_tests(void) ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08x\n", rc); /* Try setting a null address */ @@ -111,12 +111,12 @@ static void GetSetTransportAddress_udp_tests(void) ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); - todo_wine ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); - todo_wine ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); /* Try setting an IPv4 address with a port number */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4AddressWithPort); @@ -127,17 +127,17 @@ static void GetSetTransportAddress_udp_tests(void) ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); - todo_wine ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); /* Try setting an IPv6 address with a port number */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6AddressWithPort); ok(rc == S_OK, "SetTransportAddress(ipv6AddressWithPort) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); todo_wine ok(lstrcmpW(returnedAddress, ipv6AddressWithPort) == 0, "Returned address != ipv6AddressWithPort (%s)\n", wine_dbgstr_w(returnedAddress)); /* Release the object */ @@ -324,7 +324,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); todo_wine ok(lstrcmpW(returnedAddress, expectedIpv4TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); @@ -341,7 +341,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); todo_wine ok(lstrcmpW(returnedAddress, expectedIpv4TransportAddrNoPort) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); @@ -364,7 +364,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); todo_wine ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); @@ -381,7 +381,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); todo_wine ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddrNoPort) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress));

1 0

Akihiro Sagawa : tools: Support multiple error name tokens in a line.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 4fbabc2add38e710ec7bddf2287cc5da85dadf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbabc2add38e710ec7bddf22… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 3 23:24:33 2017 +0900 tools: Support multiple error name tokens in a line. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/trace.c | 1 + tools/make_requests | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/trace.c b/server/trace.c index 962b122..7a4b4b2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5429,6 +5429,7 @@ static const struct { "PRIVILEGE_NOT_HELD", STATUS_PRIVILEGE_NOT_HELD }, { "PROCESS_IN_JOB", STATUS_PROCESS_IN_JOB }, { "PROCESS_IS_TERMINATING", STATUS_PROCESS_IS_TERMINATING }, + { "PROCESS_NOT_IN_JOB", STATUS_PROCESS_NOT_IN_JOB }, { "SECTION_TOO_BIG", STATUS_SECTION_TOO_BIG }, { "SEMAPHORE_LIMIT_EXCEEDED", STATUS_SEMAPHORE_LIMIT_EXCEEDED }, { "SHARING_VIOLATION", STATUS_SHARING_VIOLATION }, diff --git a/tools/make_requests b/tools/make_requests index d99793c..3a81f36 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -290,11 +290,11 @@ sub GET_ERROR_NAMES() open FILE, $f or die "Can't open $f"; while (<FILE>) { - if (/STATUS_(\w+)/) + while (/\bSTATUS_(\w+)/g) { $errors{$1} = "STATUS_$1" unless ($1 eq "SUCCESS" || $1 eq "WAIT_0"); } - elsif (/set_win32_error\s*$\s*(\w+)\s*$/) + while (/\bset_win32_error\s*$\s*(\w+)\s*$/g) { $errors{$1} = "0xc0010000 | $1"; }

1 0

Nikolay Sivov : iphlpapi: Fix GetIfTable() trace message.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 9eaf99174e5cd8c6fd639a00e4188fe5a4cba6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaf99174e5cd8c6fd639a00e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 3 15:01:19 2017 +0300 iphlpapi: Fix GetIfTable() trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d0e13e4..94bf825 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1800,8 +1800,8 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) { DWORD ret; - TRACE("pIfTable %p, pdwSize %p, bOrder %d\n", pdwSize, pdwSize, - (DWORD)bOrder); + TRACE("pIfTable %p, pdwSize %p, bOrder %d\n", pIfTable, pdwSize, bOrder); + if (!pdwSize) ret = ERROR_INVALID_PARAMETER; else {

1 0

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

July 3, 2017

Module: wine Branch: master Commit: 311b3aded17080bd43fd1369b98697cf3302627e URL: http://source.winehq.org/git/wine.git/?a=commit;h=311b3aded17080bd43fd1369b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:44:25 2017 +0000 vcomp/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 9aec5cc..165d710 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -188,16 +188,6 @@ static const char vcomp_manifest[] = #undef ARCH -static const char *debugstr_longlong(ULONGLONG ll) -{ - static char str[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(str, "%lx", (unsigned long)ll); - return str; -} - static void create_vcomp_manifest(void) { char temp_path[MAX_PATH]; @@ -1875,27 +1865,27 @@ static void test_atomic_integer64(void) { LONG64 val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); - ok(val == tests1[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests1[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) { LONG64 val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); todo_wine_if(tests2[i].todo) - ok(val == tests2[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests2[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) { ULONG64 val = tests3[i].v1; tests3[i].func(&val, tests3[i].v2); - ok(val == tests3[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests3[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) { ULONG64 val = tests4[i].v1; tests4[i].func(&val, tests4[i].v2); todo_wine_if(tests4[i].todo) - ok(val == tests4[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests4[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } } @@ -2152,13 +2142,13 @@ static void test_reduction_integer64(void) { LONG64 val = tests[i].v1; p_vcomp_reduction_i8(tests[i].flags, &val, tests[i].v2); - ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { ULONG64 val = tests[i].v1; p_vcomp_reduction_u8(tests[i].flags, &val, tests[i].v2); - ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } }

1 0

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

July 3, 2017

Module: wine Branch: master Commit: a3c1fbae2aa565569961a8df2e335496776563be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c1fbae2aa565569961a8df2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:44:06 2017 +0000 ntdll/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/ntdll/tests/file.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9de9009..71b37e4 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -87,16 +87,6 @@ static inline BOOL is_signaled( HANDLE obj ) return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } -static const char* debugstr_longlong(ULONGLONG ll) -{ - static char str[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(str, "%lx", (unsigned long)ll); - return str; -} - #define TEST_BUF_LEN 3 static HANDLE create_temp_file( ULONG flags ) @@ -1134,10 +1124,10 @@ static void test_file_full_size_information(void) /* Test for FileFsSizeInformation */ ok(fsi.TotalAllocationUnits.QuadPart > 0, "[fsi] TotalAllocationUnits expected positive, got 0x%s\n", - debugstr_longlong(fsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.TotalAllocationUnits.QuadPart)); ok(fsi.AvailableAllocationUnits.QuadPart > 0, "[fsi] AvailableAllocationUnits expected positive, got 0x%s\n", - debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); /* Assume file system is NTFS */ ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); @@ -1147,21 +1137,21 @@ static void test_file_full_size_information(void) { ok(ffsi.TotalAllocationUnits.QuadPart > 0, "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); ok(ffsi.CallerAvailableAllocationUnits.QuadPart > 0, "[ffsi] CallerAvailableAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); ok(ffsi.ActualAvailableAllocationUnits.QuadPart > 0, "[ffsi] ActualAvailableAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); ok(ffsi.TotalAllocationUnits.QuadPart == fsi.TotalAllocationUnits.QuadPart, "[ffsi] TotalAllocationUnits error fsi:0x%s, ffsi:0x%s\n", - debugstr_longlong(fsi.TotalAllocationUnits.QuadPart), - debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.TotalAllocationUnits.QuadPart), + wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); ok(ffsi.CallerAvailableAllocationUnits.QuadPart == fsi.AvailableAllocationUnits.QuadPart, "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", - debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart), - debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart), + wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); } /* Assume file system is NTFS */

1 0

Hugh McMaster : regedit: Improve the parsing of multiline hex data during the registry import operation.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 032d32f94052a5e7386d07b4a4986d1140f736e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032d32f94052a5e7386d07b4a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:55 2017 +0000 regedit: Improve the parsing of multiline hex data during the registry import operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 143 +++++++++++++++++++++++++++++---------- programs/regedit/tests/regedit.c | 125 +++++++++++++++++----------------- 2 files changed, 171 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=032d32f94052a5e7386d0…

1 0

Akihiro Sagawa : tools: Also ignore STATUS_WAIT_0.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: c8faa1925c144ecb3874197e57a3addb5f685351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8faa1925c144ecb3874197e5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 3 23:24:31 2017 +0900 tools: Also ignore STATUS_WAIT_0. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_requests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_requests b/tools/make_requests index 6e4a537..d99793c 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -292,7 +292,7 @@ sub GET_ERROR_NAMES() { if (/STATUS_(\w+)/) { - $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS"; + $errors{$1} = "STATUS_$1" unless ($1 eq "SUCCESS" || $1 eq "WAIT_0"); } elsif (/set_win32_error\s*$\s*(\w+)\s*$/) {

1 0

Jacek Caban : server: Keep ifchange queue through sock object life time.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 37804f1ec5f82581e504b2cd23b09f4fc0a7f2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37804f1ec5f82581e504b2cd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 15:08:09 2017 +0200 server: Keep ifchange queue through sock object life time. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/server/sock.c b/server/sock.c index d4af01e..75b3db5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -123,8 +123,8 @@ static void sock_dump( struct object *obj, int verbose ); static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *sock_get_fd( struct object *obj ); static void sock_destroy( struct object *obj ); -static struct async_queue *sock_get_ifchange_q( struct sock *sock ); -static void sock_destroy_ifchange_q( struct sock *sock ); +static struct object *sock_get_ifchange( struct sock *sock ); +static void sock_release_ifchange( struct sock *sock ); static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); @@ -537,7 +537,6 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct sock *sock = get_fd_user( fd ); - struct async_queue *ifchange_q; assert( sock->obj.ops == &sock_ops ); @@ -549,8 +548,9 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_error( STATUS_CANT_WAIT ); return 0; } - if (!(ifchange_q = sock_get_ifchange_q( sock ))) return 0; - queue_async( ifchange_q, async ); + if (!sock_get_ifchange( sock )) return 0; + if (!sock->ifchange_q && !(sock->ifchange_q = create_async_queue( sock->fd ))) return 0; + queue_async( sock->ifchange_q, async ); set_error( STATUS_PENDING ); return 1; default: @@ -618,10 +618,11 @@ static void sock_destroy( struct object *obj ) if ( sock->deferred ) release_object( sock->deferred ); + async_wake_up( sock->ifchange_q, STATUS_CANCELLED ); + sock_release_ifchange( sock ); free_async_queue( sock->read_q ); free_async_queue( sock->write_q ); - async_wake_up( sock->ifchange_q, STATUS_CANCELLED ); - sock_destroy_ifchange_q( sock ); + free_async_queue( sock->ifchange_q ); if (sock->event) release_object( sock->event ); if (sock->fd) { @@ -1038,9 +1039,9 @@ static void ifchange_wake_up( struct object *obj, unsigned int status ) { struct sock *sock = LIST_ENTRY( ptr, struct sock, ifchange_entry ); - assert( sock->ifchange_q ); + assert( sock->ifchange_obj ); async_wake_up( sock->ifchange_q, status ); /* issue ifchange notification for the socket */ - sock_destroy_ifchange_q( sock ); /* remove socket from list and decrement ifchange refcount */ + sock_release_ifchange( sock ); /* remove socket from list and decrement ifchange refcount */ } } @@ -1145,40 +1146,30 @@ static void ifchange_add_sock( struct object *obj, struct sock *sock ) } /* create a new ifchange queue for a specific socket or, if one already exists, reuse the existing one */ -static struct async_queue *sock_get_ifchange_q( struct sock *sock ) +static struct object *sock_get_ifchange( struct sock *sock ) { struct object *ifchange; - if (sock->ifchange_q) /* reuse existing ifchange_q for this socket */ - return sock->ifchange_q; + if (sock->ifchange_obj) /* reuse existing ifchange_obj for this socket */ + return sock->ifchange_obj; if (!(ifchange = get_ifchange())) return NULL; - /* create the ifchange notification queue */ - sock->ifchange_q = create_async_queue( sock->fd ); - if (!sock->ifchange_q) - { - release_object( ifchange ); - set_error( STATUS_NO_MEMORY ); - return NULL; - } - /* add the socket to the ifchange notification list */ ifchange_add_sock( ifchange, sock ); sock->ifchange_obj = ifchange; - return sock->ifchange_q; + return ifchange; } /* destroy an existing ifchange queue for a specific socket */ -static void sock_destroy_ifchange_q( struct sock *sock ) +static void sock_release_ifchange( struct sock *sock ) { - if (sock->ifchange_q) + if (sock->ifchange_obj) { list_remove( &sock->ifchange_entry ); - free_async_queue( sock->ifchange_q ); - sock->ifchange_q = NULL; release_object( sock->ifchange_obj ); + sock->ifchange_obj = NULL; } }

1 0

André Hentschel : include: Add some more prototypes to winuser.h.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 112553734a4e1ceb0e03703c04c00c9b133293e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112553734a4e1ceb0e03703c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 29 19:44:04 2017 +0200 include: Add some more prototypes to winuser.h. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index 0d6c5d6..ad786f3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3361,6 +3361,7 @@ WINUSERAPI UINT WINAPI ArrangeIconicWindows(HWND); WINUSERAPI BOOL WINAPI AttachThreadInput(DWORD,DWORD,BOOL); WINUSERAPI HDWP WINAPI BeginDeferWindowPos(INT); WINUSERAPI HDC WINAPI BeginPaint(HWND,LPPAINTSTRUCT); +WINUSERAPI BOOL WINAPI BlockInput(BOOL); WINUSERAPI BOOL WINAPI BringWindowToTop(HWND); WINUSERAPI LONG WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM); WINUSERAPI LONG WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM); @@ -3482,6 +3483,7 @@ WINUSERAPI LRESULT WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM); WINUSERAPI LRESULT WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM); #define DefWindowProc WINELIB_NAME_AW(DefWindowProc) WINUSERAPI BOOL WINAPI DeleteMenu(HMENU,UINT,UINT); +WINUSERAPI BOOL WINAPI DeregisterShellHookWindow(HWND); WINUSERAPI BOOL WINAPI DestroyAcceleratorTable(HACCEL); WINUSERAPI BOOL WINAPI DestroyCaret(void); WINUSERAPI BOOL WINAPI DestroyCursor(HCURSOR); @@ -3500,6 +3502,7 @@ WINUSERAPI INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW, WINUSERAPI INT_PTR WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM); WINUSERAPI INT_PTR WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM); #define DialogBoxParam WINELIB_NAME_AW(DialogBoxParam) +WINUSERAPI VOID WINAPI DisableProcessWindowsGhosting(VOID); WINUSERAPI LRESULT WINAPI DispatchMessageA(const MSG*); WINUSERAPI LRESULT WINAPI DispatchMessageW(const MSG*); #define DispatchMessage WINELIB_NAME_AW(DispatchMessage) @@ -3638,6 +3641,7 @@ WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void); WINUSERAPI BOOL WINAPI GetGestureConfig(HWND,DWORD,DWORD,UINT*,GESTURECONFIG*,UINT); WINUSERAPI BOOL WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*); +WINUSERAPI DWORD WINAPI GetGuiResources(HANDLE,DWORD); WINUSERAPI BOOL WINAPI GetIconInfo(HICON,PICONINFO); WINUSERAPI BOOL WINAPI GetIconInfoExA(HICON,ICONINFOEXA*); WINUSERAPI BOOL WINAPI GetIconInfoExW(HICON,ICONINFOEXW*); @@ -3658,6 +3662,7 @@ WINUSERAPI BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR); WINUSERAPI SHORT WINAPI GetKeyState(INT); WINUSERAPI HWND WINAPI GetLastActivePopup(HWND); WINUSERAPI BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO); +WINUSERAPI DWORD WINAPI GetListBoxInfo(HWND); WINUSERAPI UINT WINAPI GetRawInputBuffer(PRAWINPUT,PUINT,UINT); WINUSERAPI UINT WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT); WINUSERAPI UINT WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT); @@ -3696,6 +3701,7 @@ WINUSERAPI HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL); #define GetNextWindow GetWindow WINUSERAPI HWND WINAPI GetOpenClipboardWindow(void); WINUSERAPI HWND WINAPI GetParent(HWND); +WINUSERAPI BOOL WINAPI GetPhysicalCursorPos(POINT*); WINUSERAPI INT WINAPI GetPriorityClipboardFormat(UINT*,INT); WINUSERAPI BOOL WINAPI GetProcessDefaultLayout(DWORD*); WINUSERAPI HANDLE WINAPI GetPropA(HWND,LPCSTR); @@ -3745,6 +3751,7 @@ WINUSERAPI UINT WINAPI GetWindowModuleFileNameW(HWND,LPWSTR,UINT); #define GetWindowModuleFileName WINELIB_NAME_AW(GetWindowModuleFileName) WINUSERAPI BOOL WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT); WINUSERAPI BOOL WINAPI GetWindowRect(HWND,LPRECT); +WINUSERAPI INT WINAPI GetWindowRgnBox(HWND,LPRECT); WINUSERAPI INT WINAPI GetWindowRgn(HWND,HRGN); WINUSERAPI HWINSTA WINAPI GetProcessWindowStation(void); #define GetWindowTask(hwnd) ((HTASK)GetWindowThreadProcessId(hwnd,NULL)) @@ -3836,8 +3843,10 @@ WINUSERAPI HMENU WINAPI LoadMenuIndirectW(LPCVOID); WINUSERAPI INT WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,INT); WINUSERAPI INT WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,INT); #define LoadString WINELIB_NAME_AW(LoadString) +WINUSERAPI BOOL WINAPI LogicalToPhysicalPoint(HWND,POINT*); WINUSERAPI BOOL WINAPI LockSetForegroundWindow(UINT); WINUSERAPI BOOL WINAPI LockWindowUpdate(HWND); +WINUSERAPI BOOL WINAPI LockWorkStation(void); WINUSERAPI INT WINAPI LookupIconIdFromDirectory(LPBYTE,BOOL); WINUSERAPI INT WINAPI LookupIconIdFromDirectoryEx(LPBYTE,BOOL,INT,INT,UINT); WINUSERAPI UINT WINAPI MapVirtualKeyA(UINT,UINT); @@ -3889,6 +3898,7 @@ WINUSERAPI BOOL WINAPI PaintDesktop(HDC); WINUSERAPI BOOL WINAPI PeekMessageA(LPMSG,HWND,UINT,UINT,UINT); WINUSERAPI BOOL WINAPI PeekMessageW(LPMSG,HWND,UINT,UINT,UINT); #define PeekMessage WINELIB_NAME_AW(PeekMessage) +WINUSERAPI BOOL WINAPI PhysicalToLogicalPoint(HWND,POINT*); #define PostAppMessageA(thread,msg,wparam,lparam) PostThreadMessageA((DWORD)(thread),msg,wparam,lparam) #define PostAppMessageW(thread,msg,wparam,lparam) PostThreadMessageW((DWORD)(thread),msg,wparam,lparam) #define PostAppMessage WINELIB_NAME_AW(PostAppMessage) @@ -3899,6 +3909,7 @@ WINUSERAPI void WINAPI PostQuitMessage(INT); WINUSERAPI BOOL WINAPI PostThreadMessageA(DWORD,UINT,WPARAM,LPARAM); WINUSERAPI BOOL WINAPI PostThreadMessageW(DWORD,UINT,WPARAM,LPARAM); #define PostThreadMessage WINELIB_NAME_AW(PostThreadMessage) +WINUSERAPI BOOL WINAPI PrintWindow(HWND,HDC,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); @@ -3924,6 +3935,8 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); +WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); +WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); WINUSERAPI UINT WINAPI RegisterWindowMessageA(LPCSTR); WINUSERAPI UINT WINAPI RegisterWindowMessageW(LPCWSTR); #define RegisterWindowMessage WINELIB_NAME_AW(RegisterWindowMessage) @@ -4002,6 +4015,7 @@ WINUSERAPI BOOL WINAPI SetMenuItemInfoW(HMENU,UINT,BOOL,const MENUITEMINF WINUSERAPI LPARAM WINAPI SetMessageExtraInfo(LPARAM); WINUSERAPI BOOL WINAPI SetMessageQueue(INT); WINUSERAPI HWND WINAPI SetParent(HWND,HWND); +WINUSERAPI BOOL WINAPI SetPhysicalCursorPos(INT,INT); WINUSERAPI BOOL WINAPI SetProcessDPIAware(void); WINUSERAPI BOOL WINAPI SetProcessDefaultLayout(DWORD); WINUSERAPI BOOL WINAPI SetProcessWindowStation(HWINSTA);

1 0