Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32)

Browse source 
- Implement IsUserAdmin in setupapi (based on shell32 implementation)
- Implement pSetupIsUserAdmin

svn path=/trunk/; revision=39709
This commit is contained in:
Dmitry Chapyshev 2009-02-22 12:49:18 +00:00
parent 9660c296f2
commit 485eae5524
3 changed files with 80 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reactos/dll/win32/setupapi/cfgmgr.c
View file

@ -153,7 +153,7 @@ CONFIGRET WINAPI CMP_Report_LogOn(
if (!PnpGetLocalHandles(&BindingHandle, NULL))
return CR_FAILURE;
bAdmin = IsUserAnAdmin();
bAdmin = IsUserAdmin();
for (i = 0; i < 30; i++)
{
@ -209,7 +209,7 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
FIXME("%p %p %lu %lx %p\n",
plcLogConf, dnDevInst, Priority, ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
if (plcLogConf == NULL)
@ -336,7 +336,7 @@ CONFIGRET WINAPI CM_Add_ID_ExW(
TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
if (dnDevInst == 0)
@ -543,7 +543,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
FIXME("%p %s %p %lx %p\n",
pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
if (pdnDevInst == NULL)
@ -713,7 +713,7 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
if (dnDevInst == 0)
@ -812,7 +812,7 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
if (dnDevInst == 0)
@ -1079,7 +1079,7 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex(
TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed;
@ -3008,7 +3008,7 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
FIXME("%lx %lx %lx %lx\n",
dnFromDevInst, dnToDevInst, ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
if (dnFromDevInst == 0 || dnToDevInst == 0)
@ -3385,7 +3385,7 @@ CONFIGRET WINAPI CM_Run_Detection_Ex(
TRACE("%lx %lx\n", ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
if (ulFlags & ~CM_DETECT_BITS)
@ -3903,7 +3903,7 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine);
if (!IsUserAnAdmin())
if (!IsUserAdmin())
return CR_ACCESS_DENIED;
if (dnDevInst == 0)

68
reactos/dll/win32/setupapi/misc.c
View file

@ -1685,3 +1685,71 @@ pSetupIsGuidNull(LPGUID lpGUID)
{
return IsEqualGUID(lpGUID, &GUID_NULL);
}
/*
* implemented
*/
BOOL
WINAPI
IsUserAdmin(VOID)
{
SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY};
HANDLE hToken;
DWORD dwSize;
PTOKEN_GROUPS lpGroups;
PSID lpSid;
DWORD i;
BOOL bResult = FALSE;
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
{
return FALSE;
}
if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize))
{
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
{
CloseHandle(hToken);
return FALSE;
}
}
lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize);
if (lpGroups == NULL)
{
CloseHandle(hToken);
return FALSE;
}
if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize))
{
HeapFree(GetProcessHeap(), 0, lpGroups);
CloseHandle(hToken);
return FALSE;
}
CloseHandle(hToken);
if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID,
DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0,
&lpSid))
{
HeapFree(GetProcessHeap(), 0, lpGroups);
return FALSE;
}
for (i = 0; i < lpGroups->GroupCount; i++)
{
if (EqualSid(lpSid, lpGroups->Groups[i].Sid))
{
bResult = TRUE;
break;
}
}
FreeSid(lpSid);
HeapFree(GetProcessHeap(), 0, lpGroups);
return bResult;
}

4
reactos/dll/win32/setupapi/setupapi.spec
View file

@ -213,7 +213,7 @@
@ stdcall InstallHinfSection(long long str long) InstallHinfSectionA
@ stdcall InstallHinfSectionA(long long str long)
@ stdcall InstallHinfSectionW(long long wstr long)
@ stdcall IsUserAdmin() shell32.IsUserAnAdmin
@ stdcall IsUserAdmin()
@ stdcall MyFree(ptr)
@ stdcall MyMalloc(long)
@ stdcall MyRealloc(ptr long)
@ -566,7 +566,7 @@
@ stub pSetupInstallStopEx
@ stdcall pSetupIsGuidNull(ptr)
@ stub pSetupIsLocalSystem
@ stub pSetupIsUserAdmin
@ stdcall pSetupIsUserAdmin() IsUserAdmin
@ stub pSetupMakeSurePathExists
@ stub pSetupMalloc
@ stub pSetupModifyGlobalFlags