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

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

29 Aug '23

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

Mohamad Al-Jaf : include: Add dxcore_interface.h file.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: ef79bf9111f8053c4b85b8479e5d9daed6921d16 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef79bf9111f8053c4b85b8479e5d9d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Aug 11 19:18:05 2023 -0400 include: Add dxcore_interface.h file. --- include/Makefile.in | 1 + include/dxcore_interface.h | 235 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 236 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index adbc4165b48..1adad2785b4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -282,6 +282,7 @@ SOURCES = \ dwrite_1.idl \ dwrite_2.idl \ dwrite_3.idl \ + dxcore_interface.h \ dxdiag.h \ dxerr8.h \ dxerr9.h \ diff --git a/include/dxcore_interface.h b/include/dxcore_interface.h new file mode 100644 index 00000000000..635a7f047a5 --- /dev/null +++ b/include/dxcore_interface.h @@ -0,0 +1,235 @@ +/* + * 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 + */ + +#ifndef __DXCORE_INTERFACE__ +#define __DXCORE_INTERFACE__ + +#include <stdarg.h> +#include <stdint.h> +#include <ole2.h> + +#ifdef __cplusplus +#define DECLARE_ENUM_CLASS(x) enum class x : uint32_t +#define REFLUID const LUID & +#else +#define DECLARE_ENUM_CLASS(x) typedef enum x x; enum x +#define REFLUID const LUID * +#endif + +DECLARE_ENUM_CLASS(DXCoreAdapterProperty) +{ + InstanceLuid = 0, + DriverVersion = 1, + DriverDescription = 2, + HardwareID = 3, + KmdModelVersion = 4, + ComputePreemptionGranularity = 5, + GraphicsPreemptionGranularity = 6, + DedicatedAdapterMemory = 7, + DedicatedSystemMemory = 8, + SharedSystemMemory = 9, + AcgCompatible = 10, + IsHardware = 11, + IsIntegrated = 12, + IsDetachable = 13, + HardwareIDParts = 14, +}; + +DECLARE_ENUM_CLASS(DXCoreAdapterState) +{ + IsDriverUpdateInProgress = 0, + AdapterMemoryBudget = 1, +}; + +DECLARE_ENUM_CLASS(DXCoreSegmentGroup) +{ + Local = 0, + NonLocal = 1, +}; + +DECLARE_ENUM_CLASS(DXCoreNotificationType) +{ + AdapterListStale = 0, + AdapterNoLongerValid = 1, + AdapterBudgetChange = 2, + AdapterHardwareContentProtectionTeardown = 3, +}; + +DECLARE_ENUM_CLASS(DXCoreAdapterPreference) +{ + Hardware = 0, + MinimumPower = 1, + HighPerformance = 2, +}; + +typedef struct DXCoreHardwareID +{ + uint32_t vendorID; + uint32_t deviceID; + uint32_t subSysID; + uint32_t revision; +} DXCoreHardwareID; + +typedef struct DXCoreHardwareIDParts +{ + uint32_t vendorID; + uint32_t deviceID; + uint32_t subSystemID; + uint32_t subVendorID; + uint32_t revisionID; +} DXCoreHardwareIDParts; + +typedef struct DXCoreAdapterMemoryBudgetNodeSegmentGroup +{ + uint32_t nodeIndex; + DXCoreSegmentGroup segmentGroup; +} DXCoreAdapterMemoryBudgetNodeSegmentGroup; + +typedef struct DXCoreAdapterMemoryBudget +{ + uint64_t budget; + uint64_t currentUsage; + uint64_t availableForReservation; + uint64_t currentReservation; +} DXCoreAdapterMemoryBudget; + +typedef void (STDMETHODCALLTYPE *PFN_DXCORE_NOTIFICATION_CALLBACK)(DXCoreNotificationType type, IUnknown *object, void *context); + +DEFINE_GUID(IID_IDXCoreAdapterFactory, 0x78ee5945, 0xc36e, 0x4b13, 0xa6, 0x69, 0x00, 0x5d, 0xd1, 0x1c, 0x0f, 0x06); +DEFINE_GUID(IID_IDXCoreAdapterList, 0x526c7776, 0x40e9, 0x459b, 0xb7, 0x11, 0xf3, 0x2a, 0xd7, 0x6d, 0xfc, 0x28); +DEFINE_GUID(IID_IDXCoreAdapter, 0xf0db4c7f, 0xfe5a, 0x42a2, 0xbd, 0x62, 0xf2, 0xa6, 0xcf, 0x6f, 0xc8, 0x3e); +DEFINE_GUID(DXCORE_ADAPTER_ATTRIBUTE_D3D11_GRAPHICS, 0x8c47866b, 0x7583, 0x450d, 0xf0, 0xf0, 0x6b, 0xad, 0xa8, 0x95, 0xaf, 0x4b); +DEFINE_GUID(DXCORE_ADAPTER_ATTRIBUTE_D3D12_GRAPHICS, 0x0c9ece4d, 0x2f6e, 0x4f01, 0x8c, 0x96, 0xe8, 0x9e, 0x33, 0x1b, 0x47, 0xb1); +DEFINE_GUID(DXCORE_ADAPTER_ATTRIBUTE_D3D12_CORE_COMPUTE, 0x248e2800, 0xa793, 0x4724, 0xab, 0xaa, 0x23, 0xa6, 0xde, 0x1b, 0xe0, 0x90); + +#undef INTERFACE +#define INTERFACE IDXCoreAdapter +DECLARE_INTERFACE_IID_(IDXCoreAdapter, IUnknown, "f0db4c7f-fe5a-42a2-bd62-f2a6cf6fc83e") +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef) (THIS) PURE; + STDMETHOD_(ULONG, Release) (THIS) PURE; + /* IDXCoreAdapter methods */ + STDMETHOD_(BOOL, IsValid) (THIS) PURE; + STDMETHOD_(BOOL, IsAttributeSupported) (THIS_ REFGUID attribute) PURE; + STDMETHOD_(BOOL, IsPropertySupported) (THIS_ DXCoreAdapterProperty property) PURE; + STDMETHOD(GetProperty) (THIS_ DXCoreAdapterProperty property, size_t buffer_size, void *buffer) PURE; + STDMETHOD(GetPropertySize) (THIS_ DXCoreAdapterProperty property, size_t *buffer_size) PURE; + STDMETHOD_(BOOL, IsQueryStateSupported) (THIS_ DXCoreAdapterState property) PURE; + STDMETHOD(QueryState) (THIS_ DXCoreAdapterState state, size_t state_details_size, const void *state_details, size_t buffer_size, void *buffer) PURE; + STDMETHOD_(BOOL, IsSetStateSupported) (THIS_ DXCoreAdapterState property) PURE; + STDMETHOD(SetState) (THIS_ DXCoreAdapterState state, size_t state_details_size, const void *state_details, size_t buffer_size, const void *buffer) PURE; + STDMETHOD(GetFactory) (THIS_ REFIID riid, void **ppv) PURE; + + #ifdef __cplusplus + template <class T> + HRESULT GetProperty(DXCoreAdapterProperty property, T *buffer) + { + return GetProperty(property, sizeof(T), (void *)buffer); + } + + template <class T1, class T2> + HRESULT QueryState(DXCoreAdapterState state, const T1 *state_details, T2 *buffer) + { + return QueryState(state, sizeof(T1), (const void *)state_details, sizeof(T2), (void *)buffer); + } + + template <class T> + HRESULT QueryState(DXCoreAdapterState state, T *buffer) + { + return QueryState(state, 0, NULL, sizeof(T), (void *)buffer); + } + + template <class T1, class T2> + HRESULT SetState(DXCoreAdapterState state, const T1 *state_details, const T2 *buffer) + { + return SetState(state, sizeof(T1), (const void *)state_details, sizeof(T2), (const void *)buffer); + } + + template <class T> + HRESULT GetFactory(T **ppv) + { + return GetFactory(IID_PPV_ARGS(ppv)); + } + #endif +}; + +#undef INTERFACE +#define INTERFACE IDXCoreAdapterList +DECLARE_INTERFACE_IID_(IDXCoreAdapterList, IUnknown, "526c7776-40e9-459b-b711-f32ad76dfc28") +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef) (THIS) PURE; + STDMETHOD_(ULONG, Release) (THIS) PURE; + /* IDXCoreAdapterList methods */ + STDMETHOD(GetAdapter) (THIS_ uint32_t index, REFIID riid, void **ppv) PURE; + STDMETHOD_(uint32_t, GetAdapterCount) (THIS) PURE; + STDMETHOD_(BOOL, IsStale) (THIS) PURE; + STDMETHOD(GetFactory) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD(Sort) (THIS_ uint32_t num_preferences, const DXCoreAdapterPreference *preferences) PURE; + STDMETHOD_(BOOL, IsAdapterPreferenceSupported) (THIS_ DXCoreAdapterPreference preference) PURE; + + #ifdef __cplusplus + template<class T> + HRESULT STDMETHODCALLTYPE GetAdapter(uint32_t index, T **ppv) + { + return GetAdapter(index, IID_PPV_ARGS(ppv)); + } + + template <class T> + HRESULT GetFactory(T **ppv) + { + return GetFactory(IID_PPV_ARGS(ppv)); + } + #endif +}; + +#undef INTERFACE +#define INTERFACE IDXCoreAdapterFactory +DECLARE_INTERFACE_IID_(IDXCoreAdapterFactory, IUnknown, "78ee5945-c36e-4b13-a669-005dd11c0f06") +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef) (THIS) PURE; + STDMETHOD_(ULONG, Release) (THIS) PURE; + /* IDXCoreAdapterFactory methods */ + STDMETHOD(CreateAdapterList) (THIS_ uint32_t num_attributes, const GUID *filter_attributes, REFIID riid, void **ppv) PURE; + STDMETHOD(GetAdapterByLuid) (THIS_ REFLUID adapter_luid, REFIID riid, void **ppv) PURE; + STDMETHOD_(BOOL, IsNotificationTypeSupported) (THIS_ DXCoreNotificationType type) PURE; + STDMETHOD(RegisterEventNotification) (THIS_ IUnknown *dxcore_object, DXCoreNotificationType type, PFN_DXCORE_NOTIFICATION_CALLBACK callback, + void *callback_context, uint32_t *event_cookie) PURE; + STDMETHOD(UnregisterEventNotification) (THIS_ uint32_t event_cookie) PURE; + + #ifdef __cplusplus + template<class T> + HRESULT STDMETHODCALLTYPE CreateAdapterList(uint32_t num_attributes, const GUID *filter_attributes, T **ppv) + { + return CreateAdapterList(num_attributes, filter_attributes, IID_PPV_ARGS(ppv)); + } + + template<class T> + HRESULT STDMETHODCALLTYPE GetAdapterByLuid(const LUID &adapter_luid, T **ppv) + { + return GetAdapterByLuid(adapter_luid, IID_PPV_ARGS(ppv)); + } + #endif +}; + +#endif /* __DXCORE_INTERFACE__ */

