Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65105: [DISK] Revert r65097 and r65090. Thanks to r65104, now the FSCTLs go to the right place: the FSDs! Thanks to Thomas for pointing out that NTFSinfo was really talking with the F...
by pschweitzer＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: pschweitzer Date: Wed Oct 29 18:25:30 2014 New Revision: 65105 URL: http://svn.reactos.org/svn/reactos?rev=65105&view=rev Log: [DISK] Revert r65097 and r65090. Thanks to r65104, now the FSCTLs go to the right place: the FSDs! Thanks to Thomas for pointing out that NTFSinfo was really talking with the FSD on Windows and not to disk.sys CORE-8725 Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Wed Oct 29 18:25:30 2014 @@ -384,11 +384,6 @@ InitializationData.ClassDeviceControl = ScsiDiskDeviceControl; InitializationData.ClassShutdownFlush = ScsiDiskShutdownFlush; InitializationData.ClassCreateClose = NULL; - - // - // HACK! Please check below to the implementation of the function - // - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = ScsiDiskFileSystemControl; // // Call the class init routine @@ -5214,116 +5209,3 @@ } // end UpdateDeviceObjects() -// -// This function is supposed only to support NTFS tools -// from M. Russinovich. This is kind of huge hack and is -// totally undocumented :-). -// -NTSTATUS -NtfsRussinovichism(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ -#define FSCTL_GET_VOLUME_INFORMATION 0x90064 - typedef struct { - LARGE_INTEGER SerialNumber; - LARGE_INTEGER NumberOfSectors; - LARGE_INTEGER TotalClusters; - LARGE_INTEGER FreeClusters; - LARGE_INTEGER Reserved; - ULONG BytesPerSector; - ULONG BytesPerCluster; - ULONG BytesPerMFTRecord; - ULONG ClustersPerMFTRecord; - LARGE_INTEGER MFTLength; - LARGE_INTEGER MFTStart; - LARGE_INTEGER MFTMirrorStart; - LARGE_INTEGER MFTZoneStart; - LARGE_INTEGER MFTZoneEnd; - } NTFS_VOLUME_DATA_BUFFER, *PNTFS_VOLUME_DATA_BUFFER; - - PIO_STACK_LOCATION Stack; - NTSTATUS Status; - PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; - PDISK_DATA diskData; - - DPRINT1("NtfsRussinovichism(%p, %p)\n", DeviceObject, Irp); - - Stack = IoGetCurrentIrpStackLocation(Irp); - - switch (Stack->Parameters.FileSystemControl.FsControlCode) - { - case FSCTL_GET_VOLUME_INFORMATION: - // - // Check we received something we understand - // - if (Stack->Parameters.FileSystemControl.OutputBufferLength < sizeof(NTFS_VOLUME_DATA_BUFFER) || - Irp->UserBuffer == NULL) - { - DPRINT1("Invalid output! %d %p\n", Stack->Parameters.FileSystemControl.OutputBufferLength, Irp->UserBuffer); - Status = STATUS_INVALID_PARAMETER; - break; - } - - // - // Now, quickly check we are supposed to have a NTFS volume - // - diskData = (PDISK_DATA)(deviceExtension + 1); - if (diskData->PartitionType != PARTITION_IFS) - { - DPRINT1("Invalid partition type! %x\n", diskData->PartitionType); - Status = STATUS_INVALID_PARAMETER; - break; - } - - UNIMPLEMENTED; - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - return Status; -#undef FSCTL_GET_VOLUME_INFORMATION -} - -// -// Hack: this function is not supposed to be implemented -// Even though it's required to enable some M. Russinovich -// to directly request disks so that they can dump NTFS data -// without going through the driver. -// We don't expect doing more from here, hence the limited -// implementation and support. -// -NTSTATUS -NTAPI -ScsiDiskFileSystemControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - NTSTATUS Status; - - DPRINT1("ScsiDiskFileSystemControl(%p, %p)\n", DeviceObject, Irp); - - Stack = IoGetCurrentIrpStackLocation(Irp); - - switch (Stack->MinorFunction) - { - case IRP_MN_USER_FS_REQUEST: - Status = NtfsRussinovichism(DeviceObject, Irp); - break; - - default: - DPRINT("MinorFunction %d\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; -}

1 0

[pschweitzer] 65104: [NTOSKRNL] Disable the IopParseDevice hack. It appears it was triggered on volume opening and thus was breaking volume opening which were then forwarded down to disk.sys. Not s...
by pschweitzer＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: pschweitzer Date: Wed Oct 29 18:20:43 2014 New Revision: 65104 URL: http://svn.reactos.org/svn/reactos?rev=65104&view=rev Log: [NTOSKRNL] Disable the IopParseDevice hack. It appears it was triggered on volume opening and thus was breaking volume opening which were then forwarded down to disk.sys. Not sure how legit it is to have it anylonger. At least, disabling it reenables volume opening in ReactOS and associated FSCTL! Alex & Aleksey, can you review please? CORE-8725 Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Wed Oct 29 18:20:43 2014 @@ -419,6 +419,7 @@ DirectOpen = TRUE; } +#if 0 /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. */ @@ -438,6 +439,7 @@ WRITE_DAC)); DirectOpen = TRUE; } +#endif /* Check if we have a related FO that wasn't a direct open */ if ((OpenPacket->RelatedFileObject) &&

1 0

[khornicek] 65103: [NLS] - fix the code page value - also fixes intl.cpl showing date format string in the code page list
by khornicek＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: khornicek Date: Wed Oct 29 18:20:03 2014 New Revision: 65103 URL: http://svn.reactos.org/svn/reactos?rev=65103&view=rev Log: [NLS] - fix the code page value - also fixes intl.cpl showing date format string in the code page list Modified: trunk/reactos/media/nls/c_037.nls Modified: trunk/reactos/media/nls/c_037.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_037.nls?rev=65… ============================================================================== Binary files - no diff available.

1 0

[khornicek] 65102: [KERNEL32] - remove bunch of stray pragmas - add a czech translation to stop debug spam reported in CORE-8720
by khornicek＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: khornicek Date: Wed Oct 29 16:59:44 2014 New Revision: 65102 URL: http://svn.reactos.org/svn/reactos?rev=65102&view=rev Log: [KERNEL32] - remove bunch of stray pragmas - add a czech translation to stop debug spam reported in CORE-8720 Added: trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc (with props) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Wed Oct 29 16:59:44 2014 @@ -11,14 +11,15 @@ /* UTF-8 */ #pragma code_page(65001) - +#ifdef LANGUAGE_CS_CZ + #include "winnls/lang/cs-CZ.rc" +#endif #ifdef LANGUAGE_DE_DE #include "winnls/lang/de-DE.rc" #endif #ifdef LANGUAGE_EN_US #include "winnls/lang/en-US.rc" #endif -#pragma code_page(65001) #ifdef LANGUAGE_ES_ES #include "winnls/lang/es-ES.rc" #endif Added: trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc (added) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc [iso-8859-1] Wed Oct 29 16:59:44 2014 @@ -0,0 +1,161 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - stÅedoevropskÃ© jazyky)" + 1251 "1251 (ANSI - azbuka)" + 1252 "1252 (ANSI - latin I)" + 1253 "1253 (ANSI - ÅeÄtina)" + 1254 "1254 (ANSI - tureÄtina)" + 1255 "1255 (ANSI - hebrejÅ¡tina)" + 1256 "1256 (ANSI - arabÅ¡tina)" + 1257 "1257 (ANSI - pobaltskÃ© jazyky)" + 1258 "1258 (ANSI/OEM - vietnamÅ¡tina)" + 874 "874 (ANSI/OEM - thajÅ¡tina)" + 932 "932 (ANSI/OEM - japonÅ¡tina Shift-JIS)" + 936 "936 (ANSI/OEM - zjednoduÅ¡enÃ¡ ÄÃnÅ¡tina GBK)" + 949 "949 (ANSI/OEM - korejÅ¡tina)" + 950 "950 (ANSI/OEM - tradiÄnÃ ÄÃnÅ¡tina Big5)" + + 437 "437 (OEM - SpojenÃ© stÃ¡ty)" + 737 "737 (OEM - Åecko 437G)" + 775 "775 (OEM - PobaltÃ)" + 850 "850 (OEM - vÃcejazyÄnÃ¡ latin I)" + 852 "852 (OEM - latin II)" + 855 "855 (OEM - azbuka)" + 857 "857 (OEM - tureÄtina)" + 858 "858 (OEM - vÃcejazyÄnÃ¡ Latin I + Euro)" + 860 "860 (OEM - portugalÅ¡tina)" + 861 "861 (OEM - islandÅ¡tina)" + 862 "862 (OEM - hebrejÅ¡tina)" + 863 "863 (OEM - kanadskÃ¡ francouzÅ¡tina)" + 864 "864 (OEM - arabÅ¡tina)" + 865 "865 (OEM - severskÃ© jazyky)" + 866 "866 (OEM - ruÅ¡tina)" + 869 "869 (OEM - modernÃ ÅeÄtina )" + + 10000 "10000 (MAC - romÃ¡nskÃ© jazyky)" + 10001 "10001 (MAC - japonÅ¡tina)" + 10002 "10002 (MAC - tradiÄnÃ ÄÃnÅ¡tina Big5)" + 10003 "10003 (MAC - korejÅ¡tina)" + 10004 "10004 (MAC - arabÅ¡tina)" + 10005 "10005 (MAC - hebrejÅ¡tina)" + 10006 "10006 (MAC - ÅeÄtina I)" + 10007 "10007 (MAC - azbuka)" + 10008 "10008 (MAC - zjednoduÅ¡enÃ¡ ÄÃnÅ¡tina GB 2312)" + 10010 "10010 (MAC - rumunÅ¡tina)" + 10017 "10017 (MAC - ukrajinÅ¡tina)" + 10021 "10021 (MAC - thajÅ¡tina)" + 10029 "10029 (MAC - latin II)" + 10079 "10079 (MAC - islandÅ¡tina)" + 10081 "10081 (MAC - tureÄtina)" + 10082 "10082 (MAC - chorvatÅ¡tina)" + + 65000 "65000 (UTF-7)" + 65001 "65001 (UTF-8)" + + 3700 "37 (IBM EBCDIC - U.S.A./Kanada)" /* FIXME */ + 1026 "1026 (IBM EBCDIC - tureÄtina (latin-5))" + 1047 "1047 (IBM EBCDIC - latin-1/Open System)" + 1140 "1140 (IBM EBCDIC - U.S.A/Kanada (37 + Euro))" + 1141 "1141 (IBM EBCDIC - NÄmecko (20273 + Euro))" + 1142 "1142 (IBM EBCDIC - DÃ¡nsko/Norsko (20277 + Euro))" + 1143 "1143 (IBM EBCDIC - Finsko/Å vÃ©dsko (20278 + Euro))" + 1144 "1144 (IBM EBCDIC - ItÃ¡lie (20280 + Euro))" + 1145 "1145 (IBM EBCDIC - LatinskÃ¡ Amerika/Å panÄlsko (20284 + Euro))" + 1146 "1146 (IBM EBCDIC - SpojenÃ© krÃ¡lovstvÃ (20285 + Euro))" + 1147 "1147 (IBM EBCDIC - Francie (20297 + Euro))" + 1148 "1148 (IBM EBCDIC - mezinÃ¡rodnÃ (500 + Euro))" + 1149 "1149 (IBM EBCDIC - Island (20871 + Euro))" + 20273 "20273 (IBM EBCDIC - NÄmecko)" + 20277 "20277 (IBM EBCDIC - DÃ¡nsko/Norsko)" + 20278 "20278 (IBM EBCDIC - Finsko/Å vÃ©dsko)" + 20280 "20280 (IBM EBCDIC - ItÃ¡lie)" + 20284 "20284 (IBM EBCDIC - LatinskÃ¡ Amerika/Å panÄlsko)" + 20285 "20285 (IBM EBCDIC - SpojenÃ© krÃ¡lovstvÃ)" + 20290 "20290 (IBM EBCDIC - japonÅ¡tina - rozÅ¡ÃÅenÃ¡ Katakana)" + 20297 "20297 (IBM EBCDIC - Francie)" + 20420 "20420 (IBM EBCDIC - arabÅ¡tina)" + 20423 "20423 (IBM EBCDIC - Åecko)" + 20424 "20424 (IBM EBCDIC - hebrejÅ¡tina)" + 20833 "20833 (IBM EBCDIC - rozÅ¡ÃÅenÃ¡ korejÅ¡tina)" + 20838 "20838 (IBM EBCDIC - thajÅ¡tina)" + 20871 "20871 (IBM EBCDIC - islandÅ¡tina)" + 20880 "20880 (IBM EBCDIC - azbuka (Rusko))" + 20905 "20905 (IBM EBCDIC - tureÄtina)" + 20924 "20924 (IBM EBCDIC - latin-1/Open System (1047 + Euro))" + 21025 "21025 (IBM EBCDIC - azbuka (Srbsko, Bulharsko))" + 500 "500 (IBM EBCDIC - mezinÃ¡rodnÃ)" + 870 "870 (IBM EBCDIC - vÃcejazyÄnÃ¡/ROECE (Latin-2))" + 875 "875 (IBM EBCDIC - modernÃ ÅeÄtina)" + + 20269 "20269 (ISO 6937 akcent bez mezer)" + 28591 "28591 (ISO 8859-1 latin I)" + 28592 "28592 (ISO 8859-2 stÅednÃ Evropa)" + 28593 "28593 (ISO 8859-3 latin 3)" + 28594 "28594 (ISO 8859-4 PobaltÃ)" + 28595 "28595 (ISO 8859-5 azbuka)" + 28596 "28596 (ISO 8859-6 arabÅ¡tina)" + 28597 "28597 (ISO 8859-7 Åecko)" + 28598 "28598 (ISO 8859-8 hebrejÅ¡tina: vizuÃ¡lnÃ ÅazenÃ)" + 28599 "28599 (ISO 8859-9 latin 5)" + 28605 "28605 (ISO 8859-15 latin 9)" + 38598 "38598 (ISO 8859-8 hebrejÅ¡tina: logickÃ© ÅazenÃ)" + + 20105 "20105 (IA5 IRV mezinÃ¡rodnÃ abeceda No.5)" + 20106 "20106 (IA5 nÄmÄina)" + 20107 "20107 (IA5 Å¡vÃ©dÅ¡tina)" + 20108 "20108 (IA5 norÅ¡tina)" + + 1361 "1361 (korejÅ¡tina - Johab)" + 20000 "20000 (CNS - Tchaj-wan)" + 20001 "20001 (TCA - Tchaj-wan)" + 20002 "20002 (Eten - Tchaj-wan)" + 20003 "20003 (IBM5550 - Tchaj-wan)" + 20004 "20004 (TeleText - Tchaj-wan)" + 20005 "20005 (Wang - Tchaj-wan)" + 20127 "20127 (US-ASCII)" + 20261 "20261 (T.61)" + 20866 "20866 (ruÅ¡tina - KOI8)" + 21027 "21027 (rozÅ¡ÃÅenÃ¡ Alfa - malÃ¡ pÃsmena)" + 21866 "21866 (ukrajinÅ¡tina - KOI8-U)" + 708 "708 (arabÅ¡tina - ASMO)" + 720 "720 (arabÅ¡tina - prÅ¯hlednÃ¡ ASMO)" + 20932 "20932 (JIS X 0208-1990 & 0212-1990)" + 20936 "20936 (zjednoduÅ¡enÃ¡ ÄÃnÅ¡tina GB2312)" + 20949 "20949 (korejÅ¡tina Wansung)" + + 57002 "57002 (ISCII dÃ©vanÃ¡garÃ)" + 57003 "57003 (ISCII bengÃ¡lÅ¡tina)" + 57004 "57004 (ISCII tamilÅ¡tina)" + 57005 "57005 (ISCII telugÅ¡tina)" + 57006 "57006 (ISCII Ã¡sÃ¡mÅ¡tina)" + 57007 "57007 (ISCII urijÅ¡tina)" + 57008 "57008 (ISCII kannadÅ¡tina)" + 57009 "57009 (ISCII malajÃ¡lamÅ¡tina)" + 57010 "57010 (ISCII gudÅ¾arÃ¡tÅ¡tina)" + 57011 "57011 (ISCII gurmukhÃ)" + + 50930 "50930 (IBM EBCDIC - japonÅ¡tina (rozÅ¡ÃÅenÃ¡ Katakana) a japonÅ¡tina)" + 50931 "50931 (IBM EBCDIC - U.S.A./Kanada a japonÅ¡tina)" + 50933 "50933 (IBM EBCDIC - rozÅ¡ÃÅenÃ¡ korejÅ¡tina a korejÅ¡tina)" + 50935 "50935 (IBM EBCDIC - zjednoduÅ¡enÃ¡ ÄÃnÅ¡tina" + 50937 "50937 (IBM EBCDIC - U.S.A./Kanada a tradiÄnÃ ÄÃnÅ¡tina)" + 50939 "50939 (IBM EBCDIC - japonÅ¡tina (rozÅ¡ÃÅenÃ¡ latinka) a japonÅ¡tina)" + + 50220 "50220 (ISO-2022 japonÅ¡tina bez poloviÄnÃch znakÅ¯ Katakana)" + 50221 "50221 (ISO-2022 japonÅ¡tina s poloviÄnÃmi znaky Katakana)" + 50222 "50222 (ISO-2022 japonÅ¡tina JIS X 0201-1989)" + 50225 "50225 (ISO-2022 korejÅ¡tina)" + 50227 "50227 (ISO-2022 zjednoduÅ¡enÃ¡ ÄÃnÅ¡tina)" + 50229 "50229 (ISO-2022 tradiÄnÃ ÄÃnÅ¡tina)" + + 51932 "51932 (EUC-japonÅ¡tina)" + 51936 "51936 (EUC-zjednoduÅ¡enÃ¡ ÄÃnÅ¡tina)" + 51949 "51949 (EUC-korejÅ¡tina)" + 51950 "51950 (EUC-tradiÄnÃ ÄÃnÅ¡tina)" + + 52936 "52936 (HZ-GB2312 zjednoduÅ¡enÃ¡ ÄÃnÅ¡tina)" + 54936 "54936 (GB18030 zjednoduÅ¡enÃ¡ ÄÃnÅ¡tina)" +END Propchange: trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc [iso-8859-1] Wed Oct 29 16:59:44 2014 @@ -1,5 +1,3 @@ -#pragma code_page(1252) - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc [iso-8859-1] Wed Oct 29 16:59:44 2014 @@ -1,5 +1,3 @@ -#pragma code_page(1252) - LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc [iso-8859-1] Wed Oct 29 16:59:44 2014 @@ -1,5 +1,3 @@ -#pragma code_page(1252) - LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc [iso-8859-1] Wed Oct 29 16:59:44 2014 @@ -1,7 +1,4 @@ /* TRANSLATOR: 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ - -#pragma code_page(1252) - LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE

1 0

[zguo] 65101: [WIN32SS] Merge in workaround for freetype rendering issue. CORE-8525, CORE-6023, CORE-7735 and CORE-8635
by zguo＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: zguo Date: Wed Oct 29 16:03:21 2014 New Revision: 65101 URL: http://svn.reactos.org/svn/reactos?rev=65101&view=rev Log: [WIN32SS] Merge in workaround for freetype rendering issue. CORE-8525, CORE-6023, CORE-7735 and CORE-8635 Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/win32ss/gdi/ntgdi/freetype.c Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 29 16:03:21 2014 @@ -18,4 +18,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976,65025-65028,65041 +/trunk/reactos:64752-64754,64765,64769,64771,64776-64777,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976,65025-65028,65041 Modified: branches/0.3.17/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/gdi/ntgd… ============================================================================== --- branches/0.3.17/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Oct 29 16:03:21 2014 @@ -2664,15 +2664,42 @@ Status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE); if (NT_SUCCESS(Status)) { + static const UNICODE_STRING MarlettFaceNameW = RTL_CONSTANT_STRING(L"Marlett"); + static const UNICODE_STRING SymbolFaceNameW = RTL_CONSTANT_STRING(L"Symbol"); + static const UNICODE_STRING VGAFaceNameW = RTL_CONSTANT_STRING(L"VGA"); + if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length) { EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR); EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0'; } - if (0 == RtlCompareUnicodeString(FaceName, &EntryFaceNameW, TRUE)) + + if (!RtlCompareUnicodeString(FaceName, &EntryFaceNameW, TRUE)) { Score += 49; } + + /* FIXME: this is a work around to counter weird fonts on weird places. + A proper fix would be to score fonts on more attributes than + the ones in this function */ + if (!RtlCompareUnicodeString(&MarlettFaceNameW, &EntryFaceNameW, TRUE) && + RtlCompareUnicodeString(&MarlettFaceNameW, FaceName, TRUE)) + { + Score = 0; + } + + if (!RtlCompareUnicodeString(&SymbolFaceNameW, &EntryFaceNameW, TRUE) && + RtlCompareUnicodeString(&SymbolFaceNameW, FaceName, TRUE)) + { + Score = 0; + } + + if (!RtlCompareUnicodeString(&VGAFaceNameW, &EntryFaceNameW, TRUE) && + RtlCompareUnicodeString(&VGAFaceNameW, FaceName, TRUE)) + { + Score = 0; + } + RtlFreeUnicodeString(&EntryFaceNameW); }

