Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[dreimer] 35634: More and more pain in the ass, this batch... More work on Update. Now it only extracts the zips if they are really newer than before.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 25 13:38:07 2008 New Revision: 35634 URL: http://svn.reactos.org/svn/reactos?rev=35634&view=rev Log: More and more pain in the ass, this batch... More work on Update. Now it only extracts the zips if they are really newer than before. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Mon Aug 25 13:38:07 2008 @@ -9,87 +9,104 @@ @echo off :: The Update Server -set url=www.foo.bar +set _ROSBE_URL=www.foo.bar :: First check for a new Updater -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/update.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/update.cmd "%_ROSBE_BASEDIR%\update.cmd" :: PS1 Files if exist "%_ROSBE_BASEDIR%\Build.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Build.ps1 + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.ps1 ) if exist "%_ROSBE_BASEDIR%\Clean.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Clean.ps1 + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Clean.ps1 ) if exist "%_ROSBE_BASEDIR%\Help.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Help.ps1 + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Help.ps1 ) if exist "%_ROSBE_BASEDIR%\MinGW.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.ps1 + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.ps1 ) if exist "%_ROSBE_BASEDIR%\RosBE.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.ps1 + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.ps1 ) if exist "%_ROSBE_BASEDIR%\rosbe-gcc-env.ps1" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe-gcc-env.ps1 + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe-gcc-env.ps1 ) :: Options Files if exist "%_ROSBE_BASEDIR%\options.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/options.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/options.cmd ) :: SVN Files if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/sSVN.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/sSVN.cmd ) :: SCut Files if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/scut.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/scut.cmd ) :: RelAddr2Line Files if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/reladdr2line.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/reladdr2line.cmd ) :: Other Tools Files if exist "%_ROSBE_BASEDIR%\Config.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Config.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Config.cmd ) if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/chdefdir.cmd + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefdir.cmd ) -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Build.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/ChangeLog.txt -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/chdefgcc.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Clean.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Help.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/LICENSE.TXT -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/mingw.ico -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/MinGW.mac -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/README.pdf -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe.ico -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/RosBE.mac -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/rosbe-gcc-env.cmd -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/TimeDate.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Build.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/ChangeLog.txt +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/chdefgcc.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Clean.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Help.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/LICENSE.TXT +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/mingw.ico +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/MinGW.mac +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/README.pdf +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe.ico +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/RosBE.mac +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/rosbe-gcc-env.cmd +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/TimeDate.cmd :: Load GCC and Tool SRC packages -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/GCC.7z -"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %url%/Tools.7z +if exist GCC.7z ( + for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE=%%i +) +if exist Tools.7z ( + for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE=%%i +) + +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/GCC.7z +"%_ROSBE_BASEDIR%\Tools\wget.exe" -N %_ROSBE_URL%/Tools.7z + +for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE2=%%i +for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE2=%%i :: Extract GCC -"%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" -"%_ROSBE_BASEDIR%\Tools\7z.exe" x Tools.7z "%TEMP%" - -:: Build the tools -make -f %TEMP%\makefile -copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" +if %_ROSBE_GCCDATE% NEQ %_ROSBE_GCCDATE2% ( + "%_ROSBE_BASEDIR%\Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" +) +if %_ROSBE_TOOLSDATE% NEQ %_ROSBE_TOOLSDATE2% ( + "%_ROSBE_BASEDIR%\Tools\7z.exe" x Tools.7z "%TEMP%" + :: Build the tools + make -f %TEMP%\makefile + copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" +) :: Unload Vars -set url= +set _ROSBE_URL= +set _ROSBE_GCCDATE= +set _ROSBE_TOOLSDATE= +set _ROSBE_GCCDATE2= +set _ROSBE_TOOLSDATE2=

16 years, 1 month

[sginsberg] 35633: - Remove LIST_FOR_EACH and LIST_FOR_EACH_SAFE from the kernel - Fix a bug in KeStartProfile (a missing negation) which caused us to either free buffer when we shouldn't, or leak it

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 25 13:21:19 2008 New Revision: 35633 URL: http://svn.reactos.org/svn/reactos?rev=35633&view=rev Log: - Remove LIST_FOR_EACH and LIST_FOR_EACH_SAFE from the kernel - Fix a bug in KeStartProfile (a missing negation) which caused us to either free buffer when we shouldn't, or leak it Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c trunk/reactos/ntoskrnl/ke/profobj.c Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Mon Aug 25 13:21:19 2008 @@ -350,14 +350,22 @@ NTSTATUS INIT_FUNCTION IoDestroyDriverList(VOID) { - PSERVICE_GROUP CurrentGroup, tmp1; - PSERVICE CurrentService, tmp2; + PSERVICE_GROUP CurrentGroup; + PSERVICE CurrentService; + PLIST_ENTRY NextEntry, TempEntry; DPRINT("IoDestroyDriverList() called\n"); /* Destroy the Group List */ - LIST_FOR_EACH_SAFE(CurrentGroup, tmp1, &GroupListHead, SERVICE_GROUP, GroupListEntry) - { + for (NextEntry = GroupListHead.Flink, TempEntry = NextEntry->Flink; + NextEntry != &GroupListHead; + NextEntry = TempEntry, TempEntry = NextEntry->Flink) + { + /* Get the entry */ + CurrentGroup = CONTAINING_RECORD(NextEntry, + SERVICE_GROUP, + GroupListEntry); + /* Remove it from the list */ RemoveEntryList(&CurrentGroup->GroupListEntry); @@ -369,8 +377,15 @@ } /* Destroy the Service List */ - LIST_FOR_EACH_SAFE(CurrentService, tmp2, &ServiceListHead, SERVICE, ServiceListEntry) - { + for (NextEntry = ServiceListHead.Flink, TempEntry = NextEntry->Flink; + NextEntry != &ServiceListHead; + NextEntry = TempEntry, TempEntry = NextEntry->Flink) + { + /* Get the entry */ + CurrentService = CONTAINING_RECORD(NextEntry, + SERVICE, + ServiceListEntry); + /* Remove it from the list */ RemoveEntryList(&CurrentService->ServiceListEntry); @@ -448,21 +463,35 @@ PSERVICE CurrentService; NTSTATUS Status; ULONG i; + PLIST_ENTRY NextGroupEntry, NextServiceEntry; DPRINT("IopInitializeSystemDrivers()\n"); - /* Loop the list */ - LIST_FOR_EACH(CurrentGroup, &GroupListHead, SERVICE_GROUP, GroupListEntry) - { + /* Start looping */ + for (NextGroupEntry = GroupListHead.Flink; + NextGroupEntry != &GroupListHead; + NextGroupEntry = NextGroupEntry->Flink) + { + /* Get the entry */ + CurrentGroup = CONTAINING_RECORD(NextGroupEntry, + SERVICE_GROUP, + GroupListEntry); DPRINT("Group: %wZ\n", &CurrentGroup->GroupName); /* Load all drivers with a valid tag */ for (i = 0; i < CurrentGroup->TagCount; i++) { - /* Loop the list */ - LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) + /* Start looping */ + for (NextServiceEntry = ServiceListHead.Flink; + NextServiceEntry != &ServiceListHead; + NextServiceEntry = NextServiceEntry->Flink) { + /* Get the entry */ + CurrentService = CONTAINING_RECORD(NextServiceEntry, + SERVICE, + ServiceListEntry); + if ((!RtlCompareUnicodeString(&CurrentGroup->GroupName, &CurrentService->ServiceGroup, TRUE)) && @@ -477,8 +506,15 @@ } /* Load all drivers without a tag or with an invalid tag */ - LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) + for (NextServiceEntry = ServiceListHead.Flink; + NextServiceEntry != &ServiceListHead; + NextServiceEntry = NextServiceEntry->Flink) { + /* Get the entry */ + CurrentService = CONTAINING_RECORD(NextServiceEntry, + SERVICE, + ServiceListEntry); + if ((!RtlCompareUnicodeString(&CurrentGroup->GroupName, &CurrentService->ServiceGroup, TRUE)) && Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Mon Aug 25 13:21:19 2008 @@ -99,14 +99,20 @@ { PPNPROOT_DEVICE Device; UNICODE_STRING DeviceIdU, InstanceIdU; + PLIST_ENTRY NextEntry; /* Initialize the strings to compare */ RtlInitUnicodeString(&DeviceIdU, DeviceId); RtlInitUnicodeString(&InstanceIdU, InstanceId); /* Start looping */ - LIST_FOR_EACH(Device, &DeviceExtension->DeviceListHead, PNPROOT_DEVICE, ListEntry) - { + for (NextEntry = DeviceExtension->DeviceListHead.Flink; + NextEntry != &DeviceExtension->DeviceListHead; + NextEntry = NextEntry->Flink) + { + /* Get the entry */ + Device = CONTAINING_RECORD(NextEntry, PNPROOT_DEVICE, ListEntry); + /* See if the strings match */ if (RtlEqualUnicodeString(&DeviceIdU, &Device->DeviceID, TRUE) && RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE)) @@ -521,6 +527,7 @@ PPNPROOT_DEVICE Device = NULL; ULONG Size; NTSTATUS Status; + PLIST_ENTRY NextEntry; DPRINT("PnpRootQueryDeviceRelations(FDO %p, Irp %p)\n", DeviceObject, Irp); @@ -556,8 +563,15 @@ } KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); - LIST_FOR_EACH(Device, &DeviceExtension->DeviceListHead, PNPROOT_DEVICE, ListEntry) - { + + /* Start looping */ + for (NextEntry = DeviceExtension->DeviceListHead.Flink; + NextEntry != &DeviceExtension->DeviceListHead; + NextEntry = NextEntry->Flink) + { + /* Get the entry */ + Device = CONTAINING_RECORD(NextEntry, PNPROOT_DEVICE, ListEntry); + if (!Device->Pdo) { /* Create a physical device object for the Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Mon Aug 25 13:21:19 2008 @@ -54,8 +54,9 @@ KIRQL OldIrql; PKPROFILE_SOURCE_OBJECT SourceBuffer; PKPROFILE_SOURCE_OBJECT CurrentSource; - BOOLEAN FreeBuffer = TRUE; + BOOLEAN FreeBuffer = TRUE, SourceFound = FALSE;; PKPROCESS ProfileProcess; + PLIST_ENTRY NextEntry; /* Allocate a buffer first, before we raise IRQL */ SourceBuffer = ExAllocatePoolWithTag(NonPagedPool, @@ -89,18 +90,27 @@ InsertTailList(&KiProfileListHead, &Profile->ProfileListEntry); } - /* Check if this type of profile (source) is already running */ - LIST_FOR_EACH(CurrentSource, &KiProfileSourceListHead, KPROFILE_SOURCE_OBJECT, ListEntry) - { + /* Start looping */ + for (NextEntry = KiProfileSourceListHead.Flink; + NextEntry != &KiProfileSourceListHead; + NextEntry = NextEntry->Flink) + { + /* Get the entry */ + CurrentSource = CONTAINING_RECORD(NextEntry, + KPROFILE_SOURCE_OBJECT, + ListEntry); + /* Check if it's the same as the one being requested now */ if (CurrentSource->Source == Profile->Source) { + /* It is, break out */ + SourceFound = TRUE; break; } } /* See if the loop found something */ - if (!CurrentSource) + if (!SourceFound) { /* Nothing found, use our allocated buffer */ CurrentSource = SourceBuffer; @@ -122,7 +132,7 @@ //HalStartProfileInterrupt(Profile->Source); /* Free the pool */ - if (!FreeBuffer) ExFreePool(SourceBuffer); + if (FreeBuffer) ExFreePool(SourceBuffer); } BOOLEAN @@ -131,6 +141,8 @@ { KIRQL OldIrql; PKPROFILE_SOURCE_OBJECT CurrentSource = NULL; + PLIST_ENTRY NextEntry; + BOOLEAN SourceFound = FALSE; /* Raise to PROFILE_LEVEL and acquire spinlock */ KeRaiseIrql(PROFILE_LEVEL, &OldIrql); @@ -143,12 +155,23 @@ RemoveEntryList(&Profile->ProfileListEntry); Profile->Started = FALSE; - /* Find the Source Object */ - LIST_FOR_EACH(CurrentSource, &KiProfileSourceListHead, KPROFILE_SOURCE_OBJECT, ListEntry) - { + /* Start looping */ + for (NextEntry = KiProfileSourceListHead.Flink; + NextEntry != &KiProfileSourceListHead; + NextEntry = NextEntry->Flink) + { + /* Get the entry */ + CurrentSource = CONTAINING_RECORD(NextEntry, + KPROFILE_SOURCE_OBJECT, + ListEntry); + + /* Check if this is the Source Object */ if (CurrentSource->Source == Profile->Source) { - /* Remove it */ + /* Remember we found one */ + SourceFound = TRUE; + + /* Remove it and break out */ RemoveEntryList(&CurrentSource->ListEntry); break; } @@ -164,7 +187,7 @@ //HalStopProfileInterrupt(Profile->Source); /* Free the Source Object */ - if (CurrentSource) ExFreePool(CurrentSource); + if (SourceFound) ExFreePool(CurrentSource); /* FIXME */ return FALSE; @@ -231,10 +254,16 @@ { PULONG BucketValue; PKPROFILE Profile; + PLIST_ENTRY NextEntry; /* Loop the List */ - LIST_FOR_EACH(Profile, ListHead, KPROFILE, ProfileListEntry) - { + for (NextEntry = ListHead->Flink; + NextEntry != ListHead; + NextEntry = NextEntry->Flink) + { + /* Get the entry */ + Profile = CONTAINING_RECORD(NextEntry, KPROFILE, ProfileListEntry); + /* Check if the source is good, and if it's within the range */ #ifdef _M_IX86 if ((Profile->Source != Source) ||

