Ros-dev October 2012

ros-dev@reactos.org

14 participants
9 discussions

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.

11 years, 10 months

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

11 years, 11 months

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() > > >

11 years, 11 months

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

11 years, 11 months

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)) > { > > >

11 years, 11 months

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; > > >

11 years, 11 months

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; > > > >

11 years, 11 months

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); > -} > +} > > >

11 years, 11 months

Everithing is down?

by Александр

11 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev October 2012