1 0

[khornicek] 65100: [BOOTDATA] - add metrics to classic themes (the flag 0xb0001 will result in a kinda esoteric value of type REG_QWORD) - fixes switching from Lautus back to a classic theme CORE-8718
by khornicek＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: khornicek Date: Wed Oct 29 14:27:09 2014 New Revision: 65100 URL: http://svn.reactos.org/svn/reactos?rev=65100&view=rev Log: [BOOTDATA] - add metrics to classic themes (the flag 0xb0001 will result in a kinda esoteric value of type REG_QWORD) - fixes switching from Lautus back to a classic theme CORE-8718 Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Oct 29 14:27:09 2014 @@ -1,4 +1,4 @@ -ï»¿[Version] +[Version] Signature="$ReactOS$" [AddReg] @@ -301,6 +301,15 @@ HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #29",0x00010001,0x006a240a HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #30",0x00010001,0x00c8d0d4 HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Brick HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\1","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%" @@ -363,6 +372,15 @@ HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #30",0x00010001,0x00a5bfc2 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Eggplant HKCU,"Control Panel\Appearance\New Schemes\2","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\2","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%" @@ -425,6 +443,15 @@ HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Color #29",0x00010001,0x00788058 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Color #30",0x00010001,0x00a8b090 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Green Olive HKCU,"Control Panel\Appearance\New Schemes\3","DisplayName",0x00020000,"@themeui.dll,-877" HKCU,"Control Panel\Appearance\New Schemes\3","LegacyName",0x00020000,"%DESKTOP_SCHEME_3%" @@ -487,6 +514,15 @@ HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Color #29",0x00010001,0x00649759 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Color #30",0x00010001,0x00a9c8a2 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; High Contrast 1 HKCU,"Control Panel\Appearance\New Schemes\4","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\4","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%" @@ -549,6 +585,15 @@ HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Color #29",0x00010001,0x00008000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; High Contrast 2 HKCU,"Control Panel\Appearance\New Schemes\5","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\5","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%" @@ -611,6 +656,15 @@ HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Color #29",0x00010001,0x00ff0000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; High Contrast Black HKCU,"Control Panel\Appearance\New Schemes\6","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\6\","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%" @@ -673,6 +727,15 @@ HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; High Contrast White HKCU,"Control Panel\Appearance\New Schemes\7","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\7","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%" @@ -735,6 +798,15 @@ HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Color #29",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Color #30",0x00010001,0x00ffffff HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Lilac HKCU,"Control Panel\Appearance\New Schemes\8","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\8","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%" @@ -797,6 +869,15 @@ HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Color #29",0x00010001,0x00b14e5a HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Color #30",0x00010001,0x00d9a8ae HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Maple HKCU,"Control Panel\Appearance\New Schemes\9","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\9","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%" @@ -859,6 +940,15 @@ HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Color #29",0x00010001,0x0046a6c6 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Color #30",0x00010001,0x00aed8e6 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Marine HKCU,"Control Panel\Appearance\New Schemes\10","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\10","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%" @@ -921,6 +1011,15 @@ HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Color #29",0x00010001,0x00800000 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Color #30",0x00010001,0x00b8c088 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Plum HKCU,"Control Panel\Appearance\New Schemes\11","DisplayName",0x00020000,"@themeui.dll,-869" HKCU,"Control Panel\Appearance\New Schemes\11","LegacyName",0x00020000,"%DESKTOP_SCHEME_11%" @@ -983,6 +1082,15 @@ HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Color #30",0x00010001,0x009098a8 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Pumpkin HKCU,"Control Panel\Appearance\New Schemes\12","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\12","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%" @@ -1045,6 +1153,15 @@ HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Color #30",0x00010001,0x009dd5ec HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Rainy Day HKCU,"Control Panel\Appearance\New Schemes\13","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\13","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%" @@ -1107,6 +1224,15 @@ HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Color #29",0x00010001,0x007d654f HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Color #30",0x00010001,0x00b19983 HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; ReactOS Classic HKCU,"Control Panel\Appearance\New Schemes\14","DisplayName",0x00020000,"@themeui.dll,-880" HKCU,"Control Panel\Appearance\New Schemes\14","LegacyName",0x00020000,"%DESKTOP_SCHEME_14%" @@ -1169,6 +1295,15 @@ HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Color #29",0x00010001,0x00800000 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Rose HKCU,"Control Panel\Appearance\New Schemes\15","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\15","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%" @@ -1231,6 +1366,15 @@ HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Color #29",0x00010001,0x0070609f HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Color #30",0x00010001,0x00b7afcf HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Sand HKCU,"Control Panel\Appearance\New Schemes\16","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\16","LegacyName",0x00020000,"%DESKTOP_SCHEME_16%" @@ -1293,6 +1437,15 @@ HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Color #30",0x00010001,0x00bbccd5 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Sky (WinXP-like) HKCU,"Control Panel\Appearance\New Schemes\17","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\17","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%" @@ -1355,6 +1508,15 @@ HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Color #29",0x00010001,0x00c56a31 HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Color #30",0x00010001,0x00d8e9ec HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Slate HKCU,"Control Panel\Appearance\New Schemes\18","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\18","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%" @@ -1417,6 +1579,15 @@ HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Color #29",0x00010001,0x00978055 HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Color #30",0x00010001,0x00c8b99d HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Storm HKCU,"Control Panel\Appearance\New Schemes\19","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\19","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%" @@ -1479,6 +1650,15 @@ HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Teal HKCU,"Control Panel\Appearance\New Schemes\20","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\20","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%" @@ -1541,6 +1721,15 @@ HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 ; Wheat HKCU,"Control Panel\Appearance\New Schemes\21","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\21","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%" @@ -1603,6 +1792,15 @@ HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Color #29",0x00010001,0x00008080 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Color #30",0x00010001,0x00a0dede HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #0",0x000b0001,01,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #1",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #2",0x000b0001,10,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #3",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #4",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #5",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #6",0x000b0001,0c,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #7",0x000b0001,12,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #8",0x000b0001,12,00,00,00,00,00,00,00 HKCU,"Control Panel\Sound","Beep",2,"yes" HKCU,"Control Panel\Sound","ExtendedSounds",2,"yes"

