From 84690a71d8eb9f340caf024e944de7f74275823f Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 24 Apr 2016 11:29:40 +0000 Subject: [PATCH] [SYSSETUP] Rename SetAccountDomain to SetAccountsDomainSid and export it. svn path=/trunk/; revision=71194 --- reactos/dll/win32/syssetup/globals.h | 3 +-- reactos/dll/win32/syssetup/security.c | 8 +++++--- reactos/dll/win32/syssetup/syssetup.spec | 2 +- reactos/dll/win32/syssetup/wizard.c | 4 ++-- reactos/sdk/include/reactos/libs/syssetup/syssetup.h | 11 +++++++++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/reactos/dll/win32/syssetup/globals.h b/reactos/dll/win32/syssetup/globals.h index a3e9c1ce485..456cef906a2 100644 --- a/reactos/dll/win32/syssetup/globals.h +++ b/reactos/dll/win32/syssetup/globals.h @@ -74,8 +74,7 @@ extern ADMIN_INFO AdminInfo; BOOL RegisterTypeLibraries (HINF hinf, LPCWSTR szSection); /* security.c */ -NTSTATUS SetAccountDomain(LPCWSTR DomainName, - PSID DomainSid); + VOID InstallSecurity(VOID); NTSTATUS SetAdministratorPassword(LPCWSTR Password); diff --git a/reactos/dll/win32/syssetup/security.c b/reactos/dll/win32/syssetup/security.c index 5dec6042dd0..97716901914 100644 --- a/reactos/dll/win32/syssetup/security.c +++ b/reactos/dll/win32/syssetup/security.c @@ -21,8 +21,10 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -SetAccountDomain(LPCWSTR DomainName, - PSID DomainSid) +WINAPI +SetAccountsDomainSid( + PSID DomainSid, + LPCWSTR DomainName) { PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; POLICY_ACCOUNT_DOMAIN_INFO Info; @@ -35,7 +37,7 @@ SetAccountDomain(LPCWSTR DomainName, NTSTATUS Status; - DPRINT("SYSSETUP: SetAccountDomain\n"); + DPRINT("SYSSETUP: SetAccountsDomainSid\n"); memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); diff --git a/reactos/dll/win32/syssetup/syssetup.spec b/reactos/dll/win32/syssetup/syssetup.spec index 0acfdabebc2..ed4e0e18724 100644 --- a/reactos/dll/win32/syssetup/syssetup.spec +++ b/reactos/dll/win32/syssetup/syssetup.spec @@ -38,7 +38,7 @@ @ stub ReportError @ stub RunOEMExtraTasks @ stdcall ScsiClassInstaller(long ptr ptr) -@ stub SetAccountDomainSid +@ stdcall SetAccountsDomainSid(ptr wstr) @ stub SetupAddOrRemoveTestCertificate @ stdcall SetupChangeFontSize(ptr wstr) @ stdcall SetupChangeLocale(ptr long) diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c index dba513e884c..89dee4ce26d 100644 --- a/reactos/dll/win32/syssetup/wizard.c +++ b/reactos/dll/win32/syssetup/wizard.c @@ -587,8 +587,8 @@ WriteComputerSettings(WCHAR * ComputerName, HWND hwndDlg) /* Try to also set DNS hostname */ SetComputerNameExW(ComputerNamePhysicalDnsHostname, ComputerName); - /* Set the account domain name */ - SetAccountDomain(ComputerName, NULL); + /* Set the accounts domain name */ + SetAccountsDomainSid(NULL, ComputerName); return TRUE; } diff --git a/reactos/sdk/include/reactos/libs/syssetup/syssetup.h b/reactos/sdk/include/reactos/libs/syssetup/syssetup.h index a78f478b4a0..6a7ec56fb37 100644 --- a/reactos/sdk/include/reactos/libs/syssetup/syssetup.h +++ b/reactos/sdk/include/reactos/libs/syssetup/syssetup.h @@ -25,9 +25,16 @@ /* System setup APIs */ -DWORD WINAPI -InstallReactOS (HINSTANCE hInstance); +DWORD +WINAPI +InstallReactOS( + HINSTANCE hInstance); +NTSTATUS +WINAPI +SetAccountsDomainSid( + PSID DomainSid, + LPCWSTR DomainName); /* Log File APIs */ -- 2.17.1