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

Nikolay Sivov : vkd3d-shader/hlsl: Add texCUBE() function.
by Alexandre Julliard Aug. 29, 2023

Aug. 29, 2023

Module: vkd3d Branch: master Commit: c39c5b3907c9f696c1a0c45fa90812446bdaef87 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c39c5b3907c9f696c1a0c45fa9081… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 25 10:39:21 2023 +0200 vkd3d-shader/hlsl: Add texCUBE() function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 7 +++++++ tests/hlsl/sampler.shader_test | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 43ea4b4d..73257b8e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3478,6 +3478,12 @@ static bool intrinsic_tex3D(struct hlsl_ctx *ctx, return intrinsic_tex(ctx, params, loc, "tex3D", HLSL_SAMPLER_DIM_3D); } +static bool intrinsic_texCUBE(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return intrinsic_tex(ctx, params, loc, "texCUBE", HLSL_SAMPLER_DIM_CUBE); +} + static bool intrinsic_transpose(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3648,6 +3654,7 @@ intrinsic_functions[] = {"step", 2, true, intrinsic_step}, {"tex2D", -1, false, intrinsic_tex2D}, {"tex3D", -1, false, intrinsic_tex3D}, + {"texCUBE", -1, false, intrinsic_texCUBE}, {"transpose", 1, true, intrinsic_transpose}, {"trunc", 1, true, intrinsic_trunc}, }; diff --git a/tests/hlsl/sampler.shader_test b/tests/hlsl/sampler.shader_test index 628c3186..8b1c550c 100644 --- a/tests/hlsl/sampler.shader_test +++ b/tests/hlsl/sampler.shader_test @@ -49,3 +49,14 @@ float4 main() : sv_target { return tex2D(s, float2(0.0, 0.0)) + tex3D(s, float3(0.0, 0.0, 0.0)); } + +[require] +options: backcompat + +[pixel shader] +samplerCUBE s; + +float4 main() : sv_target +{ + return texCUBE(s, float3(0.0, 0.0, 0.0)); +}

1 0

Esme Povirk : user32/tests: Always generate a description for WM_NCCALCSIZE.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: afb00f7d987617a7351204c2f590d3e708030906 URL: https://gitlab.winehq.org/wine/wine/-/commit/afb00f7d987617a7351204c2f590d3… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Aug 2 13:56:16 2023 -0500 user32/tests: Always generate a description for WM_NCCALCSIZE. It's confusing to look at a dumped sequence and see empty lines. --- dlls/user32/tests/msg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cd540db2580..c8ea036d8e6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2505,6 +2505,10 @@ static void add_message_(int line, const struct recvd_message *msg) } else { + RECT *rect = (RECT*)msg->lParam; + + sprintf(seq->output, "%s: %p WM_NCCALCSIZE: %s", + msg->descr, msg->hwnd, wine_dbgstr_rect(rect)); seq->lParam = 0; } break;

1 0

Esme Povirk : user32/tests: Use winetest context in ok_sequence.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: b1fe5339cbeb8a2562147124d9626f221c8c2c75 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1fe5339cbeb8a2562147124d9626f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 1 14:32:33 2023 -0500 user32/tests: Use winetest context in ok_sequence. --- dlls/user32/tests/msg.c | 84 +++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 37 deletions(-)

1 0

Esme Povirk : user32/tests: Share code between ok_sequence and dump_sequence.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: 05435becff456e801fecf287030d7e283ab263c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/05435becff456e801fecf287030d7e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 1 13:52:16 2023 -0500 user32/tests: Share code between ok_sequence and dump_sequence. --- dlls/user32/tests/msg.c | 191 +++++++++++++++++++++--------------------------- 1 file changed, 83 insertions(+), 108 deletions(-)

1 0

