Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 02/06: [NTUSER] Don't crash when the current thread doesn't have a desktop

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=298a46acbf39eff14bfe9… commit 298a46acbf39eff14bfe9a193b04c7b5f2a67350 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Dec 17 20:11:59 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Dec 19 16:13:18 2018 +0200 [NTUSER] Don't crash when the current thread doesn't have a desktop --- win32ss/user/ntuser/scrollex.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/win32ss/user/ntuser/scrollex.c b/win32ss/user/ntuser/scrollex.c index dd3b1d47f0..c344cec947 100644 --- a/win32ss/user/ntuser/scrollex.c +++ b/win32ss/user/ntuser/scrollex.c @@ -14,20 +14,17 @@ static HWND FASTCALL co_IntFixCaret(PWND Window, RECTL *lprc, UINT flags) { - PDESKTOP Desktop; PTHRDCARETINFO CaretInfo; PTHREADINFO pti; - PUSER_MESSAGE_QUEUE ActiveMessageQueue; + PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndCaret; PWND WndCaret; ASSERT_REFS_CO(Window); pti = PsGetCurrentThreadWin32Thread(); - Desktop = pti->rpdesk; - ActiveMessageQueue = Desktop->ActiveMessageQueue; - if (!ActiveMessageQueue) return 0; - CaretInfo = &ActiveMessageQueue->CaretInfo; + ThreadQueue = pti->MessageQueue; + CaretInfo = &ThreadQueue->CaretInfo; hWndCaret = CaretInfo->hWnd; WndCaret = ValidateHwndNoErr(hWndCaret);

5 years, 9 months

[reactos] 01/06: [WINSRV] Fix setting the console title

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2a5f5dbb3660085cd109… commit b2a5f5dbb3660085cd1099dc4103192e164ee80e Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Dec 17 10:50:50 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Dec 19 16:13:18 2018 +0200 [WINSRV] Fix setting the console title --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 6 +++--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 2c48f7841b..9da1e92e76 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -2528,9 +2528,9 @@ ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) Beep(800, 200); break; - // case PM_CONSOLE_SET_TITLE: - // SetWindowTextW(GuiData->hWindow, GuiData->Console->Title.Buffer); - // break; + case PM_CONSOLE_SET_TITLE: + SetWindowTextW(GuiData->hWindow, GuiData->Console->Title.Buffer); + break; default: Default: Result = DefWindowProcW(hWnd, msg, wParam, lParam); diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index 258b1e28e6..1468363517 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -865,8 +865,7 @@ static VOID NTAPI GuiChangeTitle(IN OUT PFRONTEND This) { PGUI_CONSOLE_DATA GuiData = This->Context; - // PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); - SetWindowTextW(GuiData->hWindow, GuiData->Console->Title.Buffer); + PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); } static BOOL NTAPI

5 years, 9 months

[reactos] 01/01: [TRANSLATION][USETUP] Complete Hebrew translation (#1163)

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d991ea5a7005ec7a564c… commit 3d991ea5a7005ec7a564ca1970cb7558c6c7f924 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Wed Dec 19 14:20:18 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 19 13:20:18 2018 +0100 [TRANSLATION][USETUP] Complete Hebrew translation (#1163) - Code-page 862, Hebrew text is in visual order. - Use escape sequences for quotation marks. --- base/setup/usetup/lang/he-IL.h | 659 +++++++++++++++++++++-------------------- 1 file changed, 331 insertions(+), 328 deletions(-) diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 68d91a72c5..4bb964a429 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1,4 +1,5 @@ #pragma once +/* Hebrew text is in visual order */ static MUI_ENTRY heILLanguagePageEntries[] = { @@ -17,25 +18,25 @@ static MUI_ENTRY heILLanguagePageEntries[] = { 8, 10, - "\x07 �� .", + "\x07 .�� ", TEXT_STYLE_NORMAL }, { 8, 11, - " .ENTER �� ", + " .ENTER �� ", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 .�� ", + "\x07 .�� ", TEXT_STYLE_NORMAL }, { 0, 0, - "�� = F3 �� = ENTER", + "�� = F3 �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -51,55 +52,56 @@ static MUI_ENTRY heILWelcomePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS �� ", + "ReactOS �� ", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "�� ", + "ReactOS �� ", TEXT_STYLE_NORMAL }, { 6, 12, - "�� .", + ".�� ", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Press ENTER to install or upgrade ReactOS.", + "\x07 .ReactOS �� ENTER ��", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 .ReactOS �� R ��", + // "\x07 Press R to repair a ReactOS installation using the Recovery Console.", + "\x07 .ReactOS �� R ��", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 .ReactOS �� L ��", + "\x07 .ReactOS �� L ��", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 .ReactOS �� F3 ��", + "\x07 .ReactOS �� F3 ��", TEXT_STYLE_NORMAL }, { 6, 23, - ":� �� ,ReactOS �� ", + ":�� ,ReactOS �� ", TEXT_STYLE_NORMAL }, { @@ -111,7 +113,7 @@ static MUI_ENTRY heILWelcomePageEntries[] = { 0, 0, - "�� = F3 �� = L �� = R �� = ENTER", + "�� = F3 �� = L �� = R �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -127,61 +129,61 @@ static MUI_ENTRY heILIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS Version Status", + "ReactOS �� ", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "ReactOS is in Alpha stage, meaning it is not feature-complete", + "�� ,�� ReactOS", TEXT_STYLE_NORMAL }, { 6, 12, - "and is under heavy development. It is recommended to use it only for", + "�� .�� ", TEXT_STYLE_NORMAL }, { 6, 13, - "evaluation and testing purposes and not as your daily-usage OS.", + ".�� ", TEXT_STYLE_NORMAL }, { 6, 15, - "Backup your data or test on a secondary computer if you attempt", + "�� ", TEXT_STYLE_NORMAL }, { 6, 16, - "to run ReactOS on real hardware.", + ".�� ReactOS �� ", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ENTER to continue ReactOS Setup.", + "\x07 .ReactOS �� ENTER ��", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 .ReactOS �� F3 ��", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Continue F3 = Quit", + "�� = F3 �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -197,13 +199,13 @@ static MUI_ENTRY heILLicensePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 6, - "Licensing:", + ":��", TEXT_STYLE_HIGHLIGHT }, { @@ -281,7 +283,7 @@ static MUI_ENTRY heILLicensePageEntries[] = { 8, 22, - "Warranty:", + ":��", TEXT_STYLE_HIGHLIGHT }, { @@ -305,7 +307,7 @@ static MUI_ENTRY heILLicensePageEntries[] = { 0, 0, - "ENTER = ��", + "�� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -321,84 +323,84 @@ static MUI_ENTRY heILDevicePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "The list below shows the current device settings.", + ".�� ", TEXT_STYLE_NORMAL }, { 24, 11, - "��:", + ":��", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 12, - "��:", + ":��", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 13, - "��:", + ":��", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 14, - "�� :", + ":�� ", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 16, - "��:", + ":��", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, - 16, "Accept these device settings", + 16, "�� ", TEXT_STYLE_NORMAL }, { 6, 19, - "You can change the hardware settings by pressing the UP or DOWN keys", + "�� ", TEXT_STYLE_NORMAL }, { 6, 20, - "to select an entry. Then press the ENTER key to select alternative", + ".�� ENTER �� .�� ", TEXT_STYLE_NORMAL }, { 6, 21, - "��.", + "", TEXT_STYLE_NORMAL }, { 6, 23, - "When all settings are correct, select \"Accept these device settings\"", + "\"�� \"� �� ,�� ", TEXT_STYLE_NORMAL }, { 6, 24, - "�� ENTER", + ".ENTER ��", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� F3 = ��", + "�� = F3 �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -414,55 +416,55 @@ static MUI_ENTRY heILRepairPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS Setup is in an early development phase. It does not yet", + ".�� ReactOS ��", TEXT_STYLE_NORMAL }, { 6, 9, - "support all the functions of a fully usable setup application.", + ".�� ", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not implemented yet.", + ".�� ", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Press U for Updating OS.", + "\x07 .�� U ��", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R for the Recovery Console.", + "\x07 .�� R ��", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to return to the main page.", + "\x07 .�� ESC ��", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ENTER to reboot your computer.", + "\x07 .�� ENTER ��", TEXT_STYLE_NORMAL }, { 0, 0, - "ESC = �� U = �� R = �� ENTER = ��", + "�� = ENTER �� = R �� = U �� = ESC", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -478,61 +480,61 @@ static MUI_ENTRY heILUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "The ReactOS Setup can upgrade one of the available ReactOS installations", + "ReactOS �� ReactOS ��", TEXT_STYLE_NORMAL }, { 6, 9, - "listed below, or, if a ReactOS installation is damaged, the Setup program", + "�� ,�� ,�� ", TEXT_STYLE_NORMAL }, { 6, 10, - "can attempt to repair it.", + ".�� ", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not all implemented yet.", + ".�� ", TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Press UP or DOWN to select an OS installation.", + "\x07 .�� ", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press U for upgrading the selected OS installation.", + "\x07 .�� U ��", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to continue with a new installation.", + "\x07 .�� ESC ��", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 .ReactOS �� F3 ��", TEXT_STYLE_NORMAL }, { 0, 0, - "U = Upgrade ESC = Do not upgrade F3 = Quit", + "�� = F3 �� = ESC �� = ESC", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -548,43 +550,43 @@ static MUI_ENTRY heILComputerPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "You want to change the type of computer to be installed.", + ".�� ", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Press the UP or DOWN key to select the desired computer type.", + "\x07 .�� ", TEXT_STYLE_NORMAL }, { 8, 11, - " �� ENTER.", + " .ENTER �� ", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 .�� ESC �� ", TEXT_STYLE_NORMAL }, { 8, 14, - " the computer type.", + "", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� ESC = �� F3 = ��", + "�� = F3 �� = ESC �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -600,31 +602,31 @@ static MUI_ENTRY heILFlushPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 10, 6, - "The system is now making sure all data is stored on your disk", + "�� ", TEXT_STYLE_NORMAL }, { 10, 8, - "This may take a minute", + "�� ", TEXT_STYLE_NORMAL }, { 10, 9, - "When finished, your computer will reboot automatically", + "�� ,��", TEXT_STYLE_NORMAL }, { 0, 0, - "Flushing cache", + "�� ", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -640,37 +642,37 @@ static MUI_ENTRY heILQuitPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 10, 6, - "ReactOS is not completely installed", + "�� ReactOS", TEXT_STYLE_NORMAL }, { 10, 8, - "Remove floppy disk from Drive A: and", + " :A �� ", TEXT_STYLE_NORMAL }, { 10, 9, - "all CD-ROMs from CD-Drives.", + ".�� ", TEXT_STYLE_NORMAL }, { 10, 11, - "Press ENTER to reboot your computer.", + ".�� ENTER ��", TEXT_STYLE_NORMAL }, { 0, 0, - "Please wait ...", + "...�� ", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -686,42 +688,42 @@ static MUI_ENTRY heILDisplayPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "You want to change the type of display to be installed.", + ".�� ", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Press the UP or DOWN key to select the desired display type.", + "\x07 .�� ", TEXT_STYLE_NORMAL }, { 8, 11, - " Then press ENTER.", + " .ENTER �� ", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 .�� ESC ��", TEXT_STYLE_NORMAL }, { 8, 14, - " the display type.", + "", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Continue ESC = Cancel F3 = Quit", + "�� = F3 �� = ESC �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -737,37 +739,37 @@ static MUI_ENTRY heILSuccessPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 10, 6, - "�� ReactOS �� .", + ".�� ReactOS �� ", TEXT_STYLE_NORMAL }, { 10, 8, - "Remove floppy disk from Drive A: and", + " :A �� ", TEXT_STYLE_NORMAL }, { 10, 9, - "all CD-ROMs from CD-Drive.", + ".�� ", TEXT_STYLE_NORMAL }, { 10, 11, - "�� ENTER �� ", + ".�� ENTER ��", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� ", + "�� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -783,37 +785,37 @@ static MUI_ENTRY heILBootPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Setup cannot install the bootloader on your computers", + "�� ", TEXT_STYLE_NORMAL }, { 6, 9, - "hardisk", + "��", TEXT_STYLE_NORMAL }, { 6, 13, - "Please insert a formatted floppy disk in drive A: and", + ".ENTER �� :A �� ", TEXT_STYLE_NORMAL }, { 6, 14, - "press ENTER.", + "", TEXT_STYLE_NORMAL, }, { 0, 0, - "ENTER = �� F3 = �� ", + "�� = F3 �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -830,61 +832,61 @@ static MUI_ENTRY heILSelectPartitionEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "The list below shows existing partitions and unused disk", + "�� ", TEXT_STYLE_NORMAL }, { 6, 9, - "space for new partitions.", + ".�� ", TEXT_STYLE_NORMAL }, { 8, 11, - "\x07 Press UP or DOWN to select a list entry.", + "\x07 .�� ", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press ENTER to install ReactOS onto the selected partition.", + "\x07 .�� ReactOS �� ENTER ��", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Press P to create a primary partition.", + "\x07 .�� P ��", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 .�� E ��", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press L to create a logical partition.", + "\x07 .�� L ��", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press D to delete an existing partition.", + "\x07 .�� D ��", TEXT_STYLE_NORMAL }, { 0, 0, - "�� ...", + "...�� ", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -900,85 +902,85 @@ static MUI_ENTRY heILConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "You have chosen to delete the system partition.", + ".�� ", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnostic programs, hardware configuration", + ",�� ,�� ", TEXT_STYLE_NORMAL }, { 6, 11, - "programs, programs to start an operating system (like ReactOS) or other", + ")ReactOS ��( �� ", TEXT_STYLE_NORMAL }, { 6, 12, - "programs provided by the hardware manufacturer.", + ".�� ", TEXT_STYLE_NORMAL }, { 6, 14, - "Delete a system partition only when you are sure that there are no such", + "�� ", TEXT_STYLE_NORMAL }, { 6, 15, - "programs on the partition, or when you are sure you want to delete them.", + ".�� ,�� ", TEXT_STYLE_NORMAL }, { 6, 16, - "When you delete the partition, you might not be able to boot the", + "�� ,�� ", TEXT_STYLE_NORMAL }, { 6, 17, - "computer from the harddisk until you finished the ReactOS Setup.", + ".ReactOS �� ", TEXT_STYLE_NORMAL }, { 8, 20, - "\x07 Press ENTER to delete the system partition. You will be asked", + "\x07 �� .�� ENTER ��", TEXT_STYLE_NORMAL }, { 8, 21, - " to confirm the deletion of the partition again later.", + " .�� ", TEXT_STYLE_NORMAL }, { 8, 24, - "\x07 Press ESC to return to the previous page. The partition will", + "\x07 .�� ,�� ESC ��", TEXT_STYLE_NORMAL }, { 8, 25, - " not be deleted.", + "", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER=Continue ESC=Cancel", + "�� = ESC �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -994,25 +996,25 @@ static MUI_ENTRY heILFormatPartitionEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "�� ", + "�� ", TEXT_STYLE_NORMAL }, { 6, 10, - "Setup will now format the partition. Press ENTER to continue.", + ".�� ENTER �� .�� ", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� F3 = �� ", + "�� = F3 �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1028,43 +1030,43 @@ static MUI_ENTRY heILInstallDirectoryEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Setup installs ReactOS files onto the selected partition. Choose a", + ".�� ReactOS �� ", TEXT_STYLE_NORMAL }, { 6, 9, - "directory where you want ReactOS to be installed:", + ":ReactOS �� ", TEXT_STYLE_NORMAL }, { 6, 14, - "To change the suggested directory, press BACKSPACE to delete", + "�� BACKSPACE �� ,�� ", TEXT_STYLE_NORMAL }, { 6, 15, - "characters and then type the directory where you want ReactOS to", + ".ReactOS �� ", TEXT_STYLE_NORMAL }, { 6, 16, - "be installed.", + "", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� F3 = �� ", + "�� = F3 �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1080,31 +1082,31 @@ static MUI_ENTRY heILFileCopyEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " �� ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 0, 12, - "Please wait while ReactOS Setup copies files to your ReactOS", + "�� ReactOS �� ", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 13, - "installation folder.", + ".�� ", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 14, - "This may take several minutes to complete.", + ".�� ", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 50, 0, - "\xB3 �� ... ", + "\xB3 ...�� ", TEXT_TYPE_STATUS }, { @@ -1120,43 +1122,43 @@ static MUI_ENTRY heILBootLoaderEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Setup is installing the boot loader", + "�� ", TEXT_STYLE_NORMAL }, { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + ".(VBR-� MBR) �� ", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + ".(�� VBR) �� ", TEXT_STYLE_NORMAL }, { 8, 14, - "Install bootloader on a floppy disk.", + ".�� ", TEXT_STYLE_NORMAL }, { 8, 15, - "Skip install bootloader.", + ".�� ", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� F3 = �� ", + "�� = F3 �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1172,43 +1174,43 @@ static MUI_ENTRY heILKeyboardSettingsEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "You want to change the type of keyboard to be installed.", + ".�� ", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Press the UP or DOWN key to select the desired keyboard type.", + "\x07 .�� ", TEXT_STYLE_NORMAL }, { 8, 11, - " Then press ENTER.", + " .ENTER �� ", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 .�� ESC �� ", TEXT_STYLE_NORMAL }, { 8, 14, - " the keyboard type.", + "", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� ESC = �� F3 = �� ", + "�� = F3 �� = ESC �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1224,43 +1226,43 @@ static MUI_ENTRY heILLayoutSettingsEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Please select a layout to be installed by default.", + ".�� ", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Press the UP or DOWN key to select the desired keyboard", + "\x07 .�� ", TEXT_STYLE_NORMAL }, { 8, 11, - " layout. Then press ENTER.", + " .ENTER �� ", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 .�� ESC ��", TEXT_STYLE_NORMAL }, { 8, 14, - " the keyboard layout.", + "", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = �� ESC = �� F3 = �� ", + "�� = F3 �� = ESC �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1277,19 +1279,19 @@ static MUI_ENTRY heILPrepareCopyEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Setup prepares your computer for copying the ReactOS files. ", + ".ReactOS �� ", TEXT_STYLE_NORMAL }, { 0, 0, - "Building the file copy list...", + "...�� ", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1306,37 +1308,37 @@ static MUI_ENTRY heILSelectFSEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 17, - "Select a file system from the list below.", + ".�� ", 0 }, { 8, 19, - "\x07 Press UP or DOWN to select a file system.", + "\x07 .�� ", 0 }, { 8, 21, - "\x07 Press ENTER to format the partition.", + "\x07 .�� ENTER ��", 0 }, { 8, 23, - "\x07 Press ESC to select another partition.", + "\x07 .�� ESC ��", 0 }, { 0, 0, - "ENTER = Continue ESC = Cancel F3 = Quit", + "�� = F3 �� = ESC �� = ENTER", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, @@ -1353,37 +1355,37 @@ static MUI_ENTRY heILDeletePartitionEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "You have chosen to delete the partition", + "�� ", TEXT_STYLE_NORMAL }, { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 .�� D ��", TEXT_STYLE_NORMAL }, { 11, 19, - "WARNING: All data on this partition will be lost!", + "!�� :��", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ESC to cancel.", + "\x07 .�� ESC ��", TEXT_STYLE_NORMAL }, { 0, 0, - "D = Delete Partition ESC = Cancel F3 = Quit", + "�� = F3 �� = ESC �� = D", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1399,19 +1401,19 @@ static MUI_ENTRY heILRegistryEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " �� ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "Setup is updating the system configuration. ", + " .�� ", TEXT_STYLE_NORMAL }, { 0, 0, - "Creating registry hives...", + "...�� ", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1427,239 +1429,237 @@ MUI_ERROR heILErrorEntries[] = { { // NOT_AN_ERROR - "Success\n" + "��\n" }, { // ERROR_NOT_INSTALLED - "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" + ".�� ReactOS\n" + "�� ,�� \n" + ".ReactOS �� \n" "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3 = Quit ENTER = Continue" + " \x07 .�� ENTER ��\n" + " \x07 .�� F3 ��", + "�� = F3 �� = ENTER" }, { // ERROR_NO_HDD - "Setup could not find a harddisk.\n", - "ENTER = Reboot computer" + ".�� \n", + "�� = ENTER" }, { // ERROR_NO_SOURCE_DRIVE - "Setup could not find its source drive.\n", - "ENTER = Reboot computer" + ".�� \n", + "�� = ENTER" }, { // ERROR_LOAD_TXTSETUPSIF - "Setup failed to load the file TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + ".TXTSETUP.SIF �� \n", + "�� = ENTER" }, { // ERROR_CORRUPT_TXTSETUPSIF - "Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + ".�� TXTSETUP.SIF �� \n", + "�� = ENTER" }, { // ERROR_SIGNATURE_TXTSETUPSIF, - "Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + ".TXTSETUP.SIF-� �� \n", + "�� = ENTER" }, { // ERROR_DRIVE_INFORMATION - "Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer" + ".�� \n", + "�� = ENTER" }, { // ERROR_WRITE_BOOT, - "Setup failed to install %S bootcode on the system partition.", - "ENTER = Reboot computer" + ".�� %S �� ", + "�� = ENTER" }, { // ERROR_LOAD_COMPUTER, - "Setup failed to load the computer type list.\n", - "ENTER = Reboot computer" + ".�� \n", + "�� = ENTER" }, { // ERROR_LOAD_DISPLAY, - "Setup failed to load the display settings list.\n", - "ENTER = Reboot computer" + ".�� \n", + "�� = ENTER" }, { // ERROR_LOAD_KEYBOARD, - "Setup failed to load the keyboard type list.\n", - "ENTER = Reboot computer" + ".�� \n", + "�� = ENTER" }, { // ERROR_LOAD_KBLAYOUT, - "Setup failed to load the keyboard layout list.\n", - "ENTER = Reboot computer" + ".�� \n", + "�� = ENTER" }, { // ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partition table.\n" - "\n" - " \x07 Press F3 to quit Setup.\n" - " \x07 Press ENTER to continue.", - "F3 = Quit ENTER = Continue" + "�� \n" + "!�� \n" + "\n" + ".�� \n" + "\n" + " \x07 .�� F3 ��\n" + " \x07 .�� ENTER ��", + "�� = F3 �� = ENTER" }, { // ERROR_NEW_PARTITION, - "You can not create a new Partition inside\n" - "of an already existing Partition!\n" + "!�� \n" "\n" - " * Press any key to continue.", + ".�� * ", NULL }, { // ERROR_DELETE_SPACE, - "You can not delete unpartitioned disk space!\n" + "!�� \n" "\n" - " * Press any key to continue.", + ".�� * ", NULL }, { // ERROR_INSTALL_BOOTCODE, - "Setup failed to install the %S bootcode on the system partition.", - "ENTER = Reboot computer" + ".�� %S �� ", + "�� = ENTER" }, { // ERROR_NO_FLOPPY, - "No disk in drive A:.", - "ENTER = Continue" + ".:A �� ", + "�� = ENTER" }, { // ERROR_UPDATE_KBSETTINGS, - "Setup failed to update keyboard layout settings.", - "ENTER = Reboot computer" + ".�� ", + "�� = ENTER" }, { // ERROR_UPDATE_DISPLAY_SETTINGS, - "Setup failed to update display registry settings.", - "ENTER = Reboot computer" + ".�� ", + "�� = ENTER" }, { // ERROR_IMPORT_HIVE, - "Setup failed to import a hive file.", - "ENTER = Reboot computer" + ".�� ", + "�� = ENTER" }, { // ERROR_FIND_REGISTRY - "Setup failed to find the registry data files.", - "ENTER = Reboot computer" + "�� .", + "�� = ENTER" }, { // ERROR_CREATE_HIVE, - "Setup failed to create the registry hives.", - "ENTER = Reboot computer" + ".�� ", + "�� = ENTER" }, { // ERROR_INITIALIZE_REGISTRY, - "Setup failed to initialize the registry.", - "ENTER = Reboot computer" + ".�� ", + "�� = ENTER" }, { // ERROR_INVALID_CABINET_INF, - "Cabinet has no valid inf file.\n", - "ENTER = Reboot computer" + ".inf �� Cabinet ��\n", + "�� = ENTER" }, { // ERROR_CABINET_MISSING, - "Cabinet not found.\n", - "ENTER = Reboot computer" + ".�� Cabinet ��\n", + "�� = ENTER" }, { // ERROR_CABINET_SCRIPT, - "Cabinet has no setup script.\n", - "ENTER = Reboot computer" + "�� Cabinet �� .\n", + "�� = ENTER" }, { // ERROR_COPY_QUEUE, - "Setup failed to open the copy file queue.\n", - "ENTER = Reboot computer" + ".�� \n", + "�� = ENTER" }, { // ERROR_CREATE_DIR, - "Setup could not create the installation directories.", - "ENTER = Reboot computer" + ".�� ", + "�� = ENTER" }, { // ERROR_TXTSETUP_SECTION, - "Setup failed to find the '%S' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + ".TXTSETUP.SIF� '%S' �� \n", + "�� = ENTER" }, { // ERROR_CABINET_SECTION, - "Setup failed to find the '%S' section\n" - "in the cabinet.\n", - "ENTER = Reboot computer" + "'%S' �� \n" + ".Cabinet ��\n", + "�� = ENTER" }, { // ERROR_CREATE_INSTALL_DIR - "Setup could not create the installation directory.", - "ENTER = Reboot computer" + ".�� ", + "�� = ENTER" }, { // ERROR_WRITE_PTABLE, - "Setup failed to write partition tables.\n" - "ENTER = Reboot computer" + ".�� \n" + "�� = ENTER" }, { // ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" - "ENTER = Reboot computer" + ".�� codepage �� \n" + "�� = ENTER" }, { // ERROR_UPDATE_LOCALESETTINGS, - "Setup could not set the system locale.\n" - "ENTER = Reboot computer" + ".�� n" + "�� = ENTER" }, { // ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + ".�� \n" + "�� = ENTER" }, { // ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" + ".geo id � �� \n" + "�� = ENTER" }, { // ERROR_DIRECTORY_NAME, - "Invalid directory name.\n" + ".�� \n" "\n" - " * Press any key to continue." + ".�� * " }, { // ERROR_INSUFFICIENT_PARTITION_SIZE, - "The selected partition is not large enough to install ReactOS.\n" - "The install partition must have a size of at least %lu MB.\n" + ".ReactOS �� \n" + ".�\"� %lu �� \n" "\n" - " * Press any key to continue.", + ".�� * ", NULL }, { // ERROR_PARTITION_TABLE_FULL, - "You can not create a new primary or extended partition in the\n" - "partition table of this disk because the partition table is full.\n" + "�� \n" + ".�� \n" "\n" - " * Press any key to continue." + ".�� * " }, { // ERROR_ONLY_ONE_EXTENDED, - "You can not create more than one extended partition per disk.\n" + ".�� \n" "\n" - " * Press any key to continue." + ".�� * " }, { // ERROR_FORMATTING_PARTITION, - "Setup is unable to format the partition:\n" + ":�� \n" " %S\n" "\n" - "ENTER = Reboot computer" + "�� = ENTER" }, { NULL, @@ -1778,90 +1778,89 @@ MUI_PAGE heILPages[] = MUI_STRING heILStrings[] = { {STRING_PLEASEWAIT, - " �� ..."}, + " ...�� "}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " ENTER = �� C = �� F3 = �� "}, + " �� = F3 �� = E �� = P �� = ENTER"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " �� = F3 �� = L �� = ENTER"}, {STRING_INSTALLDELETEPARTITION, - " ENTER = �� D = �� F3 = �� "}, + " �� = F3 �� = D �� = ENTER"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " �� = F3 �� = D"}, {STRING_PARTITIONSIZE, - "�� :"}, + ":�� "}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a primary partition on"}, + "�� "}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, - "You have chosen to create an extended partition on"}, + "�� "}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, - "You have chosen to create a logical partition on"}, + "�� "}, {STRING_HDDSIZE, - "Please enter the size of the new partition in megabytes."}, + ".��-�� "}, {STRING_CREATEPARTITION, - " ENTER = �� ESC = �� F3 = �� "}, + " �� = F3 �� = ESC �� = ENTER"}, {STRING_PARTFORMAT, - "This Partition will be formatted next."}, + ".�� "}, {STRING_NONFORMATTEDPART, - "You chose to install ReactOS on a new or unformatted Partition."}, + ".�� /�� ReactOS �� "}, {STRING_NONFORMATTEDSYSTEMPART, - "The system partition is not formatted yet."}, + ".�� "}, {STRING_NONFORMATTEDOTHERPART, - "The new partition is not formatted yet."}, + ".�� "}, {STRING_INSTALLONPART, - "Setup installs ReactOS onto Partition"}, + "�� ReactOS �� "}, {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, + ".�� "}, {STRING_CONTINUE, - "ENTER = ��"}, + "�� = ENTER"}, {STRING_QUITCONTINUE, - "F3 = �� ENTER = ��"}, + "�� = ENTER �� = F3"}, {STRING_REBOOTCOMPUTER, - "ENTER = �� "}, + "�� = ENTER"}, {STRING_DELETING, - " Deleting file: %S"}, + " �� : %S"}, {STRING_MOVING, - " Moving file: %S to: %S"}, + " �� : %S �: %S"}, {STRING_RENAMING, - " Renaming file: %S to: %S"}, + " �� : %S �: %S"}, {STRING_COPYING, - " �� : %S"}, + " �� : %S"}, {STRING_SETUPCOPYINGFILES, - "�� ..."}, + "...�� "}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " ...�� "}, {STRING_IMPORTFILE, - " �� %S..."}, + " �� %S..."}, {STRING_DISPLAYSETTINGSUPDATE, - " Updating display registry settings..."}, + " ...�� "}, {STRING_LOCALESETTINGSUPDATE, - " Updating locale settings..."}, + " ...�� "}, {STRING_KEYBOARDSETTINGSUPDATE, - " Updating keyboard layout settings..."}, + " ...�� "}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " ...�� codepage �� "}, {STRING_DONE, - " ��..."}, + " ...��"}, {STRING_REBOOTCOMPUTER2, - " ENTER = �� "}, + " �� = ENTER"}, {STRING_REBOOTPROGRESSBAR, - " Your computer will reboot in %li second(s)... "}, + " ...�� %li �� "}, {STRING_CONSOLEFAIL1, - "Unable to open the console\r\n\r\n"}, + "�� \r\n\r\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\r\n"}, + "USB �� \r\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\r\n"}, + "�� USB ��\r\n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + "�� "}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "�� "}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " (�� ) %S �� "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " %S �� "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " (�� ( �� "}, {STRING_HDINFOPARTCREATE_1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."}, {STRING_HDINFOPARTCREATE_2, @@ -1874,10 +1873,14 @@ MUI_STRING heILStrings[] = "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDINFOPARTZEROED_1, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, + // {STRING_HDINFOPARTZEROED_2, + // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, {STRING_HDINFOPARTEXISTS_1, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, + // {STRING_HDINFOPARTEXISTS_2, + // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, {STRING_HDINFOPARTSELECT_1, @@ -1885,26 +1888,26 @@ MUI_STRING heILStrings[] = {STRING_HDINFOPARTSELECT_2, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + "�� "}, {STRING_UNPSPACE, " %sUnpartitioned space%s %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + "�\"� (��. ul% �\"�)"}, {STRING_EXTENDED_PARTITION, - "Extended Partition"}, + "�� "}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + ")�� ( ��"}, {STRING_FORMATUNUSED, - "Unused"}, + "�� "}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "�� "}, {STRING_KB, - "��"}, + "�\"�"}, {STRING_MB, - "��"}, + "�\"�"}, {STRING_GB, - "��"}, + "�\"�"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "...�� "}, {0, 0} };

5 years, 9 months

[reactos] 01/01: [ROSAPPS][VGAFONTEDIT] Allow file drop (#1165)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d47eab52663a152deec3… commit 6d47eab52663a152deec3fb5f70804736bd216dc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 19 21:08:25 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 19 21:08:25 2018 +0900 [ROSAPPS][VGAFONTEDIT] Allow file drop (#1165) - Allow file drop on EXE file. - Allow file drop on the main window. --- .../devutils/vgafontedit/CMakeLists.txt | 2 +- .../applications/devutils/vgafontedit/mainwnd.c | 41 +++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/modules/rosapps/applications/devutils/vgafontedit/CMakeLists.txt b/modules/rosapps/applications/devutils/vgafontedit/CMakeLists.txt index 43bab70abb..390146eb96 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/vgafontedit/CMakeLists.txt @@ -13,5 +13,5 @@ list(APPEND SOURCE add_executable(vgafontedit ${SOURCE} vgafontedit.rc) add_pch(vgafontedit precomp.h SOURCE) set_module_type(vgafontedit win32gui UNICODE) -add_importlibs(vgafontedit user32 gdi32 comdlg32 msvcrt kernel32) +add_importlibs(vgafontedit shell32 user32 gdi32 comdlg32 msvcrt kernel32) add_cd_file(TARGET vgafontedit DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/devutils/vgafontedit/mainwnd.c b/modules/rosapps/applications/devutils/vgafontedit/mainwnd.c index cde135a357..fd708491bf 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/mainwnd.c +++ b/modules/rosapps/applications/devutils/vgafontedit/mainwnd.c @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Implements the main window of the application * COPYRIGHT: Copyright 2008 Colin Finck (colin(a)reactos.org) + * Copyright 2018 Katayama Hirofui MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" @@ -221,6 +222,34 @@ DoFileOpen(IN PMAIN_WND_INFO Info) } } +static VOID +MainWndOpenFile(IN PMAIN_WND_INFO Info, LPCWSTR File) +{ + PFONT_OPEN_INFO OpenInfo; + + OpenInfo = HeapAlloc(hProcessHeap, HEAP_ZERO_MEMORY, sizeof(FONT_OPEN_INFO)); + OpenInfo->pszFileName = HeapAlloc(hProcessHeap, 0, MAX_PATH); + lstrcpynW(OpenInfo->pszFileName, File, MAX_PATH); + + OpenInfo->bCreateNew = FALSE; + CreateFontWindow(Info, OpenInfo); +} + +static VOID +MainWndDropFiles(IN PMAIN_WND_INFO Info, HDROP hDrop) +{ + WCHAR Path[MAX_PATH]; + INT i, Count = DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0); + + for (i = 0; i < Count; ++i) + { + DragQueryFileW(hDrop, i, Path, MAX_PATH); + MainWndOpenFile(Info, Path); + } + + DragFinish(hDrop); +} + VOID DoFileSave(IN PMAIN_WND_INFO Info, IN BOOL bSaveAs) { @@ -439,7 +468,7 @@ static LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static HWND hNextClipboardViewer; - + INT i; PMAIN_WND_INFO Info; Info = (PMAIN_WND_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); @@ -497,6 +526,12 @@ MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) InitResources(Info); ShowWindow(hwnd, Info->nCmdShow); + + for (i = 1; i < __argc; ++i) + { + MainWndOpenFile(Info, __wargv[i]); + } + DragAcceptFiles(hwnd, TRUE); return 0; case WM_DESTROY: @@ -521,6 +556,10 @@ MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SIZE: MainWndSize( Info, LOWORD(lParam), HIWORD(lParam) ); return 0; + + case WM_DROPFILES: + MainWndDropFiles(Info, (HDROP)wParam); + return 0; } }

5 years, 9 months

[reactos] 01/01: Update Chinese translation. (#1164)

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bba8262bc1f6125505f3e… commit bba8262bc1f6125505f3e0272c519e2d3b0a93db Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Wed Dec 19 20:04:19 2018 +0800 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Dec 19 21:04:19 2018 +0900 Update Chinese translation. (#1164) * [SYSSETUP] Update Simplified Chinese translation. * [SYSSETUP] Update Traditional Chinese translation. * [SHELL32] Update Traditional Chinese translation. * [VCDCONTROLTOOL] Update Simplified Chinese translation. * [VCDCONTROLTOOL] Update Traditional Chinese translation. --- dll/win32/shell32/lang/zh-TW.rc | 32 +++++++++++----------- dll/win32/syssetup/lang/zh-CN.rc | 20 +++++++------- dll/win32/syssetup/lang/zh-TW.rc | 20 +++++++------- .../applications/vcdcontroltool/lang/zh-CN.rc | 2 +- .../applications/vcdcontroltool/lang/zh-TW.rc | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 1047a42114..da8c3f290c 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -854,7 +854,7 @@ BEGIN IDS_DRIVE_FIXED "本機磁碟" IDS_DRIVE_CDROM "CD 光碟機" IDS_DRIVE_NETWORK "網路磁碟" - IDS_DRIVE_FLOPPY "3.5 軟碟機" + IDS_DRIVE_FLOPPY "3.5-吋磁片" IDS_DRIVE_REMOVABLE "抽取式磁碟" IDS_FS_UNKNOWN "未知" @@ -864,8 +864,8 @@ BEGIN IDS_OPEN_WITH_RECOMMENDED "推薦的程式:" IDS_OPEN_WITH_OTHER "其它程式:" - IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_BACK "< &Back" + IDS_SHELL_ABOUT_AUTHORS "作者(&A)" + IDS_SHELL_ABOUT_BACK "< 返回(&B)" FCIDM_SHVIEW_NEW "新增" FCIDM_SHVIEW_NEWFOLDER "新增資料夾(&F)" FCIDM_SHVIEW_NEWLINK "新增捷徑(&L)" @@ -874,14 +874,14 @@ BEGIN IDS_RECYCLEBIN_DISKSPACE "可用空間" IDS_EMPTY_BITBUCKET "清空資源回收筒" IDS_PICK_ICON_TITLE "選擇圖示" - IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "可執行檔 (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_PICK_ICON_FILTER "圖示檔案 (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "可執行檔 (*.exe)\0*.exe\0所有檔案 (*.*)\0*.*\0" - IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." - IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." - IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_CANTLOCKVOLUME "無法鎖定磁碟區 (錯誤碼: %lu)." + IDS_CANTDISMOUNTVOLUME "無法卸載磁碟區 (錯誤碼: %lu)." + IDS_CANTEJECTMEDIA "無法退出媒體 (錯誤碼: %lu)." + IDS_CANTSHOWPROPERTIES "無法顯示內容 (錯誤碼: %lu)." + IDS_CANTDISCONNECT "無法中斷 (錯誤碼: %lu)." /* Friendly File Type Names */ IDS_DIRECTORY "資料夾" @@ -890,13 +890,13 @@ BEGIN IDS_COM_FILE "DOS 應用程式" IDS_CPL_FILE "控制台項目" IDS_CUR_FILE "指標" - IDS_DB__FILE "Database File" + IDS_DB__FILE "資料庫檔案" IDS_DLL_FILE "應用程式擴充" IDS_DRV_FILE "裝置驅動程式" - IDS_EFI_FILE "Extensible Firmware Interface Executable" + IDS_EFI_FILE "可延伸軔體介面 (EFI) 可執行檔" IDS_EXE_FILE "應用程式" IDS_NLS_FILE "National Language Support File" - IDS_OCX_FILE "ActiveX Control" + IDS_OCX_FILE "ActiveX 控制項" IDS_TLB_FILE "Type Library" IDS_FON_FILE "字型檔案" IDS_TTF_FILE "TrueType 字型檔案" @@ -940,11 +940,11 @@ BEGIN IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "未知應用程式" - IDS_EXE_DESCRIPTION "Description:" + IDS_EXE_DESCRIPTION "描述:" IDS_MENU_EMPTY "(Empty)" - IDS_OBJECTS "%d Objects" - IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_OBJECTS "%d 個物件" + IDS_OBJECTS_SELECTED "已選擇 %d 個物件" IDS_ADVANCED_FOLDER "Files and Folders" IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers" diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index b3531cf5a5..7378995135 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -90,7 +90,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - PUSHBUTTON "Lautus 主題", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus 主题", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE PUSHBUTTON "经典主题", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END @@ -138,17 +138,17 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "高级设置" FONT 9, "宋体" BEGIN - RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 - LTEXT "reports per second", -1, 169, 35, 54, 8 + RTEXT "采样率(&S):", -1, 27, 35, 90, 8 + LTEXT "每秒报告", -1, 169, 35, 54, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + RTEXT "滚轮检测(&W):", -1, 27, 55, 90, 8 COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 - LTEXT "packets", -1, 169, 75, 26, 8 + RTEXT "输入缓冲区长度(&I):", -1, 27, 75, 90, 8 + LTEXT "数据包", -1, 169, 75, 26, 8 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 AUTOCHECKBOX "快速初始化(&F)", IDC_PS2MOUSEFASTINIT, 124, 97, 72, 10 - PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 + PUSHBUTTON "默认值(&D)", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 END STRINGTABLE @@ -218,7 +218,7 @@ END STRINGTABLE BEGIN - IDS_DETECTIONDISABLED "Detection disabled" - IDS_LOOKFORWHEEL "Look for wheel" - IDS_ASSUMEPRESENT "Assume wheel is present" + IDS_DETECTIONDISABLED "检测已禁用" + IDS_LOOKFORWHEEL "寻找滚轮" + IDS_ASSUMEPRESENT "假设存在滚轮" END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index b717d2a332..ee3fb748c8 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -158,17 +158,17 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "進階設定" FONT 9, "新細明體" BEGIN - RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 - LTEXT "reports per second", -1, 169, 35, 76, 8 + RTEXT "采樣速率(&S):", -1, 27, 35, 90, 8 + LTEXT "每秒報告", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + RTEXT "滾輪偵測(&W):", -1, 27, 55, 90, 8 COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 - LTEXT "packets", -1, 169, 75, 26, 8 + RTEXT "輸入緩衝區長度(&I):", -1, 27, 75, 90, 8 + LTEXT "封包", -1, 169, 75, 26, 8 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 - AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 - PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 + AUTOCHECKBOX "快速初始化(&F)", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "預設值(&D)", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 END STRINGTABLE @@ -240,7 +240,7 @@ END STRINGTABLE BEGIN - IDS_DETECTIONDISABLED "Detection disabled" - IDS_LOOKFORWHEEL "Look for wheel" - IDS_ASSUMEPRESENT "Assume wheel is present" + IDS_DETECTIONDISABLED "偵測已禁用" + IDS_LOOKFORWHEEL "搜尋滾輪" + IDS_ASSUMEPRESENT "假設滾輪已存在" END diff --git a/modules/rosapps/applications/vcdcontroltool/lang/zh-CN.rc b/modules/rosapps/applications/vcdcontroltool/lang/zh-CN.rc index 372bb37c9c..f9a3022f73 100755 --- a/modules/rosapps/applications/vcdcontroltool/lang/zh-CN.rc +++ b/modules/rosapps/applications/vcdcontroltool/lang/zh-CN.rc @@ -57,7 +57,7 @@ END STRINGTABLE BEGIN IDS_DRIVE "驱动器" - IDS_MAPPEDIMAGE "镜像已映射" + IDS_MAPPEDIMAGE "已映射的镜像" IDS_NOMOUNTED "没有镜像被挂载。最后挂载的是 - %s" IDS_NONE "无" IDS_FILTER "所有被支持的镜像 (*.udf; *.cdfs; *.jo; *.iso; *.rock)\0*.udf;*.cdfs;*.jo;*.iso;*.rock\0" diff --git a/modules/rosapps/applications/vcdcontroltool/lang/zh-TW.rc b/modules/rosapps/applications/vcdcontroltool/lang/zh-TW.rc index 315c35bea6..572d46336a 100755 --- a/modules/rosapps/applications/vcdcontroltool/lang/zh-TW.rc +++ b/modules/rosapps/applications/vcdcontroltool/lang/zh-TW.rc @@ -57,7 +57,7 @@ END STRINGTABLE BEGIN IDS_DRIVE "磁碟機" - IDS_MAPPEDIMAGE "映像已映射" + IDS_MAPPEDIMAGE "已映射的映像" IDS_NOMOUNTED "沒有映像被掛接。最後一個是 - %s" IDS_NONE "無" IDS_FILTER "所有被支持的映像 (*.udf; *.cdfs; *.jo; *.iso; *.rock)\0*.udf;*.cdfs;*.jo;*.iso;*.rock\0"

5 years, 9 months

[reactos] 01/01: [DEVMGR][NETCFGX][MSCONFIG][NETSHELL] Fix and improve icons (#1143)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02936d4c671105fe041e1… commit 02936d4c671105fe041e1459a08c627c4d0cc2cb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 19 20:07:17 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 19 20:07:17 2018 +0900 [DEVMGR][NETCFGX][MSCONFIG][NETSHELL] Fix and improve icons (#1143) CORE-15445 --- base/applications/msconfig/msconfig.c | 34 +++++++++----- dll/shellext/netshell/lanstatusui.cpp | 23 ++++++++- dll/shellext/netshell/shfldr_netconnect.cpp | 23 ++++++++- dll/win32/devmgr/devmgmt/MainWindow.cpp | 6 +-- dll/win32/netcfgx/inetcfgcomp_iface.c | 23 ++++++++- dll/win32/netcfgx/netcfgx.rc | 3 ++ dll/win32/netcfgx/res/Icon_Licence/COPYING | 67 +++++++++++++++++++++++++++ dll/win32/netcfgx/res/Icon_Licence/Tango.txt | 6 +++ dll/win32/netcfgx/res/internet.ico | Bin 0 -> 22486 bytes dll/win32/netcfgx/res/network.ico | Bin 0 -> 22486 bytes dll/win32/netcfgx/resource.h | 4 ++ dll/win32/netcfgx/tcpipconf_notify.c | 23 ++++++++- 12 files changed, 193 insertions(+), 19 deletions(-) diff --git a/base/applications/msconfig/msconfig.c b/base/applications/msconfig/msconfig.c index 01ee4f479b..3cbe4c5d81 100644 --- a/base/applications/msconfig/msconfig.c +++ b/base/applications/msconfig/msconfig.c @@ -21,7 +21,8 @@ HINSTANCE hInst = 0; HWND hMainWnd; /* Main Window */ HWND hTabWnd; /* Tab Control Window */ UINT uXIcon = 0, uYIcon = 0; /* Icon sizes */ -HICON hDialogIcon = NULL; +HICON hDialogIconBig = NULL; +HICON hDialogIconSmall = NULL; void MsConfig_OnTabWndSelChange(void); @@ -203,18 +204,25 @@ static VOID SetDialogIcon(HWND hDlg) { - if (hDialogIcon) DestroyIcon(hDialogIcon); - - hDialogIcon = LoadImage(GetModuleHandle(NULL), - MAKEINTRESOURCE(IDI_APPICON), - IMAGE_ICON, - uXIcon, - uYIcon, - 0); + if (hDialogIconBig) DestroyIcon(hDialogIconBig); + if (hDialogIconSmall) DestroyIcon(hDialogIconSmall); + + hDialogIconBig = LoadIconW(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDI_APPICON)); + hDialogIconSmall = LoadImage(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDI_APPICON), + IMAGE_ICON, + uXIcon, + uYIcon, + 0); + SendMessage(hDlg, + WM_SETICON, + ICON_BIG, + (LPARAM)hDialogIconBig); SendMessage(hDlg, WM_SETICON, ICON_SMALL, - (LPARAM)hDialogIcon); + (LPARAM)hDialogIconSmall); } @@ -292,8 +300,10 @@ MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) DestroyWindow(hFreeLdrPage); if (hSystemPage) DestroyWindow(hSystemPage); - if (hDialogIcon) - DestroyIcon(hDialogIcon); + if (hDialogIconBig) + DestroyIcon(hDialogIconBig); + if (hDialogIconSmall) + DestroyIcon(hDialogIconSmall); return DefWindowProc(hDlg, message, wParam, lParam); } diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index a5b4144dca..3d985e7db0 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -676,6 +676,23 @@ InitializePropertyDialog( pContext->dwAdapterIndex = dwAdapterIndex; } +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(netshell_hInstance, MAKEINTRESOURCEW(IDI_SHELL_NETWORK_FOLDER)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + VOID ShowStatusPropertyDialog( LANSTATUSUI_CONTEXT *pContext, @@ -688,9 +705,13 @@ ShowStatusPropertyDialog( ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); ZeroMemory(hppages, sizeof(hppages)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); - pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW | + PSH_USEICONID | PSH_USECALLBACK; pinfo.phpage = hppages; pinfo.hwndParent = hwndDlg; + pinfo.hInstance = netshell_hInstance; + pinfo.pszIcon = MAKEINTRESOURCEW(IDI_SHELL_NETWORK_FOLDER); + pinfo.pfnCallback = PropSheetProc; if (pContext->pNet->GetProperties(&pProperties) == S_OK) { diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index a3398f36ec..07d2c1c068 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -549,6 +549,23 @@ ShowNetConnectionStatus( return lpOleCmd->Exec(&pdata->guidId, OLECMDID_NEW, OLECMDEXECOPT_DODEFAULT, NULL, NULL); } +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(netshell_hInstance, MAKEINTRESOURCEW(IDI_SHELL_NETWORK_FOLDER)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + HRESULT ShowNetConnectionProperties( INetConnection *pNetConnect, @@ -584,9 +601,13 @@ ShowNetConnectionProperties( ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); ZeroMemory(hppages, sizeof(hppages)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); - pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW | + PSH_USEICONID | PSH_USECALLBACK; + pinfo.hInstance = netshell_hInstance; + pinfo.pszIcon = MAKEINTRESOURCEW(IDI_SHELL_NETWORK_FOLDER); pinfo.phpage = hppages; pinfo.hwndParent = hwnd; + pinfo.pfnCallback = PropSheetProc; pinfo.pszCaption = pProperties->pszwName; hr = pNCP->AddPages(hwnd, PropSheetExCallback, (LPARAM)&pinfo); diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp index 50dc3a9207..b69778b641 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.cpp +++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp @@ -155,9 +155,9 @@ CDeviceManager::Initialize(_In_z_ LPCTSTR lpCaption, wc.hIconSm = (HICON)LoadImage(g_hThisInstance, MAKEINTRESOURCE(IDI_MAIN_ICON), IMAGE_ICON, - 16, - 16, - LR_SHARED); + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); // Register the window if (RegisterClassExW(&wc)) diff --git a/dll/win32/netcfgx/inetcfgcomp_iface.c b/dll/win32/netcfgx/inetcfgcomp_iface.c index 7d08afe7fc..71b5e028da 100644 --- a/dll/win32/netcfgx/inetcfgcomp_iface.c +++ b/dll/win32/netcfgx/inetcfgcomp_iface.c @@ -420,6 +420,23 @@ CreateNotificationObject( return S_OK; } +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(netcfgx_hInstance, MAKEINTRESOURCEW(IDI_INTERNET)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + HRESULT WINAPI INetCfgComponent_fnRaisePropertyUi( @@ -456,11 +473,15 @@ INetCfgComponent_fnRaisePropertyUi( } ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); - pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW | + PSH_USEICONID | PSH_USECALLBACK; pinfo.u3.phpage = hppages; pinfo.hwndParent = hwndParent; pinfo.nPages = Pages; + pinfo.hInstance = netcfgx_hInstance; pinfo.pszCaption = This->pItem->szDisplayName; + pinfo.u.pszIcon = MAKEINTRESOURCEW(IDI_INTERNET); + pinfo.pfnCallback = PropSheetProc; iResult = PropertySheetW(&pinfo); CoTaskMemFree(hppages); diff --git a/dll/win32/netcfgx/netcfgx.rc b/dll/win32/netcfgx/netcfgx.rc index 8f37e78e8f..1d23c73a1a 100644 --- a/dll/win32/netcfgx/netcfgx.rc +++ b/dll/win32/netcfgx/netcfgx.rc @@ -20,6 +20,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* UTF-8 */ #pragma code_page(65001) +IDI_NETWORK ICON "res/network.ico" +IDI_INTERNET ICON "res/internet.ico" + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif diff --git a/dll/win32/netcfgx/res/Icon_Licence/COPYING b/dll/win32/netcfgx/res/Icon_Licence/COPYING new file mode 100644 index 0000000000..e709d0c050 --- /dev/null +++ b/dll/win32/netcfgx/res/Icon_Licence/COPYING @@ -0,0 +1,67 @@ +Creative Commons Attribution-ShareAlike 2.5 License Agreement + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + 1. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. + 2. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of d [...] + 3. "Licensor" means the individual or entity that offers the Work under the terms of this License. + 4. "Original Author" means the individual or entity who created the Work. + 5. "Work" means the copyrightable work of authorship offered under the terms of this License. + 6. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + 7. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. + +2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + 1. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; + 2. to create and reproduce Derivative Works; + 3. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; + 4. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works. + 5. + + For the avoidance of doubt, where the work is a musical composition: + 1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work. + 2. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions). + 6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions). + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + 1. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights g [...] + 2. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sent [...] + 3. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for a [...] + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSIO [...] + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this Lic [...] + +8. Miscellaneous + + 1. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + 2. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all right [...] + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. + +Creative Commons may be contacted at http://creativecommons.org/. diff --git a/dll/win32/netcfgx/res/Icon_Licence/Tango.txt b/dll/win32/netcfgx/res/Icon_Licence/Tango.txt new file mode 100644 index 0000000000..20f151d094 --- /dev/null +++ b/dll/win32/netcfgx/res/Icon_Licence/Tango.txt @@ -0,0 +1,6 @@ +The following icons are the property of the Tango project and are +released under Creative Commons Attribution-ShareAlike 2.5 License. +Please see COPYING for details + +network.ico +internet.ico diff --git a/dll/win32/netcfgx/res/internet.ico b/dll/win32/netcfgx/res/internet.ico new file mode 100644 index 0000000000..5b994e3440 Binary files /dev/null and b/dll/win32/netcfgx/res/internet.ico differ diff --git a/dll/win32/netcfgx/res/network.ico b/dll/win32/netcfgx/res/network.ico new file mode 100644 index 0000000000..1498e69384 Binary files /dev/null and b/dll/win32/netcfgx/res/network.ico differ diff --git a/dll/win32/netcfgx/resource.h b/dll/win32/netcfgx/resource.h index ac58a2234c..c04a2eae9b 100644 --- a/dll/win32/netcfgx/resource.h +++ b/dll/win32/netcfgx/resource.h @@ -1,5 +1,9 @@ #pragma once +/* icons */ +#define IDI_NETWORK 100 +#define IDI_INTERNET 101 + /* dialogs */ #define IDD_TCPIP_BASIC_DLG 100 #define IDD_TCPIP_ALTCF_DLG 101 diff --git a/dll/win32/netcfgx/tcpipconf_notify.c b/dll/win32/netcfgx/tcpipconf_notify.c index 3d8f2fdd11..0fa79d860a 100644 --- a/dll/win32/netcfgx/tcpipconf_notify.c +++ b/dll/win32/netcfgx/tcpipconf_notify.c @@ -2090,6 +2090,23 @@ TcpipAdvancedDnsDlg( 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(netcfgx_hInstance, MAKEINTRESOURCEW(IDI_NETWORK)); + SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + break; + } + } + return 0; +} + VOID LaunchAdvancedTcpipSettings( HWND hwndDlg, @@ -2111,11 +2128,15 @@ LaunchAdvancedTcpipSettings( ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); - pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; + pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW | + PSH_USEICONID | PSH_USECALLBACK; pinfo.u3.phpage = hppages; pinfo.nPages = 3; pinfo.hwndParent = hwndDlg; + pinfo.hInstance = netcfgx_hInstance; pinfo.pszCaption = szBuffer; + pinfo.u.pszIcon = MAKEINTRESOURCEW(IDI_NETWORK); + pinfo.pfnCallback = PropSheetProc; StoreTcpipBasicSettings(hwndDlg, This, FALSE); PropertySheetW(&pinfo);

5 years, 9 months

[reactos] 01/01: [CRT] Use explicit C linkage for intrinsic functions.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d6dcee968e6ba29b11c9… commit 0d6dcee968e6ba29b11c9ede4bf24e61fb0b5a2d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Dec 19 10:54:49 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Dec 19 10:55:20 2018 +0100 [CRT] Use explicit C linkage for intrinsic functions. Fixes MSVC warnings: sdk\include\crt\xmmintrin.h(33): warning C4162: '_mm_getcsr': no function with C linkage found sdk\include\crt\xmmintrin.h(35): warning C4162: '_mm_setcsr': no function with C linkage found --- sdk/include/crt/xmmintrin.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/include/crt/xmmintrin.h b/sdk/include/crt/xmmintrin.h index 8bb7c7b06b..2db9fb0ea2 100644 --- a/sdk/include/crt/xmmintrin.h +++ b/sdk/include/crt/xmmintrin.h @@ -25,6 +25,10 @@ typedef union _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128 } __m128; +#ifdef __cplusplus +extern "C" { +#endif + extern __m128 _mm_load_ss(float const*); extern int _mm_cvt_ss2si(__m128); @@ -64,6 +68,9 @@ __INTRIN_INLINE void _mm_setcsr(unsigned int val) /* Alternate names */ #define _mm_cvtss_si32 _mm_cvt_ss2si +#ifdef __cplusplus +} +#endif /* _mm_prefetch constants */ #define _MM_HINT_T0 1

5 years, 9 months

[reactos] 01/01: [NTOSKRNL] Fix copy/pasta ;-)

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=549793b8a460f2afc9d57… commit 549793b8a460f2afc9d572d22b731055d16aaa12 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Dec 19 08:15:11 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Dec 19 08:15:11 2018 +0100 [NTOSKRNL] Fix copy/pasta ;-) --- ntoskrnl/ex/uuid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ex/uuid.c b/ntoskrnl/ex/uuid.c index ca6ed09abf..375e39f89f 100644 --- a/ntoskrnl/ex/uuid.c +++ b/ntoskrnl/ex/uuid.c @@ -388,7 +388,7 @@ NtAllocateUuids(OUT PULARGE_INTEGER Time, ExReleaseFastMutex(&UuidMutex); - /* Write back LUID to caller */ + /* Write back UUIDs to caller */ _SEH2_TRY { Time->QuadPart = IntTime.QuadPart;

5 years, 9 months

[reactos] 01/01: [NTOSKRNL] Probe parameters in NtAllocateUuids() if called from user-mode

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8cb37bf1563a9e133042… commit d8cb37bf1563a9e1330422a8234ea3ebbf326a37 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Dec 19 08:07:28 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Dec 19 08:09:04 2018 +0100 [NTOSKRNL] Probe parameters in NtAllocateUuids() if called from user-mode This will avoid that userland applications can trigger an invalid write in the kernel (and thus, a BSOD). CORE-15462 --- ntoskrnl/ex/uuid.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/ex/uuid.c b/ntoskrnl/ex/uuid.c index e43f6d12de..ca6ed09abf 100644 --- a/ntoskrnl/ex/uuid.c +++ b/ntoskrnl/ex/uuid.c @@ -319,9 +319,39 @@ NtAllocateUuids(OUT PULARGE_INTEGER Time, ULARGE_INTEGER IntTime; ULONG IntRange; NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; PAGED_CODE(); + /* Probe if user mode */ + PreviousMode = ExGetPreviousMode(); + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForWrite(Time, + sizeof(ULARGE_INTEGER), + sizeof(ULONG)); + + ProbeForWrite(Range, + sizeof(ULONG), + sizeof(ULONG)); + + ProbeForWrite(Sequence, + sizeof(ULONG), + sizeof(ULONG)); + + ProbeForWrite(Seed, + SEED_BUFFER_SIZE, + sizeof(UCHAR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + ExAcquireFastMutex(&UuidMutex); if (!UuidSequenceInitialized) @@ -358,13 +388,22 @@ NtAllocateUuids(OUT PULARGE_INTEGER Time, ExReleaseFastMutex(&UuidMutex); - Time->QuadPart = IntTime.QuadPart; - *Range = IntRange; - *Sequence = UuidSequence; + /* Write back LUID to caller */ + _SEH2_TRY + { + Time->QuadPart = IntTime.QuadPart; + *Range = IntRange; + *Sequence = UuidSequence; - RtlCopyMemory(Seed, - UuidSeed, - SEED_BUFFER_SIZE); + RtlCopyMemory(Seed, + UuidSeed, + SEED_BUFFER_SIZE); + } + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; return STATUS_SUCCESS; }

5 years, 9 months

[reactos] 01/01: [VCDCONTROLTOOL] Add Ukrainian translation

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a8c57fcbc10a6467b392… commit 4a8c57fcbc10a6467b39209c189a872b12789313 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Dec 19 00:21:07 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 18 23:21:07 2018 +0100 [VCDCONTROLTOOL] Add Ukrainian translation --- .../applications/vcdcontroltool/lang/uk-UA.rc | 62 ++++++++++++++++++++++ .../applications/vcdcontroltool/vcdcontroltool.rc | 3 ++ 2 files changed, 65 insertions(+) diff --git a/modules/rosapps/applications/vcdcontroltool/lang/uk-UA.rc b/modules/rosapps/applications/vcdcontroltool/lang/uk-UA.rc new file mode 100644 index 0000000000..c78b90d488 --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/lang/uk-UA.rc @@ -0,0 +1,62 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL + +IDD_MAINWINDOW DIALOGEX 0, 0, 320, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Панель керування віртуальним CD-ROM" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MAINOK, 214, 179, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_MAINDEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 7, 306, 83 + GROUPBOX "Геометрія диска", IDC_STATIC, 7, 101, 153, 74, BS_GROUPBOX | WS_CHILD | WS_VISIBLE + LTEXT "Кількість секторів", IDC_STATIC, 15, 115, 60, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Розмір сектора", IDC_STATIC, 15, 127, 50, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Вільно кластерів", IDC_STATIC, 15, 139, 56, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Всього кластерів", IDC_STATIC, 15, 151, 57, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MAINSECTORS, 88, 115, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINSIZE, 88, 127, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINFREE, 88, 139, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINTOTAL, 88, 151, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Додати диск", IDC_MAINADD, 173, 123, 64, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Видалити диск", IDC_MAINREMOVE, 240, 123, 64, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Монтувати", IDC_MAINMOUNT, 173, 142, 64, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Вилучити", IDC_MAINEJECT, 173, 161, 131, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Перемонтувати", IDC_MAINREMOUNT, 240, 142, 64, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Керування драйвером ...", IDC_MAINCONTROL, 173, 105, 131, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_MOUNTWINDOW DIALOG 0, 0, 187, 97 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Особливі опції монтування" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MOUNTOK, 130, 59, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Скасувати", IDC_MOUNTCANCEL, 130, 76, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_MOUNTIMAGE, 7, 17, 173, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + LTEXT "Образ для монтування", IDC_STATIC, 7, 7, 173, 10, SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE | WS_GROUP + AUTOCHECKBOX "Придушення UDF", IDC_MOUNTUDF, 7, 40, 114, 10, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Придушення Joliet", IDC_MOUNTJOLIET, 7, 56, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Постійне монтування", IDC_MOUNTPERSIST, 7, 71, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_DRIVERWINDOW DIALOG 0, 0, 187, 123 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Керування драйвером віртуального CD-ROM" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_DRIVEROK, 11, 98, 165, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Встановити драйвер ...", IDC_DRIVERINSTALL, 11, 61, 81, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Запустити", IDC_DRIVERSTART, 11, 79, 81, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Зупинити", IDC_DRIVERSTOP, 95, 79, 81, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Видалити драйвер", IDC_DRIVERREMOVE, 95, 61, 81, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_DRIVERINFO, 5, 7, 177, 50, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_DRIVE "Диск" + IDS_MAPPEDIMAGE "Співставлений образ" + IDS_NOMOUNTED "Немає примонтованого образа. Останній був - %s" + IDS_NONE "Немає" + IDS_FILTER "Всі підтримувані образи (*.udf; *.cdfs; *.jo; *.iso; *.rock)\0*.udf;*.cdfs;*.jo;*.iso;*.rock\0" +END diff --git a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc index cd088fd934..9e08063248 100644 --- a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc +++ b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc @@ -28,6 +28,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif

5 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2018