16 years, 1 month

[pschweitzer] 35632: Skip first dots in filename while generating 8dot3 filename in RtlGenerate8dot3Name.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Aug 25 13:14:44 2008 New Revision: 35632 URL: http://svn.reactos.org/svn/reactos?rev=35632&view=rev Log: Skip first dots in filename while generating 8dot3 filename in RtlGenerate8dot3Name. Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?r… ============================================================================== --- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Mon Aug 25 13:14:44 2008 @@ -95,6 +95,7 @@ ULONG IndexLength; ULONG CurrentIndex; USHORT Checksum; + BOOLEAN SkipDots = TRUE; StrLength = Name->Length / sizeof(WCHAR); DPRINT("StrLength: %lu\n", StrLength); @@ -105,7 +106,14 @@ { if (Name->Buffer[i] == L'.') { - DotPos = i; + if (!SkipDots) + { + DotPos = i; + } + } + else + { + SkipDots = FALSE; } }

16 years, 1 month

[tkreuzer] 35631: merge 35359 from ros-amd64-bringup branch: The TEB member is called ClientId not Cid on all Windows versions I could check (XP, 2k3, vista).

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 25 11:38:02 2008 New Revision: 35631 URL: http://svn.reactos.org/svn/reactos?rev=35631&view=rev Log: merge 35359 from ros-amd64-bringup branch: The TEB member is called ClientId not Cid on all Windows versions I could check (XP, 2k3, vista). Modified: trunk/reactos/dll/ntdll/csr/api.c trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/dll/win32/gdi32/main/dllmain.c trunk/reactos/dll/win32/kernel32/file/pipe.c trunk/reactos/dll/win32/kernel32/process/proc.c trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/ndk/pstypes.h trunk/reactos/lib/rtl/critical.c trunk/reactos/lib/rtl/dbgbuffer.c trunk/reactos/lib/rtl/resource.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c Modified: trunk/reactos/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/api.c?rev=35… ============================================================================== --- trunk/reactos/dll/ntdll/csr/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/api.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -73,7 +73,7 @@ /* Set up the data for CSR */ DbgBreakPoint(); IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread; - IdentifyAlertableThread->Cid = NtCurrentTeb()->Cid; + IdentifyAlertableThread->Cid = NtCurrentTeb()->ClientId; /* Call it */ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -152,7 +152,7 @@ { /* This is a server-to-server call. Save our CID and do a direct call */ DbgBreakPoint(); - ApiMessage->Header.ClientId = NtCurrentTeb()->Cid; + ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; Status = CsrServerApiRoutine(&ApiMessage->Header, &ApiMessage->Header); Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -48,7 +48,7 @@ GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; GdiDevCaps = &GdiSharedHandleTable->DevCaps; - CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; + CurrentProcessId = NtCurrentTeb()->ClientId.UniqueProcess; GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; } Modified: trunk/reactos/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/pi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -55,7 +55,7 @@ /* Create the pipe name */ swprintf(Buffer, L"\\Device\\NamedPipe\\Win32Pipes.%08x.%08x", - NtCurrentTeb()->Cid.UniqueProcess, + NtCurrentTeb()->ClientId.UniqueProcess, PipeId); RtlInitUnicodeString(&PipeName, Buffer); Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -272,7 +272,7 @@ DWORD STDCALL GetCurrentProcessId(VOID) { - return((DWORD)GetTeb()->Cid.UniqueProcess); + return((DWORD)GetTeb()->ClientId.UniqueProcess); } Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -319,7 +319,7 @@ WINAPI GetCurrentThreadId(VOID) { - return (DWORD)(NtCurrentTeb()->Cid).UniqueThread; + return (DWORD)(NtCurrentTeb()->ClientId).UniqueThread; } /* Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -1313,8 +1313,8 @@ { // We are current. //FIXME("Current!\n"); if ( lpdwProcessId ) - *lpdwProcessId = (DWORD)NtCurrentTeb()->Cid.UniqueProcess; - Ret = (DWORD)NtCurrentTeb()->Cid.UniqueThread; + *lpdwProcessId = (DWORD)NtCurrentTeb()->ClientId.UniqueProcess; + Ret = (DWORD)NtCurrentTeb()->ClientId.UniqueThread; } else { // Ask kernel for info. Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -729,7 +729,7 @@ { NT_TIB Tib; PVOID EnvironmentPointer; - CLIENT_ID Cid; + CLIENT_ID ClientId; PVOID ActiveRpcHandle; PVOID ThreadLocalStoragePointer; struct _PEB *ProcessEnvironmentBlock; Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=356… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -310,7 +310,7 @@ DPRINT("Freeing from Buffer: %p. Entry: %lu inside Process: %p\n", DebugInfo, EntryId, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); RtlpDebugInfoFreeList[EntryId] = FALSE; } else { @@ -318,7 +318,7 @@ /* It's a dynamic one, so free from the heap */ DPRINT("Freeing from Heap: %p inside Process: %p\n", DebugInfo, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); RtlFreeHeap(NtCurrentPeb()->ProcessHeap, 0, DebugInfo); } @@ -424,7 +424,7 @@ NTAPI RtlEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { - HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; + HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; /* Try to Lock it */ if (_InterlockedIncrement(&CriticalSection->LockCount) != 0) { @@ -522,7 +522,7 @@ CritcalSectionDebugData = RtlpAllocateDebugInfo(); DPRINT("Allocated Debug Data: %p inside Process: %p\n", CritcalSectionDebugData, - NtCurrentTeb()->Cid.UniqueProcess); + NtCurrentTeb()->ClientId.UniqueProcess); if (!CritcalSectionDebugData) { @@ -657,11 +657,11 @@ -1) == -1) { /* It's ours */ - CriticalSection->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + CriticalSection->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; CriticalSection->RecursionCount = 1; return TRUE; - } else if (CriticalSection->OwningThread == NtCurrentTeb()->Cid.UniqueThread) { + } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { /* It's already ours */ _InterlockedIncrement(&CriticalSection->LockCount); Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=35… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -234,7 +234,7 @@ IN OUT PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG) NtCurrentTeb()->Cid.UniqueProcess; + ULONG Pid = (ULONG) NtCurrentTeb()->ClientId.UniqueProcess; Buf->Flags = DebugInfoMask; Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); Modified: trunk/reactos/lib/rtl/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/resource.c?rev=356… ============================================================================== --- trunk/reactos/lib/rtl/resource.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/resource.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -94,7 +94,7 @@ } else if (Resource->NumberActive < 0) /* exclusive lock in progress */ { - if (Resource->OwningThread == NtCurrentTeb()->Cid.UniqueThread) + if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { retVal = TRUE; Resource->NumberActive--; @@ -120,7 +120,7 @@ goto wait; } if (retVal == TRUE) - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; done: RtlLeaveCriticalSection(&Resource->Lock); return retVal; @@ -141,7 +141,7 @@ RtlEnterCriticalSection(&Resource->Lock); if (Resource->NumberActive < 0) { - if (Resource->OwningThread == NtCurrentTeb()->Cid.UniqueThread) + if (Resource->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { Resource->NumberActive--; retVal = TRUE; @@ -218,7 +218,7 @@ if (Resource->NumberActive == 1) { - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; Resource->NumberActive = -1; } else @@ -233,7 +233,7 @@ return; RtlEnterCriticalSection(&Resource->Lock); - Resource->OwningThread = NtCurrentTeb()->Cid.UniqueThread; + Resource->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; Resource->NumberActive = -1; } RtlLeaveCriticalSection(&Resource->Lock); Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -452,7 +452,7 @@ Teb->Tib.Self = (PNT_TIB)Teb; /* Set TEB Data */ - Teb->Cid = *ClientId; + Teb->ClientId = *ClientId; Teb->RealClientId = *ClientId; Teb->ProcessEnvironmentBlock = Process->Peb; Teb->CurrentLocale = PsDefaultThreadLocaleId; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Mon Aug 25 11:38:02 2008 @@ -155,7 +155,7 @@ hwnd, pEP->idObject, pEP->idChild, - (DWORD)(NtCurrentTeb()->Cid).UniqueThread, + (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD)EngGetTickCount(), pEH->Proc); return Result; @@ -185,14 +185,14 @@ if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL)) { // if all process || all thread || other thread same process if (!(pEH->idProcess) || !(pEH->idThread) || - ((DWORD)(NtCurrentTeb()->Cid).UniqueProcess == pEH->idProcess)) + ((DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess)) { Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild); } }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && ( ((pEH->idProcess && - (DWORD)(NtCurrentTeb()->Cid).UniqueProcess == pEH->idProcess) && + (DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess) && !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !pEH->idProcess ) ) { @@ -201,7 +201,7 @@ Window->hSelf, idObject, idChild, - (DWORD)(NtCurrentTeb()->Cid).UniqueThread, + (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD)EngGetTickCount(), pEH->Proc); }

