Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[tthompson] 75284: [NTFS] - Add some fixes and improvements to mft.c from CR-123: FindAttribute() - Use * sizeof(WCHAR) in place bit-shifting wizardry. IncreaseMftSize() - Remove two useless casts....

by tthompson＠svn.reactos.org

Author: tthompson Date: Wed Jul 5 05:09:51 2017 New Revision: 75284 URL: http://svn.reactos.org/svn/reactos?rev=75284&view=rev Log: [NTFS] - Add some fixes and improvements to mft.c from CR-123: FindAttribute() - Use * sizeof(WCHAR) in place bit-shifting wizardry. IncreaseMftSize() - Remove two useless casts. Return error code if WriteAttribute() fails. SetNonResidentAttributeDataLength() - Assert that AttrContext parameter describes a NonResident attribute. When migrating a resident attribute to non-resident, don't leak memory if FsRtlInitializeLargeMcb() throws an exception, and don't mark the attribute as non-resident until after the Mcb is initialized. InternalSetResidentAttributeLength() and SetResidentAttributeLength() - Assert that AttrContext parameter describes a resident attribute. AddNewMftEntry() - Simplify math of backing up and restoring reserved bits by changing BitmapData to PUCHAR type. Don't attempt to modify a volume with more than 2^32 clusters. AddFixupArray() - Use ULONG in place of int. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Wed Jul 5 05:09:51 2017 @@ -133,7 +133,7 @@ AttrName = (PWCHAR)((PCHAR)Attribute + Attribute->NameOffset); DPRINT("%.*S, %.*S\n", Attribute->NameLength, AttrName, NameLength, Name); - if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) + if (RtlCompareMemory(AttrName, Name, NameLength * sizeof(WCHAR)) == (NameLength * sizeof(WCHAR))) { Found = TRUE; } @@ -268,7 +268,7 @@ } // Zero the bytes we'll be adding - RtlZeroMemory((PUCHAR)((ULONG_PTR)BitmapBuffer), NewBitmapSize); + RtlZeroMemory(BitmapBuffer, NewBitmapSize); // Read the bitmap attribute BytesRead = ReadAttribute(Vcb, @@ -337,6 +337,7 @@ ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); ReleaseAttributeContext(BitmapContext); DPRINT1("ERROR: Couldn't write to bitmap attribute of $MFT!\n"); + return Status; } // Cleanup @@ -357,6 +358,8 @@ ULONG NextAttributeOffset; DPRINT("InternalSetResidentAttributeLength( %p, %p, %lu, %lu )\n", AttrContext, FileRecord, AttrOffset, DataSize); + + ASSERT(!AttrContext->Record.IsNonResident); // update ValueLength Field AttrContext->Record.Resident.ValueLength = @@ -537,11 +540,7 @@ PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); ULONG ExistingClusters = AttrContext->Record.NonResident.AllocatedSize / BytesPerCluster; - if (!AttrContext->Record.IsNonResident) - { - DPRINT1("ERROR: SetNonResidentAttributeDataLength() called for resident attribute!\n"); - return STATUS_INVALID_PARAMETER; - } + ASSERT(AttrContext->Record.IsNonResident); // do we need to increase the allocation size? if (AttrContext->Record.NonResident.AllocatedSize < AllocationSize) @@ -671,11 +670,7 @@ ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((PCHAR)FileRecord + NextAttributeOffset); - if (AttrContext->Record.IsNonResident) - { - DPRINT1("ERROR: SetResidentAttributeDataLength() called for non-resident attribute!\n"); - return STATUS_INVALID_PARAMETER; - } + ASSERT(!AttrContext->Record.IsNonResident); //NtfsDumpFileAttributes(Vcb, FileRecord); @@ -733,9 +728,6 @@ // update the mapping pairs offset, which will be 0x40 + length in bytes of the name AttrContext->Record.NonResident.MappingPairsOffset = Destination->NonResident.MappingPairsOffset = 0x40 + (Destination->NameLength * 2); - // mark the attribute as non-resident - AttrContext->Record.IsNonResident = Destination->IsNonResident = 1; - // update the end of the file record // calculate position of end markers (1 byte for empty data run) EndAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + 1; @@ -750,7 +742,22 @@ (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + EndAttributeOffset), FILE_RECORD_END); - // update file record on disk + // Initialize the MCB, potentially catch an exception + _SEH2_TRY + { + FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Unable to create LargeMcb!\n"); + ExFreePoolWithTag(AttribData, TAG_NTFS); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } _SEH2_END; + + // Mark the attribute as non-resident (we wait until after we know the LargeMcb was initialized) + AttrContext->Record.IsNonResident = Destination->IsNonResident = 1; + + // Update file record on disk Status = UpdateFileRecord(Vcb, AttrContext->FileMFTIndex, FileRecord); if (!NT_SUCCESS(Status)) { @@ -759,13 +766,6 @@ ExFreePoolWithTag(AttribData, TAG_NTFS); return Status; } - - // Initialize the MCB, potentially catch an exception - _SEH2_TRY{ - FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool); - } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } _SEH2_END; // Now we can treat the attribute as non-resident and enlarge it normally Status = SetNonResidentAttributeDataLength(Vcb, AttrContext, AttrOffset, FileRecord, DataSize); @@ -1729,7 +1729,7 @@ RTL_BITMAP Bitmap; ULONGLONG BitmapDataSize; ULONGLONG AttrBytesRead; - PVOID BitmapData; + PUCHAR BitmapData; ULONG LengthWritten; PNTFS_ATTR_CONTEXT BitmapContext; LARGE_INTEGER BitmapBits; @@ -1765,17 +1765,20 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } - // we need to backup the bits for records 0x10 - 0x17 and leave them unassigned if they aren't assigned - RtlCopyMemory(&SystemReservedBits, (PVOID)((ULONG_PTR)BitmapData + 2), 1); - RtlFillMemory((PVOID)((ULONG_PTR)BitmapData + 2), 1, (UCHAR)0xFF); + // We need to backup the bits for records 0x10 - 0x17 (3rd byte of bitmap) and mark these records + // as in-use so we don't assign files to those indices. They're reserved for the system (e.g. ChkDsk). + SystemReservedBits = BitmapData[2]; + BitmapData[2] = 0xff; // Calculate bit count BitmapBits.QuadPart = AttributeDataLength(&(DeviceExt->MFTContext->Record)) / DeviceExt->NtfsInfo.BytesPerFileRecord; if (BitmapBits.HighPart != 0) { - DPRINT1("\tFIXME: bitmap sizes beyond 32bits are not yet supported!\n"); - BitmapBits.LowPart = 0xFFFFFFFF; + DPRINT1("\tFIXME: bitmap sizes beyond 32bits are not yet supported! (Your NTFS volume is too large)\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return STATUS_NOT_IMPLEMENTED; } // convert buffer into bitmap @@ -1809,7 +1812,7 @@ // [BitmapData should have been updated via RtlFindClearBitsAndSet()] // Restore the system reserved bits - RtlCopyMemory((PVOID)((ULONG_PTR)BitmapData + 2), &SystemReservedBits, 1); + BitmapData[2] = SystemReservedBits; // write the bitmap back to the MFT's $Bitmap attribute Status = WriteAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize, &LengthWritten); @@ -1845,9 +1848,9 @@ PNTFS_RECORD_HEADER Record) { USHORT *pShortToFixUp; - unsigned int ArrayEntryCount = Record->UsaCount - 1; - unsigned int Offset = Vcb->NtfsInfo.BytesPerSector - 2; - int i; + ULONG ArrayEntryCount = Record->UsaCount - 1; + ULONG Offset = Vcb->NtfsInfo.BytesPerSector - 2; + ULONG i; PFIXUP_ARRAY fixupArray = (PFIXUP_ARRAY)((UCHAR*)Record + Record->UsaOffset);

7 years, 5 months

[tthompson] 75283: [NTFS] - Add some fixes and improvements to finfo.c from CR-123: NtfsSetEndOfFile() - Make fileNameAttribute and filename variables uppercase. Don't leak FileRecord if we can't t...

by tthompson＠svn.reactos.org

Author: tthompson Date: Wed Jul 5 03:11:13 2017 New Revision: 75283 URL: http://svn.reactos.org/svn/reactos?rev=75283&view=rev Log: [NTFS] - Add some fixes and improvements to finfo.c from CR-123: NtfsSetEndOfFile() - Make fileNameAttribute and filename variables uppercase. Don't leak FileRecord if we can't truncate the file. Don't leak memory if there's no FileName attribute. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Wed Jul 5 03:11:13 2017 @@ -449,9 +449,9 @@ ULONG AttributeOffset; NTSTATUS Status = STATUS_SUCCESS; ULONGLONG AllocationSize; - PFILENAME_ATTRIBUTE fileNameAttribute; + PFILENAME_ATTRIBUTE FileNameAttribute; ULONGLONG ParentMFTId; - UNICODE_STRING filename; + UNICODE_STRING FileName; // Allocate non-paged memory for the file record @@ -485,6 +485,7 @@ NewFileSize)) { DPRINT1("Couldn't decrease file size!\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); return STATUS_USER_MAPPED_FILE; } } @@ -535,24 +536,26 @@ // now we need to update this file's size in every directory index entry that references it // TODO: expand to work with every filename / hardlink stored in the file record. - fileNameAttribute = GetBestFileNameFromRecord(Fcb->Vcb, FileRecord); - if (fileNameAttribute == NULL) + FileNameAttribute = GetBestFileNameFromRecord(Fcb->Vcb, FileRecord); + if (FileNameAttribute == NULL) { DPRINT1("Unable to find FileName attribute associated with file!\n"); + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); return STATUS_INVALID_PARAMETER; } - ParentMFTId = fileNameAttribute->DirectoryFileReferenceNumber & NTFS_MFT_MASK; - - filename.Buffer = fileNameAttribute->Name; - filename.Length = fileNameAttribute->NameLength * sizeof(WCHAR); - filename.MaximumLength = filename.Length; + ParentMFTId = FileNameAttribute->DirectoryFileReferenceNumber & NTFS_MFT_MASK; + + FileName.Buffer = FileNameAttribute->Name; + FileName.Length = FileNameAttribute->NameLength * sizeof(WCHAR); + FileName.MaximumLength = FileName.Length; AllocationSize = ROUND_UP(NewFileSize->QuadPart, Fcb->Vcb->NtfsInfo.BytesPerCluster); Status = UpdateFileNameRecord(Fcb->Vcb, ParentMFTId, - &filename, + &FileName, FALSE, NewFileSize->QuadPart, AllocationSize,

7 years, 5 months

