Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

by blight＠svn.reactos.com

Add shutdown message. Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-02-18 20:19:49 UTC (rev 13635) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-02-18 20:52:24 UTC (rev 13636) @@ -167,7 +167,8 @@ "Until then, there must be no regrets, no fears, no anxieties.\n" "Just go forward in all your beliefs, and prove to me that I am not mistaken in mine.\n", "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\n", - "Hasta la vista, BABY!\n" + "Hasta la vista, BABY!\n", + "They live, we sleep!\n" }; LARGE_INTEGER Now;

19 years, 10 months

[gvg] 13635: Protect against bogus string offsets

by gvg＠svn.reactos.com

Protect against bogus string offsets Modified: trunk/reactos/tools/rsym.c _____ Modified: trunk/reactos/tools/rsym.c --- trunk/reactos/tools/rsym.c 2005-02-18 18:28:49 UTC (rev 13634) +++ trunk/reactos/tools/rsym.c 2005-02-18 20:19:49 UTC (rev 13635) @@ -442,7 +442,8 @@ { case N_SO: Name = (char *) StabStringsBase + StabEntry[i].n_strx; - if ('\0' == *Name || '/' == Name[strlen(Name) - 1] + if (StabStringsLength < StabEntry[i].n_strx + ||'\0' == *Name || '/' == Name[strlen(Name) - 1] || '\\' == Name[strlen(Name) - 1] || StabEntry[i].n_value < ImageBase) {

19 years, 10 months

[blight] 13634: Fix KeUnstackDetachProcess.

by blight＠svn.reactos.com

Fix KeUnstackDetachProcess. Modified: trunk/reactos/ntoskrnl/ke/process.c _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2005-02-18 17:15:01 UTC (rev 13633) +++ trunk/reactos/ntoskrnl/ke/process.c 2005-02-18 18:28:49 UTC (rev 13634) @@ -216,7 +216,7 @@ { KIRQL OldIrql; PKTHREAD Thread; - + /* If the special "We tried to attach to the process already being attached to" flag is there, don't do anything */ if (ApcState->Process == (PKPROCESS)1) return; @@ -231,29 +231,27 @@ /* Restore the Old APC State if a Process was present */ if (ApcState->Process) { - RtlMoveMemory(ApcState, &Thread->ApcState, sizeof(KAPC_STATE)); + KiMoveApcState(ApcState, &Thread->ApcState); } else { /* The ApcState parameter is useless, so use the saved data and reset it */ - RtlMoveMemory(&Thread->SavedApcState, &Thread->ApcState, sizeof(KAPC_STATE)); + KiMoveApcState(&Thread->SavedApcState, &Thread->ApcState); Thread->SavedApcState.Process = NULL; Thread->ApcStateIndex = OriginalApcEnvironment; Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->ApcState; Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->SavedApcState; } - /* Restore the APC State */ - KiMoveApcState(&Thread->SavedApcState, &Thread->ApcState); - /* Swap Processes */ KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); - + /* Return to old IRQL*/ KeReleaseDispatcherDatabaseLock(OldIrql); } -// This function should be used by win32k.sys to add its own user32/gdi32 services -// TableIndex is 0 based -// ServiceCountTable its not used at the moment +/* This function should be used by win32k.sys to add its own user32/gdi32 services + * TableIndex is 0 based + * ServiceCountTable its not used at the moment + */ /* * @implemented */

19 years, 10 months

[navaraf] 13633: Fix the detection of /3GB switch.

by navaraf＠svn.reactos.com

Fix the detection of /3GB switch. Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c --- trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-02-18 15:13:02 UTC (rev 13632) +++ trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-02-18 17:15:01 UTC (rev 13633) @@ -4,7 +4,7 @@ * FILE: boot/freeldr/freeldr/multiboot.c * PURPOSE: ReactOS Loader * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Hartmutt Birr - SMP/PAE Code + * Hartmut Birr - SMP/PAE Code */ #include <freeldr.h> @@ -54,7 +54,7 @@ #define ApicPageTableIndexPae (APIC_BASE >> 21) -#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase +#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase /* Load Address of Next Module */ ULONG_PTR NextModuleBase = 0; @@ -217,7 +217,7 @@ /* Jump to Kernel */ PagedJump = (ASMCODE)KernelEntryPoint; PagedJump(Magic, &LoaderBlock); - } +} /*++ * FrLdrGetKernelBase @@ -239,27 +239,24 @@ FASTCALL FrLdrGetKernelBase(VOID) { - PCHAR p1; - PCHAR p2; + PCHAR p; /* Read Command Line */ - for(p1 = (PCHAR)&LoaderBlock.CommandLine; *p1 && (p2 = strchr(p1, '/')); p2++) { + p = (PCHAR)LoaderBlock.CommandLine; + while ((p = strchr(p, '/')) != NULL) { /* Find "/3GB" */ - if (!strnicmp(p2, "3GB", 3)) { + if (!strnicmp(p + 1, "3GB", 3)) { /* Make sure there's nothing following it */ - if (p2[3] == ' ' || p2[3] == 0) { + if (p[4] == ' ' || p[4] == 0) { /* Use 3GB */ KernelBase = 0xC0000000; - - } else { - - /* Use 2GB */ - KernelBase = 0x80000000; } } + + p++; } /* Set KernelBase */

19 years, 10 months

[weiden] 13632: don't call win32k for GetObjectType() and query the information directly from the shared handle table

by weiden＠svn.reactos.com

don't call win32k for GetObjectType() and query the information directly from the shared handle table Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/gdi32/main/dllmain.c Modified: trunk/reactos/lib/gdi32/misc/misc.c Modified: trunk/reactos/lib/gdi32/objects/dc.c _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-02-18 13:53:21 UTC (rev 13631) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-02-18 15:13:02 UTC (rev 13632) @@ -358,7 +358,7 @@ GetNearestColor@8=NtGdiGetNearestColor@8 GetNearestPaletteIndex@8=NtGdiGetNearestPaletteIndex@8 GetObjectA@12 -GetObjectType@4=NtGdiGetObjectType@4 +GetObjectType@4 GetObjectW@12 GetOutlineTextMetricsA@12 GetOutlineTextMetricsW@12 @@ -560,4 +560,3 @@ bMakePathNameW@16 ;cGetTTFFromFOT gdiPlaySpoolStream@24 -

19 years, 10 months

[gdalsnes] 13631: workaround for buggy mingw include search order on linux (gvg)

by gdalsnes＠svn.reactos.com

workaround for buggy mingw include search order on linux (gvg) Added: trunk/reactos/lib/crt/include/float.h _____ Added: trunk/reactos/lib/crt/include/float.h --- trunk/reactos/lib/crt/include/float.h 2005-02-18 13:07:27 UTC (rev 13630) +++ trunk/reactos/lib/crt/include/float.h 2005-02-18 13:53:21 UTC (rev 13631) @@ -0,0 +1,152 @@ +/* + * float.h + * This file has no copyright assigned and is placed in the Public Domain. + * This file is a part of the mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within the package. + * + * Constants related to floating point arithmetic. + * + * Also included here are some non-ANSI bits for accessing the floating + * point controller. + * + * NOTE: GCC provides float.h, but it doesn't include the non-standard + * stuff for accessing the fp controller. We include_next the + * GCC-supplied header and just define the MS-specific extensions + * here. + * + */ + +#include_next<float.h> + +#ifndef _MINGW_FLOAT_H_ +#define _MINGW_FLOAT_H_ + +/* All the headers include this file. */ +#include <_mingw.h> + +/* + * Functions and definitions for controlling the FPU. + */ +#ifndef __STRICT_ANSI__ + +/* TODO: These constants are only valid for x86 machines */ + +/* Control word masks for unMask */ +#define _MCW_EM 0x0008001F /* Error masks */ +#define _MCW_IC 0x00040000 /* Infinity */ +#define _MCW_RC 0x00000300 /* Rounding */ +#define _MCW_PC 0x00030000 /* Precision */ + +/* Control word values for unNew (use with related unMask above) */ +#define _EM_INVALID 0x00000010 +#define _EM_DENORMAL 0x00080000 +#define _EM_ZERODIVIDE 0x00000008 +#define _EM_OVERFLOW 0x00000004 +#define _EM_UNDERFLOW 0x00000002 +#define _EM_INEXACT 0x00000001 +#define _IC_AFFINE 0x00040000 +#define _IC_PROJECTIVE 0x00000000 +#define _RC_CHOP 0x00000300 +#define _RC_UP 0x00000200 +#define _RC_DOWN 0x00000100 +#define _RC_NEAR 0x00000000 +#define _PC_24 0x00020000 +#define _PC_53 0x00010000 +#define _PC_64 0x00000000 + +/* These are also defined in Mingw math.h, needed to work around + GCC build issues. */ +/* Return values for fpclass. */ +#ifndef __MINGW_FPCLASS_DEFINED +#define __MINGW_FPCLASS_DEFINED 1 +#define _FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ +#define _FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ +#define _FPCLASS_NINF 0x0004 /* Negative Infinity */ +#define _FPCLASS_NN 0x0008 /* Negative Normal */ +#define _FPCLASS_ND 0x0010 /* Negative Denormal */ +#define _FPCLASS_NZ 0x0020 /* Negative Zero */ +#define _FPCLASS_PZ 0x0040 /* Positive Zero */ +#define _FPCLASS_PD 0x0080 /* Positive Denormal */ +#define _FPCLASS_PN 0x0100 /* Positive Normal */ +#define _FPCLASS_PINF 0x0200 /* Positive Infinity */ +#endif /* __MINGW_FPCLASS_DEFINED */ + +/* invalid subconditions (_SW_INVALID also set) */ +#define _SW_UNEMULATED 0x0040 /* unemulated instruction */ +#define _SW_SQRTNEG 0x0080 /* square root of a neg number */ +#define _SW_STACKOVERFLOW 0x0200 /* FP stack overflow */ +#define _SW_STACKUNDERFLOW 0x0400 /* FP stack underflow */ + +/* Floating point error signals and return codes */ +#define _FPE_INVALID 0x81 +#define _FPE_DENORMAL 0x82 +#define _FPE_ZERODIVIDE 0x83 +#define _FPE_OVERFLOW 0x84 +#define _FPE_UNDERFLOW 0x85 +#define _FPE_INEXACT 0x86 +#define _FPE_UNEMULATED 0x87 +#define _FPE_SQRTNEG 0x88 +#define _FPE_STACKOVERFLOW 0x8a +#define _FPE_STACKUNDERFLOW 0x8b +#define _FPE_EXPLICITGEN 0x8c /* raise( SIGFPE ); */ + +#ifndef RC_INVOKED + +#ifdef __cplusplus +extern "C" { +#endif + +/* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), + * i.e. change the bits in unMask to have the values they have in unNew, + * leaving other bits unchanged. */ +_CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask); +_CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask); + + +_CRTIMP unsigned int __cdecl _clearfp (void); /* Clear the FPU status word */ +_CRTIMP unsigned int __cdecl _statusfp (void); /* Report the FPU status word */ +#define _clear87 _clearfp +#define _status87 _statusfp + + +/* + MSVCRT.dll _fpreset initializes the control register to 0x27f, + the status register to zero and the tag word to 0FFFFh. + This differs from asm instruction finit/fninit which set control + word to 0x37f (64 bit mantissa precison rather than 53 bit). + By default, the mingw version of _fpreset sets fp control as + per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when + building your application. +*/ +void __cdecl _fpreset (void); +void __cdecl fpreset (void); + +/* Global 'variable' for the current floating point error code. */ +_CRTIMP int * __cdecl __fpecode(void); +#define _fpecode (*(__fpecode())) + +/* + * IEEE recommended functions. MS puts them in float.h + * but they really belong in math.h. + */ + +_CRTIMP double __cdecl _chgsign (double); +_CRTIMP double __cdecl _copysign (double, double); +_CRTIMP double __cdecl _logb (double); +_CRTIMP double __cdecl _nextafter (double, double); +_CRTIMP double __cdecl _scalb (double, long); + +_CRTIMP int __cdecl _finite (double); +_CRTIMP int __cdecl _fpclass (double); +_CRTIMP int __cdecl _isnan (double); + +#ifdef __cplusplus +} +#endif + +#endif /* Not RC_INVOKED */ + +#endif /* Not __STRICT_ANSI__ */ + +#endif /* _FLOAT_H_ */ +

19 years, 10 months

[weiden] 13630: minor fix

by weiden＠svn.reactos.com

minor fix Modified: trunk/reactos/subsys/win32k/objects/region.c _____ Modified: trunk/reactos/subsys/win32k/objects/region.c --- trunk/reactos/subsys/win32k/objects/region.c 2005-02-18 12:59:30 UTC (rev 13629) +++ trunk/reactos/subsys/win32k/objects/region.c 2005-02-18 13:07:27 UTC (rev 13630) @@ -1992,7 +1992,7 @@ RGNDATA_UnlockRgn(hSrc2); result = destRgn->rdh.iType; } - else + else if(hSrc2 == NULL) { DPRINT1("NtGdiCombineRgn requires hSrc2 != NULL for combine mode %d!\n", CombineMode); }

19 years, 10 months

[weiden] 13629: only dump stack traces when GDI_DEBUG is enabled

by weiden＠svn.reactos.com

only dump stack traces when GDI_DEBUG is enabled Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-02-18 12:54:17 UTC (rev 13628) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-02-18 12:59:30 UTC (rev 13629) @@ -801,13 +801,17 @@ if((EntryType & ~GDI_HANDLE_REUSE_MASK) == 0) { DPRINT1("Attempted to lock object 0x%x that is deleted!\n", hObj); +#ifdef GDI_DEBUG KeRosDumpStackFrames ( NULL, 20 ); +#endif } else { DPRINT1("Attempted to lock object 0x%x, type mismatch (0x%x : 0x%x)\n", hObj, EntryType & ~GDI_HANDLE_REUSE_MASK, ExpectedType & ~GDI_HANDLE_REUSE_MASK); +#ifdef GDI_DEBUG KeRosDumpStackFrames ( NULL, 20 ); +#endif } #ifdef GDI_DEBUG DPRINT1("-> called from %s:%i\n", file, line); @@ -839,8 +843,8 @@ else { DPRINT1("Attempted to lock foreign handle: 0x%x, Owner: 0x%x locked: 0x%x Caller: 0x%x, stockobj: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)PrevProcId & 0x1, PsGetCurrentProcessId(), GDI_HANDLE_IS_STOCKOBJ(hObj)); +#ifdef GDI_DEBUG KeRosDumpStackFrames ( NULL, 20 ); -#ifdef GDI_DEBUG DPRINT1("-> called from %s:%i\n", file, line); #endif }

19 years, 10 months

[weiden] 13628: implemented reuse counters for gdi objects

by weiden＠svn.reactos.com

implemented reuse counters for gdi objects Modified: trunk/reactos/include/win32k/gdiobj.h Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/objects/region.c _____ Modified: trunk/reactos/include/win32k/gdiobj.h --- trunk/reactos/include/win32k/gdiobj.h 2005-02-18 09:17:56 UTC (rev 13627) +++ trunk/reactos/include/win32k/gdiobj.h 2005-02-18 12:54:17 UTC (rev 13628) @@ -19,13 +19,16 @@ #define GDI_HANDLE_INDEX_MASK (GDI_HANDLE_COUNT - 1) #define GDI_HANDLE_TYPE_MASK 0x007f0000 #define GDI_HANDLE_STOCK_MASK 0x00800000 +#define GDI_HANDLE_REUSE_MASK 0xff000000 +#define GDI_HANDLE_REUSECNT_SHIFT 24 + #define GDI_HANDLE_CREATE(i, t) ((HANDLE)(((i) & GDI_HANDLE_INDEX_MASK) | ((t) & GDI_HANDLE_TYPE_MASK))) -#define GDI_HANDLE_GET_INDEX(h) (((DWORD)(h)) & GDI_HANDLE_INDEX_MASK) -#define GDI_HANDLE_GET_TYPE(h) (((DWORD)(h)) & GDI_HANDLE_TYPE_MASK) -#define GDI_HANDLE_IS_TYPE(h, t) ((t) == (((DWORD)(h)) & GDI_HANDLE_TYPE_MASK)) -#define GDI_HANDLE_IS_STOCKOBJ(h) (0 != (((DWORD)(h)) & GDI_HANDLE_STOCK_MASK)) -#define GDI_HANDLE_SET_STOCKOBJ(h) ((h) = (HANDLE)(((DWORD)(h)) | GDI_HANDLE_STOCK_MASK)) +#define GDI_HANDLE_GET_INDEX(h) (((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) +#define GDI_HANDLE_GET_TYPE(h) (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK) +#define GDI_HANDLE_IS_TYPE(h, t) ((t) == (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK)) +#define GDI_HANDLE_IS_STOCKOBJ(h) (0 != (((ULONG_PTR)(h)) & GDI_HANDLE_STOCK_MASK)) +#define GDI_HANDLE_SET_STOCKOBJ(h) ((h) = (HANDLE)(((ULONG_PTR)(h)) | GDI_HANDLE_STOCK_MASK)) /*! \defgroup GDI object types @@ -74,20 +77,10 @@ #endif } GDIOBJHDR, *PGDIOBJHDR; -typedef struct _GDIMULTILOCK -{ - HGDIOBJ hObj; - PGDIOBJ pObj; - DWORD ObjectType; -} GDIMULTILOCK, *PGDIMULTILOCK; - -BOOL INTERNAL_CALL GDIOBJ_LockMultipleObj(PGDIMULTILOCK pList, INT nObj); -BOOL INTERNAL_CALL GDIOBJ_UnlockMultipleObj(PGDIMULTILOCK pList, INT nObj); BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle); void INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner); void INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo); BOOL INTERNAL_CALL GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj); -BOOL INTERNAL_CALL GDIOBJ_LockMultipleObj(PGDIMULTILOCK pList, INT nObj); #define GDIOBJ_GetObjectType(Handle) \ GDI_HANDLE_GET_TYPE(Handle) _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-02-18 09:17:56 UTC (rev 13627) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-02-18 12:54:17 UTC (rev 13628) @@ -377,28 +377,31 @@ RtlZeroMemory(ObjectBody, GetObjectSize(ObjectType)); - TypeInfo = (ObjectType & 0xFFFF0000) | (ObjectType >> 16); + TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> 16); FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) { HANDLE PrevProcId; UINT Index; - HGDIOBJ Handle; /* calculate the entry from the address of the entry in the free slot array */ Index = ((ULONG_PTR)FreeEntry - (ULONG_PTR)&HandleTable->FreeEntries[0]) / sizeof(HandleTable->FreeEntries[0]); Entry = &HandleTable->Entries[Index]; - Handle = (HGDIOBJ)((Index & 0xFFFF) | (ObjectType & 0xFFFF0000)); LockHandle: PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, 0); if(PrevProcId == NULL) { + HGDIOBJ Handle; + ASSERT(Entry->KernelData == NULL); Entry->KernelData = ObjectBody; + + /* copy the reuse-counter */ + TypeInfo |= Entry->Type & GDI_HANDLE_REUSE_MASK; /* we found a free entry, no need to exchange this field atomically since we're holding the lock */ @@ -416,6 +419,7 @@ { InterlockedIncrement(&W32Process->GDIObjects); } + Handle = (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo & (GDI_HANDLE_TYPE_MASK | GDI_HANDLE_REUSE_MASK))); DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, ObjectBody); return Handle; @@ -425,7 +429,7 @@ #ifdef GDI_DEBUG if(++Attempts > 20) { - DPRINT1("[%d]Waiting on 0x%x\n", Attempts, Handle); + DPRINT1("[%d]Waiting on handle in index 0x%x\n", Attempts, Index); } #endif /* damn, someone is trying to lock the object even though it doesn't @@ -508,7 +512,8 @@ PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, ProcessId); if(PrevProcId == ProcessId) { - if(Entry->Type != 0 && Entry->KernelData != NULL && (ExpectedType == 0 || ((Entry->Type << 16) == ExpectedType))) + if(Entry->Type != 0 && Entry->KernelData != NULL && + (ExpectedType == 0 || ((Entry->Type << 16) == ExpectedType))) { PGDIOBJHDR GdiHdr; @@ -520,8 +525,8 @@ PW32PROCESS W32Process = PsGetWin32Process(); ULONG Type = Entry->Type << 16; - /* Clear the type field so when unlocking the handle it gets finally deleted */ - Entry->Type = 0; + /* Clear the type field so when unlocking the handle it gets finally deleted and increment reuse counter */ + Entry->Type = ((Entry->Type >> GDI_HANDLE_REUSECNT_SHIFT) + 1) << GDI_HANDLE_REUSECNT_SHIFT; Entry->KernelData = NULL; /* unlock the handle slot */ @@ -551,8 +556,9 @@ else { /* the object is currently locked. just clear the type field so when the - object gets unlocked it will be finally deleted from the table. */ - Entry->Type = 0; + object gets unlocked it will be finally deleted from the table. Also + incrment the reuse counter! */ + Entry->Type = ((Entry->Type >> GDI_HANDLE_REUSECNT_SHIFT) + 1) << GDI_HANDLE_REUSECNT_SHIFT; /* unlock the handle slot */ InterlockedExchangePointer(&Entry->ProcessId, NULL); @@ -563,7 +569,7 @@ } else { - if(Entry->Type != 0) + if((Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0) { DPRINT1("Attempted to delete object 0x%x, type mismatch (0x%x : 0x%x)\n", hObj, ObjectType, ExpectedType); } @@ -610,85 +616,6 @@ } /*! - * Lock multiple objects. Use this function when you need to lock multiple objects and some of them may be - * duplicates. You should use this function to avoid trying to lock the same object twice! - * - * \param pList pointer to the list that contains handles to the objects. You should set hObj and ObjectType fields. - * \param nObj number of objects to lock - * \return for each entry in pList this function sets pObj field to point to the object. - * - * \note this function uses an O(n^2) algoritm because we shouldn't need to call it with more than 3 or 4 objects. -*/ -BOOL INTERNAL_CALL -GDIOBJ_LockMultipleObj(PGDIMULTILOCK pList, INT nObj) -{ - INT i, j; - ASSERT( pList ); - /* FIXME - check for "invalid" handles */ - /* go through the list checking for duplicate objects */ - for (i = 0; i < nObj; i++) - { - pList[i].pObj = NULL; - for (j = 0; j < i; j++) - { - if (pList[i].hObj == pList[j].hObj) - { - /* already locked, so just copy the pointer to the object */ - pList[i].pObj = pList[j].pObj; - break; - } - } - - if (NULL == pList[i].pObj) - { - /* object hasn't been locked, so lock it. */ - if (NULL != pList[i].hObj) - { - pList[i].pObj = GDIOBJ_LockObj(pList[i].hObj, pList[i].ObjectType); - } - } - } - - return TRUE; -} - -/*! - * Unlock multiple objects. Use this function when you need to unlock multiple objects and some of them may be - * duplicates. - * - * \param pList pointer to the list that contains handles to the objects. You should set hObj and ObjectType fields. - * \param nObj number of objects to lock - * - * \note this function uses O(n^2) algoritm because we shouldn't need to call it with more than 3 or 4 objects. -*/ -BOOL INTERNAL_CALL -GDIOBJ_UnlockMultipleObj(PGDIMULTILOCK pList, INT nObj) -{ - INT i, j; - ASSERT(pList); - - /* go through the list checking for duplicate objects */ - for (i = 0; i < nObj; i++) - { - if (NULL != pList[i].pObj) - { - for (j = i + 1; j < nObj; j++) - { - if ((pList[i].pObj == pList[j].pObj)) - { - /* set the pointer to zero for all duplicates */ - pList[j].pObj = NULL; - } - } - GDIOBJ_UnlockObj(pList[i].hObj); - pList[i].pObj = NULL; - } - } - - return TRUE; -} - -/*! * Initialization of the GDI object engine. */ VOID INTERNAL_CALL @@ -744,11 +671,11 @@ End = &HandleTable->Entries[GDI_HANDLE_COUNT]; for(Entry = &HandleTable->Entries[RESERVE_ENTRIES_COUNT]; - Entry < End; + Entry != End; Entry++, Index++) { /* ignore the lock bit */ - if((HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && Entry->Type != 0) + if((HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && (Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0) { HGDIOBJ ObjectHandle; @@ -824,7 +751,8 @@ /* we're locking an object that belongs to our process or it's a global object if ProcessId == 0 here. ProcessId can only be 0 here if it previously failed to lock the object and it turned out to be a global object. */ - if(EntryType != 0 && Entry->KernelData != NULL && (ExpectedType == 0 || (EntryType == ExpectedType))) + if(EntryType != 0 && Entry->KernelData != NULL && + (ExpectedType == 0 || (EntryType == ExpectedType))) { PETHREAD PrevThread; PGDIOBJHDR GdiHdr; @@ -870,14 +798,15 @@ { InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); - if(EntryType == 0) + if((EntryType & ~GDI_HANDLE_REUSE_MASK) == 0) { DPRINT1("Attempted to lock object 0x%x that is deleted!\n", hObj); KeRosDumpStackFrames ( NULL, 20 ); } else { - DPRINT1("Attempted to lock object 0x%x, type mismatch (0x%x : 0x%x)\n", hObj, EntryType, ExpectedType); + DPRINT1("Attempted to lock object 0x%x, type mismatch (0x%x : 0x%x)\n", + hObj, EntryType & ~GDI_HANDLE_REUSE_MASK, ExpectedType & ~GDI_HANDLE_REUSE_MASK); KeRosDumpStackFrames ( NULL, 20 ); } #ifdef GDI_DEBUG @@ -981,7 +910,7 @@ #endif } - if(Entry->Type == 0 && GdiHdr->Locks == 0) + if((Entry->Type & ~GDI_HANDLE_REUSE_MASK) == 0 && GdiHdr->Locks == 0) { PPAGED_LOOKASIDE_LIST LookasideList; PW32PROCESS W32Process = PsGetWin32Process(); @@ -1095,7 +1024,7 @@ Entry = GDI_HANDLE_GET_ENTRY(HandleTable, ObjectHandle); Ret = Entry->KernelData != NULL && - Entry->Type != 0 && + (Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0 && (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcessId; return Ret; @@ -1143,6 +1072,8 @@ exchange it.*/ NewType = GDI_HANDLE_GET_TYPE(*hObj); NewType |= NewType >> 16; + NewType |= (ULONG_PTR)(*hObj) & GDI_HANDLE_REUSE_MASK; + /* This is the type that the object should have right now, save it */ OldType = NewType; /* As the object should be a stock object, set it's flag, but only in the upper 16 bits */ @@ -1268,7 +1199,7 @@ { PETHREAD PrevThread; - if(Entry->Type != 0 && Entry->KernelData != NULL) + if((Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0 && Entry->KernelData != NULL) { PGDIOBJHDR GdiHdr = GDIBdyToHdr(Entry->KernelData); @@ -1401,7 +1332,7 @@ PETHREAD PrevThread; PGDIOBJHDR GdiHdr; - if(FromEntry->Type != 0 && FromEntry->KernelData != NULL) + if((FromEntry->Type & ~GDI_HANDLE_REUSE_MASK) != 0 && FromEntry->KernelData != NULL) { GdiHdr = GDIBdyToHdr(FromEntry->KernelData); _____ Modified: trunk/reactos/subsys/win32k/objects/region.c --- trunk/reactos/subsys/win32k/objects/region.c 2005-02-18 09:17:56 UTC (rev 13627) +++ trunk/reactos/subsys/win32k/objects/region.c 2005-02-18 12:54:17 UTC (rev 13628) @@ -707,45 +707,43 @@ HRGN FASTCALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt) { PROSRGNDATA objSrc, rgnDst; - HRGN hNewDst, hRet = NULL; - GDIMULTILOCK Lock[2] = {{hDst, 0, GDI_OBJECT_TYPE_REGION}, {hSrc, 0, GDI_OBJECT_TYPE_REGION}}; + HRGN hRet = NULL; + POINT pt = { 0, 0 }; if( !hDst ) { - if( !( hNewDst = RGNDATA_AllocRgn(1) ) ) + if( !( hDst = RGNDATA_AllocRgn(1) ) ) { return 0; } - Lock[0].hObj = hNewDst; } - if ( !GDIOBJ_LockMultipleObj(Lock, sizeof(Lock)/sizeof(Lock[0])) ) - { - DPRINT1("GDIOBJ_LockMultipleObj() failed\n" ); - return 0; - } - rgnDst = Lock[0].pObj; - objSrc = Lock[1].pObj; - - if( objSrc && rgnDst ) + rgnDst = RGNDATA_LockRgn(hDst); + if(rgnDst == NULL) { - if(rgnDst) - { - POINT pt = { 0, 0 }; + return NULL; + } + + objSrc = RGNDATA_LockRgn(hSrc); + if(objSrc == NULL) + { + RGNDATA_UnlockRgn(hDst); + return NULL; + } + if(!lpPt) + lpPt = &pt; - if(!lpPt) - lpPt = &pt; - - if(REGION_CropAndOffsetRegion(lpPt, lpRect, objSrc, rgnDst) == FALSE) - { // ve failed cleanup and return - hRet = NULL; - } - else{ // ve are fine. unlock the correct pointer and return correct handle - hRet = Lock[0].hObj; - } + if(REGION_CropAndOffsetRegion(lpPt, lpRect, objSrc, rgnDst) == FALSE) + { // ve failed cleanup and return + hRet = NULL; } + else{ // ve are fine. unlock the correct pointer and return correct handle + hRet = hDst; } - GDIOBJ_UnlockMultipleObj(Lock, sizeof(Lock)/sizeof(Lock[0])); + + RGNDATA_UnlockRgn(hSrc); + RGNDATA_UnlockRgn(hDst); + return hRet; } @@ -1957,21 +1955,12 @@ INT CombineMode) { INT result = ERROR; - GDIMULTILOCK Lock[3] = {{hDest, 0, GDI_OBJECT_TYPE_REGION}, {hSrc1, 0, GDI_OBJECT_TYPE_REGION}, {hSrc2, 0, GDI_OBJECT_TYPE_REGION}}; PROSRGNDATA destRgn, src1Rgn, src2Rgn; - - if ( !GDIOBJ_LockMultipleObj(Lock, sizeof(Lock)/sizeof(Lock[0])) ) - { - DPRINT1("GDIOBJ_LockMultipleObj() failed\n" ); - return ERROR; - } - - destRgn = (PROSRGNDATA) Lock[0].pObj; - src1Rgn = (PROSRGNDATA) Lock[1].pObj; - src2Rgn = (PROSRGNDATA) Lock[2].pObj; - + + destRgn = RGNDATA_LockRgn(hDest); if( destRgn ) { + src1Rgn = RGNDATA_LockRgn(hSrc1); if( src1Rgn ) { if (CombineMode == RGN_COPY) @@ -1982,7 +1971,8 @@ } else { - if( src2Rgn ) + src2Rgn = RGNDATA_LockRgn(hSrc2); + if( src2Rgn ) { switch (CombineMode) { @@ -1999,17 +1989,26 @@ REGION_SubtractRegion(destRgn, src1Rgn, src2Rgn); break; } + RGNDATA_UnlockRgn(hSrc2); result = destRgn->rdh.iType; } + else + { + DPRINT1("NtGdiCombineRgn requires hSrc2 != NULL for combine mode %d!\n", CombineMode); + } } + + RGNDATA_UnlockRgn(hSrc1); } + + RGNDATA_UnlockRgn(hDest); } else { DPRINT("NtGdiCombineRgn: hDest unavailable\n"); result = ERROR; } - GDIOBJ_UnlockMultipleObj(Lock, sizeof(Lock)/sizeof(Lock[0])); + return result; }

19 years, 10 months

[gvg] 13627: We don't have separate .sym files anymore

by gvg＠svn.reactos.com

We don't have separate .sym files anymore Modified: trunk/reactos/Makefile Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-18 02:41:49 UTC (rev 13626) +++ trunk/reactos/Makefile 2005-02-18 09:17:56 UTC (rev 13627) @@ -983,8 +983,6 @@ $(RM) $(INSTALL_DIR)/system32/config/*.* $(HALFVERBOSEECHO) [RM] $(INSTALL_DIR)/system32/*.* $(RM) $(INSTALL_DIR)/system32/*.* - $(HALFVERBOSEECHO) [RM] $(INSTALL_DIR)/symbols/*.* - $(RM) $(INSTALL_DIR)/symbols/*.* $(HALFVERBOSEECHO) [RM] $(INSTALL_DIR)/media/fonts/*.* $(RM) $(INSTALL_DIR)/media/fonts/*.* $(HALFVERBOSEECHO) [RM] $(INSTALL_DIR)/media/*.* @@ -999,8 +997,6 @@ $(RMDIR) $(INSTALL_DIR)/system32/config $(HALFVERBOSEECHO) [RMDIR] $(INSTALL_DIR)/system32 $(RMDIR) $(INSTALL_DIR)/system32 - $(HALFVERBOSEECHO) [RMDIR] $(INSTALL_DIR)/symbols - $(RMDIR) $(INSTALL_DIR)/symbols $(HALFVERBOSEECHO) [RMDIR] $(INSTALL_DIR)/media/fonts $(RMDIR) $(INSTALL_DIR)/media/fonts $(HALFVERBOSEECHO) [RMDIR] $(INSTALL_DIR)/media @@ -1023,8 +1019,6 @@ $(RMKDIR) $(INSTALL_DIR)/media $(HALFVERBOSEECHO) [RMKDIR] $(INSTALL_DIR)/media/fonts $(RMKDIR) $(INSTALL_DIR)/media/fonts - $(HALFVERBOSEECHO) [RMKDIR] $(INSTALL_DIR)/symbols - $(RMKDIR) $(INSTALL_DIR)/symbols $(HALFVERBOSEECHO) [RMKDIR] $(INSTALL_DIR)/system32 $(RMKDIR) $(INSTALL_DIR)/system32 $(HALFVERBOSEECHO) [RMKDIR] $(INSTALL_DIR)/system32/config _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-02-18 02:41:49 UTC (rev 13626) +++ trunk/reactos/tools/helper.mk 2005-02-18 09:17:56 UTC (rev 13627) @@ -926,10 +926,9 @@ MK_CLEANFILTERED := $(MK_OBJECTS:.o=.d) $(TARGET_PCH:.h=.d) MK_CLEANDEPS := $(join $(dir $(MK_CLEANFILTERED)), $(addprefix ., $(notdir $(MK_CLEANFILTERED)))) -# FIXME: The $(MK_BASENAME).sym can be removed around 15 Feb 2005 clean: $(MK_REGTESTS_CLEAN) $(SUBDIRS:%=%_clean) $(HALFVERBOSEECHO) [CLEAN] - - $(RM) *.o $(MK_PCHCLEAN) $(MK_BASENAME).sym $(MK_BASENAME).a $(MK_RESOURCE) \ + - $(RM) *.o $(MK_PCHCLEAN) $(MK_BASENAME).a $(MK_RESOURCE) \ $(MK_FULLNAME) $(MK_NOSTRIPNAME) $(MK_CLEANFILES) $(MK_CLEANDEPS) $(MK_BASENAME).map \ junk.tmp base.tmp temp.exp $(MK_RC_BINARIES) $(MK_SPECDEF) $(MK_STUBS_SRC) \ $(MK_GENERATED_MAKEFILE) $(TARGET_CLEAN)

19 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005