16 years, 1 month

[sginsberg] 35630: - Remove a header duplication and move a prototype to the correct place

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 25 10:22:30 2008 New Revision: 35630 URL: http://svn.reactos.org/svn/reactos?rev=35630&view=rev Log: - Remove a header duplication and move a prototype to the correct place Modified: trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Aug 25 10:22:30 2008 @@ -521,21 +521,6 @@ /////////////////////////////////////////////////////////////////////////////// // -// Startup and Shutdown Functions -// -BOOLEAN -NTAPI -CmInitSystem1( - VOID -); - -VOID -NTAPI -CmShutdownSystem( - VOID -); - -// // Mapped View Hive Functions // VOID @@ -1420,6 +1405,12 @@ // // Startup and Shutdown // +BOOLEAN +NTAPI +CmInitSystem1( + VOID +); + VOID NTAPI CmShutdownSystem(

16 years, 1 month

[sginsberg] 35629: - NtLoadKey: Call NtLoadKeyEx directly instead of calling NtLoadKey2 (which forwards to NtLoadKeyEx)

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 25 10:10:27 2008 New Revision: 35629 URL: http://svn.reactos.org/svn/reactos?rev=35629&view=rev Log: - NtLoadKey: Call NtLoadKeyEx directly instead of calling NtLoadKey2 (which forwards to NtLoadKeyEx) Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Mon Aug 25 10:10:27 2008 @@ -707,7 +707,7 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes) { /* Call the newer API */ - return NtLoadKey2(KeyObjectAttributes, FileObjectAttributes, 0); + return NtLoadKeyEx(KeyObjectAttributes, FileObjectAttributes, 0, NULL); } NTSTATUS

