Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[fireball] 32112: - Make other filesystems use the new heap mm routines.
by fireball＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: fireball Date: Mon Feb 4 12:37:59 2008 New Revision: 32112 URL: http://svn.reactos.org/svn/reactos?rev=32112&view=rev Log: - Make other filesystems use the new heap mm routines. Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Mon Feb 4 12:37:59 2008 @@ -106,7 +106,7 @@ { if (TempExt2FileInfo.FileBlockList != NULL) { - MmFreeMemory(TempExt2FileInfo.FileBlockList); + MmHeapFree(TempExt2FileInfo.FileBlockList); } return NULL; @@ -148,20 +148,20 @@ if (TempExt2FileInfo.FileBlockList != NULL) { - MmFreeMemory(TempExt2FileInfo.FileBlockList); + MmHeapFree(TempExt2FileInfo.FileBlockList); } return Ext2OpenFile(FullPath); } else { - FileHandle = MmAllocateMemory(sizeof(EXT2_FILE_INFO)); + FileHandle = MmHeapAlloc(sizeof(EXT2_FILE_INFO)); if (FileHandle == NULL) { if (TempExt2FileInfo.FileBlockList != NULL) { - MmFreeMemory(TempExt2FileInfo.FileBlockList); + MmHeapFree(TempExt2FileInfo.FileBlockList); } return NULL; @@ -230,11 +230,11 @@ // if (!Ext2SearchDirectoryBufferForFile(DirectoryBuffer, (ULONG)Ext2GetInodeFileSize(&InodeData), PathPart, &DirectoryEntry)) { - MmFreeMemory(DirectoryBuffer); - return FALSE; - } - - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); + return FALSE; + } + + MmHeapFree(DirectoryBuffer); DirectoryInode = DirectoryEntry.inode; } @@ -581,7 +581,7 @@ // if (Ext2SuperBlock != NULL) { - MmFreeMemory(Ext2SuperBlock); + MmHeapFree(Ext2SuperBlock); Ext2SuperBlock = NULL; } @@ -589,7 +589,7 @@ // // Now allocate the memory to hold the super block // - Ext2SuperBlock = (PEXT2_SUPER_BLOCK)MmAllocateMemory(1024); + Ext2SuperBlock = (PEXT2_SUPER_BLOCK)MmHeapAlloc(1024); // // Make sure we got the memory @@ -744,7 +744,7 @@ // if (Ext2GroupDescriptors != NULL) { - MmFreeMemory(Ext2GroupDescriptors); + MmHeapFree(Ext2GroupDescriptors); Ext2GroupDescriptors = NULL; } @@ -753,7 +753,7 @@ // Now allocate the memory to hold the group descriptors // GroupDescBlockCount = ROUND_UP(Ext2GroupCount, Ext2GroupDescPerBlock) / Ext2GroupDescPerBlock; - Ext2GroupDescriptors = (PEXT2_GROUP_DESC)MmAllocateMemory(GroupDescBlockCount * Ext2BlockSizeInBytes); + Ext2GroupDescriptors = (PEXT2_GROUP_DESC)MmHeapAlloc(GroupDescBlockCount * Ext2BlockSizeInBytes); // // Make sure we got the memory @@ -812,14 +812,14 @@ // // Now allocate the memory to hold the group descriptors // - *DirectoryBuffer = (PEXT2_DIR_ENTRY)MmAllocateMemory(DirectoryFileInfo.FileSize); + *DirectoryBuffer = (PEXT2_DIR_ENTRY)MmHeapAlloc(DirectoryFileInfo.FileSize); // // Make sure we got the memory // if (*DirectoryBuffer == NULL) { - MmFreeMemory(DirectoryFileInfo.FileBlockList); + MmHeapFree(DirectoryFileInfo.FileBlockList); FileSystemError("Out of memory."); return FALSE; } @@ -827,13 +827,13 @@ // Now read the root directory data if (!Ext2ReadFileBig(&DirectoryFileInfo, DirectoryFileInfo.FileSize, NULL, *DirectoryBuffer)) { - MmFreeMemory(*DirectoryBuffer); + MmHeapFree(*DirectoryBuffer); *DirectoryBuffer = NULL; - MmFreeMemory(DirectoryFileInfo.FileBlockList); - return FALSE; - } - - MmFreeMemory(DirectoryFileInfo.FileBlockList); + MmHeapFree(DirectoryFileInfo.FileBlockList); + return FALSE; + } + + MmHeapFree(DirectoryFileInfo.FileBlockList); return TRUE; } @@ -1023,7 +1023,7 @@ BlockCount = (FileSize / Ext2BlockSizeInBytes); // Allocate the memory for the block list - BlockList = MmAllocateMemory(BlockCount * sizeof(ULONG)); + BlockList = MmHeapAlloc(BlockCount * sizeof(ULONG)); if (BlockList == NULL) { return NULL; @@ -1044,7 +1044,7 @@ { if (!Ext2CopyIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->i_block[EXT3_IND_BLOCK])) { - MmFreeMemory(BlockList); + MmHeapFree(BlockList); return FALSE; } } @@ -1054,7 +1054,7 @@ { if (!Ext2CopyDoubleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->i_block[EXT3_DIND_BLOCK])) { - MmFreeMemory(BlockList); + MmHeapFree(BlockList); return FALSE; } } @@ -1064,7 +1064,7 @@ { if (!Ext2CopyTripleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->i_block[EXT3_TIND_BLOCK])) { - MmFreeMemory(BlockList); + MmHeapFree(BlockList); return FALSE; } } @@ -1118,7 +1118,7 @@ BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); - BlockBuffer = (ULONG*)MmAllocateMemory(Ext2BlockSizeInBytes); + BlockBuffer = (ULONG*)MmHeapAlloc(Ext2BlockSizeInBytes); if (BlockBuffer == NULL) { return FALSE; @@ -1126,7 +1126,7 @@ if (!Ext2ReadBlock(DoubleIndirectBlock, BlockBuffer)) { - MmFreeMemory(BlockBuffer); + MmHeapFree(BlockBuffer); return FALSE; } @@ -1134,12 +1134,12 @@ { if (!Ext2CopyIndirectBlockPointers(BlockList, CurrentBlockInList, BlockCount, BlockBuffer[CurrentBlock])) { - MmFreeMemory(BlockBuffer); - return FALSE; - } - } - - MmFreeMemory(BlockBuffer); + MmHeapFree(BlockBuffer); + return FALSE; + } + } + + MmHeapFree(BlockBuffer); return TRUE; } @@ -1153,7 +1153,7 @@ BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); - BlockBuffer = (ULONG*)MmAllocateMemory(Ext2BlockSizeInBytes); + BlockBuffer = (ULONG*)MmHeapAlloc(Ext2BlockSizeInBytes); if (BlockBuffer == NULL) { return FALSE; @@ -1161,7 +1161,7 @@ if (!Ext2ReadBlock(TripleIndirectBlock, BlockBuffer)) { - MmFreeMemory(BlockBuffer); + MmHeapFree(BlockBuffer); return FALSE; } @@ -1169,12 +1169,12 @@ { if (!Ext2CopyDoubleIndirectBlockPointers(BlockList, CurrentBlockInList, BlockCount, BlockBuffer[CurrentBlock])) { - MmFreeMemory(BlockBuffer); - return FALSE; - } - } - - MmFreeMemory(BlockBuffer); + MmHeapFree(BlockBuffer); + return FALSE; + } + } + + MmHeapFree(BlockBuffer); return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c Mon Feb 4 12:37:59 2008 @@ -265,7 +265,7 @@ return NULL; } - FileHandle = MmAllocateMemory(sizeof(ISO_FILE_INFO)); + FileHandle = MmHeapAlloc(sizeof(ISO_FILE_INFO)); if (FileHandle == NULL) { Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Mon Feb 4 12:37:59 2008 @@ -89,7 +89,7 @@ { PNTFS_ATTR_CONTEXT Context; - Context = MmAllocateMemory(FIELD_OFFSET(NTFS_ATTR_CONTEXT, Record) + AttrRecord->Length); + Context = MmHeapAlloc(FIELD_OFFSET(NTFS_ATTR_CONTEXT, Record) + AttrRecord->Length); RtlCopyMemory(&Context->Record, AttrRecord, AttrRecord->Length); if (AttrRecord->IsNonResident) { @@ -120,7 +120,7 @@ static VOID NtfsReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context) { - MmFreeMemory(Context); + MmHeapFree(Context); } /* FIXME: Optimize for multisector reads. */ @@ -338,7 +338,7 @@ ListContext = NtfsPrepareAttributeContext(AttrRecord); ListSize = NtfsGetAttributeSize(&ListContext->Record); - ListBuffer = MmAllocateMemory(ListSize); + ListBuffer = MmHeapAlloc(ListSize); ListAttrRecord = (PNTFS_ATTR_RECORD)ListBuffer; ListAttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)ListBuffer + ListSize); @@ -349,7 +349,7 @@ Type, Name, NameLength); NtfsReleaseAttributeContext(ListContext); - MmFreeMemory(ListBuffer); + MmHeapFree(ListBuffer); if (Context != NULL) return Context; @@ -495,7 +495,7 @@ ULONG RecordOffset; ULONG IndexBlockSize; - MftRecord = MmAllocateMemory(NtfsMftRecordSize); + MftRecord = MmHeapAlloc(NtfsMftRecordSize); if (MftRecord == NULL) { return FALSE; @@ -508,14 +508,14 @@ IndexRootCtx = NtfsFindAttribute(MftRecord, NTFS_ATTR_TYPE_INDEX_ROOT, L"$I30"); if (IndexRootCtx == NULL) { - MmFreeMemory(MftRecord); + MmHeapFree(MftRecord); return FALSE; } - IndexRecord = MmAllocateMemory(NtfsIndexRecordSize); + IndexRecord = MmHeapAlloc(NtfsIndexRecordSize); if (IndexRecord == NULL) { - MmFreeMemory(MftRecord); + MmHeapFree(MftRecord); return FALSE; } @@ -534,8 +534,8 @@ if (NtfsCompareFileName(FileName, IndexEntry)) { *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; - MmFreeMemory(IndexRecord); - MmFreeMemory(MftRecord); + MmHeapFree(IndexRecord); + MmHeapFree(MftRecord); return TRUE; } IndexEntry = (PNTFS_INDEX_ENTRY)((PCHAR)IndexEntry + IndexEntry->Length); @@ -551,16 +551,16 @@ if (IndexBitmapCtx == NULL) { DbgPrint((DPRINT_FILESYSTEM, "Corrupted filesystem!\n")); - MmFreeMemory(MftRecord); + MmHeapFree(MftRecord); return FALSE; } BitmapDataSize = NtfsGetAttributeSize(&IndexBitmapCtx->Record); DbgPrint((DPRINT_FILESYSTEM, "BitmapDataSize: %x\n", BitmapDataSize)); - BitmapData = MmAllocateMemory(BitmapDataSize); + BitmapData = MmHeapAlloc(BitmapDataSize); if (BitmapData == NULL) { - MmFreeMemory(IndexRecord); - MmFreeMemory(MftRecord); + MmHeapFree(IndexRecord); + MmHeapFree(MftRecord); return FALSE; } NtfsReadAttribute(IndexBitmapCtx, 0, BitmapData, BitmapDataSize); @@ -570,9 +570,9 @@ if (IndexAllocationCtx == NULL) { DbgPrint((DPRINT_FILESYSTEM, "Corrupted filesystem!\n")); - MmFreeMemory(BitmapData); - MmFreeMemory(IndexRecord); - MmFreeMemory(MftRecord); + MmHeapFree(BitmapData); + MmHeapFree(IndexRecord); + MmHeapFree(MftRecord); return FALSE; } IndexAllocationSize = NtfsGetAttributeSize(&IndexAllocationCtx->Record); @@ -614,9 +614,9 @@ { DbgPrint((DPRINT_FILESYSTEM, "File found\n")); *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; - MmFreeMemory(BitmapData); - MmFreeMemory(IndexRecord); - MmFreeMemory(MftRecord); + MmHeapFree(BitmapData); + MmHeapFree(IndexRecord); + MmHeapFree(MftRecord); NtfsReleaseAttributeContext(IndexAllocationCtx); return TRUE; } @@ -627,16 +627,16 @@ } NtfsReleaseAttributeContext(IndexAllocationCtx); - MmFreeMemory(BitmapData); - } - - MmFreeMemory(IndexRecord); + MmHeapFree(BitmapData); + } + + MmHeapFree(IndexRecord); } else { DbgPrint((DPRINT_FILESYSTEM, "Can't read MFT record\n")); } - MmFreeMemory(MftRecord); + MmHeapFree(MftRecord); return FALSE; } @@ -703,7 +703,7 @@ return FALSE; } - NtfsBootSector = MmAllocateMemory(NtfsBootSector->BytesPerSector); + NtfsBootSector = MmHeapAlloc(NtfsBootSector->BytesPerSector); if (NtfsBootSector == NULL) { return FALSE; @@ -740,10 +740,10 @@ return FALSE; } - NtfsMasterFileTable = MmAllocateMemory(NtfsMftRecordSize); + NtfsMasterFileTable = MmHeapAlloc(NtfsMftRecordSize); if (NtfsMasterFileTable == NULL) { - MmFreeMemory(NtfsBootSector); + MmHeapFree(NtfsBootSector); return FALSE; } @@ -765,7 +765,7 @@ PNTFS_FILE_HANDLE FileHandle; PNTFS_MFT_RECORD MftRecord; - FileHandle = MmAllocateMemory(sizeof(NTFS_FILE_HANDLE) + NtfsMftRecordSize); + FileHandle = MmHeapAlloc(sizeof(NTFS_FILE_HANDLE) + NtfsMftRecordSize); if (FileHandle == NULL) { return NULL; @@ -774,7 +774,7 @@ MftRecord = (PNTFS_MFT_RECORD)(FileHandle + 1); if (!NtfsLookupFile(FileName, MftRecord, &FileHandle->DataContext)) { - MmFreeMemory(FileHandle); + MmHeapFree(FileHandle); return NULL; } @@ -787,7 +787,7 @@ { PNTFS_FILE_HANDLE FileHandle = (PNTFS_FILE_HANDLE)File; NtfsReleaseAttributeContext(FileHandle->DataContext); - MmFreeMemory(FileHandle); + MmHeapFree(FileHandle); } BOOLEAN NtfsReadFile(FILE *File, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer)

1 0

[tkreuzer] 32111: - recurse into IntGdiDeleteDC directly, instead of going back to NtGdiDeleteObjectApp and pass Force parameter on. - add a FIXME for dangerous code
by tkreuzer＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: tkreuzer Date: Mon Feb 4 06:31:09 2008 New Revision: 32111 URL: http://svn.reactos.org/svn/reactos?rev=32111&view=rev Log: - recurse into IntGdiDeleteDC directly, instead of going back to NtGdiDeleteObjectApp and pass Force parameter on. - add a FIXME for dangerous code Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Feb 4 06:31:09 2008 @@ -961,7 +961,7 @@ DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC)); DCToDelete->saveLevel--; DC_UnlockDc( savedDC ); - NtGdiDeleteObjectApp (savedHDC); + IntGdiDeleteDC(savedHDC, Force); } /* Free GDI resources allocated to this DC */ @@ -2475,7 +2475,7 @@ { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - + // FIXME: dc could have been deleted!!! use GDIOBJ_InsertUserData if (NT_SUCCESS(Status)) { RtlZeroMemory(NewMem, MemSize);

1 0

[tkreuzer] 32110: - simplify a check - fix a check - fix a region leak - don't abuse GDIOBJ_LockObj to validate a handle, use GDIOBJ_ValidateHandle instead - add some additional debug output
by tkreuzer＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: tkreuzer Date: Mon Feb 4 06:22:27 2008 New Revision: 32110 URL: http://svn.reactos.org/svn/reactos?rev=32110&view=rev Log: - simplify a check - fix a check - fix a region leak - don't abuse GDIOBJ_LockObj to validate a handle, use GDIOBJ_ValidateHandle instead - add some additional debug output Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Mon Feb 4 06:22:27 2008 @@ -485,7 +485,7 @@ else { Dce = Window->Dce; - if (NULL != Dce && Dce->hwndCurrent == (Window ? Window->hSelf : NULL)) + if (Dce->hwndCurrent == Window->hSelf) { UpdateVisRgn = FALSE; /* updated automatically, via DCHook() */ } @@ -511,7 +511,7 @@ if (0 == (Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && NULL != ClipRegion) { - if (Flags & DCX_KEEPCLIPRGN) + if (!(Flags & DCX_KEEPCLIPRGN)) NtGdiDeleteObject(ClipRegion); ClipRegion = NULL; } @@ -520,7 +520,6 @@ if (NULL != Dce->hClipRgn) { DceDeleteClipRgn(Dce); - Dce->hClipRgn = NULL; } #endif @@ -541,6 +540,7 @@ { Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); } + Dce->DCXFlags &= ~DCX_KEEPCLIPRGN; } else if (ClipRegion != NULL) { @@ -715,8 +715,8 @@ } } - dc = DC_LockDc(pDCE->hDC); - if (dc == NULL) + if (!GDIOBJ_ValidateHandle(pDCE->hDC, GDI_OBJECT_TYPE_DC) || + (dc = DC_LockDc(pDCE->hDC)) == NULL) { pDCE = (PDCE) pDCE->List.Flink; continue; 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 Mon Feb 4 06:22:27 2008 @@ -857,6 +857,12 @@ /* Check for invalid owner. */ if (ProcessId != HandleProcessId && HandleProcessId != NULL) { + DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId); +#ifdef GDI_DEBUG + KeRosDumpStackFrames(NULL, 20); +// DPRINT1("Handle allocator:\n"); +// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); +#endif return NULL; }

1 0

[tkreuzer] 32109: - remove GDIOB_XxxDbg functions - enhance backtracing and debug output for GDI_DEBUG - implement GDIOBJ_ValidateHandle() Stack record dumping is commented out atm due to missing support from ntoskrnl
by tkreuzer＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: tkreuzer Date: Mon Feb 4 06:17:37 2008 New Revision: 32109 URL: http://svn.reactos.org/svn/reactos?rev=32109&view=rev Log: - remove GDIOB_XxxDbg functions - enhance backtracing and debug output for GDI_DEBUG - implement GDIOBJ_ValidateHandle() Stack record dumping is commented out atm due to missing support from ntoskrnl Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Mon Feb 4 06:17:37 2008 @@ -72,27 +72,11 @@ #define GDIOBJ_GetObjectType(Handle) \ GDI_HANDLE_GET_TYPE(Handle) -#ifdef GDI_DEBUG - -/* a couple macros for debugging GDIOBJ locking */ -#define GDIOBJ_AllocObj(ht,ty) GDIOBJ_AllocObjDbg(ht,__FILE__,__LINE__,ty) -#define GDIOBJ_FreeObj(ht,obj,ty) GDIOBJ_FreeObjDbg(ht,__FILE__,__LINE__,obj,ty) -#define GDIOBJ_LockObj(ht,obj,ty) GDIOBJ_LockObjDbg(ht,__FILE__,__LINE__,obj,ty) -#define GDIOBJ_ShareLockObj(ht,obj,ty) GDIOBJ_ShareLockObjDbg(ht,__FILE__,__LINE__,obj,ty) - -HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, ULONG ObjectType); -BOOL INTERNAL_CALL GDIOBJ_FreeObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); -PGDIOBJ INTERNAL_CALL GDIOBJ_LockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); -PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); - -#else /* !GDI_DEBUG */ - +BOOL INTERNAL_CALL GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType); HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObj(PGDI_HANDLE_TABLE HandleTable, ULONG ObjectType); BOOL INTERNAL_CALL GDIOBJ_FreeObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType); - -#endif /* GDI_DEBUG */ PVOID INTERNAL_CALL GDI_MapHandleTable(PSECTION_OBJECT SectionObject, PEPROCESS Process); 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 Mon Feb 4 06:17:37 2008 @@ -28,12 +28,11 @@ #include <debug.h> /* FIXME include right header for KeRosDumpStackFrames */ -VOID -NTAPI -KeRosDumpStackFrames( - PULONG Frame, - ULONG FrameCount -); +VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); + +#ifdef GDI_DEBUG +BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); +#endif #define GDI_ENTRY_TO_INDEX(ht, e) \ (((ULONG_PTR)(e) - (ULONG_PTR)&((ht)->Entries[0])) / sizeof(GDI_TABLE_ENTRY)) @@ -109,11 +108,6 @@ DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) -#ifdef GDI_DEBUG -BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); -VOID STDCALL KeRosDumpStackFrames(PULONG Frame, ULONG FrameCount); -#endif - /*! * Allocate GDI object table. * \param Size - number of entries in the object table. @@ -207,6 +201,7 @@ static int leak_reported = 0; #define GDI_STACK_LEVELS 12 static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS]; +static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS]; struct DbgOpenGDIHandle { ULONG idx; @@ -383,6 +378,23 @@ } +BOOL +INTERNAL_CALL +GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType) +{ + PGDI_TABLE_ENTRY Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, hObj); + if((((ULONG_PTR)hObj & GDI_HANDLE_TYPE_MASK) == ObjectType) && + (Entry->Type << GDI_ENTRY_UPPER_SHIFT) == GDI_HANDLE_GET_UPPER(hObj)) + { + HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); + if(pid == NULL || pid == PsGetCurrentProcessId()) + { + return TRUE; + } + } + return FALSE; +} + /*! * Allocate memory for GDI object and return handle to it. * @@ -394,11 +406,7 @@ * \todo return the object pointer and lock it by default. */ HGDIOBJ INTERNAL_CALL -#ifdef GDI_DEBUG -GDIOBJ_AllocObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, ULONG ObjectType) -#else /* !GDI_DEBUG */ GDIOBJ_AllocObj(PGDI_HANDLE_TABLE HandleTable, ULONG ObjectType) -#endif /* GDI_DEBUG */ { PW32PROCESS W32Process; PGDIOBJHDR newObject = NULL; @@ -445,13 +453,6 @@ 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)); @@ -487,8 +488,8 @@ (void)InterlockedExchangePointer(&Entry->ProcessId, CurrentProcessId); #ifdef GDI_DEBUG - memset ( GDIHandleAllocator[Index], 0xcd, GDI_STACK_LEVELS * sizeof(ULONG) ); - RtlCaptureStackBackTrace(2, GDI_STACK_LEVELS, (PVOID*)GDIHandleAllocator[Index], NULL); + memset ( GDIHandleAllocator[Index], 0x00, GDI_STACK_LEVELS * sizeof(ULONG) ); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleAllocator[Index], NULL); #endif /* GDI_DEBUG */ if(W32Process != NULL) @@ -548,11 +549,7 @@ * to the calling process. */ BOOL INTERNAL_CALL -#ifdef GDI_DEBUG -GDIOBJ_FreeObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) -#else /* !GDI_DEBUG */ GDIOBJ_FreeObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) -#endif /* GDI_DEBUG */ { PGDI_TABLE_ENTRY Entry; PPAGED_LOOKASIDE_LIST LookasideList; @@ -569,7 +566,8 @@ { DPRINT1("GDIOBJ_FreeObj() failed, can't delete stock object handle: 0x%x !!!\n", hObj); #ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); + DPRINT1("-> called from:\n"); + KeRosDumpStackFrames(NULL, 20); #endif return FALSE; } @@ -655,7 +653,8 @@ */ DPRINT1("GdiHdr->Locks: %d\n", GdiHdr->Locks); #ifdef GDI_DEBUG - DPRINT1("Locked from: %s:%d\n", GdiHdr->lockfile, GdiHdr->lockline); +// DPRINT1("Locked from:\n"); +// KeRosDumpStackFrames(GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); #endif ASSERT(FALSE); } @@ -688,15 +687,16 @@ { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId); - KeRosDumpStackFrames(NULL, 20); } else { DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); + } +#ifdef GDI_DEBUG + DPRINT1("-> called from:\n"); KeRosDumpStackFrames(NULL, 20); - } -#ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); +// DPRINT1("Allocated from:\n"); +// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); #endif } } @@ -818,11 +818,7 @@ * \todo Get rid of the ExpectedType parameter! */ PGDIOBJ INTERNAL_CALL -#ifdef GDI_DEBUG -GDIOBJ_LockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) -#else /* !GDI_DEBUG */ GDIOBJ_LockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) -#endif /* GDI_DEBUG */ { ULONG HandleIndex; PGDI_TABLE_ENTRY Entry; @@ -847,6 +843,11 @@ { DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", hObj, HandleType, ExpectedType); +#ifdef GDI_DEBUG + KeRosDumpStackFrames(NULL, 20); +// DPRINT1("Allocated from:\n"); +// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); +#endif return NULL; } @@ -898,8 +899,8 @@ GdiHdr->LockingThread = Thread; GdiHdr->Locks = 1; #ifdef GDI_DEBUG - GdiHdr->lockfile = file; - GdiHdr->lockline = line; + memset(GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], NULL); #endif Object = Entry->KernelData; } @@ -928,7 +929,8 @@ LockErrorDebugOutput(hObj, Entry, "GDIOBJ_LockObj"); #ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); + DPRINT1("-> called from:\n"); + KeRosDumpStackFrames(NULL, 20); #endif } @@ -966,11 +968,7 @@ * \todo Get rid of the ExpectedType parameter! */ PGDIOBJ INTERNAL_CALL -#ifdef GDI_DEBUG -GDIOBJ_ShareLockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) -#else /* !GDI_DEBUG */ GDIOBJ_ShareLockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) -#endif /* GDI_DEBUG */ { ULONG HandleIndex; PGDI_TABLE_ENTRY Entry; @@ -1043,8 +1041,8 @@ #ifdef GDI_DEBUG if (InterlockedIncrement((PLONG)&GdiHdr->Locks) == 1) { - GdiHdr->lockfile = file; - GdiHdr->lockline = line; + memset(GDIHandleLocker[HandleIndex], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[HandleIndex], NULL); } #else InterlockedIncrement((PLONG)&GdiHdr->Locks); @@ -1060,7 +1058,8 @@ LockErrorDebugOutput(hObj, Entry, "GDIOBJ_ShareLockObj"); #ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); + DPRINT1("-> called from:\n"); + KeRosDumpStackFrames(NULL, 20); #endif } @@ -1099,8 +1098,8 @@ #ifdef GDI_DEBUG if (InterlockedDecrement((PLONG)&GdiHdr->Locks) == 0) { - GdiHdr->lockfile = NULL; - GdiHdr->lockline = 0; + memset(GDIHandleLocker[GDI_HANDLE_GET_INDEX(Object)], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(Object)], NULL); } #else if (InterlockedDecrement((PLONG)&GdiHdr->Locks) < 0) @@ -1234,7 +1233,7 @@ { if(GdiHdr->lockfile != NULL) { - DPRINT1("[%d]Locked %s:%i by 0x%x (we're 0x%x)\n", Attempts, GdiHdr->lockfile, GdiHdr->lockline, PrevThread, Thread); + DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); } } #endif @@ -1356,10 +1355,7 @@ #ifdef GDI_DEBUG if(++Attempts > 20) { - if(GdiHdr->lockfile != NULL) - { - DPRINT1("[%d]Locked from %s:%i by 0x%x (we're 0x%x)\n", Attempts, GdiHdr->lockfile, GdiHdr->lockline, PrevThread, Thread); - } + DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); } #endif /* WTF?! The object is already locked by a different thread! @@ -1475,10 +1471,7 @@ #ifdef GDI_DEBUG if(++Attempts > 20) { - if(GdiHdr->lockfile != NULL) - { - DPRINT1("[%d]Locked from %s:%i by 0x%x (we're 0x%x)\n", Attempts, GdiHdr->lockfile, GdiHdr->lockline, PrevThread, Thread); - } + DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); } #endif /* WTF?! The object is already locked by a different thread!

1 0

[fireball] 32108: - Revert 32105 to make trunk bootable, as agreed with Colin.
by fireball＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: fireball Date: Mon Feb 4 00:47:35 2008 New Revision: 32108 URL: http://svn.reactos.org/svn/reactos?rev=32108&view=rev Log: - Revert 32105 to make trunk bootable, as agreed with Colin. Modified: trunk/reactos/tools/rsym.c trunk/reactos/tools/rsym.h trunk/reactos/tools/rsym.mak Modified: trunk/reactos/tools/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.c?rev=32108&r1=… ============================================================================== --- trunk/reactos/tools/rsym.c (original) +++ trunk/reactos/tools/rsym.c Mon Feb 4 00:47:35 2008 @@ -490,7 +490,7 @@ *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); if (NULL == *ProcessedRelocs) { - fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (UINT)RelocSectionHeader->SizeOfRawData); + fprintf(stderr, "Failed to allocate %lu bytes for relocations\n", RelocSectionHeader->SizeOfRawData); return 1; } *ProcessedRelocsLength = 0; @@ -566,7 +566,7 @@ OutHeader = malloc(StartOfRawData); if (NULL == OutHeader) { - fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (UINT)StartOfRawData); + fprintf(stderr, "Failed to allocate %lu bytes for output file header\n", StartOfRawData); return 1; } memset(OutHeader, '\0', StartOfRawData); @@ -679,7 +679,7 @@ PaddedRosSym = malloc(RosSymFileLength); if (NULL == PaddedRosSym) { - fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (UINT)RosSymFileLength); + fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", RosSymFileLength); return 1; } memcpy(PaddedRosSym, RosSymSection, RosSymLength); Modified: trunk/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=32108&r1=… ============================================================================== --- trunk/reactos/tools/rsym.h (original) +++ trunk/reactos/tools/rsym.h Mon Feb 4 00:47:35 2008 @@ -10,7 +10,28 @@ #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -#include <host/typedefs.h> +typedef unsigned char BYTE; +typedef unsigned char UCHAR; +typedef unsigned short WORD; +typedef unsigned short USHORT; +#if defined(__x86_64__) && defined(unix) +typedef signed int LONG; +typedef unsigned int ULONG; +typedef unsigned int DWORD; +#else +typedef signed long LONG; +typedef unsigned long ULONG; +typedef unsigned long DWORD; +#endif +#if defined(_WIN64) +typedef unsigned __int64 ULONG_PTR; +#else +#if defined(__x86_64__) && defined(unix) +typedef unsigned int ULONG_PTR; +#else +typedef unsigned long ULONG_PTR; +#endif +#endif #pragma pack(2) typedef struct _IMAGE_DOS_HEADER { Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=32108&r… ============================================================================== --- trunk/reactos/tools/rsym.mak (original) +++ trunk/reactos/tools/rsym.mak Mon Feb 4 00:47:35 2008 @@ -16,7 +16,7 @@ RSYM_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o)) -RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -Iinclude +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[fireball] 32107: - Make caching enable/disable a runtime switch instead of a compile time one.
by fireball＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: fireball Date: Sun Feb 3 21:51:48 2008 New Revision: 32107 URL: http://svn.reactos.org/svn/reactos?rev=32107&view=rev Log: - Make caching enable/disable a runtime switch instead of a compile time one. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Sun Feb 3 21:51:48 2008 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -#define CACHE_ENABLED +BOOLEAN gCacheEnabled = TRUE; ULONG BytesPerSector; /* Number of bytes per sector */ ULONG SectorsPerCluster; /* Number of sectors per cluster */ @@ -336,28 +336,30 @@ } MmHeapFree(FatVolumeBootSector); -#ifdef CACHE_ENABLED - // - // Initialize the disk cache for this drive - // - if (!CacheInitializeDrive(DriveNumber)) - { - return FALSE; - } - - // - // Force the FAT sectors into the cache - // as long as it is FAT12 or FAT16. FAT32 can - // have a multi-megabyte FAT so we don't want that. - // - if (FatType != FAT32 && FatType != FATX32) - { - if (!CacheForceDiskSectorsIntoCache(DriveNumber, ActiveFatSectorStart, SectorsPerFat)) + if (gCacheEnabled) + { + // + // Initialize the disk cache for this drive + // + if (!CacheInitializeDrive(DriveNumber)) { return FALSE; } - } -#else + + // + // Force the FAT sectors into the cache + // as long as it is FAT12 or FAT16. FAT32 can + // have a multi-megabyte FAT so we don't want that. + // + if (FatType != FAT32 && FatType != FATX32) + { + if (!CacheForceDiskSectorsIntoCache(DriveNumber, ActiveFatSectorStart, SectorsPerFat)) + { + return FALSE; + } + } + } + else { GEOMETRY DriveGeometry; ULONG BlockSize; @@ -370,7 +372,6 @@ BlockSize = MachDiskGetCacheableBlockCount(DriveNumber); } -#endif return TRUE; } @@ -1422,21 +1423,24 @@ BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) { -#ifdef CACHE_ENABLED - return CacheReadDiskSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, Buffer); -#else - // Now try to read in the block - if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) - { - return FALSE; - } - - // Copy data to the caller - RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); - - // Return success - return TRUE; -#endif + if (gCacheEnabled) + { + return CacheReadDiskSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, Buffer); + } + else + { + // Now try to read in the block + if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) + { + return FALSE; + } + + // Copy data to the caller + RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); + + // Return success + return TRUE; + } } const FS_VTBL FatVtbl = {

1 0

[tkreuzer] 32106: fix a DC handle leak
by tkreuzer＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: tkreuzer Date: Sun Feb 3 17:26:52 2008 New Revision: 32106 URL: http://svn.reactos.org/svn/reactos?rev=32106&view=rev Log: fix a DC handle leak Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Sun Feb 3 17:26:52 2008 @@ -1711,7 +1711,7 @@ Ret = TRUE; cleanup: - if(DoFlickerFree) + if(DoFlickerFree || bAlpha) { if(hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp); if(hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush);

1 0

[cfinck] 32105: - Use host/typedefs.h for rsym instead of reinventing the wheel for host types - Get rsym to compile warning-free under any host
by cfinck＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: cfinck Date: Sun Feb 3 16:53:27 2008 New Revision: 32105 URL: http://svn.reactos.org/svn/reactos?rev=32105&view=rev Log: - Use host/typedefs.h for rsym instead of reinventing the wheel for host types - Get rsym to compile warning-free under any host Modified: trunk/reactos/tools/rsym.c trunk/reactos/tools/rsym.h trunk/reactos/tools/rsym.mak Modified: trunk/reactos/tools/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.c?rev=32105&r1=… ============================================================================== --- trunk/reactos/tools/rsym.c (original) +++ trunk/reactos/tools/rsym.c Sun Feb 3 16:53:27 2008 @@ -490,7 +490,7 @@ *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); if (NULL == *ProcessedRelocs) { - fprintf(stderr, "Failed to allocate %lu bytes for relocations\n", RelocSectionHeader->SizeOfRawData); + fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (UINT)RelocSectionHeader->SizeOfRawData); return 1; } *ProcessedRelocsLength = 0; @@ -566,7 +566,7 @@ OutHeader = malloc(StartOfRawData); if (NULL == OutHeader) { - fprintf(stderr, "Failed to allocate %lu bytes for output file header\n", StartOfRawData); + fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (UINT)StartOfRawData); return 1; } memset(OutHeader, '\0', StartOfRawData); @@ -679,7 +679,7 @@ PaddedRosSym = malloc(RosSymFileLength); if (NULL == PaddedRosSym) { - fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", RosSymFileLength); + fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (UINT)RosSymFileLength); return 1; } memcpy(PaddedRosSym, RosSymSection, RosSymLength); Modified: trunk/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=32105&r1=… ============================================================================== --- trunk/reactos/tools/rsym.h (original) +++ trunk/reactos/tools/rsym.h Sun Feb 3 16:53:27 2008 @@ -10,28 +10,7 @@ #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -typedef unsigned char BYTE; -typedef unsigned char UCHAR; -typedef unsigned short WORD; -typedef unsigned short USHORT; -#if defined(__x86_64__) && defined(unix) -typedef signed int LONG; -typedef unsigned int ULONG; -typedef unsigned int DWORD; -#else -typedef signed long LONG; -typedef unsigned long ULONG; -typedef unsigned long DWORD; -#endif -#if defined(_WIN64) -typedef unsigned __int64 ULONG_PTR; -#else -#if defined(__x86_64__) && defined(unix) -typedef unsigned int ULONG_PTR; -#else -typedef unsigned long ULONG_PTR; -#endif -#endif +#include <host/typedefs.h> #pragma pack(2) typedef struct _IMAGE_DOS_HEADER { Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=32105&r… ============================================================================== --- trunk/reactos/tools/rsym.mak (original) +++ trunk/reactos/tools/rsym.mak Sun Feb 3 16:53:27 2008 @@ -16,7 +16,7 @@ RSYM_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o)) -RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -Iinclude RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[cfinck] 32104: Get inflib_host to build warning-free
by cfinck＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: cfinck Date: Sun Feb 3 16:36:10 2008 New Revision: 32104 URL: http://svn.reactos.org/svn/reactos?rev=32104&view=rev Log: Get inflib_host to build warning-free Modified: trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/inflib/infhostgen.c trunk/reactos/lib/inflib/infhostput.c trunk/reactos/lib/inflib/infput.c Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=… ============================================================================== --- trunk/reactos/lib/inflib/builddep.h (original) +++ trunk/reactos/lib/inflib/builddep.h Sun Feb 3 16:36:10 2008 @@ -16,9 +16,9 @@ #include <errno.h> #define FREE(Area) free(Area) -#define MALLOC(Size) malloc(Size) -#define ZEROMEMORY(Area, Size) memset((Area), '\0', (Size)) -#define MEMCPY(Dest, Src, Size) memcpy((Dest), (Src), (Size)) +#define MALLOC(Size) malloc((size_t)(Size)) +#define ZEROMEMORY(Area, Size) memset((Area), '\0', (size_t)(Size)) +#define MEMCPY(Dest, Src, Size) memcpy((Dest), (Src), (size_t)(Size)) #define INF_STATUS_SUCCESS 0 #define INF_STATUS_NO_MEMORY ENOMEM Modified: trunk/reactos/lib/inflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostgen.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostgen.c (original) +++ trunk/reactos/lib/inflib/infhostgen.c Sun Feb 3 16:36:10 2008 @@ -100,7 +100,7 @@ DPRINT("fopen() successful\n"); /* Query file size */ - if (fseek(File, 0, SEEK_END)) + if (fseek(File, (size_t)0, SEEK_END)) { DPRINT1("fseek() to EOF failed (errno %d)\n", errno); fclose(File); @@ -114,10 +114,10 @@ fclose(File); return -1; } - DPRINT("File size: %lu\n", FileLength); + DPRINT("File size: %u\n", (UINT)FileLength); /* Rewind */ - if (fseek(File, 0, SEEK_SET)) + if (fseek(File, (size_t)0, SEEK_SET)) { DPRINT1("fseek() to BOF failed (errno %d)\n", errno); fclose(File); @@ -134,7 +134,7 @@ } /* Read file */ - if (FileLength != fread(FileBuffer, 1, FileLength, File)) + if (FileLength != fread(FileBuffer, (size_t)1, (size_t)FileLength, File)) { DPRINT1("fread() failed (errno %d)\n", errno); fclose(File); Modified: trunk/reactos/lib/inflib/infhostput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostput.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostput.c (original) +++ trunk/reactos/lib/inflib/infhostput.c Sun Feb 3 16:36:10 2008 @@ -43,7 +43,7 @@ fprintf(File, "; %s\r\n\r\n", HeaderComment); } - if (BufferSize != fwrite(Buffer, 1, BufferSize, File)) + if (BufferSize != fwrite(Buffer, (size_t)1, (size_t)BufferSize, File)) { DPRINT1("fwrite() failed (errno %d)\n", errno); fclose(File); Modified: trunk/reactos/lib/inflib/infput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infput.c?rev=32… ============================================================================== --- trunk/reactos/lib/inflib/infput.c (original) +++ trunk/reactos/lib/inflib/infput.c Sun Feb 3 16:36:10 2008 @@ -40,13 +40,13 @@ Length = _tcslen(Text); if (OutBuf->FreeSize < Length + 1 && INF_SUCCESS(OutBuf->Status)) { - DPRINT("Out of free space. TotalSize %lu FreeSize %lu Length %u\n", - OutBuf->TotalSize, OutBuf->FreeSize, Length); + DPRINT("Out of free space. TotalSize %u FreeSize %u Length %u\n", + (UINT)OutBuf->TotalSize, (UINT)OutBuf->FreeSize, (UINT)Length); /* Round up to next SIZE_INC */ NewSize = OutBuf->TotalSize + (((Length + 1) - OutBuf->FreeSize + (SIZE_INC - 1)) / SIZE_INC) * SIZE_INC; - DPRINT("NewSize %lu\n", NewSize); + DPRINT("NewSize %u\n", (UINT)NewSize); NewBuf = MALLOC(NewSize); /* Abort if failed */ if (NULL == NewBuf) @@ -59,8 +59,8 @@ /* Need to copy old contents? */ if (NULL != OutBuf->Buffer) { - DPRINT("Copying %lu bytes from old content\n", - OutBuf->TotalSize - OutBuf->FreeSize); + DPRINT("Copying %u bytes from old content\n", + (UINT)(OutBuf->TotalSize - OutBuf->FreeSize)); MEMCPY(NewBuf, OutBuf->Buffer, OutBuf->TotalSize - OutBuf->FreeSize); OutBuf->Current = NewBuf + (OutBuf->Current - OutBuf->Buffer); FREE(OutBuf->Buffer); @@ -72,8 +72,8 @@ OutBuf->Buffer = NewBuf; OutBuf->FreeSize += NewSize - OutBuf->TotalSize; OutBuf->TotalSize = NewSize; - DPRINT("After reallocation TotalSize %lu FreeSize %lu\n", - OutBuf->TotalSize, OutBuf->FreeSize); + DPRINT("After reallocation TotalSize %u FreeSize %u\n", + (UINT)OutBuf->TotalSize, (UINT)OutBuf->FreeSize); } /* We're guaranteed to have enough room now. Copy char by char because of

1 0

[cfinck] 32103: Finally fix all cabman warnings and the 64-bit build
by cfinck＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: cfinck Date: Sun Feb 3 14:52:42 2008 New Revision: 32103 URL: http://svn.reactos.org/svn/reactos?rev=32103&view=rev Log: Finally fix all cabman warnings and the 64-bit build Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sun Feb 3 14:52:42 2008 @@ -1105,8 +1105,8 @@ BytesToRead = CFData.CompSize; - DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n", - (UINT_PTR)CurrentBuffer, (UINT_PTR)Buffer)); + DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", + (_W64 unsigned long)CurrentBuffer, (_W64 unsigned long)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) @@ -1228,7 +1228,7 @@ BytesToWrite = BytesLeftInBlock; DPRINT(MAX_TRACE, ("Seeking to absolute offset 0x%X.\n", - (UINT)CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize)); + (UINT)(CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize))); if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA)))

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 February 2008