Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[tkreuzer] 63413: [BMFD] Fix inverted use of scaling factors. Patch by Victor Martinez. CORE-8165 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 22 16:15:48 2014 New Revision: 63413 URL: http://svn.reactos.org/svn/reactos?rev=63413&view=rev Log: [BMFD] Fix inverted use of scaling factors. Patch by Victor Martinez. CORE-8165 #resolve Modified: trunk/reactos/win32ss/drivers/font/bmfd/glyph.c Modified: trunk/reactos/win32ss/drivers/font/bmfd/glyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/glyph.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/glyph.c [iso-8859-1] Thu May 22 16:15:48 2014 @@ -118,8 +118,8 @@ } else { - cxDst = cxSrc * yScale; - cyDst = cySrc * xScale; + cxDst = cxSrc * xScale; + cyDst = cySrc * yScale; } cjDstRow = (cxDst + 7) / 8; @@ -154,7 +154,7 @@ } /* Fill GLYPHBITS structure */ - pgb->ptlOrigin.x = yScale * pface->wA; + pgb->ptlOrigin.x = xScale * pface->wA; pgb->ptlOrigin.y = - yScale * pface->wAscent; pgb->sizlBitmap.cx = cxDst; pgb->sizlBitmap.cy = cyDst;

10 years, 7 months

[akhaldi] 63412: [CRT] * Update fputs(). CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 22 16:13:44 2014 New Revision: 63412 URL: http://svn.reactos.org/svn/reactos?rev=63412&view=rev Log: [CRT] * Update fputs(). CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Thu May 22 16:13:44 2014 @@ -551,6 +551,29 @@ file->_ptr = file->_base; file->_cnt = 0; return TRUE; +} + +/* INTERNAL: Allocate temporary buffer for stdout and stderr */ +static BOOL add_std_buffer(FILE *file) +{ + static char buffers[2][BUFSIZ]; + + if((file->_file!=STDOUT_FILENO && file->_file!=STDERR_FILENO) + || !_isatty(file->_file) || file->_bufsiz) + return FALSE; + + file->_ptr = file->_base = buffers[file->_file == STDOUT_FILENO ? 0 : 1]; + file->_bufsiz = file->_cnt = BUFSIZ; + return TRUE; +} + +/* INTERNAL: Removes temporary buffer from stdout or stderr */ +/* Only call this function when add_std_buffer returned TRUE */ +static void remove_std_buffer(FILE *file) +{ + flush_buffer(file); + file->_ptr = file->_base = NULL; + file->_bufsiz = file->_cnt = 0; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ @@ -3427,23 +3450,13 @@ */ int CDECL fputs(const char *s, FILE* file) { - size_t i, len = strlen(s); + size_t len = strlen(s); int ret; _lock_file(file); - if (!(get_ioinfo(file->_file)->wxflag & WX_TEXT)) { - ret = fwrite(s,sizeof(*s),len,file) == len ? 0 : EOF; - _unlock_file(file); - return ret; - } - for (i=0; i<len; i++) - if (fputc(s[i], file) == EOF) { - _unlock_file(file); - return EOF; - } - + ret = fwrite(s, sizeof(*s), len, file) == len ? 0 : EOF; _unlock_file(file); - return 0; + return ret; } /********************************************************************* @@ -3452,6 +3465,7 @@ int CDECL fputws(const wchar_t *s, FILE* file) { size_t i, len = strlenW(s); + BOOL tmp_buf; int ret; _lock_file(file); @@ -3460,14 +3474,17 @@ _unlock_file(file); return ret; } + + tmp_buf = add_std_buffer(file); for (i=0; i<len; i++) { - if (((s[i] == '\n') && (fputc('\r', file) == EOF)) - || fputwc(s[i], file) == WEOF) { + if(fputwc(s[i], file) == WEOF) { + if(tmp_buf) remove_std_buffer(file); _unlock_file(file); return WEOF; } } + if(tmp_buf) remove_std_buffer(file); _unlock_file(file); return 0; }

10 years, 7 months

[ekohl] 63411: [USETUP] - Fix a failed partition type assignment, when unpartitioned disk space is converted to an extended partition. - Rename the extended partition list to logical partition list...

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 22 14:55:04 2014 New Revision: 63411 URL: http://svn.reactos.org/svn/reactos?rev=63411&view=rev Log: [USETUP] - Fix a failed partition type assignment, when unpartitioned disk space is converted to an extended partition. - Rename the extended partition list to logical partition list. - Add a pointer to an extended partition to the disk entries. And keep it up-to-date when the primary partition list is built or modified. - Add the 'Unpartitioned space' partiton entry to the logical partition list when an extended partition has been created. - Remove all logical partition entries when the coresponding extended partition will be deleted. Modified: trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Thu May 22 14:55:04 2014 @@ -524,7 +524,7 @@ ULONG DiskNumber, PDISKENTRY DiskEntry, ULONG PartitionIndex, - BOOLEAN ExtendedPartition) + BOOLEAN LogicalPartition) { PPARTITION_INFORMATION PartitionInfo; PPARTENTRY PartEntry; @@ -548,7 +548,7 @@ PartEntry->PartitionType = PartitionInfo->PartitionType; PartEntry->HiddenSectors = PartitionInfo->HiddenSectors; - PartEntry->ExtendedPartition = ExtendedPartition; + PartEntry->LogicalPartition = LogicalPartition; PartEntry->IsPartitioned = TRUE; PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; PartEntry->PartitionIndex = PartitionIndex; @@ -556,6 +556,9 @@ if (IsContainerPartition(PartEntry->PartitionType)) { PartEntry->FormatState = Unformatted; + + if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) + DiskEntry->ExtendedPartition = PartEntry; } else if ((PartEntry->PartitionType == PARTITION_FAT_12) || (PartEntry->PartitionType == PARTITION_FAT_16) || @@ -613,8 +616,8 @@ PartEntry->FormatState = UnknownFormat; } - if (ExtendedPartition) - InsertTailList(&DiskEntry->ExtendedPartListHead, + if (LogicalPartition) + InsertTailList(&DiskEntry->LogicalPartListHead, &PartEntry->ListEntry); else InsertTailList(&DiskEntry->PrimaryPartListHead, @@ -991,7 +994,7 @@ } InitializeListHead(&DiskEntry->PrimaryPartListHead); - InitializeListHead(&DiskEntry->ExtendedPartListHead); + InitializeListHead(&DiskEntry->LogicalPartListHead); DiskEntry->Cylinders = DiskGeometry.Cylinders.QuadPart; DiskEntry->TracksPerCylinder = DiskGeometry.TracksPerCylinder; @@ -1009,8 +1012,8 @@ DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; - DPRINT("SectorCount %I64u\n", DiskEntry->SectorCount); - DPRINT("SectorAlignment %lu\n", DiskEntry->SectorAlignment); + DPRINT1("SectorCount %I64u\n", DiskEntry->SectorCount); + DPRINT1("SectorAlignment %lu\n", DiskEntry->SectorAlignment); DiskEntry->DiskNumber = DiskNumber; DiskEntry->Port = ScsiAddress.PortNumber; @@ -1228,10 +1231,10 @@ RtlFreeHeap(ProcessHeap, 0, PartEntry); } - /* Release extended partition list */ - while (!IsListEmpty(&DiskEntry->ExtendedPartListHead)) - { - Entry = RemoveHeadList(&DiskEntry->ExtendedPartListHead); + /* Release logical partition list */ + while (!IsListEmpty(&DiskEntry->LogicalPartListHead)) + { + Entry = RemoveHeadList(&DiskEntry->LogicalPartListHead); PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); RtlFreeHeap(ProcessHeap, 0, PartEntry); @@ -1342,8 +1345,8 @@ sprintf(LineBuffer, MUIGetString(STRING_UNPSPACE), - PartEntry->ExtendedPartition ? " " : "", - PartEntry->ExtendedPartition ? "" : " ", + PartEntry->LogicalPartition ? " " : "", + PartEntry->LogicalPartition ? "" : " ", PartSize.u.LowPart, Unit); } @@ -1410,9 +1413,9 @@ MUIGetString(STRING_HDDINFOUNK5), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->ExtendedPartition ? " " : "", + PartEntry->LogicalPartition ? " " : "", PartEntry->PartitionType, - PartEntry->ExtendedPartition ? "" : " ", + PartEntry->LogicalPartition ? "" : " ", PartSize.u.LowPart, Unit); } @@ -1422,9 +1425,9 @@ "%c%c %s%-24s%s %6lu %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->ExtendedPartition ? " " : "", + PartEntry->LogicalPartition ? " " : "", PartType, - PartEntry->ExtendedPartition ? "" : " ", + PartEntry->LogicalPartition ? "" : " ", PartSize.u.LowPart, Unit); } @@ -1474,8 +1477,8 @@ PPARTLIST List, PDISKENTRY DiskEntry) { - PPARTENTRY PrimaryPartEntry, ExtendedPartEntry; - PLIST_ENTRY PrimaryEntry, ExtendedEntry; + PPARTENTRY PrimaryPartEntry, LogicalPartEntry; + PLIST_ENTRY PrimaryEntry, LogicalEntry; CHAR LineBuffer[128]; COORD coPos; DWORD Written; @@ -1570,16 +1573,16 @@ if (IsContainerPartition(PrimaryPartEntry->PartitionType)) { - ExtendedEntry = DiskEntry->ExtendedPartListHead.Flink; - while (ExtendedEntry != &DiskEntry->ExtendedPartListHead) + LogicalEntry = DiskEntry->LogicalPartListHead.Flink; + while (LogicalEntry != &DiskEntry->LogicalPartListHead) { - ExtendedPartEntry = CONTAINING_RECORD(ExtendedEntry, PARTENTRY, ListEntry); + LogicalPartEntry = CONTAINING_RECORD(LogicalEntry, PARTENTRY, ListEntry); PrintPartitionData(List, DiskEntry, - ExtendedPartEntry); - - ExtendedEntry = ExtendedEntry->Flink; + LogicalPartEntry); + + LogicalEntry = LogicalEntry->Flink; } } @@ -2208,6 +2211,40 @@ } +static +VOID +AddLogicalDiskSpace( + PDISKENTRY DiskEntry) +{ + PPARTENTRY NewPartEntry; + + DPRINT1("AddLogicalDiskSpace()\n"); + + /* Create a partition table entry that represents the empty space in the container partition */ + NewPartEntry = RtlAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + NewPartEntry->DiskEntry = DiskEntry; + NewPartEntry->LogicalPartition = TRUE; + + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->StartSector.QuadPart = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorsPerTrack; + NewPartEntry->SectorCount.QuadPart = DiskEntry->ExtendedPartition->SectorCount.QuadPart - (ULONGLONG)DiskEntry->SectorsPerTrack; + + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->FormatState = Unformatted; + + InsertTailList(&DiskEntry->LogicalPartListHead, + &NewPartEntry->ListEntry); +} + + VOID CreateExtendedPartition( PPARTLIST List, @@ -2217,7 +2254,7 @@ PPARTENTRY PartEntry; PPARTENTRY NewPartEntry; - DPRINT1("CreatePrimaryPartition(%I64u)\n", SectorCount); + DPRINT1("CreateExtendedPartition(%I64u)\n", SectorCount); if (List == NULL || List->CurrentDisk == NULL || @@ -2237,11 +2274,23 @@ DPRINT1("Convert existing partition entry\n"); /* Convert current entry to 'new (unformatted)' */ PartEntry->IsPartitioned = TRUE; -// PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Formatted; PartEntry->AutoCreate = FALSE; PartEntry->New = FALSE; PartEntry->BootIndicator = FALSE; /* FIXME */ + + if (PartEntry->StartSector.QuadPart < 1450560) + { + /* Partition starts below the 8.4GB boundary ==> CHS partition */ + PartEntry->PartitionType = PARTITION_EXTENDED; + } + else + { + /* Partition starts above the 8.4GB boundary ==> LBA partition */ + PartEntry->PartitionType = PARTITION_XINT13_EXTENDED; + } + + DiskEntry->ExtendedPartition = PartEntry; DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart); DPRINT1("Last Sector: %I64u\n", PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - 1); @@ -2269,30 +2318,32 @@ NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; -// NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; + NewPartEntry->New = FALSE; + NewPartEntry->FormatState = Formatted; + NewPartEntry->BootIndicator = FALSE; /* FIXME */ + + if (NewPartEntry->StartSector.QuadPart < 1450560) + { + /* Partition starts below the 8.4GB boundary ==> CHS partition */ + NewPartEntry->PartitionType = PARTITION_EXTENDED; + } + else + { + /* Partition starts above the 8.4GB boundary ==> LBA partition */ + NewPartEntry->PartitionType = PARTITION_XINT13_EXTENDED; + } + + DiskEntry->ExtendedPartition = NewPartEntry; + + PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; + PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); - - NewPartEntry->New = FALSE; - NewPartEntry->FormatState = Formatted; - NewPartEntry->BootIndicator = FALSE; /* FIXME */ - - PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; - PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); - } - - if (NewPartEntry->StartSector.QuadPart < 1450560) - { - /* Partition starts below the 8.4GB boundary ==> CHS partition */ - NewPartEntry->PartitionType = PARTITION_EXTENDED; - } - else - { - /* Partition starts above the 8.4GB boundary ==> LBA partition */ - NewPartEntry->PartitionType = PARTITION_XINT13_EXTENDED; - } + } + + AddLogicalDiskSpace(DiskEntry); UpdateDiskLayout(DiskEntry); @@ -2312,6 +2363,8 @@ PPARTENTRY PartEntry; PPARTENTRY PrevPartEntry; PPARTENTRY NextPartEntry; + PPARTENTRY LogicalPartEntry; + PLIST_ENTRY Entry; if (List == NULL || List->CurrentDisk == NULL || @@ -2323,6 +2376,20 @@ DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; + + /* Delete all logical partiton entries if an extended partition will be deleted */ + if (DiskEntry->ExtendedPartition == PartEntry) + { + while (!IsListEmpty(&DiskEntry->LogicalPartListHead)) + { + Entry = RemoveHeadList(&DiskEntry->LogicalPartListHead); + LogicalPartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + RtlFreeHeap(ProcessHeap, 0, LogicalPartEntry); + } + + DiskEntry->ExtendedPartition = NULL; + } /* Adjust unpartitioned disk space entries */ @@ -2744,30 +2811,6 @@ } -static -ULONG -GetExtendedPartitionCount( - IN PDISKENTRY DiskEntry) -{ - PLIST_ENTRY Entry; - PPARTENTRY PartEntry; - UINT nCount = 0; - - Entry = DiskEntry->PrimaryPartListHead.Flink; - while (Entry != &DiskEntry->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned == TRUE && - IsContainerPartition(PartEntry->PartitionType)) - nCount++; - - Entry = Entry->Flink; - } - - return nCount; -} - - ULONG PrimaryPartitionCreationChecks( IN PPARTLIST List) @@ -2786,7 +2829,7 @@ if (GetPrimaryPartitionCount(DiskEntry) > 4) return ERROR_PARTITION_TABLE_FULL; - /* FIXME: Fail if this partiton is located behind an extended partition */ + /* Fail if this partiton is located behind an extended partition */ if (IsPreviousPartitionExtended(PartEntry, DiskEntry)) return ERROR_NOT_BEHIND_EXTENDED; @@ -2813,7 +2856,7 @@ return ERROR_PARTITION_TABLE_FULL; /* Fail if there is another extended partition in the list */ - if (GetExtendedPartitionCount(DiskEntry) != 0) + if (DiskEntry->ExtendedPartition != NULL) return ERROR_ONLY_ONE_EXTENDED; /* Fail if the partition is not the last list entry */ @@ -2823,5 +2866,4 @@ return ERROR_SUCCESS; } - /* EOF */ Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Thu May 22 14:55:04 2014 @@ -57,7 +57,7 @@ CHAR VolumeLabel[17]; CHAR FileSystemName[9]; - BOOLEAN ExtendedPartition; + BOOLEAN LogicalPartition; /* Partition is partitioned disk space */ BOOLEAN IsPartitioned; @@ -117,8 +117,10 @@ PDRIVE_LAYOUT_INFORMATION LayoutBuffer; + PPARTENTRY ExtendedPartition; + LIST_ENTRY PrimaryPartListHead; - LIST_ENTRY ExtendedPartListHead; + LIST_ENTRY LogicalPartListHead; } DISKENTRY, *PDISKENTRY;

10 years, 7 months

[akhaldi] 63410: [CRT] * Update fgetpos(). CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 22 14:10:49 2014 New Revision: 63410 URL: http://svn.reactos.org/svn/reactos?rev=63410&view=rev Log: [CRT] * Update fgetpos(). CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Thu May 22 14:10:49 2014 @@ -3416,34 +3416,9 @@ */ int CDECL fgetpos(FILE* file, fpos_t *pos) { - int off=0; - - _lock_file(file); - *pos = _lseeki64(file->_file,0,SEEK_CUR); - if(*pos == -1) { - _unlock_file(file); + *pos = _ftelli64(file); + if(*pos == -1) return -1; - } - if(file->_bufsiz) { - if( file->_flag & _IOWRT ) { - off = file->_ptr - file->_base; - } else { - off = -file->_cnt; - if (get_ioinfo(file->_file)->wxflag & WX_TEXT) { - /* Black magic correction for CR removal */ - int i; - for (i=0; i<file->_cnt; i++) { - if (file->_ptr[i] == '\n') - off--; - } - /* Black magic when reading CR at buffer boundary*/ - if(get_ioinfo(file->_file)->wxflag & WX_READCR) - off--; - } - } - } - *pos += off; - _unlock_file(file); return 0; }

10 years, 7 months

