Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[cwittich] 24653: fix some issues when reading from a named pipe fix a typo terminate qemu at exit (when using named pipes)
by cwittich＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: cwittich Date: Thu Oct 26 00:02:01 2006 New Revision: 24653 URL: http://svn.reactos.org/svn/reactos?rev=24653&view=rev Log: fix some issues when reading from a named pipe fix a typo terminate qemu at exit (when using named pipes) Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Thu Oct 26 00:02:01 2006 @@ -97,6 +97,8 @@ string::size_type size = Buffer.capacity(); DWORD cbRead; BOOL fSuccess; + TCHAR * localbuf; + DWORD localsize = 100; //#ifdef NDEBUG memset(buf, 0x0, sizeof(TCHAR) * size); @@ -105,25 +107,42 @@ #ifdef __LINUX__ #else - do - { - fSuccess = ReadFile( - h_Pipe, - buf, - size, - &cbRead, - NULL); - - if (! fSuccess && GetLastError() != ERROR_MORE_DATA) - break; - - _tprintf( TEXT("%s\n"), buf ); - } while (!fSuccess); // repeat loop if ERROR_MORE_DATA + localbuf = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(TCHAR)); + if (localbuf != NULL) + { - if (!fSuccess) + do + { + do + { + ZeroMemory(localbuf, sizeof(localsize) * sizeof(TCHAR)); + + fSuccess = ReadFile( + h_Pipe, + localbuf, + localsize * sizeof(TCHAR), + &cbRead, + NULL); + + if (! fSuccess && GetLastError() != ERROR_MORE_DATA) + break; + + _tcscat(buf, localbuf); + + } while (!fSuccess); // repeat loop if ERROR_MORE_DATA + } while (localbuf[_tcslen(localbuf)-1] != '\n'); + + if (!fSuccess) + return 0; + + HeapFree(GetProcessHeap(), 0, localbuf); + } + else + { return 0; + } #endif - + buf[_tcslen(buf)-_tcslen(_T("\n"))-1] = '\0'; return _tcslen(buf); } Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Thu Oct 26 00:02:01 2006 @@ -320,10 +320,11 @@ string pipecmd = _T(""); #ifdef __LINUX__ - + pid_t pid; #else STARTUPINFO siStartInfo; PROCESS_INFORMATION piProcInfo; + DWORD pid; ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); @@ -338,6 +339,10 @@ { cerr << "Error: CreateProcess failed " << boot_cmd <<endl; return false; + } + else + { + pid = piProcInfo.dwProcessId; } #endif @@ -356,7 +361,7 @@ if (m_Delayread) { /// - /// delay reading untill emulator is ready + /// delay reading until emulator is ready /// _sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); @@ -380,23 +385,35 @@ break; } - namedpipe_reader.readPipe (Buffer); - cout << Buffer.c_str() << endl; - vect.push_back (Buffer); - - DebugState state = checkDebugData(vect); - - if (state == DebugStateBSODDetected || state == DebugStateUMEDetected) - { - ret = false; - break; - } - else if (state == DebugStateCPReached) - { - break; + if (namedpipe_reader.readPipe (Buffer) != 0) + { + vect.push_back (Buffer.c_str()); + + DebugState state = checkDebugData(vect); + if (state == DebugStateBSODDetected || state == DebugStateUMEDetected) + { + ret = false; + break; + } + else if (state == DebugStateCPReached) + { + break; + } } } namedpipe_reader.closePipe (); + +#ifdef __LINUX__ + kill(pid, SIGTERM); +#else + HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (hProcess) + { + TerminateProcess(hProcess, 0); + } + CloseHandle(hProcess); +#endif + return ret; } //---------------------------------------------------------------------------------------

1 0

