Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 28892: - use the new ObjectType list with fixed indices
by tkreuzer＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: tkreuzer Date: Thu Sep 6 06:54:17 2007 New Revision: 28892 URL: http://svn.reactos.org/svn/reactos?rev=28892&view=rev Log: - use the new ObjectType list with fixed indices Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Sep 6 06:54:17 2007 @@ -48,13 +48,6 @@ /* apparently the first 10 entries are never used in windows as they are empty */ #define RESERVE_ENTRIES_COUNT 10 -typedef struct -{ - ULONG Type; - ULONG Size; - GDICLEANUPPROC CleanupProc; -} GDI_OBJ_INFO, *PGDI_OBJ_INFO; - /* * Dummy GDI Cleanup Callback */ @@ -63,31 +56,6 @@ { return TRUE; } - -/* Testing shows that regions are the most used GDIObj type, - so put that one first for performance */ -static const -GDI_OBJ_INFO ObjInfo[] = -{ - /* Type */ /* Size */ /* CleanupProc */ - {GDI_OBJECT_TYPE_REGION, sizeof(ROSRGNDATA), RGNDATA_Cleanup}, - {GDI_OBJECT_TYPE_BITMAP, sizeof(BITMAPOBJ), BITMAP_Cleanup}, - {GDI_OBJECT_TYPE_DC, sizeof(DC), DC_Cleanup}, - {GDI_OBJECT_TYPE_PALETTE, sizeof(PALGDI), PALETTE_Cleanup}, - {GDI_OBJECT_TYPE_BRUSH, sizeof(GDIBRUSHOBJ), BRUSH_Cleanup}, - {GDI_OBJECT_TYPE_PEN, sizeof(GDIBRUSHOBJ), BRUSH_Cleanup}, - {GDI_OBJECT_TYPE_FONT, sizeof(TEXTOBJ), GDI_CleanupDummy}, - {GDI_OBJECT_TYPE_DIRECTDRAW, sizeof(DD_DIRECTDRAW), DD_Cleanup}, - {GDI_OBJECT_TYPE_DD_SURFACE, sizeof(DD_SURFACE), DDSURF_Cleanup}, - {GDI_OBJECT_TYPE_EXTPEN, sizeof(GDIBRUSHOBJ), BRUSH_Cleanup}, - /* FIXME do not use normal DC struct for this */ - {GDI_OBJECT_TYPE_METADC, sizeof(DC), GDI_CleanupDummy}, - {GDI_OBJECT_TYPE_METAFILE, sizeof(DC), GDI_CleanupDummy}, - {GDI_OBJECT_TYPE_ENHMETAFILE, 0, GDI_CleanupDummy}, - {GDI_OBJECT_TYPE_EMF, 0, GDI_CleanupDummy} -}; - -#define OBJTYPE_COUNT (sizeof(ObjInfo) / sizeof(ObjInfo[0])) typedef struct { @@ -200,7 +168,7 @@ } HandleTable->LookasideLists = ExAllocatePoolWithTag(NonPagedPool, - OBJTYPE_COUNT * sizeof(PAGED_LOOKASIDE_LIST), + BASE_OBJTYPE_COUNT * sizeof(PAGED_LOOKASIDE_LIST), TAG_GDIHNDTBLE); if(HandleTable->LookasideLists == NULL) { @@ -210,10 +178,13 @@ return NULL; } - for(ObjType = 0; ObjType < OBJTYPE_COUNT; ObjType++) - { - ExInitializePagedLookasideList(HandleTable->LookasideLists + ObjType, NULL, NULL, 0, - ObjInfo[ObjType].Size + sizeof(GDIOBJHDR), TAG_GDIOBJ, 0); + for(ObjType = 0; ObjType < BASE_OBJTYPE_COUNT; ObjType++) + { + if (ObjTypeInfo[ObjType].bUseLookaside) + { + ExInitializePagedLookasideList(HandleTable->LookasideLists + ObjType, NULL, NULL, 0, + ObjTypeInfo[ObjType].ulBodySize + sizeof(GDIOBJHDR), ObjTypeInfo[ObjType].Tag, 0); + } } ShortDelay.QuadPart = -5000LL; /* FIXME - 0.5 ms? */ @@ -223,55 +194,21 @@ static __inline PPAGED_LOOKASIDE_LIST FindLookasideList(PGDI_HANDLE_TABLE HandleTable, - DWORD ObjectType) -{ - int Index; - - for (Index = 0; Index < OBJTYPE_COUNT; Index++) - { - if (ObjInfo[Index].Type == ObjectType) - { - return HandleTable->LookasideLists + Index; - } - } - - DPRINT1("Can't find lookaside list for object type 0x%08x\n", ObjectType); - - return NULL; + ULONG TypeIndex) +{ + return HandleTable->LookasideLists + TypeIndex; } static __inline BOOL -RunCleanupCallback(PGDIOBJ pObj, DWORD ObjectType) -{ - int Index; - - for (Index = 0; Index < OBJTYPE_COUNT; Index++) - { - if (ObjInfo[Index].Type == ObjectType) - { - return ((GDICLEANUPPROC)ObjInfo[Index].CleanupProc)(pObj); - } - } - - DPRINT1("Can't find cleanup callback for object type 0x%08x\n", ObjectType); - return TRUE; +RunCleanupCallback(PGDIOBJ pObj, ULONG TypeIndex) +{ + return ((GDICLEANUPPROC)ObjTypeInfo[TypeIndex].CleanupProc)(pObj); } static __inline ULONG -GetObjectSize(DWORD ObjectType) -{ - int Index; - - for (Index = 0; Index < OBJTYPE_COUNT; Index++) - { - if (ObjInfo[Index].Type == ObjectType) - { - return ObjInfo[Index].Size; - } - } - - DPRINT1("Can't find size for object type 0x%08x\n", ObjectType); - return 0; +GetObjectSize(ULONG TypeIndex) +{ + return ObjTypeInfo[TypeIndex].ulBodySize; } #ifdef GDI_DEBUG @@ -411,9 +348,10 @@ #endif /* GDI_DEBUG */ { PW32PROCESS W32Process; - PGDIOBJHDR newObject; - PPAGED_LOOKASIDE_LIST LookasideList; + PGDIOBJHDR newObject = NULL; + PPAGED_LOOKASIDE_LIST LookasideList = NULL; HANDLE CurrentProcessId, LockedProcessId; + ULONG TypeIndex; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif @@ -426,115 +364,128 @@ ASSERT(ObjectType != GDI_OBJECT_TYPE_DONTCARE); - LookasideList = FindLookasideList(HandleTable, ObjectType); - if(LookasideList != NULL) - { - newObject = ExAllocateFromPagedLookasideList(LookasideList); - if(newObject != NULL) - { - PSLIST_ENTRY FreeEntry; - PGDI_TABLE_ENTRY Entry; - PGDIOBJ ObjectBody; - LONG TypeInfo; - - CurrentProcessId = PsGetCurrentProcessId(); - LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); - - newObject->LockingThread = NULL; - newObject->Locks = 0; - -#ifdef GDI_DEBUG - newObject->createdfile = file; - newObject->createdline = line; - newObject->lockfile = NULL; - newObject->lockline = 0; -#endif - - ObjectBody = GDIHdrToBdy(newObject); - - RtlZeroMemory(ObjectBody, GetObjectSize(ObjectType)); + TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(ObjectType); + if (ObjTypeInfo[TypeIndex].bUseLookaside) + { + LookasideList = FindLookasideList(HandleTable, TypeIndex); + if(LookasideList != NULL) + { + newObject = ExAllocateFromPagedLookasideList(LookasideList); + } + } + else + { + newObject = ExAllocatePoolWithTag(PagedPool, + ObjTypeInfo[TypeIndex].ulBodySize + sizeof(GDIOBJHDR), + ObjTypeInfo[TypeIndex].Tag); + } + if(newObject != NULL) + { + PSLIST_ENTRY FreeEntry; + PGDI_TABLE_ENTRY Entry; + PGDIOBJ ObjectBody; + LONG TypeInfo; + + CurrentProcessId = PsGetCurrentProcessId(); + LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); + + newObject->LockingThread = NULL; + newObject->Locks = 0; + +#ifdef GDI_DEBUG + newObject->createdfile = file; + newObject->createdline = line; + newObject->lockfile = NULL; + newObject->lockline = 0; +#endif + + ObjectBody = GDIHdrToBdy(newObject); + + RtlZeroMemory(ObjectBody, GetObjectSize(TypeIndex)); /* FIXME: On Windows the higher 16 bit of the type field don't always match the type from the handle, it is probably a storage type (type = pen, storage = brush) */ - TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); - - FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); - if(FreeEntry != NULL) - { - HANDLE PrevProcId; - UINT Index; - - /* 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]; + TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); + + FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); + if(FreeEntry != NULL) + { + HANDLE PrevProcId; + UINT Index; + + /* 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]; LockHandle: - PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, 0); - if(PrevProcId == NULL) + 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_ENTRY_REUSE_MASK; + + /* we found a free entry, no need to exchange this field atomically + since we're holding the lock */ + Entry->Type = TypeInfo; + + /* unlock the entry */ + (void)InterlockedExchangePointer(&Entry->ProcessId, CurrentProcessId); + +#ifdef GDI_DEBUG + memset ( GDIHandleAllocator[Index], 0xcd, GDI_STACK_LEVELS * sizeof(ULONG) ); + KeRosGetStackFrames ( GDIHandleAllocator[Index], GDI_STACK_LEVELS ); +#endif /* GDI_DEBUG */ + + if(W32Process != NULL) { - HGDIOBJ Handle; - - ASSERT(Entry->KernelData == NULL); - - Entry->KernelData = ObjectBody; - - /* copy the reuse-counter */ - TypeInfo |= Entry->Type & GDI_ENTRY_REUSE_MASK; - - /* we found a free entry, no need to exchange this field atomically - since we're holding the lock */ - Entry->Type = TypeInfo; - - /* unlock the entry */ - (void)InterlockedExchangePointer(&Entry->ProcessId, CurrentProcessId); - -#ifdef GDI_DEBUG - memset ( GDIHandleAllocator[Index], 0xcd, GDI_STACK_LEVELS * sizeof(ULONG) ); - KeRosGetStackFrames ( GDIHandleAllocator[Index], GDI_STACK_LEVELS ); -#endif /* GDI_DEBUG */ - - if(W32Process != NULL) - { - InterlockedIncrement(&W32Process->GDIObjects); - } - Handle = (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_ENTRY_UPPER_SHIFT)); - - DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, ObjectBody); - return Handle; + InterlockedIncrement(&W32Process->GDIObjects); } - else + Handle = (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_ENTRY_UPPER_SHIFT)); + + DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, ObjectBody); + return Handle; + } + else + { +#ifdef GDI_DEBUG + if(++Attempts > 20) { -#ifdef GDI_DEBUG - if(++Attempts > 20) - { - DPRINT1("[%d]Waiting on handle in index 0x%x\n", Attempts, Index); - } + 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 eve nexist anymore, wait a little and try again! FIXME - we shouldn't loop forever! Give up after some time! */ - DelayExecution(); + DelayExecution(); /* try again */ - goto LockHandle; - } - } - + goto LockHandle; + } + } + + if (ObjTypeInfo[TypeIndex].bUseLookaside) + { ExFreeToPagedLookasideList(LookasideList, newObject); - DPRINT1("Failed to insert gdi object into the handle table, no handles left!\n"); -#ifdef GDI_DEBUG - IntDumpHandleTable(HandleTable); + } + else + { + ExFreePool(newObject); + } + DPRINT1("Failed to insert gdi object into the handle table, no handles left!\n"); +#ifdef GDI_DEBUG + IntDumpHandleTable(HandleTable); #endif /* GDI_DEBUG */ - } - else - { - DPRINT1("Not enough memory to allocate gdi object!\n"); - } } else { - DPRINT1("Failed to find lookaside list for object type 0x%x\n", ObjectType); + DPRINT1("Not enough memory to allocate gdi object!\n"); } return NULL; } @@ -559,7 +510,7 @@ PGDI_TABLE_ENTRY Entry; PPAGED_LOOKASIDE_LIST LookasideList; HANDLE ProcessId, LockedProcessId, PrevProcId; - ULONG HandleType, HandleUpper; + ULONG HandleType, HandleUpper, TypeIndex; BOOL Silent; #ifdef GDI_DEBUG ULONG Attempts = 0; @@ -632,13 +583,21 @@ } /* call the cleanup routine. */ - Ret = RunCleanupCallback(GDIHdrToBdy(GdiHdr), HandleType); + TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(HandleType); + Ret = RunCleanupCallback(GDIHdrToBdy(GdiHdr), TypeIndex); /* Now it's time to free the memory */ - LookasideList = FindLookasideList(HandleTable, HandleType); - if(LookasideList != NULL) + if (ObjTypeInfo[TypeIndex].bUseLookaside) { - ExFreeToPagedLookasideList(LookasideList, GdiHdr); + LookasideList = FindLookasideList(HandleTable, TypeIndex); + if(LookasideList != NULL) + { + ExFreeToPagedLookasideList(LookasideList, GdiHdr); + } + } + else + { + ExFreePool(GdiHdr); } return Ret;

1 0

[tkreuzer] 28891: - cleanup EXTPENS and PENS in BRUSH_Cleanup, remove EXTPEN_Cleanup - add new new ObjectTypeInfo structure. It's unused atm, but it will be soon.
by tkreuzer＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: tkreuzer Date: Thu Sep 6 05:04:18 2007 New Revision: 28891 URL: http://svn.reactos.org/svn/reactos?rev=28891&view=rev Log: - cleanup EXTPENS and PENS in BRUSH_Cleanup, remove EXTPEN_Cleanup - add new new ObjectTypeInfo structure. It's unused atm, but it will be soon. Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pen.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h Thu Sep 6 05:04:18 2007 @@ -15,6 +15,5 @@ #define PENOBJ_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr(GdiHandleTable, pPenObj) INT STDCALL PEN_GetObject(PGDIBRUSHOBJ hPen, INT Count, PLOGPEN Buffer); -BOOL INTERNAL_CALL EXTPEN_Cleanup(PVOID ObjectBody); #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Thu Sep 6 05:04:18 2007 @@ -44,6 +44,12 @@ ASSERT(pBrush->hbmPattern); GDIOBJ_SetOwnership(GdiHandleTable, pBrush->hbmPattern, PsGetCurrentProcess()); NtGdiDeleteObject(pBrush->hbmPattern); + } + + /* Free the kmode styles array of EXTPENS */ + if (pBrush->pStyle) + { + ExFreePool(pBrush->pStyle); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Sep 6 05:04:18 2007 @@ -75,11 +75,11 @@ {GDI_OBJECT_TYPE_DC, sizeof(DC), DC_Cleanup}, {GDI_OBJECT_TYPE_PALETTE, sizeof(PALGDI), PALETTE_Cleanup}, {GDI_OBJECT_TYPE_BRUSH, sizeof(GDIBRUSHOBJ), BRUSH_Cleanup}, - {GDI_OBJECT_TYPE_PEN, sizeof(GDIBRUSHOBJ), GDI_CleanupDummy}, + {GDI_OBJECT_TYPE_PEN, sizeof(GDIBRUSHOBJ), BRUSH_Cleanup}, {GDI_OBJECT_TYPE_FONT, sizeof(TEXTOBJ), GDI_CleanupDummy}, {GDI_OBJECT_TYPE_DIRECTDRAW, sizeof(DD_DIRECTDRAW), DD_Cleanup}, {GDI_OBJECT_TYPE_DD_SURFACE, sizeof(DD_SURFACE), DDSURF_Cleanup}, - {GDI_OBJECT_TYPE_EXTPEN, sizeof(GDIBRUSHOBJ), EXTPEN_Cleanup}, + {GDI_OBJECT_TYPE_EXTPEN, sizeof(GDIBRUSHOBJ), BRUSH_Cleanup}, /* FIXME do not use normal DC struct for this */ {GDI_OBJECT_TYPE_METADC, sizeof(DC), GDI_CleanupDummy}, {GDI_OBJECT_TYPE_METAFILE, sizeof(DC), GDI_CleanupDummy}, @@ -88,6 +88,51 @@ }; #define OBJTYPE_COUNT (sizeof(ObjInfo) / sizeof(ObjInfo[0])) + +typedef struct +{ + BOOL bUseLookaside; + ULONG_PTR ulBodySize; + ULONG Tag; + GDICLEANUPPROC CleanupProc; +} OBJ_TYPE_INFO, *POBJ_TYPE_INFO; + +static const +OBJ_TYPE_INFO ObjTypeInfo[] = +{ + {0, 0, 0, NULL}, /* 00 reserved entry */ + {1, sizeof(DC), GDI_OBJECT_TAG_DC, DC_Cleanup}, /* 01 DC */ + {1, sizeof(DD_DIRECTDRAW), GDI_OBJECT_TAG_DDRAW, DD_Cleanup}, /* 02 DD_DDRAW, should be moved away from gdi objects */ + {1, sizeof(DD_SURFACE), GDI_OBJECT_TAG_DDSURF, DDSURF_Cleanup}, /* 03 DD_SURFACE, should be moved away from gdi objects */ + {1, sizeof(ROSRGNDATA), GDI_OBJECT_TAG_REGION, RGNDATA_Cleanup}, /* 04 REGION */ + {1, sizeof(BITMAPOBJ), GDI_OBJECT_TAG_BITMAP, BITMAP_Cleanup}, /* 05 BITMAP */ + {0, sizeof(DC), GDI_OBJECT_TAG_CLIOBJ, GDI_CleanupDummy}, /* 06 CLIOBJ: METADC,... FIXME: don't use DC struct */ + {0, 0, GDI_OBJECT_TAG_PATH, NULL}, /* 07 PATH, unused */ + {1, sizeof(PALGDI), GDI_OBJECT_TAG_PALETTE, PALETTE_Cleanup}, /* 08 PALETTE */ + {0, 0, GDI_OBJECT_TAG_COLSPC, NULL}, /* 09 COLORSPACE, unused */ + {1, sizeof(TEXTOBJ), GDI_OBJECT_TAG_FONT, GDI_CleanupDummy}, /* 0a FONT */ + {0, 0, 0, NULL}, /* 0b RFONT, unused */ + {0, 0, 0, NULL}, /* 0c PFE, unused */ + {0, 0, 0, NULL}, /* 0d PFT, unused */ + {0, 0, 0, NULL}, /* 0e ICMCXF, unused */ + {0, 0, 0, NULL}, /* 0f ICMDLL, unused */ + {1, sizeof(GDIBRUSHOBJ), GDI_OBJECT_TAG_BRUSH, BRUSH_Cleanup}, /* 10 BRUSH, PEN, EXTPEN */ + {0, 0, 0, NULL}, /* 11 D3D_HANDLE, unused */ + {0, 0, 0, NULL}, /* 12 DD_VPORT, unused */ + {0, 0, 0, NULL}, /* 13 SPACE, unused */ + {0, 0, 0, NULL}, /* 14 DD_MOTION, unused */ + {0, 0, 0, NULL}, /* 15 META, unused */ + {0, 0, 0, NULL}, /* 16 ENUMFONT, unused */ + {0, 0, 0, NULL}, /* 18 VTFD, unused */ + {0, 0, 0, NULL}, /* 19 TTFD, unused */ + {0, 0, 0, NULL}, /* 1a RC, unused */ + {0, 0, 0, NULL}, /* 1b TEMP, unused */ + {0, 0, 0, NULL}, /* 1c DRVOBJ, unused */ + {0, 0, 0, NULL}, /* 1d DCIOBJ, unused */ + {0, 0, 0, NULL}, /* 1e SPOOL, unused */ +}; + +#define BASE_OBJTYPE_COUNT (sizeof(ObjTypeInfo) / sizeof(ObjTypeInfo[0])) static LARGE_INTEGER ShortDelay; 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c Thu Sep 6 05:04:18 2007 @@ -201,19 +201,6 @@ return cbRetCount; } -BOOL INTERNAL_CALL -EXTPEN_Cleanup(PVOID ObjectBody) -{ - PGDIBRUSHOBJ pPenObject = (PGDIBRUSHOBJ)ObjectBody; - - /* Free the kmode Styles array */ - if (pPenObject->pStyle) - { - ExFreePool(pPenObject->pStyle); - } - return TRUE; -} - /* PUBLIC FUNCTIONS ***********************************************************/ HPEN STDCALL

1 0

[tkreuzer] 28890: - use NtDd api directly instead of using old syscall function. - remove some old definitions - fix build to make Wax happy
by tkreuzer＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: tkreuzer Date: Thu Sep 6 04:42:51 2007 New Revision: 28890 URL: http://svn.reactos.org/svn/reactos?rev=28890&view=rev Log: - use NtDd api directly instead of using old syscall function. - remove some old definitions - fix build to make Wax happy Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Thu Sep 6 04:42:51 2007 @@ -13,7 +13,7 @@ /* Cleanup ReactX setup */ DeleteDC(hdc); - Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDraw); + NtGdiDdDeleteDirectDrawObject(hDirectDraw); return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c Thu Sep 6 04:42:51 2007 @@ -25,7 +25,7 @@ TEST(GDI_HANDLE_GET_TYPE(hPal) == GDI_OBJECT_TYPE_PALETTE); pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(hPal)]; TEST(pEntry->KernelData != NULL); - TEST(pEntry->ProcessId == (HANDLE)GetCurrentProcessId()); + TEST(pEntry->ProcessId == GetCurrentProcessId()); TEST(pEntry->UserData == 0); TEST(pEntry->Type == (((UINT)hPal >> 16) | GDI_OBJECT_TYPE_PALETTE)); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c Thu Sep 6 04:42:51 2007 @@ -1,3 +1,4 @@ + INT Test_NtGdiEnumFontOpen(PTESTINFO pti) { @@ -17,7 +18,7 @@ TEST(GDI_HANDLE_GET_TYPE(idEnum) == GDI_OBJECT_TYPE_ENUMFONT); pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(idEnum)]; TEST(pEntry->KernelData != NULL); - TEST(pEntry->ProcessId == (HANDLE)GetCurrentProcessId()); + TEST(pEntry->ProcessId == GetCurrentProcessId()); TEST(pEntry->UserData == 0); TEST(pEntry->Type == ((idEnum >> 16) | GDI_OBJECT_TYPE_ENUMFONT)); Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Thu Sep 6 04:42:51 2007 @@ -22,10 +22,6 @@ #include "../apitest.h" -#define OS_UNSUPPORTED 0 -#define OS_REACTOS 1 -#define OS_WINDOWS 2 - typedef struct { LPWSTR lpszFunction;

1 0

[tkreuzer] 28889: - move dx gdi object type definitions from intddraw.h to ntgdihdl.h, change 2 type values to make them match windows, comment out 2 unused types for now. - add pool tags for gdi objects - add a bitmask for basic type (0x01 - 0x1f)
by tkreuzer＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: tkreuzer Date: Thu Sep 6 04:28:04 2007 New Revision: 28889 URL: http://svn.reactos.org/svn/reactos?rev=28889&view=rev Log: - move dx gdi object type definitions from intddraw.h to ntgdihdl.h, change 2 type values to make them match windows, comment out 2 unused types for now. - add pool tags for gdi objects - add a bitmask for basic type (0x01 - 0x1f) Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/intddraw.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Sep 6 04:28:04 2007 @@ -23,6 +23,7 @@ /* Handle Masks and shifts */ #define GDI_HANDLE_INDEX_MASK (GDI_HANDLE_COUNT - 1) #define GDI_HANDLE_TYPE_MASK 0x007f0000 +#define GDI_HANDLE_BASETYPE_MASK 0x001f0000 #define GDI_HANDLE_STOCK_MASK 0x00800000 #define GDI_HANDLE_REUSE_MASK 0xff000000 #define GDI_HANDLE_UPPER_MASK (GDI_HANDLE_TYPE_MASK|GDI_HANDLE_STOCK_MASK|GDI_HANDLE_REUSE_MASK) @@ -33,6 +34,21 @@ #define GDI_ENTRY_REUSE_INC 0x00000100 #define GDI_ENTRY_REUSECNT_SHIFT 8 #define GDI_ENTRY_UPPER_SHIFT 16 + +#define GDI_OBJECT_TAG_DC TAG('G', 'l', 'a', '1') +#define GDI_OBJECT_TAG_REGION TAG('G', 'l', 'a', '4') +#define GDI_OBJECT_TAG_BITMAP TAG('G', 'l', 'a', '5') +#define GDI_OBJECT_TAG_CLIOBJ TAG('G', 'h', '0', '6') +#define GDI_OBJECT_TAG_PATH TAG('G', 'h', '0', '7') +#define GDI_OBJECT_TAG_PALETTE TAG('G', 'l', 'a', '8') +#define GDI_OBJECT_TAG_COLSPC TAG('G', 'h', '0', '9') +#define GDI_OBJECT_TAG_FONT TAG('G', 'l', 'a', ':') +#define GDI_OBJECT_TAG_PFE TAG('G', 'h', '0', '<') +#define GDI_OBJECT_TAG_BRUSH TAG('G', 'l', 'a', '@') +#define GDI_OBJECT_TAG_ENUMFONT TAG('G', 'h', '0', 'F') + +#define GDI_OBJECT_TAG_DDRAW TAG('D', 'h', ' ', '1') +#define GDI_OBJECT_TAG_DDSURF TAG('D', 'h', ' ', '2') /*! \defgroup GDI object types * @@ -40,20 +56,33 @@ * */ /*@{*/ -#define GDI_OBJECT_TYPE_DC 0x00010000 -#define GDI_OBJECT_TYPE_REGION 0x00040000 -#define GDI_OBJECT_TYPE_BITMAP 0x00050000 -#define GDI_OBJECT_TYPE_PALETTE 0x00080000 -#define GDI_OBJECT_TYPE_FONT 0x000a0000 -#define GDI_OBJECT_TYPE_BRUSH 0x00100000 +#define GDI_OBJECT_TYPE_DC 0x00010000 +#define GDI_OBJECT_TYPE_DIRECTDRAW 0x00020000 /* Should be moved away from gdi objects */ +#define GDI_OBJECT_TYPE_DD_SURFACE 0x00030000 /* Should be moved away from gdi objects */ +#define GDI_OBJECT_TYPE_REGION 0x00040000 +#define GDI_OBJECT_TYPE_BITMAP 0x00050000 +#define GDI_OBJECT_TYPE_CLIOBJ 0x00060000 +#define GDI_OBJECT_TYPE_PATH 0x00070000 +#define GDI_OBJECT_TYPE_PALETTE 0x00080000 +#define GDI_OBJECT_TYPE_COLORSPACE 0x00090000 +#define GDI_OBJECT_TYPE_FONT 0x000a0000 + +#define GDI_OBJECT_TYPE_BRUSH 0x00100000 +#define GDI_OBJECT_TYPE_DD_VIDEOPORT 0x00120000 /* Should be moved away from gdi objects */ +#define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00140000 /* Should be moved away from gdi objects */ +#define GDI_OBJECT_TYPE_ENUMFONT 0x00160000 + +/* Following object types are derived types from the above base types + use 0x001f0000 as mask to get the base type */ #define GDI_OBJECT_TYPE_EMF 0x00210000 +#define GDI_OBJECT_TYPE_METAFILE 0x00260000 +#define GDI_OBJECT_TYPE_ENHMETAFILE 0x00460000 #define GDI_OBJECT_TYPE_PEN 0x00300000 #define GDI_OBJECT_TYPE_EXTPEN 0x00500000 -#define GDI_OBJECT_TYPE_COLORSPACE 0x00090000 #define GDI_OBJECT_TYPE_METADC 0x00660000 -#define GDI_OBJECT_TYPE_METAFILE 0x00260000 -#define GDI_OBJECT_TYPE_ENHMETAFILE 0x00460000 -#define GDI_OBJECT_TYPE_ENUMFONT 0x00160000 +/*#define GDI_OBJECT_TYPE_DD_PALETTE 0x00630000 unused at the moment, other value required */ +/*#define GDI_OBJECT_TYPE_DD_CLIPPER 0x00640000 unused at the moment, other value required */ + /* Following object types made up for ROS */ #define GDI_OBJECT_TYPE_DONTCARE 0x007f0000 /** Not really an object type. Forces GDI_FreeObj to be silent. */ Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h Thu Sep 6 04:28:04 2007 @@ -3,13 +3,6 @@ #include <ddrawint.h> #include <ddkernel.h> - -#define GDI_OBJECT_TYPE_DIRECTDRAW 0x00600000 -#define GDI_OBJECT_TYPE_DD_SURFACE 0x00610000 -#define GDI_OBJECT_TYPE_DD_VIDEOPORT 0x00620000 -#define GDI_OBJECT_TYPE_DD_PALETTE 0x00630000 -#define GDI_OBJECT_TYPE_DD_CLIPPER 0x00640000 -#define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00650000 typedef struct {

1 0

[gedmurphy] 28888: don't try to free a NULL pointer
by gedmurphy＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: gedmurphy Date: Thu Sep 6 02:44:46 2007 New Revision: 28888 URL: http://svn.reactos.org/svn/reactos?rev=28888&view=rev Log: don't try to free a NULL pointer Modified: trunk/reactos/base/system/services/config.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c (original) +++ trunk/reactos/base/system/services/config.c Thu Sep 6 02:44:46 2007 @@ -288,7 +288,8 @@ if (dwError != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, ptr); - HeapFree(GetProcessHeap(), 0, expanded); + if (expanded) + HeapFree(GetProcessHeap(), 0, expanded); } return dwError;

1 0

[gedmurphy] 28887: - Implement the RPC server calls for QueryServiceConfig2 and ChangeServiceConfig2 (SmcrChangeServiceConfig2 is untested) - This fixes the retrieval of the service description in servman
by gedmurphy＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: gedmurphy Date: Thu Sep 6 02:35:51 2007 New Revision: 28887 URL: http://svn.reactos.org/svn/reactos?rev=28887&view=rev Log: - Implement the RPC server calls for QueryServiceConfig2 and ChangeServiceConfig2 (SmcrChangeServiceConfig2 is untested) - This fixes the retrieval of the service description in servman Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Thu Sep 6 02:35:51 2007 @@ -2219,8 +2219,93 @@ unsigned char *lpInfo, unsigned long dwInfoSize) { - DPRINT1("ScmrChangeServiceConfig2W() is unimplemented\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD dwError = ERROR_SUCCESS; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + HKEY hServiceKey = NULL; + + DPRINT("ScmrChangeServiceConfig2W() called\n"); + DPRINT("dwInfoLevel = %lu\n", dwInfoLevel); + DPRINT("dwInfoSize = %lu\n", dwInfoSize); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_CHANGE_CONFIG)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* FIXME: Lock database exclusively */ + + if (lpService->bDeleted) + { + /* FIXME: Unlock database */ + DPRINT1("The service has already been marked for delete!\n"); + return ERROR_SERVICE_MARKED_FOR_DELETE; + } + + /* Open the service key */ + dwError = ScmOpenServiceKey(lpService->szServiceName, + KEY_SET_VALUE, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto done; + + if (dwInfoLevel & SERVICE_CONFIG_DESCRIPTION) + { + LPSERVICE_DESCRIPTIONW lpServiceDescription = (LPSERVICE_DESCRIPTIONW)lpInfo; + + if (dwInfoSize != sizeof(*lpServiceDescription)) + { + dwError = ERROR_INVALID_PARAMETER; + goto done; + } + + if (lpServiceDescription != NULL && lpServiceDescription->lpDescription != NULL) + { + RegSetValueExW(hServiceKey, + L"Description", + 0, + REG_SZ, + (LPBYTE)lpServiceDescription->lpDescription, + (wcslen(lpServiceDescription->lpDescription) + 1) * sizeof(WCHAR)); + + if (dwError != ERROR_SUCCESS) + goto done; + } + } + else if (dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS) + { + DPRINT1("SERVICE_CONFIG_FAILURE_ACTIONS not implemented\n"); + dwError = ERROR_CALL_NOT_IMPLEMENTED; + goto done; + } + +done: + /* FIXME: Unlock database */ + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); + + return dwError; } @@ -2247,8 +2332,92 @@ unsigned long cbBufSize, unsigned long *pcbBytesNeeded) { - DPRINT1("ScmrQueryServiceConfig2W() is unimplemented\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD dwError = ERROR_SUCCESS; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + HKEY hServiceKey = NULL; + DWORD dwRequiredSize; + LPWSTR lpDescription = NULL; + + DPRINT("ScmrQueryServiceConfig2W() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_QUERY_CONFIG)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* FIXME: Lock the service database shared */ + + dwError = ScmOpenServiceKey(lpService->lpServiceName, + KEY_READ, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto done; + + if (dwInfoLevel & SERVICE_CONFIG_DESCRIPTION) + { + LPSERVICE_DESCRIPTIONW lpServiceDescription = (LPSERVICE_DESCRIPTIONW)lpBuffer; + LPWSTR lpStr; + + dwError = ScmReadString(hServiceKey, + L"Description", + &lpDescription); + if (dwError != ERROR_SUCCESS) + goto done; + + dwRequiredSize = sizeof(SERVICE_DESCRIPTIONW) + ((wcslen(lpDescription) + 1) * sizeof(WCHAR)); + + if (cbBufSize < dwRequiredSize) + { + *pcbBytesNeeded = dwRequiredSize; + dwError = ERROR_INSUFFICIENT_BUFFER; + goto done; + } + else + { + lpStr = (LPWSTR)(lpServiceDescription + 1); + wcscpy(lpStr, lpDescription); + lpServiceDescription->lpDescription = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceDescription); + } + } + else if (dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS) + { + DPRINT1("SERVICE_CONFIG_FAILURE_ACTIONS not implemented\n"); + dwError = ERROR_CALL_NOT_IMPLEMENTED; + goto done; + } + +done: + if (lpDescription != NULL) + HeapFree(GetProcessHeap(), 0, lpDescription); + + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + /* FIXME: Unlock database */ + + DPRINT("ScmrQueryServiceConfig2W() done (Error %lu)\n", dwError); + + return dwError; }

1 0

[fireball] 28886: - Fix IntEaLength's type (ULONG -> LONG), so it could actually become negative, and corresponding check will be performed.
by fireball＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: fireball Date: Thu Sep 6 01:35:09 2007 New Revision: 28886 URL: http://svn.reactos.org/svn/reactos?rev=28886&view=rev Log: - Fix IntEaLength's type (ULONG -> LONG), so it could actually become negative, and corresponding check will be performed. Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c Thu Sep 6 01:35:09 2007 @@ -139,7 +139,8 @@ OUT PULONG ErrorOffset) { PFILE_FULL_EA_INFORMATION EaBufferEnd; - ULONG NextEaBufferOffset, IntEaLength; + ULONG NextEaBufferOffset; + LONG IntEaLength; /* Lenght of the rest. Inital equal to EaLength */ IntEaLength = EaLength;

1 0

[fireball] 28885: UINT -> ULONG
by fireball＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: fireball Date: Thu Sep 6 01:32:04 2007 New Revision: 28885 URL: http://svn.reactos.org/svn/reactos?rev=28885&view=rev Log: UINT -> ULONG Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c trunk/reactos/ntoskrnl/kdbg/kdb_serial.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.h?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.h (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.h Thu Sep 6 01:32:04 2007 @@ -249,11 +249,11 @@ #define KdbpGetCharKeyboard(ScanCode) KdbpTryGetCharKeyboard(ScanCode, 0) CHAR -KdbpTryGetCharKeyboard(PULONG ScanCode, UINT Retry); +KdbpTryGetCharKeyboard(PULONG ScanCode, ULONG Retry); #define KdbpGetCharSerial() KdbpTryGetCharSerial(0) CHAR -KdbpTryGetCharSerial(UINT Retry); +KdbpTryGetCharSerial(ULONG Retry); VOID KdbEnter(VOID); Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_keyboard… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c Thu Sep 6 01:32:04 2007 @@ -62,7 +62,7 @@ } CHAR -KdbpTryGetCharKeyboard(PULONG ScanCode, UINT Retry) +KdbpTryGetCharKeyboard(PULONG ScanCode, ULONG Retry) { static byte_t last_key = 0; static byte_t shift = 0; Modified: trunk/reactos/ntoskrnl/kdbg/kdb_serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_serial.c… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_serial.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_serial.c Thu Sep 6 01:32:04 2007 @@ -17,7 +17,7 @@ #include <debug.h> CHAR -KdbpTryGetCharSerial(UINT Retry) +KdbpTryGetCharSerial(ULONG Retry) { CHAR Result = -1;

1 0

[janderwald] 28884: - delete pidfile if it exists before launching emulator - delete pidfile on exit - close pidfile on failure
by janderwald＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: janderwald Date: Thu Sep 6 01:00:32 2007 New Revision: 28884 URL: http://svn.reactos.org/svn/reactos?rev=28884&view=rev Log: - delete pidfile if it exists before launching emulator - delete pidfile on exit - close pidfile on failure Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp 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 Sep 6 01:00:32 2007 @@ -578,22 +578,19 @@ return false; } } + if (m_PidFile.length () && isFileExisting(m_PidFile)) + { + cerr << "Deleting pid file " << m_PidFile << endl; + _tremove(m_PidFile.c_str ()); + } + cerr << "Opening Data Source:" << m_BootCmd << endl; - -/* -#ifdef __LINUX__ - _tremove(m_PidFile.c_str ()); - m_DataSource = new PipeReader(); - m_Src = m_BootCmd; -#else -*/ m_DataSource = new NamedPipeReader(); if (!executeBootCmd()) { cerr << "Error: failed to launch emulator with: " << m_BootCmd << endl; return false; } -//#endif return true; } @@ -647,6 +644,11 @@ } delete m_DataSource; m_DataSource = NULL; + + if (m_PidFile.length ()) + { + _tremove(m_PidFile.c_str ()); + } } //--------------------------------------------------------------------------------------- @@ -720,6 +722,7 @@ if (!fread(buffer, 1, sizeof(buffer), file)) { cerr << "Error: pid file w/o pid!!! " << endl; + fclose(file); cleanup(); return false; }

1 0

[tkreuzer] 28883: New implementation of EnumFontFamiliesExW, based on NtGdiEnumFontXxx, does not work on ros, because those apis are not implemented yet, but it works on Windows XP.
by tkreuzer＠svn.reactos.org 05 Sep '07

05 Sep '07

Author: tkreuzer Date: Wed Sep 5 23:32:37 2007 New Revision: 28883 URL: http://svn.reactos.org/svn/reactos?rev=28883&view=rev Log: New implementation of EnumFontFamiliesExW, based on NtGdiEnumFontXxx, does not work on ros, because those apis are not implemented yet, but it works on Windows XP. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Wed Sep 5 23:32:37 2007 @@ -1310,6 +1310,70 @@ #endif } - - - +#define EfdFontFamilies 3 + +INT +STDCALL +NewEnumFontFamiliesExW( + HDC hDC, + LPLOGFONTW lpLogfont, + FONTENUMPROCW lpEnumFontFamExProcW, + LPARAM lParam, + DWORD dwFlags) +{ + ULONG_PTR idEnum, ulCount, ulSize; + PENUMFONTDATAW pEfdw; + PBYTE pBuffer; + PBYTE pMax; + INT ret = 1; + + idEnum = NtGdiEnumFontOpen(hDC, + EfdFontFamilies, + 0, + LF_FACESIZE, + lpLogfont->lfFaceName, + lpLogfont->lfCharSet, + &ulCount); + if (idEnum == 0) + { + return 0; + } + if (ulCount == 0) + { + NtGdiEnumFontClose(idEnum); + return 0; + } + + pBuffer = HeapAlloc(GetProcessHeap(), 0, ulCount); + if (pBuffer == NULL) + { + NtGdiEnumFontClose(idEnum); + return 0; + } + pMax = pBuffer + ulCount; + + if (!NtGdiEnumFontChunk(hDC, idEnum, ulCount, &ulSize, (PVOID)pBuffer)) + { + HeapFree(GetProcessHeap(), 0, pBuffer); + NtGdiEnumFontClose(idEnum); + return 0; + } + + /* Iterate through the structures */ + for (pEfdw = (PENUMFONTDATAW)pBuffer; + (PBYTE)pEfdw < pMax && pEfdw->cbSize != 0 && ret != 0; + pEfdw = (PENUMFONTDATAW)((PBYTE)pEfdw + pEfdw->cbSize)) + { + ENUMLOGFONTEXW *pElfew = &pEfdw->efdi.elfex; + NEWTEXTMETRICEXW *pNtmew = (NEWTEXTMETRICEXW*)((PBYTE)&pEfdw->efdi + pEfdw->efdi.cbSize + sizeof(DWORD)); // FIXME + DWORD dwFontType = pEfdw->efdi.dwFontType; + ret = lpEnumFontFamExProcW(pElfew, pNtmew, dwFontType, lParam); + } + + HeapFree(GetProcessHeap(), 0, pBuffer); + NtGdiEnumFontClose(idEnum); + + return ret; +} + +

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