May 2020 - Wine-devel - list.winehq.org

[PATCH v2 2/3] api-ms-win-shcore-obsolete-l1-1-0: Is win32 only.
by Serge Gautherie 19 May '20

19 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://testbot.winehq.org/JobDetails.pl?Key=71898 --- .../api-ms-win-shcore-obsolete-l1-1-0.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec index edb8143..b162037 100644 --- a/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec +++ b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stdcall CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW -@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA -@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW +@ stdcall -arch=win32 CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW +@ stdcall -arch=win32 SHStrDupA(str ptr) shcore.SHStrDupA +@ stdcall -arch=win32 SHStrDupW(wstr ptr) shcore.SHStrDupW -- 2.10.0.windows.1

1 0

[PATCH] configure: Use cross compiler for EXCESS_PRECISION_CFLAGS check when available.
by Jacek Caban 19 May '20

19 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- In my case, -fexcess-precision=standard was found supported by my default native default compiler (GCC), but later used on clang cross compiler causing a warning. configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH resend 1/2] winex11.drv: Use a helper to retrieve the decoration rect for managed windows.
by Gabriel Ivăncescu 19 May '20

19 May '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This simplifies the next patch and avoids duplicating code. dlls/winex11.drv/window.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d6873ce..595c54a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1154,19 +1154,16 @@ void make_window_embedded( struct x11drv_win_data *data ) /*********************************************************************** - * X11DRV_window_to_X_rect - * - * Convert a rect from client to X window coordinates + * get_decoration_rect */ -static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, - const RECT *window_rect, const RECT *client_rect ) +static void get_decoration_rect( struct x11drv_win_data *data, RECT *rect, + const RECT *window_rect, const RECT *client_rect ) { DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; unsigned long decor; - RECT rc; + SetRectEmpty( rect ); if (!data->managed) return; - if (IsRectEmpty( rect )) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); @@ -1179,9 +1176,23 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, ex_style_mask |= WS_EX_DLGMODALFRAME; } - SetRectEmpty( &rc ); - AdjustWindowRectEx( &rc, style & style_mask, FALSE, ex_style & ex_style_mask ); + AdjustWindowRectEx( rect, style & style_mask, FALSE, ex_style & ex_style_mask ); +} + + +/*********************************************************************** + * X11DRV_window_to_X_rect + * + * Convert a rect from client to X window coordinates + */ +static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, + const RECT *window_rect, const RECT *client_rect ) +{ + RECT rc; + + if (IsRectEmpty( rect )) return; + get_decoration_rect( data, &rc, window_rect, client_rect ); rect->left -= rc.left; rect->right -= rc.right; rect->top -= rc.top; -- 2.21.0

1 1

[PATCH] ucrtbase: Add remaining _o_* functions forwards.
by Piotr Caban 19 May '20

19 May '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 1290 ++++++++-------- dlls/ucrtbase/ucrtbase.spec | 1292 ++++++++--------- 3 files changed, 1292 insertions(+), 1292 deletions(-)

1 0

Patch to fix HOTAS / button/axis limit problems
by Cláudio Sampaio 19 May '20

19 May '20

Hi all, I am a heavy user of wine and proton for games and for some time the failures some games had with my HOTAS (Hands On Throttle-And-Stick) have been bothering me. I tried to take a look at wine code and found out that the maximum numbers of buttons for a single device was hardwired to 32 and the maximum number of analog axes was hardwired to 4 pairs (8 axes). My own HOTAS, a very common Logitech X52 Pro, has a bigger number of buttons -- 39, so the higher buttons would "carry over" to register like they were lower buttons -- and this prevented it from working on games. I increased these hardwired numbers to 64 and 8 respectively, and the patch seems to have largely worked on all games I used it -- for example, I am only able to play Elite: Dangerous with my patched proton version. However, there have been some problems, like a few sliders not working -- slider 7 (you could check the numbering of axes with a program like antimicro on Linux) does not seem to register in Star Citizen, for example. I noticed from joystick.c that the analog axes seem to have specific names and functionality, like DIJOFS_RX and DIJOFS_SLIDER, and if I understood what's going on, it might prevent the code to work generally with obscure devices that have a couple number of sliders, is that correct? How could I get the code to recognize and translate my axes to games? Also, for this patch to be complete I will also need to change the GUI for testing joystick via "wine control", and I do not have much experience with Windows programming. Any help would be welcome. I have also described the problem on this forum post: https://forum.winehq.org/viewtopic.php?f=2&t=33615&p=126895#p126895 And the bug report for it at https://bugs.winehq.org/show_bug.cgi?id=48799 And I have also talked about it on gamingonlinux: https://www.gamingonlinux.com/forum/topic/4330 This patch has around 50 to 60 hours of testing. -- Cláudio "Patola" Sampaio MakerLinux Labs - Campinas, SP Resume <https://github.com/Patola/resume> Gmail <patola(a)gmail.com> - MakerLinux <patola(a)makerlinux.com.br> - YOUTUBE <https://www.youtube.com/user/makerlinux>! Facebook <https://www.facebook.com/patolinux> - Facebook da MakerLinux <https://www.facebook.com/makerlinux> - Lattes <http://buscatextual.cnpq.br/buscatextual/visualizacv.do?id=K4763932Z5>

2 2

[PATCH 1/2] ws2_32: Set WSAEINVAL in InetPtonW if the address string is unparsable
by Alex Henrie 19 May '20

19 May '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a5df51d421..d57fc9ecd2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8450,6 +8450,7 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) WideCharToMultiByte(CP_ACP, 0, addr, -1, addrA, len, NULL, NULL); ret = WS_inet_pton(family, addrA, buffer); + if (!ret) SetLastError(WSAEINVAL); HeapFree(GetProcessHeap(), 0, addrA); return ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9c996037ce..dcbc9377d7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5014,11 +5014,11 @@ static void test_inet_pton(void) WSASetLastError(0xdeadbeef); ret = pInetPtonA(tests[i].family, tests[i].printable, buffer); ok (ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); + err = WSAGetLastError(); if (tests[i].ret == -1) - { - err = WSAGetLastError(); ok (tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); - } + else + ok (err == 0xdeadbeef, "Test [%d]: Expected 0xdeadbeef, got 0x%x\n", i, tests[i].err, err); if (tests[i].ret != 1) continue; ok (memcmp(buffer, tests[i].raw_data, tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, @@ -5041,11 +5041,14 @@ static void test_inet_pton(void) WSASetLastError(0xdeadbeef); ret = pInetPtonW(tests[i].family, tests[i].printable ? printableW : NULL, buffer); ok(ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); + err = WSAGetLastError(); if (tests[i].ret == -1) - { - err = WSAGetLastError(); ok(tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); - } + else if (tests[i].ret == 0) + ok(err == WSAEINVAL || broken(err == 0xdeadbeef) /* win2008 */, + "Test [%d]: Expected WSAEINVAL, got 0x%x\n", i, err); + else + ok(err == 0xdeadbeef, "Test [%d]: Expected 0xdeadbeef, got 0x%x\n", i, err); if (tests[i].ret != 1) continue; ok(memcmp(buffer, tests[i].raw_data, tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, -- 2.26.2

2 3

[PATCH v2 2/2] ws2_32: Reimplement inet_pton on top of ntdll functions
by Alex Henrie 19 May '20

19 May '20