1 0

Mohamad Al-Jaf : include: Add dxcore.h file.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: 3c4c935f6423b97b70dc3a06edc31cdd86521293 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c4c935f6423b97b70dc3a06edc31c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Aug 11 20:51:49 2023 -0400 include: Add dxcore.h file. --- include/Makefile.in | 1 + include/dxcore.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 1adad2785b4..c0f2e873837 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -282,6 +282,7 @@ SOURCES = \ dwrite_1.idl \ dwrite_2.idl \ dwrite_3.idl \ + dxcore.h \ dxcore_interface.h \ dxdiag.h \ dxerr8.h \ diff --git a/include/dxcore.h b/include/dxcore.h new file mode 100644 index 00000000000..89257efc4e8 --- /dev/null +++ b/include/dxcore.h @@ -0,0 +1,29 @@ +/* + * 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_interface.h" + +STDAPI DXCoreCreateAdapterFactory(REFIID,void **); + +#ifdef __cplusplus +template <class T> +HRESULT DXCoreCreateAdapterFactory(T **ppv) +{ + return DXCoreCreateAdapterFactory(IID_PPV_ARGS(ppv)); +} +#endif

1 0

Mohamad Al-Jaf : dxcore: Add stub DLL.
by Alexandre Julliard 28 Aug '23

28 Aug '23

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

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

28 Aug '23

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 : apisetschema: Add ext-ms-win-dxcore-l1-1-0.
by Alexandre Julliard 28 Aug '23

28 Aug '23

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

Nikolay Sivov : wldp: Add WldpIsDynamicCodePolicyEnabled() stub.
by Alexandre Julliard 28 Aug '23

28 Aug '23

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

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

28 Aug '23

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: Remove some todo's for working tests.
by Alexandre Julliard 28 Aug '23

28 Aug '23

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

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

28 Aug '23

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