- Ros-dev - ReactOS.org

Re: [ros-dev] [ros-diffs] [pschweitzer] 57674: [DOXYGEN] ReactOS is not C only. Enable support builtin STL.

by Timo Kreuzer

We have 90 % C. So disabling OPTIMIZE_OUTPUT_FOR_C will probably result in worse readable output for 90% of the code. Am 05.11.2012 12:14, schrieb pschweitzer(a)svn.reactos.org: > Author: pschweitzer > Date: Mon Nov 5 11:13:59 2012 > New Revision: 57674 > > URL: http://svn.reactos.org/svn/reactos?rev=57674&view=rev > Log: > [DOXYGEN] > ReactOS is not C only. > Enable support builtin STL. > > Modified: > trunk/reactos/Doxyfile > > Modified: trunk/reactos/Doxyfile > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=57674&r1=5767… > ============================================================================== > --- trunk/reactos/Doxyfile [iso-8859-1] (original) > +++ trunk/reactos/Doxyfile [iso-8859-1] Mon Nov 5 11:13:59 2012 > @@ -196,7 +196,7 @@ > # For instance, some of the names that are used will be different. The list > # of all members will be omitted, etc. > > -OPTIMIZE_OUTPUT_FOR_C = YES > +OPTIMIZE_OUTPUT_FOR_C = NO > > # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java > # sources only. Doxygen will then generate output that is more tailored for > @@ -236,7 +236,7 @@ > # func(std::string) {}). This also make the inheritance and collaboration > # diagrams that involve STL classes more complete and accurate. > > -BUILTIN_STL_SUPPORT = NO > +BUILTIN_STL_SUPPORT = YES > > # If you use Microsoft's C++/CLI language, you should set this option to YES to > # enable parsing support. > > >

12 years, 10 months

3
3
0 0

[ros-diffs] [jgardou] 57679: [USER32] - Avoid more rounding issues and hopefully fix MSC build

by James Tabor

Hi, BE AWARE this is port synced from wine and please notate changes so it will not get lost on the next sync! James

12 years, 10 months

1
0
0 0

Meeting rescheduled!

by Aleksey Bragin

Hello, the meeting is rescheduled to 1st of November, as I don't see a point to do a meeting if zwabbit, caemyr and other can not attend. 1st of November will also be thursday, just one week late. Sorry for inconvenience. And it's time for agenda proposals already, please send them in to my email address as usual. Thanks. Best regards, Aleksey Bragin.

12 years, 10 months

4
7
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests.

by Hermès BÉLUSCA - MAÏTO

OK, I didn't know that ! I will revert this modification as soon as possible. Regards, Hermès BÉLUSCA - MAÏTO -----Message d'origine----- De : ros-dev-bounces(a)reactos.org [mailto:ros-dev-bounces@reactos.org] De la part de Sylvain Petreolle Envoyé : mercredi 10 octobre 2012 18:10 À : ReactOS Development List Objet : Re: [ros-dev] [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests. +1. You don't need to add the directory in PATH even if the helper is into bin\data. Kind regards, Sylvain Petreolle ----- Mail original ----- > De : Timo Kreuzer <timo.kreuzer(a)web.de> À : ros-dev(a)reactos.org Cc : > Envoyé le : Mercredi 10 octobre 2012 9h52 Objet : Re: [ros-dev] > [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests. > > > Why is it in the PATH variable? > Why not just put the test data in the bin folder? > > Am 10.10.2012 00:00, schrieb hbelusca(a)svn.reactos.org: >> Author: hbelusca >> Date: Tue Oct 9 22:00:47 2012 >> New Revision: 57526 >> >> URL: http://svn.reactos.org/svn/reactos?rev=57526&view=rev >> Log: >> [BOOTDATA-CMAKE] >> Add a bin\data directory for holding data files which can be used >> for > tests. >> >> Modified: >> trunk/reactos/boot/bootdata/hivesys_amd64.inf >> trunk/reactos/boot/bootdata/hivesys_arm.inf >> trunk/reactos/boot/bootdata/hivesys_i386.inf >> trunk/reactos/boot/bootdata/packages/reactos.dff.in >> trunk/reactos/cmake/CMakeMacros.cmake >> >> Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys > _amd64.inf?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] >> (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf >> [iso-8859-1] Tue Oct 9 > 22:00:47 2012 >> @@ -1200,7 +1200,7 @@ >> ; System environment settings >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" >> -HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system 32;%SystemRoot%;%SystemRoot%\system32\wbem" >> +HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\da ta;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","windir",0x00020000,"%SystemRoot%" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" >> >> Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys > _arm.inf?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] >> (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf >> [iso-8859-1] Tue Oct 9 > 22:00:47 2012 >> @@ -755,7 +755,7 @@ >> ; System environment settings >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" >> -HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system 32;%SystemRoot%;%SystemRoot%\system32\wbem" >> +HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\da ta;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","windir",0x00020000,"%SystemRoot%" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" >> >> Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys > _i386.inf?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] >> (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf >> [iso-8859-1] Tue Oct 9 > 22:00:47 2012 >> @@ -1200,7 +1200,7 @@ >> ; System environment settings >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" >> -HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system 32;%SystemRoot%;%SystemRoot%\system32\wbem" >> +HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\da ta;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","windir",0x00020000,"%SystemRoot%" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" >> >> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/package > s/reactos.dff.in?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] > (original) >> +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] >> Tue > Oct 9 22:00:47 2012 >> @@ -21,12 +21,13 @@ >> 5 = system32\drivers\etc >> 6 = inf >> 7 = bin >> -8 = media >> -9 = Microsoft.NET >> -10 = Microsoft.NET\Framework >> -11 = Microsoft.NET\Framework\v1.0.3705 >> -12 = Microsoft.NET\Framework\v1.1.4322 >> -13 = Microsoft.NET\Framework\v2.0.50727 >> +8 = bin\data >> +9 = media >> +10 = Microsoft.NET >> +11 = Microsoft.NET\Framework >> +12 = Microsoft.NET\Framework\v1.0.3705 >> +13 = Microsoft.NET\Framework\v1.1.4322 >> +14 = Microsoft.NET\Framework\v2.0.50727 >> .InfEnd >> @@ -59,4 +60,4 @@ >> modules\optional\wine_gecko-1.0.0-x86.cab 4 optional >> boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 > optional >> -modules\wallpaper\Angelus_02_ROSWP.bmp > 4 optional >> +modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional >> >> Modified: trunk/reactos/cmake/CMakeMacros.cmake >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cma > ke?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) >> +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Oct 9 >> 22:00:47 > 2012 >> @@ -97,18 +97,20 @@ >> set(${var} 6) >> elseif(${dir} STREQUAL reactos/bin) >> set(${var} 7) >> + elseif(${dir} STREQUAL reactos/bin/data) + set(${var} >> 8) >> elseif(${dir} STREQUAL reactos/media) >> - set(${var} 8) >> + set(${var} 9) >> elseif(${dir} STREQUAL reactos/Microsoft.NET) >> - set(${var} 9) >> + set(${var} 10) >> elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) >> - set(${var} 10) >> + set(${var} 11) >> elseif(${dir} STREQUAL >> reactos/Microsoft.NET/Framework/v1.0.3705) >> - set(${var} 11) >> + set(${var} 12) >> elseif(${dir} STREQUAL >> reactos/Microsoft.NET/Framework/v1.1.4322) >> - set(${var} 12) >> + set(${var} 13) >> elseif(${dir} STREQUAL >> reactos/Microsoft.NET/Framework/v2.0.50727) >> - set(${var} 13) >> + set(${var} 14) >> else() >> message(ERROR "Wrong destination: ${dir}") >> endif() >> >> >> > > > _______________________________________________ > 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

12 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests.

by Timo Kreuzer

Why is it in the PATH variable? Why not just put the test data in the bin folder? Am 10.10.2012 00:00, schrieb hbelusca(a)svn.reactos.org: > Author: hbelusca > Date: Tue Oct 9 22:00:47 2012 > New Revision: 57526 > > URL: http://svn.reactos.org/svn/reactos?rev=57526&view=rev > Log: > [BOOTDATA-CMAKE] > Add a bin\data directory for holding data files which can be used for tests. > > Modified: > trunk/reactos/boot/bootdata/hivesys_amd64.inf > trunk/reactos/boot/bootdata/hivesys_arm.inf > trunk/reactos/boot/bootdata/hivesys_i386.inf > trunk/reactos/boot/bootdata/packages/reactos.dff.in > trunk/reactos/cmake/CMakeMacros.cmake > > Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -1200,7 +1200,7 @@ > > ; System environment settings > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" > -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" > > Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -755,7 +755,7 @@ > > ; System environment settings > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" > -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" > > Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -1200,7 +1200,7 @@ > > ; System environment settings > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" > -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" > > Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… > ============================================================================== > --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -21,12 +21,13 @@ > 5 = system32\drivers\etc > 6 = inf > 7 = bin > -8 = media > -9 = Microsoft.NET > -10 = Microsoft.NET\Framework > -11 = Microsoft.NET\Framework\v1.0.3705 > -12 = Microsoft.NET\Framework\v1.1.4322 > -13 = Microsoft.NET\Framework\v2.0.50727 > +8 = bin\data > +9 = media > +10 = Microsoft.NET > +11 = Microsoft.NET\Framework > +12 = Microsoft.NET\Framework\v1.0.3705 > +13 = Microsoft.NET\Framework\v1.1.4322 > +14 = Microsoft.NET\Framework\v2.0.50727 > > .InfEnd > > @@ -59,4 +60,4 @@ > modules\optional\wine_gecko-1.0.0-x86.cab 4 optional > boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 optional > > -modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional > +modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional > > Modified: trunk/reactos/cmake/CMakeMacros.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… > ============================================================================== > --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -97,18 +97,20 @@ > set(${var} 6) > elseif(${dir} STREQUAL reactos/bin) > set(${var} 7) > + elseif(${dir} STREQUAL reactos/bin/data) > + set(${var} 8) > elseif(${dir} STREQUAL reactos/media) > - set(${var} 8) > + set(${var} 9) > elseif(${dir} STREQUAL reactos/Microsoft.NET) > - set(${var} 9) > + set(${var} 10) > elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) > - set(${var} 10) > + set(${var} 11) > elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705) > - set(${var} 11) > + set(${var} 12) > elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322) > - set(${var} 12) > + set(${var} 13) > elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727) > - set(${var} 13) > + set(${var} 14) > else() > message(ERROR "Wrong destination: ${dir}") > endif() > > >

12 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [ekohl] 57517: [LSASRV] Implement lookup of accounts in the account domain of the SAM database. The advapi32 security winetest shows proper domain and account names for the administrator and guest ...

by Alex Ionescu

Eric, with my rewrite, you can call RtlEqualPrefixSid instead of using LsapIsPrefixSid. The code should be the same Best regards, Alex Ionescu On Sun, Oct 7, 2012 at 7:33 PM, <ekohl(a)svn.reactos.org> wrote: > LsapIsPrefixSid

12 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [ekohl] 57503: [LSASRV] - Make LsarLookupNames, LsarLookupNames2 and LsarLookupNames4 call LsapLookupNames and convert the results where this is needed. - Split the lookup code in LsapLookupSids in...

by Timo Kreuzer

Looks like this revision breaks advapi32:security test (crash) and iphlpapi:iphlpapi (cancelled) http://reactos.org/testman/compare.php?ids=13887,13888 Am 06.10.2012 21:37, schrieb ekohl(a)svn.reactos.org: > Author: ekohl > Date: Sat Oct 6 19:37:10 2012 > New Revision: 57503 > > URL:http://svn.reactos.org/svn/reactos?rev=57503&view=rev > Log: > [LSASRV] > - Make LsarLookupNames, LsarLookupNames2 and LsarLookupNames4 call LsapLookupNames and convert the results where this is needed. > - Split the lookup code in LsapLookupSids into separate functions. > > Modified: > trunk/reactos/dll/win32/lsasrv/lsarpc.c > trunk/reactos/dll/win32/lsasrv/lsasrv.h > trunk/reactos/dll/win32/lsasrv/sids.c > > Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c > URL:http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarp… > ============================================================================== > --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Oct 6 19:37:10 2012 > @@ -550,89 +550,53 @@ > LSAP_LOOKUP_LEVEL LookupLevel, > DWORD *MappedCount) > { > - SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; > - static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); > - PLSAPR_REFERENCED_DOMAIN_LIST OutputDomains = NULL; > - PLSA_TRANSLATED_SID OutputSids = NULL; > - ULONG OutputSidsLength; > + LSAPR_TRANSLATED_SIDS_EX2 TranslatedSidsEx2; > ULONG i; > - PSID Sid; > - ULONG SidLength; > NTSTATUS Status; > > - TRACE("LsarLookupNames(%p, %lu, %p, %p, %p, %d, %p)\n", > + TRACE("(%p %lu %p %p %p %d %p)\n", > PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, > LookupLevel, MappedCount); > > - TranslatedSids->Entries = Count; > + TranslatedSids->Entries = 0; > TranslatedSids->Sids = NULL; > *ReferencedDomains = NULL; > > - OutputSidsLength = Count * sizeof(LSA_TRANSLATED_SID); > - OutputSids = MIDL_user_allocate(OutputSidsLength); > - if (OutputSids == NULL) > - { > + if (Count == 0) > + return STATUS_NONE_MAPPED; > + > + TranslatedSidsEx2.Entries = 0; > + TranslatedSidsEx2.Sids = NULL; > + > + Status = LsapLookupNames(Count, > + Names, > + ReferencedDomains, > + &TranslatedSidsEx2, > + LookupLevel, > + MappedCount, > + 0, > + 0); > + if (!NT_SUCCESS(Status)) > + return Status; > + > + TranslatedSids->Entries = TranslatedSidsEx2.Entries; > + TranslatedSids->Sids = MIDL_user_allocate(TranslatedSids->Entries * sizeof(LSA_TRANSLATED_SID)); > + if (TranslatedSids->Sids == NULL) > + { > + MIDL_user_free(TranslatedSidsEx2.Sids); > + MIDL_user_free(*ReferencedDomains); > + *ReferencedDomains = NULL; > return STATUS_INSUFFICIENT_RESOURCES; > } > > - RtlZeroMemory(OutputSids, OutputSidsLength); > - > - OutputDomains = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); > - if (OutputDomains == NULL) > - { > - MIDL_user_free(OutputSids); > - return STATUS_INSUFFICIENT_RESOURCES; > - } > - > - OutputDomains->Entries = Count; > - OutputDomains->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); > - if (OutputDomains->Domains == NULL) > - { > - MIDL_user_free(OutputDomains); > - MIDL_user_free(OutputSids); > - return STATUS_INSUFFICIENT_RESOURCES; > - } > - > - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, > - 2, > - SECURITY_BUILTIN_DOMAIN_RID, > - DOMAIN_ALIAS_RID_ADMINS, > - 0, 0, 0, 0, 0, 0, > - &Sid); > - if (!NT_SUCCESS(Status)) > - { > - MIDL_user_free(OutputDomains->Domains); > - MIDL_user_free(OutputDomains); > - MIDL_user_free(OutputSids); > - return Status; > - } > - > - SidLength = RtlLengthSid(Sid); > - > - for (i = 0; i < Count; i++) > - { > - OutputDomains->Domains[i].Sid = MIDL_user_allocate(SidLength); > - RtlCopyMemory(OutputDomains->Domains[i].Sid, Sid, SidLength); > - > - OutputDomains->Domains[i].Name.Buffer = MIDL_user_allocate(DomainName.MaximumLength); > - OutputDomains->Domains[i].Name.Length = DomainName.Length; > - OutputDomains->Domains[i].Name.MaximumLength = DomainName.MaximumLength; > - RtlCopyMemory(OutputDomains->Domains[i].Name.Buffer, DomainName.Buffer, DomainName.MaximumLength); > - } > - > - for (i = 0; i < Count; i++) > - { > - OutputSids[i].Use = SidTypeWellKnownGroup; > - OutputSids[i].RelativeId = DOMAIN_USER_RID_ADMIN; //DOMAIN_ALIAS_RID_ADMINS; > - OutputSids[i].DomainIndex = i; > - } > - > - *ReferencedDomains = OutputDomains; > - > - *MappedCount = Count; > - > - TranslatedSids->Entries = Count; > - TranslatedSids->Sids = OutputSids; > + for (i = 0; i < TranslatedSidsEx2.Entries; i++) > + { > + TranslatedSids->Sids[i].Use = TranslatedSidsEx2.Sids[i].Use; > + TranslatedSids->Sids[i].RelativeId = LsapGetRelativeIdFromSid(TranslatedSidsEx2.Sids[i].Sid); > + TranslatedSids->Sids[i].DomainIndex = TranslatedSidsEx2.Sids[i].DomainIndex; > + } > + > + MIDL_user_free(TranslatedSidsEx2.Sids); > > return STATUS_SUCCESS; > } > @@ -658,14 +622,11 @@ > /* FIXME: Fail, if there is an invalid SID in the SidEnumBuffer */ > > TranslatedNames->Entries = SidEnumBuffer->Entries; > - TranslatedNames->Names = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME)); > - if (TranslatedNames->Names == NULL) > - return STATUS_INSUFFICIENT_RESOURCES; > - > + TranslatedNames->Names = NULL; > *ReferencedDomains = NULL; > > TranslatedNamesEx.Entries = SidEnumBuffer->Entries; > - TranslatedNamesEx.Names = NULL;; > + TranslatedNamesEx.Names = NULL; > > Status = LsapLookupSids(SidEnumBuffer, > ReferencedDomains, > @@ -675,9 +636,16 @@ > 0, > 0); > if (!NT_SUCCESS(Status)) > + return Status; > + > + TranslatedNames->Entries = SidEnumBuffer->Entries; > + TranslatedNames->Names = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME)); > + if (TranslatedNames->Names == NULL) > { > MIDL_user_free(TranslatedNamesEx.Names); > - return Status; > + MIDL_user_free(*ReferencedDomains); > + *ReferencedDomains = NULL; > + return STATUS_INSUFFICIENT_RESOURCES; > } > > for (i = 0; i < TranslatedNamesEx.Entries; i++) > @@ -1977,8 +1945,56 @@ > DWORD LookupOptions, > DWORD ClientRevision) > { > - UNIMPLEMENTED; > - return STATUS_NOT_IMPLEMENTED; > + LSAPR_TRANSLATED_SIDS_EX2 TranslatedSidsEx2; > + ULONG i; > + NTSTATUS Status; > + > + TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", > + PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, > + LookupLevel, MappedCount, LookupOptions, ClientRevision); > + > + TranslatedSids->Entries = 0; > + TranslatedSids->Sids = NULL; > + *ReferencedDomains = NULL; > + > + if (Count == 0) > + return STATUS_NONE_MAPPED; > + > + TranslatedSidsEx2.Entries = 0; > + TranslatedSidsEx2.Sids = NULL; > + > + Status = LsapLookupNames(Count, > + Names, > + ReferencedDomains, > + &TranslatedSidsEx2, > + LookupLevel, > + MappedCount, > + LookupOptions, > + ClientRevision); > + if (!NT_SUCCESS(Status)) > + return Status; > + > + TranslatedSids->Entries = TranslatedSidsEx2.Entries; > + TranslatedSids->Sids = MIDL_user_allocate(TranslatedSids->Entries * sizeof(LSA_TRANSLATED_SID)); > + if (TranslatedSids->Sids == NULL) > + { > + MIDL_user_free(TranslatedSidsEx2.Sids); > + MIDL_user_free(*ReferencedDomains); > + *ReferencedDomains = NULL; > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + for (i = 0; i < TranslatedSidsEx2.Entries; i++) > + { > + TranslatedSids->Sids[i].Use = TranslatedSidsEx2.Sids[i].Use; > + TranslatedSids->Sids[i].RelativeId = LsapGetRelativeIdFromSid(TranslatedSidsEx2.Sids[i].Sid); > + TranslatedSids->Sids[i].DomainIndex = TranslatedSidsEx2.Sids[i].DomainIndex; > + TranslatedSids->Sids[i].Flags = TranslatedSidsEx2.Sids[i].Flags; > + } > + > + MIDL_user_free(TranslatedSidsEx2.Sids); > + > + return STATUS_SUCCESS; > } > > > @@ -2081,7 +2097,7 @@ > { > NTSTATUS Status; > > - TRACE("LsarLookupNames3(%p, %lu, %p, %p, %p, %d, %p, %lu, %lu)\n", > + TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", > PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, > LookupLevel, MappedCount, LookupOptions, ClientRevision); > > @@ -2223,8 +2239,29 @@ > DWORD LookupOptions, > DWORD ClientRevision) > { > - UNIMPLEMENTED; > - return STATUS_NOT_IMPLEMENTED; > + NTSTATUS Status; > + > + TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n", > + RpcHandle, Count, Names, ReferencedDomains, TranslatedSids, > + LookupLevel, MappedCount, LookupOptions, ClientRevision); > + > + TranslatedSids->Entries = 0; > + TranslatedSids->Sids = NULL; > + *ReferencedDomains = NULL; > + > + if (Count == 0) > + return STATUS_NONE_MAPPED; > + > + Status = LsapLookupNames(Count, > + Names, > + ReferencedDomains, > + TranslatedSids, > + LookupLevel, > + MappedCount, > + LookupOptions, > + ClientRevision); > + > + return Status; > } > > > > Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h > URL:http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasr… > ============================================================================== > --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Oct 6 19:37:10 2012 > @@ -192,6 +192,9 @@ > NTSTATUS > LsapInitSids(VOID); > > +ULONG > +LsapGetRelativeIdFromSid(PSID Sid); > + > NTSTATUS > LsapLookupNames(DWORD Count, > PRPC_UNICODE_STRING Names, > > Modified: trunk/reactos/dll/win32/lsasrv/sids.c > URL:http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.… > ============================================================================== > --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Sat Oct 6 19:37:10 2012 > @@ -808,6 +808,18 @@ > } > > > +ULONG > +LsapGetRelativeIdFromSid(PSID Sid_) > +{ > + PISID Sid = Sid_; > + > + if (Sid->SubAuthorityCount != 0) > + return Sid->SubAuthority[Sid->SubAuthorityCount - 1]; > + > + return 0; > +} > + > + > NTSTATUS > LsapLookupNames(DWORD Count, > PRPC_UNICODE_STRING Names, > @@ -824,10 +836,6 @@ > PRPC_UNICODE_STRING AccountNames = NULL; > ULONG SidsBufferLength; > ULONG DomainIndex; > -// ULONG DomainSidLength; > -// ULONG AccountSidLength; > -// PSID DomainSid; > -// PSID AccountSid; > ULONG i; > ULONG Mapped = 0; > NTSTATUS Status = STATUS_SUCCESS; > @@ -1006,84 +1014,29 @@ > } > > > -NTSTATUS > -LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, > - PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, > - PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, > - LSAP_LOOKUP_LEVEL LookupLevel, > - DWORD *MappedCount, > - DWORD LookupOptions, > - DWORD ClientRevision) > -{ > - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; > - PLSAPR_TRANSLATED_NAME_EX NamesBuffer = NULL; > - ULONG NamesBufferLength; > +static NTSTATUS > +LsapLookupWellKnownSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, > + PLSAPR_TRANSLATED_NAME_EX NamesBuffer, > + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, > + PULONG Mapped) > +{ > + PWELL_KNOWN_SID ptr, ptr2; > + LPWSTR SidString = NULL; > ULONG DomainIndex; > ULONG i; > - ULONG Mapped = 0; > NTSTATUS Status = STATUS_SUCCESS; > > - PWELL_KNOWN_SID ptr, ptr2; > - > - SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; > - static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); > - static const UNICODE_STRING AdminName = RTL_CONSTANT_STRING(L"Administrator"); > - PSID AdminsSid = NULL; > - ULONG SidLength; > - > - > - NamesBufferLength = SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME_EX); > - NamesBuffer = MIDL_user_allocate(NamesBufferLength); > - if (NamesBuffer == NULL) > - { > - Status = STATUS_INSUFFICIENT_RESOURCES; > - goto done; > - } > - > - DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); > - if (DomainsBuffer == NULL) > - { > - Status = STATUS_INSUFFICIENT_RESOURCES; > - goto done; > - } > - > - DomainsBuffer->Domains = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSA_TRUST_INFORMATION)); > - if (DomainsBuffer->Domains == NULL) > - { > - Status = STATUS_INSUFFICIENT_RESOURCES; > - goto done; > - } > - > - DomainsBuffer->Entries = 0; > - DomainsBuffer->MaxEntries = SidEnumBuffer->Entries; > - > - /* Initialize all name entries */ > for (i = 0; i < SidEnumBuffer->Entries; i++) > { > - NamesBuffer[i].Use = SidTypeUnknown; > - NamesBuffer[i].Name.Length = 0; > - NamesBuffer[i].Name.MaximumLength = 0; > - NamesBuffer[i].Name.Buffer = NULL; > - NamesBuffer[i].DomainIndex = -1; > - NamesBuffer[i].Flags = 0; > - } > - > - > - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, > - 2, > - SECURITY_BUILTIN_DOMAIN_RID, > - DOMAIN_ALIAS_RID_ADMINS, > - 0, 0, 0, 0, 0, 0, > - &AdminsSid); > - if (!NT_SUCCESS(Status)) > - goto done; > - > - > - SidLength = RtlLengthSid(AdminsSid); > - > - > - for (i = 0; i < SidEnumBuffer->Entries; i++) > - { > + /* Ignore SIDs which are already mapped */ > + if (NamesBuffer[i].Use != SidTypeUnknown) > + continue; > + > + ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); > + TRACE("Unmapped SID: %S\n", SidString); > + LocalFree(SidString); > + SidString = NULL; > + > ptr = LsapLookupWellKnownSid(SidEnumBuffer->SidInfo[i].Sid); > if (ptr != NULL) > { > @@ -1106,13 +1059,83 @@ > NamesBuffer[i].DomainIndex = DomainIndex; > } > > - Mapped++; > + TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); > + > + (*Mapped)++; > + } > + } > + > + return Status; > +} > + > + > +static NTSTATUS > +LsapLookupLocalDomainSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, > + PLSAPR_TRANSLATED_NAME_EX NamesBuffer, > + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, > + PULONG Mapped) > +{ > + LPWSTR SidString = NULL; > + ULONG i; > + > + for (i = 0; i < SidEnumBuffer->Entries; i++) > + { > + /* Ignore SIDs which are already mapped */ > + if (NamesBuffer[i].Use != SidTypeUnknown) > continue; > - } > + > + ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); > + TRACE("Unmapped SID: %S\n", SidString); > + LocalFree(SidString); > + SidString = NULL; > + } > + > + return STATUS_SUCCESS; > +} > + > + > +static NTSTATUS > +LsapLookupUnknownSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, > + PLSAPR_TRANSLATED_NAME_EX NamesBuffer, > + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, > + PULONG Mapped) > +{ > + SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; > + static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); > + static const UNICODE_STRING AdminName = RTL_CONSTANT_STRING(L"Administrator"); > + PSID AdminsSid = NULL; > + LPWSTR SidString = NULL; > + ULONG SidLength; > + ULONG DomainIndex; > + ULONG i; > + NTSTATUS Status; > + > + Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, > + 2, > + SECURITY_BUILTIN_DOMAIN_RID, > + DOMAIN_ALIAS_RID_ADMINS, > + 0, 0, 0, 0, 0, 0, > + &AdminsSid); > + if (!NT_SUCCESS(Status)) > + goto done; > + > + SidLength = RtlLengthSid(AdminsSid); > + > + for (i = 0; i < SidEnumBuffer->Entries; i++) > + { > + /* Ignore SIDs which are already mapped */ > + if (NamesBuffer[i].Use != SidTypeUnknown) > + continue; > + > + > + ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); > + TRACE("Unmapped SID: %S\n", SidString); > + LocalFree(SidString); > + SidString = NULL; > > > /* Hack: Map the SID to the Admin Account if it is not a well-known SID */ > - NamesBuffer[i].Use = SidTypeWellKnownGroup; > + NamesBuffer[i].Use = SidTypeUser; > NamesBuffer[i].Flags = 0; > NamesBuffer[i].Name.Length = AdminName.Length; > NamesBuffer[i].Name.MaximumLength = AdminName.MaximumLength; > @@ -1126,16 +1149,103 @@ > if (NT_SUCCESS(Status)) > NamesBuffer[i].DomainIndex = DomainIndex; > > - Mapped++; > - continue; > - > - > + TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); > + > + (*Mapped)++; > } > > done: > if (AdminsSid != NULL) > RtlFreeSid(AdminsSid); > > + return Status; > +} > + > + > +NTSTATUS > +LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, > + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, > + PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, > + LSAP_LOOKUP_LEVEL LookupLevel, > + DWORD *MappedCount, > + DWORD LookupOptions, > + DWORD ClientRevision) > +{ > + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; > + PLSAPR_TRANSLATED_NAME_EX NamesBuffer = NULL; > + ULONG NamesBufferLength; > + ULONG i; > + ULONG Mapped = 0; > + NTSTATUS Status = STATUS_SUCCESS; > + > + NamesBufferLength = SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME_EX); > + NamesBuffer = MIDL_user_allocate(NamesBufferLength); > + if (NamesBuffer == NULL) > + { > + Status = STATUS_INSUFFICIENT_RESOURCES; > + goto done; > + } > + > + DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); > + if (DomainsBuffer == NULL) > + { > + Status = STATUS_INSUFFICIENT_RESOURCES; > + goto done; > + } > + > + DomainsBuffer->Domains = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSA_TRUST_INFORMATION)); > + if (DomainsBuffer->Domains == NULL) > + { > + Status = STATUS_INSUFFICIENT_RESOURCES; > + goto done; > + } > + > + DomainsBuffer->Entries = 0; > + DomainsBuffer->MaxEntries = SidEnumBuffer->Entries; > + > + /* Initialize all name entries */ > + for (i = 0; i < SidEnumBuffer->Entries; i++) > + { > + NamesBuffer[i].Use = SidTypeUnknown; > + NamesBuffer[i].Name.Length = 0; > + NamesBuffer[i].Name.MaximumLength = 0; > + NamesBuffer[i].Name.Buffer = NULL; > + NamesBuffer[i].DomainIndex = -1; > + NamesBuffer[i].Flags = 0; > + } > + > + /* Look-up all well-known SIDs */ > + Status = LsapLookupWellKnownSids(SidEnumBuffer, > + NamesBuffer, > + DomainsBuffer, > + &Mapped); > + if (!NT_SUCCESS(Status)) > + goto done; > + > + if (Mapped == SidEnumBuffer->Entries) > + goto done; > + > + /* Look-up all Domain SIDs */ > + Status = LsapLookupLocalDomainSids(SidEnumBuffer, > + NamesBuffer, > + DomainsBuffer, > + &Mapped); > + if (!NT_SUCCESS(Status)) > + goto done; > + > + if (Mapped == SidEnumBuffer->Entries) > + goto done; > + > + /* Map unknown SIDs */ > + Status = LsapLookupUnknownSids(SidEnumBuffer, > + NamesBuffer, > + DomainsBuffer, > + &Mapped); > + if (!NT_SUCCESS(Status)) > + goto done; > + > +done: > + TRACE("done Status: %lx Mapped: %lu\n", Status, Mapped); > > if (!NT_SUCCESS(Status)) > { > > >

12 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 57504: [NTOSKRNL] Rearrange the NtQuerySystemEnvironmentValue code to have successive logical checks.

by Timo Kreuzer

This changes the logic. I'm not sure how exact the previous version was, but these changes should be tested. Am 06.10.2012 21:50, schrieb hbelusca(a)svn.reactos.org: > Author: hbelusca > Date: Sat Oct 6 19:50:17 2012 > New Revision: 57504 > > URL: http://svn.reactos.org/svn/reactos?rev=57504&view=rev > Log: > [NTOSKRNL] > Rearrange the NtQuerySystemEnvironmentValue code to have successive logical checks. > > Modified: > trunk/reactos/ntoskrnl/ex/sysinfo.c > > Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Oct 6 19:50:17 2012 > @@ -235,44 +235,40 @@ > _SEH2_YIELD(return _SEH2_GetExceptionCode()); > } > _SEH2_END; > - > - } > - > - /* Allocate a buffer for the value */ > - AnsiValueBuffer = ExAllocatePoolWithTag(NonPagedPool, ValueBufferLength, 'pmeT'); > - if (AnsiValueBuffer == NULL) > - { > - return STATUS_INSUFFICIENT_RESOURCES; > - } > - > - /* > - * Copy the name to kernel space if necessary and convert it to ANSI. > - */ > + } > + > + /* According to NTInternals the SeSystemEnvironmentName privilege is required! */ > + if (!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, PreviousMode)) > + { > + DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); > + return STATUS_PRIVILEGE_NOT_HELD; > + } > + > + /* Copy the name to kernel space if necessary */ > Status = ProbeAndCaptureUnicodeString(&WName, PreviousMode, VariableName); > if (!NT_SUCCESS(Status)) > { > return Status; > } > > - /* > - * according to ntinternals the SeSystemEnvironmentName privilege is required! > - */ > - if (!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, PreviousMode)) > - { > - ReleaseCapturedUnicodeString(&WName, PreviousMode); > - DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); > - return STATUS_PRIVILEGE_NOT_HELD; > - } > - > - /* Convert the value name to ansi and release the captured unicode string */ > + /* Convert the name to ANSI and release the captured UNICODE string */ > Status = RtlUnicodeStringToAnsiString(&AName, &WName, TRUE); > ReleaseCapturedUnicodeString(&WName, PreviousMode); > if (!NT_SUCCESS(Status)) return Status; > > - /* Get the environment variable */ > + /* Allocate a buffer for the ANSI environment variable */ > + AnsiValueBuffer = ExAllocatePoolWithTag(NonPagedPool, ValueBufferLength, 'pmeT'); > + if (AnsiValueBuffer == NULL) > + { > + RtlFreeAnsiString(&AName); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Get the environment variable and free the ANSI name */ > Result = HalGetEnvironmentVariable(AName.Buffer, > (USHORT)ValueBufferLength, > AnsiValueBuffer); > + RtlFreeAnsiString(&AName); > > /* Check if we had success */ > if (Result == ESUCCESS) > @@ -280,13 +276,13 @@ > /* Copy the result back to the caller. */ > _SEH2_TRY > { > - /* Initialize ansi string from the result */ > + /* Initialize ANSI string from the result */ > RtlInitAnsiString(&AValue, AnsiValueBuffer); > > - /* Initialize a unicode string from the callers buffer */ > + /* Initialize a UNICODE string from the callers buffer */ > RtlInitEmptyUnicodeString(&WValue, ValueBuffer, ValueBufferLength); > > - /* Convert the result to unicode */ > + /* Convert the result to UNICODE */ > Status = RtlAnsiStringToUnicodeString(&WValue, &AValue, FALSE); > > if (ReturnLength != NULL) > @@ -305,8 +301,7 @@ > Status = STATUS_UNSUCCESSFUL; > } > > - /* Cleanup allocated resources. */ > - RtlFreeAnsiString(&AName); > + /* Free the allocated ANSI value buffer */ > ExFreePoolWithTag(AnsiValueBuffer, 'pmeT'); > > return Status; > > >

12 years, 11 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [tfaber] 57485: [SHELL32] - Fix what might finally be the last missing "this->" instances left over from the C++ conversion (used a regex this time)

by Timo Kreuzer

Shouldn't member variables rather be prefixed with m_? Am 05.10.2012 01:46, schrieb tfaber(a)svn.reactos.org: > Author: tfaber > Date: Thu Oct 4 23:46:59 2012 > New Revision: 57485 > > URL: http://svn.reactos.org/svn/reactos?rev=57485&view=rev > Log: > [SHELL32] > - Fix what might finally be the last missing "this->" instances left over from the C++ conversion (used a regex this time) > > Modified: > trunk/reactos/dll/win32/shell32/folders/cpanel.cpp > trunk/reactos/dll/win32/shell32/folders/mycomp.cpp > trunk/reactos/dll/win32/shell32/shlview.cpp > > Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… > ============================================================================== > --- trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 > @@ -540,7 +540,7 @@ > // > pObj = (IContextMenu *)this; > this->apidl = apidl; > - cidl = cidl; > + this->cidl = cidl; > pObj->AddRef(); > hr = S_OK; > } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { > > Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… > ============================================================================== > --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 > @@ -728,7 +728,7 @@ > > wcscpy(sName, lpName); > SHFree(sName); > - sName = sName; > + this->sName = sName; > TRACE("result %s\n", debugstr_w(sName)); > return S_OK; > } > > Modified: trunk/reactos/dll/win32/shell32/shlview.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… > ============================================================================== > --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 > @@ -2828,7 +2828,7 @@ > FIXME("partial stub: %p %08x %08x %p\n", this, aspects, advf, pAdvSink); > > /* FIXME: we set the AdviseSink, but never use it to send any advice */ > - pAdvSink = pAdvSink; > + this->pAdvSink = pAdvSink; > dwAspects = aspects; > dwAdvf = advf; > > > >

12 years, 11 months

4
3
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 57462: [REGEDIT] - WCHAR ==> TCHAR in (before a REALLY conversion of regedit into UNICODE) - Correct some mistakes in displayed strings - Improve informative / warning / error messages w...

by Timo Kreuzer

Please don't use TCHAR. Make everything WCHAR and use widechar functions explicitly. Am 03.10.2012 01:29, schrieb hbelusca(a)svn.reactos.org: > Author: hbelusca > Date: Tue Oct 2 23:29:22 2012 > New Revision: 57462 > > URL: http://svn.reactos.org/svn/reactos?rev=57462&view=rev > Log: > [REGEDIT] > - WCHAR ==> TCHAR in (before a REALLY conversion of regedit into UNICODE) > - Correct some mistakes in displayed strings > - Improve informative / warning / error messages when importing registry files > - Now, try to import each registry file specified in the command line and don't fail miserably when one of them is missing, but continue with the next one (as Windows' regedit does). > Patch by Edijs Kolesnikovičs (2/2) adapted by me. > > CORE-6239 #comment Fixed in r57462 with some adaptations. Thanks ;) #resolve > > Modified: > trunk/reactos/base/applications/regedit/regedit.c > > Modified: trunk/reactos/base/applications/regedit/regedit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… > ============================================================================== > --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) > +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Tue Oct 2 23:29:22 2012 > @@ -23,30 +23,31 @@ > > static const char *usage = > "Usage:\n" > - " regedit filename\n" > + " regedit filenames\n" > " regedit /E filename [regpath]\n" > " regedit /D regpath\n" > "\n" > - "filename - registry file name\n" > - "regpath - name of the registry key\n" > + "filenames - List of registry files names\n" > + "filename - Registry file name\n" > + "regpath - Name of the registry key\n" > "\n" > "When is called without any switches adds contents of the specified\n" > - "registry file to the registry\n" > + "registry files to the registry.\n" > "\n" > "Switches:\n" > - " /E - exports contents of the specified registry key to the specified\n" > - " file. Exports the whole registry if no key is specified.\n" > - " /D - deletes specified registry key\n" > - " /S - silent execution, can be used with any other switch.\n" > - " The only existing mode, exists for compatibility with Windows regedit.\n" > - " /V - advanced mode, can be used with any other switch.\n" > - " Ignored, exists for compatibility with Windows regedit.\n" > - " /L - location of system.dat file. Can be used with any other switch.\n" > - " Ignored. Exists for compatibility with Windows regedit.\n" > - " /R - location of user.dat file. Can be used with any other switch.\n" > - " Ignored. Exists for compatibility with Windows regedit.\n" > - " /? - print this help. Any other switches are ignored.\n" > - " /C - create registry from. Not implemented.\n" > + " /E - Exports contents of the specified registry key to the specified\n" > + " file. Exports the whole registry if no key is specified.\n" > + " /D - Deletes specified registry key\n" > + " /S - Silent execution, can be used with any other switch.\n" > + " The only existing mode, exists for compatibility with Windows regedit.\n" > + " /V - Advanced mode, can be used with any other switch.\n" > + " Ignored, exists for compatibility with Windows regedit.\n" > + " /L - Location of system.dat file. Can be used with any other switch.\n" > + " Ignored. Exists for compatibility with Windows regedit.\n" > + " /R - Location of user.dat file. Can be used with any other switch.\n" > + " Ignored. Exists for compatibility with Windows regedit.\n" > + " /? - Print this help. Any other switches are ignored.\n" > + " /C - Create registry from. Not implemented.\n" > "\n" > "The switches are case-insensitive, can be prefixed either by '-' or '/'.\n" > "This program is command-line compatible with Microsoft Windows\n" > @@ -74,10 +75,10 @@ > * where *s[0] is the first symbol of the file name. > * file_name - buffer to write the file name to. > */ > -void get_file_name(LPWSTR *command_line, LPWSTR file_name) > -{ > - WCHAR *s = *command_line; > - int pos = 0; /* position of pointer "s" in *command_line */ > +void get_file_name(LPTSTR *command_line, LPTSTR file_name) > +{ > + TCHAR *s = *command_line; > + int pos = 0; /* position of pointer "s" in *command_line */ > file_name[0] = 0; > > if (!s[0]) > @@ -85,11 +86,11 @@ > return; > } > > - if (s[0] == L'"') > + if (s[0] == _T('"')) > { > s++; > (*command_line)++; > - while(s[0] != L'"') > + while(s[0] != _T('"')) > { > if (!s[0]) > { > @@ -102,7 +103,7 @@ > } > else > { > - while(s[0] && !iswspace(s[0])) > + while(s[0] && !_istspace(s[0])) > { > s++; > pos++; > @@ -110,13 +111,13 @@ > } > memcpy(file_name, *command_line, pos * sizeof(WCHAR)); > /* remove the last backslash */ > - if (file_name[pos - 1] == L'\\') > - { > - file_name[pos - 1] = L'\0'; > + if (file_name[pos - 1] == _T('\\')) > + { > + file_name[pos - 1] = _T('\0'); > } > else > { > - file_name[pos] = L'\0'; > + file_name[pos] = _T('\0'); > } > > if (s[0]) > @@ -124,7 +125,7 @@ > s++; > pos++; > } > - while(s[0] && iswspace(s[0])) > + while(s[0] && _istspace(s[0])) > { > s++; > pos++; > @@ -132,88 +133,116 @@ > (*command_line) += pos; > } > > -BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s, BOOL silent) > -{ > - TCHAR szTitle[256], szText[256]; > +BOOL PerformRegAction(REGEDIT_ACTION action, LPTSTR s, BOOL silent) > +{ > switch (action) > { > - case ACTION_ADD: > - { > - WCHAR filename[MAX_PATH]; > - FILE *fp; > - > - get_file_name(&s, filename); > - if (!filename[0]) > - { > - fprintf(stderr, "%s: No file name is specified\n", getAppName()); > - fprintf(stderr, usage); > - exit(4); > - } > - > - while(filename[0]) > - { > - fp = _wfopen(filename, L"r"); > - if (fp == NULL) > - { > - LPSTR p = GetMultiByteString(filename); > - perror(""); > - fprintf(stderr, "%s: Can't open file \"%s\"\n", getAppName(), p); > - HeapFree(GetProcessHeap(), 0, p); > - exit(5); > - } > - import_registry_file(fp); > + case ACTION_ADD: > + { > + TCHAR szTitle[512], szText[512]; > + TCHAR filename[MAX_PATH]; > + FILE *fp; > + > get_file_name(&s, filename); > + if (!filename[0]) > + { > + fprintf(stderr, "%s: No file name is specified\n", getAppName()); > + fprintf(stderr, usage); > + exit(4); > + } > + > LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); > - LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); > - /* show successful import */ > - if (!silent) > - MessageBox(NULL, szText, szTitle, MB_OK); > - } > - break; > - } > - case ACTION_DELETE: > - { > - WCHAR reg_key_name[KEY_MAX_LEN]; > - get_file_name(&s, reg_key_name); > - if (!reg_key_name[0]) > - { > - fprintf(stderr, "%s: No registry key is specified for removal\n", getAppName()); > - fprintf(stderr, usage); > - exit(6); > - } > - delete_registry_key(reg_key_name); > - break; > - } > - case ACTION_EXPORT: > - { > - WCHAR filename[MAX_PATH]; > - > - filename[0] = _T('\0'); > - get_file_name(&s, filename); > - if (!filename[0]) > - { > - fprintf(stderr, "%s: No file name is specified\n", getAppName()); > - fprintf(stderr, usage); > - exit(7); > - } > - > - if (s[0]) > - { > - WCHAR reg_key_name[KEY_MAX_LEN]; > + > + while (filename[0]) > + { > + /* Request import confirmation */ > + if (!silent) > + { > + LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); > + > + if (InfoMessageBox(NULL, MB_YESNO | MB_ICONWARNING, szTitle, szText, filename) != IDYES) > + goto cont; > + } > + > + fp = _tfopen(filename, _T("r")); > + if (fp != NULL) > + { > + import_registry_file(fp); > + > + /* Show successful import */ > + if (!silent) > + { > + LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); > + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, szText, filename); > + } > + } > + else > + { > + LPSTR p = GetMultiByteString(filename); > + perror(""); > + fprintf(stderr, "%s: Can't open file \"%s\"\n", getAppName(), p); > + HeapFree(GetProcessHeap(), 0, p); > + > + /* Error opening the file */ > + if (!silent) > + { > + LoadString(hInst, IDS_IMPORT_ERROR, szText, COUNT_OF(szText)); > + InfoMessageBox(NULL, MB_OK | MB_ICONERROR, szTitle, szText, filename); > + } > + } > + > +cont: > + get_file_name(&s, filename); > + } > + break; > + } > + > + case ACTION_DELETE: > + { > + TCHAR reg_key_name[KEY_MAX_LEN]; > get_file_name(&s, reg_key_name); > - export_registry_key(filename, reg_key_name, REG_FORMAT_4); > - } > - else > - { > - export_registry_key(filename, NULL, REG_FORMAT_4); > - } > - break; > - } > - default: > - fprintf(stderr, "%s: Unhandled action!\n", getAppName()); > - exit(8); > - break; > - } > + if (!reg_key_name[0]) > + { > + fprintf(stderr, "%s: No registry key is specified for removal\n", getAppName()); > + fprintf(stderr, usage); > + exit(6); > + } > + delete_registry_key(reg_key_name); > + break; > + } > + > + case ACTION_EXPORT: > + { > + TCHAR filename[MAX_PATH]; > + > + filename[0] = _T('\0'); > + get_file_name(&s, filename); > + if (!filename[0]) > + { > + fprintf(stderr, "%s: No file name is specified\n", getAppName()); > + fprintf(stderr, usage); > + exit(7); > + } > + > + if (s[0]) > + { > + TCHAR reg_key_name[KEY_MAX_LEN]; > + get_file_name(&s, reg_key_name); > + export_registry_key(filename, reg_key_name, REG_FORMAT_4); > + } > + else > + { > + export_registry_key(filename, NULL, REG_FORMAT_4); > + } > + break; > + } > + > + default: > + fprintf(stderr, "%s: Unhandled action!\n", getAppName()); > + exit(8); > + break; > + } > + > return TRUE; > } > > @@ -233,35 +262,35 @@ > else > { > fprintf(stderr, "%s: Alphabetic character is expected after '%c' " > - "in swit ch specification\n", getAppName(), *(s - 1)); > + "in switch specification\n", getAppName(), *(s - 1)); > } > exit(1); > } > > -BOOL ProcessCmdLine(LPWSTR lpCmdLine) > +BOOL ProcessCmdLine(LPTSTR lpCmdLine) > { > BOOL silent = FALSE; > REGEDIT_ACTION action = ACTION_UNDEF; > - LPWSTR s = lpCmdLine; /* command line pointer */ > - WCHAR ch = *s; /* current character */ > - > - while (ch && ((ch == L'-') || (ch == L'/'))) > - { > - WCHAR chu; > - WCHAR ch2; > + LPTSTR s = lpCmdLine; /* command line pointer */ > + TCHAR ch = *s; /* current character */ > + > + while (ch && ((ch == _T('-')) || (ch == _T('/')))) > + { > + TCHAR chu; > + TCHAR ch2; > > s++; > ch = *s; > ch2 = *(s + 1); > - chu = (WCHAR)towupper(ch); > - if (!ch2 || iswspace(ch2)) > - { > - if (chu == L'S') > + chu = _totupper(ch); > + if (!ch2 || _istspace(ch2)) > + { > + if (chu == _T('S')) > { > /* Silence dialogs */ > silent = TRUE; > } > - else if (chu == L'V') > + else if (chu == _T('V')) > { > /* Ignore this switch */ > } > @@ -269,41 +298,41 @@ > { > switch (chu) > { > - case L'D': > - action = ACTION_DELETE; > - break; > - case L'E': > - action = ACTION_EXPORT; > - break; > - case L'?': > - fprintf(stderr, usage); > - exit(3); > - break; > - default: > - error_unknown_switch(chu, s); > - break; > + case _T('D'): > + action = ACTION_DELETE; > + break; > + case _T('E'): > + action = ACTION_EXPORT; > + break; > + case _T('?'): > + fprintf(stderr, usage); > + exit(3); > + break; > + default: > + error_unknown_switch(chu, s); > + break; > } > } > s++; > } > else > { > - if (ch2 == L':') > + if (ch2 == _T(':')) > { > switch (chu) > { > - case L'L': > - /* fall through */ > - case L'R': > - s += 2; > - while (*s && !iswspace(*s)) > - { > - s++; > - } > - break; > - default: > - error_unknown_switch(chu, s); > - break; > + case _T('L'): > + /* fall through */ > + case _T('R'): > + s += 2; > + while (*s && !_istspace(*s)) > + { > + s++; > + } > + break; > + default: > + error_unknown_switch(chu, s); > + break; > } > } > else > @@ -315,7 +344,7 @@ > } > /* skip spaces to the next parameter */ > ch = *s; > - while (ch && iswspace(ch)) > + while (ch && _istspace(ch)) > { > s++; > ch = *s; > @@ -323,25 +352,10 @@ > } > > if (*s && action == ACTION_UNDEF) > - { > - if (!silent) > - { > - TCHAR szTitle[256], szText[256]; > - LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); > - LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); > - /* request import confirmation */ > - if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) > - action = ACTION_ADD; > - else > - return TRUE; > - } > - else > - { > - action = ACTION_ADD; > - } > - } > - if (action == ACTION_UNDEF) > + action = ACTION_ADD; > + > + if (action != ACTION_UNDEF) > + return PerformRegAction(action, s, silent); > + else > return FALSE; > - > - return PerformRegAction(action, s, silent); > -} > +} > > >

12 years, 11 months

2
1
0 0

Everithing is down?

by Александр

12 years, 11 months

3
3
0 0

General life fault

by caemyr＠myopera.com

Hiya Unfortunately, my lappy has died yesterday. I`ll RMA it this week (its just 6mo old...) but who knows how long will it take. I`ll get one as replacement from my work tomorow, but still this means no testing for me, just the web works for few next weeks. -- With best regards Caemyr

12 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 57400: [NTOSKRNL] Coverity code defects fixes : - Cache: CID 701441 - Config: CIDs 716570, 716669, 716760 - Dbgk: Kdbg: CIDs 716571, 515128/9, 500432 - Ex: CIDs 500156/7, 515122, 716200/...

by Pierre Schweitzer

What's the purpose of such ASSERT? > Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Thu Sep 27 17:16:31 2012 > @@ -586,6 +586,13 @@ > /* Allocate new notification */ > NotifyChange = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, > sizeof(NOTIFY_CHANGE), 'FSrN'); > + > + /* > + * If NotifyChange == NULL then an > + * exception was already raised. > + */ > + ASSERT(NotifyChange != NULL); > + > RtlZeroMemory(NotifyChange, sizeof(NOTIFY_CHANGE)); > > /* Set basic information */ > -- Pierre Schweitzer <pierre(a)reactos.org> System Administrator ReactOS Foundation