And add a test to show that inet_pton does not accept hexadecimal IPv4 addresses, and another test to demonstrate that it has the same leading double colon bug as RtlIpv6StringToAddress. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Put the break statements back in that I took out while tweaking this patch and failed to put back in before sending --- configure.ac | 1 - dlls/ws2_32/socket.c | 25 ++++++++++++------------- dlls/ws2_32/tests/sock.c | 6 +++++- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index b7916fcca7..8ddeb0710a 100644 --- a/configure.ac +++ b/configure.ac @@ -2247,7 +2247,6 @@ AC_CHECK_FUNCS(\ inet_addr \ inet_network \ inet_ntop \ - inet_pton \ ) dnl Check for clock_gettime which may be in -lrt diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d57fc9ecd2..8e66ab8fec 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8394,10 +8394,10 @@ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) /*********************************************************************** * inet_pton (WS2_32.@) */ -INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) +INT WINAPI WS_inet_pton(INT family, const char *addr, void *buffer) { -#ifdef HAVE_INET_PTON - int unixaf, ret; + NTSTATUS status; + const char *terminator; TRACE("family %d, addr %s, buffer (%p)\n", family, debugstr_a(addr), buffer); @@ -8407,21 +8407,20 @@ INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) return SOCKET_ERROR; } - unixaf = convert_af_w2u(family); - if (unixaf != AF_INET && unixaf != AF_INET6) + switch (family) { + case WS_AF_INET: + status = RtlIpv4StringToAddressA(addr, TRUE, &terminator, buffer); + break; + case WS_AF_INET6: + status = RtlIpv6StringToAddressA(addr, &terminator, buffer); + break; + default: SetLastError(WSAEAFNOSUPPORT); return SOCKET_ERROR; } - ret = inet_pton(unixaf, addr, buffer); - if (ret == -1) SetLastError(wsaErrno()); - return ret; -#else - FIXME( "not supported on this platform\n" ); - SetLastError( WSAEAFNOSUPPORT ); - return SOCKET_ERROR; -#endif + return (status == STATUS_SUCCESS && *terminator == 0); } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dcbc9377d7..edf184f908 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4993,7 +4993,11 @@ static void test_inet_pton(void) "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, {AF_INET6, 1, 0, "2001:cdba:0:0:0:0:3257:9652", "2001:cdba::3257:9652", - "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"} + "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, + {AF_INET, 0, 0, + "0x12345678", NULL, NULL}, + {AF_INET6, 0, 0, /* windows bug */ + "::1:2:3:4:5:6:7", NULL, NULL}, }; int i, ret; DWORD err; -- 2.26.2

1 0

[PATCH 3/3] api-ms-win-downlevel-shlwapi-l2-1-0.spec: SHStrDupW is win32 only
by Serge Gautherie 18 May '20

18 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://testbot.winehq.org/JobDetails.pl?Key=71899 --- .../api-ms-win-downlevel-shlwapi-l2-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec index 11c33f8..080fa99 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec @@ -51,6 +51,6 @@ @ stdcall SHSetThreadRef(ptr) shlwapi.SHSetThreadRef @ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA @ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW -@ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW +@ stdcall -arch=win32 SHStrDupW(wstr ptr) shlwapi.SHStrDupW @ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi @ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode -- 2.10.0.windows.1

1 0

[PATCH 2/3] api-ms-win-shcore-obsolete-l1-1-0: is win32 only
by Serge Gautherie 18 May '20

18 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://testbot.winehq.org/JobDetails.pl?Key=71898 --- .../api-ms-win-shcore-obsolete-l1-1-0.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec index edb8143..b162037 100644 --- a/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec +++ b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stdcall CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW -@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA -@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW +@ stdcall -arch=win32 CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW +@ stdcall -arch=win32 SHStrDupA(str ptr) shcore.SHStrDupA +@ stdcall -arch=win32 SHStrDupW(wstr ptr) shcore.SHStrDupW -- 2.10.0.windows.1

1 0

[PATCH 1/3] api-ms-win-downlevel-shell32-l1-1-0: is win32 only
by Serge Gautherie 18 May '20

18 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://testbot.winehq.org/JobDetails.pl?Key=71897 --- .../api-ms-win-downlevel-shell32-l1-1-0.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec index 9d03c03..72e51bc 100644 --- a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW -@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID -@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID +@ stdcall -arch=win32 CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW +@ stdcall -arch=win32 GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID +@ stdcall -arch=win32 SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID -- 2.10.0.windows.1

1 0