[PATCH 0/1] MR6528: netapi32: Add a stub NetFreeAadJoinInformation function.
Chromium loads NetGetAadJoinInformation and NetFreeAadJoinInformation dynamically from netapi32. While it gracefully handles the absence of netapi32 or the getter, it has an assert that fails if the free function isn't there. It gracefully handles our ERROR_CALL_NOT_IMPLEMENTED from NetGetAadJoinInformation. --- chromium.googlesource.com/chromium/src/base/+/master/win/win_util.cc#189 has the relevant chromium source lines. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6528
From: Stefan Dösinger <stefan(a)codeweavers.com> Chromium loads NetGetAadJoinInformation and NetFreeAadJoinInformation dynamically from netapi32. While it gracefully handles the absence of netapi32 or the getter, it has an assert that fails if the free function isn't there. It gracefully handles our ERROR_CALL_NOT_IMPLEMENTED from NetGetAadJoinInformation. --- chromium.googlesource.com/chromium/src/base/+/master/win/win_util.cc#189 has the relevant chromium source lines. --- dlls/netapi32/netapi32.c | 5 +++++ dlls/netapi32/netapi32.spec | 1 + include/lmjoin.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 1a5af31b132..e28c1d5887f 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2755,3 +2755,8 @@ HRESULT WINAPI NetGetAadJoinInformation(LPCWSTR tenant_id, PDSREG_JOIN_INFO *joi FIXME("(%s, %p): stub\n", debugstr_w(tenant_id), join_info); return ERROR_CALL_NOT_IMPLEMENTED; } + +void NET_API_FUNCTION NetFreeAadJoinInformation(DSREG_JOIN_INFO *join_info) +{ + FIXME("%p): stub\n", join_info); +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index f24aa4a490f..f5fd4444de8 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -93,6 +93,7 @@ @ stub NetFileClose @ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetFileGetInfo +@ stdcall NetFreeAadJoinInformation(ptr) @ stdcall NetGetAadJoinInformation(wstr ptr) @ stdcall NetGetAnyDCName(wstr wstr ptr) @ stdcall NetGetDCName(wstr wstr ptr) diff --git a/include/lmjoin.h b/include/lmjoin.h index f363259f990..6bf97105ca4 100644 --- a/include/lmjoin.h +++ b/include/lmjoin.h @@ -74,6 +74,9 @@ HRESULT NET_API_FUNCTION NetGetAadJoinInformation( LPCWSTR pcszTenantId, PDSREG_JOIN_INFO *ppJoinInfo); +void NET_API_FUNCTION NetFreeAadJoinInformation( + DSREG_JOIN_INFO *join_info); + #ifdef __cplusplus } #endif -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6528
participants (1)
-
Stefan Dösinger