Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[pschweitzer] 60811: [NTOSKRNL] - Finally fully implement FstubVerifyPartitionTableEFI(). It is capable of fixing a GPT disk. - Fix implementation of FstubReadHeaderEFI() (which returns a pointer t...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Oct 31 18:03:48 2013 New Revision: 60811 URL: http://svn.reactos.org/svn/reactos?rev=60811&view=rev Log: [NTOSKRNL] - Finally fully implement FstubVerifyPartitionTableEFI(). It is capable of fixing a GPT disk. - Fix implementation of FstubReadHeaderEFI() (which returns a pointer to the header). Fixed all the other functions accordingly. Note that you have to be careful when using Disk->Buffer. You can easily read a buffer that doesn't contain your data anylonger. - Fix implementation of FstubReadPartitionTableEFI(). It was improperly dealing with the backup table. Now, it will look for it and replace/recreate it if not found where expected. - Fix implementation of FstubWriteEntryEFI(). The computation of memory placement was wrong, and thus it was missing partitions and causing corruption. Thank you checksums! In case you format a disk with GPT using Linux (with GParted, for instance), don't be surprised if once started with ReactOS your GPT is modified, and especially its backup table moved. They don't have the same sector counts. It was a nice way to tests whether ReactOS properly write GPT. Which it does now :-). Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Thu Oct 31 18:03:48 2013 @@ -134,6 +134,17 @@ NTSTATUS NTAPI +FstubWriteHeaderEFI(IN PDISK_INFORMATION Disk, + IN ULONG PartitionsSizeSector, + IN GUID DiskGUID, + IN ULONG NumberOfEntries, + IN ULONGLONG FirstUsableLBA, + IN ULONGLONG LastUsableLBA, + IN ULONG PartitionEntryCRC32, + IN BOOLEAN WriteBackupTable); + +NTSTATUS +NTAPI FstubWritePartitionTableEFI(IN PDISK_INFORMATION Disk, IN GUID DiskGUID, IN ULONG MaxPartitionCount, @@ -220,7 +231,7 @@ } else { - DiskInformation->DiskGeometry = *DiskGeometry; + RtlCopyMemory(&DiskInformation->DiskGeometry, DiskGeometry, sizeof(DISK_GEOMETRY_EX)); } /* Ensure read/received information are correct */ @@ -799,7 +810,7 @@ NTAPI FstubReadHeaderEFI(IN PDISK_INFORMATION Disk, IN BOOLEAN ReadBackupTable, - PEFI_PARTITION_HEADER HeaderBuffer) + PEFI_PARTITION_HEADER * HeaderBuffer) { NTSTATUS Status; PUCHAR Sector = NULL; @@ -931,7 +942,7 @@ if (PreviousCRC32 == EFIHeader->PartitionEntryCRC32) { /* In case of a success, return read header */ - *HeaderBuffer = *EFIHeader; + *HeaderBuffer = EFIHeader; return STATUS_SUCCESS; } else @@ -949,10 +960,11 @@ OUT struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout) { NTSTATUS Status; - EFI_PARTITION_HEADER EfiHeader; - ULONGLONG SectorsForPartitions; + ULONG NumberOfEntries; + PEFI_PARTITION_HEADER EfiHeader; EFI_PARTITION_ENTRY PartitionEntry; BOOLEAN UpdatedPartitionTable = FALSE; + ULONGLONG SectorsForPartitions, PartitionEntryLBA; PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL; ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector; PAGED_CODE(); @@ -971,27 +983,34 @@ return Status; } + /* Backup the number of entries, will be used later on */ + NumberOfEntries = EfiHeader->NumberOfEntries; + /* Allocate a DRIVE_LAYOUT_INFORMATION_EX struct big enough */ DriveLayoutEx = ExAllocatePoolWithTag(NonPagedPool, FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION_EX, PartitionEntry) + - EfiHeader.NumberOfEntries * sizeof(PARTITION_INFORMATION_EX), + EfiHeader->NumberOfEntries * sizeof(PARTITION_INFORMATION_EX), TAG_FSTUB); if (!DriveLayoutEx) { return STATUS_INSUFFICIENT_RESOURCES; } - if (ReadBackupTable) - { - /* If we read backup but if it doesn't match with current geometry */ - if ((Disk->SectorCount - 1ULL) != EfiHeader.AlternateLBA) + if (!ReadBackupTable) + { + /* If we weren't ask to read backup table, + * check the status of the backup table. + * In case it's not where we're expecting it, move it and ask + * for a partition table rewrite. + */ + if ((Disk->SectorCount - 1ULL) != EfiHeader->AlternateLBA) { /* We'll update it. First, count number of sectors needed to store partitions */ - SectorsForPartitions = ((ULONGLONG)EfiHeader.NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; + SectorsForPartitions = (EfiHeader->NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; /* Then set first usable LBA: Legacy MBR + GPT header + Partitions entries */ - EfiHeader.FirstUsableLBA = SectorsForPartitions + 2; + EfiHeader->FirstUsableLBA = SectorsForPartitions + 2; /* Then set last usable LBA: Last sector - GPT header - Partitions entries */ - EfiHeader.LastUsableLBA = Disk->SectorCount - SectorsForPartitions - 1; + EfiHeader->LastUsableLBA = Disk->SectorCount - SectorsForPartitions - 1; /* Inform that we'll rewrite partition table */ UpdatedPartitionTable = TRUE; } @@ -999,16 +1018,21 @@ DriveLayoutEx->PartitionStyle = PARTITION_STYLE_GPT; /* Translate LBA -> Offset */ - DriveLayoutEx->Gpt.StartingUsableOffset.QuadPart = EfiHeader.FirstUsableLBA * Disk->SectorSize; - DriveLayoutEx->Gpt.UsableLength.QuadPart = EfiHeader.LastUsableLBA - EfiHeader.FirstUsableLBA * Disk->SectorSize; - DriveLayoutEx->Gpt.MaxPartitionCount = EfiHeader.NumberOfEntries; - DriveLayoutEx->Gpt.DiskId = EfiHeader.DiskGUID; - + DriveLayoutEx->Gpt.StartingUsableOffset.QuadPart = EfiHeader->FirstUsableLBA * Disk->SectorSize; + DriveLayoutEx->Gpt.UsableLength.QuadPart = EfiHeader->LastUsableLBA - EfiHeader->FirstUsableLBA * Disk->SectorSize; + DriveLayoutEx->Gpt.MaxPartitionCount = EfiHeader->NumberOfEntries; + DriveLayoutEx->Gpt.DiskId = EfiHeader->DiskGUID; + + /* Backup partition entry position */ + PartitionEntryLBA = EfiHeader->PartitionEntryLBA; /* Count number of partitions per sector */ PartitionsPerSector = (Disk->SectorSize / PARTITION_ENTRY_SIZE); - /* Read all partitions and fill in structure */ + /* Read all partitions and fill in structure + * BEWARE! Past that point EfiHeader IS NOT VALID ANYMORE + * It will be erased by the reading of the partition entry + */ for (i = 0, PartitionCount = 0, PartitionIndex = PartitionsPerSector; - i < EfiHeader.NumberOfEntries; + i < NumberOfEntries; i++) { /* Only read following sector if we finished with previous sector */ @@ -1016,7 +1040,7 @@ { Status = FstubReadSector(Disk->DeviceObject, Disk->SectorSize, - EfiHeader.PartitionEntryLBA + (i / PartitionsPerSector), + PartitionEntryLBA + (i / PartitionsPerSector), Disk->Buffer); if (!NT_SUCCESS(Status)) { @@ -1245,9 +1269,9 @@ IN BOOLEAN FixErrors) { NTSTATUS Status; - PEFI_PARTITION_HEADER EFIHeader; - EFI_PARTITION_HEADER ReadEFIHeader; - BOOLEAN PrimaryValid = FALSE, BackupValid = FALSE; + PEFI_PARTITION_HEADER EFIHeader, ReadEFIHeader; + BOOLEAN PrimaryValid = FALSE, BackupValid = FALSE, WriteBackup; + ULONGLONG ReadPosition, WritePosition, SectorsForPartitions, PartitionIndex; PAGED_CODE(); EFIHeader = ExAllocatePoolWithTag(NonPagedPool, sizeof(EFI_PARTITION_HEADER), TAG_FSTUB); @@ -1260,43 +1284,112 @@ if (NT_SUCCESS(Status)) { PrimaryValid = TRUE; + ASSERT(ReadEFIHeader); + RtlCopyMemory(EFIHeader, ReadEFIHeader, sizeof(EFI_PARTITION_HEADER)); } Status = FstubReadHeaderEFI(Disk, TRUE, &ReadEFIHeader); if (NT_SUCCESS(Status)) { BackupValid = TRUE; - } - - if (!PrimaryValid) - { - if (!BackupValid || !FixErrors) - { - ExFreePoolWithTag(EFIHeader, TAG_FSTUB); - return STATUS_DISK_CORRUPT_ERROR; - } - - DPRINT1("EFI::Partition table fixing not yet supported!\n"); - ExFreePoolWithTag(EFIHeader, TAG_FSTUB); - return STATUS_NOT_IMPLEMENTED; - } - else if (!BackupValid) - { - if (!PrimaryValid || !FixErrors) - { - ExFreePoolWithTag(EFIHeader, TAG_FSTUB); - return STATUS_DISK_CORRUPT_ERROR; - } - - DPRINT1("EFI::Partition table fixing not yet supported!\n"); - ExFreePoolWithTag(EFIHeader, TAG_FSTUB); - return STATUS_NOT_IMPLEMENTED; - } - else + ASSERT(ReadEFIHeader); + RtlCopyMemory(EFIHeader, ReadEFIHeader, sizeof(EFI_PARTITION_HEADER)); + } + + /* If both are sane, just return */ + if (PrimaryValid && BackupValid) { ExFreePoolWithTag(EFIHeader, TAG_FSTUB); return STATUS_SUCCESS; } + + /* If both are damaged OR if we have not been ordered to fix + * Then, quit and warn about disk corruption + */ + if ((!PrimaryValid && !BackupValid) || !FixErrors) + { + ExFreePoolWithTag(EFIHeader, TAG_FSTUB); + return STATUS_DISK_CORRUPT_ERROR; + } + + /* Compute sectors taken by partitions */ + SectorsForPartitions = ((EFIHeader->NumberOfEntries * PARTITION_ENTRY_SIZE) + Disk->SectorSize - 1) / Disk->SectorSize; + if (PrimaryValid) + { + WriteBackup = TRUE; + /* Take position at backup table for writing */ + WritePosition = Disk->SectorCount - SectorsForPartitions; + /* And read from primary table */ + ReadPosition = 2ULL; + + DPRINT("EFI::Will repair backup table from primary\n"); + } + else + { + ASSERT(BackupValid); + WriteBackup = FALSE; + /* Take position at primary table for writing */ + WritePosition = 2ULL; + /* And read from backup table */ + ReadPosition = Disk->SectorCount - SectorsForPartitions; + + DPRINT("EFI::Will repair primary table from backup\n"); + } + + PartitionIndex = 0ULL; + + /* If no partitions are to be copied, just restore header */ + if (SectorsForPartitions <= 0) + { + Status = FstubWriteHeaderEFI(Disk, + SectorsForPartitions, + EFIHeader->DiskGUID, + EFIHeader->NumberOfEntries, + EFIHeader->FirstUsableLBA, + EFIHeader->LastUsableLBA, + EFIHeader->PartitionEntryCRC32, + WriteBackup); + + goto Cleanup; + } + + /* Copy all the partitions */ + for (; PartitionIndex < SectorsForPartitions; ++PartitionIndex) + { + /* First, read the partition from the first table */ + Status = FstubReadSector(Disk->DeviceObject, + Disk->SectorSize, + ReadPosition + PartitionIndex, + Disk->Buffer); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Then, write it in the other table */ + Status = FstubWriteSector(Disk->DeviceObject, + Disk->SectorSize, + WritePosition + PartitionIndex, + Disk->Buffer); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + } + + /* Now we're done, write the header */ + Status = FstubWriteHeaderEFI(Disk, + SectorsForPartitions, + EFIHeader->DiskGUID, + EFIHeader->NumberOfEntries, + EFIHeader->FirstUsableLBA, + EFIHeader->LastUsableLBA, + EFIHeader->PartitionEntryCRC32, + WriteBackup); + +Cleanup: + ExFreePoolWithTag(EFIHeader, TAG_FSTUB); + return Status; } NTSTATUS @@ -1384,7 +1477,7 @@ /* Copy the entry at the proper place into the buffer * That way, we don't erase previous entries */ - RtlCopyMemory(Disk->Buffer + (((PartitionEntryNumber * PARTITION_ENTRY_SIZE) % Disk->SectorSize) / sizeof(PUSHORT)), + RtlCopyMemory((PVOID)((ULONG_PTR)Disk->Buffer + ((PartitionEntryNumber * PARTITION_ENTRY_SIZE) % Disk->SectorSize)), PartitionEntry, sizeof(EFI_PARTITION_ENTRY)); /* Compute size of buffer */ @@ -1403,6 +1496,7 @@ { return Status; } + /* We clean buffer */ RtlZeroMemory(Disk->Buffer, Disk->SectorSize); } @@ -1484,13 +1578,18 @@ /* Debug the way we'll break disk, to let user pray */ DPRINT("FSTUB: About to write the following header for %s table\n", (WriteBackupTable ? "backup" : "primary")); - DPRINT(" Signature: %I64x\n Revision: %x\n HeaderSize: %x\n HeaderCRC32: %x\n", - EFIHeader->Signature, EFIHeader->Revision, EFIHeader->HeaderSize, EFIHeader->HeaderCRC32); - DPRINT(" MyLBA: %I64x\n AlternateLBA: %I64x\n FirstUsableLBA: %I64x\n LastUsableLBA: %I64x\n", - EFIHeader->MyLBA, EFIHeader->AlternateLBA, EFIHeader->FirstUsableLBA, EFIHeader->LastUsableLBA); - DPRINT(" PartitionEntryLBA: %I64x\n NumberOfEntries: %x\n SizeOfPartitionEntry: %x\n PartitionEntryCRC32: %x\n", - EFIHeader->PartitionEntryLBA, EFIHeader->NumberOfEntries, - EFIHeader->SizeOfPartitionEntry, EFIHeader->PartitionEntryCRC32); + DPRINT(" Signature: %I64x\n", EFIHeader->Signature); + DPRINT(" Revision: %x\n", EFIHeader->Revision); + DPRINT(" HeaderSize: %x\n", EFIHeader->HeaderSize); + DPRINT(" HeaderCRC32: %x\n", EFIHeader->HeaderCRC32); + DPRINT(" MyLBA: %I64x\n", EFIHeader->MyLBA); + DPRINT(" AlternateLBA: %I64x\n", EFIHeader->AlternateLBA); + DPRINT(" FirstUsableLBA: %I64x\n", EFIHeader->FirstUsableLBA); + DPRINT(" LastUsableLBA: %I64x\n", EFIHeader->LastUsableLBA); + DPRINT(" PartitionEntryLBA: %I64x\n", EFIHeader->PartitionEntryLBA); + DPRINT(" NumberOfEntries: %x\n", EFIHeader->NumberOfEntries); + DPRINT(" SizeOfPartitionEntry: %x\n", EFIHeader->SizeOfPartitionEntry); + DPRINT(" PartitionEntryCRC32: %x\n", EFIHeader->PartitionEntryCRC32); /* Write header to disk */ return FstubWriteSector(Disk->DeviceObject, @@ -2324,10 +2423,12 @@ IoWritePartitionTableEx(IN PDEVICE_OBJECT DeviceObject, IN struct _DRIVE_LAYOUT_INFORMATION_EX* DriveLayout) { + GUID DiskGuid; NTSTATUS Status; + ULONG NumberOfEntries; PDISK_INFORMATION Disk; - ULONGLONG SectorsForPartitions; - EFI_PARTITION_HEADER EfiHeader; + PEFI_PARTITION_HEADER EfiHeader; + ULONGLONG SectorsForPartitions, FirstUsableLBA, LastUsableLBA; PAGED_CODE(); ASSERT(DeviceObject); @@ -2367,20 +2468,23 @@ if (NT_SUCCESS(Status)) { /* Check if there are enough places for the partitions to be written */ - if (DriveLayout->PartitionCount <= EfiHeader.NumberOfEntries) + if (DriveLayout->PartitionCount <= EfiHeader->NumberOfEntries) { + /* Backup data */ + NumberOfEntries = EfiHeader->NumberOfEntries; + RtlCopyMemory(&DiskGuid, &EfiHeader->DiskGUID, sizeof(GUID)); /* Count number of sectors needed to store partitions */ - SectorsForPartitions = (EfiHeader.NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; + SectorsForPartitions = (NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; /* Set first usable LBA: Legacy MBR + GPT header + Partitions entries */ - EfiHeader.FirstUsableLBA = SectorsForPartitions + 2; + FirstUsableLBA = SectorsForPartitions + 2; /* Set last usable LBA: Last sector - GPT header - Partitions entries */ - EfiHeader.LastUsableLBA = Disk->SectorCount - SectorsForPartitions - 1; + LastUsableLBA = Disk->SectorCount - SectorsForPartitions - 1; /* Write primary table */ Status = FstubWritePartitionTableEFI(Disk, - EfiHeader.DiskGUID, - EfiHeader.NumberOfEntries, - EfiHeader.FirstUsableLBA, - EfiHeader.LastUsableLBA, + DiskGuid, + NumberOfEntries, + FirstUsableLBA, + LastUsableLBA, FALSE, DriveLayout->PartitionCount, DriveLayout->PartitionEntry); @@ -2388,10 +2492,10 @@ if (NT_SUCCESS(Status)) { Status = FstubWritePartitionTableEFI(Disk, - EfiHeader.DiskGUID, - EfiHeader.NumberOfEntries, - EfiHeader.FirstUsableLBA, - EfiHeader.LastUsableLBA, + DiskGuid, + NumberOfEntries, + FirstUsableLBA, + LastUsableLBA, TRUE, DriveLayout->PartitionCount, DriveLayout->PartitionEntry);

10 years, 10 months

[akhaldi] 60810: [USER32] * Fix MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 31 17:45:16 2013 New Revision: 60810 URL: http://svn.reactos.org/svn/reactos?rev=60810&view=rev Log: [USER32] * Fix MSVC build. Modified: trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Thu Oct 31 17:45:16 2013 @@ -218,9 +218,12 @@ { LONG ret; UINT cp = GdiGetCodePage( hDC ); // CP_ACP - DWORD len = MultiByteToWideChar(cp, 0, lpString, nCount, NULL, 0); + DWORD len; + LPWSTR strW; + + len = MultiByteToWideChar(cp, 0, lpString, nCount, NULL, 0); if (!len) return 0; - LPWSTR strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!strW) return 0; MultiByteToWideChar(cp, 0, lpString, nCount, strW, len); ret = GetTabbedTextExtentW(hDC, strW, len, nTabPositions, lpnTabStopPositions);

10 years, 10 months

[jimtabor] 60809: - Fix build

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 31 17:21:04 2013 New Revision: 60809 URL: http://svn.reactos.org/svn/reactos?rev=60809&view=rev Log: - Fix build Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Oct 31 17:21:04 2013 @@ -14356,7 +14356,10 @@ test_combobox_messages(); test_wmime_keydown_message(); test_paint_messages(); -// test_interthread_messages(); ReactOS ActivateActCtx seems to be broken. + if(!winetest_interactive) + skip("ReactOS ActivateActCtx seems to be broken.\n"); + else + test_interthread_messages(); test_message_conversion(); test_accelerators(); test_timers();

10 years, 10 months

[jimtabor] 60808: - ActivateActCtx seems to be broken, skip test.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 31 17:15:49 2013 New Revision: 60808 URL: http://svn.reactos.org/svn/reactos?rev=60808&view=rev Log: - ActivateActCtx seems to be broken, skip test. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Oct 31 17:15:49 2013 @@ -14356,7 +14356,7 @@ test_combobox_messages(); test_wmime_keydown_message(); test_paint_messages(); - test_interthread_messages(); +// test_interthread_messages(); ReactOS ActivateActCtx seems to be broken. test_message_conversion(); test_accelerators(); test_timers();

10 years, 10 months

[jimtabor] 60807: - Fix Text tests. Update wine sync.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 31 16:54:01 2013 New Revision: 60807 URL: http://svn.reactos.org/svn/reactos?rev=60807&view=rev Log: - Fix Text tests. Update wine sync. Modified: trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Thu Oct 31 16:54:01 2013 @@ -32,6 +32,9 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(text); + +DWORD WINAPI GdiGetCodePage(HDC hdc); + /* FUNCTIONS *****************************************************************/ @@ -71,14 +74,13 @@ LONG ret; DWORD len; LPWSTR strW; - - len = MultiByteToWideChar(CP_ACP, 0, lpString, nCount, NULL, 0); + UINT cp = GdiGetCodePage( hDC ); // CP_ACP + + len = MultiByteToWideChar(cp, 0, lpString, nCount, NULL, 0); + if (!len) return 0; strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!strW) - { - return 0; - } - MultiByteToWideChar(CP_ACP, 0, lpString, nCount, strW, len); + if (!strW) return 0; + MultiByteToWideChar(cp, 0, lpString, nCount, strW, len); ret = TabbedTextOutW(hDC, X, Y, strW, len, nTabPositions, lpnTabStopPositions, nTabOrigin); HeapFree(GetProcessHeap(), 0, strW); return ret; @@ -215,20 +217,16 @@ CONST INT *lpnTabStopPositions) { LONG ret; - DWORD len = MultiByteToWideChar(CP_ACP, 0, lpString, nCount, NULL, 0); + UINT cp = GdiGetCodePage( hDC ); // CP_ACP + DWORD len = MultiByteToWideChar(cp, 0, lpString, nCount, NULL, 0); + if (!len) return 0; LPWSTR strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - - if (!strW) - return 0; - MultiByteToWideChar(CP_ACP, 0, lpString, nCount, strW, len); - - ret = GetTabbedTextExtentW(hDC, strW, len, nTabPositions, - lpnTabStopPositions); - + if (!strW) return 0; + MultiByteToWideChar(cp, 0, lpString, nCount, strW, len); + ret = GetTabbedTextExtentW(hDC, strW, len, nTabPositions, lpnTabStopPositions); HeapFree(GetProcessHeap(), 0, strW); return ret; } - /* * @implemented @@ -293,6 +291,8 @@ #define CR 13 #define SPACE 32 #define PREFIX 38 +#define ALPHA_PREFIX 30 /* Win16: Alphabet prefix */ +#define KANA_PREFIX 31 /* Win16: Katakana prefix */ #define FORWARD_SLASH '/' #define BACK_SLASH '\\' @@ -711,8 +711,9 @@ max -= n; while (n--) { - if (*start_str++ == PREFIX && max--) + if ((*start_str == PREFIX || *start_str == ALPHA_PREFIX) && max--) start_str++; + start_str++; } start_count -= (start_str - str_on_entry); } @@ -746,10 +747,10 @@ const ellipsis_data *pe) { int result = -1; - unsigned int i = 0; + unsigned int i; unsigned int n = pe->before + pe->under + pe->after; assert (n <= ns); - while (i < n) + for (i = 0; i < n; i++, str++) { if (i == (unsigned int) pe->before) { @@ -762,16 +763,15 @@ } if (!ns) break; ns--; - if (*str++ == PREFIX) - { + if (*str++ == PREFIX || *str == ALPHA_PREFIX) + { + str++; if (!ns) break; if (*str != PREFIX) result = (i < (unsigned int) pe->before || pe->under == 0) ? i : i - pe->under + pe->len; /* pe->len may be non-zero while pe_under is zero */ - str++; ns--; } - i++; } return result; } @@ -870,8 +870,13 @@ (str[i] != TAB || !(format & DT_EXPANDTABS)) && ((str[i] != CR && str[i] != LF) || (format & DT_SINGLELINE))) { - if (str[i] == PREFIX && !(format & DT_NOPREFIX) && *count > 1) + if ((format & DT_NOPREFIX) || *count <= 1) { + (*count)--; if (j < maxl) dest[j++] = str[i++]; else i++; + continue; + } + + if (str[i] == PREFIX || str[i] == ALPHA_PREFIX) { (*count)--, i++; /* Throw away the prefix itself */ if (str[i] == PREFIX) { @@ -887,6 +892,12 @@ * one. */ } + else if (str[i] == KANA_PREFIX) + { + /* Throw away katakana access keys */ + (*count)--, i++; /* skip the prefix */ + (*count)--, i++; /* skip the letter */ + } else { (*count)--; if (j < maxl) dest[j++] = str[i++]; else i++; @@ -1283,10 +1294,6 @@ } return y - rect->top; } - -DWORD -WINAPI -GdiGetCodePage(HDC hdc); /*********************************************************************** * DrawTextExA (USER32.@)

10 years, 10 months

[jimtabor] 60806: - Add message type to debug.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 31 16:52:18 2013 New Revision: 60806 URL: http://svn.reactos.org/svn/reactos?rev=60806&view=rev Log: - Add message type to debug. Modified: trunk/reactos/win32ss/user/ntuser/callback.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Thu Oct 31 16:52:18 2013 @@ -334,7 +334,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Failed to copy result from user mode!\n"); + ERR("Failed to copy result from user mode Message %d!\n", Message); Status = _SEH2_GetExceptionCode(); } _SEH2_END;

10 years, 10 months

[tfaber] 60805: [SHELL32] - Fix copy/paste in shell views when multiple files are selected. Patch by Huw Campbell CORE-4771

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 31 16:46:14 2013 New Revision: 60805 URL: http://svn.reactos.org/svn/reactos?rev=60805&view=rev Log: [SHELL32] - Fix copy/paste in shell views when multiple files are selected. Patch by Huw Campbell CORE-4771 Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/fs.cpp Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Thu Oct 31 16:46:14 2013 @@ -1283,14 +1283,16 @@ } op.pTo = szTargetPath; + op.fFlags = 0; } else { op.pTo = pszTargetList; + op.fFlags = FOF_MULTIDESTFILES; } op.hwnd = GetActiveWindow(); op.wFunc = FO_COPY; - op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; res = SHFileOperationW(&op); Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Thu Oct 31 16:46:14 2013 @@ -1124,14 +1124,16 @@ } op.pTo = szTargetPath; + op.fFlags = 0; } else { op.pTo = pszTargetList; + op.fFlags = FOF_MULTIDESTFILES; } op.hwnd = GetActiveWindow(); op.wFunc = FO_COPY; - op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; res = SHFileOperationW(&op);

10 years, 10 months

[tfaber] 60804: [SHELL32] - Handle invalid cbSize in Shell_NotifyIcon[AW]. Patch by Ivan Rodionov. - Use FIELD_OFFSET for variable-length structure CORE-7164

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 31 16:21:57 2013 New Revision: 60804 URL: http://svn.reactos.org/svn/reactos?rev=60804&view=rev Log: [SHELL32] - Handle invalid cbSize in Shell_NotifyIcon[AW]. Patch by Ivan Rodionov. - Use FIELD_OFFSET for variable-length structure CORE-7164 Modified: trunk/reactos/dll/win32/shell32/systray.cpp Modified: trunk/reactos/dll/win32/shell32/systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/systray.… ============================================================================== --- trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] Thu Oct 31 16:21:57 2013 @@ -21,6 +21,8 @@ #include "precomp.h" +WINE_DEFAULT_DEBUG_CHANNEL(shell); + /* copy data structure for tray notifications */ typedef struct TrayNotifyCDS_Dummy { DWORD cookie; @@ -29,13 +31,13 @@ } TrayNotifyCDS_Dummy; /* The only difference between Shell_NotifyIconA and Shell_NotifyIconW is the call to SendMessageA/W. */ -static BOOL SHELL_NotifyIcon(DWORD dwMessage, void* pnid, HWND nid_hwnd, int nid_size, BOOL unicode) +static BOOL SHELL_NotifyIcon(DWORD dwMessage, void* pnid, HWND nid_hwnd, DWORD nid_size, BOOL unicode) { HWND hwnd; COPYDATASTRUCT data; BOOL ret = FALSE; - int len = sizeof(TrayNotifyCDS_Dummy) - sizeof(DWORD) + nid_size; + int len = FIELD_OFFSET(TrayNotifyCDS_Dummy, nicon_data) + nid_size; TrayNotifyCDS_Dummy* pnotify_data = (TrayNotifyCDS_Dummy*) alloca(len); @@ -61,7 +63,21 @@ */ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) { - return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, pnid->cbSize, FALSE); + DWORD cbSize; + + /* Validate the cbSize as Windows XP does */ + if (pnid->cbSize != NOTIFYICONDATAA_V1_SIZE && + pnid->cbSize != NOTIFYICONDATAA_V2_SIZE && + pnid->cbSize != sizeof(NOTIFYICONDATAA)) + { + WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", + pnid->cbSize, NOTIFYICONDATAA_V1_SIZE); + cbSize = NOTIFYICONDATAA_V1_SIZE; + } + else + cbSize = pnid->cbSize; + + return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, cbSize, FALSE); } /************************************************************************* @@ -69,5 +85,19 @@ */ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid) { - return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, pnid->cbSize, TRUE); + DWORD cbSize; + + /* Validate the cbSize so that WM_COPYDATA doesn't crash the application */ + if (pnid->cbSize != NOTIFYICONDATAW_V1_SIZE && + pnid->cbSize != NOTIFYICONDATAW_V2_SIZE && + pnid->cbSize != sizeof(NOTIFYICONDATAW)) + { + WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", + pnid->cbSize, NOTIFYICONDATAW_V1_SIZE); + cbSize = NOTIFYICONDATAA_V1_SIZE; + } + else + cbSize = pnid->cbSize; + + return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, cbSize, TRUE); }

10 years, 10 months

[tfaber] 60803: [CMAKE] - Add /FS to VS 2013 build to fix issues with concurrent access to PDB files. Patch by David Quintana - Use subsystem version 5.02 for x64, because 5.01 doesn't exist CORE-7...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 31 09:59:55 2013 New Revision: 60803 URL: http://svn.reactos.org/svn/reactos?rev=60803&view=rev Log: [CMAKE] - Add /FS to VS 2013 build to fix issues with concurrent access to PDB files. Patch by David Quintana - Use subsystem version 5.02 for x64, because 5.01 doesn't exist CORE-7434 #resolve Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=60803… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Oct 31 09:59:55 2013 @@ -24,8 +24,13 @@ # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See CORE-6507 -if (MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") +if(MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") add_compile_flags("/arch:IA32") +endif () + +# VS 12+ requires /FS when used in parallel compilations +if(MSVC_VERSION GREATER 1799 AND NOT MSVC_IDE) + add_compile_flags("/FS") endif () # C++ exception specification ignored... yeah we don't care @@ -111,7 +116,11 @@ function(set_subsystem MODULE SUBSYSTEM) if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 17) - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01") + if(ARCH STREQUAL "amd64") + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.02") + else() + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01") + endif() else() add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM}") endif()

10 years, 10 months

[pschweitzer] 60802: [NTOSKRNL] Implement MiSetControlAreaSymbolsLoaded and MiLoadUserSymbols. These are responsible for marking the control area that we've loaded the symbols and for effectively l...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Oct 30 23:17:08 2013 New Revision: 60802 URL: http://svn.reactos.org/svn/reactos?rev=60802&view=rev Log: [NTOSKRNL] Implement MiSetControlAreaSymbolsLoaded and MiLoadUserSymbols. These are responsible for marking the control area that we've loaded the symbols and for effectively loading the symbols. These two functions only apply on image section! (ie, ControlArea->u.Flags.Image not null). They are only compatible with ARM3. But, for the moment, old MM is responsible for image section mapping and thus, these two functions cannot be used. Once this responsibility is transfered to ARM3, first call MiCacheImageSymbols, if successful, then call MiSetControlAreaSymbolsLoaded and MiLoadUserSymbols. After checking image was at base and GlobalMemory was not set. Once this is finally linked, this *should* fix PSAPI apitests. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c 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] Wed Oct 30 23:17:08 2013 @@ -1080,6 +1080,116 @@ return STATUS_SUCCESS; } +VOID +NTAPI +MiSetControlAreaSymbolsLoaded(IN PCONTROL_AREA ControlArea) +{ + KIRQL OldIrql; + + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + ControlArea->u.Flags.DebugSymbolsLoaded |= 1; + + ASSERT(OldIrql <= APC_LEVEL); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); +} + +VOID +NTAPI +MiLoadUserSymbols(IN PCONTROL_AREA ControlArea, + IN PVOID BaseAddress, + IN PEPROCESS Process) +{ + NTSTATUS Status; + ANSI_STRING FileNameA; + PLIST_ENTRY NextEntry; + PUNICODE_STRING FileName; + PIMAGE_NT_HEADERS NtHeaders; + PLDR_DATA_TABLE_ENTRY LdrEntry; + + FileName = &ControlArea->FilePointer->FileName; + if (FileName->Length == 0) + { + return; + } + + /* Acquire module list lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&PsLoadedModuleResource, TRUE); + + /* Browse list to try to find current module */ + for (NextEntry = MmLoadedUserImageList.Flink; + NextEntry != &MmLoadedUserImageList; + NextEntry = NextEntry->Flink) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* If already in the list, increase load count */ + if (LdrEntry->DllBase == BaseAddress) + { + ++LdrEntry->LoadCount; + break; + } + } + + /* Not in the list, we'll add it */ + if (NextEntry == &MmLoadedUserImageList) + { + /* Allocate our element, taking to the name string and its null char */ + LdrEntry = ExAllocatePoolWithTag(NonPagedPool, FileName->Length + sizeof(UNICODE_NULL) + sizeof(*LdrEntry), 'bDmM'); + if (LdrEntry) + { + memset(LdrEntry, 0, FileName->Length + sizeof(UNICODE_NULL) + sizeof(*LdrEntry)); + + _SEH2_TRY + { + /* Get image checksum and size */ + NtHeaders = RtlImageNtHeader(BaseAddress); + if (NtHeaders) + { + LdrEntry->SizeOfImage = NtHeaders->OptionalHeader.SizeOfImage; + LdrEntry->CheckSum = NtHeaders->OptionalHeader.CheckSum; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(NonPagedPool, 'bDmM'); + _SEH2_YIELD(return); + } + _SEH2_END; + + /* Fill all the details */ + LdrEntry->DllBase = BaseAddress; + LdrEntry->FullDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry + sizeof(*LdrEntry)); + LdrEntry->FullDllName.Length = FileName->Length; + LdrEntry->FullDllName.MaximumLength = FileName->Length + sizeof(UNICODE_NULL); + memcpy(LdrEntry->FullDllName.Buffer, FileName->Buffer, FileName->Length); + LdrEntry->FullDllName.Buffer[LdrEntry->FullDllName.Length / sizeof(WCHAR)] = UNICODE_NULL; + LdrEntry->LoadCount = 1; + + /* Insert! */ + InsertHeadList(&MmLoadedUserImageList, &LdrEntry->InLoadOrderLinks); + } + } + + /* Release locks */ + ExReleaseResourceLite(&PsLoadedModuleResource); + KeLeaveCriticalRegion(); + + /* Load symbols */ + Status = RtlUnicodeStringToAnsiString(&FileNameA, FileName, TRUE); + if (NT_SUCCESS(Status)) + { + DbgLoadImageSymbols(&FileNameA, BaseAddress, (ULONG_PTR)Process); + RtlFreeAnsiString(&FileNameA); + } +} + NTSTATUS NTAPI MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea,

10 years, 10 months

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 October 2013