December 2020 - Wine-commits

Francois Gouget : ws2_32/tests: Skip some raw socket tests when missing elevated privileges.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: 948e08152bbe12c511526e2515bd11b5da4e78fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=948e08152bbe12c511526e25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 14 15:45:46 2020 +0100 ws2_32/tests: Skip some raw socket tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2d69a05aec5..8711b65fcea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2551,29 +2551,35 @@ static void test_WSASocket(void) SOCK_RAW, socktype); closesocket(sock); - todo_wine { sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); + if (sock != INVALID_SOCKET) + { + todo_wine { + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); } + else if (WSAGetLastError() == WSAEACCES) + skip("SOCK_RAW is not available\n"); + else + ok(0, "Failed to create socket: %d\n", WSAGetLastError()); - sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); } /* IPX socket tests */

1 0

Julian Rüger : German translation for release 6.0-rc2.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: website Branch: master Commit: f91aabaea2ef1487ac3514af219c2e5925b83d96 URL: https://source.winehq.org/git/website.git/?a=commit;h=f91aabaea2ef1487ac351… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Dec 14 11:21:42 2020 +0100 German translation for release 6.0-rc2. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020121101.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2020121101.xml b/news/de/2020121101.xml new file mode 100644 index 00000000..2fb14788 --- /dev/null +++ b/news/de/2020121101.xml @@ -0,0 +1,12 @@ +<news> +<date>11. December 2020</date> +<title>Wine 6.0-rc2 freigegeben</title> +<body> +Die Entwicklungsversion 6.0-rc2 von Wine ist jetzt verfügbar. +<a href="{$root}/announce/6.0-rc2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc2.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

Alexandre Julliard : Wine release 6.0-rc2
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: website Branch: master Commit: 91dfe6a89fa18de0466f3680eea0bcb1dd4c7d65 URL: https://source.winehq.org/git/website.git/?a=commit;h=91dfe6a89fa18de0466f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 22:08:30 2020 +0100 Wine release 6.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020121101.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020121101.xml b/news/en/2020121101.xml new file mode 100644 index 00000000..1fd4e111 --- /dev/null +++ b/news/en/2020121101.xml @@ -0,0 +1,12 @@ +<news> +<date>December 11, 2020</date> +<title>Wine 6.0-rc2 Released</title> +<body> + The Wine development release 6.0-rc2 is now available. + <a href="{$root}/announce/6.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : configure: Get rid of some removed files in the install target.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: bd3757022d3ac0e46f6494f7568f90336b03420e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd3757022d3ac0e46f6494f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 15:05:56 2020 +0100 configure: Get rid of some removed files in the install target. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 3 --- 2 files changed, 6 deletions(-) diff --git a/configure b/configure index c6d2bab49f5..8b067ad66dd 100755 --- a/configure +++ b/configure @@ -21157,9 +21157,6 @@ else TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ fonts \ loader/wine.inf \ -loader/winebus.inf \ -loader/winehid.inf \ -loader/wineusb.inf \ nls \ programs/msidb/msidb \ programs/msiexec/msiexec \ diff --git a/configure.ac b/configure.ac index 85ba522a951..a53080de944 100644 --- a/configure.ac +++ b/configure.ac @@ -4105,9 +4105,6 @@ else TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ fonts \ loader/wine.inf \ -loader/winebus.inf \ -loader/winehid.inf \ -loader/wineusb.inf \ nls \ programs/msidb/msidb \ programs/msiexec/msiexec \

1 0

Alexandre Julliard : makefiles: Add support for Automake-style silent make rules.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: 1a16b9e9aa9a3ea1d0b5adbfa5fb6c83d99a06bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a16b9e9aa9a3ea1d0b5adbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 16:05:45 2020 +0100 makefiles: Add support for Automake-style silent make rules. Based on a patch by Jeff Smith. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49841 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- configure | 14 ++++++- configure.ac | 8 +++- tools/makedep.c | 120 ++++++++++++++++++++++++++++++++++++++++---------------- 4 files changed, 106 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a16b9e9aa9a3ea1d0b5…

1 0

