Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 04/04: [NTOS:IO] Avoid an unnecessary stack buffer in OpenRegistryHandlesFromSymbolicLink. CORE-15882
by Thomas Faber 25 Mar '19

25 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a976ebb0315a0b27438ed… commit a976ebb0315a0b27438edb04fd69555e7de732df Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 24 10:55:04 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 25 08:43:47 2019 +0100 [NTOS:IO] Avoid an unnecessary stack buffer in OpenRegistryHandlesFromSymbolicLink. CORE-15882 --- ntoskrnl/io/iomgr/deviface.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ntoskrnl/io/iomgr/deviface.c b/ntoskrnl/io/iomgr/deviface.c index 0e1f32f5ca4..34245027627 100644 --- a/ntoskrnl/io/iomgr/deviface.c +++ b/ntoskrnl/io/iomgr/deviface.c @@ -37,7 +37,6 @@ OpenRegistryHandlesFromSymbolicLink(IN PUNICODE_STRING SymbolicLinkName, IN OPTIONAL PHANDLE InstanceKey) { OBJECT_ATTRIBUTES ObjectAttributes; - WCHAR PathBuffer[MAX_PATH]; UNICODE_STRING BaseKeyU; UNICODE_STRING GuidString, SubKeyName, ReferenceString; PWCHAR StartPosition, EndPosition; @@ -67,11 +66,7 @@ OpenRegistryHandlesFromSymbolicLink(IN PUNICODE_STRING SymbolicLinkName, *DeviceKeyRealP = NULL; *InstanceKeyRealP = NULL; - BaseKeyU.Buffer = PathBuffer; - BaseKeyU.Length = 0; - BaseKeyU.MaximumLength = MAX_PATH * sizeof(WCHAR); - - RtlAppendUnicodeToString(&BaseKeyU, BaseKeyString); + RtlInitUnicodeString(&BaseKeyU, BaseKeyString); /* Open the DeviceClasses key */ InitializeObjectAttributes(&ObjectAttributes,

1 0

[reactos] 03/04: [NTOS:FSTUB] Fix a clang format string warning.
by Thomas Faber 25 Mar '19

25 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0bb3d0041047298cdf5c… commit b0bb3d0041047298cdf5cacec9d56143e976f5e1 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 24 15:44:44 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 25 08:41:55 2019 +0100 [NTOS:FSTUB] Fix a clang format string warning. --- ntoskrnl/fstub/fstubex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index b9be7fa4e16..d3bb08accfa 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -526,7 +526,7 @@ FstubDbgGuidToString(IN PGUID Guid, OUT PCHAR String) { sprintf(String, - "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", Guid->Data1, Guid->Data2, Guid->Data3,

1 0

[reactos] 02/04: [NTOS:IO] Fix always-false condition in IoCheckEaBufferValidity.
by Thomas Faber 25 Mar '19

25 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57225adaac5d6dae53dd5… commit 57225adaac5d6dae53dd5b9d2b832a0ace73187b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 24 16:10:33 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 25 08:41:51 2019 +0100 [NTOS:IO] Fix always-false condition in IoCheckEaBufferValidity. Spotted by clang. --- ntoskrnl/io/iomgr/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/util.c b/ntoskrnl/io/iomgr/util.c index 5005e182089..bd7fdde85dc 100644 --- a/ntoskrnl/io/iomgr/util.c +++ b/ntoskrnl/io/iomgr/util.c @@ -251,7 +251,7 @@ IoCheckEaBufferValidity(IN PFILE_FULL_EA_INFORMATION EaBuffer, /* Compute the remaining bits */ EaLength -= NextEntryOffset; /* We must have bits left */ - if (EaLength < 0) + if ((LONG)EaLength < 0) { goto FailPath; }

1 0

[reactos] 01/04: [NTOS:KDBG] Fix uninitialized variable usage.
by Thomas Faber 25 Mar '19

25 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=faaf2dc0e641d9360ca57… commit faaf2dc0e641d9360ca57fd0787fbfdbc65eaa04 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 24 10:43:53 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 25 08:41:44 2019 +0100 [NTOS:KDBG] Fix uninitialized variable usage. Spotted by clang. --- ntoskrnl/ex/handle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index 76dcbfcff96..1851d56b094 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -1297,7 +1297,8 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) PHANDLE_TABLE HandleTable; POBJECT_HEADER ObjectHeader; PHANDLE_TABLE_ENTRY TableEntry; - ULONG NeededLength, NameLength; + ULONG NeededLength = 0; + ULONG NameLength; PCM_KEY_CONTROL_BLOCK Kcb, CurrentKcb; POBJECT_HEADER_NAME_INFO ObjectNameInfo;

1 0

[reactos] 01/01: [SYSDM] Add the 'Copy to' dialog and move the 'Change Profile Type' dialog a little.
by Eric Kohl 24 Mar '19

24 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a2911d7d85cb4b3c24d5… commit 5a2911d7d85cb4b3c24d5d927858299f26a613d3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 25 00:19:58 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 25 00:19:58 2019 +0100 [SYSDM] Add the 'Copy to' dialog and move the 'Change Profile Type' dialog a little. --- dll/cpl/sysdm/lang/bg-BG.rc | 17 +++- dll/cpl/sysdm/lang/cs-CZ.rc | 17 +++- dll/cpl/sysdm/lang/da-DK.rc | 17 +++- dll/cpl/sysdm/lang/de-DE.rc | 17 +++- dll/cpl/sysdm/lang/el-GR.rc | 17 +++- dll/cpl/sysdm/lang/en-US.rc | 17 +++- dll/cpl/sysdm/lang/es-ES.rc | 17 +++- dll/cpl/sysdm/lang/fr-FR.rc | 39 ++++++--- dll/cpl/sysdm/lang/he-IL.rc | 17 +++- dll/cpl/sysdm/lang/hu-HU.rc | 17 +++- dll/cpl/sysdm/lang/id-ID.rc | 17 +++- dll/cpl/sysdm/lang/it-IT.rc | 17 +++- dll/cpl/sysdm/lang/ja-JP.rc | 17 +++- dll/cpl/sysdm/lang/nl-NL.rc | 17 +++- dll/cpl/sysdm/lang/no-NO.rc | 17 +++- dll/cpl/sysdm/lang/pl-PL.rc | 17 +++- dll/cpl/sysdm/lang/ro-RO.rc | 17 +++- dll/cpl/sysdm/lang/ru-RU.rc | 17 +++- dll/cpl/sysdm/lang/sk-SK.rc | 17 +++- dll/cpl/sysdm/lang/sq-AL.rc | 17 +++- dll/cpl/sysdm/lang/sv-SE.rc | 17 +++- dll/cpl/sysdm/lang/tr-TR.rc | 17 +++- dll/cpl/sysdm/lang/uk-UA.rc | 17 +++- dll/cpl/sysdm/lang/zh-CN.rc | 17 +++- dll/cpl/sysdm/lang/zh-TW.rc | 17 +++- dll/cpl/sysdm/resource.h | 8 ++ dll/cpl/sysdm/userprofile.c | 190 +++++++++++++++++++++++++++++++------------- 27 files changed, 554 insertions(+), 91 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index baede2efb2a..bd3a5bc9fe9 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Пускане и възстановяване" diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index da662b15539..f16ccb3d5cb 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -170,7 +170,7 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -182,6 +182,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Spuštění a zotavení" diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 1aae2813cc7..21ceef5ba63 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Fortryd", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Opstart og Gendannelse" diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index a1cddac197e..29f5d06ff00 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Profiltyp ändern" FONT 8, "MS Shell Dlg" @@ -186,6 +186,21 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kopieren nach" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Profil kopieren nach", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Durchsuchen", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Benutzer", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "Ä&ndern", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Starten und Wiederherstellen" diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 8b1ac79e06e..d8552a3a7f7 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Άκυρο", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Εκκίνηση και αποκατάσταση" diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 4d75aa16f34..02941a12319 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Startup and Recovery" diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 89c773a83be..1f8f58c1b9b 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inicio y recuperación" diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index db30145b1c2..7661696d665 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -146,18 +146,6 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 196, 24, 50, 14 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Change Profile Type" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 - AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 - AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 - DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 -END - IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Profils Utilisateurs" @@ -177,6 +165,33 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Démarrage et Récupération" diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 16fd5388f1b..057a008bab3 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "הפעלה ושחזור" diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 99e02ffc9cb..ef2ee19adfc 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "Mégsem", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Indítás és helyreállítás" diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index d873b96055e..4c0f1bc5a8b 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Startup and Recovery" diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 33a0fe8bd91..f11d4b13eb1 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Avvio e recupero" diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 5eadab04e68..c992ae20241 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 9, "MS UI Gothic" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "起動と回復" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 7a39ea7d5b1..601c91e8363 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Opstart- en herstelinstellingen" diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 6fb3d8a3b0c..2570df6a967 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Oppstart og gjenoppretting" diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 30d148c90a2..8242fa9ec4c 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -186,6 +186,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Uruchamianie i odzyskiwanie" diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index d08ddee1868..2a6ad877111 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -186,6 +186,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Pornire și Recuperare" diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 521d85c03d4..b9eccd4e821 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Загрузка и восстановление" diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 6e77a82f658..f478192e44b 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -185,6 +185,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Spúšťanie a obnovovanie" diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 9bf0b6f7108..1974f3ba3ce 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Fillimi dhe Shërimi" diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index ba6975fd19d..78f6de889ed 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Start och återställning" diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 34373a7d295..90f11345a26 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Başlangıç ve Kurtarma" diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 5244315769e..116cef429fb 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -185,6 +185,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Завантаження й відновлення" diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 31655dc24ce..51c5d1319e4 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -168,7 +168,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 9, "宋体" @@ -180,6 +180,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 9, "宋体" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "启动和故障恢复" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index c47d483a7f2..a5cdd973313 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -168,7 +168,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 9, "新細明體" @@ -180,6 +180,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 9, "新細明體" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "啓動和故障恢復" diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 6d9d22aff74..93d204416b5 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -110,6 +110,14 @@ #define IDC_USERPROFILE_TYPE_ROAMING 522 #define IDC_USERPROFILE_TYPE_LOCAL 523 +/* Copy user profile */ +#define IDD_USERPROFILE_COPY 530 +#define IDC_USERPROFILE_COPY_PATH 531 +#define IDC_USERPROFILE_COPY_BROWSE 532 +#define IDC_USERPROFILE_COPY_USER 533 +#define IDC_USERPROFILE_COPY_CHANGE 534 + + /* Environment variables */ #define IDD_ENVIRONMENT_VARIABLES 600 #define IDC_USER_VARIABLE_LIST 601 diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index fa59e9e534e..ff0e08ba3e7 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -69,10 +69,11 @@ done: static INT_PTR CALLBACK -UserProfileTypeDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +UserProfileTypeDlgProc( + _In_ HWND hwndDlg, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) { switch (uMsg) { @@ -142,6 +143,134 @@ ChangeUserProfileType( } +static +BOOL +DeleteUserProfile( + _In_ HWND hwndDlg) +{ + WCHAR szTitle[64], szRawText[128], szCookedText[256]; + HWND hwndListView; + LVITEM Item; + INT iSelected; + PPROFILEDATA pProfileData; + + DPRINT("DeleteUserProfile()\n"); + + hwndListView = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); + if (hwndListView == NULL) + return FALSE; + + iSelected = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED); + if (iSelected == -1) + return FALSE; + + ZeroMemory(&Item, sizeof(LVITEM)); + Item.mask = LVIF_PARAM; + Item.iItem = iSelected; + Item.iSubItem = 0; + if (!ListView_GetItem(hwndListView, &Item)) + return FALSE; + + if (Item.lParam == 0) + return FALSE; + + pProfileData = (PPROFILEDATA)Item.lParam; + if (pProfileData->bMyProfile) + return FALSE; + + LoadStringW(hApplet, IDS_USERPROFILE_CONFIRM_DELETE_TITLE, szTitle, ARRAYSIZE(szTitle)); + LoadStringW(hApplet, IDS_USERPROFILE_CONFIRM_DELETE, szRawText, ARRAYSIZE(szRawText)); + swprintf(szCookedText, szRawText, pProfileData->pszFullName); + + if (MessageBoxW(hwndDlg, + szCookedText, + szTitle, + MB_ICONQUESTION | MB_YESNO) == IDYES) + { + /* FIXME: Delete the profile here! */ + return TRUE; + } + + return FALSE; +} + + +static +INT_PTR +CALLBACK +CopyUserProfileDlgProc( + _In_ HWND hwndDlg, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + return TRUE; + + case WM_DESTROY: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + } + break; + } + + return FALSE; +} + + +static +BOOL +CopyUserProfile( + _In_ HWND hwndDlg) +{ + HWND hwndListView; + LVITEM Item; + INT iSelected; + + DPRINT("CopyUserProfile()\n"); + + hwndListView = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); + if (hwndListView == NULL) + return FALSE; + + iSelected = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED); + if (iSelected == -1) + return FALSE; + + ZeroMemory(&Item, sizeof(LVITEM)); + Item.mask = LVIF_PARAM; + Item.iItem = iSelected; + Item.iSubItem = 0; + if (!ListView_GetItem(hwndListView, &Item)) + return FALSE; + + if (Item.lParam == 0) + return FALSE; + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_USERPROFILE_COPY), + hwndDlg, + CopyUserProfileDlgProc, + (LPARAM)Item.lParam) == IDOK) + { + /* FIXME: Update the profile list view */ + return TRUE; + } + + return FALSE; +} + + static VOID SetListViewColumns( _In_ HWND hwndListView) @@ -258,6 +387,7 @@ AddUserProfile( dwState = 0; } + /* Create and fill the profile data entry */ dwProfileData = sizeof(PROFILEDATA) + ((wcslen(szNameBuffer) + 1) * sizeof(WCHAR)); pProfileData = HeapAlloc(GetProcessHeap(), @@ -467,57 +597,6 @@ OnNotify( } -static -BOOL -DeleteUserProfile( - HWND hwndDlg) -{ - WCHAR szTitle[64], szRawText[128], szCookedText[256]; - HWND hwndListView; - LVITEM Item; - INT iSelected; - PPROFILEDATA pProfileData; - - DPRINT("DeleteUserProfile()\n"); - - hwndListView = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); - if (hwndListView == NULL) - return FALSE; - - iSelected = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED); - if (iSelected == -1) - return FALSE; - - ZeroMemory(&Item, sizeof(LVITEM)); - Item.mask = LVIF_PARAM; - Item.iItem = iSelected; - Item.iSubItem = 0; - if (!ListView_GetItem(hwndListView, &Item)) - return FALSE; - - if (Item.lParam == 0) - return FALSE; - - pProfileData = (PPROFILEDATA)Item.lParam; - if (pProfileData->bMyProfile) - return FALSE; - - LoadStringW(hApplet, IDS_USERPROFILE_CONFIRM_DELETE_TITLE, szTitle, ARRAYSIZE(szTitle)); - LoadStringW(hApplet, IDS_USERPROFILE_CONFIRM_DELETE, szRawText, ARRAYSIZE(szRawText)); - swprintf(szCookedText, szRawText, pProfileData->pszFullName); - - if (MessageBoxW(hwndDlg, - szCookedText, - szTitle, - MB_ICONQUESTION | MB_YESNO) == IDNO) - return FALSE; - - /* FIXME: Delete the profile here! */ - - return TRUE; -} - - /* Property page dialog callback */ INT_PTR CALLBACK UserProfileDlgProc(HWND hwndDlg, @@ -553,6 +632,7 @@ UserProfileDlgProc(HWND hwndDlg, break; case IDC_USERPROFILE_COPY: + CopyUserProfile(hwndDlg); break; } break;

1 0

[reactos] 02/02: Fix regression with double click action
by Brock Mammen 24 Mar '19

24 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb4c9fbcf276c9ce5e169… commit fb4c9fbcf276c9ce5e16991f78754822f5699d63 Author: Brock Mammen <brockmammen(a)gmail.com> AuthorDate: Sat Mar 23 11:16:44 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 23:34:57 2019 +0100 Fix regression with double click action The double click action is now triggered by the WM_LBUTTONDBLCLK message instead of WM_NCLBUTTONDBLCLK. --- base/shell/explorer/trayclock.cpp | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index c49f154554c..8c217c8c4c9 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -97,7 +97,7 @@ private: LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); public: @@ -136,7 +136,7 @@ public: MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) - MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick) + MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClick) END_MSG_MAP() HRESULT Initialize(IN HWND hWndParent); @@ -720,23 +720,12 @@ LRESULT CTrayClockWnd::OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM return 0; } -LRESULT CTrayClockWnd::OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CTrayClockWnd::OnLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (IsWindowVisible()) { - /* We get all WM_NCLBUTTONDBLCLK for the taskbar so we need to check if it is on the clock*/ - RECT rcClock; - if (GetWindowRect(&rcClock)) - { - POINT ptClick; - ptClick.x = MAKEPOINTS(lParam).x; - ptClick.y = MAKEPOINTS(lParam).y; - if (PtInRect(&rcClock, ptClick)) - { - //FIXME: use SHRunControlPanel - ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); - } - } + //FIXME: use SHRunControlPanel + ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); } return TRUE; }

1 0

[reactos] 01/02: [EXPLORER] Add date tooltip to taskbar clock
by Brock Mammen 24 Mar '19

24 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7ad10241f12bb3760d6c… commit e7ad10241f12bb3760d6cdb73fd7077f87ce1cd3 Author: Brock Mammen <brockmammen(a)gmail.com> AuthorDate: Sat Mar 23 11:16:44 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 23:34:57 2019 +0100 [EXPLORER] Add date tooltip to taskbar clock CORE-11444 --- base/shell/explorer/trayclock.cpp | 41 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index b4e85d951c3..c49f154554c 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -51,6 +51,7 @@ class CTrayClockWnd : COLORREF textColor; RECT rcText; SYSTEMTIME LocalTime; + CTooltips m_tooltip; union { @@ -388,6 +389,31 @@ VOID CTrayClockWnd::UpdateWnd() GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh); } } + + int iDateLength = GetDateFormat(LOCALE_USER_DEFAULT, + DATE_LONGDATE, + &LocalTime, + NULL, + NULL, + 0); + if (iDateLength <= 0) + { + return; + } + + WCHAR* szDate = new WCHAR[iDateLength]; + if (GetDateFormat(LOCALE_USER_DEFAULT, + DATE_LONGDATE, + &LocalTime, + NULL, + szDate, + iDateLength) > 0) + { + m_tooltip.UpdateTipText(m_hWnd, + reinterpret_cast<UINT_PTR>(m_hWnd), + szDate); + } + delete[] szDate; } VOID CTrayClockWnd::Update() @@ -624,7 +650,8 @@ LRESULT CTrayClockWnd::OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT CTrayClockWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - return HTTRANSPARENT; + // HTCLIENT is returned to receive WM_MOUSEMOVE messages for the tooltip + return HTCLIENT; } LRESULT CTrayClockWnd::OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -635,6 +662,18 @@ LRESULT CTrayClockWnd::OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CTrayClockWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + m_tooltip.Create(m_hWnd, WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP); + + TOOLINFOW ti = { 0 }; + ti.cbSize = TTTOOLINFOW_V1_SIZE; + ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS; + ti.hwnd = m_hWnd; + ti.uId = reinterpret_cast<UINT_PTR>(m_hWnd); + ti.lpszText = NULL; + ti.lParam = NULL; + + m_tooltip.AddTool(&ti); + ResetTime(); return TRUE; }

1 0

[reactos] 02/02: [USER32] Edit: Fix caret and scroll position
by Stanislav Motylkov 24 Mar '19

24 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36230bb214e9e24d4be99… commit 36230bb214e9e24d4be99297332e697f43e4454c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Mar 18 20:12:41 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 23:26:20 2019 +0100 [USER32] Edit: Fix caret and scroll position Based on patch by JIRA contributor 'I_Kill_Bugs'. CORE-15780 --- win32ss/user/user32/controls/edit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 2f2da0f4462..790c8c32bbb 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -1135,7 +1135,11 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) x -= es->x_offset; } else +#ifdef __REACTOS__ /* CORE-15780 */ + x = (lw > 0 ? es->x_offset : x - es->x_offset); +#else x = es->x_offset; +#endif if (es->style & ES_RIGHT) x = w - (lw - x);

1 0

[reactos] 01/02: [COMCTL32] Edit: Fix caret and scroll position
by Stanislav Motylkov 24 Mar '19

24 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd7011388e10f2ad6f4ea… commit cd7011388e10f2ad6f4eac9c418223437d0a7884 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Mar 18 20:10:10 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 23:26:20 2019 +0100 [COMCTL32] Edit: Fix caret and scroll position Based on patch by JIRA contributor 'I_Kill_Bugs'. CORE-15780 --- dll/win32/comctl32/edit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index 11d1b1852ce..a6a04fe330a 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -1050,7 +1050,11 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) x -= es->x_offset; } else +#ifdef __REACTOS__ /* CORE-15780 */ + x = (lw > 0 ? es->x_offset : x - es->x_offset); +#else x = es->x_offset; +#endif if (es->style & ES_RIGHT) x = w - (lw - x);

1 0

[reactos] 02/02: [USER32] Add support for navigating a group of radio buttons using a keyboard.
by Hermès Bélusca-Maïto 24 Mar '19

24 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=048c8c1605e41600a2610… commit 048c8c1605e41600a2610c46b8d5eddca4e50c86 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 24 17:18:06 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 17:23:33 2019 +0100 [USER32] Add support for navigating a group of radio buttons using a keyboard. Import Wine commit: https://source.winehq.org/git/wine.git/commit/b1b8fb77be5dd9a8754b04b2ef9f7… "user32: Add support for navigating a group of radio buttons using a keyboard. The patch approximates the behaviour observed in the message tests but still doesn't make the message tests pass without failures. " by Dmitry Timoshkov. See bug report https://bugs.winehq.org/show_bug.cgi?id=16845 --- win32ss/user/user32/windows/dialog.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 0fc31a71fe5..4770169e99a 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -2556,8 +2556,16 @@ IsDialogMessageW( if (!(dlgCode & DLGC_WANTARROWS)) { BOOL fPrevious = (lpMsg->wParam == VK_LEFT || lpMsg->wParam == VK_UP); - HWND hwndNext = GetNextDlgGroupItem (hDlg, GetFocus(), fPrevious ); - SendMessageW( hDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); + HWND hwndNext = GetNextDlgGroupItem( hDlg, lpMsg->hwnd, fPrevious ); + if (hwndNext && SendMessageW( hwndNext, WM_GETDLGCODE, lpMsg->wParam, (LPARAM)lpMsg ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + { + SetFocus( hwndNext ); + if ((GetWindowLongW( hwndNext, GWL_STYLE ) & BS_TYPEMASK) == BS_AUTORADIOBUTTON && + SendMessageW( hwndNext, BM_GETCHECK, 0, 0 ) != BST_CHECKED) + SendMessageW( hwndNext, BM_CLICK, 1, 0 ); + } + else + SendMessageW( hDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); return TRUE; } break;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs