Ros-dev

ros-dev@reactos.org

1 participants
5793 discussions

[ros-diffs] [jimtabor] 28932: Wrong Meta Tag!
by James Tabor 08 Sep '07

08 Sep '07

- Starting the implementation of thread locking of GDI objects. - Ref: http://www.winehq.org/pipermail/wine-cvs/2007-August/035810.html

1 0

Bug #2640 fixed
by carlo.bramix 07 Sep '07

07 Sep '07

Hello. The attached patch fixes the italian translation of MSCONFIG. Sincerely, Carlo Bramini. ------------------------------------------------------ Leggi GRATIS le tue mail con il telefonino i-mode di Wind http://i-mode.wind.it/

1 0

gdi object code optimization
by Timo Kreuzer 07 Sep '07

07 Sep '07

Hi Here are some ideas for optimizing our gdi object code: 1.) When allocating, locking and deleting a gdi object, we pass the global variable GdiHandleTable to GDIOBJ_AllocObj(). Do we really need this? Is there a case where we pass something else? We would only save few cycles here, but if we don't need it... 2.) When allocating a gdi object, we first need to search the list of LookasideLists. My suggestion is to give each gdi object type a constant index in the list and pass that index instead of the object type value. That would require that the table for the object types/sizes/CleanupProc is in sync with the index definitions. This could be achieved by initializing that table on win32k load: InitGdiObjectType(UINT Index, LONG GdiType, ULONG_PTR ObjectSize, GDICLEANUPPROC CleanupProc); Then we only need to make sure, that every index is only there once and add one line for each object in GDIOBJ_iAllocHandleTable to initialize the object type. 3.) ROS makes massive use of gdi object handles. It uses a lot more handles than windows does. That is because every object we use is always inserted into the handle table. This is slow and wastes handle entries, wich are a limited resource. Whenever we need a (temporary) object, we allocate it (find lookaside list, allocate mem, find free entry, lock entry, do some stuff, unlock entry), then in a second call lock it (do some checks, lock entry, return pointer) and at the end unlock it and then delete it. I think we should rewrite the code a little, so that we only create handles, when the object reaches usermode and use pointers to mem objects instead if the objects are kernel mode / temporary only. XXXOBJ_AllocObj(UINT Index) -> allocate an entry from the LookasideList and initialize it. Don't create a handle. XXXOBJ_FreeObj(PVOID pObjBody) -> free the entry from the LookasideList GDIOBJ_CreateHandle(PVOID pObjBody, UINT Index, LONG GdiType) -> create a handle for a given mem object rewrite some XXXOBJ_Xxx apis to deal with pointers to the mem objects instead of handles (see REGION_Xxx apis) Imo this should result in a big speed increase for several ntgdi/ntuser apis Regards, Timo

3 3

Re: [ros-dev] Build with zlib
by carlo.bramix 07 Sep '07

07 Sep '07

Hello. No, I didn't see the creation of a DLL from the log file. Perhaps I had understood that zlib was compiled as a static library (eh eh), but in my opinion this isn't the best way for using a robust, thread safe library like this one. I also agree that I could explain my idea wrongly. Searching into the online english dictionary... and I found a better word, perhaps "redundant" sounds better than "unuseful". Sincerely, Carlo Bramini. ---------- Initial Header ----------- >From : ros-dev-bounces(a)reactos.org To : "ReactOS Development List" ros-dev(a)reactos.org Cc : Date : Wed, 05 Sep 2007 11:21:07 -0400 Subject : Re: [ros-dev] Build with zlib > Um, because it's a static library? Do you see it in the "dll" directory or > in the "lib" directory? > > -----Original Message----- > From: ros-dev-bounces(a)reactos.org [mailto:ros-dev-bounces@reactos.org] On > Behalf Of carlo.bramix > Sent: September-04-07 5:19 AM > To: ros-dev > Subject: [ros-dev] Build with zlib > > Hello, > from the compilation log you can read: > > [CC] lib\3rdparty\zlib\adler32.c > [CC] lib\3rdparty\zlib\compress.c > [CC] lib\3rdparty\zlib\crc32.c > [CC] lib\3rdparty\zlib\gzio.c > [CC] lib\3rdparty\zlib\uncompr.c > [CC] lib\3rdparty\zlib\deflate.c > [CC] lib\3rdparty\zlib\trees.c > [CC] lib\3rdparty\zlib\zutil.c > [CC] lib\3rdparty\zlib\inflate.c > [CC] lib\3rdparty\zlib\infback.c > [CC] lib\3rdparty\zlib\inftrees.c > [CC] lib\3rdparty\zlib\inffast.c > [AR] obj-i386\lib\3rdparty\zlib\zlib.a > > why does it compile zlib.a (absolutely unuseful in my opinion) instead of > zlib1.dll with its libz.a? > This log has been taken from the compilation of ReactOS and *not* from the > "make bootcd" session. > > Sincerely, > > Carlo Bramini. > > > > ------------------------------------------------------ > Leggi GRATIS le tue mail con il telefonino i-modeT di Wind > http://i-mode.wind.it/ > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > ------------------------------------------------------ Leggi GRATIS le tue mail con il telefonino i-mode di Wind http://i-mode.wind.it/