16 years, 1 month

[tkreuzer] 35628: merge 34702 and 34987 from ros-amd64-bringup branch: - convert LDR_RESOURCE_INFO members from ULONG to ULONG_PTR - fix SECURITY_DESCRIPTOR_RELATIVE and KDPC_DATA

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 25 09:51:22 2008 New Revision: 35628 URL: http://svn.reactos.org/svn/reactos?rev=35628&view=rev Log: merge 34702 and 34987 from ros-amd64-bringup branch: - convert LDR_RESOURCE_INFO members from ULONG to ULONG_PTR - fix SECURITY_DESCRIPTOR_RELATIVE and KDPC_DATA Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=35… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Mon Aug 25 09:51:22 2008 @@ -787,10 +787,10 @@ BYTE Revision; BYTE Sbz1; SECURITY_DESCRIPTOR_CONTROL Control; - DWORD Owner; - DWORD Group; - DWORD Sacl; - DWORD Dacl; + DWORD_PTR Owner; + DWORD_PTR Group; + DWORD_PTR Sacl; + DWORD_PTR Dacl; } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; typedef enum _TOKEN_INFORMATION_CLASS { TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner, Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Mon Aug 25 09:51:22 2008 @@ -558,7 +558,7 @@ typedef struct _KDPC_DATA { LIST_ENTRY DpcListHead; - ULONG DpcLock; + ULONG_PTR DpcLock; volatile ULONG DpcQueueDepth; ULONG DpcCount; } KDPC_DATA, *PKDPC_DATA; Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Mon Aug 25 09:51:22 2008 @@ -138,8 +138,8 @@ // typedef struct _LDR_RESOURCE_INFO { - ULONG Type; - ULONG Name; + ULONG_PTR Type; + ULONG_PTR Name; ULONG Language; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;

16 years, 1 month

[sginsberg] 35627: - Sync ntgdi.h to trunk, and add missing APIENTRY for a couple of functions

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 25 09:04:24 2008 New Revision: 35627 URL: http://svn.reactos.org/svn/reactos?rev=35627&view=rev Log: - Sync ntgdi.h to trunk, and add missing APIENTRY for a couple of functions Modified: branches/nwin32/include/psdk/ntgdi.h branches/nwin32/subsystems/win32/win32k/ntgdi/gdidc.c branches/nwin32/subsystems/win32/win32k/ntgdi/gdifont.c branches/nwin32/subsystems/win32/win32k/ntgdi/gditext.c Modified: branches/nwin32/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev… ============================================================================== --- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Mon Aug 25 09:04:24 2008 @@ -2843,6 +2843,7 @@ W32KAPI DWORD +APIENTRY NtGdiGetCharSet( IN HDC hdc ); @@ -2897,6 +2898,7 @@ #if (_WIN32_WINNT >= 0x0500) W32KAPI DWORD +APIENTRY NtGdiGetFontUnicodeRanges( IN HDC hdc, OUT OPTIONAL LPGLYPHSET pgs @@ -2906,6 +2908,7 @@ #ifdef LANGPACK W32KAPI BOOL +APIENTRY NtGdiGetRealizationInfo( IN HDC hdc, OUT PREALIZATION_INFO pri, @@ -2915,6 +2918,7 @@ W32KAPI BOOL +APIENTRY NtGdiAddRemoteMMInstanceToDC( IN HDC hdc, IN DOWNLOADDESIGNVECTOR *pddv, @@ -3518,6 +3522,7 @@ W32KAPI DHPDEV +APIENTRY NtGdiGetDhpdev( IN HDEV hdev ); Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdidc.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdidc.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdidc.c [iso-8859-1] Mon Aug 25 09:04:24 2008 @@ -252,7 +252,7 @@ } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiAddRemoteMMInstanceToDC(IN HDC hdc, IN DOWNLOADDESIGNVECTOR *pddv, IN ULONG cjDDV) @@ -262,7 +262,7 @@ } DHPDEV -/* Missing APIENTRY! */ +APIENTRY NtGdiGetDhpdev(IN HDEV hdev) { UNIMPLEMENTED; Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdifont.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdifont.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdifont.c [iso-8859-1] Mon Aug 25 09:04:24 2008 @@ -274,7 +274,7 @@ } DWORD -/* Missing APIENTRY! */ +APIENTRY NtGdiGetFontUnicodeRanges(IN HDC hdc, OUT OPTIONAL LPGLYPHSET pgs) { @@ -443,7 +443,7 @@ } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiGetRealizationInfo(IN HDC hdc, OUT PREALIZATION_INFO pri, IN HFONT hf) Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gditext.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gditext.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gditext.c [iso-8859-1] Mon Aug 25 09:04:24 2008 @@ -157,7 +157,7 @@ } DWORD -/* Missing APIENTRY! */ +APIENTRY NtGdiGetCharSet(IN HDC hdc) { UNIMPLEMENTED;

16 years, 1 month

[sginsberg] 35626: - Undefine KdPrint before redefining it.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 25 08:42:17 2008 New Revision: 35626 URL: http://svn.reactos.org/svn/reactos?rev=35626&view=rev Log: - Undefine KdPrint before redefining it. Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Aug 25 08:42:17 2008 @@ -137,6 +137,10 @@ #endif // _DBGNT_ #else // _DEBUG + +#ifdef KdPrint +#undef KdPrint +#endif #define PRINT_PREFIX "UniATA: "

16 years, 1 month

[pschweitzer] 35625: - Reimplemented FsRtlIsNameInExpression to get rid of recursion, and to handle all wild cards. - Updated its comments.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Aug 25 04:27:35 2008 New Revision: 35625 URL: http://svn.reactos.org/svn/reactos?rev=35625&view=rev Log: - Reimplemented FsRtlIsNameInExpression to get rid of recursion, and to handle all wild cards. - Updated its comments. Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Mon Aug 25 04:27:35 2008 @@ -5,6 +5,7 @@ * PURPOSE: Provides name parsing and other support routines for FSDs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Filip Navara (navaraf(a)reactos.org) + * Pierre Schweitzer (heis_spiter(a)hotmail.com) */ /* INCLUDES ******************************************************************/ @@ -224,13 +225,20 @@ * @name FsRtlIsNameInExpression * @implemented * - * FILLME - * - * @param DeviceObject - * FILLME - * - * @param Irp - * FILLME + * Check if the Name string is in the Expression string. + * + * @param Expression + * The string in which we've to find Name. It can contains wildcards + * + * @param Name + * The string to find. It cannot contain wildcards + * + * @param IgnoreCase + * If set to TRUE, case will be ignore with upcasing both strings + * + * @param UpcaseTable + * If not NULL, and if IgnoreCase is set to TRUE, it will be used to + * upcase the both strings * * @return TRUE if Name is in Expression, FALSE otherwise * @@ -246,85 +254,80 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - USHORT ExpressionPosition, NamePosition; - UNICODE_STRING TempExpression, TempName; - - ExpressionPosition = 0; - NamePosition = 0; - while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - NamePosition < (Name->Length / sizeof(WCHAR))) - { - if (Expression->Buffer[ExpressionPosition] == L'*') - { - ExpressionPosition++; - if (ExpressionPosition == (Expression->Length / sizeof(WCHAR))) - { - return TRUE; - } - while (NamePosition < (Name->Length / sizeof(WCHAR))) - { - TempExpression.Length = - TempExpression.MaximumLength = - Expression->Length - (ExpressionPosition * sizeof(WCHAR)); - TempExpression.Buffer = Expression->Buffer + ExpressionPosition; - TempName.Length = - TempName.MaximumLength = - Name->Length - (NamePosition * sizeof(WCHAR)); - TempName.Buffer = Name->Buffer + NamePosition; - /* FIXME: Rewrite to get rid of recursion */ - if (FsRtlIsNameInExpression(&TempExpression, &TempName, - IgnoreCase, UpcaseTable)) + ULONG i, j, k = 0; + UNICODE_STRING IntExpression, IntName; + WCHAR IntExprBuffer[Expression->Length / sizeof(WCHAR)], IntNameBuffer[Name->Length / sizeof(WCHAR)]; + + ASSERT(!FsRtlDoesNameContainWildCards(Name)); + + /* We'll first upcase the both strings, if necessary. + In all cases, we'll create internal strings to work on. */ + if (IgnoreCase) + { + IntExpression.Buffer = IntExprBuffer; + IntName.Buffer = IntNameBuffer; + if (!UpcaseTable) + { + RtlUpcaseUnicodeString(&IntExpression, Expression, FALSE); + RtlUpcaseUnicodeString(&IntName, Name, FALSE); + + } + else + { + for (i = 0 ; i < Expression->Length / sizeof (WCHAR) + 1 ; i++) + { + IntExpression.Buffer[i] = UpcaseTable[Expression->Buffer[i]]; + } + IntExpression.Length = Expression->Length; + IntExpression.MaximumLength = Expression->MaximumLength; + for (i = 0 ; i < Name->Length / sizeof (WCHAR) + 1 ; i++) + { + IntName.Buffer[i] = UpcaseTable[Name->Buffer[i]]; + } + IntName.Length = Name->Length; + IntName.MaximumLength = Name->MaximumLength; + } + } + else + { + IntExpression.Length = Expression->Length; + IntExpression.MaximumLength = Expression->MaximumLength; + IntExpression.Buffer = Expression->Buffer; + IntName.Length = Name->Length; + IntName.MaximumLength = Name->MaximumLength; + IntName.Buffer = Name->Buffer; + } + + for (i = 0 ; i < IntExpression.Length / sizeof(WCHAR) ; i++) + { + if ((IntExpression.Buffer[i] == IntName.Buffer[k]) || (IntExpression.Buffer[i] == '?') || + (IntExpression.Buffer[i] == ANSI_DOS_QM) || + (IntExpression.Buffer[i] == ANSI_DOS_DOT && (IntName.Buffer[k] == '.' || IntName.Buffer[k] == '0'))) + { + k++; + } + else if (IntExpression.Buffer[i] == '*') + { + k = IntName.Length / sizeof(WCHAR); + } + else if (IntExpression.Buffer[i] == ANSI_DOS_STAR) + { + for (j = k ; j < IntName.Length / sizeof(WCHAR) ; j++) + { + if (IntName.Buffer[j] == '.') { - return TRUE; + k = j; } - NamePosition++; } } else { - if (Expression->Buffer[ExpressionPosition] == L'?' || ( - IgnoreCase && !UpcaseTable && - RtlUpcaseUnicodeChar(Expression->Buffer[ExpressionPosition]) == - RtlUpcaseUnicodeChar(Name->Buffer[NamePosition])) || - (!IgnoreCase && Expression->Buffer[ExpressionPosition] == - Name->Buffer[NamePosition])) - { - NamePosition++; - ExpressionPosition++; - } - else if (IgnoreCase && UpcaseTable) - { - if (UpcaseTable[Expression->Buffer[ExpressionPosition]] == - UpcaseTable[Name->Buffer[NamePosition]]) - { - NamePosition++; - ExpressionPosition++; - } - } - else - { - return FALSE; - } - } - } - - /* Handle matching of "f0_*.*" expression to "f0_000" file name. */ - if (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - Expression->Buffer[ExpressionPosition] == L'.') - { - while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - (Expression->Buffer[ExpressionPosition] == L'.' || - Expression->Buffer[ExpressionPosition] == L'*' || - Expression->Buffer[ExpressionPosition] == L'?')) - { - ExpressionPosition++; - } - } - - if (ExpressionPosition == (Expression->Length / sizeof(WCHAR)) && - NamePosition == (Name->Length / sizeof(WCHAR))) - { - return TRUE; + k = 0; + } + if (k == IntName.Length / sizeof(WCHAR)) + { + return TRUE; + } } return FALSE;

16 years, 1 month

← Newer
1
...
19
20
21
22
23
24
25
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008