From: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> --- dlls/netapi32/netapi32.c | 91 ------------------------------------- dlls/netapi32/netapi32.spec | 4 +- 2 files changed, 2 insertions(+), 93 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 9737f2ae370..f58647b34c3 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2182,97 +2182,6 @@ DWORD WINAPI DsGetSiteNameA(LPCSTR ComputerName, LPSTR *SiteName) return ERROR_CALL_NOT_IMPLEMENTED; } -/************************************************************ - * DsRoleFreeMemory (NETAPI32.@) - * - * PARAMS - * Buffer [I] Pointer to the to-be-freed buffer. - * - * RETURNS - * Nothing - */ -VOID WINAPI DsRoleFreeMemory(PVOID Buffer) -{ - TRACE("(%p)\n", Buffer); - HeapFree(GetProcessHeap(), 0, Buffer); -} - -/************************************************************ - * DsRoleGetPrimaryDomainInformation (NETAPI32.@) - * - * PARAMS - * lpServer [I] Pointer to UNICODE string with ComputerName - * InfoLevel [I] Type of data to retrieve - * Buffer [O] Pointer to to the requested data - * - * RETURNS - * - * NOTES - * When lpServer is NULL, use the local computer - */ -DWORD WINAPI DsRoleGetPrimaryDomainInformation( - LPCWSTR lpServer, DSROLE_PRIMARY_DOMAIN_INFO_LEVEL InfoLevel, - PBYTE* Buffer) -{ - DWORD ret; - - FIXME("(%p, %d, %p) stub\n", lpServer, InfoLevel, Buffer); - - /* Check some input parameters */ - - if (!Buffer) return ERROR_INVALID_PARAMETER; - if ((InfoLevel < DsRolePrimaryDomainInfoBasic) || (InfoLevel > DsRoleOperationState)) return ERROR_INVALID_PARAMETER; - - *Buffer = NULL; - switch (InfoLevel) - { - case DsRolePrimaryDomainInfoBasic: - { - LSA_OBJECT_ATTRIBUTES ObjectAttributes; - LSA_HANDLE PolicyHandle; - PPOLICY_ACCOUNT_DOMAIN_INFO DomainInfo; - NTSTATUS NtStatus; - int logon_domain_sz; - DWORD size; - PDSROLE_PRIMARY_DOMAIN_INFO_BASIC basic; - - ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); - NtStatus = LsaOpenPolicy(NULL, &ObjectAttributes, - POLICY_VIEW_LOCAL_INFORMATION, &PolicyHandle); - if (NtStatus != STATUS_SUCCESS) - { - TRACE("LsaOpenPolicyFailed with NT status %lx\n", - LsaNtStatusToWinError(NtStatus)); - return ERROR_OUTOFMEMORY; - } - LsaQueryInformationPolicy(PolicyHandle, - PolicyAccountDomainInformation, (PVOID*)&DomainInfo); - logon_domain_sz = lstrlenW(DomainInfo->DomainName.Buffer) + 1; - LsaClose(PolicyHandle); - - size = sizeof(DSROLE_PRIMARY_DOMAIN_INFO_BASIC) + - logon_domain_sz * sizeof(WCHAR); - basic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (basic) - { - basic->MachineRole = DsRole_RoleStandaloneWorkstation; - basic->DomainNameFlat = (LPWSTR)((LPBYTE)basic + - sizeof(DSROLE_PRIMARY_DOMAIN_INFO_BASIC)); - lstrcpyW(basic->DomainNameFlat, DomainInfo->DomainName.Buffer); - ret = ERROR_SUCCESS; - } - else - ret = ERROR_OUTOFMEMORY; - *Buffer = (PBYTE)basic; - LsaFreeMemory(DomainInfo); - } - break; - default: - ret = ERROR_CALL_NOT_IMPLEMENTED; - } - return ret; -} - DWORD WINAPI DsGetDcOpenA(LPCSTR domain, ULONG flags, LPCSTR site, GUID *domain_guid, LPCSTR forest, ULONG dc_flags, PHANDLE context) { diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 4906bfade6d..14cf6a3a5f8 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -16,8 +16,8 @@ @ stdcall DsGetSiteNameA(str ptr) @ stdcall DsGetSiteNameW(wstr ptr) @ stub DsMergeForestTrustInformationW -@ stdcall DsRoleFreeMemory(ptr) -@ stdcall DsRoleGetPrimaryDomainInformation(wstr long ptr) +@ stdcall DsRoleFreeMemory(ptr) dsrole.DsRoleFreeMemory +@ stdcall DsRoleGetPrimaryDomainInformation(wstr long ptr) dsrole.DsRoleGetPrimaryDomainInformation @ stub DsValidateSubnetName @ stub I_BrowserDebugCall @ stub I_BrowserDebugTrace -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11146