Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37669: - Ksuser: Cleanup header usage a bit, and make sure NTSTATUS gets defined - Kernel32: Undefine IOCTL_SERIAL_LSRMST_INSERT so we don't get a (bogus) incompatible redefinition warning
by sginsberg＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: sginsberg Date: Wed Nov 26 13:04:55 2008 New Revision: 37669 URL: http://svn.reactos.org/svn/reactos?rev=37669&view=rev Log: - Ksuser: Cleanup header usage a bit, and make sure NTSTATUS gets defined - Kernel32: Undefine IOCTL_SERIAL_LSRMST_INSERT so we don't get a (bogus) incompatible redefinition warning Modified: trunk/reactos/dll/directx/ksuser/ksuser.c trunk/reactos/dll/directx/ksuser/ksuser.h trunk/reactos/dll/win32/kernel32/misc/comm.c Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Wed Nov 26 13:04:55 2008 @@ -20,6 +20,8 @@ #include "ksuser.h" +#define NDEBUG +#include <debug.h> NTSTATUS NTAPI KsiCreateObjectType( HANDLE hHandle, PVOID guidstr, PVOID Buffer, ULONG BufferSize, ACCESS_MASK DesiredAccess, PHANDLE phHandle); Modified: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Wed Nov 26 13:04:55 2008 @@ -1,15 +1,5 @@ - - - #define _KSDDK_ #include <windows.h> +#include <ntsecapi.h> +#include <ks.h> #include <reactos/helper.h> - - - -#include <ks.h> -#include <debug.h> - - - - Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/comm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/comm.c [iso-8859-1] Wed Nov 26 13:04:55 2008 @@ -38,6 +38,7 @@ #undef SERIAL_IOC_MCR_OUT1 #undef SERIAL_IOC_MCR_OUT2 #undef SERIAL_IOC_MCR_LOOP +#undef IOCTL_SERIAL_LSRMST_INSERT #include <ntddser.h> #define NDEBUG

1 0

