Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 35993: Fix permissions for section handle reference. Fix double alloc of MDL (spotted by stefan100) Streamline CcFlushCache and default success.
by arty＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: arty Date: Sat Sep 6 11:58:48 2008 New Revision: 35993 URL: http://svn.reactos.org/svn/reactos?rev=35993&view=rev Log: Fix permissions for section handle reference. Fix double alloc of MDL (spotted by stefan100) Streamline CcFlushCache and default success. Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Sat Sep 6 11:58:48 2008 @@ -205,66 +205,73 @@ IN ULONG Length, OUT OPTIONAL PIO_STATUS_BLOCK IoStatus) { - PCHAR BufPage, BufStart; - PVOID Buffer; - PNOCC_BCB Bcb; - LARGE_INTEGER ToWrite = *FileOffset; - IO_STATUS_BLOCK IOSB; - PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap; - - if (!SectionObjectPointer->SharedCacheMap) - { - if (IoStatus) - { - IoStatus->Status = STATUS_SUCCESS; - IoStatus->Information = 0; - } - return; - } - - BOOLEAN Result = CcpMapData - (Map, - FileOffset, - Length, - PIN_WAIT, - (PVOID *)&Bcb, - &Buffer); - - /* Don't flush a pinned bcb, because we'll disturb the locked-ness - * of the pages. Figured out how to do this right. */ - if (!Result || Bcb->Pinned || !Bcb->Dirty) return; - - BufStart = (PCHAR)PAGE_ROUND_DOWN(((ULONG_PTR)Buffer)); - ToWrite.LowPart = PAGE_ROUND_DOWN(FileOffset->LowPart); - - DPRINT - ("CcpSimpleWrite: [%wZ] %x:%d\n", - &Bcb->FileObject->FileName, - Buffer, - Bcb->Length); - - for (BufPage = BufStart; - BufPage < BufStart + PAGE_ROUND_UP(Length); - BufPage += PAGE_SIZE) - { - CcpSimpleWrite(Bcb->FileObject, &ToWrite, BufPage, &IOSB); - ToWrite.QuadPart += PAGE_SIZE; - } - - Bcb->Dirty = FALSE; - - DPRINT("Page Write: %08x\n", IOSB.Status); - - if (IoStatus && NT_SUCCESS(IOSB.Status)) - { - IoStatus->Status = STATUS_SUCCESS; - IoStatus->Information = Length; - } - else if (IoStatus) - { - IoStatus->Status = IOSB.Status; - IoStatus->Information = 0; - } + BOOLEAN Result; + PCHAR BufPage, BufStart; + PVOID Buffer; + PNOCC_BCB Bcb; + LARGE_INTEGER ToWrite = *FileOffset; + IO_STATUS_BLOCK IOSB; + PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap; + + if (IoStatus) + { + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = 0; + } + + if (!SectionObjectPointer->SharedCacheMap) + { + DPRINT("Attempt to flush a non-cached file section\n"); + return; + } + + Result = CcpMapData + (Map, + FileOffset, + Length, + 0, + (PVOID *)&Bcb, + &Buffer); + + if (!Result) + { + DPRINT("The requested section wasn't mapped, therefore doesn't need to be flushed\n"); + return; + } + + /* Don't flush a pinned bcb, because we'll disturb the locked-ness + * of the pages. Figured out how to do this right. */ + if (Bcb->Pinned || !Bcb->Dirty) + { + DPRINT("Bailing because the area is pinned or not dirty\n"); + return; + } + + BufStart = (PCHAR)PAGE_ROUND_DOWN(((ULONG_PTR)Buffer)); + ToWrite.LowPart = PAGE_ROUND_DOWN(FileOffset->LowPart); + + DPRINT + ("CcpSimpleWrite: [%wZ] %x:%d\n", + &Bcb->FileObject->FileName, + Buffer, + Bcb->Length); + + for (BufPage = BufStart; + BufPage < BufStart + PAGE_ROUND_UP(Length); + BufPage += PAGE_SIZE) + { + CcpSimpleWrite(Bcb->FileObject, &ToWrite, BufPage, &IOSB); + ToWrite.QuadPart += PAGE_SIZE; + } + + Bcb->Dirty = FALSE; + + DPRINT("Page Write: %08x\n", IOSB.Status); + + if (IoStatus) + { + *IoStatus = IOSB; + } } BOOLEAN Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Sat Sep 6 11:58:48 2008 @@ -45,7 +45,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <internal/debug.h> #include <reactos/exeformat.h> @@ -159,8 +159,6 @@ _SEH_TRY { - /* Allocate an MDL */ - Mdl = IoAllocateMdl(Buffer, Length, FALSE, TRUE, NULL); MmProbeAndLockPages(Mdl, KernelMode, IoWriteAccess); } _SEH_HANDLE @@ -4914,13 +4912,20 @@ return STATUS_INVALID_PAGE_PROTECTION; } - if ((DesiredAccess == SECTION_ALL_ACCESS || - (DesiredAccess & SECTION_MAP_WRITE)) && - (Protection == PAGE_READWRITE || - Protection == PAGE_EXECUTE_READWRITE)) - FileAccess = FILE_GENERIC_WRITE; + if (((DesiredAccess == SECTION_ALL_ACCESS || + (DesiredAccess & SECTION_MAP_WRITE)) && + (Protection == PAGE_READWRITE || + Protection == PAGE_EXECUTE_READWRITE)) && + !(AllocationAttributes & SEC_IMAGE)) + { + DPRINT("Creating a section with WRITE access\n"); + FileAccess = FILE_READ_DATA | FILE_WRITE_DATA; + } else - FileAccess = FILE_GENERIC_READ; + { + DPRINT("Creating a section with READ access\n"); + FileAccess = FILE_READ_DATA; + } /* * Reference the file handle

1 0

[cwittich] 35992: don't corrupt the heap by storing unneeded values in the wrong places
by cwittich＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: cwittich Date: Sat Sep 6 11:35:48 2008 New Revision: 35992 URL: http://svn.reactos.org/svn/reactos?rev=35992&view=rev Log: don't corrupt the heap by storing unneeded values in the wrong places Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] Sat Sep 6 11:35:48 2008 @@ -117,7 +117,7 @@ CloseHandle(hReadPipe); } - pf->_tmpfname = ProcessInformation.hProcess; + //pf->_tmpfname = ProcessInformation.hProcess; return( pf ); }

1 0

[cwittich] 35991: fix a typo
by cwittich＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: cwittich Date: Sat Sep 6 11:28:26 2008 New Revision: 35991 URL: http://svn.reactos.org/svn/reactos?rev=35991&view=rev Log: fix a typo Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] Sat Sep 6 11:28:26 2008 @@ -55,7 +55,7 @@ strcpy(test, "\n\nRunning "); strcat(test, cmd); OutputDebugStringA(test); - pPipe2 = _tpopen(cmd, "r"); + pPipe2 = _popen(cmd, "r"); if (pPipe2 != NULL) { while(fgets(psBuffer2, 128, pPipe2))

1 0

[sserapion] 35990: Fix 64 bit portability issues.
by sserapion＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: sserapion Date: Sat Sep 6 10:53:36 2008 New Revision: 35990 URL: http://svn.reactos.org/svn/reactos?rev=35990&view=rev Log: Fix 64 bit portability issues. Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Sep 6 10:53:36 2008 @@ -18,11 +18,11 @@ typedef unsigned long SECURITY_INFORMATION; typedef [handle] LPSTR SVCCTL_HANDLEA; typedef [handle] LPWSTR SVCCTL_HANDLEW; -typedef [context_handle] unsigned long SC_RPC_HANDLE; +typedef [context_handle] ULONG_PTR SC_RPC_HANDLE; typedef SC_RPC_HANDLE* LPSC_RPC_HANDLE; typedef [context_handle] PVOID SC_RPC_LOCK; typedef SC_RPC_LOCK* LPSC_RPC_LOCK; -typedef [context_handle] unsigned long SC_NOTIFY_RPC_HANDLE; +typedef [context_handle] ULONG_PTR SC_NOTIFY_RPC_HANDLE; typedef SC_NOTIFY_RPC_HANDLE* LPSC_NOTIFY_RPC_HANDLE; typedef [range(0, 1024 * 4)] DWORD BOUNDED_DWORD_4K; typedef BOUNDED_DWORD_4K* LPBOUNDED_DWORD_4K;

1 0

[sserapion] 35989: Merge 35977. Fix 64 bit portability issues. Thanks ekohl!
by sserapion＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: sserapion Date: Sat Sep 6 10:52:53 2008 New Revision: 35989 URL: http://svn.reactos.org/svn/reactos?rev=35989&view=rev Log: Merge 35977. Fix 64 bit portability issues. Thanks ekohl! Modified: branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c Modified: branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Sep 6 10:52:53 2008 @@ -1963,7 +1963,7 @@ if (dwError == ERROR_SUCCESS) { DPRINT("hService %p\n", hServiceHandle); - *lpServiceHandle = (unsigned long)hServiceHandle; /* FIXME: 64 bit portability */ + *lpServiceHandle = (SC_RPC_HANDLE)hServiceHandle; if (lpdwTagId != NULL) *lpdwTagId = lpService->dwTag; @@ -2356,7 +2356,7 @@ return dwError; } - *lpScHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */ + *lpScHandle = (SC_RPC_HANDLE)hHandle; DPRINT("*hScm = %p\n", *lpScHandle); DPRINT("ROpenSCManagerW() done\n"); @@ -2432,7 +2432,7 @@ lpService->dwRefCount++; DPRINT1("OpenService - lpService->dwRefCount %u\n",lpService->dwRefCount); - *lpServiceHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */ + *lpServiceHandle = (SC_RPC_HANDLE)hHandle; DPRINT("*hService = %p\n", *lpServiceHandle); DPRINT("ROpenServiceW() done\n");

1 0

[dreimer] 35988: Remove temporary commented out lines. Show the Arch which is active on startup.
by dreimer＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: dreimer Date: Sat Sep 6 10:52:18 2008 New Revision: 35988 URL: http://svn.reactos.org/svn/reactos?rev=35988&view=rev Log: Remove temporary commented out lines. Show the Arch which is active on startup. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat Sep 6 10:52:18 2008 @@ -49,15 +49,8 @@ set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_GCCVERSION= set _ROSBE_GCCTARGET= -if not .%ROS_ARCH%. == .. ( - for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i - for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -REM for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -REM for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -) else ( - for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i - for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -) +for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe if "%_ROSBE_MODE%" == "MinGW" ( @@ -74,13 +67,22 @@ :: if not .%ROS_ARCH%. == .. ( %ROS_PREFIX%-gcc -v 2>&1 | find "gcc version" - echo gcc target^: %_ROSBE_GCCTARGET% + if .%ROS_PREFIX%. == .. ( + echo gcc target^: %_ROSBE_GCCTARGET% + ) else ( + echo gcc target^: %ROS_PREFIX:~0,-11% + ) %ROS_PREFIX%-ld -v ) else ( gcc -v 2>&1 | find "gcc version" - echo gcc target^: %_ROSBE_GCCTARGET% + if .%ROS_PREFIX%. == .. ( + echo gcc target^: %_ROSBE_GCCTARGET% + ) else ( + echo gcc target^: %ROS_PREFIX:~0,-11% + ) ld -v ) + if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( nasm -v ) else (

1 0

[cwittich] 35987: -fail on kdbg enter
by cwittich＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: cwittich Date: Sat Sep 6 10:28:55 2008 New Revision: 35987 URL: http://svn.reactos.org/svn/reactos?rev=35987&view=rev Log: -fail on kdbg enter Modified: trunk/tools/sysreg2/console.c trunk/tools/sysreg2/reactos.xml trunk/tools/sysreg2/sysreg.xml trunk/tools/sysreg2/utils.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=35987&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Sat Sep 6 10:28:55 2008 @@ -62,10 +62,15 @@ memset(buf, 0, sizeof(buf)); got = readln(fds[i].fd, buf, sizeof(buf)); + if (got == -2) /* kernel debugger */ + { + Ret = false; + goto cleanup; + } if (got < 0) { goto cleanup; } - if (!got || got == 1 && buf[0] == '\33') + if (!got) { goto cleanup; } @@ -95,6 +100,11 @@ } */ } + else + { + if (got == 1 && buf[0] == '\33') + goto cleanup; + } } } Modified: trunk/tools/sysreg2/reactos.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/reactos.xml?rev=3598… ============================================================================== --- trunk/tools/sysreg2/reactos.xml [iso-8859-1] (original) +++ trunk/tools/sysreg2/reactos.xml [iso-8859-1] Sat Sep 6 10:28:55 2008 @@ -6,7 +6,7 @@ <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> + <boot dev='cdrom'/> </os> <features> </features> @@ -21,15 +21,15 @@ <target dev='hda' bus='ide'/> </disk> <disk type='file' device='cdrom'> - <source file='/opt/buildbot/kvmtest/ReactOS-RegTest.iso'/> + <source file='/opt/buildbot/kvmtest/ReactOS-RegTest.iso'/> <target dev='hdc' bus='ide'/> <readonly/> </disk> <interface type='bridge'> <mac address='00:16:3e:2e:dd:df'/> <source bridge='virbr0'/> - <target dev='vnet0'/> - <model type='pcnet'/> + <target dev='vnet0'/> + <model type='pcnet'/> </interface> <serial type='pty'> <source path='/dev/pts/4'/> @@ -39,7 +39,7 @@ <source path='/dev/pts/4'/> <target port='1'/> </console> - <input type='tablet' bus='usb'/> + <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' listen='0.0.0.0'/> </devices> Modified: trunk/tools/sysreg2/sysreg.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.xml?rev=35987… ============================================================================== --- trunk/tools/sysreg2/sysreg.xml [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.xml [iso-8859-1] Sat Sep 6 10:28:55 2008 @@ -1,4 +1,4 @@ -<settings vm="ReactOS" file="/opt/buildbot/kvmtest/reactos.xml"> +<settings vm="ReactOS" file="/opt/buildbot/sysreg2/reactos.xml"> <general>  <timeout ms="20000"/> Modified: trunk/tools/sysreg2/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/utils.c?rev=35987&r1… ============================================================================== --- trunk/tools/sysreg2/utils.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/utils.c [iso-8859-1] Sat Sep 6 10:28:55 2008 @@ -1,4 +1,5 @@ #include "sysreg.h" +#include <sys/sysinfo.h> int readln(int fd, char* buffer, int size) { @@ -7,8 +8,16 @@ while ((bp - buffer < size) && (got = read(fd, bp, 1))) { - if (*bp == '\33') - return 1; + if (fd == STDIN_FILENO) + { + if (*bp == '\33') + return 1; + } + else + { + if (strstr(buffer, "kdb:>")) + return -2; + } if (*bp++ == '\n') return (bp - buffer); }

1 0

[hpoussin] 35986: Also change kdcom.dll location in txtsetup.sif
by hpoussin＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: hpoussin Date: Sat Sep 6 10:19:57 2008 New Revision: 35986 URL: http://svn.reactos.org/svn/reactos?rev=35986&view=rev Log: Also change kdcom.dll location in txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Sep 6 10:19:57 2008 @@ -22,7 +22,7 @@ cdfs.sys=,,,,,,x,,,,,,4 cdrom.sys=,,,,,,x,,,,,,4 class2.sys=,,,,,,x,,,,,,4 -kdcom.dll=,,,,,,,,,,,,4 +kdcom.dll=,,,,,,,,,,,,2 disk.sys=,,,,,,x,,,,,,4 floppy.sys=,,,,,,x,,,,,,4 i8042prt.sys=,,,,,,x,,,,,,4

1 0

[hpoussin] 35985: kdcom.dll should be in system32 directory, not drivers one
by hpoussin＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: hpoussin Date: Sat Sep 6 10:06:07 2008 New Revision: 35985 URL: http://svn.reactos.org/svn/reactos?rev=35985&view=rev Log: kdcom.dll should be in system32 directory, not drivers one Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] Sat Sep 6 10:06:07 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> +<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32" installname="kdcom.dll"> <importlibrary definition="kdcom.spec.def"></importlibrary> <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> <include base="kdcom">.</include> @@ -12,7 +12,7 @@ </directory> </if> <if property="ARCH" value="arm"> - <directory name="arm"> + <directory name="arm"> <file>kdbg.c</file> </directory> </if>

1 0

[sginsberg] 35984: - [FORMATTING] Clean up tls.c. No code change.
by sginsberg＠svn.reactos.org 06 Sep '08

06 Sep '08

Author: sginsberg Date: Sat Sep 6 09:12:47 2008 New Revision: 35984 URL: http://svn.reactos.org/svn/reactos?rev=35984&view=rev Log: - [FORMATTING] Clean up tls.c. No code change. Modified: trunk/reactos/dll/win32/kernel32/thread/tls.c Modified: trunk/reactos/dll/win32/kernel32/thread/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/tls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/tls.c [iso-8859-1] Sat Sep 6 09:12:47 2008 @@ -13,7 +13,6 @@ /* INCLUDES ******************************************************************/ #include <k32.h> - #define NDEBUG #include <debug.h> @@ -22,169 +21,176 @@ /* * @implemented */ -DWORD STDCALL +DWORD +WINAPI TlsAlloc(VOID) { - ULONG Index; + ULONG Index; - RtlAcquirePebLock(); + RtlAcquirePebLock(); - /* Try to get regular TEB slot. */ - Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsBitmap, 1, 0); - if (Index == ~0) - { - /* If it fails, try to find expansion TEB slot. */ - Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsExpansionBitmap, 1, 0); - if (Index != ~0) - { - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - NtCurrentTeb()->TlsExpansionSlots = HeapAlloc( - GetProcessHeap(), HEAP_ZERO_MEMORY, - TLS_EXPANSION_SLOTS * sizeof(PVOID)); - } + /* Try to get regular TEB slot. */ + Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsBitmap, 1, 0); + if (Index == ~0) + { + /* If it fails, try to find expansion TEB slot. */ + Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsExpansionBitmap, 1, 0); + if (Index != ~0) + { + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + NtCurrentTeb()->TlsExpansionSlots = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + TLS_EXPANSION_SLOTS * + sizeof(PVOID)); + } - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, Index, 1); - Index = ~0; - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } - else - { - /* Clear the value. */ - NtCurrentTeb()->TlsExpansionSlots[Index] = 0; - Index += TLS_MINIMUM_AVAILABLE; - } - } - else - { - SetLastError(ERROR_NO_MORE_ITEMS); - } - } - else - { - /* Clear the value. */ - NtCurrentTeb()->TlsSlots[Index] = 0; - } + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, Index, 1); + Index = ~0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + /* Clear the value. */ + NtCurrentTeb()->TlsExpansionSlots[Index] = 0; + Index += TLS_MINIMUM_AVAILABLE; + } + } + else + { + SetLastError(ERROR_NO_MORE_ITEMS); + } + } + else + { + /* Clear the value. */ + NtCurrentTeb()->TlsSlots[Index] = 0; + } - RtlReleasePebLock(); + RtlReleasePebLock(); - return Index; + return Index; } - /* * @implemented */ -BOOL STDCALL +BOOL +WINAPI TlsFree(DWORD Index) { - BOOL BitSet; + BOOL BitSet; - if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return FALSE; - } + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; + } - RtlAcquirePebLock(); + RtlAcquirePebLock(); - if (Index >= TLS_MINIMUM_AVAILABLE) - { - BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsExpansionBitmap, - Index - TLS_MINIMUM_AVAILABLE, 1); - if (BitSet) - RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, - Index - TLS_MINIMUM_AVAILABLE, 1); - } - else - { - BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsBitmap, Index, 1); - if (BitSet) - RtlClearBits(NtCurrentPeb()->TlsBitmap, Index, 1); - } + if (Index >= TLS_MINIMUM_AVAILABLE) + { + BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsExpansionBitmap, + Index - TLS_MINIMUM_AVAILABLE, + 1); - if (BitSet) - { - /* Clear the TLS cells (slots) in all threads of the current process. */ - NtSetInformationThread(NtCurrentThread(), ThreadZeroTlsCell, - &Index, sizeof(DWORD)); - } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - } + if (BitSet) + RtlClearBits(NtCurrentPeb()->TlsExpansionBitmap, + Index - TLS_MINIMUM_AVAILABLE, + 1); + } + else + { + BitSet = RtlAreBitsSet(NtCurrentPeb()->TlsBitmap, Index, 1); + if (BitSet) + RtlClearBits(NtCurrentPeb()->TlsBitmap, Index, 1); + } - RtlReleasePebLock(); + if (BitSet) + { + /* Clear the TLS cells (slots) in all threads of the current process. */ + NtSetInformationThread(NtCurrentThread(), + ThreadZeroTlsCell, + &Index, + sizeof(DWORD)); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } - return BitSet; + RtlReleasePebLock(); + + return BitSet; } - /* * @implemented */ -LPVOID STDCALL +LPVOID +WINAPI TlsGetValue(DWORD Index) { - if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return NULL; + } - SetLastError(NO_ERROR); + SetLastError(NO_ERROR); - if (Index >= TLS_MINIMUM_AVAILABLE) - { - /* The expansion slots are allocated on demand, so check for it. */ - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - return NULL; - return NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE]; - } - else - { - return NtCurrentTeb()->TlsSlots[Index]; - } + if (Index >= TLS_MINIMUM_AVAILABLE) + { + /* The expansion slots are allocated on demand, so check for it. */ + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + return NULL; + return NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE]; + } + else + { + return NtCurrentTeb()->TlsSlots[Index]; + } } - /* * @implemented */ -BOOL STDCALL -TlsSetValue(DWORD Index, LPVOID Value) +BOOL +WINAPI +TlsSetValue(DWORD Index, + LPVOID Value) { - if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return FALSE; - } + if (Index >= TLS_EXPANSION_SLOTS + TLS_MINIMUM_AVAILABLE) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; + } - if (Index >= TLS_MINIMUM_AVAILABLE) - { - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - NtCurrentTeb()->TlsExpansionSlots = HeapAlloc( - GetProcessHeap(), HEAP_ZERO_MEMORY, - TLS_EXPANSION_SLOTS * sizeof(PVOID)); + if (Index >= TLS_MINIMUM_AVAILABLE) + { + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + NtCurrentTeb()->TlsExpansionSlots = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + TLS_EXPANSION_SLOTS * + sizeof(PVOID)); - if (NtCurrentTeb()->TlsExpansionSlots == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } + if (NtCurrentTeb()->TlsExpansionSlots == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } - NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE] = Value; - } - else - { - NtCurrentTeb()->TlsSlots[Index] = Value; - } + NtCurrentTeb()->TlsExpansionSlots[Index - TLS_MINIMUM_AVAILABLE] = Value; + } + else + { + NtCurrentTeb()->TlsSlots[Index] = Value; + } - return TRUE; + return TRUE; } - -/* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs