Ros-dev

ros-dev@reactos.org

1 participants
5793 discussions

Re: [ros-dev] [ros-diffs] [dchapyshev] 39709: - Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32) - Implement IsUserAdmin in setupapi (based on shell32 implementation) - Implement pSetupIsUserAdmin
by Ged 22 Feb '09

22 Feb '09

Shouldn't advapi32 be using CheckTokenMembership ? -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 22 February 2009 12:49 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 39709: - Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32) - Implement IsUserAdmin in setupapi (based on shell32 implementation) - Implement pSetupIsUserAdmin Author: dchapyshev Date: Sun Feb 22 15:49:18 2009 New Revision: 39709 URL: http://svn.reactos.org/svn/reactos?rev=39709&view=rev Log: - Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32) - Implement IsUserAdmin in setupapi (based on shell32 implementation) - Implement pSetupIsUserAdmin Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -153,7 +153,7 @@ if (!PnpGetLocalHandles(&BindingHandle, NULL)) return CR_FAILURE; - bAdmin = IsUserAnAdmin(); + bAdmin = IsUserAdmin(); for (i = 0; i < 30; i++) { @@ -209,7 +209,7 @@ 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 @@ 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 @@ 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 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -812,7 +812,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -1079,7 +1079,7 @@ 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 @@ 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 @@ TRACE("%lx %lx\n", ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (ulFlags & ~CM_DETECT_BITS) @@ -3903,7 +3903,7 @@ FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -1685,3 +1685,71 @@ { 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; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -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

1 0

SVN server maintenance and upgrade
by Aleksey Bragin 21 Feb '09

21 Feb '09

Hi, we have put our efforts today to upgrade the SVN server machine, which now runs Subversion 1.5.1, and do some routine maintenance like recompressing the reactos repository, reconfiguring everything, etc. As a result, some total (not even readonly access) downtime happened, however it was only slightly more than a couple of hours, so hopefully noone's suffered too much. Now it runs stable, and better than before. Enjoy. Thanks to Franz, Colin and Christoph for helping with setting up and transferring the server. Their help is greatly appreciated. WBR, Aleksey Bragin.

2 1

Re: [ros-dev] Hello Everyone...
by Richard Campbell 19 Feb '09

19 Feb '09

Hi there everyone, Thanks for the comments. Yes, i will be on IRC soon. My AIM username is eek2121. Thanks, Richard Campbell > > > > On Wed, Feb 18, 2009 at 4:04 AM, Aleksey Bragin <aleksey(a)reactos.org> wrote: >> Hi Richard, >> very nice to see you back! >> >> Do you use IRC? If not, any other IM messenger? I could be reached as >> fireballrus(a)gmail.com for gtalk, fireballrus in Skype, 3890063 in ICQ. >> >> If all the above fails, we'll just exchange emails, this is fine too. >> >> >> I'll add your login to the svn, and let you know the password. Your work is >> appreciated! >> >> >> >> WBR, >> Aleksey Bragin. >> >> >> On Feb 18, 2009, at 8:01 AM, Richard Campbell wrote: >> >>> Hi Guys, >>> >>> So After a LONG hiatus I've finally decided to get back into writing >>> code for ReactOS. Some (most?) of you may not remember me. I've been >>> lurking on the lists since 2000-2001, and was an active developer with >>> CVS access for a while back in 2002-2003 (check the commit messages >>> for rcampbell, also submitted quite a few patches). have never stopped >>> reading (although i was/am using a different email address), but >>> haven't touched the code before now. I have a couple of questions: >>> 1) Is my SVN username active? The username is rcampbell. If not, >>> I'll just use bugzilla. 2) Any documentation on coding guidelines >>> such as styles, etc. or rules? I'm sure this has changed since my >>> heyday. >>> >>> Thanks, >>> >>> Richard Campbell >>> _______________________________________________ >>> Ros-dev mailing list >>> Ros-dev(a)reactos.org >>> http://www.reactos.org/mailman/listinfo/ros-dev >> >> >

3 2

truck build problems
by Steven Edwards 19 Feb '09

19 Feb '09

Hi, Does buildbot have its own custom config.rbuild that it uses? I've been having a lot of trouble as I've been trying to boot a build in either vmware or qemu with a virgin ReactOS source tree and RosBE-unix and I always get hung up at the same place. buildbot builds don't show the problem I am having so I am trying to nail down what in the environment could cause the problem. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

3 3

Mapping Network Drives??
by Nick Couchman 19 Feb '09

19 Feb '09

I've search around the ReactOS site, the mailing lists, and the Wiki, and haven't seen this subject out there much. We have an older application that runs on Windows over a network connection. The software must be run over the network and must have a mapped network drive to function correctly. I know that Samba-TNG is available for ReactOS, but this seems to only smbclient and no way to mount or map a network share. Are there any plans or current efforts to support mapped network drive functionality? Thanks - Nick This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Test mail
by Andrew Greenwood 18 Feb '09

18 Feb '09

Can we e-mail? Yes we can! (I hope...)

3 2

Hello Everyone...
by Richard Campbell 18 Feb '09

18 Feb '09

Hi Guys, So After a LONG hiatus I've finally decided to get back into writing code for ReactOS. Some (most?) of you may not remember me. I've been lurking on the lists since 2000-2001, and was an active developer with CVS access for a while back in 2002-2003 (check the commit messages for rcampbell, also submitted quite a few patches). have never stopped reading (although i was/am using a different email address), but haven't touched the code before now. I have a couple of questions: 1) Is my SVN username active? The username is rcampbell. If not, I'll just use bugzilla. 2) Any documentation on coding guidelines such as styles, etc. or rules? I'm sure this has changed since my heyday. Thanks, Richard Campbell

6 5

ping pong
by Richard Campbell 18 Feb '09

18 Feb '09

ping?

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 39637: fix formatting
by Hervé Poussineau 17 Feb '09

17 Feb '09

tkreuzer(a)svn.reactos.org a écrit : > Author: tkreuzer > Date: Mon Feb 16 21:57:45 2009 > New Revision: 39637 > > URL: http://svn.reactos.org/svn/reactos?rev=39637&view=rev > Log: > fix formatting ... > @@ -118,7 +122,7 @@ > KeAcquireSpinLock(Lock, &OldIrql); > Result = *Destination; > if(*Destination == Result) > - *Destination = *Exchange; > + *Destination = *Exchange; > KeReleaseSpinLock(Lock, OldIrql); > return Result; > } > Is formatting really better now?

1 0

[ros-diffs] [dgorbachev] 39422: Fix bug #4129 in CmpGetNameControlBlock().
by Dmitry Gorbachev 17 Feb '09

17 Feb '09

> No, it's just a matter of coding style used in the kernel. What is a logical basis for adopting this particular rule? Sometimes it is not just a matter of preference. These parentheses are unnecessary for humans, and if they are not needed for compilers or some other tools, they are bad! Without them, the bug could be noticed earlier. Cheers, Dmitry

7 13

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev