[PATCH 0/1] MR3724: wldp: Add WldpQueryWindowsLockdownMode stub.
Function is used in MS Edge Webview2 installer. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3724
From: Helix Graziani <helix.graziani(a)hotmail.com> --- dlls/wldp/wldp.c | 11 +++++++++++ dlls/wldp/wldp.spec | 2 +- include/wldp.h | 8 ++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/wldp/wldp.c b/dlls/wldp/wldp.c index ffd9b6084c7..4b04e6da5ae 100644 --- a/dlls/wldp/wldp.c +++ b/dlls/wldp/wldp.c @@ -49,3 +49,14 @@ HRESULT WINAPI WldpGetLockdownPolicy(WLDP_HOST_INFORMATION *info, DWORD *state, *state = 0; return S_OK; } + +/*********************************************************************** + * WldpQueryWindowsLockdownMode (wldp.@) + */ +HRESULT WINAPI WldpQueryWindowsLockdownMode(WLDP_WINDOWS_LOCKDOWN_MODE *lockdown_mode) +{ + FIXME("%p\n", lockdown_mode); + + *lockdown_mode = WLDP_WINDOWS_LOCKDOWN_MODE_MAX; + return S_OK; +} \ No newline at end of file diff --git a/dlls/wldp/wldp.spec b/dlls/wldp/wldp.spec index 7e5de1d372d..5e18c267d6c 100644 --- a/dlls/wldp/wldp.spec +++ b/dlls/wldp/wldp.spec @@ -4,7 +4,7 @@ @ stub WldpQueryPolicySettingEnabled2 @ stub WldpQueryPolicySettingEnabled @ stub WldpQueryPolicySettingEnabledInternal -@ stub WldpQueryWindowsLockdownMode +@ stdcall WldpQueryWindowsLockdownMode(ptr) @ stub WldpQueryWindowsLockdownRestriction @ stub WldpResetProductionConfiguration @ stub WldpResetWcosProductionConfiguration diff --git a/include/wldp.h b/include/wldp.h index c70e5feb8f8..4d0c3a0f39b 100644 --- a/include/wldp.h +++ b/include/wldp.h @@ -32,6 +32,14 @@ typedef enum WLDP_HOST_ID WLDP_HOST_ID_MAX } WLDP_HOST_ID; +typedef enum WLDP_WINDOWS_LOCKDOWN_MODE +{ + WLDP_WINDOWS_LOCKDOWN_MODE_UNLOCKED, + WLDP_WINDOWS_LOCKDOWN_MODE_TRIAL, + WLDP_WINDOWS_LOCKDOWN_MODE_LOCKED, + WLDP_WINDOWS_LOCKDOWN_MODE_MAX +} WLDP_WINDOWS_LOCKDOWN_MODE; + typedef struct WLDP_HOST_INFORMATION { DWORD dwRevision; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3724
Etaash Mathamsetty (@etaash.mathamsetty) commented about include/wldp.h:
WLDP_HOST_ID_MAX } WLDP_HOST_ID;
+typedef enum WLDP_WINDOWS_LOCKDOWN_MODE +{ + WLDP_WINDOWS_LOCKDOWN_MODE_UNLOCKED, + WLDP_WINDOWS_LOCKDOWN_MODE_TRIAL, + WLDP_WINDOWS_LOCKDOWN_MODE_LOCKED, + WLDP_WINDOWS_LOCKDOWN_MODE_MAX +} WLDP_WINDOWS_LOCKDOWN_MODE; This can't work, you are redefining WLDP_WINDOWS_LOCKDOWN_MODE. Instead use _WLDP_WINDOWS_LOCKDOWN_MODE in the typdef enum (line 35)
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3724#note_44186
you beat me to it :sweat: edit: also add a newline at the end of the file -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3724#note_44187
Etaash Mathamsetty (@etaash.mathamsetty) commented about dlls/wldp/wldp.c:
*state = 0; return S_OK; } + +/*********************************************************************** + * WldpQueryWindowsLockdownMode (wldp.@) + */ +HRESULT WINAPI WldpQueryWindowsLockdownMode(WLDP_WINDOWS_LOCKDOWN_MODE *lockdown_mode) +{ + FIXME("%p\n", lockdown_mode); + + *lockdown_mode = WLDP_WINDOWS_LOCKDOWN_MODE_MAX;
you can't use WLDP_WINDOWS_LOCKDOWN_MODE_MAX, that's an invalid value, instead use WLDP_WINDOWS_LOCKDOWN_MODE_UNLOCKED, since wine is effectively just a normal windows 10 installation without S mode. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3724#note_44188
participants (3)
-
Etaash Mathamsetty (@etaash.mathamsetty) -
Helix Graziani -
Helix Graziani (@TornadoCookie)