[hbelusca] 75282: [WELCOME]: UI improvements: - Allow only one running instance of the Welcome application at a time. - Implement translating \xhhhh hexadecimal character specifications in topic te...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jul 5 02:02:43 2017 New Revision: 75282 URL: http://svn.reactos.org/svn/reactos?rev=75282&view=rev Log: [WELCOME]: UI improvements: - Allow only one running instance of the Welcome application at a time. - Implement translating \xhhhh hexadecimal character specifications in topic text descriptions. - Allow using the keyboard for navigating amongst the topics, and ENTER key presses to run the selected topic command. <rant> *OF COURSE*, because we are ReactOS *SO* we are *buggy* (well, user32/win32k), keyboard navigation via arrow keys *DOES NOT WORK*!! (only navigation via TAB key do work) 8^(((( </rant> This however works OK on Windows. - Improve topic buttons activation when mouse hovers around above the window, as well as when window activation is lost or regained. - Change the default text font to Tahoma. - Don't hardcode white brush, but instead use stock object WHITE_BRUSH. Similarly, don't hardcode text black colour, but instead use the ambient text colour of the system. - Add keyboard shortcuts to the default topic items. - Shift the window ID of both the checkbox and the Exit buttons to be below a fixed topic-button base ID. - In GetLocaleName(), use more explicit returned-variable names (cchRet, because it's a returned string length in character numbers). Modified: trunk/reactos/base/setup/welcome/lang/bg-BG.rc trunk/reactos/base/setup/welcome/lang/cs-CZ.rc trunk/reactos/base/setup/welcome/lang/da-DK.rc trunk/reactos/base/setup/welcome/lang/de-DE.rc trunk/reactos/base/setup/welcome/lang/el-GR.rc trunk/reactos/base/setup/welcome/lang/en-US.rc trunk/reactos/base/setup/welcome/lang/es-ES.rc trunk/reactos/base/setup/welcome/lang/et-EE.rc trunk/reactos/base/setup/welcome/lang/fr-FR.rc trunk/reactos/base/setup/welcome/lang/hu-HU.rc trunk/reactos/base/setup/welcome/lang/id-ID.rc trunk/reactos/base/setup/welcome/lang/it-IT.rc trunk/reactos/base/setup/welcome/lang/ja-JP.rc trunk/reactos/base/setup/welcome/lang/lt-LT.rc trunk/reactos/base/setup/welcome/lang/ms-MY.rc trunk/reactos/base/setup/welcome/lang/nl-NL.rc trunk/reactos/base/setup/welcome/lang/no-NO.rc trunk/reactos/base/setup/welcome/lang/pl-PL.rc trunk/reactos/base/setup/welcome/lang/pt-BR.rc trunk/reactos/base/setup/welcome/lang/ro-RO.rc trunk/reactos/base/setup/welcome/lang/ru-RU.rc trunk/reactos/base/setup/welcome/lang/sk-SK.rc trunk/reactos/base/setup/welcome/lang/sq-AL.rc trunk/reactos/base/setup/welcome/lang/sv-SE.rc trunk/reactos/base/setup/welcome/lang/tr-TR.rc trunk/reactos/base/setup/welcome/lang/uk-UA.rc trunk/reactos/base/setup/welcome/lang/zh-CN.rc trunk/reactos/base/setup/welcome/lang/zh-TW.rc trunk/reactos/base/setup/welcome/resource.h trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/bg… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/bg-BG.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "ÐÐ¾Ð±ÑÐµ Ð´Ð¾ÑÐ»Ð¸ Ð² Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð° ReactOS.\n\nÐÐ·Ð±ÐµÑÐµÑÐµ ÑÐ¸ Ð¾Ñ ÑÐµÐ¼Ð¸ÑÐµ Ð² Ð»ÑÐ²Ð¾." - IDS_CHECKTEXT "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð¹ Ð¾ÑÐ½Ð¾Ð²Ð¾ ÑÐ¾Ð·Ð¸ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ" - IDS_CLOSETEXT "ÐÐ·ÑÐ¾Ð´" + IDS_CHECKTEXT "&ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð¹ Ð¾ÑÐ½Ð¾Ð²Ð¾ ÑÐ¾Ð·Ð¸ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ" + IDS_CLOSETEXT "&ÐÐ·ÑÐ¾Ð´" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° ReactOS" - IDS_TOPICBUTTON1 "Ð Ð°Ð·Ð³Ð»ÐµÐ´Ð°Ð¹ ÑÐ¾Ð²Ð° CD" - IDS_TOPICBUTTON2 "ÐÐ·ÑÐ¾Ð´" + IDS_TOPICBUTTON0 "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° &ReactOS" + IDS_TOPICBUTTON1 "&Ð Ð°Ð·Ð³Ð»ÐµÐ´Ð°Ð¹ ÑÐ¾Ð²Ð° CD" + IDS_TOPICBUTTON2 "&ÐÐ·ÑÐ¾Ð´" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/cs… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/cs-CZ.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "VÃtejte v operaÄnÃm systÃ©mu ReactOS.\n\nKlepnÄte na tlaÄÃtko v levÃ©m sloupci." - IDS_CHECKTEXT "Zobrazit dialog znovu" - IDS_CLOSETEXT "Konec" + IDS_CHECKTEXT "&Zobrazit dialog znovu" + IDS_CLOSETEXT "&Konec" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Instalovat ReactOS" - IDS_TOPICBUTTON1 "ProhlÃÅ¾et toto CD" - IDS_TOPICBUTTON2 "Konec" + IDS_TOPICBUTTON0 "&Instalovat ReactOS" + IDS_TOPICBUTTON1 "&ProhlÃÅ¾et toto CD" + IDS_TOPICBUTTON2 "&Konec" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/da… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/da-DK.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Velkommen til ReactOS operativ System.\n\nKlik pÃ¥ et emne til venstre." - IDS_CHECKTEXT "Vis denne dialog igen ved opstart" - IDS_CLOSETEXT "Afslut" + IDS_CHECKTEXT "&Vis denne dialog igen ved opstart" + IDS_CLOSETEXT "&Afslut" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Installer ReactOS" - IDS_TOPICBUTTON1 "Gennemse Cdrom" - IDS_TOPICBUTTON2 "Afslut" + IDS_TOPICBUTTON0 "&Installer ReactOS" + IDS_TOPICBUTTON1 "&Gennemse Cdrom" + IDS_TOPICBUTTON2 "&Afslut" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/de… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Willkommen in ReactOS.\n\nKlicken Sie auf ein Thema auf der linken Seite." - IDS_CHECKTEXT "Dialog beim nÃ¤chsen Start wieder anzeigen" - IDS_CLOSETEXT "Beenden" + IDS_CHECKTEXT "&Dialog beim nÃ¤chsen Start wieder anzeigen" + IDS_CLOSETEXT "&Beenden" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "ReactOS installieren" - IDS_TOPICBUTTON1 "CD durchsuchen" - IDS_TOPICBUTTON2 "Beenden" + IDS_TOPICBUTTON0 "&ReactOS installieren" + IDS_TOPICBUTTON1 "&CD durchsuchen" + IDS_TOPICBUTTON2 "&Beenden" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/el… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/el-GR.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "ÎÎ±Î»ÏÏ Î®Î»Î¸Î±ÏÎµ ÏÏÎ¿ ReactOS ÎÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÏ Î£ÏÏÏÎ·Î¼Î±.\n\nÎÏÎ¹Î»ÎÎ¾ÏÎµ ÎÎ½Î± Î¸ÎÎ¼Î± Î±ÏÏ ÏÎ¿ Î¼ÎµÎ½Î¿Ï ÏÏÎ± Î±ÏÎ¹ÏÏÎµÏÎ¬." - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "Exit" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "&ÎÎ¾Î¿Î´Î¿Ï" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ¿Ï ReactOS" - IDS_TOPICBUTTON1 "ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï CD" - IDS_TOPICBUTTON2 "ÎÎ¾Î¿Î´Î¿Ï" + IDS_TOPICBUTTON0 "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ¿Ï &ReactOS" + IDS_TOPICBUTTON1 "ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï &CD" + IDS_TOPICBUTTON2 "&ÎÎ¾Î¿Î´Î¿Ï" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/en… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Welcome to ReactOS Operating System.\n\nClick a topic on the left." - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "Exit" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "&Exit" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Install ReactOS" - IDS_TOPICBUTTON1 "Browse this CD" - IDS_TOPICBUTTON2 "Exit" + IDS_TOPICBUTTON0 "&Install ReactOS" + IDS_TOPICBUTTON1 "&Browse this CD" + IDS_TOPICBUTTON2 "&Exit" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/es… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/es-ES.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Bienvenido al Sistema Operativo ReactOS.\n\nHaz Click en una opciÃ³n a la izquierda." - IDS_CHECKTEXT "Mostrar este dialogo otra vez" - IDS_CLOSETEXT "Salir" + IDS_CHECKTEXT "&Mostrar este dialogo otra vez" + IDS_CLOSETEXT "&Salir" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Instalar ReactOS" - IDS_TOPICBUTTON1 "Explorar este CD" - IDS_TOPICBUTTON2 "Salir" + IDS_TOPICBUTTON0 "&Instalar ReactOS" + IDS_TOPICBUTTON1 "&Explorar este CD" + IDS_TOPICBUTTON2 "&Salir" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/et… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/et-EE.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Tere tulemast operatsioonisÃ¼steemi ReactOS.\n\nVali teema vasakult." - IDS_CHECKTEXT "NÃ¤ita seda dialoogi veel" - IDS_CLOSETEXT "VÃ¤lju" + IDS_CHECKTEXT "&NÃ¤ita seda dialoogi veel" + IDS_CLOSETEXT "&VÃ¤lju" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Paigalda ReactOS" - IDS_TOPICBUTTON1 "Sirvi CD sisu" - IDS_TOPICBUTTON2 "VÃ¤lju" + IDS_TOPICBUTTON0 "&Paigalda ReactOS" + IDS_TOPICBUTTON1 "&Sirvi CD sisu" + IDS_TOPICBUTTON2 "&VÃ¤lju" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/fr… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Bienvenue sur le systÃ¨me d'exploitation ReactOS.\n\nCliquez sur une section Ã gauche." - IDS_CHECKTEXT "Afficher cette boÃ®te de dialogue de nouveau." - IDS_CLOSETEXT "Quitter" + IDS_CHECKTEXT "&Afficher cette boÃ®te de dialogue de nouveau." + IDS_CLOSETEXT "&Quitter" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Installer ReactOS" - IDS_TOPICBUTTON1 "Naviguer dans ce CD" - IDS_TOPICBUTTON2 "Quitter" + IDS_TOPICBUTTON0 "&Installer ReactOS" + IDS_TOPICBUTTON1 "&Naviguer dans ce CD" + IDS_TOPICBUTTON2 "&Quitter" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/hu… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/hu-HU.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "ÃdvÃ¶zlÃ¼nk a ReactOS OperÃ¡ciÃ³s Rendszerben.\n\n" - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "KilÃ©pÃ©s" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "&KilÃ©pÃ©s" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "ReactOS telepÃtÃ©se" - IDS_TOPICBUTTON1 "A CD bÃ¶ngÃ©szÃ©se" - IDS_TOPICBUTTON2 "KilÃ©pÃ©s" + IDS_TOPICBUTTON0 "&ReactOS telepÃtÃ©se" + IDS_TOPICBUTTON1 "&A CD bÃ¶ngÃ©szÃ©se" + IDS_TOPICBUTTON2 "&KilÃ©pÃ©s" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/id… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/id-ID.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Selamat datang di ReactOS Operating System.\n\nKlik topik di sisi kiri." - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "Exit" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "&Keluar" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Instalasi ReactOS" - IDS_TOPICBUTTON1 "Lihat CD ini" - IDS_TOPICBUTTON2 "Keluar" + IDS_TOPICBUTTON0 "&Instalasi ReactOS" + IDS_TOPICBUTTON1 "Lihat &CD ini" + IDS_TOPICBUTTON2 "&Keluar" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/it… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/it-IT.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Benvenuto nel ReactOS Operating System.\n\nClicca su un argomento a sinistra." - IDS_CHECKTEXT "Mostra ancora questa finestra" - IDS_CLOSETEXT "Esci" + IDS_CHECKTEXT "&Mostra ancora questa finestra" + IDS_CLOSETEXT "&Esci" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Installa ReactOS" - IDS_TOPICBUTTON1 "Esplora il CD" - IDS_TOPICBUTTON2 "Esci" + IDS_TOPICBUTTON0 "&Installa ReactOS" + IDS_TOPICBUTTON1 "Esplora il &CD" + IDS_TOPICBUTTON2 "&Esci" END /* Topic Titolos */ Modified: trunk/reactos/base/setup/welcome/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ja… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/ja-JP.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,8 +9,8 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "ReactOS ã¸ããããã\n\nå·¦å´ã®ãããã¯ãã¯ãªãã¯ãã¦ãã ããã" - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "Exit" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "çµäº(&Q)" END /* Topic buttons */ @@ -18,7 +18,7 @@ BEGIN IDS_TOPICBUTTON0 "ReactOS ãã¤ã³ã¹ãã¼ã«ãã" IDS_TOPICBUTTON1 "ãã® CD ãéã" - IDS_TOPICBUTTON2 "çµäº" + IDS_TOPICBUTTON2 "çµäº(&Q)" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/lt… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/lt-LT.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Sveiki, Äia ReactOS OperacinÄ Sistema.\n\nPasirinkite punktÄ kairÄje." - IDS_CHECKTEXT "Rodyti Å¡Ä¯ langÄ vÄl" - IDS_CLOSETEXT "IÅ¡eiti" + IDS_CHECKTEXT "&Rodyti Å¡Ä¯ langÄ vÄl" + IDS_CLOSETEXT "&IÅ¡eiti" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Ä®diegti ReactOS" - IDS_TOPICBUTTON1 "PerÅ¾iÅ«rÄti Å¡Ä¯ CD" - IDS_TOPICBUTTON2 "IÅ¡eiti" + IDS_TOPICBUTTON0 "Ä®diegti &ReactOS" + IDS_TOPICBUTTON1 "&PerÅ¾iÅ«rÄti Å¡Ä¯ CD" + IDS_TOPICBUTTON2 "&IÅ¡eiti" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ms… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/ms-MY.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/ms-MY.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Selamat datang ke ReactOS Operating System.\n\nKlik tajuk di sebelah kiri." - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "Exit" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "&Keluar" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Pasang ReactOS" - IDS_TOPICBUTTON1 "Layari CD ini" - IDS_TOPICBUTTON2 "Keluar" + IDS_TOPICBUTTON0 "&Pasang ReactOS" + IDS_TOPICBUTTON1 "&Layari CD ini" + IDS_TOPICBUTTON2 "&Keluar" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/nl… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/nl-NL.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Welkom bij het ReactOS Operation System.\n\nKlik links op een onderwerp." - IDS_CHECKTEXT "Ga terug naar dit scherm" - IDS_CLOSETEXT "Afsluiten" + IDS_CHECKTEXT "&Ga terug naar dit scherm" + IDS_CLOSETEXT "&Afsluiten" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Installeer ReactOS" - IDS_TOPICBUTTON1 "Deze CD Verkennen" - IDS_TOPICBUTTON2 "Afsluiten" + IDS_TOPICBUTTON0 "&Installeer ReactOS" + IDS_TOPICBUTTON1 "&Deze CD Verkennen" + IDS_TOPICBUTTON2 "&Afsluiten" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/no… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/no-NO.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Velkommen til ReactOS Operativsystem.\n\nTrykk et emne til venstre." - IDS_CHECKTEXT "Vis denne dialoget igjen" - IDS_CLOSETEXT "Avslutt" + IDS_CHECKTEXT "&Vis denne dialoget igjen" + IDS_CLOSETEXT "&Avslutt" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Innstaller ReactOS" - IDS_TOPICBUTTON1 "Utforsk denne CD" - IDS_TOPICBUTTON2 "Avslutt" + IDS_TOPICBUTTON0 "&Innstaller ReactOS" + IDS_TOPICBUTTON1 "&Utforsk denne CD" + IDS_TOPICBUTTON2 "&Avslutt" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/pl… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/pl-PL.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -15,16 +15,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Witaj w systemie operacyjnym ReactOS.\n\nWybierz temat po lewej." - IDS_CHECKTEXT "PokaÅ¼ ten dialog ponownie" - IDS_CLOSETEXT "WyjÅcie" + IDS_CHECKTEXT "&PokaÅ¼ ten dialog ponownie" + IDS_CLOSETEXT "&WyjÅcie" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Zainstaluj ReactOS" - IDS_TOPICBUTTON1 "PrzeglÄdaj CD" - IDS_TOPICBUTTON2 "WyjÅcie" + IDS_TOPICBUTTON0 "&Zainstaluj ReactOS" + IDS_TOPICBUTTON1 "PrzeglÄdaj &CD" + IDS_TOPICBUTTON2 "&WyjÅcie" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/pt… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/pt-BR.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Bem vindo ao Sistema Operacional ReactOS.\n\nClique em um tÃ³pico Ã esquerda." - IDS_CHECKTEXT "Exibir este diÃ¡logo novamente" - IDS_CLOSETEXT "Sair" + IDS_CHECKTEXT "&Exibir este diÃ¡logo novamente" + IDS_CLOSETEXT "&Sair" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Instalar ReactOS" - IDS_TOPICBUTTON1 "Examinar este CD" - IDS_TOPICBUTTON2 "Sair" + IDS_TOPICBUTTON0 "&Instalar ReactOS" + IDS_TOPICBUTTON1 "Examinar este &CD" + IDS_TOPICBUTTON2 "&Sair" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ro… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/ro-RO.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -16,16 +16,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Bun venit Ã®n Sistemul de Operare ReactOS.\n\nAlegeÈi o opÈiune din stÃ¢nga." - IDS_CHECKTEXT "AfiÈeazÄ acest dialog Èi altÄ datÄ" - IDS_CLOSETEXT "IeÈire" + IDS_CHECKTEXT "&AfiÈeazÄ acest dialog Èi altÄ datÄ" + IDS_CLOSETEXT "&IeÈire" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Instalare ReactOS" - IDS_TOPICBUTTON1 "Explorare CD" - IDS_TOPICBUTTON2 "IeÈire" + IDS_TOPICBUTTON0 "Instalare &ReactOS" + IDS_TOPICBUTTON1 "&Explorare CD" + IDS_TOPICBUTTON2 "&IeÈire" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ru… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/ru-RU.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -9,16 +9,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ Ð² ReactOS.\n\nÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿ÑÐ½ÐºÑ ÑÐ»ÐµÐ²Ð°." - IDS_CHECKTEXT "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾ ÑÐ½Ð¾Ð²Ð°" - IDS_CLOSETEXT "ÐÑÑÐ¾Ð´" + IDS_CHECKTEXT "&ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾ ÑÐ½Ð¾Ð²Ð°" + IDS_CLOSETEXT "&ÐÑÑÐ¾Ð´" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS" - IDS_TOPICBUTTON1 "ÐÐ±Ð·Ð¾Ñ Ð´Ð¸ÑÐºÐ°" - IDS_TOPICBUTTON2 "ÐÑÑÐ¾Ð´" + IDS_TOPICBUTTON0 "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS" + IDS_TOPICBUTTON1 "&ÐÐ±Ð·Ð¾Ñ Ð´Ð¸ÑÐºÐ°" + IDS_TOPICBUTTON2 "&ÐÑÑÐ¾Ð´" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sk… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/sk-SK.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Vitajte v operaÄnom systÃ©me ReactOS.\n\nKliknite na tlaÄidlo v Ä¾avom stÄºpci." - IDS_CHECKTEXT "ZobraziÅ¥ toto okno aj nabudÃºce" - IDS_CLOSETEXT "Koniec" + IDS_CHECKTEXT "&ZobraziÅ¥ toto okno aj nabudÃºce" + IDS_CLOSETEXT "&Koniec" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "InÅ¡talovaÅ¥ ReactOS" - IDS_TOPICBUTTON1 "PrezeraÅ¥ toto CD" - IDS_TOPICBUTTON2 "Koniec" + IDS_TOPICBUTTON0 "&InÅ¡talovaÅ¥ ReactOS" + IDS_TOPICBUTTON1 "&PrezeraÅ¥ toto CD" + IDS_TOPICBUTTON2 "&Koniec" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sq… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/sq-AL.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -13,16 +13,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "MirÃ« se vini nÃ« Sistemin Operative ReactOS.\n\nKliko nÃ« njÃ« topik nÃ« tÃ« majtÃ«." - IDS_CHECKTEXT "Trego kÃ«tÃ« dialog pÃ«rsÃ«ri" - IDS_CLOSETEXT "Dil" + IDS_CHECKTEXT "&Trego kÃ«tÃ« dialog pÃ«rsÃ«ri" + IDS_CLOSETEXT "&Dil" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Instalo ReactOS" - IDS_TOPICBUTTON1 "Shfleto kÃ«tÃ« CD" - IDS_TOPICBUTTON2 "Dil" + IDS_TOPICBUTTON0 "&Instalo ReactOS" + IDS_TOPICBUTTON1 "&Shfleto kÃ«tÃ« CD" + IDS_TOPICBUTTON2 "&Dil" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sv… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/sv-SE.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "VÃ¤lkommen till ReactOS Operating System.\n\nKlicka pÃ¥ ett avsnitt till vÃ¤nster." - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "Exit" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "&Avsluta" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Installera ReactOS" - IDS_TOPICBUTTON1 "Utforska skivan" - IDS_TOPICBUTTON2 "Avsluta" + IDS_TOPICBUTTON0 "&Installera ReactOS" + IDS_TOPICBUTTON1 "&Utforska skivan" + IDS_TOPICBUTTON2 "&Avsluta" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/tr… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/tr-TR.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "ReactOS Ä°Åletim Dizgesi'ne hoÅ geldiniz.\n\nSolda bir konuya tÄ±klayÄ±nÄ±z." - IDS_CHECKTEXT "Bu iletiyi yine gÃ¶ster." - IDS_CLOSETEXT "ÃÄ±kÄ±Å" + IDS_CHECKTEXT "&Bu iletiyi yine gÃ¶ster." + IDS_CLOSETEXT "&ÃÄ±kÄ±Å" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "ReactOS'u Kur" - IDS_TOPICBUTTON1 "Bu CD'yi AraÅtÄ±r" - IDS_TOPICBUTTON2 "ÃÄ±kÄ±Å" + IDS_TOPICBUTTON0 "&ReactOS'u Kur" + IDS_TOPICBUTTON1 "Bu &CD'yi AraÅtÄ±r" + IDS_TOPICBUTTON2 "&ÃÄ±kÄ±Å" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/uk… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/uk-UA.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾ Ð´Ð¾ Ð¾Ð¿ÐµÑÐ°ÑÑÐ¹Ð½Ð¾Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸ ReactOS.\n\nÐÐ»Ð°ÑÐ½ÑÑÑ Ð¿Ð¾ ÑÐµÐ¼Ñ Ð»ÑÐ²Ð¾ÑÑÑ" - IDS_CHECKTEXT "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÐ¸ ÑÐµÐ¹ Ð´ÑÐ°Ð»Ð¾Ð³ Ð·Ð½Ð¾Ð²" - IDS_CLOSETEXT "ÐÐ¸ÑÑÐ´" + IDS_CHECKTEXT "&ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÐ¸ ÑÐµÐ¹ Ð´ÑÐ°Ð»Ð¾Ð³ Ð·Ð½Ð¾Ð²" + IDS_CLOSETEXT "&ÐÐ¸ÑÑÐ´" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" - IDS_TOPICBUTTON1 "ÐÐ³Ð»ÑÐ´ ÑÑÐ¾Ð³Ð¾ CD" - IDS_TOPICBUTTON2 "ÐÐ¸ÑÑÐ´" + IDS_TOPICBUTTON0 "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ &ReactOS" + IDS_TOPICBUTTON1 "&ÐÐ³Ð»ÑÐ´ ÑÑÐ¾Ð³Ð¾ CD" + IDS_TOPICBUTTON2 "&ÐÐ¸ÑÑÐ´" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/zh… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/zh-CN.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "æ¬¢è¿ä½¿ç¨ ReactOS æä½ç³»ç»ã\n\n è¯·ç¹å»å·¦è¾¹çä¸»é¢ã" - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "Exit" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "éåº(&Q)" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "å®è£ ReactOS" - IDS_TOPICBUTTON1 "æµè§ CD" - IDS_TOPICBUTTON2 "éåº " + IDS_TOPICBUTTON0 "å®è£ &ReactOS" + IDS_TOPICBUTTON1 "æµè§ &CD" + IDS_TOPICBUTTON2 "éåº(&Q)" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/zh… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/zh-TW.rc [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -11,16 +11,16 @@ IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "æ¡è¿ä½¿ç¨ ReactOS ä½æ¥ç³»çµ±ã\n\n è«é»é¸å·¦éçä¸»é¡ã" - IDS_CHECKTEXT "Show this dialog again" - IDS_CLOSETEXT "Exit" + IDS_CHECKTEXT "&Show this dialog again" + IDS_CLOSETEXT "éåº(&Q)" END /* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "å®è£ ReactOS" - IDS_TOPICBUTTON1 "çè¦½ CD" - IDS_TOPICBUTTON2 "éåº " + IDS_TOPICBUTTON0 "å®è£ &ReactOS" + IDS_TOPICBUTTON1 "çè¦½ &CD" + IDS_TOPICBUTTON2 "éåº(&Q)" END /* Topic titles */ Modified: trunk/reactos/base/setup/welcome/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/resourc… ============================================================================== --- trunk/reactos/base/setup/welcome/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/resource.h [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -1,41 +1,44 @@ #pragma once -#define IDS_APPTITLE 1000 -#define IDS_DEFAULTTOPICTITLE 1001 -#define IDS_DEFAULTTOPICDESC 1002 -#define IDS_FONTNAME 1003 -#define IDS_CHECKTEXT 1004 -#define IDS_CLOSETEXT 1005 +/* Internal button window IDs, below TOPIC_BTN_ID_BASE == 100 */ +#define IDC_CHECKBUTTON 98 +#define IDC_CLOSEBUTTON 99 -#define IDS_TOPICBUTTON0 1010 -#define IDS_TOPICBUTTON1 1011 -#define IDS_TOPICBUTTON2 1012 +/* Strings */ +#define IDS_APPTITLE 1000 +#define IDS_DEFAULTTOPICTITLE 1001 +#define IDS_DEFAULTTOPICDESC 1002 +#define IDS_FONTNAME 1003 +#define IDS_CHECKTEXT 1004 +#define IDS_CLOSETEXT 1005 -#define IDS_TOPICTITLE0 1020 -#define IDS_TOPICTITLE1 1021 -#define IDS_TOPICTITLE2 1022 +#define IDS_TOPICBUTTON0 1010 +#define IDS_TOPICBUTTON1 1011 +#define IDS_TOPICBUTTON2 1012 -#define IDS_TOPICDESC0 1030 -#define IDS_TOPICDESC1 1031 -#define IDS_TOPICDESC2 1032 +#define IDS_TOPICTITLE0 1020 +#define IDS_TOPICTITLE1 1021 +#define IDS_TOPICTITLE2 1022 -#define IDS_TOPICACTION0 1040 -#define IDS_TOPICACTION1 1041 -#define IDS_TOPICACTION2 1042 +#define IDS_TOPICDESC0 1030 +#define IDS_TOPICDESC1 1031 +#define IDS_TOPICDESC2 1032 -// #define IDS_TOPICOPTION0 1050 -// #define IDS_TOPICOPTION1 1051 -// #define IDS_TOPICOPTION2 1052 +#define IDS_TOPICACTION0 1040 +#define IDS_TOPICACTION1 1041 +#define IDS_TOPICACTION2 1042 + +// #define IDS_TOPICOPTION0 1050 +// #define IDS_TOPICOPTION1 1051 +// #define IDS_TOPICOPTION2 1052 /* Bitmaps */ -#define IDB_TITLEBITMAP 101 -#define IDB_DEFAULTTOPICBITMAP 102 +#define IDB_TITLEBITMAP 101 +#define IDB_DEFAULTTOPICBITMAP 102 -// #define IDB_TOPICBITMAP0 110 -// #define IDB_TOPICBITMAP1 111 -// #define IDB_TOPICBITMAP2 112 +// #define IDB_TOPICBITMAP0 110 +// #define IDB_TOPICBITMAP1 111 +// #define IDB_TOPICBITMAP2 112 -#define IDC_CLOSEBUTTON 2000 -#define IDC_CHECKBUTTON 2001 - +/* Icons */ #define IDI_MAIN 3000 Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Jul 5 02:02:43 2017 @@ -52,24 +52,15 @@ /* GLOBALS ******************************************************************/ -TCHAR szFrameClass[] = TEXT("WelcomeWindowClass"); +TCHAR szWindowClass[] = TEXT("WelcomeWindowClass"); TCHAR szAppTitle[80]; HINSTANCE hInstance; HWND hWndMain = NULL; -HWND hWndDefaultTopic = NULL; - -HDC hdcMem = NULL; - -ULONG ulInnerWidth = TITLE_WIDTH; -ULONG ulInnerHeight = (TITLE_WIDTH * 3) / 4; -ULONG ulTitleHeight = TITLE_HEIGHT + 3; - -HBITMAP hTitleBitmap = NULL; -HBITMAP hDefaultTopicBitmap = NULL; + +HWND hWndCheckButton = NULL; HWND hWndCloseButton = NULL; -HWND hWndCheckButton = NULL; BOOL bDisplayCheckBox = FALSE; // FIXME: We should also repaint the OS version correctly! BOOL bDisplayExitBtn = TRUE; @@ -92,11 +83,19 @@ DWORD dwNumberTopics = 0; PTOPIC* pTopics = NULL; +WNDPROC fnOldBtn; + TCHAR szDefaultTitle[TOPIC_TITLE_LENGTH]; TCHAR szDefaultDesc[TOPIC_DESC_LENGTH]; +#define TOPIC_BTN_ID_BASE 100 + INT nTopic = -1; // Active (focused) topic INT nDefaultTopic = -1; // Default selected topic + +HDC hdcMem = NULL; +HBITMAP hTitleBitmap = NULL; +HBITMAP hDefaultTopicBitmap = NULL; HFONT hFontTopicButton; HFONT hFontTopicTitle; @@ -105,14 +104,11 @@ HBRUSH hbrLightBlue; HBRUSH hbrDarkBlue; -HBRUSH hbrRightPanel; RECT rcTitlePanel; RECT rcLeftPanel; RECT rcRightPanel; -WNDPROC fnOldBtn; - INT_PTR CALLBACK MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -122,35 +118,35 @@ INT GetLocaleName(IN LCID Locale, OUT LPTSTR lpLCData, IN SIZE_T cchData) { - INT ret, ret2; + INT cchRet, cchRet2; /* Try to retrieve the locale language name (LOCALE_SNAME is supported on Vista+) */ - ret = GetLocaleInfo(Locale, LOCALE_SNAME, lpLCData, cchData); - if (ret || (GetLastError() != ERROR_INVALID_FLAGS)) - return ret; + cchRet = GetLocaleInfo(Locale, LOCALE_SNAME, lpLCData, cchData); + if (cchRet || (GetLastError() != ERROR_INVALID_FLAGS)) + return cchRet; /* * We failed because LOCALE_SNAME was unrecognized, so try to manually build * a language name in the form xx-YY (WARNING: this method has its limitations). */ - ret = GetLocaleInfo(Locale, LOCALE_SISO639LANGNAME, lpLCData, cchData); - if (ret <= 1) - return ret; - - lpLCData += (ret - 1); - cchData -= (ret - 1); + cchRet = GetLocaleInfo(Locale, LOCALE_SISO639LANGNAME, lpLCData, cchData); + if (cchRet <= 1) + return cchRet; + + lpLCData += (cchRet - 1); + cchData -= (cchRet - 1); if (cchData <= 1) - return ret; + return cchRet; /* Try to get the second part; we add the '-' separator only if we succeed */ - ret2 = GetLocaleInfo(Locale, LOCALE_SISO3166CTRYNAME, lpLCData + 1, cchData - 1); - if (ret2 <= 1) - return ret; - ret += ret2; // 'ret' already counts '-'. + cchRet2 = GetLocaleInfo(Locale, LOCALE_SISO3166CTRYNAME, lpLCData + 1, cchData - 1); + if (cchRet2 <= 1) + return cchRet; + cchRet += cchRet2; // 'cchRet' already counts '-'. *lpLCData = _T('-'); - return ret; + return cchRet; } VOID TranslateEscapes(IN OUT LPTSTR lpString) @@ -175,6 +171,7 @@ // lpString = pEscape + 1; // Loop will stop at the next iteration. break; + /* New-line and carriage return */ case _T('n'): case _T('r'): // case _T('\\'): // others? // So far we only need to deal with the newlines. @@ -185,6 +182,15 @@ *pEscape = _T('\r'); memmove(lpString, lpString + 1, (_tcslen(lpString + 1) + 1) * sizeof(TCHAR)); + break; + } + + /* \xhhhh hexadecimal character specification */ + case _T('x'): + { + LPTSTR lpStringNew; + *pEscape = (WCHAR)_tcstoul(lpString + 1, &lpStringNew, 16); + memmove(lpString, lpStringNew, (_tcslen(lpStringNew) + 1) * sizeof(TCHAR)); break; } @@ -477,8 +483,10 @@ LPTSTR lpszCmdLine, int nCmdShow) { + HANDLE hMutex = NULL; WNDCLASSEX wndclass; MSG msg; + HWND hWndFocus; INT xPos, yPos; INT xWidth, yHeight; RECT rcWindow; @@ -486,7 +494,11 @@ HMENU hSystemMenu; DWORD dwStyle = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + BITMAP BitmapInfo; + ULONG ulInnerWidth = TITLE_WIDTH; + ULONG ulInnerHeight = (TITLE_WIDTH * 3) / 4; + ULONG ulTitleHeight = TITLE_HEIGHT + 3; UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpszCmdLine); @@ -502,6 +514,22 @@ } hInstance = hInst; + + /* Ensure only one instance is running */ + hMutex = CreateMutexW(NULL, FALSE, szWindowClass); + if (hMutex && (GetLastError() == ERROR_ALREADY_EXISTS)) + { + /* If already started, find its window */ + hWndMain = FindWindowW(szWindowClass, NULL); + + /* Activate window */ + ShowWindow(hWndMain, SW_SHOWNORMAL); + SetForegroundWindow(hWndMain); + + /* Close the mutex handle and quit */ + CloseHandle(hMutex); + return 0; + } /* Load icons */ hMainIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); @@ -518,12 +546,13 @@ wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); wndclass.hbrBackground = NULL; wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = szFrameClass; + wndclass.lpszClassName = szWindowClass; RegisterClassEx(&wndclass); + /* Load the banner bitmap, and compute the window dimensions */ hTitleBitmap = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TITLEBITMAP)); - if (hTitleBitmap != NULL) + if (hTitleBitmap) { GetObject(hTitleBitmap, sizeof(BITMAP), &BitmapInfo); ulInnerWidth = BitmapInfo.bmWidth; @@ -539,9 +568,10 @@ rcWindow.right = ulInnerWidth - 1; AdjustWindowRect(&rcWindow, dwStyle, FALSE); - xWidth = rcWindow.right - rcWindow.left; + xWidth = rcWindow.right - rcWindow.left; yHeight = rcWindow.bottom - rcWindow.top; + /* Compute the window position */ xPos = (GetSystemMetrics(SM_CXSCREEN) - xWidth) / 2; yPos = (GetSystemMetrics(SM_CYSCREEN) - yHeight) / 2; @@ -564,7 +594,7 @@ LoadConfiguration(); /* Create main window */ - hWndMain = CreateWindow(szFrameClass, + hWndMain = CreateWindow(szWindowClass, szAppTitle, dwStyle, xPos, @@ -588,13 +618,34 @@ while (GetMessage(&msg, NULL, 0, 0) != FALSE) { - TranslateMessage(&msg); - DispatchMessage(&msg); + /* Check for ENTER key presses */ + if (msg.message == WM_KEYDOWN && msg.wParam == VK_RETURN) + { + /* + * The user pressed the ENTER key. Retrieve the handle to the + * child window that has the keyboard focus, and send it a + * WM_COMMAND message. + */ + hWndFocus = GetFocus(); + if (hWndFocus) + { + SendMessage(hWndMain, WM_COMMAND, + (WPARAM)GetDlgCtrlID(hWndFocus), (LPARAM)hWndFocus); + } + } + /* Allow using keyboard navigation */ + else if (!IsDialogMessage(hWndMain, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } } /* Cleanup */ FreeResources(); + /* Close the mutex handle and quit */ + CloseHandle(hMutex); return msg.wParam; } @@ -602,15 +653,53 @@ INT_PTR CALLBACK ButtonSubclassWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + static WPARAM wParamOld = 0; + static LPARAM lParamOld = 0; + LONG i; if (uMsg == WM_MOUSEMOVE) { - i = GetWindowLongPtr(hWnd, GWL_ID); + /* Ignore mouse-move messages on the same point */ + if ((wParam == wParamOld) && (lParam == lParamOld)) + return 0; + + /* Retrieve the topic index of this button */ + i = GetWindowLongPtr(hWnd, GWLP_ID) - TOPIC_BTN_ID_BASE; + + /* + * Change the focus to this button if the current topic index differs + * (we will receive WM_SETFOCUS afterwards). + */ + if (nTopic != i) + SetFocus(hWnd); + + wParamOld = wParam; + lParamOld = lParam; + } + else if (uMsg == WM_SETFOCUS) + { + /* Retrieve the topic index of this button */ + i = GetWindowLongPtr(hWnd, GWLP_ID) - TOPIC_BTN_ID_BASE; + + /* Change the current topic index and repaint the description panel */ if (nTopic != i) { nTopic = i; - SetFocus(hWnd); + InvalidateRect(hWndMain, &rcRightPanel, TRUE); + } + } + else if (uMsg == WM_KILLFOCUS) + { + /* + * We lost focus, either because the user changed button focus, + * or because the main window to which we belong went inactivated. + * If we are in the latter case, we ignore the focus change. + * If we are in the former case, we reset to the default topic. + */ + if (GetParent(hWnd) == GetForegroundWindow()) + { + nTopic = -1; InvalidateRect(hWndMain, &rcRightPanel, TRUE); } } @@ -660,13 +749,6 @@ ShellExecute(NULL, NULL, AppName, Parameters, NULL, SW_SHOWDEFAULT); return TRUE; -} - - -static VOID -SubclassButton(HWND hWnd) -{ - fnOldBtn = (WNDPROC)SetWindowLongPtr(hWnd, GWL_WNDPROC, (DWORD_PTR)ButtonSubclassWndProc); } @@ -706,8 +788,7 @@ UNREFERENCED_PARAMETER(lParam); hbrLightBlue = CreateSolidBrush(LIGHT_BLUE); - hbrDarkBlue = CreateSolidBrush(DARK_BLUE); - hbrRightPanel = CreateSolidBrush(RGB(255, 255, 255)); + hbrDarkBlue = CreateSolidBrush(DARK_BLUE); /* Topic title font */ hFontTopicTitle = CreateFont(-18, 0, 0, 0, FW_NORMAL, @@ -717,7 +798,7 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - TEXT("Arial")); + TEXT("Tahoma")); /* Topic description font */ hFontTopicDescription = CreateFont(-11, 0, 0, 0, FW_THIN, @@ -727,7 +808,7 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - TEXT("Arial")); + TEXT("Tahoma")); /* Topic button font */ hFontTopicButton = CreateFont(-11, 0, 0, 0, FW_BOLD, @@ -737,10 +818,10 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - TEXT("Arial")); + TEXT("Tahoma")); /* Load title bitmap */ - if (hTitleBitmap != NULL) + if (hTitleBitmap) hTitleBitmap = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TITLEBITMAP)); /* Load topic bitmaps */ @@ -756,7 +837,7 @@ hdcMem = CreateCompatibleDC(ScreenDC); ReleaseDC(hWnd, ScreenDC); - /* Load and create buttons */ + /* Load and create the menu buttons */ dwTop = rcLeftPanel.top; for (i = 0; i < dwNumberTopics; i++) { @@ -775,13 +856,12 @@ rcLeftPanel.right - rcLeftPanel.left, dwHeight, hWnd, - (HMENU)IntToPtr(i), + (HMENU)IntToPtr(TOPIC_BTN_ID_BASE + i), // Similar to SetWindowLongPtr(GWLP_ID) hInstance, NULL); - hWndDefaultTopic = pTopics[i]->hWndButton; nDefaultTopic = i; - SubclassButton(pTopics[i]->hWndButton); SendMessage(pTopics[i]->hWndButton, WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0)); + fnOldBtn = (WNDPROC)SetWindowLongPtr(pTopics[i]->hWndButton, GWLP_WNDPROC, (DWORD_PTR)ButtonSubclassWndProc); } else { @@ -791,34 +871,7 @@ dwTop += dwHeight; } - /* Create "Exit" button */ - if (bDisplayExitBtn) - { - nLength = LoadString(hInstance, IDS_CLOSETEXT, szText, ARRAYSIZE(szText)); - if (nLength > 0) - { - hWndCloseButton = CreateWindow(TEXT("BUTTON"), - szText, - WS_VISIBLE | WS_CHILD | BS_FLAT, - rcRightPanel.right - 10 - 57, - rcRightPanel.bottom - 10 - 21, - 57, - 21, - hWnd, - (HMENU)IDC_CLOSEBUTTON, - hInstance, - NULL); - hWndDefaultTopic = NULL; - nDefaultTopic = -1; - SendMessage(hWndCloseButton, WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0)); - } - else - { - hWndCloseButton = NULL; - } - } - - /* Create checkbox */ + /* Create the checkbox */ if (bDisplayCheckBox) { nLength = LoadString(hInstance, IDS_CHECKTEXT, szText, ARRAYSIZE(szText)); @@ -835,7 +888,7 @@ hWndCheckButton = CreateWindow(TEXT("BUTTON"), szText, - WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX /**/| BS_FLAT/**/, + WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_AUTOCHECKBOX | BS_MULTILINE /**/| BS_FLAT/**/, rcLeftPanel.left + 8, rcLeftPanel.bottom - 8 - 13, rcLeftPanel.right - rcLeftPanel.left - 16, @@ -853,6 +906,32 @@ } } + /* Create the "Exit" button */ + if (bDisplayExitBtn) + { + nLength = LoadString(hInstance, IDS_CLOSETEXT, szText, ARRAYSIZE(szText)); + if (nLength > 0) + { + hWndCloseButton = CreateWindow(TEXT("BUTTON"), + szText, + WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_FLAT, + rcRightPanel.right - 10 - 57, + rcRightPanel.bottom - 10 - 21, + 57, + 21, + hWnd, + (HMENU)IDC_CLOSEBUTTON, + hInstance, + NULL); + nDefaultTopic = -1; + SendMessage(hWndCloseButton, WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0)); + } + else + { + hWndCloseButton = NULL; + } + } + return 0; } @@ -866,9 +945,9 @@ { DestroyWindow(hWnd); } - else if ((LOWORD(wParam) < dwNumberTopics)) - { - if (RunAction(LOWORD(wParam)) == FALSE) + else if ((LOWORD(wParam) - TOPIC_BTN_ID_BASE < dwNumberTopics)) + { + if (RunAction(LOWORD(wParam) - TOPIC_BTN_ID_BASE) == FALSE) DestroyWindow(hWnd); // Corresponds to a <exit> action. } @@ -900,7 +979,6 @@ rcPanel->right - rcPanel->left, 3, PATCOPY); - SelectObject(hdc, hOldBrush); } @@ -939,7 +1017,7 @@ SelectObject(hdc, hOldBrush); /* Right panel */ - hOldBrush = (HBRUSH)SelectObject(hdc, WHITE_BRUSH); + hOldBrush = (HBRUSH)SelectObject(hdc, GetStockObject(WHITE_BRUSH)); PatBlt(hdc, rcRightPanel.left, rcRightPanel.top, @@ -957,7 +1035,7 @@ DeleteObject(hPen); /* Draw topic bitmap */ - if ((nTopic == -1) && (hDefaultTopicBitmap != NULL)) + if ((nTopic == -1) && (hDefaultTopicBitmap)) { GetObject(hDefaultTopicBitmap, sizeof(BITMAP), &bmpInfo); hOldBitmap = (HBITMAP)SelectObject(hdcMem, hDefaultTopicBitmap); @@ -971,7 +1049,7 @@ 0, SRCCOPY); } - else if ((nTopic != -1) && (pTopics[nTopic]->hBitmap != NULL)) + else if ((nTopic != -1) && (pTopics[nTopic]->hBitmap)) { GetObject(pTopics[nTopic]->hBitmap, sizeof(BITMAP), &bmpInfo); hOldBitmap = (HBITMAP)SelectObject(hdcMem, pTopics[nTopic]->hBitmap); @@ -1032,7 +1110,7 @@ rcDescription.bottom = rcRightPanel.bottom - 20; SelectObject(hdc, hFontTopicDescription); - SetTextColor(hdc, RGB(0, 0, 0)); + SetTextColor(hdc, GetSysColor(COLOR_WINDOWTEXT)); DrawText(hdc, lpDesc, -1, &rcDescription, DT_TOP | DT_WORDBREAK); SetBkMode(hdc, OPAQUE); @@ -1059,60 +1137,88 @@ UNREFERENCED_PARAMETER(hWnd); UNREFERENCED_PARAMETER(wParam); +#if 0 + /* Neither the checkbox button nor the close button implement owner-drawing */ + if (lpDis->hwndItem == hWndCheckButton) + return 0; if (lpDis->hwndItem == hWndCloseButton) { DrawFrameControl(lpDis->hDC, &lpDis->rcItem, DFC_BUTTON, DFCS_BUTTONPUSH | DFCS_FLAT); - } + return TRUE; + } +#endif + + if (lpDis->CtlID == (ULONG)(TOPIC_BTN_ID_BASE + nTopic)) + hOldBrush = (HBRUSH)SelectObject(lpDis->hDC, GetStockObject(WHITE_BRUSH)); else - { - if (lpDis->CtlID == (ULONG)nTopic) - hOldBrush = (HBRUSH)SelectObject(lpDis->hDC, hbrRightPanel); - else - hOldBrush = (HBRUSH)SelectObject(lpDis->hDC, hbrLightBlue); - - PatBlt(lpDis->hDC, - lpDis->rcItem.left, - lpDis->rcItem.top, - lpDis->rcItem.right, - lpDis->rcItem.bottom, - PATCOPY); - SelectObject(lpDis->hDC, hOldBrush); - - hPen = CreatePen(PS_SOLID, 0, DARK_BLUE); - hOldPen = (HPEN)SelectObject(lpDis->hDC, hPen); - MoveToEx(lpDis->hDC, lpDis->rcItem.left, lpDis->rcItem.bottom - 1, NULL); - LineTo(lpDis->hDC, lpDis->rcItem.right, lpDis->rcItem.bottom - 1); - SelectObject(lpDis->hDC, hOldPen); - DeleteObject(hPen); - - InflateRect(&lpDis->rcItem, -10, -4); - OffsetRect(&lpDis->rcItem, 0, 1); - GetWindowText(lpDis->hwndItem, szText, ARRAYSIZE(szText)); - SetTextColor(lpDis->hDC, RGB(0, 0, 0)); - iBkMode = SetBkMode(lpDis->hDC, TRANSPARENT); - DrawText(lpDis->hDC, szText, -1, &lpDis->rcItem, DT_TOP | DT_LEFT | DT_WORDBREAK); - SetBkMode(lpDis->hDC, iBkMode); - } - - return 0; + hOldBrush = (HBRUSH)SelectObject(lpDis->hDC, hbrLightBlue); + + PatBlt(lpDis->hDC, + lpDis->rcItem.left, + lpDis->rcItem.top, + lpDis->rcItem.right, + lpDis->rcItem.bottom, + PATCOPY); + SelectObject(lpDis->hDC, hOldBrush); + + hPen = CreatePen(PS_SOLID, 0, DARK_BLUE); + hOldPen = (HPEN)SelectObject(lpDis->hDC, hPen); + MoveToEx(lpDis->hDC, lpDis->rcItem.left, lpDis->rcItem.bottom - 1, NULL); + LineTo(lpDis->hDC, lpDis->rcItem.right, lpDis->rcItem.bottom - 1); + SelectObject(lpDis->hDC, hOldPen); + DeleteObject(hPen); + + InflateRect(&lpDis->rcItem, -10, -4); + OffsetRect(&lpDis->rcItem, 0, 1); + GetWindowText(lpDis->hwndItem, szText, ARRAYSIZE(szText)); + SetTextColor(lpDis->hDC, GetSysColor(COLOR_WINDOWTEXT)); + iBkMode = SetBkMode(lpDis->hDC, TRANSPARENT); + DrawText(lpDis->hDC, szText, -1, &lpDis->rcItem, DT_TOP | DT_LEFT | DT_WORDBREAK); + SetBkMode(lpDis->hDC, iBkMode); + + return TRUE; } static LRESULT OnMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - + static WPARAM wParamOld = 0; + static LPARAM lParamOld = 0; + + /* Ignore mouse-move messages on the same point */ + if ((wParam == wParamOld) && (lParam == lParamOld)) + return 0; + + /* + * If the user moves the mouse over the main window, outside of the + * topic buttons, reset the current topic to the default one and + * change the focus to some other default button (to keep keyboard + * navigation possible). + */ if (nTopic != -1) { + INT nOldTopic = nTopic; nTopic = -1; - SetFocus(hWnd); + /* Also repaint the buttons, otherwise nothing repaints... */ + InvalidateRect(pTopics[nOldTopic]->hWndButton, NULL, TRUE); + + /* Set the focus to some other default button */ + if (hWndCheckButton) + SetFocus(hWndCheckButton); + else if (hWndCloseButton) + SetFocus(hWndCloseButton); + // SetFocus(hWnd); + + /* Repaint the description panel */ InvalidateRect(hWndMain, &rcRightPanel, TRUE); } + + wParamOld = wParam; + lParamOld = lParam; return 0; } @@ -1125,7 +1231,7 @@ if ((HWND)lParam == hWndCheckButton) { - SetBkColor((HDC)wParam, LIGHT_BLUE); + SetBkMode((HDC)wParam, TRANSPARENT); return (LRESULT)hbrLightBlue; } @@ -1136,35 +1242,48 @@ static LRESULT OnActivate(HWND hWnd, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(hWnd); + UNREFERENCED_PARAMETER(lParam); + + if (wParam != WA_INACTIVE) + { + /* + * The main window is re-activated, set the focus back to + * either the current topic or a default button. + */ + if (nTopic != -1) + SetFocus(pTopics[nTopic]->hWndButton); + else if (hWndCheckButton) + SetFocus(hWndCheckButton); + else if (hWndCloseButton) + SetFocus(hWndCloseButton); + + // InvalidateRect(hWndMain, &rcRightPanel, TRUE); + } + + return 0; +} + + +static LRESULT +OnDestroy(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + UINT i; + UNREFERENCED_PARAMETER(hWnd); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(lParam); - nTopic = -1; - InvalidateRect(hWndMain, &rcRightPanel, TRUE); - return 0; -} - - -static LRESULT -OnDestroy(HWND hWnd, WPARAM wParam, LPARAM lParam) -{ - UINT i; - - UNREFERENCED_PARAMETER(hWnd); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - for (i = 0; i < dwNumberTopics; i++) { - if (pTopics[i]->hWndButton != NULL) + if (pTopics[i]->hWndButton) DestroyWindow(pTopics[i]->hWndButton); } - if (hWndCloseButton != NULL) + if (hWndCloseButton) DestroyWindow(hWndCloseButton); - if (hWndCheckButton != NULL) + if (hWndCheckButton) DestroyWindow(hWndCheckButton); DeleteDC(hdcMem); @@ -1174,7 +1293,7 @@ DeleteObject(hTitleBitmap); for (i = 0; i < dwNumberTopics; i++) { - if (pTopics[i]->hBitmap != NULL) + if (pTopics[i]->hBitmap) DeleteObject(pTopics[i]->hBitmap); } @@ -1182,12 +1301,11 @@ DeleteObject(hFontTopicDescription); DeleteObject(hFontTopicButton); - if (hFontCheckButton != NULL) + if (hFontCheckButton) DeleteObject(hFontCheckButton); DeleteObject(hbrLightBlue); DeleteObject(hbrDarkBlue); - DeleteObject(hbrRightPanel); return 0; }

7 years, 5 months

[tthompson] 75281: [NTFS] - Add some fixes and improvements to create.c, dirctl.c and fcb.c from CR-123: -NtfsOpenFile() - Replace an ExFreePool() with ExFreePoolWithTag(). -NtfsCreateFile() - Fix ...

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Jul 4 22:34:17 2017 New Revision: 75281 URL: http://svn.reactos.org/svn/reactos?rev=75281&view=rev Log: [NTFS] - Add some fixes and improvements to create.c, dirctl.c and fcb.c from CR-123: -NtfsOpenFile() - Replace an ExFreePool() with ExFreePoolWithTag(). -NtfsCreateFile() - Fix broken cast with BooleanFlagOn() macro. -NtfsAddFilenameToDirectory() - Remove an extra cast. Return an error if we fail to allocate I30IndexRoot. -NtfsGetNextPathElement(), NtfsWSubString(), NtfsGetFCBForFile() - Use PCWSTR in place of const PWCHAR or PWCHAR where it makes sense. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Tue Jul 4 22:34:17 2017 @@ -304,7 +304,7 @@ DPRINT("Could not make a new FCB, status: %x\n", Status); if (AbsFileName) - ExFreePool(AbsFileName); + ExFreePoolWithTag(AbsFileName, TAG_NTFS); return Status; } @@ -572,7 +572,7 @@ // Create the file record on disk Status = NtfsCreateFileRecord(DeviceExt, FileObject, - (Stack->Flags & SL_CASE_SENSITIVE), + BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE), BooleanFlagOn(IrpContext->Flags,IRPCONTEXT_CANWAIT)); if (!NT_SUCCESS(Status)) { Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Tue Jul 4 22:34:17 2017 @@ -138,12 +138,13 @@ // Allocate memory for the index root data I30IndexRootLength = AttributeDataLength(&IndexRootContext->Record); - I30IndexRoot = (PINDEX_ROOT_ATTRIBUTE)ExAllocatePoolWithTag(NonPagedPool, I30IndexRootLength, TAG_NTFS); + I30IndexRoot = ExAllocatePoolWithTag(NonPagedPool, I30IndexRootLength, TAG_NTFS); if (!I30IndexRoot) { DPRINT1("ERROR: Couldn't allocate memory for index root attribute!\n"); ReleaseAttributeContext(IndexRootContext); ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; } // Read the Index Root Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Tue Jul 4 22:34:17 2017 @@ -35,8 +35,8 @@ /* FUNCTIONS ****************************************************************/ static -PWCHAR -NtfsGetNextPathElement(PWCHAR FileName) +PCWSTR +NtfsGetNextPathElement(PCWSTR FileName) { if (*FileName == L'\0') { @@ -55,7 +55,7 @@ static VOID NtfsWSubString(PWCHAR pTarget, - const PWCHAR pSource, + PCWSTR pSource, size_t pLength) { wcsncpy(pTarget, pSource, pLength); @@ -593,13 +593,13 @@ NtfsGetFCBForFile(PNTFS_VCB Vcb, PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, - const PWSTR pFileName, + PCWSTR pFileName, BOOLEAN CaseSensitive) { NTSTATUS Status; WCHAR pathName [MAX_PATH]; WCHAR elementName [MAX_PATH]; - PWCHAR currentElement; + PCWSTR currentElement; PNTFS_FCB FCB; PNTFS_FCB parentFCB; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Jul 4 22:34:17 2017 @@ -840,7 +840,7 @@ NtfsGetFCBForFile(PNTFS_VCB Vcb, PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, - const PWSTR pFileName, + PCWSTR pFileName, BOOLEAN CaseSensitive); NTSTATUS

7 years, 5 months

[tthompson] 75280: [NTFS] - Add some fixes and improvements to btree.c from CR-123: -CompareTreeKeys() - Assert that the first key isn't the dummy key. -CreateIndexRootFromBTree() - Assert that Cur...

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Jul 4 21:47:43 2017 New Revision: 75280 URL: http://svn.reactos.org/svn/reactos?rev=75280&view=rev Log: [NTFS] - Add some fixes and improvements to btree.c from CR-123: -CompareTreeKeys() - Assert that the first key isn't the dummy key. -CreateIndexRootFromBTree() - Assert that CurrentKey->IndexEntry->Length isn't 0. -DumpBTreeKey() - Use sizeof(WCHAR) in place of magic 2. -NtfsInsertKey() - Check for allocation failure of NewKey. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] Tue Jul 4 21:47:43 2017 @@ -61,6 +61,8 @@ { UNICODE_STRING Key1Name, Key2Name; LONG Comparison; + + ASSERT(!(Key1->IndexEntry->Flags & NTFS_INDEX_ENTRY_END)); // If Key2 is the "dummy key", key 1 will always come first if (Key2->NextKey == NULL) @@ -322,11 +324,10 @@ return STATUS_NOT_IMPLEMENTED; } + ASSERT(CurrentKey->IndexEntry->Length != 0); + // Copy the index entry - if (CurrentKey->IndexEntry->Length > 0) - RtlCopyMemory(CurrentNodeEntry, CurrentKey->IndexEntry, CurrentKey->IndexEntry->Length); - else - DPRINT1("DRIVER ERROR: CurrentKey->IndexEntry->Length <= 0 !\n"); + RtlCopyMemory(CurrentNodeEntry, CurrentKey->IndexEntry, CurrentKey->IndexEntry->Length); DPRINT1("Index Node Entry Stream Length: %u\nIndex Node Entry Length: %u\n", CurrentNodeEntry->KeyLength, @@ -409,7 +410,7 @@ if (!(Key->IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { UNICODE_STRING FileName; - FileName.Length = Key->IndexEntry->FileName.NameLength * 2; + FileName.Length = Key->IndexEntry->FileName.NameLength * sizeof(WCHAR); FileName.MaximumLength = FileName.Length; FileName.Buffer = Key->IndexEntry->FileName.Name; DbgPrint(" '%wZ'\n", &FileName); @@ -514,6 +515,12 @@ // Setup the New Key NewKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); + if (!NewKey) + { + DPRINT1("ERROR: Failed to allocate memory for new key!\n"); + ExFreePoolWithTag(NewEntry, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } NewKey->IndexEntry = NewEntry; NewKey->NextKey = NULL;

7 years, 5 months

[tthompson] 75279: [NTFS] - Add some fixes and improvements to attribute.c from CR-123: -AddFileName() - Don't use dedicated buffer for FileNameNoPath, just point into FileObject->FileName's buffer...

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Jul 4 21:40:02 2017 New Revision: 75279 URL: http://svn.reactos.org/svn/reactos?rev=75279&view=rev Log: [NTFS] - Add some fixes and improvements to attribute.c from CR-123: -AddFileName() - Don't use dedicated buffer for FileNameNoPath, just point into FileObject->FileName's buffer. Don't use RtlCopyUnicodeString(), just update pointers. -AddRun() - Fix an SEH2_YIELD with missing return statement. -FreeClusters() - Use ULONG_MAX in place of 0xffffffff. -NtfsDumpIndexRootAttribute() - Use consistent UpperCase naming convention. Use BooleanFlagOn() macro where appropriate. Replace magic 8 with sizeof(ULONGLONG). -GetFileNameAttributeLength() - Add documentation. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Tue Jul 4 21:40:02 2017 @@ -29,6 +29,7 @@ /* INCLUDES *****************************************************************/ #include "ntfs.h" +#include <ntintsafe.h> #define NDEBUG #include <debug.h> @@ -147,7 +148,6 @@ UNICODE_STRING Current, Remaining, FilenameNoPath; NTSTATUS Status = STATUS_SUCCESS; ULONG FirstEntry; - WCHAR Buffer[MAX_PATH]; if (AttributeAddress->Type != AttributeEnd) { @@ -172,7 +172,8 @@ // we need to extract the filename from the path DPRINT1("Pathname: %wZ\n", &FileObject->FileName); - RtlInitEmptyUnicodeString(&FilenameNoPath, Buffer, MAX_PATH); + FilenameNoPath.Buffer = FileObject->FileName.Buffer; + FilenameNoPath.MaximumLength = FilenameNoPath.Length = FileObject->FileName.Length; FsRtlDissectName(FileObject->FileName, &Current, &Remaining); @@ -180,8 +181,11 @@ { DPRINT1("Current: %wZ\n", &Current); - if(Remaining.Length != 0) - RtlCopyUnicodeString(&FilenameNoPath, &Remaining); + if (Remaining.Length != 0) + { + FilenameNoPath.Buffer = Remaining.Buffer; + FilenameNoPath.Length = FilenameNoPath.MaximumLength = Remaining.Length; + } FirstEntry = 0; Status = NtfsFindMftRecord(DeviceExt, @@ -196,8 +200,11 @@ if (Remaining.Length == 0 ) { - if(Current.Length != 0) - RtlCopyUnicodeString(&FilenameNoPath, &Current); + if (Current.Length != 0) + { + FilenameNoPath.Buffer = Current.Buffer; + FilenameNoPath.Length = FilenameNoPath.MaximumLength = Current.Length; + } break; } @@ -317,9 +324,13 @@ { ExRaiseStatus(STATUS_UNSUCCESSFUL); } - } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(_SEH2_GetExceptionCode()); - } _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Failed to add LargeMcb Entry!\n"); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (!RunBuffer) @@ -756,7 +767,7 @@ } BitmapDataSize = AttributeDataLength(&DataContext->Record); - BitmapDataSize = min(BitmapDataSize, 0xffffffff); + BitmapDataSize = min(BitmapDataSize, ULONG_MAX); ASSERT((BitmapDataSize * 8) >= Vcb->NtfsInfo.ClusterCount); BitmapData = ExAllocatePoolWithTag(NonPagedPool, ROUND_UP(BitmapDataSize, Vcb->NtfsInfo.BytesPerSector), TAG_NTFS); if (BitmapData == NULL) @@ -1144,8 +1155,8 @@ NtfsDumpIndexRootAttribute(PNTFS_ATTR_RECORD Attribute) { PINDEX_ROOT_ATTRIBUTE IndexRootAttr; - ULONG currentOffset; - ULONG currentNode; + ULONG CurrentOffset; + ULONG CurrentNode; IndexRootAttr = (PINDEX_ROOT_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); @@ -1168,18 +1179,18 @@ IndexRootAttr->Header.FirstEntryOffset, IndexRootAttr->Header.TotalSizeOfEntries, IndexRootAttr->Header.AllocatedSize); - currentOffset = IndexRootAttr->Header.FirstEntryOffset; - currentNode = 0; + CurrentOffset = IndexRootAttr->Header.FirstEntryOffset; + CurrentNode = 0; // print details of every node in the index - while (currentOffset < IndexRootAttr->Header.TotalSizeOfEntries) - { - PINDEX_ENTRY_ATTRIBUTE currentIndexExtry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexRootAttr + 0x10 + currentOffset); - DbgPrint(" Index Node Entry %lu", currentNode++); - if (currentIndexExtry->Flags & NTFS_INDEX_ENTRY_NODE) + while (CurrentOffset < IndexRootAttr->Header.TotalSizeOfEntries) + { + PINDEX_ENTRY_ATTRIBUTE currentIndexExtry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexRootAttr + 0x10 + CurrentOffset); + DbgPrint(" Index Node Entry %lu", CurrentNode++); + if (BooleanFlagOn(currentIndexExtry->Flags, NTFS_INDEX_ENTRY_NODE)) DbgPrint(" (Branch)"); else DbgPrint(" (Leaf)"); - if((currentIndexExtry->Flags & NTFS_INDEX_ENTRY_END)) + if (BooleanFlagOn(currentIndexExtry->Flags, NTFS_INDEX_ENTRY_END)) { DbgPrint(" (Dummy Key)"); } @@ -1203,11 +1214,11 @@ if (currentIndexExtry->Flags & NTFS_INDEX_ENTRY_NODE) { // Print the VCN of the sub-node - PULONGLONG SubNodeVCN = (PULONGLONG)((ULONG_PTR)currentIndexExtry + currentIndexExtry->Length - 8); + PULONGLONG SubNodeVCN = (PULONGLONG)((ULONG_PTR)currentIndexExtry + currentIndexExtry->Length - sizeof(ULONGLONG)); DbgPrint(" VCN of sub-node: 0x%llx\n", *SubNodeVCN); } - currentOffset += currentIndexExtry->Length; + CurrentOffset += currentIndexExtry->Length; ASSERT(currentIndexExtry->Length); } @@ -1567,6 +1578,19 @@ return NULL; } +/** +* @name GetFileNameAttributeLength +* @implemented +* +* Returns the size of a given FILENAME_ATTRIBUTE, in bytes. +* +* @param FileNameAttribute +* Pointer to a FILENAME_ATTRIBUTE to determine the size of. +* +* @remarks +* The length of a FILENAME_ATTRIBUTE is variable and is dependent on the length of the file name stored at the end. +* This function operates on the FILENAME_ATTRIBUTE proper, so don't try to pass it a PNTFS_ATTR_RECORD. +*/ ULONG GetFileNameAttributeLength(PFILENAME_ATTRIBUTE FileNameAttribute) { ULONG Length = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + (FileNameAttribute->NameLength * sizeof(WCHAR));

7 years, 5 months

[tthompson] 75278: [NTFS] - Fix UpdateFileNameRecord() when the file being updated resides in $INDEX_ROOT. Also, don't attempt to read beyond size of index root attribute, and check return value af...

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Jul 4 21:16:46 2017 New Revision: 75278 URL: http://svn.reactos.org/svn/reactos?rev=75278&view=rev Log: [NTFS] - Fix UpdateFileNameRecord() when the file being updated resides in $INDEX_ROOT. Also, don't attempt to read beyond size of index root attribute, and check return value after reading. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Jul 4 21:16:46 2017 @@ -1418,7 +1418,15 @@ return STATUS_INSUFFICIENT_RESOURCES; } - ReadAttribute(Vcb, IndexRootCtx, 0, IndexRecord, Vcb->NtfsInfo.BytesPerIndexRecord); + Status = ReadAttribute(Vcb, IndexRootCtx, 0, IndexRecord, AttributeDataLength(&IndexRootCtx->Record)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to read Index Root!\n"); + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + ReleaseAttributeContext(IndexRootCtx); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + } + IndexRoot = (PINDEX_ROOT_ATTRIBUTE)IndexRecord; IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)&IndexRoot->Header + IndexRoot->Header.FirstEntryOffset); // Index root is always resident. @@ -1439,6 +1447,18 @@ NewDataSize, NewAllocationSize, CaseSensitive); + + if (Status == STATUS_PENDING) + { + // we need to write the index root attribute back to disk + ULONG LengthWritten; + Status = WriteAttribute(Vcb, IndexRootCtx, 0, IndexRecord, AttributeDataLength(&IndexRootCtx->Record), &LengthWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't update Index Root!\n"); + } + + } ReleaseAttributeContext(IndexRootCtx); ExFreePoolWithTag(IndexRecord, TAG_NTFS);

7 years, 5 months

[tthompson] 75277: [NTFS] - Fix AddFileName() when the file path is two or more directories deep.

by tthompson＠svn.reactos.org

Author: tthompson Date: Tue Jul 4 20:47:06 2017 New Revision: 75277 URL: http://svn.reactos.org/svn/reactos?rev=75277&view=rev Log: [NTFS] - Fix AddFileName() when the file path is two or more directories deep. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Tue Jul 4 20:47:06 2017 @@ -146,7 +146,7 @@ ULONGLONG CurrentMFTIndex = NTFS_FILE_ROOT; UNICODE_STRING Current, Remaining, FilenameNoPath; NTSTATUS Status = STATUS_SUCCESS; - ULONG FirstEntry = 0; + ULONG FirstEntry; WCHAR Buffer[MAX_PATH]; if (AttributeAddress->Type != AttributeEnd) @@ -183,6 +183,7 @@ if(Remaining.Length != 0) RtlCopyUnicodeString(&FilenameNoPath, &Remaining); + FirstEntry = 0; Status = NtfsFindMftRecord(DeviceExt, CurrentMFTIndex, &Current, @@ -200,7 +201,7 @@ break; } - FsRtlDissectName(Current, &Current, &Remaining); + FsRtlDissectName(Remaining, &Current, &Remaining); } DPRINT1("MFT Index of parent: %I64u\n", CurrentMFTIndex);

7 years, 5 months

[ssawant] 75276: [QCKLNCH] -Added en-US.rc -Localized Menu resource. -Added a string table and localized some strings. -Major fixes like removing IDeskBar. -Minor suggestions fixed. CR-122 (https:/...

by ssawant＠svn.reactos.org

Author: ssawant Date: Tue Jul 4 18:37:00 2017 New Revision: 75276 URL: http://svn.reactos.org/svn/reactos?rev=75276&view=rev Log: [QCKLNCH] -Added en-US.rc -Localized Menu resource. -Added a string table and localized some strings. -Major fixes like removing IDeskBar. -Minor suggestions fixed. CR-122 (https://code.reactos.org/cru/CR-122#details) PS: Thank you everyone for spending your time and giving a thorough review. :) Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/lang/ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/lang/en-US.rc (with props) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Tue Jul 4 18:37:00 2017 @@ -14,6 +14,13 @@ #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); + +// ***Extras*** + +BOOL WINAPI _ILIsDesktop(LPCITEMIDLIST pidl) +{ + return (pidl == NULL || pidl->mkid.cb == 0); +} //***************************************************************************************** // *** CISFBand *** @@ -64,16 +71,18 @@ int index = SendMessage(m_hWnd, TB_HITTEST, 0, (LPARAM)&pt); bool chk = SendMessage(m_hWnd, TB_GETBUTTON, abs(index), (LPARAM)&tb); - CComHeapPtr<ITEMIDLIST> pidl((LPITEMIDLIST)tb.dwData); + LPITEMIDLIST pidl = (LPITEMIDLIST)tb.dwData; if (chk) { ClientToScreen(&pt); hr = m_pISF->GetUIObjectOf(m_hWnd, 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &picm)); - if (FAILED_UNEXPECTEDLY(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; hr = picm->QueryContextMenu(fmenu, 0, 1, 0x7FFF, CMF_DEFAULTONLY); - if (FAILED_UNEXPECTEDLY(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; int id = TrackPopupMenuEx(fmenu, TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RETURNCMD, pt.x, pt.y, m_hWnd, 0); if (id > 0) @@ -111,9 +120,9 @@ // Create the toolbar. m_hWnd = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | TBSTYLE_FLAT | TBSTYLE_LIST | CCS_NORESIZE | CCS_NODIVIDER, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, - hWndParent, NULL, 0, NULL); + hWndParent, NULL, 0, NULL); if (m_hWnd == NULL) - return E_FAIL; + return E_FAIL; // Set the image list. HIMAGELIST* piml; @@ -127,7 +136,7 @@ // Enumerate objects CComPtr<IEnumIDList> pEndl; - CComHeapPtr<ITEMIDLIST> pidl; + LPITEMIDLIST pidl; STRRET stret; ULONG count = 0; hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pEndl); @@ -149,8 +158,9 @@ else StrRetToBuf(&stret, pidl, sz, _countof(sz)); - TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)*&pidl, (INT_PTR)sz }; + TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)pidl, (INT_PTR)sz }; SendMessage(m_hWnd, TB_INSERTBUTTONW, 0, (LPARAM)&tb); + //CoTaskMemFree(pidl); } // Resize the toolbar, and then show it. @@ -315,29 +325,6 @@ return E_FAIL; } - /*****************************************************************************/ - // *** IDeskBar *** - STDMETHODIMP CISFBand::SetClient(IN IUnknown *punkClient) - { - TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); - - return E_NOTIMPL; - } - - STDMETHODIMP CISFBand::GetClient(OUT IUnknown **ppunkClient) - { - TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); - - return E_NOTIMPL; - } - - STDMETHODIMP CISFBand::OnPosRectChangeDB(IN RECT *prc) - { - TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom); - - return S_OK; - } - /*****************************************************************************/ // *** IPersistStream *** STDMETHODIMP CISFBand::GetClassID(OUT CLSID *pClassID) @@ -400,9 +387,19 @@ STDMETHODIMP CISFBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - UNIMPLEMENTED; - - return E_NOTIMPL; + /* switch (uMsg) + { + case WM_COMMAND: + { + MessageBox(L"Button Clicked", L"Test", MB_OKCANCEL | MB_ICONINFORMATION); + + break; + } + } + return DefSubclassProc(hWnd, uMsg, wParam, lParam);*/ + + UNIMPLEMENTED; + return E_NOTIMPL; } STDMETHODIMP CISFBand::IsWindowOwner(HWND hWnd) @@ -445,10 +442,7 @@ STDMETHODIMP CISFBand::InitializeSFB(IShellFolder *psf, PCIDLIST_ABSOLUTE pidl) { - CComHeapPtr<ITEMIDLIST> pidlRoot; - SHGetSpecialFolderLocation(0, CSIDL_DESKTOP, &pidlRoot); - - if (pidl == NULL || !psf->CompareIDs(0x80000000L, pidl, pidlRoot)) + if (_ILIsDesktop(pidl)) { m_pISF = psf; m_pidl = ILClone(pidl); Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] Tue Jul 4 18:37:00 2017 @@ -13,8 +13,7 @@ public CComCoClass<CISFBand>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, - public IDeskBand, - public IDeskBar, + public IDeskBand, public IPersistStream, public IWinEventHandler, public IOleCommandTarget, @@ -82,20 +81,6 @@ IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi - ); - -// IDeskBar - - virtual STDMETHODIMP GetClient( - OUT IUnknown **ppunkClient - ); - - virtual STDMETHODIMP OnPosRectChangeDB( - IN LPRECT prc - ); - - virtual STDMETHODIMP SetClient( - IN OPTIONAL IUnknown *punkClient ); // IPersistStream @@ -208,6 +193,7 @@ BEGIN_COM_MAP(CISFBand) COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] Tue Jul 4 18:37:00 2017 @@ -50,7 +50,8 @@ SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); } - BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; + CString biTitle((LPCSTR)IDS_BROWSEINFO_TITLE); + BROWSEINFO bi = { hwnd, pidlRoot, path, biTitle, 0, NULL, 0, 0 }; LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); return pidlSelected; @@ -68,18 +69,22 @@ HRESULT CQuickLaunchBand::FinalConstruct() { HRESULT hr = CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); - if (FAILED_UNEXPECTEDLY(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; CComPtr<IShellFolderBand> pISFB; hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB)); - if (FAILED_UNEXPECTEDLY(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; CComPtr<IShellFolder> pISF; hr = SHGetDesktopFolder(&pISF); - if (FAILED_UNEXPECTEDLY(hr)) return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP)); - if (pidl == NULL) return E_FAIL; + if (pidl == NULL) + return E_FAIL; pISFB->InitializeSFB(pISF, pidl); return hr; @@ -93,7 +98,8 @@ // Internal CISFBand Calls CComPtr<IObjectWithSite> pIOWS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIOWS->SetSite(pUnkSite); } @@ -105,7 +111,8 @@ // Internal CISFBand Calls CComPtr<IObjectWithSite> pIOWS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIOWS->GetSite(riid, ppvSite); } @@ -117,7 +124,8 @@ // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIDB->GetWindow(phwnd); } @@ -127,7 +135,8 @@ // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIDB->ContextSensitiveHelp(fEnterMode); } @@ -137,7 +146,8 @@ // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIDB->ShowDW(bShow); } @@ -147,7 +157,8 @@ // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIDB->CloseDW(dwReserved); } @@ -157,7 +168,8 @@ // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); } @@ -169,49 +181,12 @@ // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); - } - - /*****************************************************************************/ - // IDeskBar - STDMETHODIMP CQuickLaunchBand::SetClient(IN IUnknown *punkClient) - { - TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); - - // Internal CISFBand Calls - CComPtr<IDeskBar> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBar, &pIDB)); - if (FAILED(hr)) return hr; - - return pIDB->SetClient(punkClient); - } - - STDMETHODIMP CQuickLaunchBand::GetClient(OUT IUnknown **ppunkClient) - { - TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); - - // Internal CISFBand Calls - CComPtr<IDeskBar> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBar, &pIDB)); - if (FAILED(hr)) return hr; - - return pIDB->GetClient(ppunkClient); - } - - STDMETHODIMP CQuickLaunchBand::OnPosRectChangeDB(IN RECT *prc) - { - TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom); - - // Internal CISFBand Calls - CComPtr<IDeskBar> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBar, &pIDB)); - if (FAILED(hr)) return hr; - - return pIDB->OnPosRectChangeDB(prc); - } - + } + /*****************************************************************************/ // IPersistStream STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) @@ -221,7 +196,8 @@ // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIPS->GetClassID(pClassID); } @@ -231,7 +207,8 @@ // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIPS->IsDirty(); } @@ -243,7 +220,8 @@ // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIPS->Load(pStm); } @@ -253,7 +231,8 @@ // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIPS->Save(pStm, fClearDirty); } @@ -265,7 +244,8 @@ // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pIPS->GetSizeMax(pcbSize); } @@ -290,7 +270,8 @@ // Internal CISFBand Calls CComPtr<IWinEventHandler> pWEH; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); } @@ -300,7 +281,8 @@ // Internal CISFBand Calls CComPtr<IWinEventHandler> pWEH; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pWEH->IsWindowOwner(hWnd); } @@ -312,7 +294,8 @@ // Internal CISFBand Calls CComPtr<IOleCommandTarget> pOCT; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); } @@ -322,7 +305,8 @@ // Internal CISFBand Calls CComPtr<IOleCommandTarget> pOCT; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); } @@ -334,7 +318,8 @@ // Internal CISFBand Calls CComPtr<IContextMenu> pICM; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); } @@ -344,7 +329,8 @@ // Internal CISFBand Calls CComPtr<IContextMenu> pICM; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pICM->InvokeCommand(pici); } @@ -354,7 +340,8 @@ // Internal CISFBand Calls CComPtr<IContextMenu> pICM; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + return hr; return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); } Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] Tue Jul 4 18:37:00 2017 @@ -18,8 +18,7 @@ public CComCoClass<CQuickLaunchBand, &CLSID_QuickLaunchBand>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, - public IDeskBand, - public IDeskBar, + public IDeskBand, public IPersistStream, public IWinEventHandler, public IOleCommandTarget, @@ -76,21 +75,7 @@ IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi - ); - -// IDeskBar - - virtual STDMETHODIMP GetClient( - OUT IUnknown **ppunkClient - ); - - virtual STDMETHODIMP OnPosRectChangeDB( - IN LPRECT prc - ); - - virtual STDMETHODIMP SetClient( - IN OPTIONAL IUnknown *punkClient - ); + ); // IPersistStream @@ -185,6 +170,7 @@ BEGIN_COM_MAP(CQuickLaunchBand) COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/lang/en-US.rc (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/lang/en-US.rc [iso-8859-1] Tue Jul 4 18:37:00 2017 @@ -0,0 +1,19 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + +STRINGTABLE +BEGIN + IDS_BROWSEINFO_TITLE "Choose a folder" +END Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] Tue Jul 4 18:37:00 2017 @@ -27,6 +27,7 @@ #include <atlbase.h> #include <atlcom.h> #include <atlwin.h> +#include <atlstr.h> #include <undocshell.h> #include <shellutils.h> Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc [iso-8859-1] Tue Jul 4 18:37:00 2017 @@ -7,18 +7,9 @@ IDR_QCKLNCH REGISTRY "rgs/qcklnch.rgs" -IDM_POPUPMENU MENUEX DISCARDABLE -BEGIN - POPUP "" - BEGIN - POPUP "&View", IDM_VIEW_MENU - BEGIN - MENUITEM "&Large Icons", IDM_LARGE_ICONS - MENUITEM "&Small Icons", IDM_SMALL_ICONS - END - MENUITEM "&Show Text", IDM_SHOW_TEXT - END -END - #include <reactos/manifest_dll.rc> +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif + Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h [iso-8859-1] Tue Jul 4 18:37:00 2017 @@ -1,8 +1,11 @@ #pragma once -#define IDR_QCKLNCH 1001 -#define IDM_POPUPMENU 2000 -#define IDM_LARGE_ICONS 1 -#define IDM_SMALL_ICONS 2 -#define IDM_SHOW_TEXT 3 -#define IDM_VIEW_MENU 4 +#define IDR_QCKLNCH 1001 + +#define IDM_POPUPMENU 2000 +#define IDM_LARGE_ICONS 1 +#define IDM_SMALL_ICONS 2 +#define IDM_SHOW_TEXT 3 +#define IDM_VIEW_MENU 4 + +#define IDS_BROWSEINFO_TITLE 100

7 years, 5 months

[jimtabor] 75275: [GDI32_WINETEST] - Sync with Wine main head 2017-07-03.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 3 20:39:50 2017 New Revision: 75275 URL: http://svn.reactos.org/svn/reactos?rev=75275&view=rev Log: [GDI32_WINETEST] - Sync with Wine main head 2017-07-03. Modified: trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Mon Jul 3 20:39:50 2017 @@ -1122,44 +1122,6 @@ 0x14, 0x00, 0x00, 0x00 }; -static const unsigned char EMF_TEXTOUT_OUTLINE_ON_PATH_BITS[] = -{ - 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, - 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x0c, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x90, 0x06, 0x00, 0x00, 0x1a, 0x04, 0x00, 0x00, - 0x51, 0x02, 0x00, 0x00, 0x72, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x1a, 0x0b, 0x09, 0x00, - 0xf0, 0xa6, 0x05, 0x00, 0x25, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x80, - 0x3b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x54, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x01, 0x00, 0x00, 0x00, 0xc3, 0x30, 0x0d, 0x42, - 0xcf, 0xf3, 0x0c, 0x42, 0x0b, 0x00, 0x00, 0x00, - 0x16, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x54, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, - 0x73, 0x00, 0x74, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x80, - 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00 -}; - static const unsigned char MF_LINETO_BITS[] = { 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -2422,8 +2384,6 @@ HDC hdcDisplay, hdcMetafile; HENHMETAFILE hMetafile; BOOL ret; - LOGFONTA lf; - HFONT hFont; static const INT dx[4] = { 3, 5, 8, 12 }; /* Win9x doesn't play EMFs on invisible windows */ @@ -2434,19 +2394,6 @@ hdcDisplay = GetDC(hwnd); ok(hdcDisplay != 0, "GetDC error %d\n", GetLastError()); - /* with default font */ - ret = BeginPath(hdcDisplay); - ok(ret, "BeginPath error %d\n", GetLastError()); - - ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); - ok(ret, "ExtTextOut error %d\n", GetLastError()); - - ret = EndPath(hdcDisplay); - ok(ret, "EndPath error %d\n", GetLastError()); - - ret = GetPath(hdcDisplay, NULL, NULL, 0); - ok(!ret, "expected 0, got %d\n", ret); - hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); @@ -2454,13 +2401,10 @@ ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); - ok(ret, "ExtTextOut error %d\n", GetLastError()); + todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcMetafile); ok(ret, "EndPath error %d\n", GetLastError()); - - ret = GetPath(hdcMetafile, NULL, NULL, 0); - ok(!ret, "expected 0, got %d\n", ret); hMetafile = CloseEnhMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -2477,66 +2421,6 @@ ret = DeleteEnhMetaFile(hMetafile); ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); - - /* with outline font */ - memset(&lf, 0, sizeof(lf)); - lf.lfCharSet = ANSI_CHARSET; - lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; - lf.lfWeight = FW_DONTCARE; - lf.lfHeight = 7; - lf.lfQuality = DEFAULT_QUALITY; - lstrcpyA(lf.lfFaceName, "Tahoma"); - hFont = CreateFontIndirectA(&lf); - ok(hFont != 0, "CreateFontIndirectA error %d\n", GetLastError()); - hFont = SelectObject(hdcDisplay, hFont); - - ret = BeginPath(hdcDisplay); - ok(ret, "BeginPath error %d\n", GetLastError()); - - ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); - ok(ret, "ExtTextOut error %d\n", GetLastError()); - - ret = EndPath(hdcDisplay); - ok(ret, "EndPath error %d\n", GetLastError()); - - ret = GetPath(hdcDisplay, NULL, NULL, 0); - ok(ret != 0, "expected != 0\n"); - - SelectObject(hdcDisplay, hFont); - - hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); - ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); - - hFont = SelectObject(hdcMetafile, hFont); - - ret = BeginPath(hdcMetafile); - ok(ret, "BeginPath error %d\n", GetLastError()); - - ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); - ok(ret, "ExtTextOut error %d\n", GetLastError()); - - ret = EndPath(hdcMetafile); - ok(ret, "EndPath error %d\n", GetLastError()); - - ret = GetPath(hdcMetafile, NULL, NULL, 0); - ok(!ret, "expected 0, got %d\n", ret); - - hFont = SelectObject(hdcMetafile, hFont); - DeleteObject(hFont); - - hMetafile = CloseEnhMetaFile(hdcMetafile); - ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); - - if (compare_emf_bits(hMetafile, EMF_TEXTOUT_OUTLINE_ON_PATH_BITS, sizeof(EMF_TEXTOUT_OUTLINE_ON_PATH_BITS), - "emf_TextOut_on_path", FALSE) != 0) - { - dump_emf_bits(hMetafile, "emf_TextOut_outline_on_path"); - dump_emf_records(hMetafile, "emf_TextOut_outline_on_path"); - } - - ret = DeleteEnhMetaFile(hMetafile); - ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); - ret = ReleaseDC(hwnd, hdcDisplay); ok(ret, "ReleaseDC error %d\n", GetLastError()); DestroyWindow(hwnd); @@ -2548,16 +2432,16 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, + 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xd0, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x01, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, - 0x7c, 0x01, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x60, 0xcc, 0x05, 0x00, - 0xe0, 0x93, 0x04, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xb0, 0x04, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0x30, 0xda, 0x04, 0x00, 0x36, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, @@ -2567,9 +2451,16 @@ 0x64, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x00, 0x04, 0x00, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, + 0xff, 0x03, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static void translate( POINT *pt, UINT count, const XFORM *xform ) @@ -2721,6 +2612,12 @@ ret = SelectClipRgn(hdc, hrgn); ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + BeginPath(hdc); + Rectangle(hdc, rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); + EndPath(hdc); + ret = SelectClipPath(hdc, RGN_AND); + ok(ret, "SelectClipPath error %d\n", GetLastError()); + SetLastError(0xdeadbeef); hemf = CloseEnhMetaFile(hdc); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -2950,8 +2847,7 @@ hdc = CreateMetaFileA(NULL); ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); - ret = BeginPath(hdc); - ok(!ret, "BeginPath on metafile DC should fail\n"); + BeginPath(hdc); ret = MoveToEx(hdc, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdc, 50, 150); @@ -3839,8 +3735,7 @@ hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); - ret = BeginPath(hdcMetafile); - ok(ret, "BeginPath error %d\n", GetLastError()); + BeginPath(hdcMetafile); ret = MoveToEx(hdcMetafile, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 50, 150);

7 years, 5 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 July 2017