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

Józef Kucia : include: Move debug interfaces to vkd3d_d3d12sdklayers.h.
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: vkd3d Branch: master Commit: 332b250e82a16bd1f5d6eec7659a834604452ec2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=332b250e82a16bd1f5d6eec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 1 18:10:58 2019 +0200 include: Move debug interfaces to vkd3d_d3d12sdklayers.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ include/.gitignore | 1 + include/vkd3d_d3d12.idl | 24 ---------------------- include/vkd3d_d3d12sdklayers.idl | 43 ++++++++++++++++++++++++++++++++++++++++ tests/d3d12_crosstest.h | 1 + 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe3a363..2b0e8f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ AM_LDFLAGS = -no-undefined widl_headers = \ include/vkd3d_d3d12.h \ + include/vkd3d_d3d12sdklayers.h \ include/vkd3d_d3dcommon.h \ include/vkd3d_dxgi.h \ include/vkd3d_dxgi1_2.h \ @@ -17,6 +18,7 @@ widl_headers = \ vkd3d_public_headers = \ include/vkd3d.h \ include/vkd3d_d3d12.h \ + include/vkd3d_d3d12sdklayers.h \ include/vkd3d_d3dcommon.h \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ diff --git a/include/.gitignore b/include/.gitignore index d21fd99..7ed2b78 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -2,6 +2,7 @@ config.h config.h.in stamp-h1 vkd3d_d3d12.h +vkd3d_d3d12sdklayers.h vkd3d_d3dcommon.h vkd3d_dxgi.h vkd3d_dxgi1_2.h diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 067db8d..8489f56 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2319,30 +2319,6 @@ interface ID3D12Device1 : ID3D12Device } [ - uuid(344488b7-6846-474b-b989-f027448245e0), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug : IUnknown -{ - void EnableDebugLayer(); -} - -[ - uuid(affaa4ca-63fe-4d8e-b8ad-159000af4304), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug1 : IUnknown -{ - void EnableDebugLayer(); - void SetEnableGPUBasedValidation(BOOL enable); - void SetEnableSynchronizedCommandQueueValidation(BOOL enable); -} - -[ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, local, diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl new file mode 100644 index 0000000..7663462 --- /dev/null +++ b/include/vkd3d_d3d12sdklayers.idl @@ -0,0 +1,43 @@ +/* + * Copyright 2016-2019 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "vkd3d_d3d12.idl"; + +[ + uuid(344488b7-6846-474b-b989-f027448245e0), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug : IUnknown +{ + void EnableDebugLayer(); +} + +[ + uuid(affaa4ca-63fe-4d8e-b8ad-159000af4304), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug1 : IUnknown +{ + void EnableDebugLayer(); + void SetEnableGPUBasedValidation(BOOL enable); + void SetEnableSynchronizedCommandQueueValidation(BOOL enable); +} diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 1f7e764..7b59471 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -45,6 +45,7 @@ typedef int HRESULT; #include "vkd3d_windows.h" #define WIDL_C_INLINE_WRAPPERS #include "vkd3d_d3d12.h" +#include "vkd3d_d3d12sdklayers.h" #include <inttypes.h> #include <limits.h>

1 0

Julian Rüger : German translation for release 4.12.
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: website Branch: master Commit: f5d355c73f3f416ca233e45d92b5bd200ae3aa61 URL: https://source.winehq.org/git/website.git/?a=commit;h=f5d355c73f3f416ca233e… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jul 8 12:34:29 2019 +0200 German translation for release 4.12. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019070501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2019070501.xml b/news/de/2019070501.xml new file mode 100644 index 0000000..91e3f28 --- /dev/null +++ b/news/de/2019070501.xml @@ -0,0 +1,16 @@ +<news> +<date>5. Juli 2019</date> +<title>Wine 4.12 freigegeben</title> +<body> + Die Entwicklungsversion 4.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere DLLs werden standardmäßig als PE-Dateien übersetzt.</li> + <li>Unterstützung von Plug&Play-Gerätetreibern.</li> + <li>Bessere Unterstützung des Visual-Studio-Remote-Debuggers.</li> + <li>Weitere Unterstützung für das Enumerieren von Anzeigegeräten.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.12.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.12.1.
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: website Branch: master Commit: 306f8a39bbbb7811e56c6d1386855037865913a3 URL: https://source.winehq.org/git/website.git/?a=commit;h=306f8a39bbbb7811e56c6… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jul 8 12:35:32 2019 +0200 German translation for release 4.12.1. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019070701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2019070701.xml b/news/de/2019070701.xml new file mode 100644 index 0000000..5a47663 --- /dev/null +++ b/news/de/2019070701.xml @@ -0,0 +1,12 @@ +<news> +<date>7. Juli 2019</date> +<title>Wine 4.12.1 freigegeben</title> +<body> + Die Entwicklungsversion 4.12.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.12.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Korrektur der fehlerhaften Prefix-Initialisierung unter 64-Bit.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.12.1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot: Rerun make_vulkan when it is patched.
by Alexandre Julliard Aug. 2, 2019

Aug. 2, 2019

Module: tools Branch: master Commit: 69df3676114def9e457775cf9a79d78fef0abc83 URL: https://source.winehq.org/git/tools.git/?a=commit;h=69df3676114def9e457775c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 30 00:20:40 2019 +0200 testbot: Rerun make_vulkan when it is patched. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 254c762..61b47a7 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -125,6 +125,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeVulkan}) + { + InfoMsg "\nRunning make_vulkan\n"; + system("cd '$DataDir/$Dir' && set -x && ./dlls/winevulkan/make_vulkan"); + if ($? != 0) + { + LogMsg "make_vulkan failed\n"; + return undef; + } + } if ($Impacts->{MakeMakefiles}) { diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index f72cef5..d96b14a 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -325,6 +325,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new"; @@ -370,7 +375,8 @@ sub GetPatchImpacts($) # Also backup the build-related fields. foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests", - "PatchedRoot", "PatchedModules", "PatchedTests") + "MakeVulkan", "PatchedRoot", "PatchedModules", + "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -464,6 +470,7 @@ sub GetPatchImpacts($) $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; $Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests}; + $Impacts->{MakeVulkan} ||= $PastImpacts->{MakeVulkan}; $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};

1 0

Martin Storsjo : msvcrt: Provide the fmaf function on i386.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: dec4c99ae7d62cc2ceb98c4f60ec05ec2072a3c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec4c99ae7d62cc2ceb98c4f… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 31 00:08:49 2019 +0300 msvcrt: Provide the fmaf function on i386. This is one of the new -f suffixed C99 math functions that actually are available on all architectures, even on i386. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 32 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 3a5991f..bc281ca 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -242,7 +242,7 @@ @ cdecl floor(double) ucrtbase.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf @ cdecl fma(double double double) ucrtbase.fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) ucrtbase.fmaf +@ cdecl fmaf(float float float) ucrtbase.fmaf @ stub fmal @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9707211..dc887b7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2165,7 +2165,7 @@ @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf +@ cdecl fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9b7727e..c56d1a9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1831,7 +1831,7 @@ @ cdecl floor(double) msvcr120.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf @ cdecl fma(double double double) msvcr120.fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) msvcr120.fmaf +@ cdecl fmaf(float float float) msvcr120.fmaf @ stub fmal @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 63744e3..c29539e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -388,22 +388,6 @@ float CDECL MSVCRT_floorf( float x ) } /********************************************************************* - * fmaf (MSVCRT.@) - */ -float CDECL MSVCRT_fmaf( float x, float y, float z ) -{ -#ifdef HAVE_FMAF - float w = fmaf(x, y, z); -#else - float w = x * y + z; -#endif - if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; - else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; - else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; - return w; -} - -/********************************************************************* * frexpf (MSVCRT.@) */ float CDECL MSVCRT_frexpf( float x, int *exp ) @@ -896,6 +880,22 @@ double CDECL MSVCRT_fma( double x, double y, double z ) } /********************************************************************* + * fmaf (MSVCRT.@) + */ +float CDECL MSVCRT_fmaf( float x, float y, float z ) +{ +#ifdef HAVE_FMAF + float w = fmaf(x, y, z); +#else + float w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + +/********************************************************************* * fabs (MSVCRT.@) */ double CDECL MSVCRT_fabs( double x ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 567f200..e290c14 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2306,7 +2306,7 @@ @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf +@ cdecl fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf

1 0

Damjan Jovanovic : ws2_32: Implement IP_PKTINFO on *BSDs, which only have IP_RECVDSTADDR instead.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 0645e6c959a8b9e32387101fbe5b9f14d5a31807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0645e6c959a8b9e32387101f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Aug 1 06:11:28 2019 +0200 ws2_32: Implement IP_PKTINFO on *BSDs, which only have IP_RECVDSTADDR instead. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a3c3780..0034787 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -698,8 +698,10 @@ static const int ws_ip_map[][2] = #endif MAP_OPTION( IP_TOS ), MAP_OPTION( IP_TTL ), -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) MAP_OPTION( IP_PKTINFO ), +#elif defined(IP_RECVDSTADDR) + { WS_IP_PKTINFO, IP_RECVDSTADDR }, #endif #ifdef IP_UNICAST_IF MAP_OPTION( IP_UNICAST_IF ), @@ -819,7 +821,7 @@ static const int ws_poll_map[][2] = static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR *current, ULONG *maxsize, void *data, int len) { ULONG msgsize = sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(len); @@ -837,11 +839,11 @@ static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR * /* Return the pointer to where next entry should go */ return (WSACMSGHDR *) (ptr + WSA_CMSG_ALIGN(len)); } -#endif /* IP_PKTINFO */ +#endif /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) { -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) WSACMSGHDR *cmsg_win = (WSACMSGHDR *) control->buf, *ptr; ULONG ctlsize = control->len; struct cmsghdr *cmsg_unix; @@ -855,6 +857,7 @@ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) case IPPROTO_IP: switch(cmsg_unix->cmsg_type) { +#if defined(IP_PKTINFO) case IP_PKTINFO: { /* Convert the Unix IP_PKTINFO structure to the Windows version */ @@ -867,6 +870,19 @@ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) (void*)&data_win, sizeof(data_win)); if (!ptr) goto error; } break; +#elif defined(IP_RECVDSTADDR) + case IP_RECVDSTADDR: + { + struct in_addr *addr_unix = (struct in_addr *) CMSG_DATA(cmsg_unix); + struct WS_in_pktinfo data_win; + + memcpy(&data_win.ipi_addr, &addr_unix->s_addr, 4); /* 4 bytes = 32 address bits */ + data_win.ipi_ifindex = 0; /* FIXME */ + ptr = fill_control_message(WS_IPPROTO_IP, WS_IP_PKTINFO, ptr, &ctlsize, + (void*)&data_win, sizeof(data_win)); + if (!ptr) goto error; + } break; +#endif /* IP_PKTINFO */ default: FIXME("Unhandled IPPROTO_IP message header type %d\n", cmsg_unix->cmsg_type); break; @@ -884,10 +900,10 @@ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) error: control->len = 0; return 0; -#else /* IP_PKTINFO */ +#else /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ control->len = 0; return 1; -#endif /* IP_PKTINFO */ +#endif /* defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) */ } #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ @@ -4310,7 +4326,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: case WS_IP_OPTIONS: -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) case WS_IP_PKTINFO: #endif case WS_IP_TOS: @@ -5998,7 +6014,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: case WS_IP_OPTIONS: -#ifdef IP_PKTINFO +#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) case WS_IP_PKTINFO: #endif case WS_IP_TOS:

1 0

Damjan Jovanovic : ws2_32: WSARecvMsg allows a NULL control buffer when no control messages arrive.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: aa2c84a9db064a16598c4198c435e2e5896dd059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2c84a9db064a16598c4198… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Aug 1 06:11:21 2019 +0200 ws2_32: WSARecvMsg allows a NULL control buffer when no control messages arrive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43286 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 +++++--- dlls/ws2_32/tests/sock.c | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3b78f0d..a3c3780 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -878,10 +878,12 @@ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) } } -error: /* Set the length of the returned control headers */ - control->len = (ptr == NULL ? 0 : (char*)ptr - (char*)cmsg_win); - return (ptr != NULL); + control->len = (char*)ptr - (char*)cmsg_win; + return 1; +error: + control->len = 0; + return 0; #else /* IP_PKTINFO */ control->len = 0; return 1; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0c7f736..03f4e68 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2108,8 +2108,6 @@ static void test_ip_pktinfo(void) /* Setup the server side socket */ rc=bind(s1, (struct sockaddr*)&s1addr, sizeof(s1addr)); ok(rc != SOCKET_ERROR, "bind() failed error: %d\n", WSAGetLastError()); - rc=setsockopt(s1, IPPROTO_IP, IP_PKTINFO, (const char*)&yes, sizeof(yes)); - ok(rc == 0, "failed to set IPPROTO_IP flag IP_PKTINFO!\n"); /* Build "client" side socket */ addrlen = sizeof(s2addr); @@ -2133,6 +2131,21 @@ static void test_ip_pktinfo(void) err=WSAGetLastError(); ok(rc == SOCKET_ERROR && err == WSAEFAULT, "WSARecvMsg() failed error: %d (ret = %d)\n", err, rc); + /* Test that when no control data arrives, a 0-length NULL-valued control buffer should succeed */ + SetLastError(0xdeadbeef); + rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); + ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + hdr.Control.buf = NULL; + hdr.Control.len = 0; + rc=pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); + ok(rc == 0, "WSARecvMsg() failed error: %d\n", WSAGetLastError()); + hdr.Control.buf = pktbuf; + + /* Now start IP_PKTINFO for future tests */ + rc=setsockopt(s1, IPPROTO_IP, IP_PKTINFO, (const char*)&yes, sizeof(yes)); + ok(rc == 0, "failed to set IPPROTO_IP flag IP_PKTINFO!\n"); + /* * Send a packet from the client to the server and test for specifying * a short control header.

1 0

Alistair Leslie-Hughes : include: Added missing ComboBox_* defines.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 6bd804a4591335c101003072baa248a81928b240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bd804a4591335c101003072… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 06:21:13 2019 +0000 include: Added missing ComboBox_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index f21d930..77b22b4 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5295,6 +5295,10 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 }; ((INT)SNDMSG((hwnd), CB_GETMINVISIBLE, 0, 0)) #define ComboBox_SetMinVisible(hwnd, count) \ ((BOOL)SNDMSG((hwnd), CB_SETMINVISIBLE, (WPARAM)(count), 0)) +#define ComboBox_SetCueBannerText(hwnd, text) \ + ((BOOL)SNDMSG((hwnd), CB_SETCUEBANNER, 0, (LPARAM)(text))) +#define ComboBox_GetCueBannerText(hwnd, text, cnt) \ + ((BOOL)SNDMSG((hwnd), CB_GETCUEBANNER, (WPARAM)(text), (LPARAM)(cnt))) /************************************************************************** * Edit control

1 0

Alistair Leslie-Hughes : include: Added missing MonthCal_* defines.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: c388eec1a93098b2efe3e8522a05b52aee445be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c388eec1a93098b2efe3e852… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:29:03 2019 +0000 include: Added missing MonthCal_* defines. Also defines struct MCGRIDINFO need for #defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index d8ba974..0f0d83c 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4790,6 +4790,11 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', #define GMR_VISIBLE 0 #define GMR_DAYSTATE 1 +#define MCMV_MONTH 0 +#define MCMV_YEAR 1 +#define MCMV_DECADE 2 +#define MCMV_CENTURY 3 +#define MCMV_MAX MCMV_CENTURY /* Month calendar's structures */ @@ -4826,6 +4831,21 @@ typedef struct tagNMDAYSTATE LPMONTHDAYSTATE prgDayState; } NMDAYSTATE, *LPNMDAYSTATE; +typedef struct tagMCGRIDINFO +{ + UINT cbSize; + DWORD dwPart; + DWORD dwFlags; + INT iCalendar; + INT iRow; + INT iCol; + BOOL bSelected; + SYSTEMTIME stStart; + SYSTEMTIME stEnd; + RECT rc; + WCHAR *pszName; + SIZE_T cchName; +} MCGRIDINFO, *PMCGRIDINFO; /* macros */ @@ -4875,7 +4895,24 @@ typedef struct tagNMDAYSTATE (BOOL)SNDMSG((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define MonthCal_GetUnicodeFormat(hwnd) \ (BOOL)SNDMSG((hwnd), MCM_GETUNICODEFORMAT, 0, 0) - +#define MonthCal_SetCALID(hmc, calid) \ + SNDMSG(hmc, MCM_SETCALID, (WPARAM)(calid), 0) +#define MonthCal_GetCALID(hmc) \ + (CALID)SNDMSG(hmc, MCM_GETCALID, 0, 0) +#define MonthCal_GetCalendarCount(hmc) \ + (DWORD)SNDMSG(hmc, MCM_GETCALENDARCOUNT, 0, 0) +#define MonthCal_GetCurrentView(hmc) \ + (DWORD)SNDMSG(hmc, MCM_GETCURRENTVIEW, 0, 0) +#define MonthCal_SetCurrentView(hmc, view) \ + (BOOL)SNDMSG(hmc, MCM_SETCURRENTVIEW, 0, (LPARAM)view) +#define MonthCal_SizeRectToMin(hmc, prc) \ + SNDMSG(hmc, MCM_SIZERECTTOMIN, 0, (LPARAM)prc) +#define MonthCal_GetCalendarBorder(hmc) \ + (INT)SNDMSG(hmc, MCM_GETCALENDARBORDER, 0, 0) +#define MonthCal_SetCalendarBorder(hmc, reset, xy) \ + SNDMSG(hmc, MCM_SETCALENDARBORDER, (WPARAM)reset, (LPARAM)xy) +#define MonthCal_GetCalendarGridInfo(hmc, info) \ + (BOOL)SNDMSG(hmc, MCM_GETCALENDARGRIDINFO, 0, (LPARAM)(PMCGRIDINFO)info) /************************************************************************** * Date and time picker control

1 0

Gijs Vermeulen : wmp: Return E_POINTER when p is NULL in return_bstr.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: bf3d719d08c38e1c9e215f37ac03fe53b88380b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3d719d08c38e1c9e215f37… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 15:07:56 2019 +0200 wmp: Return E_POINTER when p is NULL in return_bstr. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/media.c | 1 - dlls/wmp/wmp_private.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 3d750e1..7e76aee 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -535,7 +535,6 @@ static void test_media_item(void) hr = IWMPPlayer4_newMedia(player, NULL, &media); ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); hr = IWMPMedia_get_name(media, NULL); -todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 5149d73..0b1b023 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -135,7 +135,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) { if(!p) - return E_INVALIDARG; + return E_POINTER; if(value) { *p = SysAllocString(value);

1 0