August 2021 - Wine-devel - list.winehq.org

[PATCH] user32/tests: Fix an ASCII / ANSI mixup in a dde ok() message.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index ef709369c5d..dc0bb85d736 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2649,8 +2649,8 @@ static void test_end_to_end_server(void) HDDEDATA hdata; static const char test_service[] = "TestDDEService"; - trace("client %s, server %s\n", unicode_client ? "unicode" : "ascii", - unicode_server ? "unicode" : "ascii"); + trace("client %s, server %s\n", unicode_client ? "unicode" : "ansi", + unicode_server ? "unicode" : "ansi"); server_pid = 0; msg_index = 0; -- 2.20.1

1 0

[PATCH] wsock32: Fix ASCII / ANSI mixups in comments.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsock32/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index 2b6e4e7b58d..f2a45c983b5 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -65,7 +65,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNameSpace, LPGUID lpServiceType, LPWSTR lpS * Retrieve a service type GUID for a network service specified by name. * * PARAMETERS - * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name of the service + * lpServiceName [I] NUL-terminated ANSI string that uniquely represents the name of the service * lpServiceType [O] Destination for the service type GUID * * RETURNS @@ -114,7 +114,7 @@ INT WINAPI GetTypeByNameW(LPWSTR lpServiceName, LPGUID lpServiceType) * dwNameSpace [I] Name space or set of name spaces within which the function will operate * dwOperation [I] Operation to perform * dwFlags [I] Flags to modify the function's operation - * lpServiceInfo [I] Pointer to a ASCII SERVICE_INFO structure + * lpServiceInfo [I] Pointer to an ANSI SERVICE_INFO structure * lpServiceAsyncInfo [I] Reserved for future use. Must be NULL. * lpdwStatusFlags [O] Destination for function status information * @@ -167,7 +167,7 @@ INT WINAPI SetServiceW(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE * dwNameSpace [I] Name space or set of name spaces within which the function * will operate. * lpGuid [I] Pointer to GUID of network service type. - * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name + * lpServiceName [I] NUL-terminated ANSI string that uniquely represents the name * of the service. * dwProperties [I] Flags specifying which information to return in lpBuffer. * lpBuffer [O] Pointer to buffer where the function returns an array -- 2.20.1

1 0

[PATCH] msvcrt/tests: Remove redundant NULL check before free()
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 80eab3364ba..15105ca60dd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1101,8 +1101,7 @@ static void test_demangle_datatype(void) name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - if(name) - free(name); + free(name); } } -- 2.31.1

2 1

[PATCH v2 1/3] winhttp: Factor out query_data_ready() function.
by Paul Gofman 26 Aug '21

26 Aug '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- winhttp functions (in particular, WinHttpQueryDataAvailable and WinHttpReadData) can execute synchronously if the data is available. This is the documented behaviour which is also confirmed by the tests. 'eFootball PES 2021 Season Update' depends on this behaviour. It creates asynchronous session but then breaks in various ways if WinHttpReadData() actually queues the async task. The game always calls WinHttpQueryDataAvailable() first and then WinHttpReadData with the read size equal to the available data, so that the read is always synchronous on Windows. dlls/winhttp/request.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a6c16d7b653..b8f5817737e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2815,19 +2815,26 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return !ret; } +static DWORD query_data_ready( struct request *request ) +{ + DWORD count; + + count = get_available_data( request ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + + return count; +} + static DWORD query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD ret = ERROR_SUCCESS, count = 0; if (end_of_read_data( request )) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); - if (!count) + if (!(count = query_data_ready( request ))) { if ((ret = refill_buffer( request, async ))) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + count = query_data_ready( request ); } done: -- 2.31.1

3 7

[PATCH 3/3] user32/tests: Add a helper to initialize function pointers.
by Zhiyi Zhang 26 Aug '21