1 0

[dquintana] 65099: [BROWSEUI] * Fix a 'pasta. * Open something less stupid when clicking on "Is this copy legal?" in the Help menu.
by dquintana＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: dquintana Date: Wed Oct 29 12:32:46 2014 New Revision: 65099 URL: http://svn.reactos.org/svn/reactos?rev=65099&view=rev Log: [BROWSEUI] * Fix a 'pasta. * Open something less stupid when clicking on "Is this copy legal?" in the Help menu. Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Oct 29 12:32:46 2014 @@ -453,7 +453,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - TRACE("COMMON start menu obtained.\n"); + TRACE("COMMON favorites obtained.\n"); *ppidl = pidlCommonFavorites; hr = BindToDesktop(pidlCommonFavorites, ppsfFavorites); return hr; Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Oct 29 12:32:46 2014 @@ -3252,16 +3252,9 @@ return 0; } -HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, DWORD dwFlags); - LRESULT CShellBrowser::OnIsThisLegal(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - LPITEMIDLIST desktopPIDL; - HRESULT hResult = SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 0, &desktopPIDL); - if (SUCCEEDED(hResult)) - { - hResult = SHOpenNewFrame(desktopPIDL, NULL, -1, 1); - } + ShellExecute(m_hWnd, NULL, L"https://reactos.org/user-faq", NULL, NULL, SW_SHOWNORMAL); return 0; }

1 0

[dquintana] 65098: [RSHELL] * Fix assumption that the USER folder will always exist and only the COMMON folder may be missing. Allows the Start Menu to work in livecd. [BROWSEUI] * Apply the same f...
by dquintana＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: dquintana Date: Wed Oct 29 11:52:45 2014 New Revision: 65098 URL: http://svn.reactos.org/svn/reactos?rev=65098&view=rev Log: [RSHELL] * Fix assumption that the USER folder will always exist and only the COMMON folder may be missing. Allows the Start Menu to work in livecd. [BROWSEUI] * Apply the same fix to the Favorites folder, although the LiveCD does not currently have the folder so it will not work regardless. Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Oct 29 11:52:45 2014 @@ -20,6 +20,8 @@ #include "precomp.h" #include "CMergedFolder.h" + +WINE_DEFAULT_DEBUG_CHANNEL(CStartMenu); // TODO: declare these GUIDs and interfaces in the right place (whatever that may be) IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; @@ -336,15 +338,30 @@ hr = SHGetSpecialFolderLocation(NULL, CSIDL_STARTMENU, &pidlUserStartMenu); if (FAILED(hr)) - return hr; - - if (FAILED(SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_STARTMENU, &pidlCommonStartMenu))) - { + { + WARN("Failed to get the USER start menu folder. Trying to run with just the COMMON one.\n"); + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_STARTMENU, &pidlCommonStartMenu); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + TRACE("COMMON start menu obtained.\n"); + hr = BindToDesktop(pidlCommonStartMenu, ppsfStartMenu); + ILFree(pidlCommonStartMenu); + return hr; + } + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_STARTMENU, &pidlCommonStartMenu); + if (FAILED_UNEXPECTEDLY(hr)) + { + WARN("Failed to get the COMMON start menu folder. Will use only the USER contents.\n"); hr = BindToDesktop(pidlUserStartMenu, ppsfStartMenu); ILFree(pidlUserStartMenu); return hr; } + TRACE("Both COMMON and USER statr menu folders obtained, merging them...\n"); + hr = BindToDesktop(pidlUserStartMenu, &psfUserStartMenu); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -353,7 +370,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if 1 +#if !USE_SYSTEM_MERGED_FOLDERS hr = CMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); #else hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); @@ -447,8 +464,13 @@ return hr; hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAMS, &pidlProgramsAbsolute); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (FAILED(hr)) + { + WARN("USER Programs folder not found."); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_PROGRAMS, &pidlProgramsAbsolute); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } pidlPrograms = ILClone(ILFindLastID(pidlProgramsAbsolute)); ILFree(pidlProgramsAbsolute); Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Oct 29 11:52:45 2014 @@ -446,14 +446,29 @@ hr = SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &pidlUserFavorites); if (FAILED(hr)) + { + WARN("Failed to get the USER favorites folder. Trying to run with just the COMMON one.\n"); + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_FAVORITES, &pidlCommonFavorites); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + TRACE("COMMON start menu obtained.\n"); + *ppidl = pidlCommonFavorites; + hr = BindToDesktop(pidlCommonFavorites, ppsfFavorites); return hr; - - if (FAILED(SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_FAVORITES, &pidlCommonFavorites))) - { + } + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_FAVORITES, &pidlCommonFavorites); + if (FAILED_UNEXPECTEDLY(hr)) + { + WARN("Failed to get the COMMON favorites folder. Will use only the USER contents.\n"); + *ppidl = pidlCommonFavorites; hr = BindToDesktop(pidlUserFavorites, ppsfFavorites); - *ppidl = pidlUserFavorites; return hr; } + + TRACE("Both COMMON and USER favorites folders obtained, merging them...\n"); hr = BindToDesktop(pidlUserFavorites, &psfUserFavorites); if (FAILED_UNEXPECTEDLY(hr))

1 0

[pschweitzer] 65097: [DISK] Actually, sysinternals used to release the source code of NTFSInfo (thanks Christoph!), so we know a bit more about the interface of the user FS request. So, implement a...
by pschweitzer＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: pschweitzer Date: Wed Oct 29 11:31:19 2014 New Revision: 65097 URL: http://svn.reactos.org/svn/reactos?rev=65097&view=rev Log: [DISK] Actually, sysinternals used to release the source code of NTFSInfo (thanks Christoph!), so we know a bit more about the interface of the user FS request. So, implement a bit more of the interface to validate it properly works (and so far, it does!) CORE-8725 Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Wed Oct 29 11:31:19 2014 @@ -1555,6 +1555,7 @@ Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; } + DPRINT1("STATUS_INVALID_PARAMETER\n"); return STATUS_INVALID_PARAMETER; } @@ -5222,8 +5223,69 @@ NtfsRussinovichism(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +#define FSCTL_GET_VOLUME_INFORMATION 0x90064 + typedef struct { + LARGE_INTEGER SerialNumber; + LARGE_INTEGER NumberOfSectors; + LARGE_INTEGER TotalClusters; + LARGE_INTEGER FreeClusters; + LARGE_INTEGER Reserved; + ULONG BytesPerSector; + ULONG BytesPerCluster; + ULONG BytesPerMFTRecord; + ULONG ClustersPerMFTRecord; + LARGE_INTEGER MFTLength; + LARGE_INTEGER MFTStart; + LARGE_INTEGER MFTMirrorStart; + LARGE_INTEGER MFTZoneStart; + LARGE_INTEGER MFTZoneEnd; + } NTFS_VOLUME_DATA_BUFFER, *PNTFS_VOLUME_DATA_BUFFER; + + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; + PDISK_DATA diskData; + + DPRINT1("NtfsRussinovichism(%p, %p)\n", DeviceObject, Irp); + + Stack = IoGetCurrentIrpStackLocation(Irp); + + switch (Stack->Parameters.FileSystemControl.FsControlCode) + { + case FSCTL_GET_VOLUME_INFORMATION: + // + // Check we received something we understand + // + if (Stack->Parameters.FileSystemControl.OutputBufferLength < sizeof(NTFS_VOLUME_DATA_BUFFER) || + Irp->UserBuffer == NULL) + { + DPRINT1("Invalid output! %d %p\n", Stack->Parameters.FileSystemControl.OutputBufferLength, Irp->UserBuffer); + Status = STATUS_INVALID_PARAMETER; + break; + } + + // + // Now, quickly check we are supposed to have a NTFS volume + // + diskData = (PDISK_DATA)(deviceExtension + 1); + if (diskData->PartitionType != PARTITION_IFS) + { + DPRINT1("Invalid partition type! %x\n", diskData->PartitionType); + Status = STATUS_INVALID_PARAMETER; + break; + } + + UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + return Status; +#undef FSCTL_GET_VOLUME_INFORMATION } //

1 0

[akhaldi] 65096: * Sync up to trunk head (r65095). * Thank you Kamil for r65087 ; )
by akhaldi＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: akhaldi Date: Wed Oct 29 11:25:42 2014 New Revision: 65096 URL: http://svn.reactos.org/svn/reactos?rev=65096&view=rev Log: * Sync up to trunk head (r65095). * Thank you Kamil for r65087 ;) Added: branches/shell-experiments/win32ss/gdi/gdi32/objects/colorspace.c - copied unchanged from r65095, trunk/reactos/win32ss/gdi/gdi32/objects/colorspace.c branches/shell-experiments/win32ss/gdi/gdi32/objects/gdiobj.c - copied unchanged from r65095, trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c Removed: branches/shell-experiments/win32ss/gdi/gdi32/misc/hacks.c branches/shell-experiments/win32ss/gdi/gdi32/misc/stubs.c branches/shell-experiments/win32ss/gdi/gdi32/misc/stubsa.c branches/shell-experiments/win32ss/gdi/gdi32/misc/stubsw.c Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/network/net/cmdUser.c branches/shell-experiments/base/system/winlogon/screensaver.c branches/shell-experiments/drivers/filesystems/fastfat/finfo.c branches/shell-experiments/drivers/filesystems/ntfs/volinfo.c branches/shell-experiments/drivers/storage/class/disk/disk.c branches/shell-experiments/win32ss/gdi/gdi32/CMakeLists.txt branches/shell-experiments/win32ss/gdi/gdi32/include/gdi32p.h branches/shell-experiments/win32ss/gdi/gdi32/misc/misc.c branches/shell-experiments/win32ss/gdi/gdi32/misc/wingl.c branches/shell-experiments/win32ss/gdi/gdi32/objects/bitmap.c branches/shell-experiments/win32ss/gdi/gdi32/objects/brush.c branches/shell-experiments/win32ss/gdi/gdi32/objects/coord.c branches/shell-experiments/win32ss/gdi/gdi32/objects/dc.c branches/shell-experiments/win32ss/gdi/gdi32/objects/eng.c branches/shell-experiments/win32ss/gdi/gdi32/objects/enhmfile.c branches/shell-experiments/win32ss/gdi/gdi32/objects/font.c branches/shell-experiments/win32ss/gdi/gdi32/objects/icm.c branches/shell-experiments/win32ss/gdi/gdi32/objects/metafile.c branches/shell-experiments/win32ss/gdi/gdi32/objects/painting.c branches/shell-experiments/win32ss/gdi/gdi32/objects/palette.c branches/shell-experiments/win32ss/gdi/gdi32/objects/printdrv.c branches/shell-experiments/win32ss/gdi/gdi32/objects/text.c branches/shell-experiments/win32ss/user/ntuser/painting.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Removed: branches/shell-experiments/win32ss/gdi/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Removed: branches/shell-experiments/win32ss/gdi/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Removed: branches/shell-experiments/win32ss/gdi/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Removed: branches/shell-experiments/win32ss/gdi/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/enhmfile.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/icm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs