Ros-diffs May 2019

ros-diffs@reactos.org

17 participants
165 discussions

[reactos] 01/01: [NTOS:CM] Do not call ZwQueryObject with a zero-size buffer. CORE-15882

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f86360fdbc855aaade369… commit f86360fdbc855aaade36989295edd97653c83b8b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue May 7 13:51:06 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue May 7 13:52:50 2019 +0200 [NTOS:CM] Do not call ZwQueryObject with a zero-size buffer. CORE-15882 Actually fixes ntdll_apitest:NtLoadUnloadKey. --- ntoskrnl/config/cmhvlist.c | 7 ++++--- ntoskrnl/config/cmlazy.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/config/cmhvlist.c b/ntoskrnl/config/cmhvlist.c index b9ebb8fd4e..1925bc580f 100644 --- a/ntoskrnl/config/cmhvlist.c +++ b/ntoskrnl/config/cmhvlist.c @@ -135,6 +135,7 @@ CmpAddToHiveFileList(IN PCMHIVE Hive) UNICODE_STRING HivePath; PWCHAR FilePath; ULONG Length; + OBJECT_NAME_INFORMATION DummyNameInfo; POBJECT_NAME_INFORMATION FileNameInfo; HivePath.Buffer = NULL; @@ -175,10 +176,10 @@ CmpAddToHiveFileList(IN PCMHIVE Hive) /* Determine the right buffer size and allocate */ Status = ZwQueryObject(Hive->FileHandles[HFILE_TYPE_PRIMARY], ObjectNameInformation, - NULL, - 0, + &DummyNameInfo, + sizeof(DummyNameInfo), &Length); - if (Status != STATUS_INFO_LENGTH_MISMATCH) + if (Status != STATUS_BUFFER_OVERFLOW) { DPRINT1("CmpAddToHiveFileList: Hive file name size query failed, status = 0x%08lx\n", Status); goto Quickie; diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c index a8526e5b27..04d87a7ea1 100644 --- a/ntoskrnl/config/cmlazy.c +++ b/ntoskrnl/config/cmlazy.c @@ -279,6 +279,7 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, UNICODE_STRING FileName; PWCHAR FilePath; ULONG Length; + OBJECT_NAME_INFORMATION DummyNameInfo; POBJECT_NAME_INFORMATION FileNameInfo; PAGED_CODE(); @@ -299,10 +300,10 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, /* Determine the right buffer size and allocate */ Status = ZwQueryObject(FileAttributes->RootDirectory, ObjectNameInformation, - NULL, - 0, + &DummyNameInfo, + sizeof(DummyNameInfo), &Length); - if (Status != STATUS_INFO_LENGTH_MISMATCH) + if (Status != STATUS_BUFFER_OVERFLOW) { DPRINT1("CmpCmdHiveOpen(): Root directory handle object name size query failed, Status = 0x%08lx\n", Status); return Status;

5 years, 4 months

[reactos] 01/01: [ROSAUTOTEST] Fix and improve some log handling (#1531)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=627f0242ad0d86bed0e5d… commit 627f0242ad0d86bed0e5da7003cfe5693c85a5e7 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue May 7 08:39:52 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Tue May 7 08:39:52 2019 +0200 [ROSAUTOTEST] Fix and improve some log handling (#1531) * wmain(): Use endl instead of '\n', for 'System uptime' * wmain(): Output "[ROSAUTOTEST] " in two cases: 'System uptime' and all CSimpleException. --- modules/rostests/rosautotest/main.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/rostests/rosautotest/main.cpp b/modules/rostests/rosautotest/main.cpp index 8d6d342da9..9c728d8d49 100644 --- a/modules/rostests/rosautotest/main.cpp +++ b/modules/rostests/rosautotest/main.cpp @@ -59,8 +59,10 @@ wmain(int argc, wchar_t* argv[]) Configuration.GetSystemInformation(); Configuration.GetConfigurationFromFile(); - ss << "\n\nSystem uptime " << setprecision(2) << fixed ; - ss << ((float)GetTickCount()/1000) << " seconds\n"; + ss << endl + << endl + << "[ROSAUTOTEST] System uptime " << setprecision(2) << fixed; + ss << ((float)GetTickCount()/1000) << " seconds" << endl; StringOut(ss.str()); /* Report tests startup */ @@ -89,8 +91,11 @@ wmain(int argc, wchar_t* argv[]) } catch(CSimpleException& e) { + stringstream ss; + // e.GetMessage() must include ending '\n'. - StringOut(e.GetMessage()); + ss << "[ROSAUTOTEST] " << e.GetMessage(); + StringOut(ss.str()); } catch(CFatalException& e) {

5 years, 4 months

[reactos] 01/01: [POWERCFG] Implement the power scheme 'Save As' feature

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=535b8dda8de52d85a5ad7… commit 535b8dda8de52d85a5ad7c361524e9c100db37b6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 6 23:55:42 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 6 23:55:42 2019 +0200 [POWERCFG] Implement the power scheme 'Save As' feature CORE-12565 --- dll/cpl/powercfg/lang/bg-BG.rc | 11 +++ dll/cpl/powercfg/lang/cs-CZ.rc | 11 +++ dll/cpl/powercfg/lang/de-DE.rc | 12 +++ dll/cpl/powercfg/lang/el-GR.rc | 11 +++ dll/cpl/powercfg/lang/en-US.rc | 11 +++ dll/cpl/powercfg/lang/es-ES.rc | 11 +++ dll/cpl/powercfg/lang/fr-FR.rc | 11 +++ dll/cpl/powercfg/lang/he-IL.rc | 11 +++ dll/cpl/powercfg/lang/id-ID.rc | 11 +++ dll/cpl/powercfg/lang/it-IT.rc | 11 +++ dll/cpl/powercfg/lang/ja-JP.rc | 11 +++ dll/cpl/powercfg/lang/nl-NL.rc | 11 +++ dll/cpl/powercfg/lang/no-NO.rc | 11 +++ dll/cpl/powercfg/lang/pl-PL.rc | 11 +++ dll/cpl/powercfg/lang/ro-RO.rc | 11 +++ dll/cpl/powercfg/lang/ru-RU.rc | 11 +++ dll/cpl/powercfg/lang/sk-SK.rc | 11 +++ dll/cpl/powercfg/lang/sq-AL.rc | 11 +++ dll/cpl/powercfg/lang/th-TH.rc | 11 +++ dll/cpl/powercfg/lang/tr-TR.rc | 11 +++ dll/cpl/powercfg/lang/uk-UA.rc | 11 +++ dll/cpl/powercfg/lang/zh-CN.rc | 11 +++ dll/cpl/powercfg/lang/zh-TW.rc | 11 +++ dll/cpl/powercfg/powershemes.c | 217 +++++++++++++++++++++++++++++++++-------- dll/cpl/powercfg/resource.h | 3 + 25 files changed, 436 insertions(+), 38 deletions(-) diff --git a/dll/cpl/powercfg/lang/bg-BG.rc b/dll/cpl/powercfg/lang/bg-BG.rc index 08e2a23a79..232a3fdf1a 100644 --- a/dll/cpl/powercfg/lang/bg-BG.rc +++ b/dll/cpl/powercfg/lang/bg-BG.rc @@ -101,6 +101,17 @@ BEGIN LTEXT "Трябва да освободите дисково пространство, за да може да заспива компютърът ви. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Захранване" diff --git a/dll/cpl/powercfg/lang/cs-CZ.rc b/dll/cpl/powercfg/lang/cs-CZ.rc index 693691dd85..47dfff878b 100644 --- a/dll/cpl/powercfg/lang/cs-CZ.rc +++ b/dll/cpl/powercfg/lang/cs-CZ.rc @@ -101,6 +101,17 @@ BEGIN LTEXT "Pro funkci režim spánku musíte uvolnit místo na disku. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Možnosti napájení" diff --git a/dll/cpl/powercfg/lang/de-DE.rc b/dll/cpl/powercfg/lang/de-DE.rc index e39538f5ce..85c789a021 100644 --- a/dll/cpl/powercfg/lang/de-DE.rc +++ b/dll/cpl/powercfg/lang/de-DE.rc @@ -103,6 +103,18 @@ BEGIN LTEXT "Geben Sie Speicherplatz frei, bevor Sie den Computer in den Ruhezustand versetzen.", IDC_TOLESSFREESPACE, 10, 115, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Schema speichern" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Energieschema speichern unter:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Abbrechen", IDCANCEL, 133, 40, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLNAME_1 "Energie" diff --git a/dll/cpl/powercfg/lang/el-GR.rc b/dll/cpl/powercfg/lang/el-GR.rc index 5db1535555..a27f5fce7d 100644 --- a/dll/cpl/powercfg/lang/el-GR.rc +++ b/dll/cpl/powercfg/lang/el-GR.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "Θα πρέπει να ελευθερώσετε χώρο στο δίσκο σας πριν ο υπολογιστής σας μπορέσει αν τεθεί σε κατάσταση αδρανοποίησης. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Επιλογές Ενέργειας" diff --git a/dll/cpl/powercfg/lang/en-US.rc b/dll/cpl/powercfg/lang/en-US.rc index 3de63ad589..b37b408efa 100644 --- a/dll/cpl/powercfg/lang/en-US.rc +++ b/dll/cpl/powercfg/lang/en-US.rc @@ -101,6 +101,17 @@ BEGIN LTEXT "You must free some disk space before your computer can hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Power Options" diff --git a/dll/cpl/powercfg/lang/es-ES.rc b/dll/cpl/powercfg/lang/es-ES.rc index 1ce2f75af3..042b4d83ac 100644 --- a/dll/cpl/powercfg/lang/es-ES.rc +++ b/dll/cpl/powercfg/lang/es-ES.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "Debe liberar algo de espacio en el disco para que su equipo pueda hibernar. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Opciones de energía" diff --git a/dll/cpl/powercfg/lang/fr-FR.rc b/dll/cpl/powercfg/lang/fr-FR.rc index cd2b5be88f..5d86976625 100644 --- a/dll/cpl/powercfg/lang/fr-FR.rc +++ b/dll/cpl/powercfg/lang/fr-FR.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "Vous devez libérer de l'espace avant que votre ordinateur ne se mette en veille. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Options d'alimentation" diff --git a/dll/cpl/powercfg/lang/he-IL.rc b/dll/cpl/powercfg/lang/he-IL.rc index 6fbce224fb..595e036cc9 100644 --- a/dll/cpl/powercfg/lang/he-IL.rc +++ b/dll/cpl/powercfg/lang/he-IL.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "You must free some disk space before your computer can hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "אפשרויות צריכת חשמל" diff --git a/dll/cpl/powercfg/lang/id-ID.rc b/dll/cpl/powercfg/lang/id-ID.rc index f5f1718d1a..9478d1c45d 100644 --- a/dll/cpl/powercfg/lang/id-ID.rc +++ b/dll/cpl/powercfg/lang/id-ID.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "Anda harus membebaskan beberapa ruang disk sebelum komputer anda bisa hibernasi. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Opsi Tenaga" diff --git a/dll/cpl/powercfg/lang/it-IT.rc b/dll/cpl/powercfg/lang/it-IT.rc index be2159ea7f..119f2c8cb9 100644 --- a/dll/cpl/powercfg/lang/it-IT.rc +++ b/dll/cpl/powercfg/lang/it-IT.rc @@ -101,6 +101,17 @@ BEGIN LTEXT "Deve essere liberato dello spazio su disco prima che il computer possa essere sospeso.", IDC_TOLESSFREESPACE, 10, 129, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Opzioni di risparmio energetico" diff --git a/dll/cpl/powercfg/lang/ja-JP.rc b/dll/cpl/powercfg/lang/ja-JP.rc index 51fd7a89ac..2b2d0cd101 100644 --- a/dll/cpl/powercfg/lang/ja-JP.rc +++ b/dll/cpl/powercfg/lang/ja-JP.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "休止状態をサポートするには、ディスクの空き領域を増やす必要があります。 ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "電源オプション" diff --git a/dll/cpl/powercfg/lang/nl-NL.rc b/dll/cpl/powercfg/lang/nl-NL.rc index 7795ae4ac6..bae8278f81 100644 --- a/dll/cpl/powercfg/lang/nl-NL.rc +++ b/dll/cpl/powercfg/lang/nl-NL.rc @@ -101,6 +101,17 @@ BEGIN LTEXT "U heeft onvoldoende schijfruimte om slaapstand in te schakelen. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Energie opties" diff --git a/dll/cpl/powercfg/lang/no-NO.rc b/dll/cpl/powercfg/lang/no-NO.rc index e2b03d65b4..891f4e9de8 100644 --- a/dll/cpl/powercfg/lang/no-NO.rc +++ b/dll/cpl/powercfg/lang/no-NO.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "Du trenger ledig plass før din datamaskin kan gå i dvalemodus. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Strømvalg" diff --git a/dll/cpl/powercfg/lang/pl-PL.rc b/dll/cpl/powercfg/lang/pl-PL.rc index 99f7fa8be3..de7cb29f38 100644 --- a/dll/cpl/powercfg/lang/pl-PL.rc +++ b/dll/cpl/powercfg/lang/pl-PL.rc @@ -109,6 +109,17 @@ BEGIN LTEXT "Musisz zwolnić więcej miejsca na dysku przed przejściem w stan hibernacji. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Opcje zasilania" diff --git a/dll/cpl/powercfg/lang/ro-RO.rc b/dll/cpl/powercfg/lang/ro-RO.rc index 91d767fe02..a24f6f06c0 100644 --- a/dll/cpl/powercfg/lang/ro-RO.rc +++ b/dll/cpl/powercfg/lang/ro-RO.rc @@ -106,6 +106,17 @@ BEGIN LTEXT "Este necesar mai mult spațiu liber pe dispozitivul de stocare înainte de a putea activa funcționalitatea de hibernare.", IDC_TOLESSFREESPACE, 15, 135, 224, 30 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Alimentare" diff --git a/dll/cpl/powercfg/lang/ru-RU.rc b/dll/cpl/powercfg/lang/ru-RU.rc index 2f33e3156b..4877cf2573 100644 --- a/dll/cpl/powercfg/lang/ru-RU.rc +++ b/dll/cpl/powercfg/lang/ru-RU.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "Для возможности перехода в спящий режим требуется освободить место на диске.", IDC_TOLESSFREESPACE, 10, 127, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Электропитание" diff --git a/dll/cpl/powercfg/lang/sk-SK.rc b/dll/cpl/powercfg/lang/sk-SK.rc index 1fad264770..f52c6c39e2 100644 --- a/dll/cpl/powercfg/lang/sk-SK.rc +++ b/dll/cpl/powercfg/lang/sk-SK.rc @@ -109,6 +109,17 @@ BEGIN LTEXT "Pred prechodom počítača do režimu dlhodobého spánku, musíte uvoľniť časť miesta na disku.", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Možnosti napájania" diff --git a/dll/cpl/powercfg/lang/sq-AL.rc b/dll/cpl/powercfg/lang/sq-AL.rc index 19cd847868..2859e71e66 100644 --- a/dll/cpl/powercfg/lang/sq-AL.rc +++ b/dll/cpl/powercfg/lang/sq-AL.rc @@ -106,6 +106,17 @@ BEGIN LTEXT "Ju duhet të lironi një hapësirë në disk para se kompjuteri juaj mund të hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Opsionet e energjisë" diff --git a/dll/cpl/powercfg/lang/th-TH.rc b/dll/cpl/powercfg/lang/th-TH.rc index 7bed2d3467..c5a8979e2d 100644 --- a/dll/cpl/powercfg/lang/th-TH.rc +++ b/dll/cpl/powercfg/lang/th-TH.rc @@ -101,6 +101,17 @@ BEGIN LTEXT "You must free some disk space before your computer can hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "ตัวเลือกค่าพลังงาน" diff --git a/dll/cpl/powercfg/lang/tr-TR.rc b/dll/cpl/powercfg/lang/tr-TR.rc index bd6c81844f..c1209bd8d3 100644 --- a/dll/cpl/powercfg/lang/tr-TR.rc +++ b/dll/cpl/powercfg/lang/tr-TR.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "Bilgisayarınız anıkta bekleyebilmeden önce biraz disk alanı oluşturmalısınız.", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Güç Seçenekleri" diff --git a/dll/cpl/powercfg/lang/uk-UA.rc b/dll/cpl/powercfg/lang/uk-UA.rc index 488c42f468..91d7eb2f53 100644 --- a/dll/cpl/powercfg/lang/uk-UA.rc +++ b/dll/cpl/powercfg/lang/uk-UA.rc @@ -109,6 +109,17 @@ BEGIN LTEXT "Перед переведенням комп'ютера до сплячого режиму слід звільнити місце на диску. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "Електроживлення" diff --git a/dll/cpl/powercfg/lang/zh-CN.rc b/dll/cpl/powercfg/lang/zh-CN.rc index 43155283b9..1257571f99 100644 --- a/dll/cpl/powercfg/lang/zh-CN.rc +++ b/dll/cpl/powercfg/lang/zh-CN.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "在计算机进入休眠之前，您必须释放一些磁盘空间。", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "电源选项" diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc index cf8c9e2e2c..34e83fd26e 100644 --- a/dll/cpl/powercfg/lang/zh-TW.rc +++ b/dll/cpl/powercfg/lang/zh-TW.rc @@ -103,6 +103,17 @@ BEGIN LTEXT "在電腦進入休眠之前，您必須釋放一些磁碟空間。", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END +IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 +END + STRINGTABLE BEGIN IDS_CPLNAME_1 "電源選項" diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index c237a21368..56c9ae1f3f 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -26,9 +26,18 @@ typedef struct _POWER_SCHEMES_PAGE_DATA { LIST_ENTRY PowerSchemesList; PPOWER_SCHEME pActivePowerScheme; + PPOWER_SCHEME pSelectedPowerScheme; } POWER_SCHEMES_PAGE_DATA, *PPOWER_SCHEMES_PAGE_DATA; +typedef struct _SAVE_POWER_SCHEME_DATA +{ + PPOWER_SCHEMES_PAGE_DATA pPageData; + PPOWER_SCHEME pNewScheme; + HWND hwndPage; +} SAVE_POWER_SCHEME_DATA, *PSAVE_POWER_SCHEME_DATA; + + UINT Sec[]= { 60, @@ -51,7 +60,7 @@ UINT Sec[]= static -BOOL +PPOWER_SCHEME AddPowerScheme( PPOWER_SCHEMES_PAGE_DATA pPageData, UINT uId, @@ -68,7 +77,7 @@ AddPowerScheme( HEAP_ZERO_MEMORY, sizeof(POWER_SCHEME)); if (pScheme == NULL) - return FALSE; + return NULL; pScheme->uId = uId; CopyMemory(&pScheme->PowerPolicy, pp, sizeof(POWER_POLICY)); @@ -108,9 +117,10 @@ done: HeapFree(GetProcessHeap(), 0, pScheme->pszDescription); HeapFree(GetProcessHeap(), 0, pScheme); + pScheme = NULL; } - return bResult; + return pScheme; } @@ -187,6 +197,7 @@ DestroySchemesList( } pPageData->pActivePowerScheme = NULL; + pPageData->pSelectedPowerScheme = NULL; } @@ -291,29 +302,34 @@ static VOID LoadConfig( HWND hwndDlg, - PPOWER_SCHEMES_PAGE_DATA pPageData) + PPOWER_SCHEMES_PAGE_DATA pPageData, + PPOWER_SCHEME pScheme) { - PPOWER_SCHEME pScheme; INT i = 0, iCurSel = 0; TCHAR szTemp[MAX_PATH]; TCHAR szConfig[MAX_PATH]; PPOWER_POLICY pp; - iCurSel = (INT)SendDlgItemMessage(hwndDlg, - IDC_ENERGYLIST, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - return; + if (pScheme == NULL) + { + iCurSel = (INT)SendDlgItemMessage(hwndDlg, + IDC_ENERGYLIST, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + return; + + pScheme = (PPOWER_SCHEME)SendDlgItemMessage(hwndDlg, + IDC_ENERGYLIST, + CB_GETITEMDATA, + (WPARAM)iCurSel, + 0); + if (pScheme == (PPOWER_SCHEME)CB_ERR) + return; + } - pScheme = (PPOWER_SCHEME)SendDlgItemMessage(hwndDlg, - IDC_ENERGYLIST, - CB_GETITEMDATA, - (WPARAM)iCurSel, - 0); - if (pScheme == (PPOWER_SCHEME)CB_ERR) - return; + pPageData->pSelectedPowerScheme = pScheme; if (LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) { @@ -493,23 +509,9 @@ Pos_SaveData( PPOWER_SCHEMES_PAGE_DATA pPageData) { PPOWER_SCHEME pScheme; - INT iCurSel, tmp; + INT tmp; - iCurSel = (INT)SendDlgItemMessage(hwndDlg, - IDC_ENERGYLIST, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - return; - - pScheme = (PPOWER_SCHEME)SendDlgItemMessage(hwndDlg, - IDC_ENERGYLIST, - CB_GETITEMDATA, - (WPARAM)iCurSel, - 0); - if (pScheme == (PPOWER_SCHEME)CB_ERR) - return; + pScheme = pPageData->pSelectedPowerScheme; tmp = (INT)SendDlgItemMessage(hwndDlg, IDC_MONITORACLIST, CB_GETCURSEL, @@ -637,7 +639,7 @@ DelScheme( if (iCurSel != CB_ERR) SendMessage(hList, CB_SETCURSEL, iCurSel, 0); - LoadConfig(hwnd, pPageData); + LoadConfig(hwnd, pPageData, NULL); return TRUE; } @@ -645,6 +647,144 @@ DelScheme( } +static +BOOL +SavePowerScheme( + HWND hwndDlg, + PSAVE_POWER_SCHEME_DATA pSaveSchemeData) +{ + PPOWER_SCHEMES_PAGE_DATA pPageData; + PPOWER_SCHEME pScheme; + TCHAR szSchemeName[512]; + BOOL bRet = FALSE; + + pPageData = pSaveSchemeData->pPageData; + + GetDlgItemText(hwndDlg, IDC_SCHEMENAME, szSchemeName, ARRAYSIZE(szSchemeName)); + + pScheme = AddPowerScheme(pPageData, + -1, + (_tcslen(szSchemeName) + 1) * sizeof(TCHAR), + szSchemeName, + sizeof(TCHAR), + TEXT(""), + &pPageData->pSelectedPowerScheme->PowerPolicy); + if (pScheme != NULL) + { + if (WritePwrScheme(&pScheme->uId, + pScheme->pszName, + pScheme->pszDescription, + &pScheme->PowerPolicy)) + { + pSaveSchemeData->pNewScheme = pScheme; + bRet = TRUE; + } + else + { + DeletePowerScheme(pScheme); + } + } + + return bRet; +} + + +INT_PTR +CALLBACK +SaveSchemeDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PSAVE_POWER_SCHEME_DATA pSaveSchemeData; + + pSaveSchemeData = (PSAVE_POWER_SCHEME_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pSaveSchemeData = (PSAVE_POWER_SCHEME_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSaveSchemeData); + + SetDlgItemText(hwndDlg, + IDC_SCHEMENAME, + pSaveSchemeData->pPageData->pSelectedPowerScheme->pszName); + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, SavePowerScheme(hwndDlg, pSaveSchemeData)); + break; + + case IDCANCEL: + EndDialog(hwndDlg, FALSE); + break; + } + break; + } + + return FALSE; +} + + +static +VOID +SaveScheme( + HWND hwndDlg, + PPOWER_SCHEMES_PAGE_DATA pPageData) +{ + SAVE_POWER_SCHEME_DATA SaveSchemeData; + POWER_POLICY BackupPowerPolicy; + HWND hwndList; + INT index; + + SaveSchemeData.pPageData = pPageData; + SaveSchemeData.pNewScheme = NULL; + SaveSchemeData.hwndPage = hwndDlg; + + CopyMemory(&BackupPowerPolicy, + &pPageData->pSelectedPowerScheme->PowerPolicy, + sizeof(POWER_POLICY)); + + Pos_SaveData(hwndDlg, pPageData); + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_SAVEPOWERSCHEME), + hwndDlg, + SaveSchemeDlgProc, + (LPARAM)&SaveSchemeData)) + { + if (SaveSchemeData.pNewScheme) + { + hwndList = GetDlgItem(hwndDlg, IDC_ENERGYLIST); + + index = (INT)SendMessage(hwndList, + CB_ADDSTRING, + 0, + (LPARAM)SaveSchemeData.pNewScheme->pszName); + if (index != CB_ERR) + { + SendMessage(hwndList, + CB_SETITEMDATA, + index, + (LPARAM)SaveSchemeData.pNewScheme); + + SendMessage(hwndList, CB_SETCURSEL, (WPARAM)index, 0); + + LoadConfig(hwndDlg, pPageData, SaveSchemeData.pNewScheme); + } + } + } + + CopyMemory(&pPageData->pSelectedPowerScheme->PowerPolicy, + &BackupPowerPolicy, + sizeof(POWER_POLICY)); +} + + static BOOL CreateEnergyList( HWND hwndDlg, @@ -716,7 +856,7 @@ CreateEnergyList( (LPARAM)pScheme->pszName); pPageData->pActivePowerScheme = pScheme; - LoadConfig(hwndDlg, pPageData); + LoadConfig(hwndDlg, pPageData, pScheme); } ListEntry = ListEntry->Flink; @@ -785,7 +925,7 @@ PowerSchemesDlgProc( case IDC_ENERGYLIST: if (HIWORD(wParam) == CBN_SELCHANGE) { - LoadConfig(hwndDlg, pPageData); + LoadConfig(hwndDlg, pPageData, NULL); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -795,6 +935,7 @@ PowerSchemesDlgProc( break; case IDC_SAVEAS_BTN: + SaveScheme(hwndDlg, pPageData); break; case IDC_MONITORACLIST: diff --git a/dll/cpl/powercfg/resource.h b/dll/cpl/powercfg/resource.h index e6f5d6574f..7227bd8d2b 100644 --- a/dll/cpl/powercfg/resource.h +++ b/dll/cpl/powercfg/resource.h @@ -107,6 +107,9 @@ #define IDC_DELETE_BTN 504 #define IDC_SAVEAS_BTN 505 +#define IDD_SAVEPOWERSCHEME 75 +#define IDC_SCHEMENAME 620 + #define IDS_ALPERTLOWENERGY 715 #define IDS_ALPERTCRITICLEENERGY 716 #define IDS_CRITCLENERGY 717

5 years, 4 months

[reactos] 01/01: [POWERCFG] Do not call other pages init routines when the hibernate setting changes. This will be fixed later.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af14108ee2b516180a49a… commit af14108ee2b516180a49a31d06098738cf94f22c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 6 23:38:17 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 6 23:39:09 2019 +0200 [POWERCFG] Do not call other pages init routines when the hibernate setting changes. This will be fixed later. --- dll/cpl/powercfg/hibernate.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dll/cpl/powercfg/hibernate.c b/dll/cpl/powercfg/hibernate.c index 38ac05bc4b..b82cf09450 100644 --- a/dll/cpl/powercfg/hibernate.c +++ b/dll/cpl/powercfg/hibernate.c @@ -11,8 +11,8 @@ #include "powercfg.h" -BOOLEAN Pos_InitData(); -void Adv_InitDialog(); +//BOOLEAN Pos_InitData(); +//void Adv_InitDialog(); static VOID @@ -75,8 +75,9 @@ Hib_SaveData(HWND hwndDlg) if (CallNtPowerInformation(SystemReserveHiberFile, &bHibernate, sizeof(bHibernate), NULL, 0) == STATUS_SUCCESS) { - Pos_InitData(); - Adv_InitDialog(); + // FIXME: Do not call these functions directly! Post a message to the other pages instead! + // Pos_InitData(); + // Adv_InitDialog(); Hib_InitDialog(hwndDlg); return TRUE; }

5 years, 4 months

[reactos] 01/01: [DDK][PSDK] Added the rest of the defines for netkvm

by Benjamin Aerni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3da616a918cab6ba62f13… commit 3da616a918cab6ba62f13571d3c60f882405b076 Author: Benjamin Aerni <daprogramerforbatch(a)gmail.com> AuthorDate: Sun May 5 22:34:58 2019 -0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 6 23:11:45 2019 +0200 [DDK][PSDK] Added the rest of the defines for netkvm --- sdk/include/psdk/ntddndis.h | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/sdk/include/psdk/ntddndis.h b/sdk/include/psdk/ntddndis.h index b8b63cdc10..0ccdfa5309 100644 --- a/sdk/include/psdk/ntddndis.h +++ b/sdk/include/psdk/ntddndis.h @@ -316,7 +316,19 @@ typedef ULONG NDIS_OID, *PNDIS_OID; #define OID_802_11_PRIVACY_FILTER 0x0D010119 #define OID_802_11_BSSID_LIST_SCAN 0x0D01011A #define OID_802_11_WEP_STATUS 0x0D01011B +/* New name is supposed to better reflect the extended set of encryption status */ +#define OID_802_11_ENCRYPTION_STATUS OID_802_11_WEP_STATUS #define OID_802_11_RELOAD_DEFAULTS 0x0D01011C +/* Allows key mapping and default keys */ +#define OID_802_11_ADD_KEY 0x0D01011D +#define OID_802_11_REMOVE_KEY 0x0D01011E +#define OID_802_11_ASSOCIATION_INFORMATION 0x0D01011F +#define OID_802_11_TEST 0x0D010120 +#define OID_802_11_MEDIA_STREAM_MODE 0x0D010121 +#define OID_802_11_CAPABILITY 0x0D010122 +#define OID_802_11_PMKID 0x0D010123 +#define OID_802_11_NON_BCAST_SSID_LIST 0x0D010124 +#define OID_802_11_RADIO_STATUS 0x0D010125 /* PnP and Power Management (PM) OIDs */ #define OID_PNP_CAPABILITIES 0xFD010100 @@ -331,6 +343,36 @@ typedef ULONG NDIS_OID, *PNDIS_OID; #define OID_PNP_WAKE_UP_OK 0xFD020200 #define OID_PNP_WAKE_UP_ERROR 0xFD020201 +/* TCP and IP OIDs */ +#define OID_TCP_TASK_OFFLOAD 0xFC010201 +#define OID_TCP_TASK_IPSEC_ADD_SA 0xFC010202 +#define OID_TCP_TASK_IPSEC_DELETE_SA 0xFC010203 +#define OID_TCP_SAN_SUPPORT 0xFC010204 +#define OID_TCP_TASK_IPSEC_ADD_UDPESP_SA 0xFC010205 +#define OID_TCP_TASK_IPSEC_DELETE_UDPESP_SA 0xFC010206 +#define OID_TCP4_OFFLOAD_STATS 0xFC010207 +#define OID_TCP6_OFFLOAD_STATS 0xFC010208 +#define OID_IP4_OFFLOAD_STATS 0xFC010209 +#define OID_IP6_OFFLOAD_STATS 0xFC01020A + +/* New NDIS 6 offload OIDs */ +#define OID_TCP_OFFLOAD_CURRENT_CONFIG 0xFC01020B /* NDIS 5 handled. Query only */ +#define OID_TCP_OFFLOAD_PARAMETERS 0xFC01020C /* Set only */ +#define OID_TCP_OFFLOAD_HARDWARE_CAPABILITIES 0xFC01020D /* Query only */ +#define OID_TCP_CONNECTION_OFFLOAD_CURRENT_CONFIG 0xFC01020E /* Query only */ +#define OID_TCP_CONNECTION_OFFLOAD_HARDWARE_CAPABILITIES 0xFC01020F /* Query only */ +#define OID_OFFLOAD_ENCAPSULATION 0x0101010A + +/* Obsolete FFP defines */ +#define OID_FFP_SUPPORT 0xFC010210 +#define OID_FFP_FLUSH 0xFC010211 +#define OID_FFP_CONTROL 0xFC010212 +#define OID_FFP_PARAMS 0xFC010213 +#define OID_FFP_DATA 0xFC010214 + +#define OID_FFP_DRIVER_STATS 0xFC020210 +#define OID_FFP_ADAPTER_STATS 0xFC020211 + /* OID_GEN_MINIPORT_INFO constants */ #define NDIS_MINIPORT_BUS_MASTER 0x00000001 #define NDIS_MINIPORT_WDM_DRIVER 0x00000002 @@ -358,6 +400,16 @@ typedef ULONG NDIS_OID, *PNDIS_OID; #define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS 0x00800000 #define NDIS_MINIPORT_64BITS_DMA 0x01000000 +/* Full duplex driver */ +#define NDIS_MAC_OPTION_FULL_DUPLEX 0x00000010 /* Deprecated flag */ + +#define NDIS_MAC_OPTION_EOTX_INDICATION 0x00000020 +#define NDIS_MAC_OPTION_8021P_PRIORITY 0x00000040 +#define NDIS_MAC_OPTION_SUPPORTS_MAC_ADRESS_OVERWRITE 0x00000080 +#define NDIS_MAC_OPTION_RECEIVE_AT_DPC 0x00000100 +#define NDIS_MAC_OPTION_8021Q_VLAN 0x00000200 +#define NDIS_MAC_OPTION_RESERVED 0x80000000 + #define IOCTL_NDIS_QUERY_GLOBAL_STATS CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, \ 0, \ METHOD_OUT_DIRECT, \

5 years, 4 months

[reactos] 01/01: [DDK][PSDK] Add some missing NDIS definitions/types. Caught by Benjamin Aerni.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a67dfd191b606fdc7eeb… commit 6a67dfd191b606fdc7eeb25213133b3aa3414bb6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 5 23:18:45 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 5 23:19:53 2019 +0200 [DDK][PSDK] Add some missing NDIS definitions/types. Caught by Benjamin Aerni. --- sdk/include/ddk/ndis.h | 20 +++++++++++++++++++- sdk/include/ddk/netpnp.h | 7 ------- sdk/include/psdk/ntddndis.h | 13 +++++++++++++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/sdk/include/ddk/ndis.h b/sdk/include/ddk/ndis.h index 028dd1f49b..916ba98e55 100644 --- a/sdk/include/ddk/ndis.h +++ b/sdk/include/ddk/ndis.h @@ -986,7 +986,6 @@ typedef NTSTATUS typedef struct _OID_LIST OID_LIST, *POID_LIST; /* PnP state */ - typedef enum _NDIS_PNP_DEVICE_STATE { NdisPnPDeviceAdded, NdisPnPDeviceStarted, @@ -997,6 +996,25 @@ typedef enum _NDIS_PNP_DEVICE_STATE { NdisPnPDeviceSurpriseRemoved } NDIS_PNP_DEVICE_STATE; +typedef enum _NDIS_DEVICE_PNP_EVENT { + NdisDevicePnPEventQueryRemoved, + NdisDevicePnPEventRemoved, + NdisDevicePnPEventSurpriseRemoved, + NdisDevicePnPEventQueryStopped, + NdisDevicePnPEventStopped, + NdisDevicePnPEventPowerProfileChanged, +#if NDIS_SUPPORT_NDIS6 + NdisDevicePnPEventFilterListChanged, +#endif /* NDIS_SUPPORT_NDIS6 */ + NdisDevicePnPEventMaximum +} NDIS_DEVICE_PNP_EVENT, *PNDIS_DEVICE_PNP_EVENT; + +/* Power profiles */ +typedef enum _NDIS_POWER_PROFILE { + NdisPowerProfileBattery, + NdisPowerProfileAcOnLine +} NDIS_POWER_PROFILE, *PNDIS_POWER_PROFILE; + #define NDIS_DEVICE_NOT_STOPPABLE 0x00000001 #define NDIS_DEVICE_NOT_REMOVEABLE 0x00000002 #define NDIS_DEVICE_NOT_SUSPENDABLE 0x00000004 diff --git a/sdk/include/ddk/netpnp.h b/sdk/include/ddk/netpnp.h index a7fb0ef483..4db2f63a6f 100644 --- a/sdk/include/ddk/netpnp.h +++ b/sdk/include/ddk/netpnp.h @@ -37,10 +37,3 @@ typedef struct _NET_PNP_EVENT { ULONG_PTR TdiReserved[4]; ULONG_PTR TdiClientReserved[4]; } NET_PNP_EVENT, *PNET_PNP_EVENT; - -/* FIXME : This belongs to ndis.h */ -typedef enum _NDIS_DEVICE_PNP_EVENT { - NdisDevicePnPEventSurpriseRemoved, - NdisDevicePnPEventPowerProfileChanged, - NdisDevicePnPEventMaximum -} NDIS_DEVICE_PNP_EVENT, *PNDIS_DEVICE_PNP_EVENT; diff --git a/sdk/include/psdk/ntddndis.h b/sdk/include/psdk/ntddndis.h index 720eeeec86..b8b63cdc10 100644 --- a/sdk/include/psdk/ntddndis.h +++ b/sdk/include/psdk/ntddndis.h @@ -318,6 +318,19 @@ typedef ULONG NDIS_OID, *PNDIS_OID; #define OID_802_11_WEP_STATUS 0x0D01011B #define OID_802_11_RELOAD_DEFAULTS 0x0D01011C +/* PnP and Power Management (PM) OIDs */ +#define OID_PNP_CAPABILITIES 0xFD010100 +#define OID_PNP_SET_POWER 0xFD010101 +#define OID_PNP_QUERY_POWER 0xFD010102 +#define OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103 +#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 +#define OID_PNP_WAKE_UP_PATTERN_LIST 0xFD010105 +#define OID_PNP_ENABLE_WAKE_UP 0xFD010106 + +/* Optional PnP/PM statistics OIDs */ +#define OID_PNP_WAKE_UP_OK 0xFD020200 +#define OID_PNP_WAKE_UP_ERROR 0xFD020201 + /* OID_GEN_MINIPORT_INFO constants */ #define NDIS_MINIPORT_BUS_MASTER 0x00000001 #define NDIS_MINIPORT_WDM_DRIVER 0x00000002

5 years, 4 months

[reactos] 01/01: [POWERCFG] Fix power scheme deletion

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1dcf8376f003ec8b6378a… commit 1dcf8376f003ec8b6378ad22be6b6f58d7697a15 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 5 22:48:53 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 5 22:48:53 2019 +0200 [POWERCFG] Fix power scheme deletion CORE-12566, CORE-12567 --- dll/cpl/powercfg/powershemes.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index d68af58f3d..c237a21368 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -591,8 +591,11 @@ Pos_SaveData( } -static BOOL -DelScheme(HWND hwnd) +static +BOOL +DelScheme( + HWND hwnd, + PPOWER_SCHEMES_PAGE_DATA pPageData) { WCHAR szTitleBuffer[256]; WCHAR szRawBuffer[256], szCookedBuffer[512]; @@ -618,16 +621,24 @@ DelScheme(HWND hwnd) if (MessageBoxW(hwnd, szCookedBuffer, szTitleBuffer, MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) { - UINT Current; - - if (GetActivePwrScheme(&Current)) + if (!DeletePwrScheme(pScheme->uId)) { - SendMessage(hList, CB_SETCURSEL, (WPARAM)0, 0); - SendMessage(hList, CB_DELETESTRING, (WPARAM)iCurSel, 0); + // FIXME: Show an error message box + return FALSE; } - if (DeletePwrScheme(pScheme->uId) != 0) - return TRUE; + iCurSel = SendMessage(hList, CB_FINDSTRING, -1, (LPARAM)pScheme->pszName); + if (iCurSel != CB_ERR) + SendMessage(hList, CB_DELETESTRING, iCurSel, 0); + + DeletePowerScheme(pScheme); + + iCurSel = SendMessage(hList, CB_FINDSTRING, -1, (LPARAM)pPageData->pActivePowerScheme->pszName); + if (iCurSel != CB_ERR) + SendMessage(hList, CB_SETCURSEL, iCurSel, 0); + + LoadConfig(hwnd, pPageData); + return TRUE; } return FALSE; @@ -780,7 +791,7 @@ PowerSchemesDlgProc( break; case IDC_DELETE_BTN: - DelScheme(hwndDlg); + DelScheme(hwndDlg, pPageData); break; case IDC_SAVEAS_BTN:

5 years, 4 months

[reactos] 01/01: [POWERCFG] Improve the error handling in AddPowerScheme() and keep track of the current power scheme.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=077dcfedb9eb3314ef202… commit 077dcfedb9eb3314ef2021344da0201ead18d933 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 5 22:01:54 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 5 22:10:00 2019 +0200 [POWERCFG] Improve the error handling in AddPowerScheme() and keep track of the current power scheme. --- dll/cpl/powercfg/powershemes.c | 81 ++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index dfebc9606e..d68af58f3d 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -51,7 +51,7 @@ UINT Sec[]= static -PPOWER_SCHEME +BOOL AddPowerScheme( PPOWER_SCHEMES_PAGE_DATA pPageData, UINT uId, @@ -62,21 +62,44 @@ AddPowerScheme( PPOWER_POLICY pp) { PPOWER_SCHEME pScheme; + BOOL bResult = FALSE; pScheme = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(POWER_SCHEME)); if (pScheme == NULL) - return NULL; + return FALSE; + + pScheme->uId = uId; + CopyMemory(&pScheme->PowerPolicy, pp, sizeof(POWER_POLICY)); + + if (dwName != 0) + { + pScheme->pszName = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwName); + if (pScheme->pszName == NULL) + goto done; + + _tcscpy(pScheme->pszName, pszName); + } + + if (dwDescription != 0) + { + pScheme->pszDescription = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwDescription); + if (pScheme->pszDescription == NULL) + goto done; - pScheme->pszName = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwName + sizeof(TCHAR)); + _tcscpy(pScheme->pszDescription, pszDescription); + } - pScheme->pszDescription = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwDescription + sizeof(TCHAR)); - if (pScheme->pszName == NULL || pScheme->pszDescription == NULL) + InsertTailList(&pPageData->PowerSchemesList, &pScheme->ListEntry); + bResult = TRUE; + +done: + if (bResult == FALSE) { if (pScheme->pszName) HeapFree(GetProcessHeap(), 0, pScheme->pszName); @@ -85,18 +108,9 @@ AddPowerScheme( HeapFree(GetProcessHeap(), 0, pScheme->pszDescription); HeapFree(GetProcessHeap(), 0, pScheme); - return NULL; } - pScheme->uId = uId; - _tcscpy(pScheme->pszName, pszName); - _tcscpy(pScheme->pszDescription, pszDescription); - - CopyMemory(&pScheme->PowerPolicy, pp, sizeof(POWER_POLICY)); - - InsertTailList(&pPageData->PowerSchemesList, &pScheme->ListEntry); - - return pScheme; + return bResult; } @@ -276,7 +290,8 @@ Pos_InitData( static VOID LoadConfig( - HWND hwndDlg) + HWND hwndDlg, + PPOWER_SCHEMES_PAGE_DATA pPageData) { PPOWER_SCHEME pScheme; INT i = 0, iCurSel = 0; @@ -374,6 +389,9 @@ LoadConfig( (LPARAM)0); } } + + EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_BTN), + (pScheme != pPageData->pActivePowerScheme)); } @@ -470,7 +488,9 @@ Pos_InitPage(HWND hwndDlg) static VOID -Pos_SaveData(HWND hwndDlg) +Pos_SaveData( + HWND hwndDlg, + PPOWER_SCHEMES_PAGE_DATA pPageData) { PPOWER_SCHEME pScheme; INT iCurSel, tmp; @@ -563,8 +583,11 @@ Pos_SaveData(HWND hwndDlg) pScheme->PowerPolicy.mach.DozeS4TimeoutDc = Sec[tmp]; } - SetActivePwrScheme(pScheme->uId, NULL, &pScheme->PowerPolicy); - LoadConfig(hwndDlg); + if (SetActivePwrScheme(pScheme->uId, NULL, &pScheme->PowerPolicy)) + { + pPageData->pActivePowerScheme = pScheme; + EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_BTN), FALSE); + } } @@ -601,8 +624,6 @@ DelScheme(HWND hwnd) { SendMessage(hList, CB_SETCURSEL, (WPARAM)0, 0); SendMessage(hList, CB_DELETESTRING, (WPARAM)iCurSel, 0); - if (Current == pScheme->uId) - Pos_SaveData(hwnd); } if (DeletePwrScheme(pScheme->uId) != 0) @@ -624,7 +645,7 @@ CreateEnergyList( POWER_POLICY pp; SYSTEM_POWER_CAPABILITIES spc; HWND hwndList; - unsigned aps = 0; + UINT aps = 0; hwndList = GetDlgItem(hwndDlg, IDC_ENERGYLIST); @@ -683,7 +704,8 @@ CreateEnergyList( TRUE, (LPARAM)pScheme->pszName); - LoadConfig(hwndDlg); + pPageData->pActivePowerScheme = pScheme; + LoadConfig(hwndDlg, pPageData); } ListEntry = ListEntry->Flink; @@ -691,7 +713,6 @@ CreateEnergyList( if (SendMessage(hwndList, CB_GETCOUNT, 0, 0) > 0) { - EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_BTN), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_SAVEAS_BTN), TRUE); } @@ -753,7 +774,7 @@ PowerSchemesDlgProc( case IDC_ENERGYLIST: if (HIWORD(wParam) == CBN_SELCHANGE) { - LoadConfig(hwndDlg); + LoadConfig(hwndDlg, pPageData); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -786,7 +807,7 @@ PowerSchemesDlgProc( LPNMHDR lpnm = (LPNMHDR)lParam; if (lpnm->code == (UINT)PSN_APPLY) { - Pos_SaveData(hwndDlg); + Pos_SaveData(hwndDlg, pPageData); } return TRUE; }

5 years, 4 months

[reactos] 01/01: [NOTEPAD] Duplicate notepad.exe in SystemRoot. CORE-16003 (#1555)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41723255597f5951d9ef4… commit 41723255597f5951d9ef4a891c9e0a96c9aa2cf1 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun May 5 20:48:37 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 5 19:48:37 2019 +0200 [NOTEPAD] Duplicate notepad.exe in SystemRoot. CORE-16003 (#1555) This is also done on Windows for backwards compatibility with Windows 3.x/9x. But, it's also used (i.e. "required") by some installers, like Doom 3 Demo installer and Battlefield 1942 Single Player Demo installer, for successful opening of their Readme file at the end of their installation! --- base/applications/notepad/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/notepad/CMakeLists.txt b/base/applications/notepad/CMakeLists.txt index 1674d83151..aa1aae6034 100644 --- a/base/applications/notepad/CMakeLists.txt +++ b/base/applications/notepad/CMakeLists.txt @@ -11,4 +11,5 @@ add_executable(notepad ${SOURCE} rsrc.rc) set_module_type(notepad win32gui UNICODE) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) add_pch(notepad notepad.h SOURCE) +add_cd_file(TARGET notepad DESTINATION reactos FOR all) add_cd_file(TARGET notepad DESTINATION reactos/system32 FOR all)

5 years, 4 months

[reactos] 01/01: [KERNEL32] Misc. fixes to DefineDosDeviceW

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=204bfa8574f187874a635… commit 204bfa8574f187874a635a40d88f11c316c6c2a9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun May 5 18:31:43 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun May 5 18:33:15 2019 +0200 [KERNEL32] Misc. fixes to DefineDosDeviceW - Add support for LUIDDeviceMapsEnabled; - Broadcast proper message in case of device removal; - Use less memory for strings management; - Make code a bit cleaner. --- dll/win32/kernel32/client/dosdev.c | 203 +++++++++++++++++++++---------------- 1 file changed, 116 insertions(+), 87 deletions(-) diff --git a/dll/win32/kernel32/client/dosdev.c b/dll/win32/kernel32/client/dosdev.c index 67fd60859d..3c569ec76e 100644 --- a/dll/win32/kernel32/client/dosdev.c +++ b/dll/win32/kernel32/client/dosdev.c @@ -244,38 +244,52 @@ DefineDosDeviceW( PCSR_CAPTURE_BUFFER CaptureBuffer; UNICODE_STRING NtTargetPathU; UNICODE_STRING DeviceNameU; - UNICODE_STRING DeviceUpcaseNameU; HANDLE hUser32; DEV_BROADCAST_VOLUME dbcv; - BOOL Result = TRUE; DWORD dwRecipients; typedef long (WINAPI *BSM_type)(DWORD, LPDWORD, UINT, WPARAM, LPARAM); BSM_type BSM_ptr; + BOOLEAN LUIDDeviceMapsEnabled; + WCHAR Letter; + WPARAM wParam; - if ( (dwFlags & 0xFFFFFFF0) || + /* Get status about local device mapping */ + LUIDDeviceMapsEnabled = BaseStaticServerData->LUIDDeviceMapsEnabled; + + /* Validate input & flags */ + if ((dwFlags & 0xFFFFFFE0) || ((dwFlags & DDD_EXACT_MATCH_ON_REMOVE) && - ! (dwFlags & DDD_REMOVE_DEFINITION)) ) + !(dwFlags & DDD_REMOVE_DEFINITION)) || + (lpTargetPath == NULL && !(dwFlags & (DDD_LUID_BROADCAST_DRIVE | DDD_REMOVE_DEFINITION))) || + ((dwFlags & DDD_LUID_BROADCAST_DRIVE) && + (lpDeviceName == NULL || lpTargetPath != NULL || dwFlags & (DDD_NO_BROADCAST_SYSTEM | DDD_EXACT_MATCH_ON_REMOVE | DDD_RAW_TARGET_PATH) || !LUIDDeviceMapsEnabled))) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + /* Initialize device unicode string to ease its use */ + RtlInitUnicodeString(&DeviceNameU, lpDeviceName); + + /* The buffer for CSR call will contain it */ + BufferSize = DeviceNameU.MaximumLength; ArgumentCount = 1; - BufferSize = 0; - if (!lpTargetPath) + + /* If we don't have target path, use empty string */ + if (lpTargetPath == NULL) { - RtlInitUnicodeString(&NtTargetPathU, - NULL); + RtlInitUnicodeString(&NtTargetPathU, NULL); } else { + /* Else, use it raw if asked to */ if (dwFlags & DDD_RAW_TARGET_PATH) { - RtlInitUnicodeString(&NtTargetPathU, - lpTargetPath); + RtlInitUnicodeString(&NtTargetPathU, lpTargetPath); } else { + /* Otherwise, use it converted */ if (!RtlDosPathNameToNtPathName_U(lpTargetPath, &NtTargetPathU, NULL, @@ -286,104 +300,119 @@ DefineDosDeviceW( return FALSE; } } + + /* This target path will be the second arg */ ArgumentCount = 2; - BufferSize += NtTargetPathU.Length; + BufferSize += NtTargetPathU.MaximumLength; } - RtlInitUnicodeString(&DeviceNameU, - lpDeviceName); - RtlUpcaseUnicodeString(&DeviceUpcaseNameU, - &DeviceNameU, - TRUE); - BufferSize += DeviceUpcaseNameU.Length; - + /* Allocate the capture buffer for our strings */ CaptureBuffer = CsrAllocateCaptureBuffer(ArgumentCount, BufferSize); - if (!CaptureBuffer) + if (CaptureBuffer == NULL) { + if (!(dwFlags & DDD_RAW_TARGET_PATH)) + { + RtlFreeUnicodeString(&NtTargetPathU); + } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); - Result = FALSE; + return FALSE; } - else - { - DefineDosDeviceRequest->Flags = dwFlags; - CsrCaptureMessageBuffer(CaptureBuffer, - DeviceUpcaseNameU.Buffer, - DeviceUpcaseNameU.Length, - (PVOID*)&DefineDosDeviceRequest->DeviceName.Buffer); + /* Set the flags */ + DefineDosDeviceRequest->Flags = dwFlags; - DefineDosDeviceRequest->DeviceName.Length = - DeviceUpcaseNameU.Length; - DefineDosDeviceRequest->DeviceName.MaximumLength = - DeviceUpcaseNameU.Length; + /* Allocate a buffer for the device name */ + DefineDosDeviceRequest->DeviceName.MaximumLength = CsrAllocateMessagePointer(CaptureBuffer, + DeviceNameU.MaximumLength, + (PVOID*)&DefineDosDeviceRequest->DeviceName.Buffer); + /* And copy it while upcasing it */ + RtlUpcaseUnicodeString(&DefineDosDeviceRequest->DeviceName, &DeviceNameU, FALSE); - if (NtTargetPathU.Buffer) - { - CsrCaptureMessageBuffer(CaptureBuffer, - NtTargetPathU.Buffer, - NtTargetPathU.Length, - (PVOID*)&DefineDosDeviceRequest->TargetPath.Buffer); - } - DefineDosDeviceRequest->TargetPath.Length = - NtTargetPathU.Length; - DefineDosDeviceRequest->TargetPath.MaximumLength = - NtTargetPathU.Length; - - CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepDefineDosDevice), - sizeof(*DefineDosDeviceRequest)); - CsrFreeCaptureBuffer(CaptureBuffer); - - if (!NT_SUCCESS(ApiMessage.Status)) + /* If we have a target path, copy it too, and free it if allocated */ + if (NtTargetPathU.Length != 0) + { + DefineDosDeviceRequest->TargetPath.MaximumLength = CsrAllocateMessagePointer(CaptureBuffer, + NtTargetPathU.MaximumLength, + (PVOID*)&DefineDosDeviceRequest->TargetPath.Buffer); + RtlCopyUnicodeString(&DefineDosDeviceRequest->TargetPath, &NtTargetPathU); + + if (!(dwFlags & DDD_RAW_TARGET_PATH)) { - WARN("CsrClientCallServer() failed (Status %lx)\n", ApiMessage.Status); - BaseSetLastNTError(ApiMessage.Status); - Result = FALSE; + RtlFreeUnicodeString(&NtTargetPathU); } - else + } + /* Otherwise, null initialize the string */ + else + { + RtlInitUnicodeString(&DefineDosDeviceRequest->TargetPath, NULL); + } + + /* Finally, call the server */ + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepDefineDosDevice), + sizeof(*DefineDosDeviceRequest)); + CsrFreeCaptureBuffer(CaptureBuffer); + + /* Return failure if any */ + if (!NT_SUCCESS(ApiMessage.Status)) + { + WARN("CsrClientCallServer() failed (Status %lx)\n", ApiMessage.Status); + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + /* Here is the success path, we will always return true */ + + /* Should broadcast the event? Only do if not denied and if drive letter */ + if (!(dwFlags & DDD_NO_BROADCAST_SYSTEM) && + DeviceNameU.Length == 2 * sizeof(WCHAR) && + DeviceNameU.Buffer[1] == L':') + { + /* Make sure letter is valid and there are no local device mappings */ + Letter = RtlUpcaseUnicodeChar(DeviceNameU.Buffer[0]) - L'A'; + if (Letter < 26 && !LUIDDeviceMapsEnabled) { - if (! (dwFlags & DDD_NO_BROADCAST_SYSTEM) && - DeviceUpcaseNameU.Length == 2 * sizeof(WCHAR) && - DeviceUpcaseNameU.Buffer[1] == L':' && - ( (DeviceUpcaseNameU.Buffer[0] - L'A') < 26 )) + /* Rely on user32 for broadcasting */ + hUser32 = LoadLibraryW(L"user32.dll"); + if (hUser32 != 0) { - hUser32 = LoadLibraryA("user32.dll"); - if (hUser32) + /* Get the function pointer */ + BSM_ptr = (BSM_type)GetProcAddress(hUser32, "BroadcastSystemMessageW"); + if (BSM_ptr) { - BSM_ptr = (BSM_type) - GetProcAddress(hUser32, "BroadcastSystemMessageW"); - if (BSM_ptr) - { - dwRecipients = BSM_APPLICATIONS; - dbcv.dbcv_size = sizeof(DEV_BROADCAST_VOLUME); - dbcv.dbcv_devicetype = DBT_DEVTYP_VOLUME; - dbcv.dbcv_reserved = 0; - dbcv.dbcv_unitmask |= - (1 << (DeviceUpcaseNameU.Buffer[0] - L'A')); - dbcv.dbcv_flags = DBTF_NET; - (void) BSM_ptr(BSF_SENDNOTIFYMESSAGE | BSF_FLUSHDISK, - &dwRecipients, - WM_DEVICECHANGE, - (WPARAM)DBT_DEVICEARRIVAL, - (LPARAM)&dbcv); - } - FreeLibrary(hUser32); + /* Set our target */ + dwRecipients = BSM_APPLICATIONS; + + /* And initialize our structure */ + dbcv.dbcv_size = sizeof(DEV_BROADCAST_VOLUME); + dbcv.dbcv_devicetype = DBT_DEVTYP_VOLUME; + dbcv.dbcv_reserved = 0; + + /* Set the volume which had the event */ + dbcv.dbcv_unitmask = 1 << Letter; + dbcv.dbcv_flags = DBTF_NET; + + /* And properly set the event (removal or arrival?) */ + wParam = (dwFlags & DDD_REMOVE_DEFINITION) ? DBT_DEVICEREMOVECOMPLETE : DBT_DEVICEARRIVAL; + + /* And broadcast! */ + BSM_ptr(BSF_SENDNOTIFYMESSAGE | BSF_FLUSHDISK, + &dwRecipients, + WM_DEVICECHANGE, + wParam, + (LPARAM)&dbcv); } + + /* We're done! */ + FreeLibrary(hUser32); } } } - if (NtTargetPathU.Buffer && - NtTargetPathU.Buffer != lpTargetPath) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - NtTargetPathU.Buffer); - } - RtlFreeUnicodeString(&DeviceUpcaseNameU); - return Result; + return TRUE; }

5 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2019