Esme Povirk : user32/tests: Distinguish between extra and missing messages.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: 33c2aa3ae168dd68201543ad3fa30e2e1d66ba9d URL: https://gitlab.winehq.org/wine/wine/-/commit/33c2aa3ae168dd68201543ad3fa30e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Aug 2 13:47:21 2023 -0500 user32/tests: Distinguish between extra and missing messages. This may not be very clever, but it should make the output much more readable when sequences fail. --- dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 54d036ba57b..cd540db2580 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2693,6 +2693,17 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me return TRUE; } +static BOOL sequence_contains_message(const struct message *expected, const struct recvd_message *actual) +{ + while (expected->message) + { + if (messages_equal(expected, actual, FALSE, __FILE__, __LINE__)) + return TRUE; + expected++; + } + return FALSE; +} + static void dump_sequence(const struct message *expected, const char *context, const char *file, int line) { const struct recvd_message *actual = sequence; @@ -2707,17 +2718,21 @@ static void dump_sequence(const struct message *expected, const char *context, c count, message_type_name(expected->flags), expected->message, actual->output ); } - if (!messages_equal(expected, actual, FALSE, file, line) && - can_skip_message(expected)) + if (messages_equal(expected, actual, FALSE, file, line)) + { + expected++; + actual++; + count++; + } + else if (can_skip_message(expected) || sequence_contains_message(expected, actual)) { expected++; + count++; } else { - expected++; actual++; } - count++; } /* optional trailing messages */ @@ -2844,6 +2859,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex if ((expected->flags & parent) != (actual->flags & parent)) dump++; expected++; + count++; actual++; } /* @@ -2852,6 +2868,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex else if (can_skip_message(expected)) { expected++; + count++; } else if (todo) { @@ -2860,13 +2877,17 @@ static void ok_sequence_(const struct message *expected_list, const char *contex dump++; goto done; } - else + else if (sequence_contains_message(expected, actual)) { dump++; expected++; + count++; + } + else + { + dump++; actual++; } - count++; winetest_pop_context(); winetest_push_context("%s: %u", context, count);

1 0

Esme Povirk : user32: Remove some todo's for working tests.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: ea7b52b08091e1c7b5ce69ae49d76810d3c5ec89 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea7b52b08091e1c7b5ce69ae49d768… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Aug 2 13:00:27 2023 -0500 user32: Remove some todo's for working tests. --- dlls/user32/tests/msg.c | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-)

1 0

Mohamad Al-Jaf : dxcore: Add DXCoreCreateAdapterFactory() stub.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: e3823af09e28b5a15f79011cd0a7305b0e8bc66d URL: https://gitlab.winehq.org/wine/wine/-/commit/e3823af09e28b5a15f79011cd0a730… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 16 18:05:37 2023 -0400 dxcore: Add DXCoreCreateAdapterFactory() stub. --- dlls/dxcore/Makefile.in | 3 +++ dlls/dxcore/dxcore.spec | 2 +- dlls/dxcore/main.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/dxcore/Makefile.in b/dlls/dxcore/Makefile.in index 36aa27db1aa..85eeb58cee3 100644 --- a/dlls/dxcore/Makefile.in +++ b/dlls/dxcore/Makefile.in @@ -1 +1,4 @@ MODULE = dxcore.dll + +C_SRCS = \ + main.c diff --git a/dlls/dxcore/dxcore.spec b/dlls/dxcore/dxcore.spec index 1ba59c2f632..bac714eefbf 100644 --- a/dlls/dxcore/dxcore.spec +++ b/dlls/dxcore/dxcore.spec @@ -1 +1 @@ -@ stub DXCoreCreateAdapterFactory +@ stdcall DXCoreCreateAdapterFactory(ptr ptr) diff --git a/dlls/dxcore/main.c b/dlls/dxcore/main.c new file mode 100644 index 00000000000..dcc294d04fa --- /dev/null +++ b/dlls/dxcore/main.c @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#include "dxcore.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxcore); + +HRESULT WINAPI DXCoreCreateAdapterFactory( REFIID riid, void **ppv ) +{ + FIXME( "riid %s, ppv %p stub!\n", debugstr_guid(riid), ppv ); + return E_NOINTERFACE; +}

1 0

Mohamad Al-Jaf : dxcore: Add stub DLL.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: 0aeed1a497b617917009b9b07afd4f8df0e346c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0aeed1a497b617917009b9b07afd4f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Aug 11 18:56:51 2023 -0400 dxcore: Add stub DLL. --- configure | 2 ++ configure.ac | 1 + dlls/dxcore/Makefile.in | 1 + dlls/dxcore/dxcore.spec | 1 + 4 files changed, 5 insertions(+) diff --git a/configure b/configure index db95cc3588d..a87e10198e6 100755 --- a/configure +++ b/configure @@ -1123,6 +1123,7 @@ enable_dswave enable_dwmapi enable_dwrite enable_dx8vb +enable_dxcore enable_dxdiagn enable_dxgi enable_dxtrans @@ -21225,6 +21226,7 @@ wine_fn_config_makefile dlls/dwmapi/tests enable_tests wine_fn_config_makefile dlls/dwrite enable_dwrite wine_fn_config_makefile dlls/dwrite/tests enable_tests wine_fn_config_makefile dlls/dx8vb enable_dx8vb +wine_fn_config_makefile dlls/dxcore enable_dxcore wine_fn_config_makefile dlls/dxdiagn enable_dxdiagn wine_fn_config_makefile dlls/dxdiagn/tests enable_tests wine_fn_config_makefile dlls/dxgi enable_dxgi diff --git a/configure.ac b/configure.ac index e17d28c8601..9a47d9ba5f3 100644 --- a/configure.ac +++ b/configure.ac @@ -2595,6 +2595,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) WINE_CONFIG_MAKEFILE(dlls/dwrite) WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) +WINE_CONFIG_MAKEFILE(dlls/dxcore) WINE_CONFIG_MAKEFILE(dlls/dxdiagn) WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) WINE_CONFIG_MAKEFILE(dlls/dxgi) diff --git a/dlls/dxcore/Makefile.in b/dlls/dxcore/Makefile.in new file mode 100644 index 00000000000..36aa27db1aa --- /dev/null +++ b/dlls/dxcore/Makefile.in @@ -0,0 +1 @@ +MODULE = dxcore.dll diff --git a/dlls/dxcore/dxcore.spec b/dlls/dxcore/dxcore.spec new file mode 100644 index 00000000000..1ba59c2f632 --- /dev/null +++ b/dlls/dxcore/dxcore.spec @@ -0,0 +1 @@ +@ stub DXCoreCreateAdapterFactory

1 0

Nikolay Sivov : wldp: Add WldpIsDynamicCodePolicyEnabled() stub.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: 3174e86abedf633bcec4884f1303143a696b6062 URL: https://gitlab.winehq.org/wine/wine/-/commit/3174e86abedf633bcec4884f130314… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 16 15:56:42 2023 +0200 wldp: Add WldpIsDynamicCodePolicyEnabled() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/wldp/Makefile.in | 6 ++++++ dlls/wldp/wldp.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wldp/wldp.spec | 29 +++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+) diff --git a/configure b/configure index a87e10198e6..770d16ee808 100755 --- a/configure +++ b/configure @@ -1511,6 +1511,7 @@ enable_winusb enable_wlanapi enable_wlanui enable_wldap32 +enable_wldp enable_wmasf enable_wmi enable_wmiutils @@ -21848,6 +21849,7 @@ wine_fn_config_makefile dlls/wlanapi/tests enable_tests wine_fn_config_makefile dlls/wlanui enable_wlanui wine_fn_config_makefile dlls/wldap32 enable_wldap32 wine_fn_config_makefile dlls/wldap32/tests enable_tests +wine_fn_config_makefile dlls/wldp enable_wldp wine_fn_config_makefile dlls/wmasf enable_wmasf wine_fn_config_makefile dlls/wmi enable_wmi wine_fn_config_makefile dlls/wmiutils enable_wmiutils diff --git a/configure.ac b/configure.ac index 9a47d9ba5f3..078ee5bf201 100644 --- a/configure.ac +++ b/configure.ac @@ -3217,6 +3217,7 @@ WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) WINE_CONFIG_MAKEFILE(dlls/wlanui) WINE_CONFIG_MAKEFILE(dlls/wldap32) WINE_CONFIG_MAKEFILE(dlls/wldap32/tests) +WINE_CONFIG_MAKEFILE(dlls/wldp) WINE_CONFIG_MAKEFILE(dlls/wmasf) WINE_CONFIG_MAKEFILE(dlls/wmi) WINE_CONFIG_MAKEFILE(dlls/wmiutils) diff --git a/dlls/wldp/Makefile.in b/dlls/wldp/Makefile.in new file mode 100644 index 00000000000..8e2eaead297 --- /dev/null +++ b/dlls/wldp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wldp.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + wldp.c diff --git a/dlls/wldp/wldp.c b/dlls/wldp/wldp.c new file mode 100644 index 00000000000..64c0c58aae8 --- /dev/null +++ b/dlls/wldp/wldp.c @@ -0,0 +1,38 @@ +/* + * Copyright 2023 Nikolay Sivov 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 + */ + +#include <stdarg.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wldp); + +/*********************************************************************** + * WldpIsDynamicCodePolicyEnabled (wldp.@) + */ +HRESULT WINAPI WldpIsDynamicCodePolicyEnabled(BOOL *is_enabled) +{ + FIXME("%p\n", is_enabled); + + *is_enabled = FALSE; + return S_OK; +} diff --git a/dlls/wldp/wldp.spec b/dlls/wldp/wldp.spec new file mode 100644 index 00000000000..a692efca291 --- /dev/null +++ b/dlls/wldp/wldp.spec @@ -0,0 +1,29 @@ +@ stub WldpIsAppApprovedByPolicy +@ stub WldpIsProductionConfiguration +@ stub WldpIsWcosProductionConfiguration +@ stub WldpQueryPolicySettingEnabled2 +@ stub WldpQueryPolicySettingEnabled +@ stub WldpQueryPolicySettingEnabledInternal +@ stub WldpQueryWindowsLockdownMode +@ stub WldpQueryWindowsLockdownRestriction +@ stub WldpResetProductionConfiguration +@ stub WldpResetWcosProductionConfiguration +@ stub WldpSetWindowsLockdownRestriction +@ stub WldpTraceLoggingWDACBlockDialogShown +@ stub WldpAddDeveloperCertificateForDynamicCodeTrust +@ stub WldpCheckDeviceEncryptionNotStarted +@ stub WldpCheckRetailConfiguration +@ stub WldpCheckWcosDeviceEncryptionSecure +@ stub WldpDisableDeveloperMode +@ stub WldpEnableDeveloperMode +@ stub WldpGetLockdownPolicy +@ stub WldpIsAllowedEntryPoint +@ stub WldpIsClassInApprovedList +@ stub WldpIsDebugAllowed +@ stdcall WldpIsDynamicCodePolicyEnabled(ptr) +@ stub WldpIsProductionConfigurationInProc +@ stub WldpQueryDeviceSecurityInformation +@ stub WldpQueryDynamicCodeTrust +@ stub WldpQuerySecurityPolicy +@ stub WldpSetDynamicCodeTrust +@ stub WldpSetDynamicCodeTrust2

1 0

Mohamad Al-Jaf : apisetschema: Add ext-ms-win-dxcore-l1-1-0.
by Alexandre Julliard Aug. 28, 2023

Aug. 28, 2023

Module: wine Branch: master Commit: fedf4c2e68a059f709a2a6adb06a08be084d84a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/fedf4c2e68a059f709a2a6adb06a08… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 16 20:53:25 2023 -0400 apisetschema: Add ext-ms-win-dxcore-l1-1-0. Needed by Affinity Photo. --- dlls/apisetschema/apisetschema.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index 122cd1209ba..9b09f01e5e0 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -341,9 +341,12 @@ apiset ext-ms-win-drvinst-desktop-l1-1-0 = newdev.dll apiset ext-ms-win-dwmapi-ext-l1-1-0 = dwmapi.dll apiset ext-ms-win-dwmapidxgi-ext-l1-1-1 = dwmapi.dll apiset ext-ms-win-dx-d3d9-l1-1-0 = d3d9.dll +apiset ext-ms-win-dx-d3dkmt-dxcore-l1-1-3 = dxcore.dll apiset ext-ms-win-dx-d3dkmt-gdi-l1-1-0 = gdi32.dll apiset ext-ms-win-dx-ddraw-l1-1-0 = ddraw.dll apiset ext-ms-win-dx-dinput8-l1-1-0 = dinput8.dll +apiset ext-ms-win-dxcore-internal-l1-1-0 = dxcore.dll +apiset ext-ms-win-dxcore-l1-1-0 = dxcore.dll apiset ext-ms-win-eventing-pdh-l1-1-2 = pdh.dll apiset ext-ms-win-eventing-tdh-ext-l1-1-0 = tdh.dll apiset ext-ms-win-eventing-tdh-priv-l1-1-0 = tdh.dll

1 0