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

fixed IsUserAdmin and enable the calls to it

Browse source 
svn path=/trunk/; revision=20232
This commit is contained in:
Thomas Bluemel 2005-12-17 21:13:36 +00:00
parent 893ebb6e43
commit 6246647626
3 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/lib/newdev/newdev.c
View file

@ -1018,16 +1018,12 @@ DevInstallW(
PROPSHEETPAGE psp; PROPSHEETPAGE psp;
BOOL ret; BOOL ret;
DWORD config_flags; DWORD config_flags;
/*TCHAR buf[128];*/
/* FIXME: Nov 2005. umpnpmgr.exe is directly calling DevInstallW in if (!IsUserAdmin())
* SYSTEM context, which is not member of the Administrators group. {
* So, just ignore the test at the moment... */ /* XP kills the process... */
//if (!IsUserAdmin()) ExitProcess(ERROR_ACCESS_DENIED);
//{ }
// /* XP kills the process... */
// ExitProcess(ERROR_ACCESS_DENIED);
//}
/* Clear devinst data */ /* Clear devinst data */
ZeroMemory(&DevInstData, sizeof(DEVINSTDATA)); ZeroMemory(&DevInstData, sizeof(DEVINSTDATA));

22
reactos/lib/setupapi/cfgmgr.c
View file

@ -104,7 +104,7 @@ CONFIGRET WINAPI CMP_Report_LogOn(
if (!PnpGetLocalHandles(&BindingHandle, NULL)) if (!PnpGetLocalHandles(&BindingHandle, NULL))
return CR_FAILURE; return CR_FAILURE;
bAdmin = TRUE; //IsUserAdmin(); bAdmin = IsUserAdmin();
for (i = 0; i < 30; i++) for (i = 0; i < 30; i++)
{ {
@ -256,8 +256,8 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
// if (!IsUserAdmin()) if (!IsUserAdmin())
// return CR_ACCESS_DENIED; return CR_ACCESS_DENIED;
if (dnDevInst == 0) if (dnDevInst == 0)
return CR_INVALID_DEVINST; return CR_INVALID_DEVINST;
@ -341,8 +341,8 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
// if (!IsUserAdmin()) if (!IsUserAdmin())
// return CR_ACCESS_DENIED; return CR_ACCESS_DENIED;
if (dnDevInst == 0) if (dnDevInst == 0)
return CR_INVALID_DEVINST; return CR_INVALID_DEVINST;
@ -1921,8 +1921,8 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
FIXME("%lx %lx %lx %lx\n", FIXME("%lx %lx %lx %lx\n",
dnFromDevInst, dnToDevInst, ulFlags, hMachine); dnFromDevInst, dnToDevInst, ulFlags, hMachine);
// if (!IsUserAdmin()) if (!IsUserAdmin())
// return CR_ACCESS_DENIED; return CR_ACCESS_DENIED;
if (dnFromDevInst == 0 || dnToDevInst == 0) if (dnFromDevInst == 0 || dnToDevInst == 0)
return CR_INVALID_DEVNODE; return CR_INVALID_DEVNODE;
@ -2236,8 +2236,8 @@ CONFIGRET WINAPI CM_Run_Detection_Ex(
TRACE("%lx %lx\n", ulFlags, hMachine); TRACE("%lx %lx\n", ulFlags, hMachine);
// if (!IsUserAdmin()) if (!IsUserAdmin())
// return CR_ACCESS_DENIED; return CR_ACCESS_DENIED;
if (ulFlags & ~CM_DETECT_BITS) if (ulFlags & ~CM_DETECT_BITS)
return CR_INVALID_FLAG; return CR_INVALID_FLAG;
@ -2616,8 +2616,8 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine);
// if (!IsUserAdmin()) if (!IsUserAdmin())
// return CR_ACCESS_DENIED; return CR_ACCESS_DENIED;
if (dnDevInst == 0) if (dnDevInst == 0)
return CR_INVALID_DEVNODE; return CR_INVALID_DEVNODE;

2
reactos/lib/setupapi/misc.c
View file

@ -234,7 +234,7 @@ BOOL WINAPI IsUserAdmin(VOID)
for (i = 0; i < lpGroups->GroupCount; i++) for (i = 0; i < lpGroups->GroupCount; i++)
{ {
if (EqualSid(lpSid, &lpGroups->Groups[i].Sid)) if (EqualSid(lpSid, lpGroups->Groups[i].Sid))
{ {
bResult = TRUE; bResult = TRUE;
break; break;