Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/01: [USETUP] Get rid of the interface directory because we support text-mode only
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ce0c5d48b6f149a15e7e… commit 3ce0c5d48b6f149a15e7eb9694e31a221546da5c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 19:47:52 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 19:47:52 2018 +0200 [USETUP] Get rid of the interface directory because we support text-mode only --- base/setup/usetup/CMakeLists.txt | 6 +++--- base/setup/usetup/{interface => }/consup.c | 2 +- base/setup/usetup/{interface => }/consup.h | 2 +- base/setup/usetup/{interface => }/devinst.c | 2 +- base/setup/usetup/{interface => }/usetup.c | 2 +- base/setup/usetup/usetup.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 46034af752..8ca8471f5e 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -8,9 +8,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) list(APPEND SOURCE - interface/usetup.c - interface/devinst.c - interface/consup.c native/utils/keytrans.c native/utils/console.c native/fslist.c @@ -19,6 +16,8 @@ list(APPEND SOURCE cabinet.c chkdsk.c cmdcons.c + consup.c + devinst.c drivesup.c filesup.c filequeue.c @@ -32,6 +31,7 @@ list(APPEND SOURCE progress.c registry.c settings.c + usetup.c usetup.h) add_executable(usetup ${SOURCE} usetup.rc) diff --git a/base/setup/usetup/interface/consup.c b/base/setup/usetup/consup.c similarity index 99% rename from base/setup/usetup/interface/consup.c rename to base/setup/usetup/consup.c index d682a73959..0fbf4daf9f 100644 --- a/base/setup/usetup/interface/consup.c +++ b/base/setup/usetup/consup.c @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/consup.c + * FILE: base/setup/usetup/consup.c * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */ diff --git a/base/setup/usetup/interface/consup.h b/base/setup/usetup/consup.h similarity index 98% rename from base/setup/usetup/interface/consup.h rename to base/setup/usetup/consup.h index 44d3eab80b..546e78864a 100644 --- a/base/setup/usetup/interface/consup.h +++ b/base/setup/usetup/consup.h @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/consup.h + * FILE: base/setup/usetup/consup.h * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */ diff --git a/base/setup/usetup/interface/devinst.c b/base/setup/usetup/devinst.c similarity index 99% rename from base/setup/usetup/interface/devinst.c rename to base/setup/usetup/devinst.c index 354be13075..ef4c6840a8 100644 --- a/base/setup/usetup/interface/devinst.c +++ b/base/setup/usetup/devinst.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/devinst.c + * FILE: base/setup/usetup/devinst.c * PURPOSE: Device installation * PROGRAMMER: Herv� Poussineau (hpoussin(a)reactos.org) */ diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/usetup.c similarity index 99% rename from base/setup/usetup/interface/usetup.c rename to base/setup/usetup/usetup.c index 2cbab22f0e..5b5ac583d3 100644 --- a/base/setup/usetup/interface/usetup.c +++ b/base/setup/usetup/usetup.c @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/usetup.c + * FILE: base/setup/usetup/usetup.c * PURPOSE: Text-mode setup * PROGRAMMER: Eric Kohl * Casper S. Hornstrup (chorns(a)users.sourceforge.net) diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index a640728b05..181c1b40a3 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -59,7 +59,7 @@ // #include <fslib/ntfslib.h> /* Internal Headers */ -#include "interface/consup.h" +#include "consup.h" #include "inffile.h" #include "inicache.h" #include "progress.h"

1 0

01/01: [USETUP] Simplify the unattended code path in the install directory page and verify the unattended install path.
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=849fe9f4eb11707d2f205… commit 849fe9f4eb11707d2f205271aaa77f0d80cb8064 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 18:11:12 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 18:11:12 2018 +0200 [USETUP] Simplify the unattended code path in the install directory page and verify the unattended install path. --- base/setup/usetup/filesup.c | 7 ++-- base/setup/usetup/filesup.h | 3 +- base/setup/usetup/interface/usetup.c | 65 +++++++++++++++--------------------- 3 files changed, 32 insertions(+), 43 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 4dfd7d40b6..a325df8e2a 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -133,10 +133,11 @@ DoesPathExist( BOOLEAN IsValidPath( - PWCHAR InstallDir, - ULONG Length) + PWCHAR InstallDir) { - UINT i; + UINT i, Length; + + Length = wcslen(InstallDir); // TODO: Add check for 8.3 too. diff --git a/base/setup/usetup/filesup.h b/base/setup/usetup/filesup.h index 85790e4c66..e09a08c673 100644 --- a/base/setup/usetup/filesup.h +++ b/base/setup/usetup/filesup.h @@ -48,7 +48,6 @@ DoesFileExist( BOOLEAN IsValidPath( - PWCHAR InstallDir, - ULONG Length); + PWCHAR InstallDir); /* EOF */ diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/interface/usetup.c index dbd024d076..2cbab22f0e 100644 --- a/base/setup/usetup/interface/usetup.c +++ b/base/setup/usetup/interface/usetup.c @@ -3257,24 +3257,11 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } -/* - * Displays the InstallDirectoryPage1. - * - * Next pages: - * PrepareCopyPage (At once) - * - * SIDEEFFECTS - * Inits DestinationRootPath - * Inits DestinationPath - * Inits DestinationArcPath - * - * RETURNS - * Number of the next page. - */ -static PAGE_NUMBER -InstallDirectoryPage1(PWCHAR InstallDir, - PDISKENTRY DiskEntry, - PPARTENTRY PartEntry) +static +VOID +BuildInstallPaths(PWCHAR InstallDir, + PDISKENTRY DiskEntry, + PPARTENTRY PartEntry) { WCHAR PathBuffer[MAX_PATH]; @@ -3313,8 +3300,6 @@ InstallDirectoryPage1(PWCHAR InstallDir, wcscat(PathBuffer, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); - - return PREPARE_COPY_PAGE; } @@ -3356,9 +3341,21 @@ InstallDirectoryPage(PINPUT_RECORD Ir) PartEntry = PartitionList->CurrentPartition; if (IsUnattendedSetup) - wcscpy(InstallDir, UnattendInstallationDirectory); - else - wcscpy(InstallDir, L"\\ReactOS"); + { + if (!IsValidPath(UnattendInstallationDirectory)) + { + /* FIXME: Log the error? */ + return QUIT_PAGE; + } + + BuildInstallPaths(UnattendInstallationDirectory, + DiskEntry, + PartEntry); + + return PREPARE_COPY_PAGE; + } + + wcscpy(InstallDir, L"\\ReactOS"); Length = wcslen(InstallDir); Pos = Length; @@ -3367,17 +3364,6 @@ InstallDirectoryPage(PINPUT_RECORD Ir) CONSOLE_SetCursorType(TRUE, TRUE); MUIDisplayPage(INSTALL_DIRECTORY_PAGE); - // FIXME: Check the validity of the InstallDir; however what to do - // if it is invalid but we are in unattended setup? (case of somebody - // specified an invalid installation directory in the unattended file). - - if (IsUnattendedSetup) - { - return InstallDirectoryPage1(InstallDir, - DiskEntry, - PartEntry); - } - while (TRUE) { CONSOLE_ConInKey(Ir); @@ -3446,14 +3432,17 @@ InstallDirectoryPage(PINPUT_RECORD Ir) * Check for the validity of the installation directory and pop up * an error if it is not the case. Then the user can fix its input. */ - if (!IsValidPath(InstallDir, Length)) + if (!IsValidPath(InstallDir)) { MUIDisplayError(ERROR_DIRECTORY_NAME, Ir, POPUP_WAIT_ENTER); return INSTALL_DIRECTORY_PAGE; } - return InstallDirectoryPage1(InstallDir, - DiskEntry, - PartEntry); + + BuildInstallPaths(InstallDir, + DiskEntry, + PartEntry); + + return PREPARE_COPY_PAGE; } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */ {

1 0

01/01: [USETUP] Improve the install path checks
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16daf6700a30401699005… commit 16daf6700a30401699005b6f798c73689b6223d9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 15:45:31 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 15:45:31 2018 +0200 [USETUP] Improve the install path checks - Path must not contain whitespace characters. - Path must be at least 2 characters long. - Path must start with a backslash. - Path must not end with a backslash. - Path components must not end with a dot. CORE-9529 --- base/setup/usetup/filesup.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 4238557bbe..4dfd7d40b6 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -140,13 +140,38 @@ IsValidPath( // TODO: Add check for 8.3 too. - /* Check for whitespaces */ + /* Path must be at least 2 characters long */ + if (Length < 2) + return FALSE; + + /* Path must start with a backslash */ + if (InstallDir[0] != L'\\') + return FALSE; + + /* Path must not end with a backslash */ + if (InstallDir[Length - 1] == L'\\') + return FALSE; + + /* Path must not contain whitespace characters */ for (i = 0; i < Length; i++) { if (isspace(InstallDir[i])) return FALSE; } + /* Path component must not end with a dot */ + for (i = 0; i < Length; i++) + { + if (InstallDir[i] == L'\\' && i > 0) + { + if (InstallDir[i - 1] == L'.') + return FALSE; + } + } + + if (InstallDir[Length - 1] == L'.') + return FALSE; + return TRUE; }

1 0

01/01: [USETUP] Add support for HOME, END, DEL, LEFT and RIGHT keys to partition size and install path edit fields.
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bf2f30cf27ce5b6cd923… commit 3bf2f30cf27ce5b6cd92382d2698d49bea758266 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 11:28:33 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 11:28:33 2018 +0200 [USETUP] Add support for HOME, END, DEL, LEFT and RIGHT keys to partition size and install path edit fields. CORE-13975 --- base/setup/usetup/interface/consup.c | 12 +-- base/setup/usetup/interface/usetup.c | 187 ++++++++++++++++++++++++++++++----- 2 files changed, 164 insertions(+), 35 deletions(-) diff --git a/base/setup/usetup/interface/consup.c b/base/setup/usetup/interface/consup.c index 004f9dabf8..d682a73959 100644 --- a/base/setup/usetup/interface/consup.c +++ b/base/setup/usetup/interface/consup.c @@ -334,20 +334,12 @@ CONSOLE_SetInputTextXY( &Written); coPos.X += Length; - FillConsoleOutputCharacterA( - StdOutput, - '_', - 1, - coPos, - &Written); - - if (len > Length + 1) + if (len > Length) { - coPos.X++; FillConsoleOutputCharacterA( StdOutput, ' ', - len - Length - 1, + len - Length, coPos, &Written); } diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/interface/usetup.c index 38085569d7..dbd024d076 100644 --- a/base/setup/usetup/interface/usetup.c +++ b/base/setup/usetup/interface/usetup.c @@ -1774,7 +1774,7 @@ ShowPartitionSizeInputBox(SHORT Left, DWORD Written; CHAR Buffer[128]; WCHAR PartitionSizeBuffer[100]; - ULONG Index; + ULONG Length, Pos; WCHAR ch; SHORT iLeft; SHORT iTop; @@ -1810,11 +1810,14 @@ ShowPartitionSizeInputBox(SHORT Left, &Written); swprintf(PartitionSizeBuffer, L"%lu", MaxSize); - Index = wcslen(PartitionSizeBuffer); + Length = wcslen(PartitionSizeBuffer); + Pos = Length; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, PartitionSizeBuffer); + CONSOLE_SetCursorXY(iLeft + Length, iTop); + CONSOLE_SetCursorType(TRUE, TRUE); while (TRUE) { @@ -1826,11 +1829,13 @@ ShowPartitionSizeInputBox(SHORT Left, if (Quit != NULL) *Quit = TRUE; - PartitionSizeBuffer[0] = 0; + PartitionSizeBuffer[0] = UNICODE_NULL; + CONSOLE_SetCursorType(TRUE, FALSE); break; } else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { + CONSOLE_SetCursorType(TRUE, FALSE); break; } else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESCAPE */ @@ -1838,35 +1843,100 @@ ShowPartitionSizeInputBox(SHORT Left, if (Cancel != NULL) *Cancel = TRUE; - PartitionSizeBuffer[0] = 0; + PartitionSizeBuffer[0] = UNICODE_NULL; + CONSOLE_SetCursorType(TRUE, FALSE); break; } - else if ((Ir.Event.KeyEvent.wVirtualKeyCode == VK_BACK) && /* BACKSPACE */ - (Index > 0)) + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_HOME)) /* HOME */ { - Index--; - PartitionSizeBuffer[Index] = 0; - - CONSOLE_SetInputTextXY(iLeft, - iTop, - PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + Pos = 0; + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_END)) /* END */ + { + Pos = Length; + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_LEFT)) /* LEFT */ + { + if (Pos > 0) + { + Pos--; + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } } - else if ((Ir.Event.KeyEvent.uChar.AsciiChar != 0x00) && - (Index < PARTITION_SIZE_INPUT_FIELD_LENGTH)) + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_RIGHT)) /* RIGHT */ { - ch = (WCHAR)Ir.Event.KeyEvent.uChar.AsciiChar; + if (Pos < Length) + { + Pos++; + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + } + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_DELETE)) /* DEL */ + { + if (Pos < Length) + { + memmove(&PartitionSizeBuffer[Pos], + &PartitionSizeBuffer[Pos + 1], + (Length - Pos - 1) * sizeof(WCHAR)); + PartitionSizeBuffer[Length - 1] = UNICODE_NULL; - if ((ch >= L'0') && (ch <= L'9')) + Length--; + CONSOLE_SetInputTextXY(iLeft, + iTop, + PARTITION_SIZE_INPUT_FIELD_LENGTH, + PartitionSizeBuffer); + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + } + else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_BACK) /* BACKSPACE */ + { + if (Pos > 0) { - PartitionSizeBuffer[Index] = ch; - Index++; - PartitionSizeBuffer[Index] = 0; + if (Pos < Length) + memmove(&PartitionSizeBuffer[Pos - 1], + &PartitionSizeBuffer[Pos], + (Length - Pos) * sizeof(WCHAR)); + PartitionSizeBuffer[Length - 1] = UNICODE_NULL; + Pos--; + Length--; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, PartitionSizeBuffer); + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + } + else if (Ir.Event.KeyEvent.uChar.AsciiChar != 0x00) + { + if (Length < PARTITION_SIZE_INPUT_FIELD_LENGTH) + { + ch = (WCHAR)Ir.Event.KeyEvent.uChar.AsciiChar; + + if ((ch >= L'0') && (ch <= L'9')) + { + if (Pos < Length) + memmove(&PartitionSizeBuffer[Pos + 1], + &PartitionSizeBuffer[Pos], + (Length - Pos) * sizeof(WCHAR)); + PartitionSizeBuffer[Length + 1] = UNICODE_NULL; + PartitionSizeBuffer[Pos] = ch; + + Pos++; + Length++; + CONSOLE_SetInputTextXY(iLeft, + iTop, + PARTITION_SIZE_INPUT_FIELD_LENGTH, + PartitionSizeBuffer); + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } } } } @@ -3265,7 +3335,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; WCHAR InstallDir[51]; WCHAR c; - ULONG Length; + ULONG Length, Pos; /* We do not need the filesystem list any more */ if (FileSystemList != NULL) @@ -3291,7 +3361,10 @@ InstallDirectoryPage(PINPUT_RECORD Ir) wcscpy(InstallDir, L"\\ReactOS"); Length = wcslen(InstallDir); + Pos = Length; CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); + CONSOLE_SetCursorType(TRUE, TRUE); MUIDisplayPage(INSTALL_DIRECTORY_PAGE); // FIXME: Check the validity of the InstallDir; however what to do @@ -3312,13 +3385,63 @@ InstallDirectoryPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { + CONSOLE_SetCursorType(TRUE, FALSE); + if (ConfirmQuit(Ir) != FALSE) return QUIT_PAGE; + CONSOLE_SetCursorType(TRUE, TRUE); break; } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DELETE)) /* DEL */ + { + if (Pos < Length) + { + memmove(&InstallDir[Pos], + &InstallDir[Pos + 1], + (Length - Pos - 1) * sizeof(WCHAR)); + InstallDir[Length - 1] = UNICODE_NULL; + + Length--; + CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); + } + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_HOME)) /* HOME */ + { + Pos = 0; + CONSOLE_SetCursorXY(8 + Pos, 11); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_END)) /* END */ + { + Pos = Length; + CONSOLE_SetCursorXY(8 + Pos, 11); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_LEFT)) /* LEFT */ + { + if (Pos > 0) + { + Pos--; + CONSOLE_SetCursorXY(8 + Pos, 11); + } + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RIGHT)) /* RIGHT */ + { + if (Pos < Length) + { + Pos++; + CONSOLE_SetCursorXY(8 + Pos, 11); + } + } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { + CONSOLE_SetCursorType(TRUE, FALSE); + /* * Check for the validity of the installation directory and pop up * an error if it is not the case. Then the user can fix its input. @@ -3334,11 +3457,18 @@ InstallDirectoryPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */ { - if (Length > 0) + if (Pos > 0) { + if (Pos < Length) + memmove(&InstallDir[Pos - 1], + &InstallDir[Pos], + (Length - Pos) * sizeof(WCHAR)); + InstallDir[Length - 1] = UNICODE_NULL; + + Pos--; Length--; - InstallDir[Length] = 0; CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); } } else if (isprint(Ir->Event.KeyEvent.uChar.AsciiChar)) @@ -3348,10 +3478,17 @@ InstallDirectoryPage(PINPUT_RECORD Ir) c = (WCHAR)Ir->Event.KeyEvent.uChar.AsciiChar; if (iswalpha(c) || iswdigit(c) || c == '.' || c == '\\' || c == '-' || c == '_') { - InstallDir[Length] = c; + if (Pos < Length) + memmove(&InstallDir[Pos + 1], + &InstallDir[Pos], + (Length - Pos) * sizeof(WCHAR)); + InstallDir[Length + 1] = UNICODE_NULL; + InstallDir[Pos] = c; + + Pos++; Length++; - InstallDir[Length] = 0; CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); } } }

1 0

01/01: [USETUP] Fix the name of the backspace key in the german translation
by Eric Kohl 14 May '18

14 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e9b628bb8016aa756b7f… commit 7e9b628bb8016aa756b7fd7e97f5822e9ede0e3a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 14 23:35:48 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 14 23:35:48 2018 +0200 [USETUP] Fix the name of the backspace key in the german translation CORE-14006 --- base/setup/usetup/lang/de-DE.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 2184ebeaf6..6372cee3f1 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -983,7 +983,7 @@ static MUI_ENTRY deDEInstallDirectoryEntries[] = { 6, 15, - "Benutzen Sie die Entf-TASTE, um Zeichen zu l�schen.", + "Benutzen Sie die R�ck-TASTE, um Zeichen zu l�schen.", TEXT_STYLE_NORMAL }, {

1 0

01/01: [NDIS] Fix parameter order when calling ResetHandler. CORE-14624
by Thomas Faber 14 May '18

14 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccaf7b24c3f0847e9c772… commit ccaf7b24c3f0847e9c772074533d1647390c5c68 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon May 14 18:16:02 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon May 14 18:17:52 2018 +0200 [NDIS] Fix parameter order when calling ResetHandler. CORE-14624 --- drivers/network/ndis/ndis/miniport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/network/ndis/ndis/miniport.c b/drivers/network/ndis/ndis/miniport.c index 904158d2c3..3301682b97 100644 --- a/drivers/network/ndis/ndis/miniport.c +++ b/drivers/network/ndis/ndis/miniport.c @@ -921,8 +921,8 @@ MiniReset( KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, - &AddressingReset); + &AddressingReset, + Adapter->NdisMiniportBlock.MiniportAdapterContext); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.ResetStatus = Status; @@ -1326,8 +1326,8 @@ MiniportWorker(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, - &AddressingReset); + &AddressingReset, + Adapter->NdisMiniportBlock.MiniportAdapterContext); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.ResetStatus = NdisStatus;

1 0

01/01: [CLIPBRD] Improvements for the Clipboard Viewer.
by Hermès Bélusca-Maïto 13 May '18

13 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebe3d5273e47f382f4465… commit ebe3d5273e47f382f44657ebf29c7632b23bbe5e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 13 22:15:41 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 13 22:25:55 2018 +0200 [CLIPBRD] Improvements for the Clipboard Viewer. - Improve the scrolling support for bitmaps, DIBs and text formats. This completes the work started in CORE-10679 by Ricardo Hanke. Includes scrolling with the keyboard and the mouse wheel. - Add support for the CF_DSP* clipboard formats, as well as CF_TEXT and CF_OEMTEXT. - Add support for owner-display clipboard format CF_OWNERDISPLAY. - Realize any palette found in the clipboard (CF_PALETTE) before displaying the clipboard data format we want. - Remove dead code. - Update the file headers. --- base/applications/clipbrd/clipbrd.c | 332 +++++++++++++++++++--------- base/applications/clipbrd/clipbrd.rc | 13 +- base/applications/clipbrd/cliputils.c | 254 ++++++++++++++++++++-- base/applications/clipbrd/cliputils.h | 31 ++- base/applications/clipbrd/fileutils.c | 17 +- base/applications/clipbrd/fileutils.h | 15 +- base/applications/clipbrd/precomp.h | 19 +- base/applications/clipbrd/resources.h | 7 + base/applications/clipbrd/scrollutils.c | 371 +++++++++++++++----------------- base/applications/clipbrd/scrollutils.h | 39 ++-- base/applications/clipbrd/winutils.c | 222 ++++++++++++------- base/applications/clipbrd/winutils.h | 22 +- 12 files changed, 898 insertions(+), 444 deletions(-) diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c index f46daeb6e4..280cc6f78e 100644 --- a/base/applications/clipbrd/clipbrd.c +++ b/base/applications/clipbrd/clipbrd.c @@ -1,9 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/clipbrd.c - * PURPOSE: Provides a view of the contents of the ReactOS clipboard. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Provides a view of the contents of the ReactOS clipboard. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" @@ -13,26 +13,12 @@ static const WCHAR szClassName[] = L"ClipBookWClass"; CLIPBOARD_GLOBALS Globals; SCROLLSTATE Scrollstate; -static void UpdateLinesToScroll(void) -{ - UINT uLinesToScroll; - - if (!SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &uLinesToScroll, 0)) - { - Globals.uLinesToScroll = 3; - } - else - { - Globals.uLinesToScroll = uLinesToScroll; - } -} - static void SaveClipboardToFile(void) { OPENFILENAMEW sfn; + LPWSTR c; WCHAR szFileName[MAX_PATH]; WCHAR szFilterMask[MAX_STRING_LEN + 10]; - LPWSTR c; ZeroMemory(&szFilterMask, sizeof(szFilterMask)); c = szFilterMask + LoadStringW(Globals.hInstance, STRING_FORMAT_NT, szFilterMask, MAX_STRING_LEN) + 1; @@ -87,9 +73,9 @@ static void LoadClipboardDataFromFile(LPWSTR lpszFileName) static void LoadClipboardFromFile(void) { OPENFILENAMEW ofn; + LPWSTR c; WCHAR szFileName[MAX_PATH]; WCHAR szFilterMask[MAX_STRING_LEN + 10]; - LPWSTR c; ZeroMemory(&szFilterMask, sizeof(szFilterMask)); c = szFilterMask + LoadStringW(Globals.hInstance, STRING_FORMAT_GEN, szFilterMask, MAX_STRING_LEN) + 1; @@ -123,6 +109,8 @@ static void LoadClipboardFromDrop(HDROP hDrop) static void SetDisplayFormat(UINT uFormat) { + RECT rc; + CheckMenuItem(Globals.hMenu, Globals.uCheckedItem, MF_BYCOMMAND | MF_UNCHECKED); Globals.uCheckedItem = uFormat + CMD_AUTOMATIC; CheckMenuItem(Globals.hMenu, Globals.uCheckedItem, MF_BYCOMMAND | MF_CHECKED); @@ -136,13 +124,10 @@ static void SetDisplayFormat(UINT uFormat) Globals.uDisplayFormat = uFormat; } - if (Globals.hDspBmp) - { - DeleteObject(Globals.hDspBmp); - } - - ZeroMemory(&Scrollstate, sizeof(Scrollstate)); - UpdateWindowScrollState(Globals.hMainWnd, Globals.hDspBmp, &Scrollstate); + GetClipboardDataDimensions(Globals.uDisplayFormat, &rc); + Scrollstate.CurrentX = Scrollstate.CurrentY = 0; + Scrollstate.iWheelCarryoverX = Scrollstate.iWheelCarryoverY = 0; + UpdateWindowScrollState(Globals.hMainWnd, rc.right, rc.bottom, &Scrollstate); InvalidateRect(Globals.hMainWnd, NULL, TRUE); } @@ -169,8 +154,8 @@ static void InitMenuPopup(HMENU hMenu, LPARAM index) static void UpdateDisplayMenu(void) { UINT uFormat; - WCHAR szFormatName[MAX_FMT_NAME_LEN + 1]; HMENU hMenu; + WCHAR szFormatName[MAX_FMT_NAME_LEN + 1]; hMenu = GetSubMenu(Globals.hMenu, DISPLAY_MENU_POS); @@ -187,27 +172,34 @@ static void UpdateDisplayMenu(void) AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); - uFormat = EnumClipboardFormats(0); - while (uFormat) + /* Display the supported clipboard formats first */ + for (uFormat = EnumClipboardFormats(0); uFormat; + uFormat = EnumClipboardFormats(uFormat)) { - RetrieveClipboardFormatName(Globals.hInstance, uFormat, TRUE, szFormatName, ARRAYSIZE(szFormatName)); + if (IsClipboardFormatSupported(uFormat)) + { + RetrieveClipboardFormatName(Globals.hInstance, uFormat, TRUE, + szFormatName, ARRAYSIZE(szFormatName)); + AppendMenuW(hMenu, MF_STRING, CMD_AUTOMATIC + uFormat, szFormatName); + } + } + /* Now display the unsupported clipboard formats */ + for (uFormat = EnumClipboardFormats(0); uFormat; + uFormat = EnumClipboardFormats(uFormat)) + { if (!IsClipboardFormatSupported(uFormat)) { + RetrieveClipboardFormatName(Globals.hInstance, uFormat, TRUE, + szFormatName, ARRAYSIZE(szFormatName)); AppendMenuW(hMenu, MF_STRING | MF_GRAYED, 0, szFormatName); } - else - { - AppendMenuW(hMenu, MF_STRING, CMD_AUTOMATIC + uFormat, szFormatName); - } - - uFormat = EnumClipboardFormats(uFormat); } CloseClipboard(); } -static int ClipboardCommandHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static int OnCommand(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (LOWORD(wParam)) { @@ -274,68 +266,113 @@ static int ClipboardCommandHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l return 0; } -static void ClipboardPaintHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static void OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam) { HDC hdc; PAINTSTRUCT ps; + COLORREF crOldBkColor, crOldTextColor; RECT rc; if (!OpenClipboard(Globals.hMainWnd)) return; hdc = BeginPaint(hWnd, &ps); - GetClientRect(hWnd, &rc); + + /* Erase the background if needed */ + if (ps.fErase) + FillRect(ps.hdc, &ps.rcPaint, (HBRUSH)(COLOR_WINDOW + 1)); + + /* Set the correct background and text colors */ + crOldBkColor = SetBkColor(ps.hdc, GetSysColor(COLOR_WINDOW)); + crOldTextColor = SetTextColor(ps.hdc, GetSysColor(COLOR_WINDOWTEXT)); + + /* Realize the clipboard palette if there is one */ + RealizeClipboardPalette(ps.hdc); switch (Globals.uDisplayFormat) { case CF_NONE: { + /* The clipboard is empty */ break; } + case CF_DSPTEXT: + case CF_TEXT: + case CF_OEMTEXT: case CF_UNICODETEXT: { - DrawTextFromClipboard(hdc, &rc, DT_LEFT | DT_NOPREFIX); + DrawTextFromClipboard(Globals.uDisplayFormat, ps, Scrollstate); break; } + case CF_DSPBITMAP: case CF_BITMAP: { - BitBltFromClipboard(hdc, rc.left, rc.top, rc.right, rc.bottom, 0, 0, SRCCOPY); + BitBltFromClipboard(ps, Scrollstate, SRCCOPY); break; } case CF_DIB: - { - SetDIBitsToDeviceFromClipboard(CF_DIB, hdc, rc.left, rc.top, 0, 0, 0, DIB_RGB_COLORS); - break; - } - case CF_DIBV5: { - SetDIBitsToDeviceFromClipboard(CF_DIBV5, hdc, rc.left, rc.top, 0, 0, 0, DIB_RGB_COLORS); + SetDIBitsToDeviceFromClipboard(Globals.uDisplayFormat, ps, Scrollstate, DIB_RGB_COLORS); break; } + case CF_DSPMETAFILEPICT: case CF_METAFILEPICT: { + GetClientRect(hWnd, &rc); PlayMetaFileFromClipboard(hdc, &rc); break; } + case CF_DSPENHMETAFILE: case CF_ENHMETAFILE: { + GetClientRect(hWnd, &rc); PlayEnhMetaFileFromClipboard(hdc, &rc); break; } + // case CF_PALETTE: + // TODO: Draw a palette with squares filled with colors. + // break; + + case CF_OWNERDISPLAY: + { + HGLOBAL hglb; + PPAINTSTRUCT pps; + + hglb = GlobalAlloc(GMEM_MOVEABLE, sizeof(ps)); + if (hglb) + { + pps = GlobalLock(hglb); + CopyMemory(pps, &ps, sizeof(ps)); + GlobalUnlock(hglb); + + SendClipboardOwnerMessage(TRUE, WM_PAINTCLIPBOARD, + (WPARAM)hWnd, (LPARAM)hglb); + + GlobalFree(hglb); + } + break; + } + default: { - DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, hdc, &rc, DT_CENTER | DT_WORDBREAK | DT_NOPREFIX); + GetClientRect(hWnd, &rc); + DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, + hdc, &rc, DT_CENTER | DT_WORDBREAK | DT_NOPREFIX); break; } } + /* Restore the original colors */ + SetTextColor(ps.hdc, crOldTextColor); + SetBkColor(ps.hdc, crOldBkColor); + EndPaint(hWnd, &ps); CloseClipboard(); @@ -347,12 +384,29 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP { case WM_CREATE: { + TEXTMETRICW tm; + HDC hDC = GetDC(hWnd); + + /* + * Note that the method with GetObjectW just returns + * the original parameters with which the font was created. + */ + if (GetTextMetricsW(hDC, &tm)) + { + Globals.CharWidth = tm.tmMaxCharWidth; // tm.tmAveCharWidth; + Globals.CharHeight = tm.tmHeight + tm.tmExternalLeading; + } + ReleaseDC(hWnd, hDC); + + Globals.hMenu = GetMenu(hWnd); Globals.hWndNext = SetClipboardViewer(hWnd); - + // For now, the Help dialog item is disabled because of lacking of HTML support EnableMenuItem(Globals.hMenu, CMD_HELP, MF_BYCOMMAND | MF_GRAYED); - + + UpdateLinesToScroll(&Scrollstate); + UpdateDisplayMenu(); SetDisplayFormat(0); break; @@ -367,61 +421,114 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP case WM_DESTROY: { ChangeClipboardChain(hWnd, Globals.hWndNext); + + if (Globals.uDisplayFormat == CF_OWNERDISPLAY) + { + HGLOBAL hglb; + PRECT prc; + + hglb = GlobalAlloc(GMEM_MOVEABLE, sizeof(*prc)); + if (hglb) + { + prc = GlobalLock(hglb); + SetRectEmpty(prc); + GlobalUnlock(hglb); + + SendClipboardOwnerMessage(TRUE, WM_SIZECLIPBOARD, + (WPARAM)hWnd, (LPARAM)hglb); + + GlobalFree(hglb); + } + } + PostQuitMessage(0); break; } case WM_PAINT: { - ClipboardPaintHandler(hWnd, uMsg, wParam, lParam); + OnPaint(hWnd, wParam, lParam); break; } case WM_KEYDOWN: { - HandleKeyboardScrollEvents(hWnd, uMsg, wParam, lParam); + OnKeyScroll(hWnd, wParam, lParam, &Scrollstate); break; } case WM_MOUSEWHEEL: + case WM_MOUSEHWHEEL: { - HandleMouseScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + OnMouseScroll(hWnd, uMsg, wParam, lParam, &Scrollstate); break; } case WM_HSCROLL: { - HandleHorizontalScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + // NOTE: Windows uses an offset of 16 pixels + OnScroll(hWnd, SB_HORZ, wParam, 5, &Scrollstate); break; } case WM_VSCROLL: { - HandleVerticalScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + // NOTE: Windows uses an offset of 16 pixels + OnScroll(hWnd, SB_VERT, wParam, 5, &Scrollstate); break; } case WM_SIZE: { - UpdateWindowScrollState(hWnd, Globals.hDspBmp, &Scrollstate); + RECT rc; - if ((Globals.uDisplayFormat == CF_METAFILEPICT) || - (Globals.uDisplayFormat == CF_ENHMETAFILE) || - (Globals.uDisplayFormat == CF_DSPENHMETAFILE) || - (Globals.uDisplayFormat == CF_DSPMETAFILEPICT)) + if (Globals.uDisplayFormat == CF_OWNERDISPLAY) { - InvalidateRect(Globals.hMainWnd, NULL, FALSE); + HGLOBAL hglb; + PRECT prc; + + hglb = GlobalAlloc(GMEM_MOVEABLE, sizeof(*prc)); + if (hglb) + { + prc = GlobalLock(hglb); + if (wParam == SIZE_MINIMIZED) + SetRectEmpty(prc); + else + GetClientRect(hWnd, prc); + GlobalUnlock(hglb); + + SendClipboardOwnerMessage(TRUE, WM_SIZECLIPBOARD, + (WPARAM)hWnd, (LPARAM)hglb); + + GlobalFree(hglb); + } + break; } - else if (!IsClipboardFormatSupported(Globals.uDisplayFormat)) + + GetClipboardDataDimensions(Globals.uDisplayFormat, &rc); + UpdateWindowScrollState(hWnd, rc.right, rc.bottom, &Scrollstate); + + // NOTE: There still are little problems drawing + // the background when displaying clipboard text. + if (!IsClipboardFormatSupported(Globals.uDisplayFormat) || + Globals.uDisplayFormat == CF_DSPTEXT || + Globals.uDisplayFormat == CF_TEXT || + Globals.uDisplayFormat == CF_OEMTEXT || + Globals.uDisplayFormat == CF_UNICODETEXT) { InvalidateRect(Globals.hMainWnd, NULL, TRUE); } + else + { + InvalidateRect(Globals.hMainWnd, NULL, FALSE); + } break; } case WM_CHANGECBCHAIN: { + /* Transmit through the clipboard viewer chain */ if ((HWND)wParam == Globals.hWndNext) { Globals.hWndNext = (HWND)lParam; @@ -434,11 +541,32 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP break; } + case WM_DESTROYCLIPBOARD: + break; + + case WM_RENDERALLFORMATS: + { + /* + * When the user has cleared the clipboard via the DELETE command, + * we (clipboard viewer) become the clipboard owner. When we are + * subsequently closed, this message is then sent to us so that + * we get a chance to render everything we can. Since we don't have + * anything to render, just empty the clipboard. + */ + DeleteClipboardContent(); + break; + } + + case WM_RENDERFORMAT: + // TODO! + break; + case WM_DRAWCLIPBOARD: { UpdateDisplayMenu(); SetDisplayFormat(0); + /* Pass the message to the next window in clipboard viewer chain */ SendMessageW(Globals.hWndNext, uMsg, wParam, lParam); break; } @@ -451,7 +579,7 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP } else { - ClipboardCommandHandler(hWnd, uMsg, wParam, lParam); + OnCommand(hWnd, uMsg, wParam, lParam); } break; } @@ -468,9 +596,36 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP break; } + case WM_PALETTECHANGED: + { + /* Ignore if this comes from ourselves */ + if ((HWND)wParam == hWnd) + break; + + /* Fall back to WM_QUERYNEWPALETTE */ + } + case WM_QUERYNEWPALETTE: { - if (RealizeClipboardPalette(hWnd) != GDI_ERROR) + BOOL Success; + HDC hDC; + + if (!OpenClipboard(Globals.hMainWnd)) + return FALSE; + + hDC = GetDC(hWnd); + if (!hDC) + { + CloseClipboard(); + return FALSE; + } + + Success = RealizeClipboardPalette(hDC); + + ReleaseDC(hWnd, hDC); + CloseClipboard(); + + if (Success) { InvalidateRect(hWnd, NULL, TRUE); UpdateWindow(hWnd); @@ -479,19 +634,6 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP return FALSE; } - case WM_PALETTECHANGED: - { - if ((HWND)wParam != hWnd) - { - if (RealizeClipboardPalette(hWnd) != GDI_ERROR) - { - InvalidateRect(hWnd, NULL, TRUE); - UpdateWindow(hWnd); - } - } - break; - } - case WM_SYSCOLORCHANGE: { SetDisplayFormat(Globals.uDisplayFormat); @@ -502,7 +644,7 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP { if (wParam == SPI_SETWHEELSCROLLLINES) { - UpdateLinesToScroll(); + UpdateLinesToScroll(&Scrollstate); } break; } @@ -512,6 +654,7 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP return DefWindowProc(hWnd, uMsg, wParam, lParam); } } + return 0; } @@ -530,6 +673,16 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi return 0; } + switch (GetUserDefaultUILanguage()) + { + case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + SetProcessDefaultLayout(LAYOUT_RTL); + break; + + default: + break; + } + ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; @@ -542,16 +695,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU); wndclass.lpszClassName = szClassName; - - switch (GetUserDefaultUILanguage()) - { - case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; - - default: - break; - } if (!RegisterClassExW(&wndclass)) { @@ -559,6 +702,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi return 0; } + ZeroMemory(&Scrollstate, sizeof(Scrollstate)); + LoadStringW(hInstance, STRING_CLIPBOARD, szBuffer, ARRAYSIZE(szBuffer)); Globals.hMainWnd = CreateWindowExW(WS_EX_CLIENTEDGE | WS_EX_ACCEPTFILES, szClassName, @@ -591,8 +736,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi if (lpCmdLine != NULL && *lpCmdLine) LoadClipboardDataFromFile(lpCmdLine); - UpdateLinesToScroll(); - while (GetMessageW(&msg, 0, 0, 0)) { if (!TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg)) @@ -602,10 +745,5 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi } } - if (Globals.hDspBmp) - { - DeleteObject(Globals.hDspBmp); - } - return (int)msg.wParam; } diff --git a/base/applications/clipbrd/clipbrd.rc b/base/applications/clipbrd/clipbrd.rc index 5f3e293bc4..178c6ce697 100644 --- a/base/applications/clipbrd/clipbrd.rc +++ b/base/applications/clipbrd/clipbrd.rc @@ -1,11 +1,18 @@ +/* + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Resources file. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + */ + #include <windef.h> #include <winuser.h> #include "resources.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Clipboard Viewer" -#define REACTOS_STR_INTERNAL_NAME "clipbrd" -#define REACTOS_STR_ORIGINAL_FILENAME "clipbrd.exe" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Clipboard Viewer" +#define REACTOS_STR_INTERNAL_NAME "clipbrd" +#define REACTOS_STR_ORIGINAL_FILENAME "clipbrd.exe" #include <reactos/version.rc> CLIPBRD_ICON ICON "res/clipbrd.ico" diff --git a/base/applications/clipbrd/cliputils.c b/base/applications/clipbrd/cliputils.c index e13348a9eb..daee8439a8 100644 --- a/base/applications/clipbrd/cliputils.c +++ b/base/applications/clipbrd/cliputils.c @@ -1,13 +1,32 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/cliputils.c - * PURPOSE: Clipboard helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Clipboard helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" +LRESULT +SendClipboardOwnerMessage( + IN BOOL bUnicode, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + HWND hwndOwner; + + hwndOwner = GetClipboardOwner(); + if (!hwndOwner) + return GetLastError(); + + if (bUnicode) + return SendMessageW(hwndOwner, uMsg, wParam, lParam); + else + return SendMessageA(hwndOwner, uMsg, wParam, lParam); +} + static int GetPredefinedClipboardFormatName(HINSTANCE hInstance, UINT uFormat, @@ -79,18 +98,36 @@ RetrieveClipboardFormatName(HINSTANCE hInstance, PVOID lpszFormat, UINT cch) { - if (!GetPredefinedClipboardFormatName(hInstance, uFormat, Unicode, lpszFormat, cch)) + ZeroMemory(lpszFormat, cch * (Unicode ? sizeof(WCHAR) : sizeof(CHAR))); + + /* Check for predefined clipboard format */ + if (GetPredefinedClipboardFormatName(hInstance, uFormat, Unicode, lpszFormat, cch) != 0) + return; + + /* Check for owner-display format */ + if (uFormat == CF_OWNERDISPLAY) { - if (Unicode) + if (SendClipboardOwnerMessage(Unicode, WM_ASKCBFORMATNAME, + (WPARAM)cch, (LPARAM)lpszFormat) != 0) { - if (!GetClipboardFormatNameW(uFormat, (LPWSTR)lpszFormat, cch)) + if (Unicode) LoadStringW(hInstance, STRING_CF_UNKNOWN, (LPWSTR)lpszFormat, cch); - } - else - { - if (!GetClipboardFormatNameA(uFormat, (LPSTR)lpszFormat, cch)) + else LoadStringA(hInstance, STRING_CF_UNKNOWN, (LPSTR)lpszFormat, cch); } + return; + } + + /* Fallback to registered clipboard format */ + if (Unicode) + { + if (!GetClipboardFormatNameW(uFormat, (LPWSTR)lpszFormat, cch)) + LoadStringW(hInstance, STRING_CF_UNKNOWN, (LPWSTR)lpszFormat, cch); + } + else + { + if (!GetClipboardFormatNameA(uFormat, (LPSTR)lpszFormat, cch)) + LoadStringA(hInstance, STRING_CF_UNKNOWN, (LPSTR)lpszFormat, cch); } } @@ -112,13 +149,22 @@ void DeleteClipboardContent(void) UINT GetAutomaticClipboardFormat(void) { - static UINT uFormatList[] = { + static UINT uFormatList[] = + { + CF_OWNERDISPLAY, CF_UNICODETEXT, + CF_TEXT, + CF_OEMTEXT, CF_ENHMETAFILE, CF_METAFILEPICT, CF_DIBV5, CF_DIB, - CF_BITMAP + CF_BITMAP, + CF_DSPTEXT, + CF_DSPBITMAP, + CF_DSPMETAFILEPICT, + CF_DSPENHMETAFILE, + CF_PALETTE }; return GetPriorityClipboardFormat(uFormatList, ARRAYSIZE(uFormatList)); @@ -128,12 +174,16 @@ BOOL IsClipboardFormatSupported(UINT uFormat) { switch (uFormat) { + case CF_OWNERDISPLAY: case CF_UNICODETEXT: + case CF_TEXT: + case CF_OEMTEXT: case CF_BITMAP: case CF_ENHMETAFILE: case CF_METAFILEPICT: case CF_DIB: case CF_DIBV5: + case CF_HDROP: { return TRUE; } @@ -144,3 +194,179 @@ BOOL IsClipboardFormatSupported(UINT uFormat) } } } + +SIZE_T +GetLineExtentW( + IN LPCWSTR lpText, + OUT LPCWSTR* lpNextLine) +{ + LPCWSTR ptr; + + /* Find the next line of text (lpText is NULL-terminated) */ + /* For newlines, focus only on '\n', not on '\r' */ + ptr = wcschr(lpText, L'\n'); // Find the end of this line. + if (ptr) + { + /* We have the end of this line, go to the next line (ignore the endline in the count) */ + *lpNextLine = ptr + 1; + } + else + { + /* This line was the last one, go pointing to the terminating NULL */ + ptr = lpText + wcslen(lpText); + *lpNextLine = ptr; + } + + return (ptr - lpText); +} + +SIZE_T +GetLineExtentA( + IN LPCSTR lpText, + OUT LPCSTR* lpNextLine) +{ + LPCSTR ptr; + + /* Find the next line of text (lpText is NULL-terminated) */ + /* For newlines, focus only on '\n', not on '\r' */ + ptr = strchr(lpText, '\n'); // Find the end of this line. + if (ptr) + { + /* We have the end of this line, go to the next line (ignore the endline in the count) */ + *lpNextLine = ptr + 1; + } + else + { + /* This line was the last one, go pointing to the terminating NULL */ + ptr = lpText + strlen(lpText); + *lpNextLine = ptr; + } + + return (ptr - lpText); +} + +BOOL GetClipboardDataDimensions(UINT uFormat, PRECT pRc) +{ + SetRectEmpty(pRc); + + if (!OpenClipboard(Globals.hMainWnd)) + { + return FALSE; + } + + switch (uFormat) + { + case CF_DSPBITMAP: + case CF_BITMAP: + { + HBITMAP hBitmap; + BITMAP bmp; + + hBitmap = (HBITMAP)GetClipboardData(CF_BITMAP); + GetObjectW(hBitmap, sizeof(bmp), &bmp); + SetRect(pRc, 0, 0, bmp.bmWidth, bmp.bmHeight); + break; + } + + case CF_DIB: + case CF_DIBV5: + { + HGLOBAL hGlobal; + LPBITMAPINFOHEADER lpInfoHeader; + + hGlobal = GetClipboardData(uFormat); + if (!hGlobal) + break; + + lpInfoHeader = GlobalLock(hGlobal); + if (!lpInfoHeader) + break; + + if (lpInfoHeader->biSize == sizeof(BITMAPCOREHEADER)) + { + LPBITMAPCOREHEADER lpCoreHeader = (LPBITMAPCOREHEADER)lpInfoHeader; + SetRect(pRc, 0, 0, + lpCoreHeader->bcWidth, + lpCoreHeader->bcHeight); + } + else if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) || + (lpInfoHeader->biSize == sizeof(BITMAPV4HEADER)) || + (lpInfoHeader->biSize == sizeof(BITMAPV5HEADER))) + { + SetRect(pRc, 0, 0, + lpInfoHeader->biWidth, + /* NOTE: biHeight < 0 for bottom-up DIBs, or > 0 for top-down DIBs */ + (lpInfoHeader->biHeight > 0) ? lpInfoHeader->biHeight + : -lpInfoHeader->biHeight); + } + else + { + /* Invalid format */ + } + + GlobalUnlock(hGlobal); + break; + } + + case CF_DSPTEXT: + case CF_TEXT: + case CF_OEMTEXT: + case CF_UNICODETEXT: + { + HDC hDC; + HGLOBAL hGlobal; + PVOID lpText, ptr; + DWORD dwSize; + SIZE txtSize = {0, 0}; + SIZE_T lineSize; + + hGlobal = GetClipboardData(uFormat); + if (!hGlobal) + break; + + lpText = GlobalLock(hGlobal); + if (!lpText) + break; + + hDC = GetDC(Globals.hMainWnd); + + /* Find the size of the rectangle enclosing the text */ + for (;;) + { + if (uFormat == CF_UNICODETEXT) + { + if (*(LPCWSTR)lpText == UNICODE_NULL) + break; + lineSize = GetLineExtentW(lpText, (LPCWSTR*)&ptr); + dwSize = GetTabbedTextExtentW(hDC, lpText, lineSize, 0, NULL); + } + else + { + if (*(LPCSTR)lpText == ANSI_NULL) + break; + lineSize = GetLineExtentA(lpText, (LPCSTR*)&ptr); + dwSize = GetTabbedTextExtentA(hDC, lpText, lineSize, 0, NULL); + } + txtSize.cx = max(txtSize.cx, LOWORD(dwSize)); + txtSize.cy += HIWORD(dwSize); + lpText = ptr; + } + + ReleaseDC(Globals.hMainWnd, hDC); + + GlobalUnlock(hGlobal); + + SetRect(pRc, 0, 0, txtSize.cx, txtSize.cy); + break; + } + + default: + { + break; + } + } + + CloseClipboard(); + + return TRUE; +} diff --git a/base/applications/clipbrd/cliputils.h b/base/applications/clipbrd/cliputils.h index 28d64b8b3e..f126108649 100644 --- a/base/applications/clipbrd/cliputils.h +++ b/base/applications/clipbrd/cliputils.h @@ -1,11 +1,20 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/cliputils.h - * PURPOSE: Clipboard helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Clipboard helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ +#pragma once + +LRESULT +SendClipboardOwnerMessage( + IN BOOL bUnicode, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + void RetrieveClipboardFormatName(HINSTANCE hInstance, UINT uFormat, @@ -16,3 +25,15 @@ RetrieveClipboardFormatName(HINSTANCE hInstance, void DeleteClipboardContent(void); UINT GetAutomaticClipboardFormat(void); BOOL IsClipboardFormatSupported(UINT uFormat); + +SIZE_T +GetLineExtentW( + IN LPCWSTR lpText, + OUT LPCWSTR* lpNextLine); + +SIZE_T +GetLineExtentA( + IN LPCSTR lpText, + OUT LPCSTR* lpNextLine); + +BOOL GetClipboardDataDimensions(UINT uFormat, PRECT pRc); diff --git a/base/applications/clipbrd/fileutils.c b/base/applications/clipbrd/fileutils.c index 3be9acb275..d4b3ba72f0 100644 --- a/base/applications/clipbrd/fileutils.c +++ b/base/applications/clipbrd/fileutils.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/fileutils.c - * PURPOSE: Clipboard file format helper functions. - * PROGRAMMERS: Ricardo Hanke - * Hermes Belusca-Maito + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Clipboard file format helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" @@ -399,22 +398,22 @@ void ReadClipboardFile(LPCWSTR lpFileName) break; } - case CF_BITMAP: case CF_DSPBITMAP: + case CF_BITMAP: { bResult = ClipboardReadBitmap(hFile, dwOffData, dwLenData); break; } - case CF_METAFILEPICT: case CF_DSPMETAFILEPICT: + case CF_METAFILEPICT: { bResult = ClipboardReadMetafile(hFile, dwOffData, dwLenData); break; } - case CF_ENHMETAFILE: case CF_DSPENHMETAFILE: + case CF_ENHMETAFILE: { bResult = ClipboardReadEnhMetafile(hFile, dwOffData, dwLenData); break; diff --git a/base/applications/clipbrd/fileutils.h b/base/applications/clipbrd/fileutils.h index e103d8ee84..b17c45066a 100644 --- a/base/applications/clipbrd/fileutils.h +++ b/base/applications/clipbrd/fileutils.h @@ -1,15 +1,18 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/fileutils.h - * PURPOSE: Clipboard file format helper functions. - * PROGRAMMERS: Ricardo Hanke - * Hermes Belusca-Maito + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Clipboard file format helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ +#pragma once + +/* Clipboard file format signatures */ #define CLIP_FMT_31 0xC350 #define CLIP_FMT_NT 0xC351 #define CLIP_FMT_BK 0xC352 + #define MAX_FMT_NAME_LEN 79 /* diff --git a/base/applications/clipbrd/precomp.h b/base/applications/clipbrd/precomp.h index 5159ec2e5d..7a04b962c4 100644 --- a/base/applications/clipbrd/precomp.h +++ b/base/applications/clipbrd/precomp.h @@ -1,8 +1,18 @@ +/* + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Precompiled header. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + */ + #ifndef _CLIPBRD_PCH_ #define _CLIPBRD_PCH_ // #pragma once +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x600 + #include <limits.h> #include <assert.h> @@ -19,11 +29,12 @@ #include "resources.h" #include "cliputils.h" #include "fileutils.h" -#include "winutils.h" #include "scrollutils.h" +#include "winutils.h" #define MAX_STRING_LEN 255 #define DISPLAY_MENU_POS 2 + #define CF_NONE 0 typedef struct _CLIPBOARD_GLOBALS @@ -34,8 +45,10 @@ typedef struct _CLIPBOARD_GLOBALS HMENU hMenu; UINT uDisplayFormat; UINT uCheckedItem; - UINT uLinesToScroll; - HBITMAP hDspBmp; + + /* Metrics of the current font */ + LONG CharWidth; + LONG CharHeight; } CLIPBOARD_GLOBALS; extern CLIPBOARD_GLOBALS Globals; diff --git a/base/applications/clipbrd/resources.h b/base/applications/clipbrd/resources.h index ac958ef625..afc9ae8fd9 100644 --- a/base/applications/clipbrd/resources.h +++ b/base/applications/clipbrd/resources.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Resources header. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + */ + #pragma once #define CLIPBRD_ICON 100 diff --git a/base/applications/clipbrd/scrollutils.c b/base/applications/clipbrd/scrollutils.c index 424921f321..87c6ce8334 100644 --- a/base/applications/clipbrd/scrollutils.c +++ b/base/applications/clipbrd/scrollutils.c @@ -1,202 +1,166 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/scrollutils.c - * PURPOSE: Scrolling related helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Scrolling related helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" -static int InternalSetScrollInfo(HWND hWnd, int nMin, int nMax, UINT nPage, int nPos, int fnBar) -{ - SCROLLINFO si; - - ZeroMemory(&si, sizeof(si)); - si.cbSize = sizeof(si); - si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_DISABLENOSCROLL; - si.nMin = nMin; - si.nMax = nMax; - si.nPage = nPage; - si.nPos = nPos; - - return SetScrollInfo(hWnd, fnBar, &si, TRUE); -} - -void HandleKeyboardScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +void OnKeyScroll(HWND hWnd, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) { + // NOTE: Windows uses an offset of 16 pixels switch (wParam) { case VK_UP: - { - SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_LINEUP, 0), 0); + OnScroll(hWnd, SB_VERT, MAKELONG(SB_LINEUP, 0), 5, state); break; - } case VK_DOWN: - { - SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); + OnScroll(hWnd, SB_VERT, MAKELONG(SB_LINEDOWN, 0), 5, state); break; - } case VK_LEFT: - { - SendMessage(hWnd, WM_HSCROLL, MAKELONG(SB_LINEUP, 0), 0); + OnScroll(hWnd, SB_HORZ, MAKELONG(SB_LINELEFT, 0), 5, state); break; - } case VK_RIGHT: - { - SendMessage(hWnd, WM_HSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); + OnScroll(hWnd, SB_HORZ, MAKELONG(SB_LINERIGHT, 0), 5, state); break; - } case VK_PRIOR: - { - SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_PAGEUP, 0), 0); + OnScroll(hWnd, SB_VERT, MAKELONG(SB_PAGEUP, 0), state->nPageY, state); break; - } case VK_NEXT: + OnScroll(hWnd, SB_VERT, MAKELONG(SB_PAGEDOWN, 0), state->nPageY, state); + break; + + case VK_HOME: { - SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_PAGEDOWN, 0), 0); + OnScroll(hWnd, SB_HORZ, MAKELONG(SB_LEFT, 0), 0, state); + if (GetKeyState(VK_CONTROL) & 0x8000) + OnScroll(hWnd, SB_VERT, MAKELONG(SB_TOP, 0), 0, state); break; } - default: + case VK_END: { + OnScroll(hWnd, SB_HORZ, MAKELONG(SB_RIGHT, 0), 0, state); + if (GetKeyState(VK_CONTROL) & 0x8000) + OnScroll(hWnd, SB_VERT, MAKELONG(SB_BOTTOM, 0), 0, state); break; } + + default: + break; } } -void HandleMouseScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) +void OnMouseScroll(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) { - SCROLLINFO si; - int Delta; - int NewPos; + INT nBar; + INT nPage; + INT iDelta; + UINT uLinesToScroll = state->uLinesToScroll; + INT zDelta = GET_WHEEL_DELTA_WPARAM(wParam); + WORD sbCode; - si.cbSize = sizeof(si); - si.fMask = SIF_PAGE; - GetScrollInfo(hWnd, SB_VERT, &si); + assert(uMsg == WM_MOUSEWHEEL || uMsg == WM_MOUSEHWHEEL); - if (Globals.uLinesToScroll == WHEEL_PAGESCROLL) + if (uMsg == WM_MOUSEWHEEL) { - NewPos = si.nPage; + nBar = SB_VERT; + nPage = state->nPageY; + + /* Accumulate wheel rotation ticks */ + zDelta += state->iWheelCarryoverY; + state->iWheelCarryoverY = zDelta % WHEEL_DELTA; } - else + else // if (uMsg == WM_MOUSEHWHEEL) { - NewPos = Globals.uLinesToScroll * 5; + nBar = SB_HORZ; + nPage = state->nPageX; + + /* Accumulate wheel rotation ticks */ + zDelta += state->iWheelCarryoverX; + state->iWheelCarryoverX = zDelta % WHEEL_DELTA; } - if (GET_WHEEL_DELTA_WPARAM(wParam) > 0) + /* + * If the user specified scrolling by pages, do so. + * Due to a bug on Windows where, if the window height is + * less than the scroll lines delta default value (== 3), + * several lines would be skipped when scrolling if we + * used the WHEEL_PAGESCROLL value. Instead of this, use + * the number of lines per page as the limiting value. + * See https://www.strchr.com/corrections_to_raymond_chen_s_wheel_scrolling_code + * for more details. + */ + if (uLinesToScroll > nPage) // (uLinesToScroll == WHEEL_PAGESCROLL) + uLinesToScroll = nPage; + /* If the user specified no wheel scrolling, don't do anything */ + else if (uLinesToScroll == 0) + return; + + /* Compute the scroll direction and the absolute delta value */ + if (zDelta > 0) { - NewPos = state->CurrentY - NewPos; + sbCode = SB_LINEUP; } else { - NewPos = state->CurrentY + NewPos; - } - - NewPos = min(state->MaxY, max(0, NewPos)); - - if (NewPos == state->CurrentY) - { - return; + sbCode = SB_LINEDOWN; + zDelta = -zDelta; } - Delta = NewPos - state->CurrentY; - - state->CurrentY = NewPos; + /* Compute how many lines we should scroll (in absolute value) */ + iDelta = (INT)uLinesToScroll * zDelta / WHEEL_DELTA; - ScrollWindowEx(hWnd, 0, -Delta, NULL, NULL, NULL, NULL, SW_INVALIDATE); - - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - si.nPos = state->CurrentY; - SetScrollInfo(hWnd, SB_VERT, &si, TRUE); + OnScroll(hWnd, nBar, MAKELONG(sbCode, 0), iDelta, state); } -void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) +void OnScroll(HWND hWnd, INT nBar, WPARAM wParam, INT iDelta, LPSCROLLSTATE state) { SCROLLINFO si; - int Delta; - int NewPos; + PINT pCurrent; + INT Maximum; + INT NewPos; + INT OldX, OldY; - ZeroMemory(&si, sizeof(si)); - si.cbSize = sizeof(si); - si.fMask = SIF_PAGE | SIF_TRACKPOS; - GetScrollInfo(hWnd, SB_HORZ, &si); + assert(nBar == SB_HORZ || nBar == SB_VERT); - switch (LOWORD(wParam)) + if (Globals.uDisplayFormat == CF_OWNERDISPLAY) { - case SB_THUMBPOSITION: - case SB_THUMBTRACK: + if (nBar == SB_HORZ) { - NewPos = si.nTrackPos; - break; + SendClipboardOwnerMessage(TRUE, WM_HSCROLLCLIPBOARD, + (WPARAM)hWnd, (LPARAM)wParam); } - - case SB_LINELEFT: + else // if (nBar == SB_VERT) { - NewPos = state->CurrentX - 5; - break; - } - - case SB_LINERIGHT: - { - NewPos = state->CurrentX + 5; - break; - } - - case SB_PAGELEFT: - { - NewPos = state->CurrentX - si.nPage; - break; - } - - case SB_PAGERIGHT: - { - NewPos = state->CurrentX + si.nPage; - break; - } - - default: - { - NewPos = state->CurrentX; - break; + SendClipboardOwnerMessage(TRUE, WM_VSCROLLCLIPBOARD, + (WPARAM)hWnd, (LPARAM)wParam); } + return; } - NewPos = min(state->MaxX, max(0, NewPos)); - - if (NewPos == state->CurrentX) - { - return; - } - - Delta = NewPos - state->CurrentX; - - state->CurrentX = NewPos; - - ScrollWindowEx(hWnd, -Delta, 0, NULL, NULL, NULL, NULL, SW_INVALIDATE); - - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - si.nPos = state->CurrentX; - SetScrollInfo(hWnd, SB_HORZ, &si, TRUE); -} - -void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) -{ - SCROLLINFO si; - int Delta; - int NewPos; + if (nBar == SB_HORZ) + { + pCurrent = &state->CurrentX; + Maximum = state->MaxX; + } + else // if (nBar == SB_VERT) + { + pCurrent = &state->CurrentY; + Maximum = state->MaxY; + } ZeroMemory(&si, sizeof(si)); si.cbSize = sizeof(si); - si.fMask = SIF_PAGE | SIF_TRACKPOS; - GetScrollInfo(hWnd, SB_VERT, &si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; + GetScrollInfo(hWnd, nBar, &si); switch (LOWORD(wParam)) { @@ -207,108 +171,117 @@ void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar break; } - case SB_LINEUP: + case SB_LINEUP: // SB_LINELEFT: { - NewPos = state->CurrentY - 5; + NewPos = si.nPos - iDelta; break; } - case SB_LINEDOWN: + case SB_LINEDOWN: // SB_LINERIGHT: { - NewPos = state->CurrentY + 5; + NewPos = si.nPos + iDelta; break; } - case SB_PAGEUP: + case SB_PAGEUP: // SB_PAGELEFT: { - NewPos = state->CurrentY - si.nPage; + NewPos = si.nPos - si.nPage; break; } - case SB_PAGEDOWN: + case SB_PAGEDOWN: // SB_PAGERIGHT: { - NewPos = state->CurrentY + si.nPage; + NewPos = si.nPos + si.nPage; break; } - default: + case SB_TOP: // SB_LEFT: { - NewPos = state->CurrentY; + NewPos = si.nMin; break; } - } - NewPos = min(state->MaxY, max(0, NewPos)); + case SB_BOTTOM: // SB_RIGHT: + { + NewPos = si.nMax; + break; + } - if (NewPos == state->CurrentY) - { - return; - } + default: + { + NewPos = si.nPos; + break; + } + } + + NewPos = min(max(NewPos, 0), Maximum); - Delta = NewPos - state->CurrentY; + if (si.nPos == NewPos) + return; - state->CurrentY = NewPos; + OldX = state->CurrentX; + OldY = state->CurrentY; + *pCurrent = NewPos; - ScrollWindowEx(hWnd, 0, -Delta, NULL, NULL, NULL, NULL, SW_INVALIDATE); + ScrollWindowEx(hWnd, + OldX - state->CurrentX, + OldY - state->CurrentY, + NULL, + NULL, + NULL, + NULL, + SW_ERASE | SW_INVALIDATE); + UpdateWindow(hWnd); - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - si.nPos = state->CurrentY; - SetScrollInfo(hWnd, SB_VERT, &si, TRUE); + si.fMask = SIF_POS; + si.nPos = NewPos; + SetScrollInfo(hWnd, nBar, &si, TRUE); } -void UpdateWindowScrollState(HWND hWnd, HBITMAP hBitmap, LPSCROLLSTATE lpState) +void UpdateLinesToScroll(LPSCROLLSTATE state) { - BITMAP bmp; - RECT rc; + UINT uLinesToScroll; - if (!GetObject(hBitmap, sizeof(BITMAP), &bmp)) + if (!SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &uLinesToScroll, 0)) { - bmp.bmWidth = 0; - bmp.bmHeight = 0; + /* Default value on Windows */ + state->uLinesToScroll = 3; } - - if (!GetClientRect(hWnd, &rc)) + else { - SetRectEmpty(&rc); + state->uLinesToScroll = uLinesToScroll; } - - lpState->MaxX = max(bmp.bmWidth - rc.right, 0); - lpState->CurrentX = min(lpState->CurrentX, lpState->MaxX); - InternalSetScrollInfo(hWnd, 0, bmp.bmWidth, rc.right, lpState->CurrentX, SB_HORZ); - - lpState->MaxY = max(bmp.bmHeight - rc.bottom, 0); - lpState->CurrentY = min(lpState->CurrentY, lpState->MaxY); - InternalSetScrollInfo(hWnd, 0, bmp.bmHeight, rc.bottom, lpState->CurrentY, SB_VERT); } -BOOL ScrollBlt(PAINTSTRUCT ps, HBITMAP hBmp, SCROLLSTATE state) +void UpdateWindowScrollState(HWND hWnd, INT nMaxWidth, INT nMaxHeight, LPSCROLLSTATE lpState) { - RECT rect; - BOOL ret; - HDC hdc; - int xpos; - int ypos; - - rect.left = ps.rcPaint.left; - rect.top = ps.rcPaint.top; - rect.right = (ps.rcPaint.right - ps.rcPaint.left); - rect.bottom = (ps.rcPaint.bottom - ps.rcPaint.top); - - xpos = ps.rcPaint.left + state.CurrentX; - ypos = ps.rcPaint.top + state.CurrentY; + RECT rc; + SCROLLINFO si; - ret = FALSE; + if (!GetClientRect(hWnd, &rc)) + SetRectEmpty(&rc); - hdc = CreateCompatibleDC(ps.hdc); - if (hdc) - { - if (SelectObject(hdc, hBmp)) - { - ret = BitBlt(ps.hdc, rect.left, rect.top, rect.right, rect.bottom, hdc, xpos, ypos, SRCCOPY); - } - DeleteDC(hdc); - } + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_DISABLENOSCROLL; - return ret; + lpState->nMaxWidth = nMaxWidth; + lpState->MaxX = max(nMaxWidth - rc.right, 0); + lpState->CurrentX = min(lpState->CurrentX, lpState->MaxX); + lpState->nPageX = rc.right; + si.nMin = 0; + si.nMax = nMaxWidth; + si.nPage = lpState->nPageX; + si.nPos = lpState->CurrentX; + SetScrollInfo(hWnd, SB_HORZ, &si, TRUE); + + lpState->nMaxHeight = nMaxHeight; + lpState->MaxY = max(nMaxHeight - rc.bottom, 0); + lpState->CurrentY = min(lpState->CurrentY, lpState->MaxY); + lpState->nPageY = rc.bottom; + si.nMin = 0; + si.nMax = nMaxHeight; + si.nPage = lpState->nPageY; + si.nPos = lpState->CurrentY; + SetScrollInfo(hWnd, SB_VERT, &si, TRUE); } diff --git a/base/applications/clipbrd/scrollutils.h b/base/applications/clipbrd/scrollutils.h index 221bf50ce0..4645a24441 100644 --- a/base/applications/clipbrd/scrollutils.h +++ b/base/applications/clipbrd/scrollutils.h @@ -1,22 +1,31 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/scrollutils.h - * PURPOSE: Scrolling related helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Scrolling related helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ +#pragma once + typedef struct _SCROLLSTATE { - int CurrentX; - int CurrentY; - int MaxX; - int MaxY; + UINT uLinesToScroll; /* Number of lines to scroll on one wheel rotation movement (== one "click" == WHEEL_DELTA ticks) */ + INT iWheelCarryoverX; /* Unused wheel ticks (< WHEEL_DELTA) */ + INT iWheelCarryoverY; + INT nPageX; /* Number of lines per page */ + INT nPageY; + INT CurrentX; /* Current scrollbar position */ + INT CurrentY; + INT MaxX; /* Maximum scrollbar position */ + INT MaxY; + INT nMaxWidth; /* Maximum span of displayed data */ + INT nMaxHeight; } SCROLLSTATE, *LPSCROLLSTATE; -void HandleKeyboardScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -void HandleMouseScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); -void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); -void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); -void UpdateWindowScrollState(HWND hWnd, HBITMAP hBmp, LPSCROLLSTATE lpState); -BOOL ScrollBlt(PAINTSTRUCT ps, HBITMAP hBmp, SCROLLSTATE state); +void OnKeyScroll(HWND hWnd, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); +void OnMouseScroll(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); +void OnScroll(HWND hWnd, INT nBar, WPARAM wParam, INT iDelta, LPSCROLLSTATE state); + +void UpdateLinesToScroll(LPSCROLLSTATE state); +void UpdateWindowScrollState(HWND hWnd, INT nMaxWidth, INT nMaxHeight, LPSCROLLSTATE lpState); diff --git a/base/applications/clipbrd/winutils.c b/base/applications/clipbrd/winutils.c index 43697d53e9..eb1cf03c2d 100644 --- a/base/applications/clipbrd/winutils.c +++ b/base/applications/clipbrd/winutils.c @@ -1,9 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/winutils.c - * PURPOSE: Miscellaneous helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Display helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ #include "precomp.h" @@ -46,22 +46,6 @@ void BringWindowToFront(HWND hWnd) } } -int DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat) -{ - LPWSTR lpBuffer; - int nCount; - - nCount = LoadStringW(hInstance, uID, (LPWSTR)&lpBuffer, 0); - if (nCount) - { - return DrawTextW(hDC, lpBuffer, nCount, lpRect, uFormat); - } - else - { - return 0; - } -} - int MessageBoxRes(HWND hWnd, HINSTANCE hInstance, UINT uText, UINT uCaption, UINT uType) { MSGBOXPARAMSW mb; @@ -78,45 +62,135 @@ int MessageBoxRes(HWND hWnd, HINSTANCE hInstance, UINT uText, UINT uCaption, UIN return MessageBoxIndirectW(&mb); } -void DrawTextFromClipboard(HDC hDC, LPRECT lpRect, UINT uFormat) +void DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat) { + LPWSTR lpBuffer; + int nCount; + + nCount = LoadStringW(hInstance, uID, (LPWSTR)&lpBuffer, 0); + if (nCount) + DrawTextW(hDC, lpBuffer, nCount, lpRect, uFormat); +} + +void DrawTextFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state) +{ + POINT ptOrg; HGLOBAL hGlobal; - LPWSTR lpchText; + PVOID lpText, ptr; + SIZE_T lineSize; + INT FirstLine, LastLine; - hGlobal = GetClipboardData(CF_UNICODETEXT); + hGlobal = GetClipboardData(uFormat); if (!hGlobal) return; - lpchText = GlobalLock(hGlobal); - if (!lpchText) + lpText = GlobalLock(hGlobal); + if (!lpText) return; - DrawTextW(hDC, lpchText, -1, lpRect, uFormat); + /* Find the first and last line indices to display (Note that CurrentX/Y are in pixels!) */ + FirstLine = max(0, (state.CurrentY + ps.rcPaint.top) / Globals.CharHeight); + // LastLine = min(LINES - 1, (state.CurrentY + ps.rcPaint.bottom) / Globals.CharHeight); + // NOTE: Can be less or greater than the actual number of lines in the text. + LastLine = (state.CurrentY + ps.rcPaint.bottom) / Globals.CharHeight; + + /* Find the first text line to display */ + while (FirstLine > 0) + { + if (uFormat == CF_UNICODETEXT) + { + if (*(LPCWSTR)lpText == UNICODE_NULL) + break; + GetLineExtentW(lpText, (LPCWSTR*)&ptr); + } + else + { + if (*(LPCSTR)lpText == ANSI_NULL) + break; + GetLineExtentA(lpText, (LPCSTR*)&ptr); + } + + --FirstLine; + --LastLine; + + lpText = ptr; + } + + ptOrg.x = ps.rcPaint.left; + ptOrg.y = /* FirstLine */ max(0, (state.CurrentY + ps.rcPaint.top) / Globals.CharHeight) + * Globals.CharHeight - state.CurrentY; + + /* Display each line from the current one up to the last one */ + ++LastLine; + while (LastLine >= 0) + { + if (uFormat == CF_UNICODETEXT) + { + if (*(LPCWSTR)lpText == UNICODE_NULL) + break; + lineSize = GetLineExtentW(lpText, (LPCWSTR*)&ptr); + TabbedTextOutW(ps.hdc, /*ptOrg.x*/0 - state.CurrentX, ptOrg.y, + lpText, lineSize, 0, NULL, + /*ptOrg.x*/0 - state.CurrentX); + } + else + { + if (*(LPCSTR)lpText == ANSI_NULL) + break; + lineSize = GetLineExtentA(lpText, (LPCSTR*)&ptr); + TabbedTextOutA(ps.hdc, /*ptOrg.x*/0 - state.CurrentX, ptOrg.y, + lpText, lineSize, 0, NULL, + /*ptOrg.x*/0 - state.CurrentX); + } + + --LastLine; + + ptOrg.y += Globals.CharHeight; + lpText = ptr; + } + GlobalUnlock(hGlobal); } -void BitBltFromClipboard(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int nXSrc, int nYSrc, DWORD dwRop) +void BitBltFromClipboard(PAINTSTRUCT ps, SCROLLSTATE state, DWORD dwRop) { HDC hdcMem; - HBITMAP hbm; + HBITMAP hBitmap; + BITMAP bmp; + LONG bmWidth, bmHeight; - hdcMem = CreateCompatibleDC(hdcDest); - if (hdcMem) - { - hbm = (HBITMAP)GetClipboardData(CF_BITMAP); - SelectObject(hdcMem, hbm); - BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcMem, nXSrc, nYSrc, dwRop); - DeleteDC(hdcMem); - } + hdcMem = CreateCompatibleDC(ps.hdc); + if (!hdcMem) + return; + + hBitmap = (HBITMAP)GetClipboardData(CF_BITMAP); + GetObjectW(hBitmap, sizeof(bmp), &bmp); + + SelectObject(hdcMem, hBitmap); + + bmWidth = min(ps.rcPaint.right - ps.rcPaint.left, bmp.bmWidth - ps.rcPaint.left - state.CurrentX); + bmHeight = min(ps.rcPaint.bottom - ps.rcPaint.top , bmp.bmHeight - ps.rcPaint.top - state.CurrentY); + + BitBlt(ps.hdc, + ps.rcPaint.left, + ps.rcPaint.top, + bmWidth, + bmHeight, + hdcMem, + ps.rcPaint.left + state.CurrentX, + ps.rcPaint.top + state.CurrentY, + dwRop); + + DeleteDC(hdcMem); } -void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse) +void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state, UINT fuColorUse) { + HGLOBAL hGlobal; LPBITMAPINFOHEADER lpInfoHeader; LPBYTE lpBits; LONG bmWidth, bmHeight; DWORD dwPalSize = 0; - HGLOBAL hGlobal; hGlobal = GetClipboardData(uFormat); if (!hGlobal) @@ -183,9 +257,9 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, * * FIXME: investigate!! * ANSWER: this is a Windows bug; part of the answer is there: - * http://go4answers.webhost4life.com/Help/bug-clipboard-format-conversions-28… + * https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ac7ab3b5-8609… * May be related: - * http://blog.talosintel.com/2015/10/dangerous-clipboard.html + * https://blog.talosintelligence.com/2015/10/dangerous-clipboard.html */ #if 0 if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) && @@ -196,6 +270,7 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, #endif bmWidth = lpInfoHeader->biWidth; + /* NOTE: biHeight < 0 for bottom-up DIBs, or > 0 for top-down DIBs */ bmHeight = lpInfoHeader->biHeight; } else @@ -207,11 +282,19 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, lpBits = (LPBYTE)lpInfoHeader + lpInfoHeader->biSize + dwPalSize; - SetDIBitsToDevice(hdc, - XDest, YDest, - bmWidth, bmHeight, - XSrc, YSrc, - uStartScan, + /* + * The seventh parameter (YSrc) of SetDIBitsToDevice always designates + * the Y-coordinate of the "lower-left corner" of the image, be the DIB + * in bottom-up or top-down mode. + */ + SetDIBitsToDevice(ps.hdc, + -state.CurrentX, // ps.rcPaint.left, + -state.CurrentY, // ps.rcPaint.top, + bmWidth, + bmHeight, + 0, // ps.rcPaint.left + state.CurrentX, + 0, // -(ps.rcPaint.top + state.CurrentY), + 0, // uStartScan, bmHeight, lpBits, (LPBITMAPINFO)lpInfoHeader, @@ -248,52 +331,25 @@ void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect) PlayEnhMetaFile(hdc, hEmf, lpRect); } -UINT RealizeClipboardPalette(HWND hWnd) +BOOL RealizeClipboardPalette(HDC hdc) { - HPALETTE hPalette; - HPALETTE hOldPalette; - UINT uResult; - HDC hDevContext; - - if (!OpenClipboard(Globals.hMainWnd)) - { - return GDI_ERROR; - } + BOOL Success; + HPALETTE hPalette, hOldPalette; if (!IsClipboardFormatAvailable(CF_PALETTE)) - { - CloseClipboard(); - return GDI_ERROR; - } + return FALSE; hPalette = GetClipboardData(CF_PALETTE); if (!hPalette) - { - CloseClipboard(); - return GDI_ERROR; - } - - hDevContext = GetDC(hWnd); - if (!hDevContext) - { - CloseClipboard(); - return GDI_ERROR; - } + return FALSE; - hOldPalette = SelectPalette(hDevContext, hPalette, FALSE); + hOldPalette = SelectPalette(hdc, hPalette, FALSE); if (!hOldPalette) - { - ReleaseDC(hWnd, hDevContext); - CloseClipboard(); - return GDI_ERROR; - } - - uResult = RealizePalette(hDevContext); + return FALSE; - SelectPalette(hDevContext, hOldPalette, FALSE); - ReleaseDC(hWnd, hDevContext); + Success = (RealizePalette(hdc) != GDI_ERROR); - CloseClipboard(); + SelectPalette(hdc, hOldPalette, FALSE); - return uResult; + return Success; } diff --git a/base/applications/clipbrd/winutils.h b/base/applications/clipbrd/winutils.h index 12dde908d8..e29ec927bc 100644 --- a/base/applications/clipbrd/winutils.h +++ b/base/applications/clipbrd/winutils.h @@ -1,18 +1,20 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/winutils.h - * PURPOSE: Miscellaneous helper functions. - * PROGRAMMERS: Ricardo Hanke + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Display helper functions. + * COPYRIGHT: Copyright 2015-2018 Ricardo Hanke + * Copyright 2015-2018 Hermes Belusca-Maito */ +#pragma once + void ShowLastWin32Error(HWND hwndParent); void BringWindowToFront(HWND hWnd); -int DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat); int MessageBoxRes(HWND hWnd, HINSTANCE hInstance, UINT uText, UINT uCaption, UINT uType); -void DrawTextFromClipboard(HDC hDC, LPRECT lpRect, UINT uFormat); -void BitBltFromClipboard(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int nXSrc, int nYSrc, DWORD dwRop); -void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse); +void DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat); +void DrawTextFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state); +void BitBltFromClipboard(PAINTSTRUCT ps, SCROLLSTATE state, DWORD dwRop); +void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE state, UINT fuColorUse); void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect); void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect); -UINT RealizeClipboardPalette(HWND hWnd); +BOOL RealizeClipboardPalette(HDC hdc);

1 0

01/01: Add virtio drivers to reactos.dff.in
by Andrew Cook 13 May '18

13 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a00192870ec1c1d21a3e… commit 5a00192870ec1c1d21a3e26243e5f75ca6dcad9d Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Sun May 13 14:56:44 2018 +1000 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun May 13 22:24:41 2018 +0200 Add virtio drivers to reactos.dff.in qxl has some visual glitches, viostor loads but it seems reactos doesn't support scsi disks yet --- boot/bootdata/packages/reactos.dff.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 96ace64430..2689f50483 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -89,9 +89,16 @@ Signature = "$ReactOS$" ; Optional/proprietary files "modules/optional/DroidSansFallback.ttf" 3 optional "modules/optional/NOTICE_for_Droid_Font.txt" 4 optional -"modules/optional/netkvm2k.inf" 6 optional -"modules/optional/netkvm2k.cat" 6 optional +"modules/optional/netkvm.inf" 6 optional +"modules/optional/netkvm.cat" 6 optional "modules/optional/netkvm.sys" 2 optional +"modules/optional/viostor.inf" 6 optional +"modules/optional/viostor.cat" 6 optional +"modules/optional/viostor.sys" 2 optional +"modules/optional/qxl.inf" 6 optional +"modules/optional/qxl.cat" 6 optional +"modules/optional/qxl.sys" 2 optional +"modules/optional/qxldd.dll" 1 optional "modules/optional/b57win32.inf" 6 optional "modules/optional/b57win32.cat" 6 optional "modules/optional/b57xp32.sys" 2 optional

1 0

01/01: [SHELL32] In #543, I forgot sq-AL.rc and sv-SE.rc
by Katayama Hirofumi MZ 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e96d851339d24a30247d… commit 2e96d851339d24a30247d08ed0a9716c22208539 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 12 23:33:01 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 12 17:09:59 2018 +0200 [SHELL32] In #543, I forgot sq-AL.rc and sv-SE.rc --- dll/win32/shell32/lang/sq-AL.rc | 14 +++++++------- dll/win32/shell32/lang/sv-SE.rc | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index bf4e9030cd..fced8feca2 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -457,15 +457,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Dokumentat e regjistruar dhe lloji:", -1, 7, 10, 70, 10 CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "E're", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Fshi", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detaje për '%s' zgjerim", 14003, 7, 130, 249, 70 + PUSHBUTTON "E're", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Fshi", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detaje për '%s' zgjerim", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Hap me:", -1, 12, 140, 40, 10 //ICON - LTEXT "Emriapp", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Ndrysho...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Avancuar", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Emriapp", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Ndrysho...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Avancuar", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index c0ab9760cb..9484e95687 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -453,15 +453,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registrerade fil&typer:", -1, 7, 10, 70, 10 CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Ta bort", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detaljer för filändelsen '%s'", 14003, 7, 130, 249, 70 + PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Ta bort", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detaljer för filändelsen '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Öppnas med:", -1, 12, 140, 50, 10 //ICON - LTEXT "Programnamn", 14005, 100, 140, 46, 10 - PUSHBUTTON "&Ändra...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vancerat", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Programnamn", IDC_FILETYPES_APPNAME, 100, 140, 46, 10 + PUSHBUTTON "&Ändra...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vancerat", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143

1 0

01/01: [shell32] add some control IDs for IDD_FOLDER_OPTIONS_FILETYPES
by Katayama Hirofumi MZ 12 May '18

12 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b0238a48aa2ea38125c5… commit 2b0238a48aa2ea38125c53df3316f57f409220e5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 12 21:06:13 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 12 13:47:09 2018 +0200 [shell32] add some control IDs for IDD_FOLDER_OPTIONS_FILETYPES --- dll/win32/shell32/lang/bg-BG.rc | 16 ++++++++-------- dll/win32/shell32/lang/ca-ES.rc | 16 ++++++++-------- dll/win32/shell32/lang/cs-CZ.rc | 16 ++++++++-------- dll/win32/shell32/lang/da-DK.rc | 16 ++++++++-------- dll/win32/shell32/lang/de-DE.rc | 16 ++++++++-------- dll/win32/shell32/lang/el-GR.rc | 16 ++++++++-------- dll/win32/shell32/lang/en-GB.rc | 16 ++++++++-------- dll/win32/shell32/lang/en-US.rc | 16 ++++++++-------- dll/win32/shell32/lang/es-ES.rc | 16 ++++++++-------- dll/win32/shell32/lang/et-EE.rc | 16 ++++++++-------- dll/win32/shell32/lang/fi-FI.rc | 16 ++++++++-------- dll/win32/shell32/lang/fr-FR.rc | 16 ++++++++-------- dll/win32/shell32/lang/he-IL.rc | 16 ++++++++-------- dll/win32/shell32/lang/hu-HU.rc | 16 ++++++++-------- dll/win32/shell32/lang/it-IT.rc | 16 ++++++++-------- dll/win32/shell32/lang/ja-JP.rc | 16 ++++++++-------- dll/win32/shell32/lang/ko-KR.rc | 16 ++++++++-------- dll/win32/shell32/lang/nl-NL.rc | 16 ++++++++-------- dll/win32/shell32/lang/no-NO.rc | 16 ++++++++-------- dll/win32/shell32/lang/pl-PL.rc | 16 ++++++++-------- dll/win32/shell32/lang/pt-BR.rc | 16 ++++++++-------- dll/win32/shell32/lang/pt-PT.rc | 16 ++++++++-------- dll/win32/shell32/lang/ro-RO.rc | 16 ++++++++-------- dll/win32/shell32/lang/ru-RU.rc | 16 ++++++++-------- dll/win32/shell32/lang/sk-SK.rc | 16 ++++++++-------- dll/win32/shell32/lang/sl-SI.rc | 16 ++++++++-------- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 16 ++++++++-------- dll/win32/shell32/lang/uk-UA.rc | 16 ++++++++-------- dll/win32/shell32/lang/zh-CN.rc | 16 ++++++++-------- dll/win32/shell32/lang/zh-TW.rc | 16 ++++++++-------- dll/win32/shell32/shresdef.h | 10 ++++++++++ 33 files changed, 252 insertions(+), 242 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 2cad795f64..7db93e7883 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -452,16 +452,16 @@ CAPTION "Видове файлове" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Вписани &видове файлове:", -1, 7, 10, 170, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Нов", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "Из&триване", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Подробности за разширение '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Нов", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "Из&триване", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Подробности за разширение '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Отваряне с:", -1, 12, 140, 40, 10 //ICON - LTEXT "Име на приложение", 14005, 100, 140, 40, 10 - PUSHBUTTON "Про&мяна...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 32 - PUSHBUTTON "Раз&ширени", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Име на приложение", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "Про&мяна...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 32 + PUSHBUTTON "Раз&ширени", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index c2cebd14f1..691928568e 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 333e126917..9928ef0947 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -458,16 +458,16 @@ CAPTION "Typy souborů" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registrované &typy souborů:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nový", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "O&dstranit", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Podrobnosti pro typ souborů '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nový", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "O&dstranit", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Podrobnosti pro typ souborů '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Otevírat v:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Změnit...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "&Pokročilé", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Změnit...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "&Pokročilé", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 1a662274bc..b243df2bf8 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -458,16 +458,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 1690c9ea3e..962b0b99b9 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -452,16 +452,16 @@ CAPTION "Dateitypen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Registrierte Dateitypen:", -1, 7, 10, 80, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115 - PUSHBUTTON "&Neu", 14001, 140, 140, 55, 14, WS_TABSTOP - PUSHBUTTON "&Löschen", 14002, 200, 140, 55, 14, WS_TABSTOP - GROUPBOX "Details zum Dateityp '%s'", 14003, 7, 170, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115 + PUSHBUTTON "&Neu", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP + PUSHBUTTON "&Löschen", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP + GROUPBOX "Details zum Dateityp '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70 LTEXT "Öffnen mit:", -1, 12, 180, 40, 10 //ICON - LTEXT "Name", 14005, 100, 180, 40, 10 - PUSHBUTTON "Än&dern...", 14006, 200, 180, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 195, 160, 30 - PUSHBUTTON "&Erweitert", 14008, 200, 215, 50, 14, WS_TABSTOP + LTEXT "Name", IDC_FILETYPES_APPNAME, 100, 180, 40, 10 + PUSHBUTTON "Än&dern...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 30 + PUSHBUTTON "&Erweitert", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 269d0d69af..c3de8be186 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 33066d710a..097e62f4f2 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index f09a32b2d6..02be7b92eb 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -453,16 +453,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index a655661522..33f2a498b0 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -454,16 +454,16 @@ CAPTION "Tipos de Archivo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de archivo registrados:", -1, 7, 10, 120, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80 - PUSHBUTTON "&Nueva", 14001, 170, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "Eli&minar", 14002, 230, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detalles para el tipo de archivo «%s»", 14003, 7, 130, 279, 100 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80 + PUSHBUTTON "&Nueva", IDC_FILETYPES_NEW, 170, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "Eli&minar", IDC_FILETYPES_DELETE, 230, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detalles para el tipo de archivo «%s»", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 279, 100 LTEXT "Se abre con:", -1, 12, 140, 50, 10 //ICON - LTEXT "Aplicación", 14005, 100, 140, 40, 10 - PUSHBUTTON "Cam&biar...", 14006, 230, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 165, 220, 30 - PUSHBUTTON "Opciones avanza&das", 14008, 190, 213, 90, 14, WS_TABSTOP + LTEXT "Aplicación", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "Cam&biar...", IDC_FILETYPES_CHANGE, 230, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 165, 220, 30 + PUSHBUTTON "Opciones avanza&das", IDC_FILETYPES_ADVANCED, 190, 213, 90, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 5dcac20d55..9f8150ae25 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -460,16 +460,16 @@ CAPTION "Failitüübid" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registreeritud faili&tüübid:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Uus", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Kustuta", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Failitüübi '%s' üksikasjad", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Uus", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Kustuta", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Failitüübi '%s' üksikasjad", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Avamisprogramm:", -1, 12, 140, 60, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Muuda...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "&Täpsemalt", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Muuda...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "&Täpsemalt", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index bef4798082..438b40d125 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index ed0cbbdd6a..6ca34ecaa0 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -452,16 +452,16 @@ CAPTION "Types de fichiers" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Types de fichiers enregistrés :", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nouveau", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "Supprimer", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Détails concernant l'extension '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nouveau", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "Supprimer", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Détails concernant l'extension '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Ouvrir avec :", -1, 12, 140, 40, 10 //ICON - LTEXT "Nom de l'application", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Modifier...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vancé", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Nom de l'application", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Modifier...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vancé", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 8472eaddee..925493cd51 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 629b97485b..7f4caf3157 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index a2697d681a..3ab099b0be 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -452,16 +452,16 @@ CAPTION "Tipi dei File" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipi di file Registrati:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nuovo", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Cancella", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Dettagli per l'estensione '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nuovo", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Cancella", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Dettagli per l'estensione '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Apri con:", -1, 12, 140, 40, 10 //ICON - LTEXT "Nome", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Cambia...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vanzate", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Nome", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Cambia...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vanzate", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 0a1bce3e2a..3c585185a4 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -452,16 +452,16 @@ CAPTION "ファイルの種類" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "登録済みのファイルの種類(&T):", -1, 7, 10, 180, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "新規(&N)", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "削除(&D)", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "拡張子 '%s' の詳細", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "新規(&N)", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "削除(&D)", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "拡張子 '%s' の詳細", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "開くプログラム:", -1, 12, 140, 80, 10 //ICON - LTEXT "アプリ名", 14005, 100, 140, 80, 10 - PUSHBUTTON "変更(&C)...", 14006, 180, 140, 75, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 165, 40 - PUSHBUTTON "詳細設定(&V)", 14008, 180, 175, 75, 14, WS_TABSTOP + LTEXT "アプリ名", IDC_FILETYPES_APPNAME, 100, 140, 80, 10 + PUSHBUTTON "変更(&C)...", IDC_FILETYPES_CHANGE, 180, 140, 75, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 165, 40 + PUSHBUTTON "詳細設定(&V)", IDC_FILETYPES_ADVANCED, 180, 175, 75, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 37d7afd13b..5a9674803c 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 9, "굴림", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 75a82a21af..97e947a882 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 564809b3ee..be60be5f1d 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -452,16 +452,16 @@ CAPTION "Filtyper" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registerert fil&typer:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Slett", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detailjer for '%s' utvidelser", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Slett", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detailjer for '%s' utvidelser", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Åpne med:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Endre...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Av&ansert", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Endre...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Av&ansert", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index a218dc33dc..fb62f92282 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -457,16 +457,16 @@ CAPTION "Typy plików" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Zarejestrowane &typy plików:", -1, 7, 10, 196, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nowy", 14001, 120, 110, 60, 14, WS_TABSTOP - PUSHBUTTON "&Usuń", 14002, 195, 110, 60, 14, WS_TABSTOP - GROUPBOX "Szczegóły dla rozszerzenia '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nowy", IDC_FILETYPES_NEW, 120, 110, 60, 14, WS_TABSTOP + PUSHBUTTON "&Usuń", IDC_FILETYPES_DELETE, 195, 110, 60, 14, WS_TABSTOP + GROUPBOX "Szczegóły dla rozszerzenia '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Otwiera z:", -1, 12, 140, 40, 10 //ICON - LTEXT "Nazwa Aplikacji", 14005, 50, 140, 80, 10 - PUSHBUTTON "Z&mień", 14006, 190, 140, 60, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Zaawa&nsowane", 14008, 190, 175, 60, 14, WS_TABSTOP + LTEXT "Nazwa Aplikacji", IDC_FILETYPES_APPNAME, 50, 140, 80, 10 + PUSHBUTTON "Z&mień", IDC_FILETYPES_CHANGE, 190, 140, 60, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Zaawa&nsowane", IDC_FILETYPES_ADVANCED, 190, 175, 60, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 1592819a3f..abbdc292f6 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -452,16 +452,16 @@ CAPTION "Tipos de Arquivo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de arquivo registrado:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Novo", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Apagar", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detalhes para extensão '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Novo", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Apagar", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detalhes para extensão '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Abrir com:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "Alt&erar...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vançado", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "Alt&erar...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vançado", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 243b4caf71..978dc1b95c 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -452,16 +452,16 @@ CAPTION "Tipos de Ficheiros" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de ficheiros registados:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Novo", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Apagar", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detalhes para '%s' extensão", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Novo", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Apagar", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detalhes para '%s' extensão", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Abre com:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appnome", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Mudar...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "A&vançado", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appnome", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Mudar...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "A&vançado", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 4732b10d39..3880417de2 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -454,16 +454,16 @@ CAPTION "Tipuri de fișier" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tipurile de fișier înregistrate:", -1, 7, 10, 120, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "N&ou…", 14001, 140, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Elimină", 14002, 200, 110, 50, 14, WS_TABSTOP - GROUPBOX "Detalii pentru extensia „%s”", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "N&ou…", IDC_FILETYPES_NEW, 140, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Elimină", IDC_FILETYPES_DELETE, 200, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detalii pentru extensia „%s”", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Va fi deschis cu:", -1, 22, 140, 50, 10 //ICON - LTEXT "Nume aplicație", 14005, 100, 140, 75, 10 - PUSHBUTTON "Spe&cificare…", 14006, 190, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 22, 155, 160, 35 - PUSHBUTTON "A&vansate…", 14008, 190, 175, 50, 14, WS_TABSTOP + LTEXT "Nume aplicație", IDC_FILETYPES_APPNAME, 100, 140, 75, 10 + PUSHBUTTON "Spe&cificare…", IDC_FILETYPES_CHANGE, 190, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 22, 155, 160, 35 + PUSHBUTTON "A&vansate…", IDC_FILETYPES_ADVANCED, 190, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 6a6cefc297..9fe7bb3a3a 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -454,16 +454,16 @@ CAPTION "Типы файлов" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Зарегистрированные типы файлов:", -1, 7, 10, 125, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Создать", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Удалить", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Описание расширения '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Создать", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Удалить", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Описание расширения '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Открывать с:", -1, 12, 140, 40, 10 //ICON - LTEXT "Приложение", 14005, 100, 140, 45, 10 - PUSHBUTTON "&Изменить...", 14006, 180, 140, 65, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "До&полнительно", 14008, 180, 175, 65, 14, WS_TABSTOP + LTEXT "Приложение", IDC_FILETYPES_APPNAME, 100, 140, 45, 10 + PUSHBUTTON "&Изменить...", IDC_FILETYPES_CHANGE, 180, 140, 65, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "До&полнительно", IDC_FILETYPES_ADVANCED, 180, 175, 65, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 55e3200648..c4dbe9172e 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -452,16 +452,16 @@ CAPTION "Typy súborov" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registrované &typy súborov:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Nový", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "O&dstrániť", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Nový", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "O&dstrániť", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Zmeniť...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Zmeniť...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index b51330b7b8..9520ab1ec1 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -452,16 +452,16 @@ CAPTION "File Types" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 2b886ebc4f..bf4e9030cd 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -456,7 +456,7 @@ CAPTION "Tipe Dokumenti" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Dokumentat e regjistruar dhe lloji:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "E're", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Fshi", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Detaje për '%s' zgjerim", 14003, 7, 130, 249, 70 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e10e28aa4f..c0ab9760cb 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -452,7 +452,7 @@ CAPTION "Filtyper" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registrerade fil&typer:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Ta bort", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Detaljer för filändelsen '%s'", 14003, 7, 130, 249, 70 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index e4edafe2d1..eceecef021 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -454,16 +454,16 @@ CAPTION "Kütük Türleri" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Kayıtlı Kütük Türleri:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Yeni", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Sil", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX """%s"" Uzantısı İçin Ayrıntılar", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Yeni", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Sil", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX """%s"" Uzantısı İçin Ayrıntılar", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Birlikte Açılır:", -1, 12, 140, 40, 10 //ICON - LTEXT "Uygulama Adı", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Değiştir...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "&Gelişmiş", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Uygulama Adı", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Değiştir...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "&Gelişmiş", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 142e75f235..01763d8758 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -452,16 +452,16 @@ CAPTION "Типи файлів" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Зареєстровані &типи файлів:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Створити", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "В&идалити", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Подробиці для розширення '%s'", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&Створити", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "В&идалити", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Подробиці для розширення '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Відкривати у:", -1, 12, 140, 48, 10 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "Додаток", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Змінити...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 40 - PUSHBUTTON "&Додатково", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Додаток", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Змінити...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 40 + PUSHBUTTON "&Додатково", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index e298c62759..7671975ae5 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -462,16 +462,16 @@ CAPTION "文件类型" FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "已注册的文件类型(&T):", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "新建(&N)", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "删除(&D)", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "'%S' 扩展的详细信息", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "新建(&N)", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "删除(&D)", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "'%S' 扩展的详细信息", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "打开方式:", -1, 12, 140, 40, 10 //ICON - LTEXT "应用程序名称", 14005, 100, 140, 40, 10 - PUSHBUTTON "更改...(&C)", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "高级(&V)", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "应用程序名称", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "更改...(&C)", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "高级(&V)", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index db828af75c..b0ee067e9d 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -460,16 +460,16 @@ CAPTION "File Types" FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 + CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + PUSHBUTTON "&New", IDC_FILETYPES_NEW, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 140, 40, 10 + PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 180, 140, 50, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 155, 160, 30 + PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 8d5cf11293..7bbd3b262f 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -338,6 +338,16 @@ #define IDC_BROWSE_FOR_FOLDER_TITLE 0x3742 #define IDC_BROWSE_FOR_FOLDER_TREEVIEW 0x3741 +/* Control IDs for IDD_FOLDER_OPTIONS_FILETYPES dialog */ +#define IDC_FILETYPES_LISTVIEW 14000 +#define IDC_FILETYPES_NEW 14001 +#define IDC_FILETYPES_DELETE 14002 +#define IDC_FILETYPES_DETAILS_GROUPBOX 14003 +#define IDC_FILETYPES_APPNAME 14005 +#define IDC_FILETYPES_CHANGE 14006 +#define IDC_FILETYPES_DESCRIPTION 14007 +#define IDC_FILETYPES_ADVANCED 14008 + /* Other dialogs */ #define IDD_RUN_AS 23 #define IDD_OPEN_WITH 24

1 0

← Newer
1
...
14
15
16
17
18
19
20
21
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2018