[tkreuzer] 63409: [WIN32K] Don't access the object header of a kernel object from win32k. Instead get the desktop name from the desktop info structure. CORE-6818 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 22 13:40:23 2014 New Revision: 63409 URL: http://svn.reactos.org/svn/reactos?rev=63409&view=rev Log: [WIN32K] Don't access the object header of a kernel object from win32k. Instead get the desktop name from the desktop info structure. CORE-6818 #resolve Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Thu May 22 13:40:23 2014 @@ -51,7 +51,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; PLIST_ENTRY NextEntry, ListHead; PWINSTATION_OBJECT WinStaObject = (PWINSTATION_OBJECT)ParseObject; - PUNICODE_STRING DesktopName; + UNICODE_STRING DesktopName; PBOOLEAN pContext = (PBOOLEAN) Context; if(pContext) @@ -65,43 +65,40 @@ /* Get the current desktop */ Desktop = CONTAINING_RECORD(NextEntry, DESKTOP, ListEntry); - /// @todo Don't mess around with the object headers! - /* Get its name */ - _PRAGMA_WARNING_SUPPRESS(__WARNING_DEREF_NULL_PTR) - DesktopName = GET_DESKTOP_NAME(Desktop); - if (DesktopName) + /* Get the desktop name */ + ASSERT(Desktop->pDeskInfo != NULL); + RtlInitUnicodeString(&DesktopName, Desktop->pDeskInfo->szDesktopName); + + /* Compare the name */ + if (RtlEqualUnicodeString(RemainingName, + &DesktopName, + (Attributes & OBJ_CASE_INSENSITIVE))) { - /* Compare the name */ - if (RtlEqualUnicodeString(RemainingName, - DesktopName, - (Attributes & OBJ_CASE_INSENSITIVE))) + /* We found a match. Did this come from a create? */ + if (Context) { - /* We found a match. Did this come from a create? */ - if (Context) + /* Unless OPEN_IF was given, fail with an error */ + if (!(Attributes & OBJ_OPENIF)) { - /* Unless OPEN_IF was given, fail with an error */ - if (!(Attributes & OBJ_OPENIF)) - { - /* Name collision */ - return STATUS_OBJECT_NAME_COLLISION; - } - else - { - /* Otherwise, return with a warning only */ - Status = STATUS_OBJECT_NAME_EXISTS; - } + /* Name collision */ + return STATUS_OBJECT_NAME_COLLISION; } else { - /* This was a real open, so this is OK */ - Status = STATUS_SUCCESS; + /* Otherwise, return with a warning only */ + Status = STATUS_OBJECT_NAME_EXISTS; } - - /* Reference the desktop and return it */ - ObReferenceObject(Desktop); - *Object = Desktop; - return Status; } + else + { + /* This was a real open, so this is OK */ + Status = STATUS_SUCCESS; + } + + /* Reference the desktop and return it */ + ObReferenceObject(Desktop); + *Object = Desktop; + return Status; } /* Go to the next desktop */ @@ -522,7 +519,7 @@ { gpqForeground = pdo->ActiveMessageQueue; } - else + else { gpqForeground = NULL; ERR("ptiLastInput is CLEARED!!\n");

10 years, 7 months

