Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 01/05: [MSPATCHA][PSDK] Update / add some function definitions
by Mark Jansen 15 Dec '18

15 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55e072050905450cea21d… commit 55e072050905450cea21d29ec5004d6d3540ad0b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 1 14:16:46 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Dec 15 16:28:59 2018 +0100 [MSPATCHA][PSDK] Update / add some function definitions --- dll/win32/mspatcha/mspatcha.spec | 10 +++++----- dll/win32/mspatcha/mspatcha_main.c | 4 ++-- sdk/include/psdk/patchapi.h | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dll/win32/mspatcha/mspatcha.spec b/dll/win32/mspatcha/mspatcha.spec index cc8ca94fbd..08231e0d6f 100644 --- a/dll/win32/mspatcha/mspatcha.spec +++ b/dll/win32/mspatcha/mspatcha.spec @@ -1,12 +1,12 @@ 1 stdcall ApplyPatchToFileA(str str str long) -2 stub ApplyPatchToFileByHandles +2 stdcall -stub ApplyPatchToFileByHandles(ptr ptr ptr long) 3 stub ApplyPatchToFileByHandlesEx 4 stub ApplyPatchToFileExA 5 stub ApplyPatchToFileExW 6 stdcall ApplyPatchToFileW(wstr wstr wstr long) 7 stdcall GetFilePatchSignatureA(str long ptr long ptr long ptr long ptr) -8 stub GetFilePatchSignatureByHandle +8 stdcall -stub GetFilePatchSignatureByHandle(ptr long ptr long ptr long ptr long ptr) 9 stdcall GetFilePatchSignatureW(wstr long ptr long ptr long ptr long ptr) -10 stub TestApplyPatchToFileA -11 stub TestApplyPatchToFileByHandles -12 stub TestApplyPatchToFileW +10 stdcall -stub TestApplyPatchToFileA(str str long) +11 stdcall -stub TestApplyPatchToFileByHandles(ptr ptr long) +12 stdcall -stub TestApplyPatchToFileW(wstr wstr long) diff --git a/dll/win32/mspatcha/mspatcha_main.c b/dll/win32/mspatcha/mspatcha_main.c index f78b8ab352..8dc4403d13 100644 --- a/dll/win32/mspatcha/mspatcha_main.c +++ b/dll/win32/mspatcha/mspatcha_main.c @@ -105,7 +105,7 @@ BOOL WINAPI ApplyPatchToFileW(LPCWSTR patch_file, LPCWSTR old_file, LPCWSTR new_ */ BOOL WINAPI GetFilePatchSignatureA(LPCSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, - PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, PVOID buffer) { FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_a(filename), flags, data, ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); @@ -118,7 +118,7 @@ BOOL WINAPI GetFilePatchSignatureA(LPCSTR filename, ULONG flags, PVOID data, ULO */ BOOL WINAPI GetFilePatchSignatureW(LPCWSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, - PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPWSTR buffer) + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, PVOID buffer) { FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_w(filename), flags, data, ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); diff --git a/sdk/include/psdk/patchapi.h b/sdk/include/psdk/patchapi.h index 9a62a0ff64..03853283ac 100644 --- a/sdk/include/psdk/patchapi.h +++ b/sdk/include/psdk/patchapi.h @@ -28,6 +28,13 @@ extern "C" { #define APPLY_OPTION_TEST_ONLY 0x00000004 #define APPLY_OPTION_VALID_FLAGS 0x00000007 + +// +// apply error codes +// +#define ERROR_PATCH_CORRUPT 0xC00E4102 +#define ERROR_PATCH_WRONG_FILE 0xC00E4104 + typedef struct _PATCH_IGNORE_RANGE { ULONG OffsetInOldFile; @@ -41,9 +48,36 @@ typedef struct _PATCH_RETAIN_RANGE ULONG OffsetInNewFile; } PATCH_RETAIN_RANGE, *PPATCH_RETAIN_RANGE; -BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); -BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); + +typedef WINBOOL (CALLBACK PATCH_PROGRESS_CALLBACK)(PVOID CallbackContext, ULONG CurrentPosition, ULONG MaximumPosition); +typedef PATCH_PROGRESS_CALLBACK *PPATCH_PROGRESS_CALLBACK; + + +BOOL WINAPI TestApplyPatchToFileA(LPCSTR PatchFileName, LPCSTR OldFileName, ULONG ApplyOptionFlags); +BOOL WINAPI TestApplyPatchToFileW(LPCWSTR PatchFileName, LPCWSTR OldFileName, ULONG ApplyOptionFlags); +#define TestApplyPatchToFile WINELIB_NAME_AW(TestApplyPatchToFile) +BOOL WINAPI TestApplyPatchToFileByHandles(HANDLE PatchFileHandle, HANDLE OldFileHandle, ULONG ApplyOptionFlags); + + +BOOL WINAPI ApplyPatchToFileA(LPCSTR PatchFileName, LPCSTR OldFileName, LPCSTR NewFileName, ULONG ApplyOptionFlags); +BOOL WINAPI ApplyPatchToFileW(LPCWSTR PatchFileName, LPCWSTR OldFileName, LPCWSTR NewFileName, ULONG ApplyOptionFlags); #define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) +BOOL WINAPI ApplyPatchToFileByHandles(HANDLE PatchFileHandle, HANDLE OldFileHandle, HANDLE NewFileHandle, ULONG ApplyOptionFlags); + + +BOOL WINAPI GetFilePatchSignatureA(LPCSTR FileName, ULONG OptionFlags, PVOID OptionData, ULONG IgnoreRangeCount, + PPATCH_IGNORE_RANGE IgnoreRangeArray, ULONG RetainRangeCount, + PPATCH_RETAIN_RANGE RetainRangeArray, ULONG SignatureBufferSize, + PVOID SignatureBuffer); +BOOL WINAPI GetFilePatchSignatureW(LPCWSTR FileName, ULONG OptionFlags, PVOID OptionData, ULONG IgnoreRangeCount, + PPATCH_IGNORE_RANGE IgnoreRangeArray, ULONG RetainRangeCount, + PPATCH_RETAIN_RANGE RetainRangeArray, ULONG SignatureBufferSize, + PVOID SignatureBuffer); +#define GetFilePatchSignature WINELIB_NAME_AW(GetFilePatchSignature) +BOOL WINAPI GetFilePatchSignatureByHandle(HANDLE FileHandle, ULONG OptionFlags, PVOID OptionData, ULONG IgnoreRangeCount, + PPATCH_IGNORE_RANGE IgnoreRangeArray, ULONG RetainRangeCount, + PPATCH_RETAIN_RANGE RetainRangeArray, ULONG SignatureBufferSize, + PVOID SignatureBuffer); #ifdef __cplusplus }

1 0

[reactos] 01/01: [VCDCONTROLTOOL] Add a shortcut to start menu
by Pierre Schweitzer 15 Dec '18

15 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f88259a6320223abe3547… commit f88259a6320223abe3547bf81e701a69cb13b18e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 15 15:45:57 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 15 15:46:35 2018 +0100 [VCDCONTROLTOOL] Add a shortcut to start menu --- modules/rosapps/rosapps_shortcuts.inf | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/modules/rosapps/rosapps_shortcuts.inf b/modules/rosapps/rosapps_shortcuts.inf index faecbe860f..7a681cc1fb 100644 --- a/modules/rosapps/rosapps_shortcuts.inf +++ b/modules/rosapps/rosapps_shortcuts.inf @@ -16,6 +16,7 @@ GamesShortcuts=2, %GAMES% [SystemToolsShortcuts] %SystemRoot%\system32\fontsub.exe, %FONTSUB_TITLE%, %FONTSUB_DESC%, 0 %SystemRoot%\system32\screenshot.exe, %SCREENSHOT_TITLE%, %SCREENSHOT_DESC%, 0, %HOMEDRIVE%%HOMEPATH% +%SystemRoot%\system32\vcdcontroltool.exe, %VCD_TITLE%, %VCD_DESC%, 0 ;-------------------------------- STRINGS ------------------------------- @@ -31,6 +32,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Take screenshot +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Bulgarian [Strings.0402] @@ -45,6 +48,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Снимка SCREENSHOT_DESC=Заснемане на екрана +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Czech [Strings.0405] @@ -59,6 +64,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Sejmout obrazovku SCREENSHOT_DESC=Sejmout obrazovku +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; German [Strings.0407] @@ -73,6 +80,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Screenshot erstellen +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Greek [Strings.0408] @@ -87,6 +96,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Take screenshot +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Spanish [Strings.0a] @@ -101,6 +112,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Captura de pantalla SCREENSHOT_DESC=Guarda secciones de la pantalla como un archivo de imagen. +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Estonian [Strings.0425] @@ -115,6 +128,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Tee ekraanitõmmis +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; French [Strings.040C] @@ -129,6 +144,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Capture d'écran SCREENSHOT_DESC=Faire une capture d'écran +VCD_TITLE=Panneau de contrôle des CD-ROM virtuels +VCD_DESC=Gérer les lecteurs CD-ROM virtuels ; Hebrew [Strings.040D] @@ -143,6 +160,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=צילום מסך +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Hungarian [Strings.040E] @@ -157,6 +176,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Take screenshot +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Indonesian [Strings.0421] @@ -171,6 +192,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Ambil foto layar +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Italian [Strings.0410] @@ -185,6 +208,9 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Salva una schermata +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives + ; Japanese [Strings.0411] @@ -199,6 +225,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=フォント代替エディタ SCREENSHOT_TITLE=スナップショット SCREENSHOT_DESC=スクリーンショットを撮ります +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Dutch [Strings.0413] @@ -213,6 +241,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Take screenshot +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Norwegian [Strings.0414] @@ -227,6 +257,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Ta skjermbilde +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Polish [Strings.0415] @@ -241,6 +273,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Zrzut ekranu SCREENSHOT_DESC=Zrób zrzut ekranu +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Portuguese - Brazil [Strings.0416] @@ -255,6 +289,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=SnapShot SCREENSHOT_DESC=Capturar Tela +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Romanian [Strings.0418] @@ -269,6 +305,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Captură de ecran SCREENSHOT_DESC=Program pentru executarea de capturi de ecran. +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Russian [Strings.0419] @@ -283,6 +321,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Скриншот SCREENSHOT_DESC=Сделать снимок экрана +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Slovak [Strings.041B] @@ -297,6 +337,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Momentka //SnapShot SCREENSHOT_DESC=Uložiť obrazovku +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Turkish [Strings.041f] @@ -311,6 +353,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Ekran Görüntüsü SCREENSHOT_DESC=Ekran görüntüsü al +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Ukrainian [Strings.0422] @@ -325,6 +369,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=Знімок екрану SCREENSHOT_DESC=Зробити знімок екрана +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives ; Chinese [Strings.0804] @@ -339,3 +385,5 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor SCREENSHOT_TITLE=屏幕截图 SCREENSHOT_DESC=屏幕截图 +VCD_TITLE=Virtual CDRom Control Panel +VCD_DESC=Manage virtual CDRom drives

1 0

[reactos] 01/01: [KBDROST][NTDLL_APITEST] Add UTF-8 BOM (#1135)
by Katayama Hirofumi MZ 14 Dec '18

14 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7050ac4dce4ea766304d0… commit 7050ac4dce4ea766304d0fc988f28a702d34dc97 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 15 08:00:39 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 15 08:00:39 2018 +0900 [KBDROST][NTDLL_APITEST] Add UTF-8 BOM (#1135) Add UTF-8 BOM. CORE-15447 --- dll/keyboard/kbdrost/kbdrost.c | 2 +- modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/keyboard/kbdrost/kbdrost.c b/dll/keyboard/kbdrost/kbdrost.c index 99a12188c2..419c964721 100644 --- a/dll/keyboard/kbdrost/kbdrost.c +++ b/dll/keyboard/kbdrost/kbdrost.c @@ -1,4 +1,4 @@ -/* +/* * ReactOS Romanian (Standard) Keyboard layout * Copyright (C) 2018 ReactOS * Author: Ștefan Fulea (stefan dot fulea at mail dot com) diff --git a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c index 0c1da43bc9..ec16e7d4ac 100644 --- a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c +++ b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for RtlGenerate8dot3Name

1 0

[reactos] 01/01: [SETUPLIB] Detect GPT-partitioned disks but don't use them since we don't support them at the moment.
by Hermès Bélusca-Maïto 14 Dec '18

14 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3168373eb1aece4013ad… commit a3168373eb1aece4013adccdce87a4c3d815d6a3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 14 00:30:12 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 14 23:32:31 2018 +0100 [SETUPLIB] Detect GPT-partitioned disks but don't use them since we don't support them at the moment. - Add checks for GPT disks and either fail or ignore the disk, depending on the operation being executed. [USETUP][REACTOS] Display the disk style more accurately. --- base/setup/lib/utils/partlist.c | 155 ++++++++++++++++++++++++++++++++++++++-- base/setup/lib/utils/partlist.h | 7 +- base/setup/reactos/drivepage.c | 7 +- base/setup/usetup/partlist.c | 8 ++- base/setup/usetup/usetup.c | 40 ++++++++--- 5 files changed, 196 insertions(+), 21 deletions(-) diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index e0f16aa7a9..83ad8e0317 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -1193,6 +1193,12 @@ SetDiskSignature( PDISKENTRY DiskEntry2; PUCHAR Buffer; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return; + } + Buffer = (PUCHAR)&DiskEntry->LayoutBuffer->Signature; while (TRUE) @@ -1221,6 +1227,12 @@ SetDiskSignature( { DiskEntry2 = CONTAINING_RECORD(Entry2, DISKENTRY, ListEntry); + if (DiskEntry2->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + continue; + } + if (DiskEntry != DiskEntry2 && DiskEntry->LayoutBuffer->Signature == DiskEntry2->LayoutBuffer->Signature) break; @@ -1239,13 +1251,19 @@ UpdateDiskSignatures( PLIST_ENTRY Entry; PDISKENTRY DiskEntry; - /* Print partition lines */ + /* Update each disk */ for (Entry = List->DiskListHead.Flink; Entry != &List->DiskListHead; Entry = Entry->Flink) { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + continue; + } + if (DiskEntry->LayoutBuffer && DiskEntry->LayoutBuffer->Signature == 0) { @@ -1377,11 +1395,30 @@ AddDiskToList( * Check if this disk has a valid MBR: verify its signature, * and whether its two first bytes are a valid instruction * (related to this, see IsThereAValidBootSector() in partlist.c). + * + * See also ntoskrnl/fstub/fstubex.c!FstubDetectPartitionStyle(). */ - if (Mbr->Magic != 0xaa55 || (*(PUSHORT)Mbr->BootCode) == 0x0000) - DiskEntry->NoMbr = TRUE; + + // DiskEntry->NoMbr = (Mbr->Magic != PARTITION_MAGIC || (*(PUSHORT)Mbr->BootCode) == 0x0000); + + /* If we have not the 0xAA55 then it's raw partition */ + if (Mbr->Magic != PARTITION_MAGIC) + { + DiskEntry->DiskStyle = PARTITION_STYLE_RAW; + } + /* Check partitions types: if first is 0xEE and all the others 0, we have GPT */ + else if (Mbr->Partition[0].PartitionType == EFI_PMBR_OSTYPE_EFI && + Mbr->Partition[1].PartitionType == 0 && + Mbr->Partition[2].PartitionType == 0 && + Mbr->Partition[3].PartitionType == 0) + { + DiskEntry->DiskStyle = PARTITION_STYLE_GPT; + } + /* Otherwise, partition table is in MBR */ else - DiskEntry->NoMbr = FALSE; + { + DiskEntry->DiskStyle = PARTITION_STYLE_MBR; + } /* Free the MBR sector buffer */ RtlFreeHeap(ProcessHeap, 0, Mbr); @@ -1478,6 +1515,16 @@ AddDiskToList( * We now retrieve the disk partition layout */ + /* + * Stop there now if the disk is GPT-partitioned, + * since we currently do not support such disks. + */ + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return; + } + /* Allocate a layout buffer with 4 partition entries first */ LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + ((4 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); @@ -1861,6 +1908,12 @@ GetPartition( PPARTENTRY PartEntry; PLIST_ENTRY Entry; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return NULL; + } + /* Disk found, loop over the primary partitions first... */ for (Entry = DiskEntry->PrimaryPartListHead.Flink; Entry != &DiskEntry->PrimaryPartListHead; @@ -1912,6 +1965,12 @@ GetDiskOrPartition( /* If we have a partition (PartitionNumber != 0), find it */ if (PartitionNumber != 0) { + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return FALSE; + } + PartEntry = GetPartition(/*List,*/ DiskEntry, PartitionNumber); if (!PartEntry) return FALSE; @@ -2033,6 +2092,12 @@ GetNextPartition( { DiskEntry = CONTAINING_RECORD(DiskListEntry, DISKENTRY, ListEntry); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + continue; + } + PartListEntry = DiskEntry->PrimaryPartListHead.Flink; if (PartListEntry != &DiskEntry->PrimaryPartListHead) { @@ -2110,6 +2175,12 @@ GetPrevPartition( { DiskEntry = CONTAINING_RECORD(DiskListEntry, DISKENTRY, ListEntry); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + continue; + } + PartListEntry = DiskEntry->PrimaryPartListHead.Blink; if (PartListEntry != &DiskEntry->PrimaryPartListHead) { @@ -2182,6 +2253,12 @@ GetPrimaryPartitionCount( PPARTENTRY PartEntry; ULONG Count = 0; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return 0; + } + for (Entry = DiskEntry->PrimaryPartListHead.Flink; Entry != &DiskEntry->PrimaryPartListHead; Entry = Entry->Flink) @@ -2203,6 +2280,12 @@ GetLogicalPartitionCount( PPARTENTRY PartEntry; ULONG Count = 0; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return 0; + } + for (ListEntry = DiskEntry->LogicalPartListHead.Flink; ListEntry != &DiskEntry->LogicalPartListHead; ListEntry = ListEntry->Flink) @@ -2282,6 +2365,12 @@ UpdateDiskLayout( DPRINT1("UpdateDiskLayout()\n"); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return; + } + /* Resize the layout buffer if necessary */ if (ReAllocateLayoutBuffer(DiskEntry) == FALSE) { @@ -2446,6 +2535,12 @@ GetPrevUnpartitionedEntry( PPARTENTRY PrevPartEntry; PLIST_ENTRY ListHead; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return NULL; + } + if (PartEntry->LogicalPartition) ListHead = &DiskEntry->LogicalPartListHead; else @@ -2472,6 +2567,12 @@ GetNextUnpartitionedEntry( PPARTENTRY NextPartEntry; PLIST_ENTRY ListHead; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return NULL; + } + if (PartEntry->LogicalPartition) ListHead = &DiskEntry->LogicalPartListHead; else @@ -3277,6 +3378,12 @@ WritePartitionsToDisk( { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + continue; + } + if (DiskEntry->Dirty != FALSE) { WritePartitions(List, DiskEntry); @@ -3369,6 +3476,12 @@ SetMountedDeviceValues( DISKENTRY, ListEntry); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + continue; + } + for (Entry2 = DiskEntry->PrimaryPartListHead.Flink; Entry2 != &DiskEntry->PrimaryPartListHead; Entry2 = Entry2->Flink) @@ -3440,6 +3553,12 @@ PrimaryPartitionCreationChecks( DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return ERROR_WARN_PARTITION; + } + /* Fail if the partition is already in use */ if (PartEntry->IsPartitioned) return ERROR_NEW_PARTITION; @@ -3461,6 +3580,12 @@ ExtendedPartitionCreationChecks( DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return ERROR_WARN_PARTITION; + } + /* Fail if the partition is already in use */ if (PartEntry->IsPartitioned) return ERROR_NEW_PARTITION; @@ -3480,12 +3605,18 @@ ERROR_NUMBER LogicalPartitionCreationChecks( IN PPARTLIST List) { -// PDISKENTRY DiskEntry; + PDISKENTRY DiskEntry; PPARTENTRY PartEntry; -// DiskEntry = List->CurrentDisk; + DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + return ERROR_WARN_PARTITION; + } + /* Fail if the partition is already in use */ if (PartEntry->IsPartitioned) return ERROR_NEW_PARTITION; @@ -3511,6 +3642,12 @@ GetNextUnformattedPartition( DISKENTRY, ListEntry); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + continue; + } + for (Entry2 = DiskEntry->PrimaryPartListHead.Flink; Entry2 != &DiskEntry->PrimaryPartListHead; Entry2 = Entry2->Flink) @@ -3564,6 +3701,12 @@ GetNextUncheckedPartition( DISKENTRY, ListEntry); + if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + { + DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + continue; + } + for (Entry2 = DiskEntry->PrimaryPartListHead.Flink; Entry2 != &DiskEntry->PrimaryPartListHead; Entry2 = Entry2->Flink) diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index 8e2c635bce..a27454b4aa 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -118,7 +118,7 @@ typedef struct _DISKENTRY BOOLEAN Dirty; BOOLEAN NewDisk; /* If TRUE, the disk is uninitialized */ - BOOLEAN NoMbr; /* If TRUE, the MBR is absent */ // See r40437 + PARTITION_STYLE DiskStyle; /* MBR/GPT-partitioned disk, or uninitialized disk (RAW) */ UNICODE_STRING DriverName; @@ -174,6 +174,11 @@ typedef struct _PARTLIST #define PARTITION_TBL_SIZE 4 +#define PARTITION_MAGIC 0xAA55 + +/* Defines system type for MBR showing that a GPT is following */ +#define EFI_PMBR_OSTYPE_EFI 0xEE + #include <pshpack1.h> typedef struct _PARTITION diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index 1da5771c47..a1b7d137bb 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -500,8 +500,11 @@ PrintDiskData( 0, 0, (LPARAM)DiskEntry); - /* Disk type (MBR or GPT) */ - TreeList_SetItemText(hWndList, htiDisk, 1, DiskEntry->NoMbr ? L"GPT" : L"MBR"); + /* Disk type: MBR, GPT or RAW (Uninitialized) */ + TreeList_SetItemText(hWndList, htiDisk, 1, + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); /* Format the disk size in KBs, MBs, etc... */ DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index 3544606c22..f0b5c9aafa 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -313,7 +313,9 @@ PrintDiskData( DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } else { @@ -325,7 +327,9 @@ PrintDiskData( DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } if (ListUi->Line >= 0 && ListUi->Line <= Height) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 48645eca32..eaf6d9a618 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1983,7 +1983,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } else { @@ -1995,7 +1997,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2142,7 +2146,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } else { @@ -2154,7 +2160,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2300,7 +2308,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } else { @@ -2312,7 +2322,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2539,7 +2551,9 @@ DeletePartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } else { @@ -2551,7 +2565,9 @@ DeletePartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } while (TRUE) @@ -2773,7 +2789,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); @@ -2834,7 +2852,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->NoMbr ? "GPT" : "MBR"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : + L"RAW"); } if (FileSystemList == NULL)

1 0

[reactos] 01/01: [EXPLORER] Set display icon of task properties (#1130)
by Katayama Hirofumi MZ 14 Dec '18

14 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d310503d9eccfae97aabf… commit d310503d9eccfae97aabf97bafd999e459f42301 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 14 20:07:33 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 14 20:07:33 2018 +0900 [EXPLORER] Set display icon of task properties (#1130) CORE-10494 --- base/shell/explorer/trayprop.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/trayprop.cpp b/base/shell/explorer/trayprop.cpp index 03823ccf97..d5b075a952 100644 --- a/base/shell/explorer/trayprop.cpp +++ b/base/shell/explorer/trayprop.cpp @@ -245,6 +245,23 @@ public: } }; +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hExplorerInstance, MAKEINTRESOURCEW(IDI_STARTMENU)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + VOID DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar) { @@ -261,14 +278,15 @@ DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar) ZeroMemory(&psh, sizeof(psh)); psh.dwSize = sizeof(psh); - psh.dwFlags = PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwndOwner; psh.hInstance = hExplorerInstance; - psh.hIcon = NULL; + psh.pszIcon = MAKEINTRESOURCEW(IDI_STARTMENU); psh.pszCaption = caption.GetString(); psh.nPages = _countof(hpsp); psh.nStartPage = 0; psh.phpage = hpsp; + psh.pfnCallback = PropSheetProc; PropertySheet(&psh); }

1 0

[reactos] 01/01: [CPL] Properly set display icons of control panel applets (#1129)
by Katayama Hirofumi MZ 14 Dec '18

14 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd55105c8a01db4a1d4cb… commit bd55105c8a01db4a1d4cbdce59dd9354b3efc410 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 14 20:06:57 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 14 20:06:57 2018 +0900 [CPL] Properly set display icons of control panel applets (#1129) CORE-15445 --- dll/cpl/access/access.c | 21 +++++++++++++++++++-- dll/cpl/appwiz/createlink.c | 21 ++++++++++++++++++++- dll/cpl/console/console.c | 20 +++++++++++++++++++- dll/cpl/desk/desk.c | 22 ++++++++++++++++++++-- dll/cpl/hdwwiz/hdwwiz.c | 21 ++++++++++++++++++++- dll/cpl/inetcpl/inetcpl.c | 8 ++++++-- dll/cpl/input/input.c | 22 +++++++++++++++++++--- dll/cpl/intl/generalp.c | 21 +++++++++++++++++++-- dll/cpl/intl/intl.c | 22 ++++++++++++++++++++-- dll/cpl/main/keyboard.c | 21 +++++++++++++++++++-- dll/cpl/main/mouse.c | 22 ++++++++++++++++++++-- dll/cpl/mmsys/mmsys.c | 23 ++++++++++++++++++++--- dll/cpl/openglcfg/openglcfg.c | 22 ++++++++++++++++++++-- dll/cpl/powercfg/powercfg.c | 21 +++++++++++++++++++-- dll/cpl/sysdm/sysdm.c | 23 ++++++++++++++++++++--- dll/cpl/timedate/timedate.c | 21 +++++++++++++++++++-- dll/cpl/usrmgr/usrmgr.c | 21 +++++++++++++++++++-- dll/cpl/wined3dcfg/wined3dcfg.c | 22 ++++++++++++++++++++-- 18 files changed, 338 insertions(+), 36 deletions(-) diff --git a/dll/cpl/access/access.c b/dll/cpl/access/access.c index 9bd028c64f..86a1f06907 100644 --- a/dll/cpl/access/access.c +++ b/dll/cpl/access/access.c @@ -165,6 +165,22 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, PGLOBAL_DATA psp->lParam = (LPARAM)pGlobalData; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLACCESS)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} /* First Applet */ @@ -191,14 +207,15 @@ SystemApplet(VOID) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hCPLWindow; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLACCESS)); + psh.pszIcon = MAKEINTRESOURCEW(IDI_CPLACCESS); psh.pszCaption = Caption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, KeyboardPageProc, pGlobalData); InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, SoundPageProc, pGlobalData); diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 4788cc878b..c3a3c1055c 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -381,6 +381,23 @@ FinishDlgProc(HWND hwndDlg, return FALSE; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_APPINETICO)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + LONG CALLBACK ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) { @@ -447,13 +464,15 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) /* Create the property sheet */ psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK; + psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_USEICONID | PSH_USECALLBACK; psh.hInstance = hApplet; + psh.pszIcon = MAKEINTRESOURCEW(IDI_APPINETICO); psh.hwndParent = NULL; psh.nPages = nPages; psh.nStartPage = 0; psh.phpage = ahpsp; psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_SHORTCUT); + psh.pfnCallback = PropSheetProc; /* Display the wizard */ PropertySheet(&psh); diff --git a/dll/cpl/console/console.c b/dll/cpl/console/console.c index d2cd2d7caa..d39253a0c6 100644 --- a/dll/cpl/console/console.c +++ b/dll/cpl/console/console.c @@ -133,6 +133,23 @@ Done: return; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDC_CPLICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + /* First Applet */ static LONG APIENTRY @@ -218,7 +235,7 @@ InitApplet(HANDLE hSectionOrWnd) /* Initialize the property sheet structure */ ZeroMemory(&psh, sizeof(psh)); psh.dwSize = sizeof(psh); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | /* PSH_USEHICON */ PSH_USEICONID | PSH_NOAPPLYNOW; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | /* PSH_USEHICON */ PSH_USEICONID | PSH_NOAPPLYNOW | PSH_USECALLBACK; if (ConInfo->ConsoleTitle[0] != UNICODE_NULL) { @@ -249,6 +266,7 @@ InitApplet(HANDLE hSectionOrWnd) psh.nPages = ARRAYSIZE(psp); psh.nStartPage = 0; psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, OptionsProc); InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT , FontProc ); diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 2cf27a7026..0277e7f264 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -118,6 +118,23 @@ static const struct { IDD_SETTINGS, SettingsPageProc, SettingsPageCallbackProc, L"Settings" }, }; +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDC_DESK_ICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + /* Display Applet */ static LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) @@ -180,14 +197,15 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE; + psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE | PSH_USEICONID; psh.hwndParent = hCPLWindow; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_DESK_ICON)); + psh.pszIcon = MAKEINTRESOURCEW(IDC_DESK_ICON); psh.pszCaption = Caption; psh.nPages = 0; psh.nStartPage = 0; psh.phpage = hpsp; + psh.pfnCallback = PropSheetProc; /* Allow shell extensions to replace the background page */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Desk"), MAX_DESK_PAGES - psh.nPages); diff --git a/dll/cpl/hdwwiz/hdwwiz.c b/dll/cpl/hdwwiz/hdwwiz.c index 5038b1c57e..0b1daccf34 100644 --- a/dll/cpl/hdwwiz/hdwwiz.c +++ b/dll/cpl/hdwwiz/hdwwiz.c @@ -776,6 +776,23 @@ ProgressPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) return FALSE; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + static VOID HardwareWizardInit(HWND hwnd) { @@ -888,14 +905,16 @@ HardwareWizardInit(HWND hwnd) /* Create the property sheet */ psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; + psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER | PSH_USEICONID | PSH_USECALLBACK; psh.hInstance = hApplet; + psh.pszIcon = MAKEINTRESOURCEW(IDI_CPLICON); psh.hwndParent = hwnd; psh.nPages = nPages; psh.nStartPage = 0; psh.phpage = ahpsp; psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + psh.pfnCallback = PropSheetProc; /* Create title font */ hTitleFont = CreateTitleFont(); diff --git a/dll/cpl/inetcpl/inetcpl.c b/dll/cpl/inetcpl/inetcpl.c index 9f220164db..b4d5a14037 100644 --- a/dll/cpl/inetcpl/inetcpl.c +++ b/dll/cpl/inetcpl/inetcpl.c @@ -77,13 +77,17 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) */ static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { - + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); switch (msg) { case PSCB_INITIALIZED: - SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM) LoadIconW(hcpl, MAKEINTRESOURCEW(ICO_MAIN))); + { + hIcon = LoadIconW(hcpl, MAKEINTRESOURCEW(ICO_MAIN)); + SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon); break; + } } return 0; } diff --git a/dll/cpl/input/input.c b/dll/cpl/input/input.c index d794dc830f..c9788769dc 100644 --- a/dll/cpl/input/input.c +++ b/dll/cpl/input/input.c @@ -38,6 +38,22 @@ InitPropSheetPage(PROPSHEETPAGEW *page, WORD idDlg, DLGPROC DlgProc) page->pfnDlgProc = DlgProc; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} /* First Applet */ static LONG CALLBACK @@ -52,15 +68,15 @@ SystemApplet(VOID) ZeroMemory(&header, sizeof(header)); header.dwSize = sizeof(header); - header.dwFlags = PSH_PROPSHEETPAGE; + header.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; header.hwndParent = hCPLWindow; header.hInstance = hApplet; - header.hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); + header.pszIcon = MAKEINTRESOURCEW(IDI_CPLSYSTEM); header.pszCaption = szCaption; header.nPages = ARRAYSIZE(page); header.nStartPage = 0; header.ppsp = page; - header.pfnCallback = NULL; + header.pfnCallback = PropSheetProc; /* Settings */ InitPropSheetPage(&page[0], IDD_PROPPAGESETTINGS, SettingsPageProc); diff --git a/dll/cpl/intl/generalp.c b/dll/cpl/intl/generalp.c index bee911bc8b..8055e89edd 100644 --- a/dll/cpl/intl/generalp.c +++ b/dll/cpl/intl/generalp.c @@ -1324,6 +1324,22 @@ InitPropSheetPage( psp->lParam = (LPARAM)pGlobalData; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDC_CPLICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} INT_PTR APIENTRY @@ -1339,14 +1355,15 @@ CustomizeLocalePropertySheet( ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwndDlg; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); + psh.pszIcon = MAKEINTRESOURCE(IDC_CPLICON); psh.pszCaption = Caption; psh.nPages = (sizeof(PsPage) / sizeof(PROPSHEETPAGE)) - 1; psh.nStartPage = 0; psh.ppsp = PsPage; + psh.pfnCallback = PropSheetProc; InitPropSheetPage(&PsPage[0], IDD_NUMBERSPAGE, NumbersPageProc, pGlobalData); InitPropSheetPage(&PsPage[1], IDD_CURRENCYPAGE, CurrencyPageProc, pGlobalData); diff --git a/dll/cpl/intl/intl.c b/dll/cpl/intl/intl.c index 440e34469a..13ec00906a 100644 --- a/dll/cpl/intl/intl.c +++ b/dll/cpl/intl/intl.c @@ -149,6 +149,23 @@ ParseSetupInf(VOID) SetupCloseInfFile(hSetupInf); } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDC_CPLICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { @@ -174,14 +191,15 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hCPLWindow; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); + psh.pszIcon = MAKEINTRESOURCEW(IDC_CPLICON); psh.pszCaption = Caption; psh.nPages = 0; //sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; InitIntlPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData); psh.nPages++; diff --git a/dll/cpl/main/keyboard.c b/dll/cpl/main/keyboard.c index 165d66824f..5cf39b89bc 100644 --- a/dll/cpl/main/keyboard.c +++ b/dll/cpl/main/keyboard.c @@ -282,6 +282,22 @@ KeybHardwareProc(IN HWND hwndDlg, return FALSE; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDC_CPLICON_2)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} LONG APIENTRY KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) @@ -301,13 +317,14 @@ KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwnd; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_2)); + psh.pszIcon = MAKEINTRESOURCE(IDC_CPLICON_2); psh.pszCaption = szCaption; psh.nStartPage = 0; psh.phpage = hpsp; + psh.pfnCallback = PropSheetProc; /* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Keyboard"), MAX_CPL_PAGES - psh.nPages); diff --git a/dll/cpl/main/mouse.c b/dll/cpl/main/mouse.c index a17d1795ed..4614e6ebc1 100644 --- a/dll/cpl/main/mouse.c +++ b/dll/cpl/main/mouse.c @@ -1794,6 +1794,23 @@ WheelProc(IN HWND hwndDlg, return FALSE; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDC_CPLICON_1)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + static const struct { WORD idDlg; @@ -1827,13 +1844,14 @@ MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwnd; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1)); + psh.pszIcon = MAKEINTRESOURCEW(IDC_CPLICON_1); psh.pszCaption = Caption; psh.nStartPage = 0; psh.phpage = hpsp; + psh.pfnCallback = PropSheetProc; /* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Mouse"), MAX_CPL_PAGES - psh.nPages); diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index e2e21bc8dd..e2d7c8e539 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -689,6 +689,23 @@ HardwareDlgProc(HWND hwndDlg, return FALSE; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + LONG APIENTRY MmSysApplet(HWND hwnd, UINT uMsg, @@ -706,15 +723,15 @@ MmSysApplet(HWND hwnd, LoadString(hApplet, IDS_CPLNAME, Caption, _countof(Caption)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwnd; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, - MAKEINTRESOURCE(IDI_CPLICON)); + psh.pszIcon = MAKEINTRESOURCEW(IDI_CPLICON); psh.pszCaption = Caption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; InitPropSheetPage(&psp[0], IDD_VOLUME,VolumeDlgProc); InitPropSheetPage(&psp[1], IDD_SOUNDS,SoundsDlgProc); diff --git a/dll/cpl/openglcfg/openglcfg.c b/dll/cpl/openglcfg/openglcfg.c index 8a142fdf40..281d1b23ec 100644 --- a/dll/cpl/openglcfg/openglcfg.c +++ b/dll/cpl/openglcfg/openglcfg.c @@ -4,6 +4,23 @@ HINSTANCE hApplet = 0; +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + LONG CALLBACK AppletInit(HWND hWnd) { PROPSHEETPAGEW psp; @@ -21,14 +38,15 @@ LONG CALLBACK AppletInit(HWND hWnd) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hWnd; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLICON)); + psh.pszIcon = MAKEINTRESOURCEW(IDI_CPLICON); psh.pszCaption = szCaption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = &psp; + psh.pfnCallback = PropSheetProc; return (LONG)(PropertySheet(&psh) != -1); } diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index fd820cc6d2..61a910cabf 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -67,6 +67,22 @@ InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc) return FALSE; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDC_CPLICON_1)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} /* First Applet */ static LONG APIENTRY @@ -88,14 +104,15 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwnd; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1)); + psh.pszIcon = MAKEINTRESOURCEW(IDC_CPLICON_1); psh.pszCaption = Caption; psh.nPages = 0; psh.nStartPage = 0; psh.phpage = hpsp; + psh.pfnCallback = PropSheetProc; InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, PowerSchemesDlgProc); if (GetPwrCapabilities(&spc)) diff --git a/dll/cpl/sysdm/sysdm.c b/dll/cpl/sysdm/sysdm.c index 36bd5f5114..8ce26a2a44 100644 --- a/dll/cpl/sysdm/sysdm.c +++ b/dll/cpl/sysdm/sysdm.c @@ -121,6 +121,23 @@ Fail: return hMod; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + /* First Applet */ LONG CALLBACK SystemApplet(VOID) @@ -137,15 +154,15 @@ SystemApplet(VOID) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hCPLWindow; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszIcon = MAKEINTRESOURCEW(IDI_CPLSYSTEM); psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME); psh.nPages = 0; psh.nStartPage = 0; psh.phpage = hpsp; - psh.pfnCallback = NULL; + psh.pfnCallback = PropSheetProc; InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, GeneralPageProc); hNetIdDll = AddNetIdPage(&psh); diff --git a/dll/cpl/timedate/timedate.c b/dll/cpl/timedate/timedate.c index 3bf0d7e57d..52a03f41fe 100644 --- a/dll/cpl/timedate/timedate.c +++ b/dll/cpl/timedate/timedate.c @@ -67,6 +67,22 @@ InitPropSheetPage(PROPSHEETPAGEW *psp, WORD idDlg, DLGPROC DlgProc) psp->pfnDlgProc = DlgProc; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDC_CPLICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) @@ -87,14 +103,15 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); psh.dwSize = sizeof(PROPSHEETHEADERW); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwnd; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCEW(IDC_CPLICON)); + psh.pszIcon = MAKEINTRESOURCEW(IDC_CPLICON); psh.pszCaption = Caption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGEW); psh.nStartPage = 0; psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, DateTimePageProc); InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, TimeZonePageProc); diff --git a/dll/cpl/usrmgr/usrmgr.c b/dll/cpl/usrmgr/usrmgr.c index dd3bbbb470..508e6594e4 100644 --- a/dll/cpl/usrmgr/usrmgr.c +++ b/dll/cpl/usrmgr/usrmgr.c @@ -38,6 +38,22 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) psp->pfnDlgProc = DlgProc; } +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_USRMGR_ICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} /* Display Applet */ static LONG APIENTRY @@ -55,14 +71,15 @@ UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hwnd; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_USRMGR_ICON)); + psh.pszIcon = MAKEINTRESOURCEW(IDI_USRMGR_ICON); psh.pszCaption = Caption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; InitPropSheetPage(&psp[0], IDD_USERS, UsersPageProc); InitPropSheetPage(&psp[1], IDD_GROUPS, GroupsPageProc); diff --git a/dll/cpl/wined3dcfg/wined3dcfg.c b/dll/cpl/wined3dcfg/wined3dcfg.c index 7740d6c119..8046bb2a3e 100644 --- a/dll/cpl/wined3dcfg/wined3dcfg.c +++ b/dll/cpl/wined3dcfg/wined3dcfg.c @@ -4,6 +4,23 @@ HINSTANCE hApplet = 0; +static int CALLBACK +PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) +{ + // NOTE: This callback is needed to set large icon correctly. + HICON hIcon; + switch (uMsg) + { + case PSCB_INITIALIZED: + { + hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLICON)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + LONG CALLBACK AppletInit(HWND hWnd) { PROPSHEETPAGEW psp; @@ -21,14 +38,15 @@ LONG CALLBACK AppletInit(HWND hWnd) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hWnd; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLICON)); + psh.pszIcon = MAKEINTRESOURCEW(IDI_CPLICON); psh.pszCaption = szCaption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = &psp; + psh.pfnCallback = PropSheetProc; return (LONG)(PropertySheet(&psh) != -1); }

1 0

[reactos] 01/01: [SHELL32] Localize caption of Folder Options
by Katayama Hirofumi MZ 14 Dec '18

14 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f222e89d8685089ae0727… commit f222e89d8685089ae072704dba9b3633d27e32d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 14 19:52:41 2018 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 14 19:56:44 2018 +0900 [SHELL32] Localize caption of Folder Options CORE-15247 --- dll/win32/browseui/lang/bg-BG.rc | 1 + dll/win32/browseui/lang/de-DE.rc | 1 + dll/win32/browseui/lang/en-US.rc | 1 + dll/win32/browseui/lang/es-ES.rc | 1 + dll/win32/browseui/lang/et-EE.rc | 1 + dll/win32/browseui/lang/fr-FR.rc | 1 + dll/win32/browseui/lang/he-IL.rc | 1 + dll/win32/browseui/lang/it-IT.rc | 1 + dll/win32/browseui/lang/ja-JP.rc | 1 + dll/win32/browseui/lang/pl-PL.rc | 1 + dll/win32/browseui/lang/pt-BR.rc | 1 + dll/win32/browseui/lang/ro-RO.rc | 1 + dll/win32/browseui/lang/ru-RU.rc | 1 + dll/win32/browseui/lang/sq-AL.rc | 1 + dll/win32/browseui/lang/tr-TR.rc | 1 + dll/win32/browseui/lang/uk-UA.rc | 1 + dll/win32/browseui/lang/zh-CN.rc | 1 + dll/win32/browseui/lang/zh-TW.rc | 1 + dll/win32/browseui/resource.h | 1 + dll/win32/browseui/shellbrowser.cpp | 3 ++- 20 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc index 5c1d7147a6..006ed5ef5f 100644 --- a/dll/win32/browseui/lang/bg-BG.rc +++ b/dll/win32/browseui/lang/bg-BG.rc @@ -286,6 +286,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s" IDS_FORWARD "Forward to %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 6f90562347..5a558d83cb 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -304,6 +304,7 @@ STRINGTABLE BEGIN IDS_BACK "Zurück zu %s" IDS_FORWARD "Vorwärts zu %s" + IDS_FOLDER_OPTIONS "Folder Options" END diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc index 55ab3f33ab..a565ae78c4 100644 --- a/dll/win32/browseui/lang/en-US.rc +++ b/dll/win32/browseui/lang/en-US.rc @@ -304,6 +304,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s" IDS_FORWARD "Forward to %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index 1834f99b0e..82dea9d8e0 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -294,6 +294,7 @@ STRINGTABLE BEGIN IDS_BACK "Volver a %s" IDS_FORWARD "Ir a %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/et-EE.rc b/dll/win32/browseui/lang/et-EE.rc index 6bf81a6af9..71285ef8cc 100644 --- a/dll/win32/browseui/lang/et-EE.rc +++ b/dll/win32/browseui/lang/et-EE.rc @@ -293,6 +293,7 @@ STRINGTABLE BEGIN IDS_BACK "Tagasi lehele %s" IDS_FORWARD "Edasi lehele %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index c0ad390896..c4a21ef8f6 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -304,6 +304,7 @@ STRINGTABLE BEGIN IDS_BACK "Retour vers %s" IDS_FORWARD "Avancer vers %s" + IDS_FOLDER_OPTIONS "Options des dossiers" END STRINGTABLE diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc index 480ddfe23a..54d42d0bad 100644 --- a/dll/win32/browseui/lang/he-IL.rc +++ b/dll/win32/browseui/lang/he-IL.rc @@ -288,6 +288,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s" IDS_FORWARD "Forward to %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index 824282c79b..b6b7822c51 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -286,6 +286,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s" IDS_FORWARD "Forward to %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index 289efbe4e0..d9f678b16b 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -304,6 +304,7 @@ STRINGTABLE BEGIN IDS_BACK "%s へ戻る" IDS_FORWARD "%s へ進む" + IDS_FOLDER_OPTIONS "フォルダオプション" END STRINGTABLE diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index 5a984c34f3..296ce91352 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -294,6 +294,7 @@ STRINGTABLE BEGIN IDS_BACK "Powrót do %s" IDS_FORWARD "Naprzód do %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index b0962c5af4..b9eaa654de 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -288,6 +288,7 @@ STRINGTABLE BEGIN IDS_BACK "Voltar para %s" IDS_FORWARD "Avançar para %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc index 1573b1adb7..5fb9f9808d 100644 --- a/dll/win32/browseui/lang/ro-RO.rc +++ b/dll/win32/browseui/lang/ro-RO.rc @@ -288,6 +288,7 @@ STRINGTABLE BEGIN IDS_BACK "Înapoi la %s" IDS_FORWARD "Înainte la %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index 405d7d850f..810159f270 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -288,6 +288,7 @@ STRINGTABLE BEGIN IDS_BACK "Назад на ""%s""" IDS_FORWARD "Вперед на ""%s""" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc index 8426297702..55148f9283 100644 --- a/dll/win32/browseui/lang/sq-AL.rc +++ b/dll/win32/browseui/lang/sq-AL.rc @@ -305,6 +305,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s" IDS_FORWARD "Forward to %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc index ada68a7c58..e2810b33ee 100644 --- a/dll/win32/browseui/lang/tr-TR.rc +++ b/dll/win32/browseui/lang/tr-TR.rc @@ -288,6 +288,7 @@ STRINGTABLE BEGIN IDS_BACK "Geri (%s Adresine)" IDS_FORWARD "İleri (%s Adresine)" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc index 81079169f3..6fc780761a 100644 --- a/dll/win32/browseui/lang/uk-UA.rc +++ b/dll/win32/browseui/lang/uk-UA.rc @@ -288,6 +288,7 @@ STRINGTABLE BEGIN IDS_BACK "Back to %s" IDS_FORWARD "Forward to %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index 966ad73633..cc1b92d2f5 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -307,6 +307,7 @@ STRINGTABLE BEGIN IDS_BACK "返回到 %s" IDS_FORWARD "前进到 %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index 852cca206e..199879edba 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -306,6 +306,7 @@ STRINGTABLE BEGIN IDS_BACK "返回到 %s" IDS_FORWARD "前進到 %s" + IDS_FOLDER_OPTIONS "Folder Options" END STRINGTABLE diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index b974515bf2..dc0d8e62c6 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -123,6 +123,7 @@ #define IDS_UP 58434 #define IDS_BACK 58689 #define IDS_FORWARD 58690 +#define IDS_FOLDER_OPTIONS 58691 #define IDS_CANCELLING 16 #define IDS_REMAINING 17 diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index dbafbbe860..ae981734e6 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -1361,11 +1361,12 @@ HRESULT CShellBrowser::DoFolderOptions() #endif // show sheet + CStringW strFolderOptions(MAKEINTRESOURCEW(IDS_FOLDER_OPTIONS)); m_PropSheet.dwSize = sizeof(PROPSHEETHEADER); m_PropSheet.dwFlags = 0; m_PropSheet.hwndParent = m_hWnd; m_PropSheet.hInstance = _AtlBaseModule.GetResourceInstance(); - m_PropSheet.pszCaption = _T("Folder Options"); + m_PropSheet.pszCaption = strFolderOptions; m_PropSheet.nStartPage = 0; PropertySheet(&m_PropSheet); return S_OK;

1 0

[reactos] 01/01: [KMTEST:RTL] RtlException: Remove '#if CORE_6640_IS_FIXED'
by Serge Gautherie 13 Dec '18

13 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e94618b7bf48e7a78e76b… commit e94618b7bf48e7a78e76b2da5c69f9b9654f0dd2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Dec 13 03:18:18 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Dec 13 21:36:10 2018 +0100 [KMTEST:RTL] RtlException: Remove '#if CORE_6640_IS_FIXED' On behalf of Víctor Martinez. CORE-8773 --- modules/rostests/kmtests/rtl/RtlException.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/rostests/kmtests/rtl/RtlException.c b/modules/rostests/kmtests/rtl/RtlException.c index a8b76a3b1e..0c54201a8f 100644 --- a/modules/rostests/kmtests/rtl/RtlException.c +++ b/modules/rostests/kmtests/rtl/RtlException.c @@ -158,7 +158,6 @@ START_TEST(RtlException) /* We cannot test this in kernel mode easily - the stack is just "somewhere" * in system space, and there's no guard page below it */ -#if CORE_6640_IS_FIXED #ifdef KMT_USER_MODE /* Overflow the stack - must cause a special exception */ KmtStartSeh() @@ -171,5 +170,4 @@ START_TEST(RtlException) } KmtEndSeh(STATUS_STACK_OVERFLOW); #endif -#endif /* CORE_6640_IS_FIXED */ }

1 0

[reactos] 01/01: [SETUP][FONT] Add font substitute of Ubuntu font for CJK
by Luo Yufan 13 Dec '18

13 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0b81e54e956e979eb783… commit b0b81e54e956e979eb783f41ff8d4b2dab03939e Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Fri Dec 14 01:54:13 2018 +0800 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 14 02:54:13 2018 +0900 [SETUP][FONT] Add font substitute of Ubuntu font for CJK CORE-15179 --- base/setup/lib/muifonts.h | 4 ++++ media/inf/font.inf | 1 + 2 files changed, 5 insertions(+) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 81b0962d73..b865a40d4b 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -140,6 +140,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, + { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CSF_LocalName0, L"Droid Sans Fallback" }, { CSF_LocalName1, L"Droid Sans Fallback" }, @@ -181,6 +182,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, + { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CTF_LocalName0, L"Droid Sans Fallback" }, { CTF_LocalName1, L"Droid Sans Fallback" }, @@ -220,6 +222,7 @@ MUI_SUBFONT JapaneseFonts[] = { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, + { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { JF_LocalName0, L"Droid Sans Fallback" }, { JF_LocalName1, L"Droid Sans Fallback" }, @@ -263,6 +266,7 @@ MUI_SUBFONT KoreanFonts[] = { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, + { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { KF_LocalName0, L"Droid Sans Fallback" }, { KF_LocalName1, L"Droid Sans Fallback" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index 71feb23ef3..62eedd1f49 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -110,6 +110,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Droid Sans Fallback" [Font.Unicode.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"DejaVu Sans"

1 0

[reactos] 01/01: [BROWSEUI] Follow up of #1121
by Katayama Hirofumi MZ 13 Dec '18

13 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fad9f6677a8408ec94684… commit fad9f6677a8408ec94684a1061341362a35b7396 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 13 20:40:05 2018 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 13 20:40:05 2018 +0900 [BROWSEUI] Follow up of #1121 CORE-15434 --- dll/win32/shell32/dialogs/dialogs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index f2fce61fd9..5903fe4b31 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -578,7 +578,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA if (wcschr(psz, L'%') != NULL) { - cchExpand = ExpandEnvironmentStringsW(psz, NULL, 0) + 1; + cchExpand = ExpandEnvironmentStringsW(psz, NULL, 0); pszExpanded = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, cchExpand * sizeof(WCHAR)); if (!pszExpanded) {

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
33
Older →

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 December 2018