2 1

Build with zlib
by carlo.bramix 06 Sep '07

06 Sep '07

Hello, from the compilation log you can read: [CC] lib\3rdparty\zlib\adler32.c [CC] lib\3rdparty\zlib\compress.c [CC] lib\3rdparty\zlib\crc32.c [CC] lib\3rdparty\zlib\gzio.c [CC] lib\3rdparty\zlib\uncompr.c [CC] lib\3rdparty\zlib\deflate.c [CC] lib\3rdparty\zlib\trees.c [CC] lib\3rdparty\zlib\zutil.c [CC] lib\3rdparty\zlib\inflate.c [CC] lib\3rdparty\zlib\infback.c [CC] lib\3rdparty\zlib\inftrees.c [CC] lib\3rdparty\zlib\inffast.c [AR] obj-i386\lib\3rdparty\zlib\zlib.a why does it compile zlib.a (absolutely unuseful in my opinion) instead of zlib1.dll with its libz.a? This log has been taken from the compilation of ReactOS and *not* from the "make bootcd" session. Sincerely, Carlo Bramini. ------------------------------------------------------ Leggi GRATIS le tue mail con il telefonino i-mode di Wind http://i-mode.wind.it/

4 3

Boto regression in rev. 28899
by Jan Schiefer 06 Sep '07

06 Sep '07

Built with RosBE-Unix 0.3.6, running on qemu 0.9.0. At first boot after install with Boot-CD, or when running Live-CD. $ qemu -cdrom ReactOS-LiveCD.iso -boot d -serial stdio (ntoskrnl/kd/kdio.c:191) ----------------------------------------------------- (ntoskrnl/kd/kdio.c:192) ReactOS 0.4-SVN (Build 20070906-r28895) (ntoskrnl/kd/kdio.c:193) Command Line: MININT DEBUGPORT=COM1 NOGUIBOOT (ntoskrnl/kd/kdio.c:197) ARC Paths: multi(0)disk(0)cdrom(224) \ multi(0)disk(0)cdrom(224) \reactos\ (ntoskrnl/mm/mminit.c:264) Base Length Type (ntoskrnl/mm/mminit.c:270) 00000000 00000001 FirmwarePermanent (ntoskrnl/mm/mminit.c:270) 00000001 00000002 MemoryData (ntoskrnl/mm/mminit.c:270) 00000003 00000035 Free (ntoskrnl/mm/mminit.c:270) 00000038 00000008 MemoryData (ntoskrnl/mm/mminit.c:270) 00000040 0000005F Free (ntoskrnl/mm/mminit.c:270) 0000009F 00000001 SpecialMemory (ntoskrnl/mm/mminit.c:270) 000000A0 00000048 FirmwarePermanent (ntoskrnl/mm/mminit.c:270) 000000E8 00000018 SpecialMemory (ntoskrnl/mm/mminit.c:270) 00000100 00000700 Free (ntoskrnl/mm/mminit.c:270) 00000800 00000287 SystemCode (ntoskrnl/mm/mminit.c:270) 00000A87 0000000E BootDriver (ntoskrnl/mm/mminit.c:270) 00000A95 00000019 HalCode (ntoskrnl/mm/mminit.c:270) 00000AAE 00000009 BootDriver (ntoskrnl/mm/mminit.c:270) 00000AB7 0000000F RegistryData (ntoskrnl/mm/mminit.c:270) 00000AC6 00000003 RegistryData (ntoskrnl/mm/mminit.c:270) 00000AC9 00000011 NlsData (ntoskrnl/mm/mminit.c:270) 00000ADA 00000011 NlsData (ntoskrnl/mm/mminit.c:270) 00000AEB 00000002 NlsData (ntoskrnl/mm/mminit.c:270) 00000AED 00000017 BootDriver (ntoskrnl/mm/mminit.c:270) 00000B04 00000015 BootDriver (ntoskrnl/mm/mminit.c:270) 00000B19 0000000D BootDriver (ntoskrnl/mm/mminit.c:270) 00000B26 00000011 BootDriver (ntoskrnl/mm/mminit.c:270) 00000B37 00000019 BootDriver (ntoskrnl/mm/mminit.c:270) 00000B50 00000011 BootDriver (ntoskrnl/mm/mminit.c:270) 00000B61 00000029 BootDriver (ntoskrnl/mm/mminit.c:270) 00000B8A 00000012 BootDriver (ntoskrnl/mm/mminit.c:270) 00000B9C 0000002F BootDriver (ntoskrnl/mm/mminit.c:270) 00000BCB 000003F5 Free (ntoskrnl/mm/mminit.c:270) 00000FC0 0000003F FirmwareTemporary (ntoskrnl/mm/mminit.c:270) 00000FFF 00000001 SpecialMemory (ntoskrnl/mm/mminit.c:270) 00001000 00006FF0 LoaderReserve (ntoskrnl/mm/mminit.c:270) 00007FF0 00000010 SpecialMemory (ntoskrnl/mm/mminit.c:270) 000FFFC0 00000040 SpecialMemory (ntoskrnl/mm/mminit.c:274) Total: 00008040 (128 MB) Used memory 131008Kb (ntoskrnl/ke/i386/kiinit.c:47) Large Page support detected but not yet taken advantage of! WARNING: HaliQuerySystemInformation at hal/halx86/generic/sysinfo.c:31 is UNIMPLEMENTED! (ntoskrnl/ke/i386/patpge.c:62) Advanced Memory features detected but not yet taken advantage of. IoReportResourceUsage at ntoskrnl/io/iomgr/iorsrce.c:701 is unimplemented, have a nice day (ntoskrnl/io/iomgr/driver.c:1255) '\Driver\BUSLOGIC' initialization failed, status (0xc00000c0) (ntoskrnl/io/iomgr/driver.c:1255) '\Driver\DISK' initialization failed, status (0xc000000e) (ntoskrnl/io/iomgr/driver.c:1255) '\Driver\Floppy' initialization failed, status (0xc000000e) MmPageEntireDriver at ntoskrnl/mm/drvlck.c:87 is unimplemented, have a nice day MmPageEntireDriver at ntoskrnl/mm/drvlck.c:87 is unimplemented, have a nice day MmPageEntireDriver at ntoskrnl/mm/drvlck.c:87 is unimplemented, have a nice day (drivers/video/videoprt/videoprt.c:723) No PNP Videocard . (drivers/video/videoprt/videoprt.c:723) No PNP Videocard . (lib/rtl/registry.c:362) RTL: Expand variables for %SystemRoot%\system32\cmd.exe failed - Status == c0000023 Size a8 > 7e <e> (lib/rtl/registry.c:362) RTL: Expand variables for %SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot% failed - Status == c0000023 Size f4 > ac <14> (lib/rtl/registry.c:362) RTL: Expand variables for %SystemRoot%\system32 failed - Status == c0000023 Size a0 > 7e <6> (drivers/filesystems/cdfs/fsctl.c:536) CDFS: IRP_MN_USER_FS_REQUEST (drivers/filesystems/cdfs/fsctl.c:536) CDFS: IRP_MN_USER_FS_REQUEST (drivers/filesystems/cdfs/fsctl.c:536) CDFS: IRP_MN_USER_FS_REQUEST (drivers/filesystems/cdfs/fsctl.c:536) CDFS: IRP_MN_USER_FS_REQUEST (ntoskrnl/io/iomgr/file.c:410) FIXME: Broken Parse due to invalid DesiredAccess: 1f01ff (ntoskrnl/io/iomgr/file.c:410) FIXME: Broken Parse due to invalid DesiredAccess: 1f01ff (ntoskrnl/ke/balmgr.c:79) Thread: 8120EA78 ntoskrnl/mm/rpoolmgr.h(913): double-free detected for paged pool address 0x8db3dde8 Tag PALE(454C4150), Size -1917592344, UserSize 88 First few Stack Frames: <80859719> <8085983D> <9E4156E2> <9E41D444> <9E3DC804> <8082D980> Contents of Block: 0000 00 03 14 00 00 00 00 00 80 00 00 00 00 80 00 00 ................ 0010 80 80 00 00 00 00 80 00 80 00 80 00 00 80 80 00 ................ 0020 C0 C0 C0 00 C0 DC C0 00 D4 D0 C7 00 FF FB F0 00 ................ 0030 3A 6E A5 00 80 80 80 00 FF 00 00 00 00 FF 00 00 :n.............. 0040 FF FF 00 00 00 00 FF 00 FF 00 FF 00 00 FF FF 00 ................ 0050 FF FF FF 00 CD CD CD CD ........ *** Fatal System Error: 0x00000000 (0x00000000,0x00000000,0x00000000,0x00000000) <\SystemRoot\System32\NTOSKRNL.EXE: 2989> <\SystemRoot\System32\NTOSKRNL.EXE: 59b36> <\SystemRoot\System32\NTOSKRNL.EXE: 59cff> <\SystemRoot\System32\NTOSKRNL.EXE: 5a3f2> <\SystemRoot\System32\NTOSKRNL.EXE: 596c2> <\??\C:\reactos\system32\win32k.sys: 8472d> <\??\C:\reactos\system32\win32k.sys: 8c444> <\??\C:\reactos\system32\win32k.sys: 4b804> <\SystemRoot\System32\NTOSKRNL.EXE: 2d980> <\SystemRoot\System32\NTOSKRNL.EXE: 2c939> <\SystemRoot\System32\NTOSKRNL.EXE: 87234> <\SystemRoot\System32\NTOSKRNL.EXE: 1f879> <\SystemRoot\System32\NTOSKRNL.EXE: 2c939> <\SystemRoot\System32\NTOSKRNL.EXE: 87234>