[tkreuzer] 63408: [WIN32K] Make all GDI object cleanup functions return VOID instead of BOOL. CORE-6870 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 22 11:45:53 2014 New Revision: 63408 URL: http://svn.reactos.org/svn/reactos?rev=63408&view=rev Log: [WIN32K] Make all GDI object cleanup functions return VOID instead of BOOL. CORE-6870 #resolve Modified: trunk/reactos/win32ss/gdi/eng/driverobj.c trunk/reactos/win32ss/gdi/eng/driverobj.h trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/gdi/eng/surface.h trunk/reactos/win32ss/gdi/ntgdi/brush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h trunk/reactos/win32ss/user/user32/windows/mdi.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/gdi/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/driverobj.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -19,8 +19,9 @@ /*! * \brief DRIVEROBJ cleanup function */ -BOOL NTAPI -DRIVEROBJ_Cleanup(PVOID pObject) +VOID +NTAPI +DRIVEROBJ_vCleanup(PVOID pObject) { PEDRIVEROBJ pedo = pObject; FREEOBJPROC pFreeProc; @@ -28,10 +29,8 @@ pFreeProc = pedo->drvobj.pFreeProc; if (pFreeProc) { - return pFreeProc(pedo->drvobj.pvObj); + NT_VERIFY(pFreeProc(pedo->drvobj.pvObj)); } - - return TRUE; } /** Public interface **********************************************************/ Modified: trunk/reactos/win32ss/gdi/eng/driverobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/driverobj.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/driverobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/driverobj.h [iso-8859-1] Thu May 22 11:45:53 2014 @@ -11,7 +11,7 @@ typedef DRIVEROBJ *PDRIVEROBJ; /* Cleanup function */ -BOOL NTAPI DRIVEROBJ_Cleanup(PVOID pObject); +VOID NTAPI DRIVEROBJ_vCleanup(PVOID pObject); #define DRIVEROBJ_AllocObjectWithHandle() ((PEDRIVEROBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DRIVEROBJ, sizeof(EDRIVEROBJ))) Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -62,9 +62,9 @@ } } -BOOL +VOID NTAPI -SURFACE_Cleanup(PVOID ObjectBody) +SURFACE_vCleanup(PVOID ObjectBody) { PSURFACE psurf = (PSURFACE)ObjectBody; PVOID pvBits = psurf->SurfObj.pvBits; @@ -108,8 +108,6 @@ { PALETTE_ShareUnlockPalette(psurf->ppal); } - - return TRUE; } Modified: trunk/reactos/win32ss/gdi/eng/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] Thu May 22 11:45:53 2014 @@ -111,9 +111,9 @@ FASTCALL BitmapFormat(ULONG cBits, ULONG iCompression); -BOOL +VOID NTAPI -SURFACE_Cleanup(PVOID ObjectBody); +SURFACE_vCleanup(PVOID ObjectBody); PSURFACE NTAPI Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -114,9 +114,9 @@ pbr->pBrushAttr = &pbr->BrushAttr; } -BOOL +VOID NTAPI -BRUSH_Cleanup(PVOID ObjectBody) +BRUSH_vCleanup(PVOID ObjectBody) { PBRUSH pbrush = (PBRUSH)ObjectBody; if (pbrush->hbmPattern) @@ -136,8 +136,6 @@ { ExFreePool(pbrush->pStyle); } - - return TRUE; } INT Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Thu May 22 11:45:53 2014 @@ -94,7 +94,7 @@ #define BRUSH_ShareUnlockBrush(pBrush) GDIOBJ_vDereferenceObject((POBJ)pBrush) INT FASTCALL BRUSH_GetObject (PBRUSH GdiObject, INT Count, LPLOGBRUSH Buffer); -BOOL NTAPI BRUSH_Cleanup(PVOID ObjectBody); +VOID NTAPI BRUSH_vCleanup(PVOID ObjectBody); extern HSURF gahsurfHatch[HS_DDI_MAX]; Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Thu May 22 11:45:53 2014 @@ -194,7 +194,7 @@ PPDEVOBJ FASTCALL IntEnumHDev(VOID); PDC NTAPI DC_AllocDcWithHandle(VOID); BOOL NTAPI DC_bAllocDcAttr(PDC pdc); -BOOL NTAPI DC_Cleanup(PVOID ObjectBody); +VOID NTAPI DC_vCleanup(PVOID ObjectBody); BOOL FASTCALL IntGdiDeleteDC(HDC, BOOL); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -344,9 +344,9 @@ } } -BOOL +VOID NTAPI -DC_Cleanup(PVOID ObjectBody) +DC_vCleanup(PVOID ObjectBody) { PDC pdc = (PDC)ObjectBody; @@ -391,8 +391,6 @@ SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); PDEVOBJ_vRelease(pdc->ppdev) ; - - return TRUE; } VOID Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -87,53 +87,54 @@ ULONG gulFirstUnused; static PPAGED_LOOKASIDE_LIST gpaLookasideList; -static BOOL NTAPI GDIOBJ_Cleanup(PVOID ObjectBody); +static VOID NTAPI GDIOBJ_vCleanup(PVOID ObjectBody); static const GDICLEANUPPROC apfnCleanup[] = { - NULL, /* 00 GDIObjType_DEF_TYPE */ - DC_Cleanup, /* 01 GDIObjType_DC_TYPE */ - NULL, /* 02 GDIObjType_UNUSED1_TYPE */ - NULL, /* 03 GDIObjType_UNUSED2_TYPE */ - REGION_Cleanup, /* 04 GDIObjType_RGN_TYPE */ - SURFACE_Cleanup, /* 05 GDIObjType_SURF_TYPE */ - GDIOBJ_Cleanup, /* 06 GDIObjType_CLIENTOBJ_TYPE */ - GDIOBJ_Cleanup, /* 07 GDIObjType_PATH_TYPE */ - PALETTE_Cleanup, /* 08 GDIObjType_PAL_TYPE */ - GDIOBJ_Cleanup, /* 09 GDIObjType_ICMLCS_TYPE */ - GDIOBJ_Cleanup, /* 0a GDIObjType_LFONT_TYPE */ - NULL, /* 0b GDIObjType_RFONT_TYPE, unused */ - NULL, /* 0c GDIObjType_PFE_TYPE, unused */ - NULL, /* 0d GDIObjType_PFT_TYPE, unused */ - GDIOBJ_Cleanup, /* 0e GDIObjType_ICMCXF_TYPE */ - NULL, /* 0f GDIObjType_SPRITE_TYPE, unused */ - BRUSH_Cleanup, /* 10 GDIObjType_BRUSH_TYPE, BRUSH, PEN, EXTPEN */ - NULL, /* 11 GDIObjType_UMPD_TYPE, unused */ - NULL, /* 12 GDIObjType_UNUSED4_TYPE */ - NULL, /* 13 GDIObjType_SPACE_TYPE, unused */ - NULL, /* 14 GDIObjType_UNUSED5_TYPE */ - NULL, /* 15 GDIObjType_META_TYPE, unused */ - NULL, /* 16 GDIObjType_EFSTATE_TYPE, unused */ - NULL, /* 17 GDIObjType_BMFD_TYPE, unused */ - NULL, /* 18 GDIObjType_VTFD_TYPE, unused */ - NULL, /* 19 GDIObjType_TTFD_TYPE, unused */ - NULL, /* 1a GDIObjType_RC_TYPE, unused */ - NULL, /* 1b GDIObjType_TEMP_TYPE, unused */ - DRIVEROBJ_Cleanup,/* 1c GDIObjType_DRVOBJ_TYPE */ - NULL, /* 1d GDIObjType_DCIOBJ_TYPE, unused */ - NULL, /* 1e GDIObjType_SPOOL_TYPE, unused */ - NULL, /* 1f reserved entry */ + NULL, /* 00 GDIObjType_DEF_TYPE */ + DC_vCleanup, /* 01 GDIObjType_DC_TYPE */ + NULL, /* 02 GDIObjType_UNUSED1_TYPE */ + NULL, /* 03 GDIObjType_UNUSED2_TYPE */ + REGION_vCleanup, /* 04 GDIObjType_RGN_TYPE */ + SURFACE_vCleanup, /* 05 GDIObjType_SURF_TYPE */ + GDIOBJ_vCleanup, /* 06 GDIObjType_CLIENTOBJ_TYPE */ + GDIOBJ_vCleanup, /* 07 GDIObjType_PATH_TYPE */ + PALETTE_vCleanup, /* 08 GDIObjType_PAL_TYPE */ + GDIOBJ_vCleanup, /* 09 GDIObjType_ICMLCS_TYPE */ + GDIOBJ_vCleanup, /* 0a GDIObjType_LFONT_TYPE */ + NULL, /* 0b GDIObjType_RFONT_TYPE, unused */ + NULL, /* 0c GDIObjType_PFE_TYPE, unused */ + NULL, /* 0d GDIObjType_PFT_TYPE, unused */ + GDIOBJ_vCleanup, /* 0e GDIObjType_ICMCXF_TYPE */ + NULL, /* 0f GDIObjType_SPRITE_TYPE, unused */ + BRUSH_vCleanup, /* 10 GDIObjType_BRUSH_TYPE, BRUSH, PEN, EXTPEN */ + NULL, /* 11 GDIObjType_UMPD_TYPE, unused */ + NULL, /* 12 GDIObjType_UNUSED4_TYPE */ + NULL, /* 13 GDIObjType_SPACE_TYPE, unused */ + NULL, /* 14 GDIObjType_UNUSED5_TYPE */ + NULL, /* 15 GDIObjType_META_TYPE, unused */ + NULL, /* 16 GDIObjType_EFSTATE_TYPE, unused */ + NULL, /* 17 GDIObjType_BMFD_TYPE, unused */ + NULL, /* 18 GDIObjType_VTFD_TYPE, unused */ + NULL, /* 19 GDIObjType_TTFD_TYPE, unused */ + NULL, /* 1a GDIObjType_RC_TYPE, unused */ + NULL, /* 1b GDIObjType_TEMP_TYPE, unused */ + DRIVEROBJ_vCleanup,/* 1c GDIObjType_DRVOBJ_TYPE */ + NULL, /* 1d GDIObjType_DCIOBJ_TYPE, unused */ + NULL, /* 1e GDIObjType_SPOOL_TYPE, unused */ + NULL, /* 1f reserved entry */ }; /* INTERNAL FUNCTIONS ********************************************************/ static -BOOL NTAPI -GDIOBJ_Cleanup(PVOID ObjectBody) -{ - return TRUE; +VOID +NTAPI +GDIOBJ_vCleanup(PVOID ObjectBody) +{ + /* Nothing to do */ } static Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Thu May 22 11:45:53 2014 @@ -28,7 +28,7 @@ typedef PVOID PGDIOBJ; -typedef BOOL (NTAPI *GDICLEANUPPROC)(PVOID ObjectBody); +typedef VOID (NTAPI *GDICLEANUPPROC)(PVOID ObjectBody); /* Every GDI Object must have this standard type of header. * It's for thread locking. */ Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -230,17 +230,15 @@ return ppal; } -BOOL +VOID NTAPI -PALETTE_Cleanup(PVOID ObjectBody) +PALETTE_vCleanup(PVOID ObjectBody) { PPALETTE pPal = (PPALETTE)ObjectBody; if (pPal->IndexedColors && pPal->IndexedColors != pPal->apalColors) { ExFreePoolWithTag(pPal->IndexedColors, TAG_PALETTE); } - - return TRUE; } INT @@ -702,15 +700,15 @@ EngSetLastError(ERROR_INVALID_HANDLE); return CLR_INVALID; } - + if(dc->dclevel.pSurface == NULL) ppal = gppalMono; else ppal = dc->dclevel.pSurface->ppal; - + /* Translate the color to the DC format */ Color = TranslateCOLORREF(dc, Color); - + /* XLATE it back to RGB color space */ EXLATEOBJ_vInitialize(&exlo, ppal, @@ -718,11 +716,11 @@ 0, RGB(0xff, 0xff, 0xff), RGB(0, 0, 0)); - + nearest = XLATEOBJ_iXlate(&exlo.xlo, Color); - + EXLATEOBJ_vCleanup(&exlo); - + /* We're done */ DC_UnlockDc(dc); @@ -771,7 +769,7 @@ { goto cleanup; } - + if(pdc->dctype == DCTYPE_DIRECT) { UNIMPLEMENTED; Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Thu May 22 11:45:53 2014 @@ -117,9 +117,9 @@ PPALETTE ppal, PULONG pulColors); -BOOL +VOID NTAPI -PALETTE_Cleanup(PVOID ObjectBody); +PALETTE_vCleanup(PVOID ObjectBody); FORCEINLINE ULONG Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -2275,8 +2275,8 @@ return hrgn; } -BOOL NTAPI -REGION_Cleanup(PVOID ObjectBody) +VOID NTAPI +REGION_vCleanup(PVOID ObjectBody) { PROSRGNDATA pRgn = (PROSRGNDATA)ObjectBody; PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); @@ -2288,7 +2288,6 @@ if (pRgn->Buffer && pRgn->Buffer != &pRgn->rdh.rcBound) ExFreePoolWithTag(pRgn->Buffer, TAG_REGION); - return TRUE; } VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Thu May 22 11:45:53 2014 @@ -29,7 +29,7 @@ BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc); BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const RECTL *rect, const POINT *off); VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); -BOOL NTAPI REGION_Cleanup(PVOID ObjectBody); +VOID NTAPI REGION_vCleanup(PVOID ObjectBody); extern PROSRGNDATA prgnDefault; extern HRGN hrgnDefault; Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -860,8 +860,8 @@ for (r = 1; r <= rows && *pWnd; r++, i++) { LONG posOptions = SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER; - LONG style = GetWindowLongW(win_array[i], GWL_STYLE); - if (!(style & WS_SIZEBOX)) posOptions |= SWP_NOSIZE; + LONG style = GetWindowLongW(win_array[i], GWL_STYLE); + if (!(style & WS_SIZEBOX)) posOptions |= SWP_NOSIZE; SetWindowPos(*pWnd, 0, x, y, xsize, ysize, posOptions); y += ysize; @@ -1091,9 +1091,9 @@ DefWindowProcW( frame, WM_SETTEXT, 0, (LPARAM)lpBuffer ); - if (repaint) - SetWindowPos( frame, 0,0,0,0,0, SWP_FRAMECHANGED | - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER ); + if (repaint) + SetWindowPos( frame, 0,0,0,0,0, SWP_FRAMECHANGED | + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER ); } @@ -1830,7 +1830,7 @@ return; } - ERR("CalcChildScroll 1\n"); + TRACE("CalcChildScroll 1\n"); if ((list = WIN_ListChildren( hwnd ))) { int i; @@ -1851,14 +1851,14 @@ OffsetRect(&rect, -WindowInfo.rcClient.left, -WindowInfo.rcClient.top); //WIN_GetRectangles( list[i], COORDS_PARENT, &rect, NULL ); - ERR("CalcChildScroll L\n"); + TRACE("CalcChildScroll L\n"); UnionRect( &childRect, &rect, &childRect ); } } HeapFree( GetProcessHeap(), 0, list ); } UnionRect( &childRect, &clientRect, &childRect ); - ERR("CalcChildScroll 3\n"); + TRACE("CalcChildScroll 3\n"); /* set common info values */ info.cbSize = sizeof(info); info.fMask = SIF_POS | SIF_RANGE | SIF_PAGE; @@ -1883,12 +1883,12 @@ SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); if (scroll == SB_HORZ) { - ERR("CalcChildScroll H\n"); + TRACE("CalcChildScroll H\n"); break; } else { - ERR("CalcChildScroll B\n"); + TRACE("CalcChildScroll B\n"); } /* fall through */ case SB_VERT: @@ -1898,7 +1898,7 @@ info.nPage = 1 + clientRect.bottom - clientRect.top; //info.nMax = childRect.bottom - clientRect.bottom; //info.nPos = clientRect.top - childRect.top; - ERR("CalcChildScroll V\n"); + TRACE("CalcChildScroll V\n"); if (ci->initialStyle & WS_VSCROLL) SetScrollInfo(hwnd, SB_VERT, &info, TRUE); break; @@ -2029,7 +2029,7 @@ * TileChildWindows (USER32.@) */ WORD WINAPI TileChildWindows( HWND parent, UINT flags ) -{ +{ return TileWindows( parent, flags, NULL, 0, NULL ); } Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Thu May 22 11:45:53 2014 @@ -245,7 +245,7 @@ if (!ret) cp = CP_ACP; return cp; } - + static WPARAM FASTCALL map_wparam_char_WtoA( WPARAM wParam, DWORD len ) { WCHAR wch = wParam; @@ -253,7 +253,7 @@ DWORD cp = get_input_codepage(); len = WideCharToMultiByte( cp, 0, &wch, 1, (LPSTR)ch, len, NULL, NULL ); - if (len == 2) + if (len == 2) return MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(wParam) ); else return MAKEWPARAM( ch[0], HIWORD(wParam) ); @@ -743,9 +743,9 @@ case WM_CHARTOITEM: case WM_MENUCHAR: - case WM_CHAR: + case WM_CHAR: case WM_DEADCHAR: - case WM_SYSCHAR: + case WM_SYSCHAR: case WM_SYSDEADCHAR: case EM_SETPASSWORDCHAR: case WM_IME_CHAR: @@ -1139,14 +1139,14 @@ } case WM_GETDLGCODE: - if (UnicodeMsg->lParam) + if (UnicodeMsg->lParam) { MSG newmsg = *(MSG *)UnicodeMsg->lParam; switch(newmsg.message) { case WM_CHAR: case WM_DEADCHAR: - case WM_SYSCHAR: + case WM_SYSCHAR: case WM_SYSDEADCHAR: newmsg.wParam = map_wparam_char_WtoA( newmsg.wParam, 1 ); break; @@ -1169,9 +1169,9 @@ break; case WM_CHARTOITEM: - case WM_MENUCHAR: - case WM_DEADCHAR: - case WM_SYSCHAR: + case WM_MENUCHAR: + case WM_DEADCHAR: + case WM_SYSCHAR: case WM_SYSDEADCHAR: case EM_SETPASSWORDCHAR: AnsiMsg->wParam = map_wparam_char_WtoA(UnicodeMsg->wParam,1); @@ -1303,7 +1303,7 @@ { DWORD len = AnsiMsg->wParam;// * 2; if (len) - { + { if (*Result) { RtlMultiByteToUnicodeN( UBuffer, AnsiMsg->wParam*sizeof(WCHAR), &len, Buffer, strlen(Buffer)+1 ); @@ -2404,7 +2404,7 @@ if ( Window != NULL && Window->head.pti == ti && - !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROC) && !ISITHOOKED(WH_CALLWNDPROCRET) && !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) { @@ -2468,7 +2468,7 @@ if ( Window != NULL && Window->head.pti == ti && - !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROC) && !ISITHOOKED(WH_CALLWNDPROCRET) && !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) { @@ -2935,7 +2935,7 @@ case WM_SIZING: { PRECT prect = (PRECT) KMMsg.lParam; - ERR("WM_SIZING 1 t %d l %d r %d b %d\n",prect->top,prect->left,prect->right,prect->bottom); + TRACE("WM_SIZING 1 t %d l %d r %d b %d\n",prect->top,prect->left,prect->right,prect->bottom); break; } default: @@ -2983,7 +2983,7 @@ case WM_SIZING: { PRECT prect = (PRECT) KMMsg.lParam; - ERR("WM_SIZING 2 t %d l %d r %d b %d\n",prect->top,prect->left,prect->right,prect->bottom); + TRACE("WM_SIZING 2 t %d l %d r %d b %d\n",prect->top,prect->left,prect->right,prect->bottom); break; } default:

10 years, 7 months

[akhaldi] 63407: [MSVCRT] * Don't export wcstombs_s(). CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 22 11:42:45 2014 New Revision: 63407 URL: http://svn.reactos.org/svn/reactos?rev=63407&view=rev Log: [MSVCRT] * Don't export wcstombs_s(). CORE-8174 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Thu May 22 11:42:45 2014 @@ -1439,7 +1439,6 @@ @ cdecl wcstok_s(ptr wstr ptr) @ cdecl wcstol(wstr ptr long) @ cdecl wcstombs(ptr ptr long) -@ cdecl wcstombs_s(ptr ptr long wstr long) @ cdecl wcstoul(wstr ptr long) @ cdecl wcsxfrm(ptr wstr long) # stub wctob

10 years, 7 months

[tkreuzer] 63406: [NTOSKRNL] Pass process id to DbgUnLoadImageSymbols instead of ZwCurrentProcess() or a PEPROCESS. Patch by Jérôme Gardou <jerome.gardou at reactos dot org> CORE-8253 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 22 10:18:22 2014 New Revision: 63406 URL: http://svn.reactos.org/svn/reactos?rev=63406&view=rev Log: [NTOSKRNL] Pass process id to DbgUnLoadImageSymbols instead of ZwCurrentProcess() or a PEPROCESS. Patch by Jérôme Gardou <jerome.gardou at reactos dot org> CORE-8253 #resolve Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/kd64/kdinit.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=634… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu May 22 10:18:22 2014 @@ -846,7 +846,7 @@ /* Load the symbols */ DbgLoadImageSymbols(&SymbolString, LdrEntry->DllBase, - (ULONG_PTR)ZwCurrentProcess()); + (ULONG_PTR)PsGetCurrentProcessId()); } } Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Thu May 22 10:18:22 2014 @@ -356,7 +356,7 @@ RtlInitString(&ImageName, NameBuffer); DbgLoadImageSymbols(&ImageName, LdrEntry->DllBase, - (ULONG_PTR)ZwCurrentProcess()); + (ULONG_PTR)PsGetCurrentProcessId()); /* Go to the next entry */ NextEntry = NextEntry->Flink; Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Thu May 22 10:18:22 2014 @@ -1185,7 +1185,7 @@ Status = RtlUnicodeStringToAnsiString(&FileNameA, FileName, TRUE); if (NT_SUCCESS(Status)) { - DbgLoadImageSymbols(&FileNameA, BaseAddress, (ULONG_PTR)Process); + DbgLoadImageSymbols(&FileNameA, BaseAddress, (ULONG_PTR)Process->UniqueProcessId); RtlFreeAnsiString(&FileNameA); } } Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Thu May 22 10:18:22 2014 @@ -928,7 +928,7 @@ /* Unload the symbols */ DbgUnLoadImageSymbols(&TempName, BaseAddress, - (ULONG_PTR)ZwCurrentProcess()); + (ULONG_PTR)PsGetCurrentProcessId()); RtlFreeAnsiString(&TempName); } } @@ -3309,7 +3309,7 @@ /* Notify the debugger */ DbgLoadImageSymbols(&AnsiTemp, LdrEntry->DllBase, - (ULONG_PTR)ZwCurrentProcess()); + (ULONG_PTR)PsGetCurrentProcessId()); LdrEntry->Flags |= LDRP_DEBUG_SYMBOLS_LOADED; }

10 years, 7 months

[tkreuzer] 63405: [NTOSKRNL] - Do not align the size of a memory area to the allocation granularity, but to PAGE_SIZE. Fixes OllyDbg regression from r61108. CORE-8168 #resolve - Clarify the size ca...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 22 10:08:44 2014 New Revision: 63405 URL: http://svn.reactos.org/svn/reactos?rev=63405&view=rev Log: [NTOSKRNL] - Do not align the size of a memory area to the allocation granularity, but to PAGE_SIZE. Fixes OllyDbg regression from r61108. CORE-8168 #resolve - Clarify the size calculation in MmCreateMemoryArea - Silence a few DPRINTs Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu May 22 10:08:44 2014 @@ -1100,11 +1100,11 @@ /* Check if this process is the owner, and that the thread owns the WS */ if (PsGetCurrentThread()->OwnsProcessWorkingSetExclusive == 0) { - DPRINT1("Thread: %p is not an owner\n", PsGetCurrentThread()); + DPRINT("Thread: %p is not an owner\n", PsGetCurrentThread()); } if (KeGetCurrentThread()->ApcState.Process != &Process->Pcb) { - DPRINT1("Current thread %p is attached to another process %p\n", PsGetCurrentThread(), Process); + DPRINT("Current thread %p is attached to another process %p\n", PsGetCurrentThread(), Process); } return ((KeGetCurrentThread()->ApcState.Process == &Process->Pcb) && ((PsGetCurrentThread()->OwnsProcessWorkingSetExclusive) || Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu May 22 10:08:44 2014 @@ -1291,10 +1291,10 @@ } /* This is software PTE */ - DPRINT1("Prototype PTE: %lx %p\n", TempPte.u.Hard.PageFrameNumber, Pfn); - DPRINT1("VA: %p\n", MiPteToAddress(&TempPte)); - DPRINT1("Mask: %lx\n", TempPte.u.Soft.Protection); - DPRINT1("Mask2: %lx\n", Pfn->OriginalPte.u.Soft.Protection); + DPRINT("Prototype PTE: %lx %p\n", TempPte.u.Hard.PageFrameNumber, Pfn); + DPRINT("VA: %p\n", MiPteToAddress(&TempPte)); + DPRINT("Mask: %lx\n", TempPte.u.Soft.Protection); + DPRINT("Mask2: %lx\n", Pfn->OriginalPte.u.Soft.Protection); return MmProtectToValue[TempPte.u.Soft.Protection]; } Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=63… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu May 22 10:08:44 2014 @@ -988,6 +988,7 @@ { ULONG_PTR tmpLength; PMEMORY_AREA MemoryArea; + ULONG_PTR EndingAddress; DPRINT("MmCreateMemoryArea(Type 0x%lx, BaseAddress %p, " "*BaseAddress %p, Length %p, AllocationFlags %x, " @@ -997,7 +998,7 @@ if ((*BaseAddress) == 0 && !FixedAddress) { - tmpLength = (ULONG_PTR)MM_ROUND_UP(Length, Granularity); + tmpLength = (ULONG_PTR)MM_ROUND_UP(Length, PAGE_SIZE); *BaseAddress = MmFindGap(AddressSpace, tmpLength, Granularity, @@ -1010,10 +1011,9 @@ } else { - tmpLength = Length + ((ULONG_PTR) *BaseAddress - - (ULONG_PTR) MM_ROUND_DOWN(*BaseAddress, Granularity)); - tmpLength = (ULONG_PTR)MM_ROUND_UP(tmpLength, Granularity); - *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); + EndingAddress = ((ULONG_PTR)*BaseAddress + Length - 1) | (PAGE_SIZE - 1); + *BaseAddress = ALIGN_DOWN_POINTER_BY(*BaseAddress, Granularity); + tmpLength = EndingAddress + 1 - (ULONG_PTR)*BaseAddress; if (!MmGetAddressSpaceOwner(AddressSpace) && *BaseAddress < MmSystemRangeStart) {

10 years, 7 months

[khornicek] 63404: [WIN32K] - make DIB_XXBPP_StretchBlt work with top down bitmaps - fixes missing icons in the taskbar in explorer new (32bpp)

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu May 22 09:33:29 2014 New Revision: 63404 URL: http://svn.reactos.org/svn/reactos?rev=63404&view=rev Log: [WIN32K] - make DIB_XXBPP_StretchBlt work with top down bitmaps - fixes missing icons in the taskbar in explorer new (32bpp) Modified: trunk/reactos/win32ss/gdi/dib/stretchblt.c Modified: trunk/reactos/win32ss/gdi/dib/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/dib/stretchblt… ============================================================================== --- trunk/reactos/win32ss/gdi/dib/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/dib/stretchblt.c [iso-8859-1] Thu May 22 09:33:29 2014 @@ -29,6 +29,8 @@ LONG DstWidth; LONG SrcHeight; LONG SrcWidth; + LONG MaskCy; + LONG SourceCy; ULONG Color; ULONG Dest, Source = 0, Pattern = 0; @@ -56,6 +58,7 @@ if (UsesSource) { + SourceCy = abs(SourceSurf->sizlBitmap.cy); fnSource_GetPixel = DibFunctionsForBitmapFormat[SourceSurf->iBitmapFormat].DIB_GetPixel; DPRINT("Source BPP: %u, srcRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); @@ -64,6 +67,7 @@ if (MaskSurf) { fnMask_GetPixel = DibFunctionsForBitmapFormat[MaskSurf->iBitmapFormat].DIB_GetPixel; + MaskCy = abs(MaskSurf->sizlBitmap.cy); } DstHeight = DestRect->bottom - DestRect->top; @@ -124,7 +128,7 @@ { sx = SourceRect->left+(DesX - DestRect->left) * SrcWidth / DstWidth; if (sx < 0 || sy < 0 || - MaskSurf->sizlBitmap.cx < sx || MaskSurf->sizlBitmap.cy < sy || + MaskSurf->sizlBitmap.cx < sx || MaskCy < sy || fnMask_GetPixel(MaskSurf, sx, sy) != 0) { CanDraw = FALSE; @@ -135,7 +139,7 @@ { sx = SourceRect->left+(DesX - DestRect->left) * SrcWidth / DstWidth; if (sx >= 0 && sy >= 0 && - SourceSurf->sizlBitmap.cx > sx && SourceSurf->sizlBitmap.cy > sy) + SourceSurf->sizlBitmap.cx > sx && SourceCy > sy) { Source = XLATEOBJ_iXlate(ColorTranslation, fnSource_GetPixel(SourceSurf, sx, sy)); }

10 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
44
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 May 2014