Haidong Yu : evr: Add missing LeaveCriticalSection on creating tracking thread.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: 1647524ba08974d512c5d6d69f2ff10028bc1440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1647524ba08974d512c5d6d6… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Fri Dec 11 10:21:22 2020 +0800 evr: Add missing LeaveCriticalSection on creating tracking thread. Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index aedf19b9fd4..44b09d6d474 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -345,6 +345,7 @@ static void video_sample_create_tracking_thread(void) { WARN("Failed to create sample tracking thread.\n"); CloseHandle(ready_event); + LeaveCriticalSection(&tracking_thread_cs); return; }

1 0

Paul Gofman : ntdll: Don't set xstate in context if xstate features are not supported.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: 0fde203cac0ada6439f180ac9c0456f2e85bb786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fde203cac0ada6439f180ac… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 11 16:06:37 2020 +0300 ntdll: Don't set xstate in context if xstate features are not supported. Fixes a regression reproducible on CPUs without XSAVE support introduced by 419abd49a1f816e5a869dbf4cc81114cd516138b. The regression commit erroneously assumes that if XSAVE is not supported then the host signal context won't have xsave data set up. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50271 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index eb4a6653f5e..11fa61232fa 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -774,7 +774,7 @@ static inline void restore_xstate( const CONTEXT *context ) XSAVE_FORMAT *xrstor_base; XSTATE *xs; - if (!(xs = xstate_from_context( context ))) + if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) return; xrstor_base = (XSAVE_FORMAT *)xs - 1; @@ -891,7 +891,7 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); - if ((xs = XState_sig(fpux))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(fpux))) { context_init_xstate( context, xs ); xcontext->host_compaction_mask = xs->CompactionMask; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d789cecb679..359f2d7c361 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1466,7 +1466,7 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex context->ContextFlags |= CONTEXT_FLOATING_POINT; context->u.FltSave = *FPU_sig(sigcontext); context->MxCsr = context->u.FltSave.MxCsr; - if ((xs = XState_sig(FPU_sig(sigcontext)))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(FPU_sig(sigcontext)))) { /* xcontext and sigcontext are both on the signal stack, so we can * just reference sigcontext without overflowing 32 bit XState.Offset */ @@ -1546,7 +1546,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon amd64_thread_data()->dr7 = context->Dr7; set_sigcontext( context, sigcontext ); if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; - if ((xs = XState_sig(FPU_sig(sigcontext)))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(FPU_sig(sigcontext)))) xs->CompactionMask = xcontext->host_compaction_mask; } @@ -1603,7 +1603,7 @@ static void restore_xstate( const CONTEXT *context ) XSAVE_FORMAT *xrstor_base; XSTATE *xs; - if (!(xs = xstate_from_context( context ))) + if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) return; xrstor_base = (XSAVE_FORMAT *)xs - 1;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: 6d98dc7ce80f97b109ca912a2dcc702cf9713a56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d98dc7ce80f97b109ca912a… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 11 14:12:11 2020 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 70 +++++++++++++++++----------------------------------------------- 1 file changed, 18 insertions(+), 52 deletions(-) diff --git a/po/de.po b/po/de.po index 3f82776169e..3f7a173d628 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-10-05 12:12+0200\n" +"PO-Revision-Date: 2020-12-11 14:12+0100\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -6938,10 +6938,8 @@ msgid "Not implemented.\n" msgstr "Nicht implementiert.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC-Aufruf fehlgeschlagen.\n" +msgstr "Aufruf fehlgeschlagen.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" @@ -9930,16 +9928,12 @@ msgid "Iran Daylight Time" msgstr "Iran Sommerzeit" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Haiti Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Haiti Normalzeit" +msgstr "Saint-Pierre Normalzeit" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Haiti Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Haiti Sommerzeit" +msgstr "Saint-Pierre Sommerzeit" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -9982,16 +9976,12 @@ msgid "Central Asia Daylight Time" msgstr "Zentralasien Sommerzeit" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Koreanische Normalzeit" +msgstr "Lord-Howe Normalzeit" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Koreanische Sommerzeit" +msgstr "Lord-Howe Sommerzeit" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10042,16 +10032,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Aserbaidschan Sommerzeit" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Magadan Normalzeit" +msgstr "Magallanes Normalzeit" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Magadan Sommerzeit" +msgstr "Magallanes Sommerzeit" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10102,16 +10088,12 @@ msgid "Line Islands Daylight Time" msgstr "Linieninseln Sommerzeit" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "China Normalzeit" +msgstr "Kuba Normalzeit" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "China Sommerzeit" +msgstr "Kuba Sommerzeit" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" @@ -10310,16 +10292,12 @@ msgid "US Eastern Daylight Time" msgstr "US Eastern Sommerzeit" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Koreanische Normalzeit" +msgstr "Nordkorea Normalzeit" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Koreanische Sommerzeit" +msgstr "Nordkorea Sommerzeit" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" @@ -10410,16 +10388,12 @@ msgid "Arabian Daylight Time" msgstr "Arabische Sommerzeit" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Mountain Normalzeit" +msgstr "Tocantins Normalzeit" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Mountain Sommerzeit" +msgstr "Tocantins Sommerzeit" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10430,16 +10404,12 @@ msgid "Russian Daylight Time" msgstr "Russische Sommerzeit" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "Zentralaustralische Normalzeit" +msgstr "West-Zentralaustralische Normalzeit" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "Zentralaustralische Sommerzeit" +msgstr "West-Zentralaustralische Sommerzeit" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" @@ -10658,16 +10628,12 @@ msgid "Egypt Daylight Time" msgstr "Ägypten Sommerzeit" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Central Normalzeit (Mexiko)" +msgstr "Östliche Normalzeit (Mexiko)" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Central Sommerzeit (Mexiko)" +msgstr "Östliche Sommerzeit (Mexiko)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time"