26 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 57 +++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 89a524407bf..9b9dfe4f089 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -4128,6 +4128,39 @@ static void test_GetAutoRotationState(void) ok(ret, "Expected GetAutoRotationState to succeed, error %d\n", GetLastError()); } +static void init_function_pointers(void) +{ + HMODULE user32 = GetModuleHandleA("user32.dll"); + +#define GET_PROC(module, func) \ + p##func = (void *)GetProcAddress(module, #func); \ + if (!p##func) \ + trace("GetProcAddress(%s, %s) failed.\n", #module, #func); + + GET_PROC(user32, AdjustWindowRectExForDpi) + GET_PROC(user32, ChangeDisplaySettingsExA) + GET_PROC(user32, GetAutoRotationState) + GET_PROC(user32, GetAwarenessFromDpiAwarenessContext) + GET_PROC(user32, GetDpiForMonitorInternal) + GET_PROC(user32, GetDpiForSystem) + GET_PROC(user32, GetDpiForWindow) + GET_PROC(user32, GetProcessDpiAwarenessInternal) + GET_PROC(user32, GetSystemMetricsForDpi) + GET_PROC(user32, GetThreadDpiAwarenessContext) + GET_PROC(user32, GetWindowDpiAwarenessContext) + GET_PROC(user32, IsProcessDPIAware) + GET_PROC(user32, IsValidDpiAwarenessContext) + GET_PROC(user32, LogicalToPhysicalPointForPerMonitorDPI) + GET_PROC(user32, PhysicalToLogicalPointForPerMonitorDPI) + GET_PROC(user32, SetProcessDPIAware) + GET_PROC(user32, SetProcessDpiAwarenessContext) + GET_PROC(user32, SetProcessDpiAwarenessInternal) + GET_PROC(user32, SetThreadDpiAwarenessContext) + GET_PROC(user32, SystemParametersInfoForDpi) + +#undef GET_PROC +} + START_TEST(sysparams) { int argc; @@ -4137,29 +4170,9 @@ START_TEST(sysparams) HDC hdc; HANDLE hThread; DWORD dwThreadId; - HANDLE hInstance, hdll; + HANDLE hInstance; - hdll = GetModuleHandleA("user32.dll"); - pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); - pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware"); - pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); - pGetDpiForSystem = (void*)GetProcAddress(hdll, "GetDpiForSystem"); - pGetDpiForWindow = (void*)GetProcAddress(hdll, "GetDpiForWindow"); - pGetDpiForMonitorInternal = (void*)GetProcAddress(hdll, "GetDpiForMonitorInternal"); - pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext"); - pGetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "GetProcessDpiAwarenessInternal"); - pSetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessInternal"); - pGetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetThreadDpiAwarenessContext"); - pSetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetThreadDpiAwarenessContext"); - pGetWindowDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetWindowDpiAwarenessContext"); - pGetAwarenessFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetAwarenessFromDpiAwarenessContext"); - pIsValidDpiAwarenessContext = (void*)GetProcAddress(hdll, "IsValidDpiAwarenessContext"); - pGetSystemMetricsForDpi = (void*)GetProcAddress(hdll, "GetSystemMetricsForDpi"); - pSystemParametersInfoForDpi = (void*)GetProcAddress(hdll, "SystemParametersInfoForDpi"); - pAdjustWindowRectExForDpi = (void*)GetProcAddress(hdll, "AdjustWindowRectExForDpi"); - pLogicalToPhysicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "LogicalToPhysicalPointForPerMonitorDPI"); - pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI"); - pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState"); + init_function_pointers(); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); -- 2.30.2

2 1

[PATCH 7/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthI.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 67 ++++++++++++++++------------------------------- dlls/gdi32/text.c | 10 +++++++ 2 files changed, 33 insertions(+), 44 deletions(-)

1 0

[PATCH 6/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatA.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 26 -------------------------- dlls/gdi32/text.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 26 deletions(-)

1 0

[PATCH 5/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatW.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 50 ++++++++++++----------------------------------- dlls/gdi32/text.c | 8 ++++++++ 2 files changed, 21 insertions(+), 37 deletions(-)

1 0

[PATCH 3/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidth.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 45 +++-------------------- dlls/gdi32/text.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 6 ++- 3 files changed, 103 insertions(+), 41 deletions(-)

1 0

[PATCH 2/7] gdi32/tests: Use winetest_debug to silence noisy traces.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0