[ion] 24652: - Add some missing/internal definitions to proper headers. - Get rid of FLUSH_TLB macros and use KeFlushCurrentTb and the MSVC_compatible instrinsic __invlpg; - Fix some prototypes. - Fixed unsigned/signed mismatches. - Fix SEH usage in ExAllocatePoolWithQuotaTag.
by ion＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: ion Date: Wed Oct 25 22:23:45 2006 New Revision: 24652 URL: http://svn.reactos.org/svn/reactos?rev=24652&view=rev Log: - Add some missing/internal definitions to proper headers. - Get rid of FLUSH_TLB macros and use KeFlushCurrentTb and the MSVC_compatible instrinsic __invlpg; - Fix some prototypes. - Fixed unsigned/signed mismatches. - Fix SEH usage in ExAllocatePoolWithQuotaTag. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/iotypes.h trunk/reactos/include/ndk/ldrtypes.h trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/fs/context.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/iomgr/bootlog.c trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/ldt.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/iospace.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/se/lsa.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=24… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Wed Oct 25 22:23:45 2006 @@ -70,6 +70,30 @@ extern LARGE_INTEGER IoReadTransferCount; extern LARGE_INTEGER IoWriteTransferCount; extern LARGE_INTEGER IoOtherTransferCount; + +typedef STRING LSA_STRING, *PLSA_STRING; +typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; + +typedef enum _SECURITY_LOGON_TYPE +{ + UndefinedLogonType = 0, + Interactive = 2, + Network, + Batch, + Service, + Proxy, + Unlock, + NetworkCleartext, + NewCredentials, +#if (_WIN32_WINNT >= 0x0501) + RemoteInteractive, + CachedInteractive, +#endif +#if (_WIN32_WINNT >= 0x0502) + CachedRemoteInteractive, + CachedUnlock +#endif +} SECURITY_LOGON_TYPE, *PSECURITY_LOGON_TYPE; #define ANSI_DOS_STAR ('<') #define ANSI_DOS_QM ('>') @@ -378,6 +402,7 @@ #define TOKEN_HAS_BACKUP_PRIVILEGE 0x02 #define TOKEN_HAS_RESTORE_PRIVILEGE 0x04 #define TOKEN_HAS_ADMIN_GROUP 0x08 +#define TOKEN_WRITE_RESTRICTED 0x08 #define TOKEN_IS_RESTRICTED 0x10 #define VACB_MAPPING_GRANULARITY (0x40000) @@ -1993,7 +2018,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID *Bcb, OUT PVOID *Buffer ); @@ -2026,6 +2051,8 @@ IN PMDL MdlChain ); +#define MAP_WAIT 1 + NTKERNELAPI BOOLEAN NTAPI @@ -2033,11 +2060,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, -#if (VER_PRODUCTBUILD >= 2195) IN ULONG Flags, -#else - IN BOOLEAN Wait, -#endif IN OUT PVOID *Bcb ); @@ -2048,11 +2071,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, -#if (VER_PRODUCTBUILD >= 2195) IN ULONG Flags, -#else - IN BOOLEAN Wait, -#endif OUT PVOID *Bcb, OUT PVOID *Buffer ); @@ -2076,11 +2095,7 @@ IN PLARGE_INTEGER FileOffset, IN ULONG Length, IN BOOLEAN Zero, -#if (VER_PRODUCTBUILD >= 2195) IN ULONG Flags, -#else - IN BOOLEAN Wait, -#endif OUT PVOID *Bcb, OUT PVOID *Buffer ); Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h (original) +++ trunk/reactos/include/ndk/iotypes.h Wed Oct 25 22:23:45 2006 @@ -187,12 +187,17 @@ #define DNUF_NOT_DISABLEABLE 0x0008 // +// Internal Option Flags +// +#define IO_ATTACH_DEVICE_API 0x80000000 + +// // Undocumented WMI Registration Flags // -#define WMIREG_FLAG_TRACE_PROVIDER 0x00010000 -#define WMIREG_FLAG_TRACE_NOTIFY_MASK 0x00F00000 -#define WMIREG_NOTIFY_DISK_IO 0x00100000 -#define WMIREG_NOTIFY_TDI_IO 0x00200000 +#define WMIREG_FLAG_TRACE_PROVIDER 0x00010000 +#define WMIREG_FLAG_TRACE_NOTIFY_MASK 0x00F00000 +#define WMIREG_NOTIFY_DISK_IO 0x00100000 +#define WMIREG_NOTIFY_TDI_IO 0x00200000 // // I/O Completion Information Class for NtQueryIoCompletionInformation 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 (original) +++ trunk/reactos/include/ndk/ldrtypes.h Wed Oct 25 22:23:45 2006 @@ -66,6 +66,11 @@ // #define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS 0x00000001 #define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 + +// +// FIXME: THIS SHOULD *NOT* BE USED! +// +#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 // // Loader Data stored in the PEB Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Wed Oct 25 22:23:45 2006 @@ -1130,7 +1130,7 @@ #define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 #define IMAGE_SCN_TYPE_REG 0 #define IMAGE_SCN_TYPE_DSECT 1 -#define IMAGE_SCN_TYPE_NOLOAD 2 +//#define IMAGE_SCN_TYPE_NOLOAD 2 #define IMAGE_SCN_TYPE_GROUP 4 #define IMAGE_SCN_TYPE_NO_PAD 8 #define IMAGE_SCN_CNT_CODE 32 Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=2465… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c (original) +++ trunk/reactos/ntoskrnl/cc/pin.c Wed Oct 25 22:23:45 2006 @@ -27,7 +27,7 @@ CcMapData (IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID *pBcb, OUT PVOID *pBuffer) { @@ -39,9 +39,9 @@ PINTERNAL_BCB iBcb; ULONG ROffset; - DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Wait %d," + DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Flags %d," " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, - Length, Wait, pBcb, pBuffer); + Length, Flags, pBcb, pBuffer); ReadOffset = (ULONG)FileOffset->QuadPart; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; @@ -67,7 +67,7 @@ } if (!Valid) { - if (!Wait) + if (!(Flags & MAP_WAIT)) { CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); return(FALSE); Modified: trunk/reactos/ntoskrnl/fs/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/context.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fs/context.c (original) +++ trunk/reactos/ntoskrnl/fs/context.c Wed Oct 25 22:23:45 2006 @@ -62,7 +62,7 @@ */ PFSRTL_PER_FILEOBJECT_CONTEXT NTAPI -FsRtlRemovePerFileObjectContext(IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext, +FsRtlRemovePerFileObjectContext(IN PFILE_OBJECT PerFileObjectContext, IN PVOID OwnerId OPTIONAL, IN PVOID InstanceId OPTIONAL) { Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Wed Oct 25 22:23:45 2006 @@ -514,10 +514,10 @@ *--*/ VOID FORCEINLINE -ExInitializePushLock(IN PEX_PUSH_LOCK PushLock) +ExInitializePushLock(IN PULONG_PTR PushLock) { /* Set the value to 0 */ - PushLock->Value = 0; + *PushLock = 0; } /*++ Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Wed Oct 25 22:23:45 2006 @@ -39,6 +39,13 @@ : /* no outputs */ \ : "q" (X)); +#define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); + +#define Ke386GetTr(X) \ + __asm__("str %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + #define Ke386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) #define Ke386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") @@ -58,8 +65,6 @@ #define _Ke386SetDr(N,X) __asm__ __volatile__("movl %0,%%dr" #N : :"r" (X)); -#define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); -#define Ke386GetTr(X) __asm__ __volatile__("str %%ax" : :"a" (X)); static inline void Ki386Cpuid(ULONG Op, PULONG Eax, PULONG Ebx, PULONG Ecx, PULONG Edx) { @@ -69,25 +74,11 @@ } #define Ke386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) - #define Ke386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) -#define FLUSH_TLB { \ - unsigned int tmp; \ - __asm__ __volatile__( \ - "movl %%cr3,%0\n\t" \ - "movl %0,%%cr3\n\t" \ - : "=r" (tmp) \ - :: "memory"); \ -} - -#define FLUSH_TLB_ONE(addr) __asm__ __volatile__( \ - "invlpg %0" \ - : \ - : "m" (*(volatile long *) (addr))) - -#define Ke386HaltProcessor() __asm__("hlt\n\t"); -#define Ke386FnInit() __asm__("fninit\n\t"); +#define Ke386HaltProcessor() __asm__("hlt\n\t"); + +#define Ke386FnInit() __asm__("fninit\n\t"); // // DR Macros Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Wed Oct 25 22:23:45 2006 @@ -197,14 +197,14 @@ FASTCALL ObDereferenceObjectEx( IN PVOID Object, - IN ULONG Count + IN LONG Count ); LONG FASTCALL ObReferenceObjectEx( IN PVOID Object, - IN ULONG Count + IN LONG Count ); BOOLEAN Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/bootlog.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/bootlog.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c Wed Oct 25 22:23:45 2006 @@ -314,11 +314,9 @@ ExReleaseResourceLite(&IopBootLogResource); return; } -#if defined (__GNUC__) - Status = IopWriteLogFile(L"ReactOS "KERNEL_VERSION_STR); -#elif defined (_MSC_VER) - Status = IopWriteLogFile("ReactOS "KERNEL_VERSION_STR); -#endif + + //Status = IopWriteLogFile(L"ReactOS "KERNEL_VERSION_STR); + if (!NT_SUCCESS(Status)) { DPRINT1("IopWriteLogFile() failed (Status %lx)\n", Status); Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Wed Oct 25 22:23:45 2006 @@ -1331,7 +1331,7 @@ DPRINT("Thread %p acquired mutex\n", PsGetCurrentThread()); /* Disable hardware debugging while we are inside the stub */ - _Ke386SetDr(7, 0); + Ke386SetDr7(0); GspUnloadBreakpoints(TrapFrame); /* Make sure we're debugging the current thread. */ Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Wed Oct 25 22:23:45 2006 @@ -525,7 +525,7 @@ *Idt = (PKIDTENTRY)IdtDescriptor.Base; /* Get TSS and FS Selectors */ - Ke386GetTr(&Tr); + Ke386GetTr(Tr); if (Tr != KGDT_TSS) Tr = KGDT_TSS; // FIXME: HACKHACK Fs = Ke386GetFs(); Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c Wed Oct 25 22:23:45 2006 @@ -33,7 +33,7 @@ KeAcquireSpinLock(&GdtLock, &oldIrql); - Gdt = KeGetPcr()->GDT; + Gdt = (PUSHORT)KeGetPcr()->GDT; Entry = (Entry & (~0x3)) / 2; Gdt[Entry + 1] = (USHORT)(((ULONG)Base) & 0xffff); Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Wed Oct 25 22:23:45 2006 @@ -85,11 +85,11 @@ } else if (Address == (PVOID)0xfffffffe) { - FLUSH_TLB; - } - else - { - FLUSH_TLB_ONE(Address); + KeFlushCurrentTb(); + } + else + { + __invlpg(Address); } } @@ -112,7 +112,7 @@ #else if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart) { - FLUSH_TLB_ONE(Address); + __invlpg(Address); } #endif } @@ -2220,7 +2220,7 @@ } } Address = (PVOID)((ULONG_PTR)HYPERSPACE + i * PAGE_SIZE); - FLUSH_TLB_ONE(Address); + __invlpg(Address); return Address; } @@ -2242,7 +2242,7 @@ Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); Pfn = PTE_TO_PFN(Entry); } - FLUSH_TLB_ONE(Address); + __invlpg(Address); return Pfn; } @@ -2264,7 +2264,7 @@ Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), 0); Pfn = PTE_TO_PFN(Entry); } - FLUSH_TLB_ONE(Address); + __invlpg(Address); return Pfn; } Modified: trunk/reactos/ntoskrnl/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/iospace.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/iospace.c (original) +++ trunk/reactos/ntoskrnl/mm/iospace.c Wed Oct 25 22:23:45 2006 @@ -140,7 +140,7 @@ MmUnmapIoSpace (IN PVOID BaseAddress, IN ULONG NumberOfBytes) { - ULONG Offset; + LONG Offset; PVOID Address = BaseAddress; Offset = (ULONG_PTR)Address % PAGE_SIZE; Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c (original) +++ trunk/reactos/ntoskrnl/mm/pool.c Wed Oct 25 22:23:45 2006 @@ -161,41 +161,51 @@ return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); } -/* - * @implemented - */ -PVOID STDCALL +_SEH_DEFINE_LOCALS(ExQuotaPoolVars) +{ + PVOID Block; +}; + +_SEH_FILTER(FreeAndGoOn) +{ + _SEH_ACCESS_LOCALS(ExQuotaPoolVars); + + /* Couldn't charge, so free the pool and let the caller SEH manage */ + ExFreePool(_SEH_VAR(Block)); + return EXCEPTION_CONTINUE_SEARCH; +} + +/* + * @implemented + */ +PVOID +NTAPI ExAllocatePoolWithQuotaTag (IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes, - IN ULONG Tag) -{ - PVOID Block; + IN ULONG NumberOfBytes, + IN ULONG Tag) +{ PEPROCESS Process; + _SEH_DECLARE_LOCALS(ExQuotaPoolVars); /* Allocate the Pool First */ - Block = EiAllocatePool(PoolType, - NumberOfBytes, - Tag, - &ExAllocatePoolWithQuotaTag); + _SEH_VAR(Block) = EiAllocatePool(PoolType, + NumberOfBytes, + Tag, + &ExAllocatePoolWithQuotaTag); /* "Quota is not charged to the thread for allocations >= PAGE_SIZE" - OSR Docs */ - if (!(NumberOfBytes >= PAGE_SIZE)) { - + if (!(NumberOfBytes >= PAGE_SIZE)) + { /* Get the Current Process */ Process = PsGetCurrentProcess(); /* PsChargePoolQuota returns an exception, so this needs SEH */ - _SEH_FILTER(FreeAndGoOn) - { - /* Couldn't charge, so free the pool and let the caller SEH manage */ - ExFreePool(Block); - return EXCEPTION_CONTINUE_SEARCH; - } - _SEH_TRY { - //* FIXME: Is there a way to get the actual Pool size allocated from the pool header? */ - PsChargePoolQuota(Process, PoolType & PAGED_POOL_MASK, NumberOfBytes); + /* FIXME: Is there a way to get the actual Pool size allocated from the pool header? */ + PsChargePoolQuota(Process, + PoolType & PAGED_POOL_MASK, + NumberOfBytes); } _SEH_EXCEPT(FreeAndGoOn) { @@ -205,7 +215,8 @@ _SEH_END; } - return Block; + /* Return the allocated block */ + return _SEH_VAR(Block); } /* Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Wed Oct 25 22:23:45 2006 @@ -70,7 +70,7 @@ LONG FASTCALL ObReferenceObjectEx(IN PVOID Object, - IN ULONG Count) + IN LONG Count) { /* Increment the reference count and return the count now */ return InterlockedExchangeAdd(&OBJECT_TO_OBJECT_HEADER(Object)-> @@ -81,10 +81,10 @@ LONG FASTCALL ObDereferenceObjectEx(IN PVOID Object, - IN ULONG Count) + IN LONG Count) { POBJECT_HEADER Header; - ULONG NewCount; + LONG NewCount; /* Extract the object header */ Header = OBJECT_TO_OBJECT_HEADER(Object); Modified: trunk/reactos/ntoskrnl/se/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/lsa.c?rev=2465… ============================================================================== --- trunk/reactos/ntoskrnl/se/lsa.c (original) +++ trunk/reactos/ntoskrnl/se/lsa.c Wed Oct 25 22:23:45 2006 @@ -12,7 +12,6 @@ #define NDEBUG #include <internal/debug.h> -/* LsaCallAuthenticationPackage@28 */ /* * @unimplemented */ @@ -29,7 +28,6 @@ return STATUS_NOT_IMPLEMENTED; } -/* LsaDeregisterLogonProcess@8 */ /* * @unimplemented */ @@ -41,7 +39,6 @@ return STATUS_NOT_IMPLEMENTED; } -/* LsaFreeReturnBuffer@4 */ /* * @implemented */ @@ -57,31 +54,29 @@ ); } -/* LsaLogonUser@56 */ /* * @unimplemented */ -NTSTATUS STDCALL LsaLogonUser ( - ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5, - ULONG Unknown6, - ULONG Unknown7, - ULONG Unknown8, - ULONG Unknown9, - ULONG Unknown10, - ULONG Unknown11, - ULONG Unknown12, - ULONG Unknown13 - ) +NTSTATUS +NTAPI +LsaLogonUser(IN HANDLE LsaHandle, + IN PLSA_STRING OriginName, + IN SECURITY_LOGON_TYPE LogonType, + IN ULONG AuthenticationPackage, + IN PVOID AuthenticationInformation, + IN ULONG AuthenticationInformationLength, + IN PTOKEN_GROUPS LocalGroups OPTIONAL, + IN PTOKEN_SOURCE SourceContext, + OUT PVOID *ProfileBuffer, + OUT PULONG ProfileBufferLength, + OUT PLUID LogonId, + OUT PHANDLE Token, + OUT PQUOTA_LIMITS Quotas, + OUT PNTSTATUS SubStatus) { return STATUS_NOT_IMPLEMENTED; } -/* LsaLookupAuthenticationPackage@12 */ /* * @unimplemented */ @@ -94,15 +89,14 @@ return STATUS_NOT_IMPLEMENTED; } -/* LsaRegisterLogonProcess@12 */ /* * @unimplemented */ -NTSTATUS STDCALL LsaRegisterLogonProcess ( - ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2 - ) +NTSTATUS +NTAPI +LsaRegisterLogonProcess (IN PLSA_STRING LogonProcessName, + OUT PHANDLE LsaHandle, + OUT PLSA_OPERATIONAL_MODE SecurityMode) { return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Wed Oct 25 22:23:45 2006 @@ -2415,7 +2415,7 @@ ) { PAGED_CODE(); - return (((PTOKEN)Token)->TokenFlags & TOKEN_HAS_ADMIN_GROUP) != 0; + return (((PTOKEN)Token)->TokenFlags & TOKEN_WRITE_RESTRICTED) != 0; } /*

1 0

[ion] 24651: - Implement more of the Ke386 ASM macros for MSVC. - Remove custom Set/Get Cr macros and use MSVC-compatible __read/__writecrX - Remove custom WbInvd macro and use MSVC-compatible __wbinvd.
by ion＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: ion Date: Wed Oct 25 21:15:11 2006 New Revision: 24651 URL: http://svn.reactos.org/svn/reactos?rev=24651&view=rev Log: - Implement more of the Ke386 ASM macros for MSVC. - Remove custom Set/Get Cr macros and use MSVC-compatible __read/__writecrX - Remove custom WbInvd macro and use MSVC-compatible __wbinvd. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pfault.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Wed Oct 25 21:15:11 2006 @@ -198,14 +198,14 @@ PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectorytable_pae; /* Enable PAE */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_PAE); + __writecr4(__readcr4() | X86_CR4_PAE); } /* Set the PDBR */ - Ke386SetCr3(PageDirectoryBaseAddress); + __writecr3(PageDirectoryBaseAddress); /* Enable Paging and Write Protect*/ - Ke386SetCr0(Ke386GetCr0() | X86_CR0_PG | X86_CR0_WP); + __writecr0(__readcr0() | X86_CR0_PG | X86_CR0_WP); /* Jump to Kernel */ PagedJump = (ASMCODE)(PVOID)(KernelEntryPoint); Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Wed Oct 25 21:15:11 2006 @@ -566,10 +566,10 @@ Ke386EraseFlags(); // Set the PDBR - Ke386SetCr3((ULONG_PTR)PDE); + __writecr3((ULONG_PTR)PDE); // Enable paging by modifying CR0 - Ke386SetCr0(Ke386GetCr0() | CR0_PG); + __writecr0(__readcr0() | CR0_PG); // Set processor context WinLdrSetProcessorContext(GdtIdt, KIP0PCRADDRESS, KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); 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 (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Wed Oct 25 21:15:11 2006 @@ -1689,7 +1689,7 @@ { PAGED_CODE(); - Ke386WbInvd(); + __wbinvd(); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Wed Oct 25 21:15:11 2006 @@ -50,19 +50,12 @@ #define _Ke386SetSeg(N,X) __asm__ __volatile__("movl %0,%%" #N : :"r" (X)); -#define _Ke386GetCr(N) ({ \ - unsigned int __d; \ - __asm__("movl %%cr" #N ",%0\n\t" :"=r" (__d)); \ - __d; \ - }) - #define _Ke386GetDr(N) ({ \ unsigned int __d; \ __asm__("movl %%dr" #N ",%0\n\t" :"=r" (__d)); \ __d; \ }) -#define _Ke386SetCr(N,X) __asm__ __volatile__("movl %0,%%cr" #N : :"r" (X)); #define _Ke386SetDr(N,X) __asm__ __volatile__("movl %0,%%dr" #N : :"r" (X)); #define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); @@ -95,98 +88,21 @@ #define Ke386HaltProcessor() __asm__("hlt\n\t"); #define Ke386FnInit() __asm__("fninit\n\t"); -#define Ke386WbInvd() __asm__("wbinvd\n\t"); - -#elif defined(_MSC_VER) - -VOID -FORCEINLINE -Ke386WbInvd(VOID) -{ - __asm wbinvd; -} - -VOID -FORCEINLINE -Ke386FnInit(VOID) -{ - __asm fninit; -} - -VOID -FORCEINLINE -Ke386HaltProcessor(VOID) -{ - __asm hlt; -} - -VOID -FORCEINLINE -Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor) -{ - __asm sidt Descriptor; -} - -VOID -FORCEINLINE -Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor) -{ - __asm lidt Descriptor; -} - -VOID -FORCEINLINE -Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor) -{ - __asm sgdt Descriptor; -} - -VOID -FORCEINLINE -Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor) -{ - __asm lgdt Descriptor; -} - -VOID -FORCEINLINE -Ke386GetLocalDescriptorTable(OUT USHORT Descriptor) -{ - __asm sldt Descriptor; -} - -VOID -FORCEINLINE -Ke386SetLocalDescriptorTable(IN USHORT Descriptor) -{ - __asm lldt Descriptor; -} - -#else -#error Unknown compiler for inline assembler -#endif - -// -// CR Macros -// -#define Ke386GetCr0() _Ke386GetCr(0) -#define Ke386SetCr0(X) _Ke386SetCr(0,X) -#define Ke386GetCr2() _Ke386GetCr(2) -#define Ke386SetCr2(X) _Ke386SetCr(2,X) -#define Ke386GetCr3() _Ke386GetCr(3) -#define Ke386SetCr3(X) _Ke386SetCr(3,X) -#define Ke386GetCr4() _Ke386GetCr(4) -#define Ke386SetCr4(X) _Ke386SetCr(4,X) // // DR Macros // #define Ke386GetDr0() _Ke386GetDr(0) +#define Ke386GetDr1() _Ke386GetDr(1) #define Ke386SetDr0(X) _Ke386SetDr(0,X) #define Ke386GetDr2() _Ke386GetDr(2) #define Ke386SetDr2(X) _Ke386SetDr(2,X) +#define Ke386GetDr3() _Ke386GetDr(3) #define Ke386GetDr4() _Ke386GetDr(4) #define Ke386SetDr4(X) _Ke386SetDr(4,X) +#define Ke386GetDr6() _Ke386GetDr(6) +#define Ke386GetDr7() _Ke386GetDr(7) +#define Ke386SetDr7(X) _Ke386SetDr(7,X) // // Segment Macros @@ -197,6 +113,246 @@ #define Ke386SetDs(X) _Ke386SetSeg(ds, X) #define Ke386SetEs(X) _Ke386SetSeg(es, X) +#elif defined(_MSC_VER) + +VOID +FORCEINLINE +Ke386FnInit(VOID) +{ + __asm fninit; +} + +VOID +FORCEINLINE +Ke386HaltProcessor(VOID) +{ + __asm hlt; +} + +VOID +FORCEINLINE +Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor) +{ + __asm sidt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor) +{ + __asm lidt Descriptor; +} + +VOID +FORCEINLINE +Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor) +{ + __asm sgdt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor) +{ + __asm lgdt Descriptor; +} + +VOID +FORCEINLINE +Ke386GetLocalDescriptorTable(OUT USHORT Descriptor) +{ + __asm sldt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetLocalDescriptorTable(IN USHORT Descriptor) +{ + __asm lldt Descriptor; +} + +VOID +FORCEINLINE +Ke386SaveFlags(IN ULONG Flags) +{ + __asm pushf; + __asm pop Flags; +} + +VOID +FORCEINLINE +Ke386RestoreFlags(IN ULONG Flags) +{ + __asm push Flags; + __asm popf; +} + +VOID +FORCEINLINE +Ke386SetTr(IN USHORT Tr) +{ + __asm ltr Tr; +} + +USHORT +FORCEINLINE +Ke386GetTr(IN USHORT Tr) +{ + __asm str Tr; +} + +// +// DR Macros +// +ULONG +FORCEINLINE +Ke386GetDr0(VOID) +{ + __asm mov eax, dr0; +} + +ULONG +FORCEINLINE +Ke386GetDr1(VOID) +{ + __asm mov eax, dr1; +} + +ULONG +FORCEINLINE +Ke386GetDr2(VOID) +{ + __asm mov eax, dr2; +} + +ULONG +FORCEINLINE +Ke386GetDr3(VOID) +{ + __asm mov eax, dr3; +} + +ULONG +FORCEINLINE +Ke386GetDr6(VOID) +{ + __asm mov eax, dr6; +} + +ULONG +FORCEINLINE +Ke386GetDr7(VOID) +{ + __asm mov eax, dr7; +} + +VOID +FORCEINLINE +Ke386SetDr0(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr0, eax; +} + +VOID +FORCEINLINE +Ke386SetDr2(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr2, eax; +} + +VOID +FORCEINLINE +Ke386SetDr3(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr3, eax; +} + +VOID +FORCEINLINE +Ke386SetDr6(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr6, eax; +} + +VOID +FORCEINLINE +Ke386SetDr7(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr7, eax; +} + +// +// Segment Macros +// +USHORT +FORCEINLINE +Ke386GetSs(VOID) +{ + __asm mov ax, ss; +} + +USHORT +FORCEINLINE +Ke386GetFs(VOID) +{ + __asm mov ax, fs; +} + +USHORT +FORCEINLINE +Ke386GetDs(VOID) +{ + __asm mov ax, ds; +} + +USHORT +FORCEINLINE +Ke386GetEs(VOID) +{ + __asm mov ax, es; +} + +VOID +FORCEINLINE +Ke386SetSs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov ss, ax; +} + +VOID +FORCEINLINE +Ke386SetFs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov fs, ax; +} + +VOID +FORCEINLINE +Ke386SetDs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov ds, ax; +} + +VOID +FORCEINLINE +Ke386SetEs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov es, ax; +} + +#else +#error Unknown compiler for inline assembler #endif +#endif + /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Wed Oct 25 21:15:11 2006 @@ -511,13 +511,13 @@ ULONG Cr0; /* Save current CR0 */ - Cr0 = Ke386GetCr0(); + Cr0 = __readcr0(); /* If this is a 486, enable Write-Protection */ if (KeGetCurrentPrcb()->CpuType > 3) Cr0 |= CR0_WP; /* Set new Cr0 */ - Ke386SetCr0(Cr0); + __writecr0(Cr0); } VOID @@ -601,7 +601,7 @@ /* Initialize the TSS used for handling double faults. */ Tss = (PKTSS)KiDoubleFaultTSS; KiInitializeTSS(Tss); - Tss->CR3 = _Ke386GetCr(3); + Tss->CR3 = __readcr3(); Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); Tss->Eip = PtrToUlong(KiTrap8); Tss->Cs = KGDT_R0_CODE; @@ -630,7 +630,7 @@ /* Initialize the actual TSS */ Tss = (PKTSS)KiNMITSS; KiInitializeTSS(Tss); - Tss->CR3 = _Ke386GetCr(3); + Tss->CR3 = __readcr3(); Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); Tss->Eip = PtrToUlong(KiTrap2); Tss->Cs = KGDT_R0_CODE; @@ -655,7 +655,7 @@ KeFlushCurrentTb(VOID) { /* Flush the TLB by resetting CR3 */ - _Ke386SetCr(3, _Ke386GetCr(3)); + __writecr3((ULONGLONG)__readcr3); } VOID @@ -663,19 +663,19 @@ KiSaveProcessorControlState(IN PKPROCESSOR_STATE ProcessorState) { /* Save the CR registers */ - ProcessorState->SpecialRegisters.Cr0 = _Ke386GetCr(0); - ProcessorState->SpecialRegisters.Cr2 = _Ke386GetCr(2); - ProcessorState->SpecialRegisters.Cr3 = _Ke386GetCr(3); - ProcessorState->SpecialRegisters.Cr4 = _Ke386GetCr(4); + ProcessorState->SpecialRegisters.Cr0 = __readcr0(); + ProcessorState->SpecialRegisters.Cr2 = __readcr2(); + ProcessorState->SpecialRegisters.Cr3 = __readcr3(); + ProcessorState->SpecialRegisters.Cr4 = __readcr4(); /* Save the DR registers */ - ProcessorState->SpecialRegisters.KernelDr0 = _Ke386GetDr(0); - ProcessorState->SpecialRegisters.KernelDr1 = _Ke386GetDr(1); - ProcessorState->SpecialRegisters.KernelDr2 = _Ke386GetDr(2); - ProcessorState->SpecialRegisters.KernelDr3 = _Ke386GetDr(3); - ProcessorState->SpecialRegisters.KernelDr6 = _Ke386GetDr(6); - ProcessorState->SpecialRegisters.KernelDr7 = _Ke386GetDr(7); - _Ke386SetDr(7, 0); + ProcessorState->SpecialRegisters.KernelDr0 = Ke386GetDr0(); + ProcessorState->SpecialRegisters.KernelDr1 = Ke386GetDr1(); + ProcessorState->SpecialRegisters.KernelDr2 = Ke386GetDr2(); + ProcessorState->SpecialRegisters.KernelDr3 = Ke386GetDr3(); + ProcessorState->SpecialRegisters.KernelDr6 = Ke386GetDr6(); + ProcessorState->SpecialRegisters.KernelDr7 = Ke386GetDr7(); + Ke386SetDr7(0); /* Save GDT, IDT, LDT and TSS */ Ke386GetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr); @@ -724,7 +724,7 @@ Ki386EnableDE(IN ULONG_PTR Context) { /* Enable DE */ - Ke386SetCr4(Ke386GetCr4() | CR4_DE); + __writecr4(__readcr4() | CR4_DE); return 0; } @@ -733,7 +733,7 @@ Ki386EnableFxsr(IN ULONG_PTR Context) { /* Enable FXSR */ - Ke386SetCr4(Ke386GetCr4() | CR4_FXSR); + __writecr4(__readcr4() | CR4_FXSR); return 0; } Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c Wed Oct 25 21:15:11 2006 @@ -38,15 +38,15 @@ } /* Now get CR4 and make sure PGE is masked out */ - Cr4 = Ke386GetCr4(); - Ke386SetCr4(Cr4 & ~CR4_PGE); + Cr4 = __readcr4(); + __writecr4(Cr4 & ~CR4_PGE); /* Flush the TLB */ - Cr3 = Ke386GetCr3(); - Ke386SetCr3(Cr3); + Cr3 = __readcr3(); + __writecr3(Cr3); /* Now enable PGE */ - Ke386SetCr4(Cr4 | CR4_PGE); + __writecr4(Cr4 | CR4_PGE); Ke386GlobalPagesEnabled = TRUE; /* Restore interrupts */ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Wed Oct 25 21:15:11 2006 @@ -122,7 +122,7 @@ PULONG MmGetPageDirectory(VOID) { - return (PULONG)Ke386GetCr3(); + return (PULONG)__readcr3(); } static ULONG Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pfault.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pfault.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c Wed Oct 25 21:15:11 2006 @@ -37,7 +37,7 @@ ASSERT(ExceptionNr == 14); /* get the faulting address */ - cr2 = Ke386GetCr2(); + cr2 = __readcr2(); Tf->DbgArgPointer = cr2; /* it's safe to enable interrupts after cr2 has been saved */

1 0

[ion] 24650: - Move all ASM internal intrinsics to intrin_i.h. Request for KJK::Hyperion/hackbunny to look at the GCC ones and optimize/fix them up. - Add MSVC versions for some of them (not yet complete). - Fix the fact that KeGetLocalDescriptorTable was setting the LDT instead of retrieving it. - Fix bug in LIST_FOR_EACH and LIST_FOR_EACH_SAFE which was setting the flink to NULL instead of checking if the flink is NULL. One more reason these damned macros should've never been used. - Use MSVC-
by ion＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: ion Date: Wed Oct 25 20:37:46 2006 New Revision: 24650 URL: http://svn.reactos.org/svn/reactos?rev=24650&view=rev Log: - Move all ASM internal intrinsics to intrin_i.h. Request for KJK::Hyperion/hackbunny to look at the GCC ones and optimize/fix them up. - Add MSVC versions for some of them (not yet complete). - Fix the fact that KeGetLocalDescriptorTable was setting the LDT instead of retrieving it. - Fix bug in LIST_FOR_EACH and LIST_FOR_EACH_SAFE which was setting the flink to NULL instead of checking if the flink is NULL. One more reason these damned macros should've never been used. - Use MSVC-intrinsics when applicable (_disable/_enable, etc). - Fix JOB_SET_ARRAY problems. - Fix buffer overflow in SystemProcessInformation QSI_DEF. - Fix some broken compares/arithmetic to due to lack of parens. - Add some ASSERTS to some unknown functions that make pointer assumptions. Added: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/helper.h trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/deprecated/irq.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/volume.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/kd/wrappers/bochs.c trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/ldt.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Wed Oct 25 20:37:46 2006 @@ -154,7 +154,7 @@ FrLdrStartup(ULONG Magic) { /* Disable Interrupts */ - Ke386DisableInterrupts(); + _disable(); /* Re-initalize EFLAGS */ Ke386EraseFlags(); @@ -202,7 +202,7 @@ } /* Set the PDBR */ - Ke386SetPageTableDirectory(PageDirectoryBaseAddress); + Ke386SetCr3(PageDirectoryBaseAddress); /* Enable Paging and Write Protect*/ Ke386SetCr0(Ke386GetCr0() | X86_CR0_PG | X86_CR0_WP); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Wed Oct 25 20:37:46 2006 @@ -65,6 +65,7 @@ #include <arch/i386/i386.h> #include <arch/i386/machpc.h> #include <arch/i386/machxbox.h> +#include <internal/i386/intrin_i.h> #include <internal/i386/ke.h> #endif /* misc files */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Wed Oct 25 20:37:46 2006 @@ -560,13 +560,13 @@ //BS->ExitBootServices(ImageHandle,MapKey); // Disable Interrupts - Ke386DisableInterrupts(); + _disable(); // Re-initalize EFLAGS Ke386EraseFlags(); // Set the PDBR - Ke386SetPageTableDirectory((ULONG_PTR)PDE); + Ke386SetCr3((ULONG_PTR)PDE); // Enable paging by modifying CR0 Ke386SetCr0(Ke386GetCr0() | CR0_PG); Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Wed Oct 25 20:37:46 2006 @@ -264,23 +264,15 @@ #include <poppack.h> #ifndef NTOS_MODE_USER - // // Macro to get current KPRCB // -#ifndef __GNUC__ // fixme FORCEINLINE struct _KPRCB * KeGetCurrentPrcb(VOID) { return (struct _KPRCB *)(ULONG_PTR)__readfsdword(FIELD_OFFSET(KPCR, Prcb)); } - -// -// Macro to get current previous mode -// -#define KeGetPreviousMode ExGetPreviousMode -#endif // // FN/FX (FPU) Save Area Structures 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 (original) +++ trunk/reactos/include/ndk/pstypes.h Wed Oct 25 20:37:46 2006 @@ -915,6 +915,16 @@ #ifndef NTOS_MODE_USER // +// Job Set Array +// +typedef struct _JOB_SET_ARRAY +{ + HANDLE JobHandle; + ULONG MemberLevel; + ULONG Flags; +} JOB_SET_ARRAY, *PJOB_SET_ARRAY; + +// // EPROCESS Quota Structures // typedef struct _EPROCESS_QUOTA_ENTRY Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Wed Oct 25 20:37:46 2006 @@ -3384,7 +3384,6 @@ JobObjectJobSetInformation, MaxJobObjectInfoClass } JOBOBJECTINFOCLASS; -#endif typedef struct _JOB_SET_ARRAY { @@ -3392,6 +3391,7 @@ DWORD MemberLevel; DWORD Flags; } JOB_SET_ARRAY, *PJOB_SET_ARRAY; +#endif typedef struct _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION { LARGE_INTEGER TotalUserTime; Modified: trunk/reactos/include/reactos/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/helper.h?r… ============================================================================== --- trunk/reactos/include/reactos/helper.h (original) +++ trunk/reactos/include/reactos/helper.h Wed Oct 25 20:37:46 2006 @@ -41,7 +41,7 @@ */ #define LIST_FOR_EACH(elem, list, type, field) \ for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ - &(elem)->field != (list) || (elem = NULL); \ + &(elem)->field != (list) || (elem == NULL); \ (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) /* iterate through the list using a list entry, with safety against removal @@ -50,7 +50,7 @@ #define LIST_FOR_EACH_SAFE(cursor, cursor2, list, type, field) \ for ((cursor) = CONTAINING_RECORD((list)->Flink, type, field), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field); \ - &(cursor)->field != (list) || (cursor = NULL); \ + &(cursor)->field != (list) || (cursor == NULL); \ (cursor) = (cursor2), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field)) Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c (original) +++ trunk/reactos/ntoskrnl/cc/view.c Wed Oct 25 20:37:46 2006 @@ -786,6 +786,7 @@ Previous = CacheSegList[i]; } } + ASSERT(Previous); Previous->NextInChain = NULL; return(STATUS_SUCCESS); Modified: trunk/reactos/ntoskrnl/deprecated/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irq.c?… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irq.c (original) +++ trunk/reactos/ntoskrnl/deprecated/irq.c Wed Oct 25 20:37:46 2006 @@ -480,7 +480,7 @@ * Enable interrupts * NOTE: Only higher priority interrupts will get through */ - Ke386EnableInterrupts(); + _enable(); #ifndef CONFIG_SMP if (VECTOR2IRQ(vector) == 0) @@ -500,7 +500,7 @@ /* * End the system interrupt. */ - Ke386DisableInterrupts(); + _disable(); if (old_level==PASSIVE_LEVEL && Trapframe->Cs != KGDT_R0_CODE) { @@ -512,8 +512,8 @@ DPRINT("PID: %d, TID: %d CS %04x/%04x\n", ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, ((PETHREAD)CurrentThread)->Cid.UniqueThread, - Trapframe->Cs, - CurrentThread->TrapFrame ? CurrentThread->TrapFrame->Cs : 0); + Trapframe->SegCs, + CurrentThread->TrapFrame ? CurrentThread->TrapFrame->SegCs : 0); if (CurrentThread->TrapFrame == NULL) { OldTrapFrame = CurrentThread->TrapFrame; @@ -521,9 +521,9 @@ CurrentThread->TrapFrame = &KernelTrapFrame; } - Ke386EnableInterrupts(); + _enable(); KiDeliverApc(UserMode, NULL, NULL); - Ke386DisableInterrupts(); + _disable(); ASSERT(KeGetCurrentThread() == CurrentThread); if (CurrentThread->TrapFrame == &KernelTrapFrame) 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 (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Wed Oct 25 20:37:46 2006 @@ -686,8 +686,8 @@ SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; - SpiCur->PagefileUsage = pr->QuotaUsage[3]; - SpiCur->PeakPagefileUsage = pr->QuotaPeak[3]; + SpiCur->PagefileUsage = pr->QuotaUsage[2]; + SpiCur->PeakPagefileUsage = pr->QuotaPeak[2]; SpiCur->PrivatePageCount = pr->CommitCharge; ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCur + 1); @@ -1687,10 +1687,10 @@ IN ULONG NumberOfBytesToFlush ) { - PAGED_CODE(); - - __asm__("wbinvd\n"); - return STATUS_SUCCESS; + PAGED_CODE(); + + Ke386WbInvd(); + return STATUS_SUCCESS; } ULONG Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Wed Oct 25 20:37:46 2006 @@ -34,9 +34,9 @@ #ifndef CONFIG_SMP #define ExAcquireResourceLock(l, i) { \ (void)i; \ - Ke386DisableInterrupts(); \ -} -#define ExReleaseResourceLock(l, i) Ke386EnableInterrupts(); + _disable(); \ +} +#define ExReleaseResourceLock(l, i) _enable(); #else #define ExAcquireResourceLock(l, i) KeAcquireSpinLock(l, i); #define ExReleaseResourceLock(l, i) KeReleaseSpinLock(l, i); Added: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h (added) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Wed Oct 25 20:37:46 2006 @@ -1,0 +1,202 @@ +#ifndef _INTRIN_INTERNAL_ +#define _INTRIN_INTERNAL_ + +#ifdef CONFIG_SMP +#define LOCK "lock ; " +#else +#define LOCK "" +#endif + +#if defined(__GNUC__) + +#define Ke386SetInterruptDescriptorTable(X) \ + __asm__("lidt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386GetInterruptDescriptorTable(X) \ + __asm__("sidt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386SetGlobalDescriptorTable(X) \ + __asm__("lgdt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386GetGlobalDescriptorTable(X) \ + __asm__("sgdt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386GetLocalDescriptorTable(X) \ + __asm__("sldt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386SetLocalDescriptorTable(X) \ + __asm__("lldt %w0\n\t" \ + : /* no outputs */ \ + : "q" (X)); + +#define Ke386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) +#define Ke386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") + +#define _Ke386GetSeg(N) ({ \ + unsigned int __d; \ + __asm__("movl %%" #N ",%0\n\t" :"=r" (__d)); \ + __d; \ + }) + +#define _Ke386SetSeg(N,X) __asm__ __volatile__("movl %0,%%" #N : :"r" (X)); + +#define _Ke386GetCr(N) ({ \ + unsigned int __d; \ + __asm__("movl %%cr" #N ",%0\n\t" :"=r" (__d)); \ + __d; \ + }) + +#define _Ke386GetDr(N) ({ \ + unsigned int __d; \ + __asm__("movl %%dr" #N ",%0\n\t" :"=r" (__d)); \ + __d; \ + }) + +#define _Ke386SetCr(N,X) __asm__ __volatile__("movl %0,%%cr" #N : :"r" (X)); +#define _Ke386SetDr(N,X) __asm__ __volatile__("movl %0,%%dr" #N : :"r" (X)); + +#define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); +#define Ke386GetTr(X) __asm__ __volatile__("str %%ax" : :"a" (X)); + +static inline void Ki386Cpuid(ULONG Op, PULONG Eax, PULONG Ebx, PULONG Ecx, PULONG Edx) +{ + __asm__("cpuid" + : "=a" (*Eax), "=b" (*Ebx), "=c" (*Ecx), "=d" (*Edx) + : "0" (Op)); +} + +#define Ke386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) + +#define Ke386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) + +#define FLUSH_TLB { \ + unsigned int tmp; \ + __asm__ __volatile__( \ + "movl %%cr3,%0\n\t" \ + "movl %0,%%cr3\n\t" \ + : "=r" (tmp) \ + :: "memory"); \ +} + +#define FLUSH_TLB_ONE(addr) __asm__ __volatile__( \ + "invlpg %0" \ + : \ + : "m" (*(volatile long *) (addr))) + +#define Ke386HaltProcessor() __asm__("hlt\n\t"); +#define Ke386FnInit() __asm__("fninit\n\t"); +#define Ke386WbInvd() __asm__("wbinvd\n\t"); + +#elif defined(_MSC_VER) + +VOID +FORCEINLINE +Ke386WbInvd(VOID) +{ + __asm wbinvd; +} + +VOID +FORCEINLINE +Ke386FnInit(VOID) +{ + __asm fninit; +} + +VOID +FORCEINLINE +Ke386HaltProcessor(VOID) +{ + __asm hlt; +} + +VOID +FORCEINLINE +Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor) +{ + __asm sidt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor) +{ + __asm lidt Descriptor; +} + +VOID +FORCEINLINE +Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor) +{ + __asm sgdt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor) +{ + __asm lgdt Descriptor; +} + +VOID +FORCEINLINE +Ke386GetLocalDescriptorTable(OUT USHORT Descriptor) +{ + __asm sldt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetLocalDescriptorTable(IN USHORT Descriptor) +{ + __asm lldt Descriptor; +} + +#else +#error Unknown compiler for inline assembler +#endif + +// +// CR Macros +// +#define Ke386GetCr0() _Ke386GetCr(0) +#define Ke386SetCr0(X) _Ke386SetCr(0,X) +#define Ke386GetCr2() _Ke386GetCr(2) +#define Ke386SetCr2(X) _Ke386SetCr(2,X) +#define Ke386GetCr3() _Ke386GetCr(3) +#define Ke386SetCr3(X) _Ke386SetCr(3,X) +#define Ke386GetCr4() _Ke386GetCr(4) +#define Ke386SetCr4(X) _Ke386SetCr(4,X) + +// +// DR Macros +// +#define Ke386GetDr0() _Ke386GetDr(0) +#define Ke386SetDr0(X) _Ke386SetDr(0,X) +#define Ke386GetDr2() _Ke386GetDr(2) +#define Ke386SetDr2(X) _Ke386SetDr(2,X) +#define Ke386GetDr4() _Ke386GetDr(4) +#define Ke386SetDr4(X) _Ke386SetDr(4,X) + +// +// Segment Macros +// +#define Ke386GetSs() _Ke386GetSeg(ss) +#define Ke386GetFs() _Ke386GetSeg(fs) +#define Ke386SetFs(X) _Ke386SetSeg(fs, X) +#define Ke386SetDs(X) _Ke386SetSeg(ds, X) +#define Ke386SetEs(X) _Ke386SetSeg(es, X) + +#endif + +/* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Wed Oct 25 20:37:46 2006 @@ -136,186 +136,6 @@ KTRAP_FRAME TrapFrame); #endif -#ifdef CONFIG_SMP -#define LOCK "lock ; " -#else -#define LOCK "" -#endif - -#if defined(__GNUC__) -#define Ke386DisableInterrupts() __asm__("cli\n\t"); -#define Ke386EnableInterrupts() __asm__("sti\n\t"); -#define Ke386HaltProcessor() __asm__("hlt\n\t"); -#define Ke386GetPageTableDirectory(X) \ - __asm__("movl %%cr3,%0\n\t" : "=d" (X)); -#define Ke386SetPageTableDirectory(X) \ - __asm__("movl %0,%%cr3\n\t" \ - : /* no outputs */ \ - : "r" (X)); -#define Ke386SetFileSelector(X) \ - __asm__("movl %0,%%cr3\n\t" \ - : /* no outputs */ \ - : "r" (X)); -#define Ke386SetLocalDescriptorTable(X) \ - __asm__("lldt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); -#define Ke386SetInterruptDescriptorTable(X) \ - __asm__("lidt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); -#define Ke386SetGlobalDescriptorTable(X) \ - __asm__("lgdt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386GetInterruptDescriptorTable(X) \ - __asm__("sidt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386GetGlobalDescriptorTable(X) \ - __asm__("sgdt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386GetLocalDescriptorTable(X) \ - __asm__("lldt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) -#define Ke386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") - -#define _Ke386GetSeg(N) ({ \ - unsigned int __d; \ - __asm__("movl %%" #N ",%0\n\t" :"=r" (__d)); \ - __d; \ - }) - -#define _Ke386GetCr(N) ({ \ - unsigned int __d; \ - __asm__("movl %%cr" #N ",%0\n\t" :"=r" (__d)); \ - __d; \ - }) - -#define _Ke386GetDr(N) ({ \ - unsigned int __d; \ - __asm__("movl %%dr" #N ",%0\n\t" :"=r" (__d)); \ - __d; \ - }) -#define _Ke386SetCr(N,X) __asm__ __volatile__("movl %0,%%cr" #N : :"r" (X)); -#define _Ke386SetDr(N,X) __asm__ __volatile__("movl %0,%%dr" #N : :"r" (X)); -#define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); - -#define Ke386GetTr(X) __asm__ __volatile__("str %%ax" : :"a" (X)); - -#define _Ke386SetSeg(N,X) __asm__ __volatile__("movl %0,%%" #N : :"r" (X)); - -#define Ke386GetCr0() _Ke386GetCr(0) -#define Ke386SetCr0(X) _Ke386SetCr(0,X) -#define Ke386GetCr2() _Ke386GetCr(2) -#define Ke386SetCr2(X) _Ke386SetCr(2,X) -#define Ke386GetCr4() _Ke386GetCr(4) -#define Ke386SetCr4(X) _Ke386SetCr(4,X) -#define Ke386GetSs() _Ke386GetSeg(ss) -#define Ke386GetFs() _Ke386GetSeg(fs) -#define Ke386SetFs(X) _Ke386SetSeg(fs, X) -#define Ke386SetDs(X) _Ke386SetSeg(ds, X) -#define Ke386SetEs(X) _Ke386SetSeg(es, X) - -static inline LONG Ke386TestAndClearBit(ULONG BitPos, volatile PULONG Addr) -{ - LONG OldBit; - - __asm__ __volatile__(LOCK - "btrl %2,%1\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"=m" (*Addr) - :"Ir" (BitPos) - : "memory"); - return OldBit; -} - -static inline LONG Ke386TestAndSetBit(ULONG BitPos, volatile PULONG Addr) -{ - LONG OldBit; - - __asm__ __volatile__(LOCK - "btsl %2,%1\n\t" - "sbbl %0,%0\n\t" - :"=r" (OldBit),"=m" (*Addr) - :"Ir" (BitPos) - : "memory"); - return OldBit; -} - - -static inline void Ki386Cpuid(ULONG Op, PULONG Eax, PULONG Ebx, PULONG Ecx, PULONG Edx) -{ - __asm__("cpuid" - : "=a" (*Eax), "=b" (*Ebx), "=c" (*Ecx), "=d" (*Edx) - : "0" (Op)); -} - -#define Ke386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) - -#define Ke386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) - - -#elif defined(_MSC_VER) - -#define Ke386DisableInterrupts() _cli() -#define Ke386EnableInterrupts() _sti() -#define Ke386HaltProcessor() __asm hlt -#define Ke386GetPageTableDirectory(X) \ - __asm mov eax, cr3; \ - __asm mov X, eax; -static __forceinline void Ke386SetPageTableDirectory(ULONG X) -{ - __asm mov eax, X - __asm mov cr3, eax -} -#else -#error Unknown compiler for inline assembler -#endif - -FORCEINLINE -struct _KPCR * -KeGetCurrentKPCR(VOID) -{ - ULONG Value; -#if defined(__GNUC__) - __asm__ __volatile__ ("movl %%fs:0x1C, %0\n\t" - : "=r" (Value) - : /* no inputs */ - ); -#elif defined(_MSC_VER) - __asm mov eax, fs:[1Ch] - __asm mov [Value], eax -#endif - return (struct _KPCR *) Value; -} - -#ifdef __GNUC__ -FORCEINLINE -struct _KPRCB * -KeGetCurrentPrcb(VOID) -{ - ULONG Value; -#if defined(__GNUC__) - __asm__ __volatile__ ("movl %%fs:0x20, %0\n\t" - : "=r" (Value) - : /* no inputs */ - ); -#elif defined(_MSC_VER) - __asm mov eax, fs:[20h] - __asm mov [Value], eax -#endif - return (struct _KPRCB *) Value; -} -#endif - #endif #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h Wed Oct 25 20:37:46 2006 @@ -22,31 +22,6 @@ #define PA_SYSTEM (0) #endif -#if defined(__GNUC__) - -#define FLUSH_TLB { \ - unsigned int tmp; \ - __asm__ __volatile__( \ - "movl %%cr3,%0\n\t" \ - "movl %0,%%cr3\n\t" \ - : "=r" (tmp) \ - :: "memory"); \ - } - -#define FLUSH_TLB_ONE(addr) __asm__ __volatile__( \ - "invlpg %0" \ - : \ - : "m" (*(volatile long *) (addr))) - - - -#elif defined(_MSC_VER) -/* TODO: Need some way to tell the compiler this is a memory barrier. */ -#define FLUSH_TLB __asm mov eax, cr3 __asm mov cr3, eax; -#else -#error Unknown compiler for inline assembler -#endif - struct _EPROCESS; PULONG MmGetPageDirectory(VOID); Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Wed Oct 25 20:37:46 2006 @@ -11,16 +11,16 @@ // #define KeEnterGuardedRegion() \ { \ - PKTHREAD Thread = KeGetCurrentThread(); \ + PKTHREAD _Thread = KeGetCurrentThread(); \ \ /* Sanity checks */ \ ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); \ - ASSERT(Thread == KeGetCurrentThread()); \ - ASSERT((Thread->SpecialApcDisable <= 0) && \ - (Thread->SpecialApcDisable != -32768)); \ + ASSERT(_Thread == KeGetCurrentThread()); \ + ASSERT((_Thread->SpecialApcDisable <= 0) && \ + (_Thread->SpecialApcDisable != -32768)); \ \ /* Disable Special APCs */ \ - Thread->SpecialApcDisable--; \ + _Thread->SpecialApcDisable--; \ } // @@ -28,18 +28,18 @@ // #define KeLeaveGuardedRegion() \ { \ - PKTHREAD Thread = KeGetCurrentThread(); \ + PKTHREAD _Thread = KeGetCurrentThread(); \ \ /* Sanity checks */ \ ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); \ - ASSERT(Thread == KeGetCurrentThread()); \ - ASSERT(Thread->SpecialApcDisable < 0); \ + ASSERT(_Thread == KeGetCurrentThread()); \ + ASSERT(_Thread->SpecialApcDisable < 0); \ \ /* Leave region and check if APCs are OK now */ \ - if (!(++Thread->SpecialApcDisable)) \ + if (!(++_Thread->SpecialApcDisable)) \ { \ /* Check for Kernel APCs on the list */ \ - if (!IsListEmpty(&Thread->ApcState. \ + if (!IsListEmpty(&_Thread->ApcState. \ ApcListHead[KernelMode])) \ { \ /* Check for APC Delivery */ \ @@ -684,11 +684,7 @@ { /* Clear it */ KeGetCurrentPrcb()->NpxThread = NULL; -#ifdef __GNUC__ - __asm__("fninit\n\t"); -#else - __asm fninit; -#endif + Ke386FnInit(); } } Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Wed Oct 25 20:37:46 2006 @@ -22,6 +22,7 @@ #undef PsGetCurrentProcess #define PsGetCurrentProcess _PsGetCurrentProcess +#include "i386/intrin_i.h" #include "ke.h" #include "i386/mm.h" #include "i386/fpu.h" Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c Wed Oct 25 20:37:46 2006 @@ -46,7 +46,8 @@ /* Set VPB mount settings */ Raw = !RemainingName->Length && !OpenPacket->RelatedFileObject; - Alertable = (OpenPacket->CreateOptions & FILE_SYNCHRONOUS_IO_ALERT); + Alertable = (OpenPacket->CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) ? + TRUE: FALSE; /* Start looping until the VPB is mounted */ while (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) @@ -193,7 +194,7 @@ Vpb = DeviceObject->Vpb; /* Set the VPB as mounted and possibly raw */ - Vpb->Flags |= VPB_MOUNTED | Raw ? VPB_RAW_MOUNT : 0; + Vpb->Flags |= VPB_MOUNTED | (Raw ? VPB_RAW_MOUNT : 0); /* Set the stack size */ Vpb->DeviceObject->StackSize = AttachedDeviceObject->StackSize; @@ -477,7 +478,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(AttachedDeviceObject->StackSize + - FsStackOverhead, + (UCHAR)FsStackOverhead, TRUE); if (!Irp) { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Oct 25 20:37:46 2006 @@ -2716,7 +2716,7 @@ InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_KERNEL_HANDLE, hDevicesKey, NULL); Status = ZwOpenKey( &hDeviceKey, - KEY_QUERY_VALUE + EnumerateSubKeys ? KEY_ENUMERATE_SUB_KEYS : 0, + KEY_QUERY_VALUE + (EnumerateSubKeys ? KEY_ENUMERATE_SUB_KEYS : 0), &ObjectAttributes); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/bochs… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c Wed Oct 25 20:37:46 2006 @@ -27,19 +27,9 @@ { if (*Message == '\n') { -#if defined(_M_IX86) && defined(__GNUC__) - /* Don't use WRITE_PORT_UCHAR because hal isn't initialized yet in the very early boot phase. */ - __asm__("outb %b0, %w1\n\t" :: "a" ('\r'), "d" (BOCHS_LOGGER_PORT)); -#else - WRITE_PORT_UCHAR((PUCHAR)BOCHS_LOGGER_PORT, '\r'); -#endif + __outbyte(BOCHS_LOGGER_PORT, '\r'); } -#if defined(_M_IX86) && defined(__GNUC__) - /* Don't use WRITE_PORT_UCHAR because hal isn't initialized yet in the very early boot phase. */ - __asm__("outb %b0, %w1\n\t" :: "a" (*Message), "d" (BOCHS_LOGGER_PORT)); -#else - WRITE_PORT_UCHAR((PUCHAR)BOCHS_LOGGER_PORT, *Message); -#endif + __outbyte(BOCHS_LOGGER_PORT, *Message); Message++; } } @@ -54,11 +44,7 @@ if (BootPhase == 0) { -#if defined(_M_IX86) && defined(__GNUC__) - __asm__("inb %w1, %b0\n\t" : "=a" (Value) : "d" (BOCHS_LOGGER_PORT)); -#else - Value = READ_PORT_UCHAR((PUCHAR)BOCHS_LOGGER_PORT); -#endif + Value = __inbyte(BOCHS_LOGGER_PORT); if (Value != BOCHS_LOGGER_PORT) { KdpDebugMode.Bochs = FALSE; Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Wed Oct 25 20:37:46 2006 @@ -1331,14 +1331,7 @@ DPRINT("Thread %p acquired mutex\n", PsGetCurrentThread()); /* Disable hardware debugging while we are inside the stub */ -#if defined(__GNUC__) - __asm__("movl %0,%%db7" : /* no output */ : "r" (0)); -#elif defined(_MSC_VER) - __asm mov eax, 0 __asm mov dr7, eax -#else -#error Unknown compiler for inline assembler -#endif - + _Ke386SetDr(7, 0); GspUnloadBreakpoints(TrapFrame); /* Make sure we're debugging the current thread. */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c Wed Oct 25 20:37:46 2006 @@ -1502,7 +1502,7 @@ /* Enter critical section */ Ke386SaveFlags(OldEflags); - Ke386DisableInterrupts(); + _disable(); /* Exception inside the debugger? Game over. */ if (InterlockedIncrement(&KdbEntryCount) > 1) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Wed Oct 25 20:37:46 2006 @@ -1493,7 +1493,7 @@ STATIC BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]) { - PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR(); + PKIPCR Pcr = (PKIPCR)KeGetPcr(); KdbpPrint("Current PCR is at 0x%08x.\n", (INT)Pcr); KdbpPrint(" Tib.ExceptionList: 0x%08x\n" @@ -1538,7 +1538,7 @@ STATIC BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]) { - KTSS *Tss = KeGetCurrentKPCR()->TSS; + KTSS *Tss = KeGetPcr()->TSS; KdbpPrint("Current TSS is at 0x%08x.\n", (INT)Tss); KdbpPrint(" Eip: 0x%08x\n" @@ -2440,7 +2440,7 @@ /* Enter critical section */ Ke386SaveFlags(OldEflags); - Ke386DisableInterrupts(); + _disable(); /* Interpret the init file... */ KdbInitFileBuffer = FileBuffer; Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2465… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Wed Oct 25 20:37:46 2006 @@ -183,7 +183,7 @@ KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); /* Re-enable interrupts */ - Ke386EnableInterrupts(); + _enable(); /* Call the DPC */ DeferredRoutine(Dpc, @@ -193,7 +193,7 @@ ASSERT_IRQL(DISPATCH_LEVEL); /* Disable interrupts and keep looping */ - Ke386DisableInterrupts(); + _disable(); } else { @@ -424,7 +424,7 @@ ASSERT_DPC(Dpc); /* Disable interrupts */ - Ke386DisableInterrupts(); + _disable(); /* Get DPC data and type */ DpcType = Dpc->Type; @@ -448,7 +448,7 @@ } /* Re-enable interrupts */ - Ke386EnableInterrupts(); + _enable(); /* Return if the DPC was in the queue or not */ return DpcData ? TRUE : FALSE; Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Wed Oct 25 20:37:46 2006 @@ -39,7 +39,7 @@ { ULONG i; USHORT FlippedSelector; - extern KIDTENTRY KiIdt[]; + extern KIDTENTRY KiIdt[MAXIMUM_IDTVECTOR]; /* Loop the IDT */ for (i = 0; i <= MAXIMUM_IDTVECTOR; i ++) Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c Wed Oct 25 20:37:46 2006 @@ -33,7 +33,7 @@ KeAcquireSpinLock(&GdtLock, &oldIrql); - Gdt = KeGetCurrentKPCR()->GDT; + Gdt = KeGetPcr()->GDT; Entry = (Entry & (~0x3)) / 2; Gdt[Entry + 1] = (USHORT)(((ULONG)Base) & 0xffff); @@ -68,7 +68,7 @@ KeAcquireSpinLock(&GdtLock, &oldIrql); - Gdt = (PULONG) KeGetCurrentKPCR()->GDT; + Gdt = (PULONG) KeGetPcr()->GDT; Entry = (Entry & (~0x3)) / 4; Gdt[Entry] = Value1; @@ -193,16 +193,7 @@ ((PULONG) LdtDescriptor)[0], ((PULONG) LdtDescriptor)[1]); -#if defined(__GNUC__) - __asm__("lldtw %%ax" - : /* no output */ - : "a" (KGDT_LDT)); -#elif defined(_MSC_VER) - __asm mov ax, KGDT_LDT - __asm lldt ax -#else -#error Unknown compiler for inline assembler -#endif + Ke386SetLocalDescriptorTable(KGDT_LDT); if(LdtBase) { Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c Wed Oct 25 20:37:46 2006 @@ -42,8 +42,8 @@ Ke386SetCr4(Cr4 & ~CR4_PGE); /* Flush the TLB */ - Ke386GetPageTableDirectory(Cr3); - Ke386SetPageTableDirectory(Cr3); + Cr3 = Ke386GetCr3(); + Ke386SetCr3(Cr3); /* Now enable PGE */ Ke386SetCr4(Cr4 | CR4_PGE); Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Wed Oct 25 20:37:46 2006 @@ -122,9 +122,7 @@ PULONG MmGetPageDirectory(VOID) { - unsigned int page_dir=0; - Ke386GetPageTableDirectory(page_dir); - return((PULONG)page_dir); + return (PULONG)Ke386GetCr3(); } static ULONG Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=246… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c (original) +++ trunk/reactos/ntoskrnl/mm/pool.c Wed Oct 25 20:37:46 2006 @@ -185,26 +185,24 @@ Process = PsGetCurrentProcess(); /* PsChargePoolQuota returns an exception, so this needs SEH */ -#if defined(__GNUC__) - _SEH_FILTER(FreeAndGoOn) { + _SEH_FILTER(FreeAndGoOn) + { /* Couldn't charge, so free the pool and let the caller SEH manage */ ExFreePool(Block); return EXCEPTION_CONTINUE_SEARCH; - } _SEH_TRY { + } + + _SEH_TRY + { //* FIXME: Is there a way to get the actual Pool size allocated from the pool header? */ PsChargePoolQuota(Process, PoolType & PAGED_POOL_MASK, NumberOfBytes); - } _SEH_EXCEPT(FreeAndGoOn) { + } + _SEH_EXCEPT(FreeAndGoOn) + { /* Quota Exceeded and the caller had no SEH! */ KeBugCheck(STATUS_QUOTA_EXCEEDED); - } _SEH_END; -#else /* assuming all other Win32 compilers understand SEH */ - __try { - PsChargePoolQuota(Process, PoolType & PAGED_POOL_MASK, NumberOfBytes); - } - __except (ExFreePool(Block), EXCEPTION_CONTINUE_SEARCH) { - KeBugCheck(STATUS_QUOTA_EXCEEDED); - } -#endif + } + _SEH_END; } return Block; Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c Wed Oct 25 20:37:46 2006 @@ -263,6 +263,7 @@ MmUnlockAddressSpace(AddressSpace); if (Address < MmSystemRangeStart) { + ASSERT(Process); ObDereferenceObject(Process); } Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=2465… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c (original) +++ trunk/reactos/ntoskrnl/se/sid.c Wed Oct 25 20:37:46 2006 @@ -105,7 +105,7 @@ SeRestrictedSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); SeAnonymousLogonSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); - if (SeNullSid == NULL || SeNullSid == NULL || SeWorldSid == NULL || + if (SeNullSid == NULL || SeWorldSid == NULL || SeLocalSid == NULL || SeCreatorOwnerSid == NULL || SeCreatorGroupSid == NULL || SeCreatorOwnerServerSid == NULL || SeCreatorGroupServerSid == NULL || SeNtAuthoritySid == NULL ||

1 0

[cwittich] 24649: -debug info can now be read from a pipe -fixed a typo -terminate the qemu process on linux
by cwittich＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: cwittich Date: Wed Oct 25 20:02:47 2006 New Revision: 24649 URL: http://svn.reactos.org/svn/reactos?rev=24649&view=rev Log: -debug info can now be read from a pipe -fixed a typo -terminate the qemu process on linux Added: trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sysreg.mak Added: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (added) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Wed Oct 25 20:02:47 2006 @@ -1,0 +1,131 @@ +/* $Id: pipe_reader.cpp 24643 2006-10-24 11:45:21Z janderwald $ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/namedpipe_reader.cpp + * PURPOSE: pipe reader support + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + * Christoph von Wittich (Christoph(a)ApiViewer.de) + */ + +#include "namedpipe_reader.h" + +#include <iostream> +#include <assert.h> + +namespace System_ +{ +//--------------------------------------------------------------------------------------- + NamedPipeReader::NamedPipeReader() : h_Pipe(NULL) + { + + } + +//--------------------------------------------------------------------------------------- + NamedPipeReader::~NamedPipeReader() + { + + } + +//--------------------------------------------------------------------------------------- + + bool NamedPipeReader::openPipe(string const & PipeCmd) + { + if (h_Pipe != NULL) + { + cerr << "NamedPipeReader::openPipe> pipe already open" << endl; + return false; + } + +#ifdef __LINUX__ + +#else + h_Pipe = CreateFile(PipeCmd.c_str(), + GENERIC_WRITE | GENERIC_READ, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + (HANDLE) + NULL); + + if(INVALID_HANDLE_VALUE == h_Pipe) { + cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << GetLastError() << endl; + return false; + } + else + { + cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; + return true; + } + + ConnectNamedPipe( + h_Pipe, + 0); + +#endif + + } + +//--------------------------------------------------------------------------------------- + + bool NamedPipeReader::closePipe() + { + if (!h_Pipe) + { + cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; + return false; + } + + +#ifdef __LINUX__ + +#else + DisconnectNamedPipe(h_Pipe); + CloseHandle(h_Pipe); +#endif + + h_Pipe = NULL; + return true; + } + +//--------------------------------------------------------------------------------------- + + string::size_type NamedPipeReader::readPipe(string &Buffer) + { + TCHAR * buf = (TCHAR *)Buffer.c_str(); + string::size_type size = Buffer.capacity(); + DWORD cbRead; + BOOL fSuccess; + +//#ifdef NDEBUG + memset(buf, 0x0, sizeof(TCHAR) * size); +//#endif + +#ifdef __LINUX__ + +#else + do + { + fSuccess = ReadFile( + h_Pipe, + buf, + size, + &cbRead, + NULL); + + if (! fSuccess && GetLastError() != ERROR_MORE_DATA) + break; + + _tprintf( TEXT("%s\n"), buf ); + } while (!fSuccess); // repeat loop if ERROR_MORE_DATA + + if (!fSuccess) + return 0; +#endif + + return _tcslen(buf); + } + + +} // end of namespace System_ Added: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h (added) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h Wed Oct 25 20:02:47 2006 @@ -1,0 +1,107 @@ +#ifndef NAMEDPIPE_READER_H__ +#define NAMEDPIPE_READER_H__ + +/* $Id: namedpipe_reader.h 24643 2006-10-24 11:45:21Z janderwald $ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/namedpipe_reader.h + * PURPOSE: file reading support + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + * Christoph von Wittich (Christoph(a)ApiViewer.de) + */ + + + +#include "user_types.h" +#include <stdio.h> +#include <stdlib.h> + +#ifdef __LINUX__ + +#else + #include <windows.h> +#endif + +namespace System_ +{ +//--------------------------------------------------------------------------------------- +/// +/// class NamedPipeReader +/// +/// Description: this class implements a named pipe reader. + + class NamedPipeReader + { + public: + +//--------------------------------------------------------------------------------------- +/// +/// NamedPipeReader +/// +/// Description: constructor of class PipeReader + + NamedPipeReader(); + +//--------------------------------------------------------------------------------------- +/// +/// virtual ~NamedPipeReader +/// +/// Description: destructor of class PipeReader + + virtual ~NamedPipeReader(); + +//--------------------------------------------------------------------------------------- +/// +/// openPipe +/// +/// Description: this function attempts to open a pipe. If an pipe is already open or +/// it fails to open a pipe, the function returns false +/// +/// @param PipeCmd command of the pipe to open +/// +/// @return bool + + bool openPipe(const string & PipeCmd); + +//--------------------------------------------------------------------------------------- +/// +/// closePipe +/// +/// Description: closes a pipe. Returns true on success +/// +/// @return bool + + bool closePipe(); + +//--------------------------------------------------------------------------------------- +/// +/// readPipe +/// +/// Description: attempts to read from the pipe. Returns true on success. If it returns +/// false, call PipeReader::isEoF() to determine if the pipe should be closed +/// +/// @param Buffer to be written to +/// @return string::size_type + + string::size_type readPipe(string & Buffer); + +//--------------------------------------------------------------------------------------- +/// +/// isEof +/// +/// Description: returns true if the pipe has reached end of file. The caller should call +/// closePipe if this function returns true + + bool isEof(); + +protected: + HANDLE h_Pipe; + + }; // end of class NamedPipeReader + +} // end of namespace System_ + + + +#endif /* end of NAMEDPIPE_READER_H__ */ Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Oct 25 20:02:47 2006 @@ -11,6 +11,7 @@ #include "rosboot_test.h" #include "pipe_reader.h" +#include "namedpipe_reader.h" #include "sym_file.h" #include "file_reader.h" @@ -32,6 +33,7 @@ { using std::vector; using System_::PipeReader; + using System_::NamedPipeReader; using System_::SymbolFile; using System_::FileReader; @@ -314,18 +316,42 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::fetchDebugByPipe(string boot_cmd) { - PipeReader pipe_reader; - - if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) - { - cerr << "Error: failed to open pipe with cmd: " << boot_cmd <<endl; - return false; - } - string Buffer; - Buffer.reserve (500); - - bool ret = true; - vector<string> vect; + NamedPipeReader namedpipe_reader; + string pipecmd = _T(""); + +#ifdef __LINUX__ + +#else + STARTUPINFO siStartInfo; + PROCESS_INFORMATION piProcInfo; + + ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); + ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); + + siStartInfo.cb = sizeof(STARTUPINFO); + siStartInfo.wShowWindow = SW_SHOWNORMAL; + siStartInfo.dwFlags = STARTF_USESHOWWINDOW; + + LPTSTR command = _tcsdup(boot_cmd.c_str()); + + if (!CreateProcess(NULL, command, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &siStartInfo, &piProcInfo)) + { + cerr << "Error: CreateProcess failed " << boot_cmd <<endl; + return false; + } +#endif + + string::size_type pipe_pos = boot_cmd.find (_T("serial pipe:")); + pipe_pos += 12; + string::size_type pipe_pos_end = boot_cmd.find (_T(" "), pipe_pos); + if (pipe_pos != string::npos && pipe_pos > 0 && pipe_pos < boot_cmd.size()) + { + pipecmd = "\\\\.\\pipe\\" + boot_cmd.substr (pipe_pos, pipe_pos_end - pipe_pos); + } + else + { + return false; + } if (m_Delayread) { @@ -336,14 +362,26 @@ _sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); } - while(!pipe_reader.isEof ()) + if (!namedpipe_reader.openPipe(pipecmd)) + { + cerr << "Error: failed to open pipe with cmd: " << boot_cmd <<endl; + return false; + } + string Buffer; + Buffer.reserve (500); + + bool ret = true; + vector<string> vect; + + while(1) { if (isTimeout(m_Timeout)) { break; } - pipe_reader.readPipe (Buffer); + namedpipe_reader.readPipe (Buffer); + cout << Buffer.c_str() << endl; vect.push_back (Buffer); DebugState state = checkDebugData(vect); @@ -358,14 +396,13 @@ break; } } - pipe_reader.closePipe (); + namedpipe_reader.closePipe (); return ret; } //--------------------------------------------------------------------------------------- bool RosBootTest::fetchDebugByFile(string boot_cmd, string debug_log) { PipeReader pipe_reader; - _tremove(debug_log.c_str ()); _tremove(m_PidFile.c_str ()); if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) @@ -377,7 +414,7 @@ if (m_Delayread) { /// - /// delay reading untill emulator is ready + /// delay reading until emulator is ready /// _sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); @@ -449,7 +486,7 @@ if (pid) { #ifdef __LINUX__ - + kill(pid, SIGTERM); #else HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); if (hProcess) Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Wed Oct 25 20:02:47 2006 @@ -22,6 +22,7 @@ conf_parser.cpp \ env_var.cpp \ pipe_reader.cpp \ + namedpipe_reader.cpp \ rosboot_test.cpp \ sym_file.cpp \ sysreg.cpp \ @@ -55,6 +56,10 @@ $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ +$(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + $(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@

1 0

[cwittich] 24648: use TCHAR instead of WCHAR
by cwittich＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: cwittich Date: Wed Oct 25 16:49:35 2006 New Revision: 24648 URL: http://svn.reactos.org/svn/reactos?rev=24648&view=rev Log: use TCHAR instead of WCHAR Modified: trunk/reactos/tools/sysreg/file_reader.cpp Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.cpp (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp Wed Oct 25 16:49:35 2006 @@ -138,7 +138,7 @@ int length = ((unsigned)ptr - (unsigned)offset); length /= sizeof(TCHAR); - offset[length] = L'\0'; + offset[length] = _T('\0'); string line = offset; lines.push_back (line);

1 0

[cwittich] 24647: fix SYSREG_CHECKPOINT:USETUP_COMPLETE
by cwittich＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: cwittich Date: Wed Oct 25 16:29:47 2006 New Revision: 24647 URL: http://svn.reactos.org/svn/reactos?rev=24647&view=rev Log: fix SYSREG_CHECKPOINT:USETUP_COMPLETE Modified: trunk/reactos/base/setup/usetup/usetup.c Modified: trunk/reactos/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.c (original) +++ trunk/reactos/base/setup/usetup/usetup.c Wed Oct 25 16:29:47 2006 @@ -3671,7 +3671,7 @@ /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL /// DO NOT REMOVE!!! - DPRINT1("SYSREG_CHECKPOINT:USETUP_COMPLETE"); + DPRINT1("SYSREG_CHECKPOINT:USETUP_COMPLETE\n"); /* Reboot */ FreeConsole();

1 0

[jimtabor] 24646: Commit tmp patch by dralnix, fixes Rev 24626 Breaks Linux Build, and windows build.
by jimtabor＠svn.reactos.org 25 Oct '06

25 Oct '06

Author: jimtabor Date: Wed Oct 25 05:30:19 2006 New Revision: 24646 URL: http://svn.reactos.org/svn/reactos?rev=24646&view=rev Log: Commit tmp patch by dralnix, fixes Rev 24626 Breaks Linux Build, and windows build. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=24… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Wed Oct 25 05:30:19 2006 @@ -400,11 +400,18 @@ #define SE_RM_CONTROL_VALID 0x4000 #define SE_SELF_RELATIVE 0x8000 +#ifndef _WINNT_H +#define _AUDIT_EVENT_TYPE_HACK 0 +#endif +#if (_AUDIT_EVENT_TYPE_HACK == 1) + +#else typedef enum _AUDIT_EVENT_TYPE { AuditEventObjectAccess, AuditEventDirectoryServiceAccess } AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; +#endif #define AUDIT_ALLOW_NO_PRIVILEGE 0x1 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Wed Oct 25 05:30:19 2006 @@ -3662,6 +3662,7 @@ #endif #if (_WIN32_WINNT >= 0x0500) +#define _AUDIT_EVENT_TYPE_HACK 1 typedef enum _AUDIT_EVENT_TYPE { AuditEventObjectAccess, AuditEventDirectoryServiceAccess

1 0

[janderwald] 24645: - add an checkpoint for the system regression tool
by janderwald＠svn.reactos.org 24 Oct '06

24 Oct '06

Author: janderwald Date: Wed Oct 25 00:21:30 2006 New Revision: 24645 URL: http://svn.reactos.org/svn/reactos?rev=24645&view=rev Log: - add an checkpoint for the system regression tool Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Oct 25 00:21:30 2006 @@ -668,6 +668,10 @@ SetupCloseInfFile(hSysSetupInf); + /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL + /// DO NOT REMOVE!!! + DebugPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE"); + return 0; }

1 0

[cwittich] 24644: -added -l parameter to list all available tests -when no config file is specified use sysreg.cfg as default -updated help text
by cwittich＠svn.reactos.org 24 Oct '06

24 Oct '06

Author: cwittich Date: Tue Oct 24 23:59:27 2006 New Revision: 24644 URL: http://svn.reactos.org/svn/reactos?rev=24644&view=rev Log: -added -l parameter to list all available tests -when no config file is specified use sysreg.cfg as default -updated help text Modified: trunk/reactos/tools/sysreg/sysreg.cpp Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Tue Oct 24 23:59:27 2006 @@ -25,7 +25,7 @@ typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory; static const TCHAR USAGE[] = -_T("sysreg.exe <conf_file> <testname>\n\nconf_file ... path to a configuration file\ntest_name ... name of test to execute\n"); +_T("sysreg.exe -l | [conf_file] <testname>\n\n-l - list available tests\nconf_file - (optional) path to a configuration file (default: sysreg.cfg)\ntest_name - name of test to execute\n"); @@ -34,19 +34,37 @@ { ConfigParser config; ComponentFactory comp_factory; - - if (argc != 3) + TCHAR DefaultConfig[] = _T("sysreg.cfg"); + TCHAR *ConfigFile; + + if ((argc != 3) && (argc != 2)) { cerr << USAGE << endl; return -1; } + //--------------------------------------------------------------------------------------- /// regression tests should be registered here comp_factory.registerComponent<RosBootTest>(RosBootTest::CLASS_NAME); //--------------------------------------------------------------------------------------- - if (!config.parseFile (argv[1])) + if (argc == 2) + { + if (_tcscmp(argv[1], _T("-l")) == 0) + { + comp_factory.listComponentIds(); + return -1; + } + } + + if (argc == 2) + _tcscpy(ConfigFile, DefaultConfig); + else + ConfigFile = argv[1]; + + + if (!config.parseFile (ConfigFile)) { cerr << USAGE << endl; return -1;

1 0

← Newer
1
2
3
4
5
6
7
...
36
Older →

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 October 2006