1 0

Jacek Caban : setjmp.h: Use GCC-style setjmp on Clang in MSVC mode.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: d91ad4ca2438e2193d45d99edc210a3118882f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91ad4ca2438e2193d45d99e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 11 17:36:24 2020 +0100 setjmp.h: Use GCC-style setjmp on Clang in MSVC mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/setjmp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index d4b7f8019ab..b539b22058f 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -149,7 +149,7 @@ _ACRTIMP void __cdecl longjmp(jmp_buf,int); # ifdef _UCRT # define _setjmpex __intrinsic_setjmpex # endif -# ifdef __GNUC__ +# if defined(__GNUC__) || defined(__clang__) _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); # define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) # define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0)) @@ -158,7 +158,7 @@ _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(j # ifdef _UCRT # define _setjmp __intrinsic_setjmp # endif -# ifdef __GNUC__ +# if defined(__GNUC__) || defined(__clang__) _ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); # else _ACRTIMP int __cdecl _setjmp(jmp_buf);

1 0

Rafał Harabień : include: Remove two D3DCAPS2 defines in d3d9 headers.
by Alexandre Julliard 11 Dec '20

11 Dec '20

Module: wine Branch: master Commit: c618093540ddb88251dbf86d0af815d15e177af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c618093540ddb88251dbf86d… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Thu Dec 10 22:38:23 2020 +0100 include: Remove two D3DCAPS2 defines in d3d9 headers. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 3 +-- dlls/d3d9/tests/device.c | 3 +-- include/d3d9caps.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 462037b2e01..2afe73088c7 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4020,8 +4020,7 @@ static void test_device_caps(void) ok(!(caps.Caps & ~(D3DCAPS_OVERLAY | D3DCAPS_READ_SCANLINE)), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_CANSHARERESOURCE)), "Caps2 field has unexpected flags %#x.\n", caps.Caps2); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2791e91a068..0343fade792 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13172,8 +13172,7 @@ static void test_device_caps(void) test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_CANSHARERESOURCE)), "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 1068a2c35a9..c62780b4a0a 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -258,9 +258,7 @@ #define D3DCAPS3_DXVAHD_LIMITED __MSABI_LONG(0x00000800) #define D3DCAPS3_RESERVED __MSABI_LONG(0x8000001F) -#define D3DCAPS2_NO2DDURING3DSCENE __MSABI_LONG(0x00000002) #define D3DCAPS2_FULLSCREENGAMMA __MSABI_LONG(0x00020000) -#define D3DCAPS2_CANRENDERWINDOWED __MSABI_LONG(0x00080000) #define D3DCAPS2_CANCALIBRATEGAMMA __MSABI_LONG(0x00100000) #define D3DCAPS2_RESERVED __MSABI_LONG(0x02000000) #define D3DCAPS2_CANMANAGERESOURCE __MSABI_LONG(0x10000000)

1 0