[fireball] 37668: - Fix some coverity errors. - Use KeBugCheck(MEMORY_MANAGEMENT) instead of ASSERT(FALSE), so it dies on release builds too. - Enable support for Hyper-V. - Fix incorrect gate wait code -- fixes sporadic crashes in the network stack. - Mark KeBugCheck*, ExRaise* and RtlRaiseStatus as declspec(noreturn), for better optimization of functions which call them, less potential warnings in the compiler, and, assuming coverity understands it, less false CIDs. - Fix KiUpdateDr7, which re
by fireball＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: fireball Date: Wed Nov 26 12:56:41 2008 New Revision: 37668 URL: http://svn.reactos.org/svn/reactos?rev=37668&view=rev Log: - Fix some coverity errors. - Use KeBugCheck(MEMORY_MANAGEMENT) instead of ASSERT(FALSE), so it dies on release builds too. - Enable support for Hyper-V. - Fix incorrect gate wait code -- fixes sporadic crashes in the network stack. - Mark KeBugCheck*, ExRaise* and RtlRaiseStatus as declspec(noreturn), for better optimization of functions which call them, less potential warnings in the compiler, and, assuming coverity understands it, less false CIDs. - Fix KiUpdateDr7, which resulted in broken support for hardware breakpoints. - Fix failure cases in EnumerateRootDevices which might've freed non-allocated memory. - Fix NtAddAtom/NtFindAtom logic when dealing with NULL or kernel Atom names. Patch by Alex Ionescu. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c trunk/reactos/ntoskrnl/ke/apc.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -7666,12 +7666,14 @@ NTKERNELAPI VOID NTAPI +__declspec(noreturn) ExRaiseAccessViolation( VOID); NTKERNELAPI VOID NTAPI +__declspec(noreturn) ExRaiseDatatypeMisalignment( VOID); @@ -7679,6 +7681,7 @@ NTKERNELAPI VOID NTAPI +__declspec(noreturn) ExRaiseStatus( IN NTSTATUS Status); @@ -9603,12 +9606,14 @@ NTKERNELAPI VOID NTAPI +__declspec(noreturn) KeBugCheck( IN ULONG BugCheckCode); NTKERNELAPI VOID NTAPI +__declspec(noreturn) KeBugCheckEx( IN ULONG BugCheckCode, IN ULONG_PTR BugCheckParameter1, Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -431,6 +431,7 @@ NTSYSAPI VOID NTAPI +__declspec(noreturn) RtlRaiseStatus( IN NTSTATUS Status ); Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -603,7 +603,7 @@ else { /* Get the first thread ourselves */ - ThisThread = PsGetNextProcessThread(Process, OldThread); + ThisThread = PsGetNextProcessThread(Process, NULL); IsFirstThread = TRUE; } Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=376… ============================================================================== --- trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -92,7 +92,7 @@ PRTL_ATOM_TABLE AtomTable = ExpGetGlobalAtomTable(); NTSTATUS Status = STATUS_SUCCESS; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - LPWSTR CapturedName = NULL; + LPWSTR CapturedName; ULONG CapturedSize; RTL_ATOM SafeAtom; PAGED_CODE(); @@ -107,6 +107,9 @@ DPRINT1("Atom name too long\n"); return STATUS_INVALID_PARAMETER; } + + /* Re-use the given name if kernel mode or no atom name */ + CapturedName = AtomName; /* Check if we're called from user-mode*/ if (PreviousMode != KernelMode) @@ -147,11 +150,6 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END; - } - else - { - /* Simplify code and re-use one variable */ - if (AtomName) CapturedName = AtomName; } /* Make sure probe worked */ @@ -261,6 +259,9 @@ DPRINT1("Atom name too long\n"); return STATUS_INVALID_PARAMETER; } + + /* Re-use the given name if kernel mode or no atom name */ + CapturedName = AtomName; /* Check if we're called from user-mode*/ if (PreviousMode != KernelMode) @@ -301,11 +302,6 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END; - } - else - { - /* Simplify code and re-use one variable */ - if (AtomName) CapturedName = AtomName; } /* Make sure probe worked */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -32,6 +32,21 @@ #define INT_32_DPL0 0x8E00 #define INT_32_DPL3 0xEE00 +// +// This table contains the prefix flags that are used by V86 emulation +// +.equ PREFIX_FLAG_ES, 0x00000100 +.equ PREFIX_FLAG_CS, 0x00000200 +.equ PREFIX_FLAG_SS, 0x00000400 +.equ PREFIX_FLAG_DS, 0x00000800 +.equ PREFIX_FLAG_FS, 0x00001000 +.equ PREFIX_FLAG_GS, 0x00002000 +.equ PREFIX_FLAG_OPER32, 0x00004000 +.equ PREFIX_FLAG_ADDR32, 0x00008000 +.equ PREFIX_FLAG_LOCK, 0x00010000 +.equ PREFIX_FLAG_REPNE, 0x00020000 +.equ PREFIX_FLAG_REP, 0x00040000 + .intel_syntax noprefix // @@ -196,6 +211,23 @@ .endm // +// @name GENERATE_PREFIX_HANDLER +// +// This macro creates a prefix opcode handler. +// +// @param None. +// +// @remark None. +// +.macro GENERATE_PREFIX_HANDLER Name +.func Opcode&Name&PrefixV86 +_Opcode&Name&PrefixV86: + or ebx, PREFIX_FLAG_&Name + jmp _OpcodeGenericPrefixV86 +.endfunc +.endm + +// // @name INVALID_V86_OPCODE // // This macro prints out visible message and hangs the computer. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -519,6 +519,8 @@ /* Set Charge Quota Flag */ if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; + /* FIXME: Implement Lookaside Floats */ + /* Figure out which Lookaside List to use */ if ((StackSize <= 8) && (ChargeQuota == FALSE)) { @@ -579,9 +581,6 @@ } else { - /* We have an IRP from Lookaside */ - if (ChargeQuota) Flags |= IRP_LOOKASIDE_ALLOCATION; - /* In this case there is no charge quota */ Flags &= ~IRP_QUOTA_CHARGED; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/io/pnpmgr/pnproot.c * PURPOSE: PnP manager root device * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Copyright 2007 Hervé Poussineau (hpoussin(a)reactos.org) + * Copyright 2007 Herv? Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -503,8 +503,10 @@ ZwClose(SubKeyHandle); if (KeyHandle != INVALID_HANDLE_VALUE) ZwClose(KeyHandle); - ExFreePoolWithTag(KeyInfo, TAG_PNP_ROOT); - ExFreePoolWithTag(SubKeyInfo, TAG_PNP_ROOT); + if (KeyInfo) + ExFreePoolWithTag(KeyInfo, TAG_PNP_ROOT); + if (SubKeyInfo) + ExFreePoolWithTag(SubKeyInfo, TAG_PNP_ROOT); KeReleaseGuardedMutex(&DeviceExtension->DeviceListLock); return Status; } Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3766… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -90,6 +90,7 @@ KPROCESSOR_MODE ApcMode; PLIST_ENTRY ListHead, NextEntry; PKAPC QueuedApc; + PKGATE Gate; NTSTATUS Status; BOOLEAN RequestInterrupt = FALSE; @@ -211,24 +212,42 @@ } else if (Thread->State == GateWait) { - /* We were in a gate wait. Handle this. */ - DPRINT1("A thread was in a gate wait\n"); - - /* Lock the gate */ - KiAcquireDispatcherObject(&Thread->GateObject->Header); - - /* Remove it from the waiters list */ - RemoveEntryList(&Thread->WaitBlock[0].WaitListEntry); - - /* Unlock the gate */ - KiReleaseDispatcherObject(&Thread->GateObject->Header); - - /* Increase the queue counter if needed */ - if (Thread->Queue) Thread->Queue->CurrentCount++; - - /* Put into deferred ready list with this status */ - Status = STATUS_KERNEL_APC; - KiInsertDeferredReadyList(Thread); + /* Lock the thread */ + KiAcquireThreadLock(Thread); + + /* Essentially do the same check as above */ + if ((Thread->State == GateWait) && + (Thread->WaitIrql == PASSIVE_LEVEL) && + !(Thread->SpecialApcDisable) && + (!(Apc->NormalRoutine) || + (!(Thread->KernelApcDisable) && + !(Thread->ApcState.KernelApcInProgress)))) + { + /* We were in a gate wait. Handle this. */ + DPRINT1("A thread was in a gate wait\n"); + + /* Get the gate */ + Gate = Thread->GateObject; + + /* Lock the gate */ + KiAcquireDispatcherObject(&Gate->Header); + + /* Remove it from the waiters list */ + RemoveEntryList(&Thread->WaitBlock[0].WaitListEntry); + + /* Unlock the gate */ + KiReleaseDispatcherObject(&Gate->Header); + + /* Increase the queue counter if needed */ + if (Thread->Queue) Thread->Queue->CurrentCount++; + + /* Put into deferred ready list with this status */ + Status = STATUS_KERNEL_APC; + KiInsertDeferredReadyList(Thread); + } + + /* Release the thread lock */ + KiReleaseThreadLock(Thread); } } else if ((Thread->State == Waiting) && Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3766… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -546,11 +546,13 @@ VOID NTAPI +__declspec(noreturn) KiBugCheckDebugBreak(IN ULONG StatusCode) { /* If KDBG isn't connected, freeze the CPU, otherwise, break */ if (KdDebuggerNotPresent) for (;;) KeArchHaltProcessor(); DbgBreakPointWithStatus(StatusCode); + while (TRUE); } PCHAR @@ -604,13 +606,9 @@ &InSystem); if (!ImageBase) { - /* Driver wasn't found, check for unloaded driver */ - DriverName = NULL; // FIXME: ROS can't - if (!DriverName) continue; - - /* Convert the driver name */ - ImageBase = (PVOID)Parameters[i]; - ConversionRoutine(DriverName, AnsiName, sizeof(AnsiName)); + /* FIXME: Add code to check for unloaded drivers */ + DPRINT1("Potentially unloaded driver!\n"); + continue; } else { @@ -751,6 +749,7 @@ VOID NTAPI +__declspec(noreturn) KeBugCheckWithTf(IN ULONG BugCheckCode, IN ULONG_PTR BugCheckParameter1, IN ULONG_PTR BugCheckParameter2, 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -124,7 +124,7 @@ NewMask |= DR_MASK(DR7_OVERRIDE_V); /* Set DR7 override */ - *DrMask |= DR7_OVERRIDE_MASK; + *Dr7Ptr |= DR7_OVERRIDE_MASK; } else { Modified: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86m_sup.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -10,6 +10,7 @@ #include <asm.h> #include <internal/i386/asmmacro.S> +#undef LOCK .intel_syntax noprefix /* FIXME: Can we make a nice macro to generate V86 Opcode handlers? */ @@ -139,45 +140,17 @@ UNHANDLED_V86_OPCODE .endfunc -.func OpcodeESPrefixV86 -_OpcodeESPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeCSPrefixV86 -_OpcodeCSPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeSSPrefixV86 -_OpcodeSSPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeDSPrefixV86 -_OpcodeDSPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeFSPrefixV86 -_OpcodeFSPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeGSPrefixV86 -_OpcodeGSPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeOPER32PrefixV86 -_OpcodeOPER32PrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeADDR32PrefixV86 -_OpcodeADDR32PrefixV86: - UNHANDLED_V86_OPCODE -.endfunc +GENERATE_PREFIX_HANDLER ES +GENERATE_PREFIX_HANDLER CS +GENERATE_PREFIX_HANDLER DS +GENERATE_PREFIX_HANDLER FS +GENERATE_PREFIX_HANDLER GS +GENERATE_PREFIX_HANDLER SS +GENERATE_PREFIX_HANDLER OPER32 +GENERATE_PREFIX_HANDLER ADDR32 +GENERATE_PREFIX_HANDLER LOCK +GENERATE_PREFIX_HANDLER REP +GENERATE_PREFIX_HANDLER REPNE .func OpcodeINSBV86 _OpcodeINSBV86: @@ -224,7 +197,7 @@ sub dx, 2 /* Check if there is an OPER32 prefix */ - test ebx, 0x4000 + test ebx, PREFIX_FLAG_OPER32 jnz SkipPrefix /* Push EFLAGS */ @@ -264,7 +237,7 @@ add edx, 4 /* Check for OPER32 prefix */ - test ebx, 0x4000 + test ebx, PREFIX_FLAG_OPER32 jnz NoPrefix /* Skip 2 bytes */ @@ -431,7 +404,7 @@ add ecx, edx /* Check for OPER32 prefix */ - test ebx, 0x4000 + test ebx, PREFIX_FLAG_OPER32 jnz Iret32 /* Get flat IP */ @@ -576,21 +549,6 @@ UNHANDLED_V86_OPCODE .endfunc -.func OpcodeLOCKPrefixV86 -_OpcodeLOCKPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeREPNEPrefixV86 -_OpcodeREPNEPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - -.func OpcodeREPPrefixV86 -_OpcodeREPPrefixV86: - UNHANDLED_V86_OPCODE -.endfunc - .func OpcodeCLIV86 _OpcodeCLIV86: @@ -631,6 +589,23 @@ /* Return success */ mov eax, 1 ret +.endfunc + +.func OpcodeGenericPrefixV86 +_OpcodeGenericPrefixV86: + + /* Skip instruction */ + inc esi + inc edi + + /* Get the instruction */ + movzx ecx, byte ptr [esi] + + /* Get the opcode index */ + movzx edx, byte ptr OpcodeIndex[ecx] + + /* Dispatch it */ + jmp OpcodeDispatchV86[edx*4] .endfunc .func OpcodeHLTV86 Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -256,6 +256,7 @@ /* FIXME: TODO */ Semaphore = NULL; // we'd use the Thread Semaphore here ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; } else { 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -97,7 +97,7 @@ else { DPRINT1("Unknown main protection type.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (flProtect & PAGE_SYSTEM) @@ -241,7 +241,7 @@ if (Address >= MmSystemRangeStart) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); // MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; } if (Process != NULL && Process != CurrentProcess) @@ -264,7 +264,7 @@ PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); if (PageDir == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (0 == InterlockedCompareExchangePte(&PageDir[PdeOffset], 0, 0)) { @@ -276,7 +276,7 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn); if (!NT_SUCCESS(Status) || Pfn == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Entry = InterlockedCompareExchangePte(&PageDir[PdeOffset], PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); if (Entry != 0) @@ -293,7 +293,7 @@ Pt = MmCreateHyperspaceMapping(Pfn); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } return Pt + ADDR_TO_PTE_OFFSET(Address); } @@ -311,7 +311,7 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn); if (!NT_SUCCESS(Status) || Pfn == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Entry = PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE; if (Ke386GlobalPagesEnabled) @@ -334,7 +334,7 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn); if (!NT_SUCCESS(Status) || Pfn == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Entry = InterlockedCompareExchangePte(PageDir, PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); if (Entry != 0) @@ -403,7 +403,7 @@ Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* * Atomically disable the present bit and get the old value. @@ -417,7 +417,7 @@ WasValid = (PAGE_MASK(Pte) != 0); if (!WasValid) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -582,14 +582,14 @@ if (Address < MmSystemRangeStart && Process == NULL) { DPRINT1("MmSetCleanPage is called for user space without a process.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } do @@ -617,13 +617,13 @@ if (Address < MmSystemRangeStart && Process == NULL) { DPRINT1("MmSetDirtyPage is called for user space without a process.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } do @@ -650,7 +650,7 @@ Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } do @@ -704,7 +704,7 @@ if (Address < MmSystemRangeStart) { DPRINT1("MmCreateVirtualMappingForKernel is called for user space\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Attributes = ProtectToPTE(flProtect); @@ -724,7 +724,7 @@ Pt = MmGetPageTableForProcess(NULL, Addr, TRUE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Pt--; @@ -735,7 +735,7 @@ DPRINT1("Setting physical address but not allowing access at address " "0x%.8X with attributes %x/%x.\n", Addr, Attributes, flProtect); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PdeOffset = ADDR_TO_PDE_OFFSET(Addr); @@ -744,7 +744,7 @@ Pt = MmGetPageTableForProcess(NULL, Addr, TRUE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } else @@ -756,7 +756,7 @@ Pte = *Pt; if (Pte != 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); } @@ -776,22 +776,22 @@ if (Process == NULL && Address < MmSystemRangeStart) { DPRINT1("No process\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Process != NULL && Address >= MmSystemRangeStart) { DPRINT1("Setting kernel address with process context\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (SwapEntry & (1 << 31)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Pt = MmGetPageTableForProcess(Process, Address, TRUE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Pte = *Pt; if (PAGE_MASK((Pte)) != 0) @@ -836,13 +836,13 @@ if (Address < MmSystemRangeStart) { DPRINT1("No process\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageCount > 0x10000 || (ULONG_PTR) Address / PAGE_SIZE + PageCount > 0x100000) { DPRINT1("Page count to large\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } else @@ -850,14 +850,14 @@ if (Address >= MmSystemRangeStart) { DPRINT1("Setting kernel address with process context\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE || (ULONG_PTR) Address / PAGE_SIZE + PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE) { DPRINT1("Page Count to large\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } @@ -889,7 +889,7 @@ DPRINT1("Setting physical address but not allowing access at address " "0x%.8X with attributes %x/%x.\n", Addr, Attributes, flProtect); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PdeOffset = ADDR_TO_PDE_OFFSET(Addr); if (oldPdeOffset != PdeOffset) @@ -898,7 +898,7 @@ Pt = MmGetPageTableForProcess(Process, Addr, TRUE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } else @@ -911,7 +911,7 @@ MmMarkPageMapped(Pages[i]); if (PAGE_MASK((Pte)) != 0 && !((Pte) & PA_PRESENT)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PAGE_MASK((Pte)) != 0) { @@ -950,7 +950,7 @@ if (!MmIsPageInUse(Pages[i])) { DPRINT1("Page at address %x not in use\n", PFN_TO_PTE(Pages[i])); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } @@ -1035,7 +1035,7 @@ Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); MiFlushTlb(Pt, Address); @@ -1099,7 +1099,7 @@ } if (i >= Page % 1024) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -1124,7 +1124,7 @@ } if (i <= Page % 1024) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -1158,7 +1158,7 @@ if (Address < MmSystemRangeStart) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } StartOffset = ADDR_TO_PDE_OFFSET(Address); @@ -1237,7 +1237,7 @@ BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } BaseAddress = (PVOID)HYPERSPACE; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), @@ -1251,7 +1251,7 @@ BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -291,7 +291,7 @@ { DPRINT1("Image segment %d still referenced (was %d)\n", i, SectionSegments[i].ReferenceCount); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmFreePageTablesSectionSegment(&SectionSegments[i]); } @@ -309,7 +309,7 @@ if (Segment->ReferenceCount != 0) { DPRINT1("Data segment still referenced\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmFreePageTablesSectionSegment(Segment); ExFreePool(Segment); @@ -357,7 +357,7 @@ TAG_SECTION_PAGE_TABLE); if (Table == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } memset(Table, 0, sizeof(SECTION_PAGE_TABLE)); DPRINT("Table %x\n", Table); @@ -410,16 +410,16 @@ if (Entry == 0) { DPRINT1("Entry == 0 for MmSharePageEntrySectionSegment\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (SHARE_COUNT_FROM_SSE(Entry) == MAX_SHARE_COUNT) { DPRINT1("Maximum share count reached\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (IS_SWAP_FROM_SSE(Entry)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) + 1); MmSetPageEntrySectionSegment(Segment, Offset, Entry); @@ -440,16 +440,16 @@ if (Entry == 0) { DPRINT1("Entry == 0 for MmUnsharePageEntrySectionSegment\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (SHARE_COUNT_FROM_SSE(Entry) == 0) { DPRINT1("Zero share count for unshare\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (IS_SWAP_FROM_SSE(Entry)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) - 1); /* @@ -485,7 +485,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("CcRosUnmapCacheSegment failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -534,7 +534,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } MmSetPageEntrySectionSegment(Segment, Offset, MAKE_SWAP_SSE(SavedSwapEntry)); @@ -545,7 +545,7 @@ else { DPRINT1("Found a swapentry for a non private page in an image or data file sgment\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -816,7 +816,7 @@ if (PageOp == NULL) { DPRINT1("MmGetPageOp failed\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -834,12 +834,12 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageOp->Status == STATUS_PENDING) { DPRINT1("Woke for page op before completion\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmLockAddressSpace(AddressSpace); /* @@ -897,7 +897,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, (PVOID)PAddress); } @@ -926,7 +926,7 @@ if (Segment->Flags & MM_PAGEFILE_SEGMENT) { DPRINT1("Found a swaped out private page in a pagefile section.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmUnlockSectionSegment(Segment); @@ -936,14 +936,14 @@ Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { DPRINT1("MmReadFromSwapPage failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmLockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(Process, @@ -954,7 +954,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(Status); } @@ -999,7 +999,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMappingUnsafe failed, not out of memory\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(Status); } /* @@ -1035,7 +1035,7 @@ } if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = MmCreateVirtualMapping(Process, Address, @@ -1045,7 +1045,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(Status); } MmInsertRmap(Page, Process, (PVOID)PAddress); @@ -1126,7 +1126,7 @@ if (Entry != Entry1) { DPRINT1("Someone changed ppte entry while we slept\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -1145,7 +1145,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, (PVOID)PAddress); @@ -1174,13 +1174,13 @@ Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -1197,7 +1197,7 @@ if (Entry != Entry1) { DPRINT1("Someone changed ppte entry while we slept\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -1220,7 +1220,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) @@ -1252,7 +1252,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, (PVOID)PAddress); if (Locked) @@ -1346,7 +1346,7 @@ if (PageOp == NULL) { DPRINT1("MmGetPageOp failed\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -1362,12 +1362,12 @@ if (Status == STATUS_TIMEOUT) { DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageOp->Status == STATUS_PENDING) { DPRINT1("Woke for page op before completion\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* * Restart the operation @@ -1389,7 +1389,7 @@ Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -1414,13 +1414,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(Status); } if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Locked) { @@ -1550,7 +1550,7 @@ DPRINT1("Trying to page out from physical memory section address 0x%X " "process %d\n", Address, Process ? Process->UniqueProcessId : 0); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -1561,7 +1561,7 @@ { DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", Process ? Process->UniqueProcessId : 0, Address); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page = MmGetPfnForProcess(Process, Address); SwapEntry = MmGetSavedSwapEntryPage(Page); @@ -1589,7 +1589,7 @@ if(!MiIsPageFromCache(MemoryArea, Context.Offset)) { DPRINT1("Direct mapped non private page is not associated with the cache.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } else @@ -1608,7 +1608,7 @@ if (!(Context.Segment->Flags & MM_PAGEFILE_SEGMENT) && !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } @@ -1626,7 +1626,7 @@ { DPRINT1("Found a %s private page (address %x) in a pagefile segment.\n", Context.WasDirty ? "dirty" : "clean", Address); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (!Context.WasDirty && SwapEntry != 0) { @@ -1644,7 +1644,7 @@ { DPRINT1("Found a %s private page (address %x) in a shared section segment.\n", Context.WasDirty ? "dirty" : "clean", Address); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (!Context.WasDirty || SwapEntry != 0) { @@ -1665,13 +1665,13 @@ { DPRINT1("Found a swapentry for a non private and direct mapped page (address %x)\n", Address); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = CcRosUnmapCacheSegment(Bcb, FileOffset, FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -1683,7 +1683,7 @@ { DPRINT1("Found a swap entry for a non dirty, non private and not direct mapped page (address %x)\n", Address); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; @@ -1700,7 +1700,7 @@ MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; @@ -1828,7 +1828,7 @@ MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } else @@ -1903,7 +1903,7 @@ DPRINT1("Trying to write back page from physical memory mapped at %X " "process %d\n", Address, Process ? Process->UniqueProcessId : 0); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -1914,7 +1914,7 @@ { DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", Process ? Process->UniqueProcessId : 0, Address); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page = MmGetPfnForProcess(Process, Address); SwapEntry = MmGetSavedSwapEntryPage(Page); @@ -2282,7 +2282,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create PhysicalMemory section\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = ObInsertObject(PhysSection, NULL, @@ -2723,7 +2723,7 @@ if(Length == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } FileOffset = *Offset; @@ -2731,7 +2731,7 @@ /* Negative/special offset: it cannot be used in this context */ if(FileOffset.u.HighPart < 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } AdjustOffset = PAGE_ROUND_DOWN(FileOffset.u.LowPart); @@ -3134,7 +3134,7 @@ */ else { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -3903,7 +3903,7 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmLockAddressSpace(AddressSpace); @@ -3937,7 +3937,7 @@ if (Segment->Flags & MM_PAGEFILE_SEGMENT) { DPRINT1("Found a swap entry for a page in a pagefile section.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmFreeSwapPage(SwapEntry); } @@ -3952,7 +3952,7 @@ if (Segment->Flags & MM_PAGEFILE_SEGMENT) { DPRINT1("Found a private page in a pagefile section.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* * Just dereference private pages @@ -4078,7 +4078,7 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, @@ -4124,7 +4124,7 @@ } if (i >= NrSegments) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } for (i = 0; i < NrSegments; i++) Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -763,7 +763,7 @@ NTSTATUS NTAPI ObpIncrementHandleCount(IN PVOID Object, - IN PACCESS_STATE AccessState, + IN PACCESS_STATE AccessState OPTIONAL, IN KPROCESSOR_MODE AccessMode, IN ULONG HandleAttributes, IN PEPROCESS Process, Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Wed Nov 26 12:56:41 2008 @@ -497,13 +497,8 @@ else { ParseFromRoot: - /* Check if we have a device map */ - if (DeviceMap) - { - /* Dereference it */ - //ObfDereferenceDeviceMap(DeviceMap); - DeviceMap = NULL; - } + /* FIXME: Check if we have a device map */ + ASSERT(DeviceMap == NULL); /* Check if this is a possible DOS name */ if (!((ULONG_PTR)(ObjectName->Buffer) & 7))