12 years, 11 months

2
2
0 0

Monthly meeting - September 2012

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place last Thursday of this month, 28th of September, 19:00 UTC. The meeting will be at irc://dev.reactos.org (Port 6667, no SSL) in the channel #meeting, or as Pierre/Colin say. Note that the IRC service will only be started shortly before the meeting. Your participation passwords will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. If someone still is not getting passwords sent before a meeting - please email Colin or Pierre before the meeting started to get one. In order to save time, let's choose who is going to be the minute taker on the upcoming meeting. As usual, Z98 is welcome to volunteer. The agenda will be posted shortly before the meeting, suggestions are welcome (send them to my email as usual). With the best regards, Aleksey Bragin.

12 years, 11 months

5
7
0 0

Fwd: buildbot failure in ReactOS on Windows_AMD64_1 VBox-Test

by caemyr＠myopera.com

@Giannis - as you required: http://svn.reactos.org/svn/reactos?view=revision&revision=57330 This commit is causing the following crash in user32_apitest:desktop (reported in CORE-6682 desktop.c:83: Test failed: 3: expected error 0xc0000142 in child process got 0x0 (../../win32ss/user/ntuser/desktop.c:340) err: Failed to reference desktop WinSta0/Default PID: --! (../../win32ss/user/ntuser/main.c:333) err: Failed to assign default dekstop and winsta to process (../../win32ss/user/ntuser/main.c:374) err: UserCreateThreadInfo failed! Freeing pti 0xB09C5A70 for TID 00000590 (../../dll/ntdll/ldr/ldrinit.c:829) LDR: DLL_PROCESS_ATTACH for dll "user32.dll" (InitRoutine: 77ABADBF) failed (../../dll/ntdll/ldr/ldrinit.c:2111) LDR: LdrpProcessInitialization failed running initialization routines; status c0000142 (../../dll/ntdll/ldr/ldrinit.c:2140) LDR: Process initialization failure for C:\ReactOS\bin\user32_apitest.exe; NTSTATUS = c0000142 (../../subsystems/win32/csrss/csrsrv/api/wapi.c:1221) Exception in 59c.590. Killing... (../../win32ss/user/ntuser/desktop.c:340) err: Failed to reference desktop NonExistantDesktop PID: --! (../../win32ss/user/ntuser/main.c:333) err: Failed to assign default dekstop and winsta to process (../../win32ss/user/ntuser/main.c:374) err: UserCreateThreadInfo failed! Freeing pti 0xB097F008 for TID 00000588 (../../dll/ntdll/ldr/ldrinit.c:829) LDR: DLL_PROCESS_ATTACH for dll "user32.dll" (InitRoutine: 77ABADBF) failed (../../dll/ntdll/ldr/ldrinit.c:2111) LDR: LdrpProcessInitialization failed running initialization routines; status c0000142 (../../dll/ntdll/ldr/ldrinit.c:2140) LDR: Process initialization failure for C:\ReactOS\bin\user32_apitest.exe; NTSTATUS = c0000142 (../../subsystems/win32/csrss/csrsrv/api/wapi.c:1221) Exception in 594.588. Killing... (../../win32ss/user/ntuser/desktop.c:308) err: Failed to reference window station \Windows\WindowStations\NonExistantWinsta PID: --! (../../win32ss/user/ntuser/main.c:333) err: Failed to assign default dekstop and winsta to process (../../win32ss/user/ntuser/main.c:374) err: UserCreateThreadInfo failed! Freeing pti 0xB0A444F8 for TID 00000580 (../../dll/ntdll/ldr/ldrinit.c:829) LDR: DLL_PROCESS_ATTACH for dll "user32.dll" (InitRoutine: 77ABADBF) failed (../../dll/ntdll/ldr/ldrinit.c:2111) LDR: LdrpProcessInitialization failed running initialization routines; status c0000142 (../../dll/ntdll/ldr/ldrinit.c:2140) LDR: Process initialization failure for C:\ReactOS\bin\user32_apitest.exe; NTSTATUS = c0000142 (../../subsystems/win32/csrss/csrsrv/api/wapi.c:1221) Exception in 58c.580. Killing... (../../ntoskrnl/mm/ARM3/section.c:386) Out of system view space Assertion 'Base' failed at ../../ntoskrnl/mm/ARM3/section.c line 1041 [7h Entered debugger on embedded INT3 at 0x0008:0x8092582e. kdb:> bt Eip: <NTOSKRNL.EXE:12582f (../../lib/rtl/i386/debug_asm.S:35 (_DbgBreakPoint@0))> Frames: <NTOSKRNL.EXE:b773f (../../ntoskrnl/mm/ARM3/section.c:1041 (MiMapViewInSystemSpace@16))> <NTOSKRNL.EXE:b78ee (../../ntoskrnl/mm/ARM3/section.c:2655 (MmMapViewInSessionSpace@12))> <win32k.sys:148c8 (../../win32ss/user/ntuser/misc/usrheap.c:201 (UserCreateHeap))> <win32k.sys:359e1 (../../include/ddk/wdm.h:0 (UserDestroyThreadInfo@4))> <NTOSKRNL.EXE:11100e (../../ntoskrnl/ke/i386/traphdlr.c:1629 (@KiFastCallEntryHandler@8))> <NTOSKRNL.EXE:10ebfd (../../ntoskrnl/ke/i386/trap.s:150 (_KiFastCallEntry))> <ntdll.dll:b065> <user32_apitest.exe:84f2> ----- Original message ----- From: buildbot(a)reactos.org To: caemyr(a)myopera.com Subject: buildbot failure in ReactOS on Windows_AMD64_1 VBox-Test Date: Wed, 19 Sep 2012 02:32:21 +0000 The Buildbot has finished a build on builder Windows_AMD64_1 VBox-Test while building ReactOS. Full details are available at: http://build.reactos.org/builders/Windows_AMD64_1%20VBox-Test/builds/6627 Buildbot URL: http://build.reactos.org/ Buildslave for this Build: Windows_AMD64_2 Build Reason: Triggerable(Windows_AMD64_1 VBox-Test Trigger) Build Source Stamp: 57330 Blamelist: ion BUILD FAILED: failed Cleanup sincerely, -The Buildbot -- With best regards Caemyr

12 years, 12 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 57313: * Don't use -momit-leaf-frame-pointer in debug gcc builds, it messes up stack traces. * Remove it from the amd64 gcc builds too.

by Timo Kreuzer

Amd64 doesn't need a frame pointer. Backtraces are made based on unwind tables. At least if GCC conforms to the ABI. Am 16.09.2012 14:57, schrieb akhaldi(a)svn.reactos.org: > Author: akhaldi > Date: Sun Sep 16 12:57:22 2012 > New Revision: 57313 > > URL: http://svn.reactos.org/svn/reactos?rev=57313&view=rev > Log: > * Don't use -momit-leaf-frame-pointer in debug gcc builds, it messes up stack traces. > * Remove it from the amd64 gcc builds too. > > Modified: > trunk/reactos/cmake/gcc.cmake > > Modified: trunk/reactos/cmake/gcc.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=57313&… > ============================================================================== > --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Sep 16 12:57:22 2012 > @@ -83,12 +83,15 @@ > if(ARCH STREQUAL "i386") > add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") > if(OPTIMIZE STREQUAL "1") > - add_compile_flags("-ftracer -momit-leaf-frame-pointer") > + add_compile_flags("-ftracer") > + if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") > + add_compile_flags("-momit-leaf-frame-pointer") > + endif() > endif() > elseif(ARCH STREQUAL "amd64") > add_compile_flags("-mpreferred-stack-boundary=4") > if(OPTIMIZE STREQUAL "1") > - add_compile_flags("-ftracer -momit-leaf-frame-pointer") > + add_compile_flags("-ftracer") > endif() > elseif(ARCH STREQUAL "arm") > if(OPTIMIZE STREQUAL "1") > > >

12 years, 12 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [mnordell] 57288: Add comment explaining initialization.

by Thomas Faber

On 2012-09-13 02:52, mnordell(a)svn.reactos.org wrote: > --- trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] Thu Sep 13 00:52:12 2012 > @@ -1211,7 +1211,7 @@ > BOOLEAN FirstTry; > ULONG i; > PCSR_SERVER_DLL ServerDll; > - ULONG Result = 0; > + ULONG Result = 0; /* Intentionally invalid enumeratee to silence compiler warning */ > > /* Acquire process lock */ > CsrAcquireProcessLock(); Frankly, I still don't understand it :D As I recall, this warning isn't a false positive, is it? Thus one would logically "fix", not "silence" it.

12 years, 12 months

1
0
0 0

uLAN driver with ReactOS USB advances and some questions

by Pavel Pisa

Dear ReactOS developers, I follow ReactOS development for some years. I have successfully tested and reported our uLAN driver with PCI cards on ReactOS two years ago. The latest inclusion of USB VENDOR device requests in ReactOS allowed to finally run driver with our real USB hardware with QEMU KVM USB device pass-through setup. ReactOS tuned version of the uLAN driver installs and is fully functional when tested from CHROMuLAN application. But there are more issues still and I would be happy if somebody can help with these or give me hint about possible incompatibility in our driver. The tests were conducted against ReactOS 57254 build. uLAN driver is from GIT source repository http://ulan.sourceforge.net/ http://ulan.git.sourceforge.net/git/gitweb.cgi?p=ulan/ulan-drv;a=tree;f=ul_… uLAN driver was build by MS WDF VC version 15.00.30729.207 The issues: 1) the first minor one - ReactOS requires minimal transfer size for URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE/USB_CONFIGURATION_DESCRIPTOR_TYPE function (/srv/buildbot_cmake/full_cmake/build/drivers/usb/usbhub/pdo.c:244) URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE ulan: _usb_submit_urb : return from IoCallDriver USBD 103 ulan: _usb_submit_urb : URB status = 0 status = 0 irp status 0 uLan: _usb_submit_urb done with status:0x0 uLan: _usb_get_descriptor done with status:0x0 uLan: usb_device_descriptor done with status:0x0 uLan: usb_get_configuration uLan: _usb_get_descriptor (type=0x2,idx=0x0) ulan: _usb_submit_urb : enter (/srv/buildbot_cmake/full_cmake/build/drivers/usb/usbhub/pdo.c:244) URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE Assertion 'Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_CONFIGURATION_DESCRIPTOR)' failed at /srv/buildbot_ cmake/full_cmake/build/lib/drivers/libusb/hub_controller.cpp line 1560 Entered debugger on embedded INT3 at 0x0008:0x80924c3a. Unmodified uLAN driver asks for the first four bytes descriptor bytes firest and after obtaining size of the whole descriptor it prepares full size transfer. ReactOS asserts for this shorted 4 bytes transfer. I have adapted driver to use sizeof(USB_CONFIGURATION_DESCRIPTOR) size for initial probe transfer in USB_CONFIGURATION_DESCRIPTOR_TYPE case. This makes ReactOS happy, but I would like to know which side should be updated in the future. Is there defined in some spec that initial probe for size has to be at least of sizeof(USB_CONFIGURATION_DESCRIPTOR) or the ReactOS is more strict than necessary and assert should be modified to allow truncated probes or at least 4 bytes ones in addition? The full log at http://cmp.felk.cvut.cz/~pisa/ulan/reactos/reactos-ul-win-confdesc.log 2) Driver can be enabled and disabled at runtime but shutdown does not finish, is blocked somehow but system/cursor is responsive http://cmp.felk.cvut.cz/~pisa/ulan/reactos/reactos-ul-enabled-at-runtime.log I have no idea what is the problem. Driver works correctly on Windows from 2k to Win7 and latest version supports even suspend and resume on all these platforms. 3) When driver and device are installed/present from boot time, boot hangs http://cmp.felk.cvut.cz/~pisa/ulan/reactos/reactos-ul-during-boot.log (/srv/buildbot_cmake/full_cmake/build/lib/drivers/libusb/hub_controller.cpp:313) [USBLIB] SCE Request B027B048 TransferBufferLength 8 Flags 3 MDL 00000000 (/srv/buildbot_cmake/full_cmake/build/lib/drivers/libusb/hub_controller.cpp:324) [USBLIB] Port 0: Status 103, Change 0 (/srv/buildbot_cmake/full_cmake/build/lib/drivers/libusb/hub_controller.cpp:324) [USBLIB] Port 1: Status 100, Change 0 (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/io/pnpmgr/pnpmgr.c:4030) IRP_MN_QUERY_PNP_DEVICE_STATE failed with status 0xc00000bb (/srv/buildbot_cmake/full_cmake/build/drivers/usb/usbhub/pdo.c:541) uLan2usb convertor (/srv/buildbot_cmake/full_cmake/build/drivers/usb/usbhub/pdo.c:541) uLan2usb convertor (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/io/pnpmgr/pnpmgr.c:4030) IRP_MN_QUERY_PNP_DEVICE_STATE failed with status 0xc00000bb (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:2959) ZwOpenFile failed with status 0xc000003a (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/io/iomgr/iorsrce.c:725) Failed opening given symbolic link! (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:174) Loading: \SystemRoot\system32\drivers\pciide.sys at FCBF4000 with 7 pages (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:174) Loading: \SystemRoot\system32\drivers\pciidex.sys at FCBEB000 with 9 pages (/srv/buildbot_cmake/full_cmake/build/drivers/bus/pci/pdo.c:1267) Enabling command flags for PCI device 0x21 on bus 0x0: [Bus master] [I/O space enable] (/srv/buildbot_cmake/full_cmake/build/drivers/storage/ide/pciidex/fdo.c:464) IRP_MJ_PNP / Unknown minor function 0x9 (/srv/buildbot_cmake/full_cmake/build/ntoskrnl/mm/ARM3/sysldr.c:174) Loading: \SystemRoot\system32\drivers\ul_wdm.sys at FCBD9000 with 11 pages Assertion 'IsListEmpty(&Irp->ThreadListEntry)' failed at /srv/buildbot_cmake/full_cmake/build/ntoskrnl/io/iomgr/irp.c line 1524 Entered debugger on embedded INT3 at 0x0008:0x80924c3a. kdb:> ==================================================================================== Thanks for any hints in advance. I would be happy if the problems are resolved in the future. It could be interresting option to have livecd available with ReactOS, uLAN driver and CHROMuLAN for us one day. We can provide even some small funding for such achievement if it could work reliably on real hardware. Other reason why ReactOS is interresting for us is that it has cached some bugs in our driver (mismatch in memory pools tags which are not reported by Windows release builds). Yet another reasons for ReactOS is to use 64-bit ReactOS build as testbed for uLAN driver Windows 64-bit version debugging. (64-bit Linux x86 version is fully supported now same as MIPS, PPC and ARM). But 64-bit Windows are pain for its signing requirements etc. And after all I do not have any (32/64-bit) Windows installed on our computers at all so ReactOS is great target for our development even if we has to depend on users use and demand for Windows. As for CHROMuLAN and RectOS compatibility, chromatography system is functional under ReactOS except for some problem in the complex calibration files dialog which can hang the application and some harmless exception during analysis files read. Both seems to cause similar problems under Wine as well. In each case, thanks for the big pile of the work invested to the ReactOS project, Pavel Pisa e-mail: pisa(a)cmp.felk.cvut.cz www: http://cmp.felk.cvut.cz/~pisa university: http://dce.fel.cvut.cz/ company: http://www.pikron.com/

13 years

5
6
0 0

Affects Version field

by Timo Kreuzer

Can we rename the "Affects Version" field to "Affected Revision"? Noone cares for 0.3.11 bugs and TRUNK ins meaningless. Also: is it possible to automaticcally translate to the current head revision number, when TRUNK or rather HEAD is selected? Maybe when we have FishEye? Regards, Timo

13 years

2
2
0 0

Component list rewrite

by caemyr＠myopera.com

13 years

3
6
0 0

Fwd: buildbot failure in ReactOS on Windows_AMD64_1 VBox-Test

by caemyr＠myopera.com

Test run failed due to exceeding the maximum number of restarts, Problem started with unexpected crash: Running Wine Test, Module: pdh, Test: pdh Assertion 'KiTimerTableListHead[Index].Time.QuadPart <= Timer->DueTime.QuadPart' failed at ../../ntoskrnl/ke/dpc.c line 252 [7h Entered debugger on embedded INT3 at 0x0008:0x809257d2. kdb:> bt Eip: <NTOSKRNL.EXE:1257d3 (../../lib/rtl/i386/debug_asm.S:35 (_DbgBreakPoint@0))> Frames: <NTOSKRNL.EXE:82a22 (../../ntoskrnl/ke/dpc.c:251 (KiTimerExpiration@16))> <NTOSKRNL.EXE:82c20 (../../ntoskrnl/ke/dpc.c:576 (@KiRetireDpcList@4))> <NTOSKRNL.EXE:10a2fa (../../ntoskrnl/ke/i386/ctxswitch.S:78 (KiRetireDpcListInDpcStack))> <HAL.DLL:a71b (../../hal/halx86/up/pic.c:1323 (@HalpDispatchInterrupt2ndEntry@4))> <HAL.DLL:a684 (../../hal/halx86/up/pic.c:1243 (HalEndSystemInterrupt@8))> <NTOSKRNL.EXE:89dbf (../../ntoskrnl/include/internal/arch/../i386/ke.h:829 (@KeUpdateSystemTime@12))> <HAL.DLL:9b6b (../../hal/halx86/generic/timer.c:172 (@HalpClockInterruptHandler@4))> <HAL.DLL:9f52 (../../hal/halx86/generic/trap.S:0 (_HalpClockInterrupt))> <rosautotest.exe:67cb> <rosautotest.exe:703d> The subsequent reboots have been asserting at startup: Boot took 33308394332 cycles! Interrupts: 1838 System Calls: 15454 Context Switches: 1688 (../../ntoskrnl/se/semgr.c:646) HACK: Should deny access for caller: granted 0x90003, desired 0x190003 (generic mapping B12893B0). (../../base/services/eventlog/eventlog.c:296) RegQueryValueEx failed: 126 (../../base/services/eventlog/eventlog.c:393) Failed to load Wine (../../base/services/wlansvc/wlansvc.c:145) wlansvc: main() started (../../base/services/wlansvc/wlansvc.c:96) ServiceMain() called (../../base/services/wlansvc/wlansvc.c:130) ServiceMain() done (../../base/system/services/rpcserver.c:1716) RNotifyBootConfigStatus(00000000 1) called Assertion 'CellBlock < RegistryHive->Storage[CellType].Length' failed at ../../lib/cmlib/hivecell.c line 32 [7h Entered debugger on embedded INT3 at 0x0008:0x809257d2. kdb:> bt Eip: <NTOSKRNL.EXE:1257d3 (../../lib/rtl/i386/debug_asm.S:35 (_DbgBreakPoint@0))> Frames: <NTOSKRNL.EXE:124087 (../../lib/cmlib/hivecell.c:32 (HvpGetCellHeader@8))> <NTOSKRNL.EXE:124119 (../../lib/cmlib/hivecell.c:74 (HvGetCell@8))> <NTOSKRNL.EXE:125318 (../../lib/cmlib/cminit.c:97 (CmpPrepareIndexOfKeys@8))> <NTOSKRNL.EXE:125407 (../../lib/cmlib/cminit.c:124 (CmpPrepareKey@8))> <NTOSKRNL.EXE:125435 (../../lib/cmlib/cminit.c:135 (CmPrepareHive@4))> <NTOSKRNL.EXE:12528e (../../lib/cmlib/hiveinit.c:506 (HvInitialize@52))> <NTOSKRNL.EXE:1dca5 (../../ntoskrnl/config/cminit.c:177 (CmpInitializeHive@40))> <NTOSKRNL.EXE:26132 (../../ntoskrnl/config/cmsysini.c:287 (CmpInitHiveFromFile@20))> <NTOSKRNL.EXE:2060d (../../ntoskrnl/config/cmlazy.c:259 (CmpCmdHiveOpen@20))> <NTOSKRNL.EXE:1548d (../../ntoskrnl/config/cmapi.c:1713 (CmLoadKey@16))> <NTOSKRNL.EXE:2928e (../../ntoskrnl/config/ntapi.c:843 (NtLoadKeyEx@16))> <NTOSKRNL.EXE:29356 (../../ntoskrnl/config/ntapi.c:791 (NtLoadKey@8))> <NTOSKRNL.EXE:110fb2 (../../ntoskrnl/ke/i386/traphdlr.c:1629 (@KiFastCallEntryHandler@8))> <NTOSKRNL.EXE:10eba1 (../../ntoskrnl/ke/i386/trap.s:150 (_KiFastCallEntry))> <ntdll.dll:b009> <userenv.dll:62a4> <winlogon.exe:2317> <winlogon.exe:3023> <user32.dll:4bb39> <user32.dll:4c188>--- Press q to abort, any other key to continue --- <user32.dll:4d37b> <winlogon.exe:4b00> ----- Original message ----- From: buildbot(a)reactos.org To: caemyr(a)myopera.com Subject: buildbot failure in ReactOS on Windows_AMD64_1 VBox-Test Date: Thu, 13 Sep 2012 01:14:24 +0000 The Buildbot has finished a build on builder Windows_AMD64_1 VBox-Test while building ReactOS. Full details are available at: http://build.reactos.org/builders/Windows_AMD64_1%20VBox-Test/builds/6579 Buildbot URL: http://build.reactos.org/ Buildslave for this Build: Windows_AMD64_2 Build Reason: Triggerable(Windows_AMD64_1 VBox-Test Trigger) Build Source Stamp: 57288 Blamelist: mnordell BUILD FAILED: failed test sincerely, -The Buildbot -- With best regards Caemyr

13 years

1
0
0 0

Jira search

by Timo Kreuzer

Hi, Does anyone know how to search for issues older than 1 year or something like that? According to https://jira.atlassian.com/browse/JRA-1983 it should be possible, but Icouldn't figure out how to. Timo

13 years

3
2
0 0

Re: [ros-dev] [ros-diffs] [ion] 57284: [NTOSKRNL]: Use the token lock acquire/release macros that were already written instead of manually doing it. Also fix the macros since they didn't work in GCC. No functional change, j...

by Timo Kreuzer

What was the problem with the old macros? The new ones are error-prone. if (NeedLock) SepAcquireTokenLockExclusive(Token); // <= fail! WBR, Timo Am 12.09.2012 18:29, schrieb ion(a)svn.reactos.org: > Author: ion > Date: Wed Sep 12 16:29:28 2012 > New Revision: 57284 > > URL: http://svn.reactos.org/svn/reactos?rev=57284&view=rev > Log: > [NTOSKRNL]: Use the token lock acquire/release macros that were already written instead of manually doing it. Also fix the macros since they didn't work in GCC. > No functional change, just code cleanup. > > Modified: > trunk/reactos/ntoskrnl/include/internal/se.h > trunk/reactos/ntoskrnl/se/access.c > trunk/reactos/ntoskrnl/se/semgr.c > > Modified: trunk/reactos/ntoskrnl/include/internal/se.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… > ============================================================================== > --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Wed Sep 12 16:29:28 2012 > @@ -1,4 +1,28 @@ > #pragma once > + > +typedef struct _KNOWN_ACE > +{ > + ACE_HEADER Header; > + ACCESS_MASK Mask; > + ULONG SidStart; > +} KNOWN_ACE, *PKNOWN_ACE; > + > +typedef struct _KNOWN_OBJECT_ACE > +{ > + ACE_HEADER Header; > + ACCESS_MASK Mask; > + ULONG Flags; > + ULONG SidStart; > +} KNOWN_OBJECT_ACE, *PKNOWN_OBJECT_ACE; > + > +typedef struct _KNOWN_COMPOUND_ACE > +{ > + ACE_HEADER Header; > + ACCESS_MASK Mask; > + USHORT CompoundAceType; > + USHORT Reserved; > + ULONG SidStart; > +} KNOWN_COMPOUND_ACE, *PKNOWN_COMPOUND_ACE; > > PSID > FORCEINLINE > @@ -75,6 +99,8 @@ > return Descriptor->Sacl; > } > } > + > +#ifndef RTL_H > > /* SID Authorities */ > extern SID_IDENTIFIER_AUTHORITY SeNullSidAuthority; > @@ -156,6 +182,19 @@ > extern PSECURITY_DESCRIPTOR SeSystemDefaultSd; > extern PSECURITY_DESCRIPTOR SeUnrestrictedSd; > > + > +#define SepAcquireTokenLockExclusive(Token) \ > + KeEnterCriticalRegion(); \ > + ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ > + > +#define SepAcquireTokenLockShared(Token) \ > + KeEnterCriticalRegion(); \ > + ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ > + > +#define SepReleaseTokenLock(Token) \ > + ExReleaseResource(((PTOKEN)Token)->TokenLock); \ > + KeLeaveCriticalRegion(); \ > + > // > // Token Functions > // > @@ -434,24 +473,6 @@ > OUT PACCESS_TOKEN* NewToken > ); > > -#define SepAcquireTokenLockExclusive(Token) \ > - do { \ > - KeEnterCriticalRegion(); \ > - ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ > - while(0) > - > -#define SepAcquireTokenLockShared(Token) \ > - do { \ > - KeEnterCriticalRegion(); \ > - ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ > - while(0) > - > -#define SepReleaseTokenLock(Token) \ > - do { \ > - ExReleaseResource(((PTOKEN)Token)->TokenLock); \ > - KeLeaveCriticalRegion(); \ > - while(0) > - > VOID NTAPI > SeQuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, > OUT PACCESS_MASK DesiredAccess); > @@ -460,4 +481,6 @@ > SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, > OUT PACCESS_MASK DesiredAccess); > > +#endif > + > /* EOF */ > > Modified: trunk/reactos/ntoskrnl/se/access.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/access.c?rev=5… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] Wed Sep 12 16:29:28 2012 > @@ -130,11 +130,7 @@ > ASSERT(Sid != NULL); > > /* Lock the token if needed */ > - if (!TokenLocked) > - { > - KeEnterCriticalRegion(); > - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); > - } > + if (!TokenLocked) SepAcquireTokenLockShared(Token); > > /* Check if the owner SID is found, handling restricted case as well */ > Result = SepSidInToken(Token, Sid); > @@ -144,11 +140,7 @@ > } > > /* Release the lock if we had acquired it */ > - if (!TokenLocked) > - { > - ExReleaseResourceLite(Token->TokenLock); > - KeLeaveCriticalRegion(); > - } > + if (!TokenLocked) SepReleaseTokenLock(Token); > > /* Return the result */ > return Result; > @@ -168,15 +160,13 @@ > TokenControl->TokenSource = Token->TokenSource; > > /* Lock the token */ > - KeEnterCriticalRegion(); > - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); > + SepAcquireTokenLockShared(Token); > > /* Capture the modified it */ > TokenControl->ModifiedId = Token->ModifiedId; > > /* Unlock it */ > - ExReleaseResourceLite(Token->TokenLock); > - KeLeaveCriticalRegion(); > + SepReleaseTokenLock(Token); > } > > NTSTATUS > @@ -327,13 +317,11 @@ > ClientToken = SubjectContext->ClientToken; > > /* Always lock the primary */ > - KeEnterCriticalRegion(); > - ExAcquireResourceSharedLite(PrimaryToken->TokenLock, TRUE); > + SepAcquireTokenLockShared(PrimaryToken); > > /* Lock the impersonation one if it's there */ > if (!ClientToken) return; > - KeEnterCriticalRegion(); > - ExAcquireResourceSharedLite(ClientToken->TokenLock, TRUE); > + SepAcquireTokenLockShared(ClientToken); > } > > /* > @@ -351,13 +339,11 @@ > ClientToken = SubjectContext->ClientToken; > > /* Always unlock the primary one */ > - ExReleaseResourceLite(PrimaryToken->TokenLock); > - KeLeaveCriticalRegion(); > + SepReleaseTokenLock(PrimaryToken); > > /* Unlock the impersonation one if it's there */ > if (!ClientToken) return; > - ExReleaseResourceLite(ClientToken->TokenLock); > - KeLeaveCriticalRegion(); > + SepReleaseTokenLock(ClientToken); > } > > /* > > Modified: trunk/reactos/ntoskrnl/se/semgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=57… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Wed Sep 12 16:29:28 2012 > @@ -952,8 +952,7 @@ > SeCaptureSubjectContext(&SubjectSecurityContext); > > /* Lock the token */ > - KeEnterCriticalRegion(); > - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); > + SepAcquireTokenLockShared(Token); > > /* Check if the token is the owner and grant WRITE_DAC and READ_CONTROL rights */ > if (DesiredAccess & (WRITE_DAC | READ_CONTROL | MAXIMUM_ALLOWED)) > @@ -990,8 +989,7 @@ > > /* Release subject context and unlock the token */ > SeReleaseSubjectContext(&SubjectSecurityContext); > - ExReleaseResourceLite(Token->TokenLock); > - KeLeaveCriticalRegion(); > + SepReleaseTokenLock(Token); > > /* Release the captured security descriptor */ > SeReleaseSecurityDescriptor(CapturedSecurityDescriptor, > > >

13 years

3
3
0 0

Re: [ros-dev] [ros-diffs] [ion] 57284: [NTOSKRNL]: Use the token lock acquire/release macros that were already written instead of manually doing it. Also fix the macros since they didn't work in GCC. No functional change, j...

by Ged Murphy

Why the removal of the do/while loop? This breaks the macro when used without braces : +#define SepReleaseTokenLock(Token) \ + ExReleaseResource(((PTOKEN)Token)->TokenLock); \ + KeLeaveCriticalRegion(); \ + <snip> -#define SepReleaseTokenLock(Token) \ - do { \ - ExReleaseResource(((PTOKEN)Token)->TokenLock); \ - KeLeaveCriticalRegion(); \ - while(0) <snip> /* Release the lock if we had acquired it */ + if (!TokenLocked) SepReleaseTokenLock(Token);

13 years

1
0
0 0

Jira Planning

by Timo Kreuzer

Hi, I'd like to invite every developer to make use of the Jira planning feature. For those, who are not yet familiar with it here's a an explantion. In the blue Jira menu bar you'll find an item called "Agile". Click on that to get to the planning boards. First time users will be asked to either choose between Scrum or Kanban. Select Scrum. Then you will be asked to select a dashboard or create one. You can simply choose "Scrum Board" from the dropdown list, this one should be fine. You can later create your own board, if you like. Now you will see 3 buttons on the right-hand side below the menu bar: "plan", "work" and "report" First select "plan" On the top you can see the current "sprint", which is the next planned period. We currently have one sprint for September. We can create multiple sprints and periods are as we want them. I think one month is reasonable. Under the sprint you can see the issues that are selected for this sprint, i.e. supposed to be tackled in that period. Currently only project administrators can create sprints, but every developer can move items there. To remove an item from the sprint, you need to click on it, so it gets highlited, then open the menu with the gear wheel icon in the issue description on the right and select "Remove from sprint". Below you see the backlog (all open issues). Since the list is quite huge, you can limit it to your own issues, by pressing the "Only my issues" filter button. (Note this one works like a pushbutton, click it once to enable, again to disable. Maybe Amine can make them look more like that by adding a highlite color) On the righ-hand side, you see a box that shows the currently selected issue. Now you can drag and drop issues from the backlog into one of the sprints. So if you plan to work on a specific issue in September, just drag it into sprint 1. Now select "work" Here you can see the so called "swim lanes". In the default Scrum Board they are configured per Developer. So you see every developer that has active issues in the current sprint(s). You can open and close the swim lanes to see the issues. And you can again select "Only my issues". The board has 3 columns: "To do", "In Progress", "Done". All issues that you selected for the current sprint will initially be in the "To do" column. When you work on an issue, simply drag it over to the "In Progress" column. When you fixed it, drag it to "Done". When dragging them the target column will be highlited in green. The "Done" column will show you 2 fields when dragging an item there: one for resolve, one for close. When you dragged them to close, you'll see a confirmation dialog, where you can enter additional stuff and then confirm it. Have fun Timo

13 years

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev