Rename internal setup functions in order to avoid naming conflicts.

svn path=/trunk/; revision=59068
This commit is contained in:
Eric Kohl 2013-05-23 09:07:12 +00:00
parent d9be0574d8
commit 09bc88e829

View file

@ -24,9 +24,9 @@ SID_IDENTIFIER_AUTHORITY SecurityNtAuthority = {SECURITY_NT_AUTHORITY};
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/
static BOOL static BOOL
SampAddMemberToAlias(HKEY hDomainKey, SampSetupAddMemberToAlias(HKEY hDomainKey,
ULONG AliasId, ULONG AliasId,
PSID MemberSid) PSID MemberSid)
{ {
DWORD dwDisposition; DWORD dwDisposition;
LPWSTR MemberSidString = NULL; LPWSTR MemberSidString = NULL;
@ -89,10 +89,10 @@ SampAddMemberToAlias(HKEY hDomainKey,
static BOOL static BOOL
SampCreateAliasAccount(HKEY hDomainKey, SampSetupCreateAliasAccount(HKEY hDomainKey,
LPCWSTR lpAccountName, LPCWSTR lpAccountName,
LPCWSTR lpDescription, LPCWSTR lpDescription,
ULONG ulRelativeId) ULONG ulRelativeId)
{ {
DWORD dwDisposition; DWORD dwDisposition;
WCHAR szAccountKeyName[32]; WCHAR szAccountKeyName[32];
@ -150,9 +150,9 @@ SampCreateAliasAccount(HKEY hDomainKey,
#if 0 #if 0
static BOOL static BOOL
SampCreateGroupAccount(HKEY hDomainKey, SampSetupCreateGroupAccount(HKEY hDomainKey,
LPCWSTR lpAccountName, LPCWSTR lpAccountName,
ULONG ulRelativeId) ULONG ulRelativeId)
{ {
return FALSE; return FALSE;
@ -161,11 +161,11 @@ SampCreateGroupAccount(HKEY hDomainKey,
static BOOL static BOOL
SampCreateUserAccount(HKEY hDomainKey, SampSetupCreateUserAccount(HKEY hDomainKey,
LPCWSTR lpAccountName, LPCWSTR lpAccountName,
LPCWSTR lpComment, LPCWSTR lpComment,
ULONG ulRelativeId, ULONG ulRelativeId,
ULONG UserAccountControl) ULONG UserAccountControl)
{ {
SAM_USER_FIXED_DATA FixedUserData; SAM_USER_FIXED_DATA FixedUserData;
UCHAR LogonHours[23]; UCHAR LogonHours[23];
@ -354,11 +354,11 @@ SampCreateUserAccount(HKEY hDomainKey,
static BOOL static BOOL
SampCreateDomain(IN HKEY hDomainsKey, SampSetupCreateDomain(IN HKEY hDomainsKey,
IN LPCWSTR lpKeyName, IN LPCWSTR lpKeyName,
IN LPCWSTR lpDomainName, IN LPCWSTR lpDomainName,
IN PSID lpDomainSid, IN PSID lpDomainSid,
OUT PHKEY lpDomainKey) OUT PHKEY lpDomainKey)
{ {
SAM_DOMAIN_FIXED_DATA FixedData; SAM_DOMAIN_FIXED_DATA FixedData;
LPWSTR lpEmptyString = L""; LPWSTR lpEmptyString = L"";
@ -634,52 +634,52 @@ SampInitializeSAM(VOID)
SampLoadString(hInstance, IDS_DOMAIN_BUILTIN_NAME, szName, 80); SampLoadString(hInstance, IDS_DOMAIN_BUILTIN_NAME, szName, 80);
/* Create the Builtin domain */ /* Create the Builtin domain */
if (SampCreateDomain(hDomainsKey, if (SampSetupCreateDomain(hDomainsKey,
L"Builtin", L"Builtin",
szName, szName,
pBuiltinSid, pBuiltinSid,
&hDomainKey)) &hDomainKey))
{ {
SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_NAME, szName, 80);
SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_COMMENT, szComment, 256); SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_COMMENT, szComment, 256);
SampCreateAliasAccount(hDomainKey, SampSetupCreateAliasAccount(hDomainKey,
szName, szName,
szComment, szComment,
DOMAIN_ALIAS_RID_ADMINS); DOMAIN_ALIAS_RID_ADMINS);
SampLoadString(hInstance, IDS_ALIAS_USERS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_USERS_NAME, szName, 80);
SampLoadString(hInstance, IDS_ALIAS_USERS_COMMENT, szComment, 256); SampLoadString(hInstance, IDS_ALIAS_USERS_COMMENT, szComment, 256);
SampCreateAliasAccount(hDomainKey, SampSetupCreateAliasAccount(hDomainKey,
szName, szName,
szComment, szComment,
DOMAIN_ALIAS_RID_USERS); DOMAIN_ALIAS_RID_USERS);
SampLoadString(hInstance, IDS_ALIAS_GUESTS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_GUESTS_NAME, szName, 80);
SampLoadString(hInstance, IDS_ALIAS_GUESTS_COMMENT, szComment, 256); SampLoadString(hInstance, IDS_ALIAS_GUESTS_COMMENT, szComment, 256);
SampCreateAliasAccount(hDomainKey, SampSetupCreateAliasAccount(hDomainKey,
szName, szName,
szComment, szComment,
DOMAIN_ALIAS_RID_GUESTS); DOMAIN_ALIAS_RID_GUESTS);
SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_NAME, szName, 80);
SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_COMMENT, szComment, 256); SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_COMMENT, szComment, 256);
SampCreateAliasAccount(hDomainKey, SampSetupCreateAliasAccount(hDomainKey,
szName, szName,
szComment, szComment,
DOMAIN_ALIAS_RID_POWER_USERS); DOMAIN_ALIAS_RID_POWER_USERS);
pSid = AppendRidToSid(AccountDomainInfo->DomainSid, pSid = AppendRidToSid(AccountDomainInfo->DomainSid,
DOMAIN_USER_RID_ADMIN); DOMAIN_USER_RID_ADMIN);
if (pSid != NULL) if (pSid != NULL)
{ {
SampAddMemberToAlias(hDomainKey, SampSetupAddMemberToAlias(hDomainKey,
DOMAIN_ALIAS_RID_ADMINS, DOMAIN_ALIAS_RID_ADMINS,
pSid); pSid);
RtlFreeHeap(RtlGetProcessHeap(), 0, pSid); RtlFreeHeap(RtlGetProcessHeap(), 0, pSid);
} }
@ -689,29 +689,29 @@ SampInitializeSAM(VOID)
} }
/* Create the Account domain */ /* Create the Account domain */
if (SampCreateDomain(hDomainsKey, if (SampSetupCreateDomain(hDomainsKey,
L"Account", L"Account",
L"", L"",
AccountDomainInfo->DomainSid, AccountDomainInfo->DomainSid,
&hDomainKey)) &hDomainKey))
{ {
SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_NAME, szName, 80); SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_NAME, szName, 80);
SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_COMMENT, szComment, 256); SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_COMMENT, szComment, 256);
SampCreateUserAccount(hDomainKey, SampSetupCreateUserAccount(hDomainKey,
szName, szName,
szComment, szComment,
DOMAIN_USER_RID_ADMIN, DOMAIN_USER_RID_ADMIN,
USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT);
SampLoadString(hInstance, IDS_USER_GUEST_NAME, szName, 80); SampLoadString(hInstance, IDS_USER_GUEST_NAME, szName, 80);
SampLoadString(hInstance, IDS_USER_GUEST_COMMENT, szComment, 256); SampLoadString(hInstance, IDS_USER_GUEST_COMMENT, szComment, 256);
SampCreateUserAccount(hDomainKey, SampSetupCreateUserAccount(hDomainKey,
szName, szName,
szComment, szComment,
DOMAIN_USER_RID_GUEST, DOMAIN_USER_RID_GUEST,
USER_ACCOUNT_DISABLED | USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); USER_ACCOUNT_DISABLED | USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT);
RegCloseKey(hDomainKey); RegCloseKey(hDomainKey);
} }