1 0

[sginsberg] 37667: - kmtest: Don't use user mode types - memtest: uh, no. ZwQuerySystemInformation does not return NO_ERROR
by sginsberg＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: sginsberg Date: Wed Nov 26 12:43:27 2008 New Revision: 37667 URL: http://svn.reactos.org/svn/reactos?rev=37667&view=rev Log: - kmtest: Don't use user mode types - memtest: uh, no. ZwQuerySystemInformation does not return NO_ERROR Modified: trunk/rostests/drivers/kmtest/ntos_io.c trunk/rostests/drivers/memtest/memtest.c Modified: trunk/rostests/drivers/kmtest/ntos_io.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_io.c?… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_io.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_io.c [iso-8859-1] Wed Nov 26 12:43:27 2008 @@ -48,7 +48,7 @@ ok(Mdl == NULL, "IoAllocateMdl should fail allocation of 2Gb or more, but got Mdl=0x%X", - (UINT)Mdl); + (UINT32)Mdl); if (Mdl) IoFreeMdl(Mdl); @@ -59,10 +59,10 @@ ok(Mdl != NULL, "Mdl allocation failed"); // Check fields of the allocated struct ok(Mdl->Next == NULL, "Mdl->Next should be NULL, but is 0x%X", - (UINT)Mdl->Next); + (UINT32)Mdl->Next); ok(Mdl->ByteCount == MdlSize, "Mdl->ByteCount should be equal to MdlSize, but is 0x%X", - (UINT)Mdl->ByteCount); + (UINT32)Mdl->ByteCount); // TODO: Check other fields of MDL struct IoFreeMdl(Mdl); @@ -72,7 +72,7 @@ Mdl = IoAllocateMdl(VirtualAddress, MdlSize, FALSE, FALSE, Irp); ok(Mdl != NULL, "Mdl allocation failed"); ok(Irp->MdlAddress == Mdl, "Irp->MdlAddress should be 0x%X, but is 0x%X", - (UINT)Mdl, (UINT)Irp->MdlAddress); + (UINT32)Mdl, (UINT32)Irp->MdlAddress); IoFreeMdl(Mdl); Modified: trunk/rostests/drivers/memtest/memtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/memtest/memtest.c… ============================================================================== --- trunk/rostests/drivers/memtest/memtest.c [iso-8859-1] (original) +++ trunk/rostests/drivers/memtest/memtest.c [iso-8859-1] Wed Nov 26 12:43:27 2008 @@ -47,7 +47,7 @@ if (ZwQuerySystemInformation(SystemPerformanceInformation, (PVOID) &PerformanceInfo, sizeof(SYSTEM_PERFORMANCE_INFORMATION), - &Length) != NO_ERROR) + &Length) != STATUS_SUCCESS) { break; }

1 0

[jimtabor] 37666: - Add ExtCreatePen note: This is an enhancement and prevents a call to kernel space.
by jimtabor＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: jimtabor Date: Wed Nov 26 11:47:21 2008 New Revision: 37666 URL: http://svn.reactos.org/svn/reactos?rev=37666&view=rev Log: - Add ExtCreatePen note: This is an enhancement and prevents a call to kernel space. Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/br… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/brush.c [iso-8859-1] Wed Nov 26 11:47:21 2008 @@ -29,7 +29,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return 0; } - } + } // This is an enhancement and prevents a call to kernel space. else if ((dwPenStyle & PS_STYLE_MASK) == PS_INSIDEFRAME && (dwPenStyle & PS_TYPE_MASK) != PS_GEOMETRIC) {

1 0

[jimtabor] 37665: - Update CL type.
by jimtabor＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: jimtabor Date: Wed Nov 26 11:11:59 2008 New Revision: 37665 URL: http://svn.reactos.org/svn/reactos?rev=37665&view=rev Log: - Update CL type. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Nov 26 11:11:59 2008 @@ -362,7 +362,7 @@ DWORD dwHookCurrent; INT cInDDEMLCallback; PCLIENTTHREADINFO pClientThreadInfo; - DWORD dwHookData; + ULONG_PTR dwHookData; DWORD dwKeyCache; DWORD afKeyState[2]; DWORD dwAsyncKeyCache;

1 0

[hyperion] 37664: modified lib/pseh/i386/framebased-gcchack.S Typo
by hyperion＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: hyperion Date: Wed Nov 26 10:15:29 2008 New Revision: 37664 URL: http://svn.reactos.org/svn/reactos?rev=37664&view=rev Log: modified lib/pseh/i386/framebased-gcchack.S Typo Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Wed Nov 26 10:15:29 2008 @@ -34,8 +34,8 @@ mov [fs:0], eax ret -.globl __SEH2LeaveFrame -__SEH2LeaveFrame: +.globl ___SEH2LeaveFrame +___SEH2LeaveFrame: mov eax, [fs:0] mov eax, [eax] mov [fs:0], eax

1 0

[hyperion] 37663: modified include/reactos/libs/pseh/pseh2.h If the compiler is not GCC, assume native SEH support modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Allow pseh to be compiled with Visual C++ without warnings
by hyperion＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: hyperion Date: Wed Nov 26 10:03:12 2008 New Revision: 37663 URL: http://svn.reactos.org/svn/reactos?rev=37663&view=rev Log: modified include/reactos/libs/pseh/pseh2.h If the compiler is not GCC, assume native SEH support modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Allow pseh to be compiled with Visual C++ without warnings Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Wed Nov 26 10:03:12 2008 @@ -23,10 +23,6 @@ #ifndef KJK_PSEH2_H_ #define KJK_PSEH2_H_ -#ifndef __GNUC__ -#error TODO -#endif - struct _EXCEPTION_RECORD; struct _EXCEPTION_POINTERS; struct _CONTEXT; @@ -39,90 +35,12 @@ void * ); -#if defined(__i386__) -typedef struct __SEHTrampoline -{ - unsigned char STR_MovEcx; - unsigned char STR_Closure[4]; - unsigned char STR_Jmp; - unsigned char STR_Function[4]; -} -_SEHTrampoline_t; - -static -__inline__ -__attribute__((always_inline)) -int _SEHIsTrampoline(_SEHTrampoline_t * trampoline_) -{ - return trampoline_->STR_MovEcx == 0xb9 && trampoline_->STR_Jmp == 0xe9; -} - -static -__inline__ -__attribute__((always_inline)) -void * _SEHFunctionFromTrampoline(_SEHTrampoline_t * trampoline_) -{ - return (void *)(*(int *)(&trampoline_->STR_Function[0]) + (int)(trampoline_ + 1)); -} - -static -__inline__ -__attribute__((always_inline)) -void * _SEHClosureFromTrampoline(_SEHTrampoline_t * trampoline_) -{ - return (void *)*(int *)(&trampoline_->STR_Closure[0]); -} -#else -#error TODO -#endif - -/* A no-op side effect that scares GCC */ -#define __SEH_SIDE_EFFECT __asm__ __volatile__("#") - -/* A no-op without any real side effects, but silences warnings */ -#define __SEH_PRETEND_SIDE_EFFECT (void)0 - -/* Forces GCC to consider the specified label reachable */ -#define __SEH_USE_LABEL(L_) __asm__ __volatile__("# %0\n" : : "i" (&&L_)) - -/* Makes GCC pretend the specified label is reachable, to silence warnings */ -#define __SEH_PRETEND_USE_LABEL(L_) (void)(&&L_) - -/* Forces GCC to emit the specified nested function as a function */ -#define __SEH_USE_NESTED_FUNCTION(F_) (void)(&F_) /* __attribute__((noinline)) seems to do the trick */ - -/* Soft memory barrier */ -#define __SEH_BARRIER __asm__ __volatile__("#":::"memory") - -/* GCC doesn't know that this equals zero */ -#define __SEH_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) - -#define __SEH_FALSE __builtin_expect(__SEH_ZERO, 0) -#define __SEH_TRUE __builtin_expect(!__SEH_ZERO, 1) - typedef struct __SEH2Registration { struct __SEH2Registration * SER_Prev; _SEH2FrameHandler_t SER_Handler; } _SEH2Registration_t; - -#define __SEH_FORCE_NEST \ - __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) - -#define __SEH_NESTED_PROLOG \ - __SEH_FORCE_NEST; - -#define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void *) -#define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void *) -#define __SEH_DEFINE_EXCEPT(NAME_) int __cdecl NAME_(void * _SEHExceptionPointers) - -#define __SEH_DECLARE_FINALLY_PFN(NAME_) void (__cdecl * NAME_)(void) -#define __SEH_DECLARE_FINALLY(NAME_) void __cdecl NAME_(void) -#define __SEH_DEFINE_FINALLY(NAME_) void __cdecl NAME_(void) - -#define __SEH_RETURN_EXCEPT(R_) return (int)(R_) -#define __SEH_RETURN_FINALLY() return typedef struct __SEH2Frame { @@ -142,6 +60,99 @@ void * ST_Body; } _SEH2TryLevel_t; + +#ifdef __cplusplus +extern "C" +{ +#endif + +extern void __cdecl _SEH2EnterFrame(_SEH2Frame_t *); +extern void __cdecl _SEH2LeaveFrame(void); +extern void __cdecl _SEH2Return(void); + +#ifdef __cplusplus +} +#endif + +#if defined(__GNUC__) + +#if defined(__i386__) +typedef struct __SEHTrampoline +{ + unsigned char STR_MovEcx; + unsigned char STR_Closure[4]; + unsigned char STR_Jmp; + unsigned char STR_Function[4]; +} +_SEHTrampoline_t; + +static +__inline__ +__attribute__((always_inline)) +int _SEHIsTrampoline(_SEHTrampoline_t * trampoline_) +{ + return trampoline_->STR_MovEcx == 0xb9 && trampoline_->STR_Jmp == 0xe9; +} + +static +__inline__ +__attribute__((always_inline)) +void * _SEHFunctionFromTrampoline(_SEHTrampoline_t * trampoline_) +{ + return (void *)(*(int *)(&trampoline_->STR_Function[0]) + (int)(trampoline_ + 1)); +} + +static +__inline__ +__attribute__((always_inline)) +void * _SEHClosureFromTrampoline(_SEHTrampoline_t * trampoline_) +{ + return (void *)*(int *)(&trampoline_->STR_Closure[0]); +} +#else +#error TODO +#endif + +/* A no-op side effect that scares GCC */ +#define __SEH_SIDE_EFFECT __asm__ __volatile__("#") + +/* A no-op without any real side effects, but silences warnings */ +#define __SEH_PRETEND_SIDE_EFFECT (void)0 + +/* Forces GCC to consider the specified label reachable */ +#define __SEH_USE_LABEL(L_) __asm__ __volatile__("# %0\n" : : "i" (&&L_)) + +/* Makes GCC pretend the specified label is reachable, to silence warnings */ +#define __SEH_PRETEND_USE_LABEL(L_) (void)(&&L_) + +/* Forces GCC to emit the specified nested function as a function */ +#define __SEH_USE_NESTED_FUNCTION(F_) (void)(&F_) /* __attribute__((noinline)) seems to do the trick */ + +/* Soft memory barrier */ +#define __SEH_BARRIER __asm__ __volatile__("#":::"memory") + +/* GCC doesn't know that this equals zero */ +#define __SEH_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) + +#define __SEH_FALSE __builtin_expect(__SEH_ZERO, 0) +#define __SEH_TRUE __builtin_expect(!__SEH_ZERO, 1) + +#define __SEH_FORCE_NEST \ + __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) + +#define __SEH_NESTED_PROLOG \ + __SEH_FORCE_NEST; + +#define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void *) +#define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void *) +#define __SEH_DEFINE_EXCEPT(NAME_) int __cdecl NAME_(void * _SEHExceptionPointers) + +#define __SEH_DECLARE_FINALLY_PFN(NAME_) void (__cdecl * NAME_)(void) +#define __SEH_DECLARE_FINALLY(NAME_) void __cdecl NAME_(void) +#define __SEH_DEFINE_FINALLY(NAME_) void __cdecl NAME_(void) + +#define __SEH_RETURN_EXCEPT(R_) return (int)(R_) +#define __SEH_RETURN_FINALLY() return #define __SEH_BEGIN_TRY \ { \ @@ -347,6 +358,7 @@ #define _SEH2_GetExceptionInformation() ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) #define _SEH2_GetExceptionCode() ((_SEH2FrameP)->SF_Code) +#define _SEH2_AbnormalTermination() (!!_SEH2_GetExceptionCode()) #define _SEH2_YIELD(STMT_) \ for(;;) \ @@ -361,17 +373,22 @@ __SEH_END_SCOPE_CHAIN; -#ifdef __cplusplus -extern "C" -{ -#endif - -extern void __cdecl _SEH2EnterFrame(_SEH2Frame_t *); -extern void __cdecl _SEH2LeaveFrame(void); -extern void __cdecl _SEH2Return(void); - -#ifdef __cplusplus -} +#else + +#include <excpt.h> + +#define _SEH2_TRY __try +#define _SEH2_FINALLY __finally +#define _SEH2_EXCEPT(E_) __except((E_)) +#define _SEH2_END + +#define _SEH2_GetExceptionInformation() (GetExceptionInformation()) +#define _SEH2_GetExceptionCode() (GetExceptionCode()) +#define _SEH2_AbnormalTermination() (AbnormalTermination()) + +#define _SEH2_YIELD(STMT_) STMT_ +#define _SEH2_LEAVE __leave + #endif #endif Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Wed Nov 26 10:03:12 2008 @@ -34,15 +34,31 @@ extern int __SEH2Except(void *, void *, void *); extern void __SEH2Finally(void *, void *); +extern +#if defined(__GNUC__) +__attribute__((noreturn)) +#elif defined(_MSC_VER) +__declspec(noreturn) +#endif +int __SEH2Handle(void *, void *, void *); + static +#if defined(__GNUC__) __attribute__((always_inline)) +#elif defined(_MSC_VER) +__forceinline +#endif int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, EXCEPTION_POINTERS * ep) { return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); } static +#if defined(__GNUC__) __attribute__((noinline)) +#elif defined(_MSC_VER) +__declspec(noinline) +#endif void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); @@ -65,22 +81,16 @@ extern void _SEH2GlobalUnwind(void *); static +#if defined(__GNUC__) __attribute__((noreturn)) +#elif defined(_MSC_VER) +__declspec(noreturn) +#endif void _SEH2Handle(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { _SEH2GlobalUnwind(frame); _SEH2LocalUnwind(frame, trylevel); - - __asm__ __volatile__ - ( - "mov %[frame], %%ebp\n" - "mov %[stack], %%esp\n" - "jmp *%[handler]\n" : - : - [frame] "m" (frame->SF_FramePointer), [stack] "m" (frame->SF_StackPointer), [handler] "r" (trylevel->ST_Body) - ); - - for(;;); + __SEH2Handle(trylevel->ST_Body, frame->SF_FramePointer, frame->SF_StackPointer); } static @@ -94,7 +104,11 @@ { _SEH2Frame_t * frame; +#if defined(__GNUC__) __asm__ __volatile__("cld"); +#elif defined(_MSC_VER) + __asm cld +#endif frame = EstablisherFrame; @@ -134,28 +148,23 @@ } extern +void __cdecl __SEH2EnterFrame(_SEH2Frame_t *); + +extern void __cdecl _SEH2EnterFrame(_SEH2Frame_t * frame) { frame->SF_Registration.SER_Handler = _SEH2FrameHandler; frame->SF_Code = 0; - __asm__ __volatile__("movl %%fs:0, %k0\n" : "=q" (frame->SF_Registration.SER_Prev)); - - __SEH_BARRIER; - __asm__ __volatile__("movl %k0, %%fs:0\n" : : "q" (&frame->SF_Registration)); + __SEH2EnterFrame(frame); } extern -void __cdecl _SEH2LeaveFrame() +void __cdecl __SEH2LeaveFrame(void); + +extern +void __cdecl _SEH2LeaveFrame(void) { - __asm__ __volatile__ - ( - "movl %%fs:0, %%edx\n" - "movl 0(%%edx), %%edx\n" - "movl %%edx, %%fs:0\n" : - : - : - "edx" - ); + __SEH2LeaveFrame(); } extern Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Wed Nov 26 10:03:12 2008 @@ -25,6 +25,28 @@ __SEH2CurrentRegistration: mov eax, [fs:0] ret + +.globl ___SEH2EnterFrame +___SEH2EnterFrame: + mov eax, [esp+4] + mov ecx, [fs:0] + mov [eax], ecx + mov [fs:0], eax + ret + +.globl __SEH2LeaveFrame +__SEH2LeaveFrame: + mov eax, [fs:0] + mov eax, [eax] + mov [fs:0], eax + ret + +.globl ___SEH2Handle +___SEH2Handle: + mov eax, [esp+4] + mov ebp, [esp+8] + mov esp, [esp+12] + jmp eax .globl ___SEH2Except ___SEH2Except:

1 0

[khornicek] 37662: - fix a typo
by khornicek＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: khornicek Date: Wed Nov 26 09:38:43 2008 New Revision: 37662 URL: http://svn.reactos.org/svn/reactos?rev=37662&view=rev Log: - fix a typo Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Wed Nov 26 09:38:43 2008 @@ -67,7 +67,7 @@ FreeLibrary(hModWineD3D); } - if (!InitWineD3DFunction("WineDirect3DCreate", (FARPROC*)pWineDirect3DCreate)) + if (!InitWineD3DFunction("WineDirect3DCreate", (FARPROC*)&pWineDirect3DCreate)) Ret = FALSE; return Ret;

1 0

[gschneider] 37661: - ExtCreatePen creates a PS_NULL style pen in the LOGPEN Format, use the NULL_PEN StockObject for that matter - Fixes 24 gdi32 pen winetests
by gschneider＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: gschneider Date: Wed Nov 26 09:12:38 2008 New Revision: 37661 URL: http://svn.reactos.org/svn/reactos?rev=37661&view=rev Log: - ExtCreatePen creates a PS_NULL style pen in the LOGPEN Format, use the NULL_PEN StockObject for that matter - Fixes 24 gdi32 pen winetests Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Wed Nov 26 09:12:38 2008 @@ -369,17 +369,25 @@ } } - hPen = IntGdiExtCreatePen(dwPenStyle, - ulWidth, - ulBrushStyle, - ulColor, - ulClientHatch, - ulHatch, - dwStyleCount, - pSafeStyle, - cjDIB, - bOldStylePen, - hBrush); + if (dwPenStyle != PS_NULL) + { + hPen = IntGdiExtCreatePen(dwPenStyle, + ulWidth, + ulBrushStyle, + ulColor, + ulClientHatch, + ulHatch, + dwStyleCount, + pSafeStyle, + cjDIB, + bOldStylePen, + hBrush); + } + else + { + hPen = NtGdiGetStockObject(NULL_PEN); + } + if (!hPen && pSafeStyle) { ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES);

1 0

[khornicek] 37660: - use dynamic linking for wined3d, fixes boot
by khornicek＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: khornicek Date: Wed Nov 26 08:59:30 2008 New Revision: 37660 URL: http://svn.reactos.org/svn/reactos?rev=37660&view=rev Log: - use dynamic linking for wined3d, fixes boot Modified: branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Wed Nov 26 08:59:30 2008 @@ -18,7 +18,6 @@ <library>uuid</library> <library>wine</library> <library>opengl32</library> - <library>wined3d</library> </if> <directory name="include"> Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Wed Nov 26 08:59:30 2008 @@ -28,8 +28,50 @@ #include "wine/config.h" #include "wine/wined3d_interface.h" - - +typedef IWineD3D* WINAPI (*WINED3DCREATE) (UINT, UINT, PVOID); + +static WINED3DCREATE pWineDirect3DCreate = NULL; + +HINSTANCE hWineD3D = NULL; + +static BOOL InitWineD3DFunction(PCSTR name, + FARPROC *funcptr) +{ + PVOID func; + + func = (PVOID)GetProcAddress(hWineD3D, name); + if (func != NULL) + { + (void)InterlockedCompareExchangePointer((PVOID*)funcptr, + func, + NULL); + return TRUE; + } + + return FALSE; +} + +static BOOL InitWineD3D(void) +{ + HMODULE hModWineD3D; + BOOL Ret = TRUE; + + hModWineD3D = LoadLibraryW(L"WINED3D.DLL"); + if (hModWineD3D == NULL) + return FALSE; + + if (InterlockedCompareExchangePointer((PVOID*)&hWineD3D, + (PVOID)hModWineD3D, + NULL) != NULL) + { + FreeLibrary(hModWineD3D); + } + + if (!InitWineD3DFunction("WineDirect3DCreate", (FARPROC*)pWineDirect3DCreate)) + Ret = FALSE; + + return Ret; +} /* DATA **********************************************************************/ @@ -1636,6 +1678,7 @@ #endif } + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -1651,6 +1694,10 @@ BOOL Return = FALSE; + if(pWineDirect3DCreate == NULL) + if(InitWineD3D() == FALSE) + return Return; + /* Check if the global hDC (hdc == 0) is being used */ if (!hdc) { @@ -1662,7 +1709,7 @@ { /* Create the DDraw Object */ //ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); - ghDirectDraw = (HANDLE) WineDirect3DCreate(D3D_SDK_VERSION, 9, NULL); + ghDirectDraw = (HANDLE) pWineDirect3DCreate(D3D_SDK_VERSION, 9, NULL); /* Delete our DC */ DeleteDC(hdc); @@ -1684,7 +1731,7 @@ { /* Using the per-process object, so create it */ //pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc); - pDirectDrawGlobal->hDD = (ULONG_PTR) WineDirect3DCreate(D3D_SDK_VERSION, 9, NULL); + pDirectDrawGlobal->hDD = (ULONG_PTR) pWineDirect3DCreate(D3D_SDK_VERSION, 9, NULL); /* Set the return value */ Return = pDirectDrawGlobal->hDD ? TRUE : FALSE; @@ -1720,7 +1767,7 @@ D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; DWORD CallbackFlags[3]; - DWORD dwNumHeaps=0, FourCCs=0; + //DWORD dwNumHeaps=0, FourCCs=0; DWORD Flags; BOOL retVal = TRUE;

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