1 0

regarding access.cpl (For Eric)
by Daniel Reimer 03 Sep '07

03 Sep '07

Hi, This is for Eric. I couldnt find your Mail Address, so I send this to ROS ML instead. I uploaded a picture with the errors in German RC, which are left. Only one Window makes problems. http://img407.imageshack.us/img407/7514/errorsbf8.jpg Bye Daniel "EmuandCo" Reimer

1 0

idea to a test frame work and other changes to win32k
by Magnus Olsen 02 Sep '07

02 Sep '07

Hi I am thinking of doing this adding a header call ntuser.h and put it in include/reactos/../ that contain all ntuser* syscall prototypes next thing we need a good test frame work betwin gdi32.dll and win32k.sys so we can check all param from gdi32 comes down to win32k are correct or captuers ms gdi32.dll to achive this so easy as posible I am thinking of adding a new config value or define value for win32k that will always test the input data is correct. example INT STDCALL NtGdiExtEscape(HDC hDC, IN OPTIONAL PWCHAR pDriver, IN INT nDriver, INT Escape, INT InSize, OPTIONAL LPSTR UnsafeInData, INT OutSize, OPTIONAL LPSTR UnsafeOutData) { PDC pDC; LPVOID SafeInData = NULL; LPVOID SafeOutData = NULL; NTSTATUS Status = STATUS_SUCCESS; INT Result; #if gdi32_testing_on test_NtGdiExtEscape(...); #endif ... ... } test will testing see if the data should have been sent or not to win32k and vaildate everthing. and if any error detects it print out a DPRINT1 msg DPRINT1("Testing start"); DPRINT1("Status : fail"); DPRINT1("Status : why :"); DPRINT1("Testing end"); or DPRINT1("Testing start"); DPRINT1("Status : Sussess"); DPRINT1("Testing end"); it is like this I want adding to win32k and thuse build in test case. I hope you all have understanding of good testcase and testframe buildin that can be easy disable and activate. ofcures the testframe should not be in debug build. we maybe should create a complete new target for it as well so public can get hold of it easy.

1 0

Re: [ros-dev] [ros-diffs] [hpoussin] 28693: Implement IsUserAnAdmin(), by copying implementation of IsUserAdmin() in setupapi (was implemented by Eric Kohl) Redirect setupapi.IsUserAdmin to shell32.IsUserAnAdmin
by Jeremy Drake 31 Aug '07

31 Aug '07

Umm, this implementation of IsUserAnAdmin is not quite correct. I just had to deal with a function almost identical to this in real life, which gave the wrong answer on Vista due to the filtered token containing the Administrators group with the "for deny only" attribute. You need to either check the attribute portion of the SID_AND_ATTRIBUTE struct as well, or use something like CheckTokenMembership (assuming that is implemented properly), or construct a security descriptor and use AccessCheck (again, assuming that is implemented correctly (I would hope so...)). Of course, this is probably just overly anal on ReactOS, as you don't have the whole Vista filtered token/elevation mess (yet), but probably best to be technically correct... On Fri, 31 Aug 2007, hpoussin(a)svn.reactos.org wrote: > Author: hpoussin > Date: Fri Aug 31 13:49:48 2007 > New Revision: 28693 > > URL: http://svn.reactos.org/svn/reactos?rev=28693&view=rev > Log: > Implement IsUserAnAdmin(), by copying implementation of IsUserAdmin() in setupapi (was implemented by Eric Kohl) > Redirect setupapi.IsUserAdmin to shell32.IsUserAnAdmin > > Modified: > trunk/reactos/dll/win32/setupapi/cfgmgr.c > trunk/reactos/dll/win32/setupapi/misc.c > trunk/reactos/dll/win32/setupapi/setupapi.spec > trunk/reactos/dll/win32/shell32/shellord.c > > 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 (original) > +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Fri Aug 31 13:49:48 2007 > @@ -135,7 +135,7 @@ > if (!PnpGetLocalHandles(&BindingHandle, NULL)) > return CR_FAILURE; > > - bAdmin = IsUserAdmin(); > + bAdmin = IsUserAnAdmin(); > > for (i = 0; i < 30; i++) > { > @@ -182,7 +182,7 @@ > FIXME("%p %p %lu %lx %p\n", > plcLogConf, dnDevInst, Priority, ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > return CR_ACCESS_DENIED; > > if (plcLogConf == NULL) > @@ -298,7 +298,7 @@ > > TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > return CR_ACCESS_DENIED; > > if (dnDevInst == 0) > @@ -490,7 +490,7 @@ > FIXME("%p %s %p %lx %p\n", > pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > return CR_ACCESS_DENIED; > > if (pdnDevInst == NULL) > @@ -637,7 +637,7 @@ > > FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > return CR_ACCESS_DENIED; > > if (dnDevInst == 0) > @@ -725,7 +725,7 @@ > > FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > return CR_ACCESS_DENIED; > > if (dnDevInst == 0) > @@ -961,7 +961,7 @@ > > TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > return CR_ACCESS_DENIED; > > pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed; > @@ -2707,7 +2707,7 @@ > FIXME("%lx %lx %lx %lx\n", > dnFromDevInst, dnToDevInst, ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > return CR_ACCESS_DENIED; > > if (dnFromDevInst == 0 || dnToDevInst == 0) > @@ -3051,7 +3051,7 @@ > > TRACE("%lx %lx\n", ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > return CR_ACCESS_DENIED; > > if (ulFlags & ~CM_DETECT_BITS) > @@ -3525,7 +3525,7 @@ > > FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); > > - if (!IsUserAdmin()) > + if (!IsUserAnAdmin()) > 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 (original) > +++ trunk/reactos/dll/win32/setupapi/misc.c Fri Aug 31 13:49:48 2007 > @@ -246,84 +246,6 @@ > MyFree(*lpData); > > return lError; > -} > - > - > -/************************************************************************** > - * IsUserAdmin [SETUPAPI.@] > - * > - * Checks whether the current user is a member of the Administrators group. > - * > - * PARAMS > - * None > - * > - * RETURNS > - * Success: TRUE > - * Failure: FALSE > - */ > -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; > - > - TRACE("\n"); > - > - 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 = MyMalloc(dwSize); > - if (lpGroups == NULL) > - { > - CloseHandle(hToken); > - return FALSE; > - } > - > - if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) > - { > - MyFree(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)) > - { > - MyFree(lpGroups); > - return FALSE; > - } > - > - for (i = 0; i < lpGroups->GroupCount; i++) > - { > - if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) > - { > - bResult = TRUE; > - break; > - } > - } > - > - FreeSid(lpSid); > - MyFree(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 (original) > +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Fri Aug 31 13:49:48 2007 > @@ -216,7 +216,7 @@ > @ stdcall InstallHinfSectionW(long long wstr long) > @ stub InstallStop > @ stub InstallStopEx > -@ stdcall IsUserAdmin() > +@ stdcall IsUserAdmin=shell32.IsUserAnAdmin() > @ stub LookUpStringInTable > @ stub MemoryInitialize > @ stdcall MultiByteToUnicode(str long) > > Modified: trunk/reactos/dll/win32/shell32/shellord.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… > ============================================================================== > --- trunk/reactos/dll/win32/shell32/shellord.c (original) > +++ trunk/reactos/dll/win32/shell32/shellord.c Fri Aug 31 13:49:48 2007 > @@ -1227,10 +1227,78 @@ > /************************************************************************* > * IsUserAnAdmin [SHELL32.680] NT 4.0 > * > + * Checks whether the current user is a member of the Administrators group. > + * > + * PARAMS > + * None > + * > + * RETURNS > + * Success: TRUE > + * Failure: FALSE > */ > BOOL WINAPI IsUserAnAdmin(VOID) > -{ FIXME("stub\n"); > - return TRUE; > +{ > + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; > + HANDLE hToken; > + DWORD dwSize; > + PTOKEN_GROUPS lpGroups; > + PSID lpSid; > + DWORD i; > + BOOL bResult = FALSE; > + > + TRACE("\n"); > + > + 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; > } > > /************************************************************************* > > > > -- Fortune's Real-Life Courtroom Quote #19: Q: Doctor, how many autopsies have you performed on dead people? A: All my autopsies have been performed on dead people.

1 0

GDI_TABLE_ENTRY structure
by Timo Kreuzer 31 Aug '07

31 Aug '07

Our current gdi handle and handle table entry code uses a bunch of macros, masks, bitshifts and even hardcoded values, iirc. This leads imo to errors, will make the code less portable and cannot make use of better compiler optimizations. So I have created a new GDI_TABLE_ENTRY struct and a new type GDIHANDLE. Both use unions and packed structs to directly access all fields. GDI_TABLE_ENTRY is completely compatible to our current one, so all the code would still be valid. + the compiler can optimize access of single elements better (movzx, byte ptr ...) + no more need for additional masks, shifts and macros + no more messed up code because of wrong hardcoded values + better readable code + probably easier porting to 64 bits - must be redefined for big-endian systems - direct access of stockbit is slightly slower, but could still be handled by a macro #pragma pack(push,1) typedef struct { PVOID KernelData; /* Points to the kernel mode structure */ union { DWORD ProcessId; /* process id that created the object, 0 for kernel objects */ struct { unsigned ProcessId16: 16; unsigned Unused: 16; }; }; union { ULONG Type; struct { union { unsigned TypeLower: 16; struct { union { unsigned HandleTypeStock: 8; struct { unsigned HandleType: 7; unsigned StockBit: 1; }; }; unsigned ReuseCount: 8; }; }; union { unsigned TypeUpper: 16; struct { unsigned StorageType: 8; /* PEN uses same value as BRUSH here, no stock bit */ unsigned Flags: 8; }; }; }; }; PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY;; typedef union { HGDIOBJ Handle; struct { unsigned Index: 16; union { unsigned Upper: 16; struct { union { unsigned HandleTypeStock: 8; struct { unsigned HandleType: 7; unsigned StockBit: 1; }; }; unsigned ReuseCount: 8; }; }; }; } GDIHANDLE, *PGDIHANDLE; #pragma pack(pop)

6 16

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