Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/01: [SNDVOL32] Add the tray volume dialog - Add the tray volume dialog (run "sndvol32 /t"). - Add a simple command line parser.
by Eric Kohl 26 Feb '18

26 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40bd09a2ce78328f70904… commit 40bd09a2ce78328f709047c420f46e0925978d8b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 25 21:58:34 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 26 00:44:41 2018 +0100 [SNDVOL32] Add the tray volume dialog - Add the tray volume dialog (run "sndvol32 /t"). - Add a simple command line parser. --- base/applications/sndvol32/CMakeLists.txt | 1 + base/applications/sndvol32/lang/bg-BG.rc | 10 +++ base/applications/sndvol32/lang/cs-CZ.rc | 10 +++ base/applications/sndvol32/lang/de-DE.rc | 10 +++ base/applications/sndvol32/lang/el-GR.rc | 10 +++ base/applications/sndvol32/lang/en-US.rc | 10 +++ base/applications/sndvol32/lang/es-ES.rc | 10 +++ base/applications/sndvol32/lang/fr-FR.rc | 10 +++ base/applications/sndvol32/lang/he-IL.rc | 10 +++ base/applications/sndvol32/lang/hu-HU.rc | 10 +++ base/applications/sndvol32/lang/id-ID.rc | 10 +++ base/applications/sndvol32/lang/it-IT.rc | 10 +++ base/applications/sndvol32/lang/ja-JP.rc | 10 +++ base/applications/sndvol32/lang/ko-KR.rc | 10 +++ base/applications/sndvol32/lang/lt-LT.rc | 10 +++ base/applications/sndvol32/lang/nl-NL.rc | 10 +++ base/applications/sndvol32/lang/no-NO.rc | 10 +++ base/applications/sndvol32/lang/pl-PL.rc | 10 +++ base/applications/sndvol32/lang/pt-BR.rc | 10 +++ base/applications/sndvol32/lang/ro-RO.rc | 10 +++ base/applications/sndvol32/lang/ru-RU.rc | 10 +++ base/applications/sndvol32/lang/sk-SK.rc | 10 +++ base/applications/sndvol32/lang/sq-AL.rc | 10 +++ base/applications/sndvol32/lang/sv-SE.rc | 10 +++ base/applications/sndvol32/lang/th-TH.rc | 10 +++ base/applications/sndvol32/lang/tr-TR.rc | 10 +++ base/applications/sndvol32/lang/uk-UA.rc | 10 +++ base/applications/sndvol32/lang/zh-CN.rc | 10 +++ base/applications/sndvol32/lang/zh-TW.rc | 10 +++ base/applications/sndvol32/resources.h | 1 + base/applications/sndvol32/sndvol32.c | 112 ++++++++++++++++++++++++------ base/applications/sndvol32/sndvol32.h | 10 +++ base/applications/sndvol32/tray.c | 71 +++++++++++++++++++ 33 files changed, 453 insertions(+), 22 deletions(-) diff --git a/base/applications/sndvol32/CMakeLists.txt b/base/applications/sndvol32/CMakeLists.txt index 3d97d129de..dd1827368a 100644 --- a/base/applications/sndvol32/CMakeLists.txt +++ b/base/applications/sndvol32/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND SOURCE misc.c mixer.c sndvol32.c + tray.c sndvol32.h) add_rc_deps(sndvol32.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/sndvol32.ico) diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index 4bd1fabfc9..6ac13cd18e 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -58,3 +58,13 @@ BEGIN CHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 190, 110, 16, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Сила", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index be0dd0c510..1ac95bcda7 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -60,3 +60,13 @@ BEGIN CHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Hlasitost", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 7d36e8d688..4df44041f7 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Lautstärke", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index 7265a3ff6c..4c8e33ca03 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index e7774a9a37..3a5e80fac6 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index 8ba4fc4efc..ef7a74eeaf 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -57,3 +57,13 @@ BEGIN CHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volumen", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index 977f1668bd..7331e0ed92 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 02bd4c6e6a..3779376bc7 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "השתק", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "עוצמה", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index 373c1d59bf..759ce74b3a 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index 3612ab0ab4..cc6327bcfc 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index 6794625ffd..3678b5bf0a 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index c57639b20d..61a7b69e1a 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "MS UI Gothic" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index 99c5c40b33..1abeb34f03 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "굴림" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index e241dc516c..7c44bf2eae 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index e89e20ec76..18e0bb2889 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index 8634227c19..ef4bde48b9 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -54,3 +54,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index 05cfbbe303..40610bbfe7 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -62,3 +62,13 @@ BEGIN CHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Głośność", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 54582e241e..146ffb6721 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index ebd21954ef..17cf0379e3 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -55,3 +55,13 @@ BEGIN CHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volum", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index 7ed361747c..b9df68910a 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Громкость", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index 8e062cf7bf..b58b95ddad 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index ee3089fc02..ac94cdb36d 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -58,3 +58,13 @@ BEGIN CHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volumi", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index f0159ef455..1695b69b1f 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volyme", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index 90f19d40f3..b8ab88c434 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -62,3 +62,13 @@ BEGIN CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 300c24ca77..ae98afc4cb 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Ses Düzeyi", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index f5001c526b..19270442c7 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -62,3 +62,13 @@ BEGIN CHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Гучність", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index 6726c3d01e..d4cea71d42 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "宋体" +BEGIN + CTEXT "音量", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index 2a75b3464b..d70bbd0a3e 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -56,3 +56,13 @@ BEGIN CHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END + +IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +STYLE DS_MODALFRAME | WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 9, "新細明體" +BEGIN + CTEXT "音量", -1, 0, 4, 50, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 16, 15, 20, 50 + AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 70, 44, 8 +END diff --git a/base/applications/sndvol32/resources.h b/base/applications/sndvol32/resources.h index 85dfed93dd..80f82e7b1f 100644 --- a/base/applications/sndvol32/resources.h +++ b/base/applications/sndvol32/resources.h @@ -28,3 +28,4 @@ #define IDD_VOLUME_CTRL 200 #define IDD_PREFERENCES 201 +#define IDD_TRAY_CTRL 202 diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index b19f99e0f3..7531518d64 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -1136,6 +1136,61 @@ CreateApplicationWindow(VOID) return hWnd; } +static +BOOL +HandleCommandLine(LPTSTR cmdline, + PBOOL pTray) +{ + TCHAR option; + + while (*cmdline == _T(' ') || *cmdline == _T('-') || *cmdline == _T('/')) + { + if (*cmdline++ == _T(' ')) + continue; + + option = *cmdline; + if (option) + cmdline++; + while (*cmdline == _T(' ')) + cmdline++; + + switch (option) + { + case 'd': /* Device */ + case 'D': + break; + + case 'n': /* Normal size */ + case 'N': + *pTray = FALSE; + break; + + case 's': /* Small size */ + case 'S': + *pTray = FALSE; + break; + + case 't': /* Tray size */ + case 'T': + *pTray = TRUE; + break; + + case 'p': /* Play mode */ + case 'P': + break; + + case 'r': /* Record mode */ + case 'R': + break; + + default: + return FALSE; + } + } + + return TRUE; +} + int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -1145,14 +1200,16 @@ _tWinMain(HINSTANCE hInstance, MSG Msg; int Ret = 1; INITCOMMONCONTROLSEX Controls; + BOOL bTray = FALSE; UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpszCmdLine); - UNREFERENCED_PARAMETER(nCmdShow); + UNREFERENCED_PARAMETER(nCmdShow); hAppInstance = hInstance; hAppHeap = GetProcessHeap(); + HandleCommandLine(lpszCmdLine, &bTray); + if (InitAppConfig()) { /* load the application title */ @@ -1168,37 +1225,48 @@ _tWinMain(HINSTANCE hInstance, InitCommonControlsEx(&Controls); - if (RegisterApplicationClasses()) + if (bTray) + { + DialogBoxParam(hAppInstance, + MAKEINTRESOURCE(IDD_TRAY_CTRL), + NULL, + TrayDlgProc, + 0); + } + else { - hMainWnd = CreateApplicationWindow(); - if (hMainWnd != NULL) + if (RegisterApplicationClasses()) { - BOOL bRet; - while ((bRet =GetMessage(&Msg, - NULL, - 0, - 0)) != 0) + hMainWnd = CreateApplicationWindow(); + if (hMainWnd != NULL) { - if (bRet != -1) + BOOL bRet; + while ((bRet =GetMessage(&Msg, + NULL, + 0, + 0)) != 0) { - TranslateMessage(&Msg); - DispatchMessage(&Msg); + if (bRet != -1) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } } + + DestroyWindow(hMainWnd); + Ret = 0; + } + else + { + DPRINT("Failed to create application window (LastError: %d)!\n", GetLastError()); } - DestroyWindow(hMainWnd); - Ret = 0; + UnregisterApplicationClasses(); } else { - DPRINT("Failed to create application window (LastError: %d)!\n", GetLastError()); + DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError()); } - - UnregisterApplicationClasses(); - } - else - { - DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError()); } if (lpAppTitle != NULL) diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index cd9c7ad5b3..f98f23d493 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -164,4 +164,14 @@ WriteLineConfig(IN LPTSTR szDeviceName, IN PSNDVOL_REG_LINESTATE LineState, IN DWORD cbSize); +/* tray.c */ + +INT_PTR +CALLBACK +TrayDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); + #endif /* __SNDVOL32_H */ diff --git a/base/applications/sndvol32/tray.c b/base/applications/sndvol32/tray.c new file mode 100644 index 0000000000..2223aadaef --- /dev/null +++ b/base/applications/sndvol32/tray.c @@ -0,0 +1,71 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Sound Volume Control + * FILE: base/applications/sndvol32/tray.c + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include "sndvol32.h" + +static VOID +OnTrayInitDialog( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + POINT ptCursor; + RECT rcWindow; + RECT rcScreen; + LONG x, y, cx, cy; + + GetCursorPos(&ptCursor); + + GetWindowRect(hwnd, &rcWindow); + + GetWindowRect(GetDesktopWindow(), &rcScreen); + + cx = rcWindow.right - rcWindow.left; + cy = rcWindow.bottom - rcWindow.top; + + if (ptCursor.y + cy > rcScreen.bottom) + y = ptCursor.y - cy; + else + y = ptCursor.y; + + if (ptCursor.x + cx > rcScreen.right) + x = ptCursor.x - cx; + else + x = ptCursor.x; + + SetWindowPos(hwnd, HWND_TOPMOST, x, y, 0, 0, SWP_NOSIZE); + + /* Disable the controls for now */ + EnableWindow(GetDlgItem(hwnd, IDC_LINE_SLIDER_VERT), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_LINE_SWITCH), FALSE); +} + + +INT_PTR +CALLBACK +TrayDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + OnTrayInitDialog(hwndDlg, wParam, lParam); + break; + + case WM_ACTIVATE: + if (LOWORD(wParam) == WA_INACTIVE) + EndDialog(hwndDlg, IDOK); + break; + } + + return 0; +} + +/* EOF */

1 0

05/05: [ADVAPI32] Few improvements for Services.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=295ea36f9e8e70fd219ed… commit 295ea36f9e8e70fd219ed9eaf8dc25e536db82a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 23:35:35 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:37:09 2018 +0100 [ADVAPI32] Few improvements for Services. - Set some last errors. - Fix error code returned by ScLookupServiceByServiceName(). - Check the validity of the handler proc in RegisterServiceCtrlHandler(Ex)W(). - Improve some traces; comment some code. --- dll/win32/advapi32/service/sctrl.c | 135 +++++++++++++++++++++++-------------- 1 file changed, 84 insertions(+), 51 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index 30903ffeb4..f0de114f40 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -135,15 +135,19 @@ ScDestroyStatusBinding(VOID) } -static PACTIVE_SERVICE -ScLookupServiceByServiceName(LPCWSTR lpServiceName) +static DWORD +ScLookupServiceByServiceName(IN LPCWSTR lpServiceName, + OUT PACTIVE_SERVICE* pService) { DWORD i; TRACE("ScLookupServiceByServiceName(%S) called\n", lpServiceName); if (lpActiveServices[0].bOwnProcess) - return &lpActiveServices[0]; + { + *pService = &lpActiveServices[0]; + return ERROR_SUCCESS; + } for (i = 0; i < dwActiveServiceCount; i++) { @@ -151,15 +155,14 @@ ScLookupServiceByServiceName(LPCWSTR lpServiceName) if (_wcsicmp(lpActiveServices[i].ServiceName.Buffer, lpServiceName) == 0) { TRACE("Found!\n"); - return &lpActiveServices[i]; + *pService = &lpActiveServices[i]; + return ERROR_SUCCESS; } } TRACE("No service found!\n"); - - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - - return NULL; + *pService = NULL; + return ERROR_SERVICE_NOT_IN_EXE; } @@ -268,7 +271,7 @@ ScConnectControlPipe(HANDLE *hPipe) dwProcessId = GetCurrentProcessId(); WriteFile(*hPipe, &dwProcessId, - sizeof(DWORD), + sizeof(dwProcessId), &dwBytesWritten, NULL); @@ -588,8 +591,8 @@ ScServiceDispatcher(HANDLE hPipe, if (ControlPacket->dwControl == SERVICE_CONTROL_START_OWN) lpActiveServices[0].bOwnProcess = TRUE; - lpService = ScLookupServiceByServiceName(lpServiceName); - if (lpService != NULL) + dwError = ScLookupServiceByServiceName(lpServiceName, &lpService); + if ((dwError == ERROR_SUCCESS) && (lpService != NULL)) { /* Execute command */ switch (ControlPacket->dwControl) @@ -611,10 +614,6 @@ ScServiceDispatcher(HANDLE hPipe, break; } } - else - { - dwError = ERROR_SERVICE_DOES_NOT_EXIST; - } } ReplyPacket.dwError = dwError; @@ -647,21 +646,21 @@ RegisterServiceCtrlHandlerA(LPCSTR lpServiceName, { ANSI_STRING ServiceNameA; UNICODE_STRING ServiceNameU; - SERVICE_STATUS_HANDLE SHandle; + SERVICE_STATUS_HANDLE hServiceStatus; - RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); + RtlInitAnsiString(&ServiceNameA, lpServiceName); if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) { - SetLastError(ERROR_OUTOFMEMORY); - return (SERVICE_STATUS_HANDLE)0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; } - SHandle = RegisterServiceCtrlHandlerW(ServiceNameU.Buffer, - lpHandlerProc); + hServiceStatus = RegisterServiceCtrlHandlerW(ServiceNameU.Buffer, + lpHandlerProc); RtlFreeUnicodeString(&ServiceNameU); - return SHandle; + return hServiceStatus; } @@ -674,18 +673,26 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName, LPHANDLER_FUNCTION lpHandlerProc) { + DWORD dwError; PACTIVE_SERVICE Service; - Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); - if (Service == NULL) + dwError = ScLookupServiceByServiceName(lpServiceName, &Service); + if ((dwError != ERROR_SUCCESS) || (Service == NULL)) + { + SetLastError(dwError); + return NULL; + } + + if (!lpHandlerProc) { - return (SERVICE_STATUS_HANDLE)NULL; + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; } - Service->HandlerFunction = lpHandlerProc; + Service->HandlerFunction = lpHandlerProc; Service->HandlerFunctionEx = NULL; - TRACE("RegisterServiceCtrlHandler returning %lu\n", Service->hServiceStatus); + TRACE("RegisterServiceCtrlHandler returning 0x%p\n", Service->hServiceStatus); return Service->hServiceStatus; } @@ -703,22 +710,22 @@ RegisterServiceCtrlHandlerExA(LPCSTR lpServiceName, { ANSI_STRING ServiceNameA; UNICODE_STRING ServiceNameU; - SERVICE_STATUS_HANDLE SHandle; + SERVICE_STATUS_HANDLE hServiceStatus; - RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); + RtlInitAnsiString(&ServiceNameA, lpServiceName); if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) { - SetLastError(ERROR_OUTOFMEMORY); - return (SERVICE_STATUS_HANDLE)0; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; } - SHandle = RegisterServiceCtrlHandlerExW(ServiceNameU.Buffer, - lpHandlerProc, - lpContext); + hServiceStatus = RegisterServiceCtrlHandlerExW(ServiceNameU.Buffer, + lpHandlerProc, + lpContext); RtlFreeUnicodeString(&ServiceNameU); - return SHandle; + return hServiceStatus; } @@ -732,19 +739,27 @@ RegisterServiceCtrlHandlerExW(LPCWSTR lpServiceName, LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext) { + DWORD dwError; PACTIVE_SERVICE Service; - Service = ScLookupServiceByServiceName(lpServiceName); - if (Service == NULL) + dwError = ScLookupServiceByServiceName(lpServiceName, &Service); + if ((dwError != ERROR_SUCCESS) || (Service == NULL)) { - return (SERVICE_STATUS_HANDLE)NULL; + SetLastError(dwError); + return NULL; } - Service->HandlerFunction = NULL; + if (!lpHandlerProc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + Service->HandlerFunction = NULL; Service->HandlerFunctionEx = lpHandlerProc; - Service->HandlerContext = lpContext; + Service->HandlerContext = lpContext; - TRACE("RegisterServiceCtrlHandlerEx returning %lu\n", Service->hServiceStatus); + TRACE("RegisterServiceCtrlHandlerEx returning 0x%p\n", Service->hServiceStatus); return Service->hServiceStatus; } @@ -942,11 +957,14 @@ StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA *lpServiceStartTable) } dwActiveServiceCount = i; + + /* Initialize the service table */ lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); if (lpActiveServices == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -956,16 +974,18 @@ StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA *lpServiceStartTable) RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].ServiceMain.A = lpServiceStartTable[i].lpServiceProc; - lpActiveServices[i].hServiceStatus = 0; + lpActiveServices[i].hServiceStatus = NULL; lpActiveServices[i].bUnicode = FALSE; lpActiveServices[i].bOwnProcess = FALSE; } + /* Initialize the connection to the SCM */ + dwError = ScConnectControlPipe(&hPipe); if (dwError != ERROR_SUCCESS) { bRet = FALSE; - goto done; + goto Done; } dwBufSize = sizeof(SCM_CONTROL_PACKET) + @@ -976,22 +996,24 @@ StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA *lpServiceStartTable) dwBufSize); if (ControlPacket == NULL) { + dwError = ERROR_NOT_ENOUGH_MEMORY; bRet = FALSE; - goto done; + goto Done; } ScCreateStatusBinding(); + /* Start the dispatcher loop */ ScServiceDispatcher(hPipe, ControlPacket, dwBufSize); + /* Close the connection */ ScDestroyStatusBinding(); - CloseHandle(hPipe); /* Free the control packet */ RtlFreeHeap(RtlGetProcessHeap(), 0, ControlPacket); -done: +Done: /* Free the service table */ for (i = 0; i < dwActiveServiceCount; i++) { @@ -1001,6 +1023,8 @@ done: lpActiveServices = NULL; dwActiveServiceCount = 0; + if (!bRet) SetLastError(dwError); + return bRet; } @@ -1029,11 +1053,14 @@ StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW *lpServiceStartTable) } dwActiveServiceCount = i; + + /* Initialize the service table */ lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); if (lpActiveServices == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -1043,16 +1070,18 @@ StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW *lpServiceStartTable) RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].ServiceMain.W = lpServiceStartTable[i].lpServiceProc; - lpActiveServices[i].hServiceStatus = 0; + lpActiveServices[i].hServiceStatus = NULL; lpActiveServices[i].bUnicode = TRUE; lpActiveServices[i].bOwnProcess = FALSE; } + /* Initialize the connection to the SCM */ + dwError = ScConnectControlPipe(&hPipe); if (dwError != ERROR_SUCCESS) { bRet = FALSE; - goto done; + goto Done; } dwBufSize = sizeof(SCM_CONTROL_PACKET) + @@ -1063,22 +1092,24 @@ StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW *lpServiceStartTable) dwBufSize); if (ControlPacket == NULL) { + dwError = ERROR_NOT_ENOUGH_MEMORY; bRet = FALSE; - goto done; + goto Done; } ScCreateStatusBinding(); + /* Start the dispatcher loop */ ScServiceDispatcher(hPipe, ControlPacket, dwBufSize); + /* Close the connection */ ScDestroyStatusBinding(); - CloseHandle(hPipe); /* Free the control packet */ RtlFreeHeap(RtlGetProcessHeap(), 0, ControlPacket); -done: +Done: /* Free the service table */ for (i = 0; i < dwActiveServiceCount; i++) { @@ -1088,6 +1119,8 @@ done: lpActiveServices = NULL; dwActiveServiceCount = 0; + if (!bRet) SetLastError(dwError); + return bRet; }

1 0

04/05: [ADVAPI32] Code formatting + improve two traces.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e3f80f940f494c06a19f… commit 2e3f80f940f494c06a19f143f427a87933207224 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 19:40:08 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:37:05 2018 +0100 [ADVAPI32] Code formatting + improve two traces. --- dll/win32/advapi32/service/sctrl.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index b5e1b8a26b..30903ffeb4 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -229,7 +229,6 @@ ScConnectControlPipe(HANDLE *hPipe) QueryTable, NULL, NULL); - if (!NT_SUCCESS(Status)) { ERR("RtlQueryRegistryValues() failed (Status %lx)\n", Status); @@ -638,7 +637,7 @@ ScServiceDispatcher(HANDLE hPipe, /********************************************************************** - * RegisterServiceCtrlHandlerA + * RegisterServiceCtrlHandlerA * * @implemented */ @@ -667,7 +666,7 @@ RegisterServiceCtrlHandlerA(LPCSTR lpServiceName, /********************************************************************** - * RegisterServiceCtrlHandlerW + * RegisterServiceCtrlHandlerW * * @implemented */ @@ -693,7 +692,7 @@ RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName, /********************************************************************** - * RegisterServiceCtrlHandlerExA + * RegisterServiceCtrlHandlerExA * * @implemented */ @@ -724,7 +723,7 @@ RegisterServiceCtrlHandlerExA(LPCSTR lpServiceName, /********************************************************************** - * RegisterServiceCtrlHandlerExW + * RegisterServiceCtrlHandlerExW * * @implemented */ @@ -752,7 +751,7 @@ RegisterServiceCtrlHandlerExW(LPCWSTR lpServiceName, /********************************************************************** - * I_ScIsSecurityProcess + * I_ScIsSecurityProcess * * Undocumented * @@ -766,7 +765,7 @@ I_ScIsSecurityProcess(VOID) /********************************************************************** - * I_ScPnPGetServiceName + * I_ScPnPGetServiceName * * Undocumented * @@ -794,7 +793,7 @@ I_ScPnPGetServiceName(IN SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * I_ScSetServiceBitsA + * I_ScSetServiceBitsA * * Undocumented * @@ -811,7 +810,6 @@ I_ScSetServiceBitsA(SERVICE_STATUS_HANDLE hServiceStatus, RpcTryExcept { - /* Call to services.exe using RPC */ bResult = RI_ScSetServiceBitsA((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, dwServiceBits, bSetBitsOn, @@ -830,7 +828,7 @@ I_ScSetServiceBitsA(SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * I_ScSetServiceBitsW + * I_ScSetServiceBitsW * * Undocumented * @@ -847,7 +845,6 @@ I_ScSetServiceBitsW(SERVICE_STATUS_HANDLE hServiceStatus, RpcTryExcept { - /* Call to services.exe using RPC */ bResult = RI_ScSetServiceBitsW((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, dwServiceBits, bSetBitsOn, @@ -866,7 +863,7 @@ I_ScSetServiceBitsW(SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * SetServiceBits + * SetServiceBits * * @implemented */ @@ -885,7 +882,7 @@ SetServiceBits(SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * SetServiceStatus + * SetServiceStatus * * @implemented */ @@ -895,12 +892,10 @@ SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, { DWORD dwError; - TRACE("SetServiceStatus() called\n"); - TRACE("hServiceStatus %lu\n", hServiceStatus); + TRACE("SetServiceStatus(hServiceStatus %lu) called\n", hServiceStatus); RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RSetServiceStatus((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, lpServiceStatus); } @@ -912,7 +907,7 @@ SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, if (dwError != ERROR_SUCCESS) { - ERR("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); + ERR("RSetServiceStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -924,7 +919,7 @@ SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, /********************************************************************** - * StartServiceCtrlDispatcherA + * StartServiceCtrlDispatcherA * * @implemented */ @@ -1011,7 +1006,7 @@ done: /********************************************************************** - * StartServiceCtrlDispatcherW + * StartServiceCtrlDispatcherW * * @implemented */

1 0

03/05: [ADVAPI32] ScStartService(): Just start the thread straight ahead, and return a suitable error code if thread creation failed.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c44925ec1a31e6c0dc66… commit 0c44925ec1a31e6c0dc66ea8f68a2755d1e4f492 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 19:02:38 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:37:01 2018 +0100 [ADVAPI32] ScStartService(): Just start the thread straight ahead, and return a suitable error code if thread creation failed. --- dll/win32/advapi32/service/sctrl.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index 5afa8dfc14..b5e1b8a26b 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -432,9 +432,9 @@ ScStartService(PACTIVE_SERVICE lpService, if (lpService == NULL || ControlPacket == NULL) return ERROR_INVALID_PARAMETER; - TRACE("ScStartService() called\n"); - TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); + TRACE("ScStartService(Size: %lu, Service: '%S') called\n", + ControlPacket->dwSize, + (PWSTR)((ULONG_PTR)ControlPacket + ControlPacket->dwServiceNameOffset)); /* Set the service status handle */ lpService->hServiceStatus = ControlPacket->hServiceStatus; @@ -458,18 +458,20 @@ ScStartService(PACTIVE_SERVICE lpService, 0, ScServiceMainStubW, ThreadParamsW, - CREATE_SUSPENDED, + 0, &ThreadId); if (ThreadHandle == NULL) { if (ThreadParamsW->lpArgVector != NULL) { - HeapFree(GetProcessHeap(), - 0, - ThreadParamsW->lpArgVector); + HeapFree(GetProcessHeap(), 0, ThreadParamsW->lpArgVector); } HeapFree(GetProcessHeap(), 0, ThreadParamsW); + + return ERROR_SERVICE_NO_THREAD; } + + CloseHandle(ThreadHandle); } else { @@ -489,22 +491,21 @@ ScStartService(PACTIVE_SERVICE lpService, 0, ScServiceMainStubA, ThreadParamsA, - CREATE_SUSPENDED, + 0, &ThreadId); if (ThreadHandle == NULL) { if (ThreadParamsA->lpArgVector != NULL) { - HeapFree(GetProcessHeap(), - 0, - ThreadParamsA->lpArgVector); + HeapFree(GetProcessHeap(), 0, ThreadParamsA->lpArgVector); } HeapFree(GetProcessHeap(), 0, ThreadParamsA); + + return ERROR_SERVICE_NO_THREAD; } - } - ResumeThread(ThreadHandle); - CloseHandle(ThreadHandle); + CloseHandle(ThreadHandle); + } return ERROR_SUCCESS; }

1 0

02/05: [ADVAPI32] Take into account the service handler context when dispatching a control notification to a service. (Used e.g. by tcpsvcs.)
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91b50f9ccb530e9544a22… commit 91b50f9ccb530e9544a224df0f0a3e5630441ab6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 18:53:05 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:36:57 2018 +0100 [ADVAPI32] Take into account the service handler context when dispatching a control notification to a service. (Used e.g. by tcpsvcs.) --- dll/win32/advapi32/service/scm.c | 2 +- dll/win32/advapi32/service/sctrl.c | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index ec1b84cb20..5a20508f69 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); +WINE_DEFAULT_DEBUG_CHANNEL(advapi_service); /* FUNCTIONS *****************************************************************/ diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index fe2469732f..5afa8dfc14 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -12,7 +12,7 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); +WINE_DEFAULT_DEBUG_CHANNEL(advapi_service); /* TYPES *********************************************************************/ @@ -514,26 +514,31 @@ static DWORD ScControlService(PACTIVE_SERVICE lpService, PSCM_CONTROL_PACKET ControlPacket) { + DWORD dwError; + if (lpService == NULL || ControlPacket == NULL) return ERROR_INVALID_PARAMETER; - TRACE("ScControlService() called\n"); - TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); + TRACE("ScControlService(Size: %lu, Service: '%S') called\n", + ControlPacket->dwSize, + (PWSTR)((ULONG_PTR)ControlPacket + ControlPacket->dwServiceNameOffset)); if (lpService->HandlerFunction) { (lpService->HandlerFunction)(ControlPacket->dwControl); + dwError = ERROR_SUCCESS; } else if (lpService->HandlerFunctionEx) { - /* FIXME: send correct params */ - (lpService->HandlerFunctionEx)(ControlPacket->dwControl, 0, NULL, NULL); + /* FIXME: Send correct 2nd and 3rd parameters */ + dwError = (lpService->HandlerFunctionEx)(ControlPacket->dwControl, + 0, NULL, + lpService->HandlerContext); } - TRACE("ScControlService() done\n"); + TRACE("ScControlService() done (error %lu)\n", dwError); - return ERROR_SUCCESS; + return dwError; }

1 0

01/05: [ADVAPI32] Use RPC types where needed. Comments cleanup.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=635aabb011949e6d9a8b1… commit 635aabb011949e6d9a8b1619ae1a5d5301860049 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 16:31:00 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:36:53 2018 +0100 [ADVAPI32] Use RPC types where needed. Comments cleanup. --- dll/win32/advapi32/service/eventlog.c | 74 +++++++++++++------------- dll/win32/advapi32/service/scm.c | 97 +++++++++++++---------------------- 2 files changed, 72 insertions(+), 99 deletions(-) diff --git a/dll/win32/advapi32/service/eventlog.c b/dll/win32/advapi32/service/eventlog.c index fcf1000405..d3afa467ce 100644 --- a/dll/win32/advapi32/service/eventlog.c +++ b/dll/win32/advapi32/service/eventlog.c @@ -4,7 +4,7 @@ * Copyright 1995 Sven Verdoolaege * Copyright 1998 Juergen Schmied * Copyright 2003 Mike Hearn - * Copyright 2007 Herv� Poussineau + * Copyright 2007 Hervé Poussineau * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,35 +40,35 @@ handle_t __RPC_USER EVENTLOG_HANDLE_A_bind(EVENTLOG_HANDLE_A UNCServerName) { handle_t hBinding = NULL; - UCHAR *pszStringBinding; - RPC_STATUS status; + RPC_CSTR pszStringBinding; + RPC_STATUS Status; TRACE("EVENTLOG_HANDLE_A_bind() called\n"); - status = RpcStringBindingComposeA(NULL, - (UCHAR *)"ncacn_np", - (UCHAR *)UNCServerName, - (UCHAR *)"\\pipe\\EventLog", + Status = RpcStringBindingComposeA(NULL, + (RPC_CSTR)"ncacn_np", + (RPC_CSTR)UNCServerName, + (RPC_CSTR)"\\pipe\\EventLog", NULL, - (UCHAR **)&pszStringBinding); - if (status) + &pszStringBinding); + if (Status) { - ERR("RpcStringBindingCompose returned 0x%x\n", status); + ERR("RpcStringBindingCompose returned 0x%x\n", Status); return NULL; } /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingA(pszStringBinding, + Status = RpcBindingFromStringBindingA(pszStringBinding, &hBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); } - status = RpcStringFreeA(&pszStringBinding); - if (status != RPC_S_OK) + Status = RpcStringFreeA(&pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringFree returned 0x%x\n", status); + ERR("RpcStringFree returned 0x%x\n", Status); } return hBinding; @@ -79,14 +79,14 @@ void __RPC_USER EVENTLOG_HANDLE_A_unbind(EVENTLOG_HANDLE_A UNCServerName, handle_t hBinding) { - RPC_STATUS status; + RPC_STATUS Status; TRACE("EVENTLOG_HANDLE_A_unbind() called\n"); - status = RpcBindingFree(&hBinding); - if (status != RPC_S_OK) + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) { - ERR("RpcBindingFree returned 0x%x\n", status); + ERR("RpcBindingFree returned 0x%x\n", Status); } } @@ -95,35 +95,35 @@ handle_t __RPC_USER EVENTLOG_HANDLE_W_bind(EVENTLOG_HANDLE_W UNCServerName) { handle_t hBinding = NULL; - LPWSTR pszStringBinding; - RPC_STATUS status; + RPC_WSTR pszStringBinding; + RPC_STATUS Status; TRACE("EVENTLOG_HANDLE_W_bind() called\n"); - status = RpcStringBindingComposeW(NULL, + Status = RpcStringBindingComposeW(NULL, L"ncacn_np", UNCServerName, L"\\pipe\\EventLog", NULL, &pszStringBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcStringBindingCompose returned 0x%x\n", status); + ERR("RpcStringBindingCompose returned 0x%x\n", Status); return NULL; } /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingW(pszStringBinding, + Status = RpcBindingFromStringBindingW(pszStringBinding, &hBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); } - status = RpcStringFreeW(&pszStringBinding); - if (status != RPC_S_OK) + Status = RpcStringFreeW(&pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringFree returned 0x%x\n", status); + ERR("RpcStringFree returned 0x%x\n", Status); } return hBinding; @@ -134,14 +134,14 @@ void __RPC_USER EVENTLOG_HANDLE_W_unbind(EVENTLOG_HANDLE_W UNCServerName, handle_t hBinding) { - RPC_STATUS status; + RPC_STATUS Status; TRACE("EVENTLOG_HANDLE_W_unbind() called\n"); - status = RpcBindingFree(&hBinding); - if (status != RPC_S_OK) + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) { - ERR("RpcBindingFree returned 0x%x\n", status); + ERR("RpcBindingFree returned 0x%x\n", Status); } } @@ -1352,7 +1352,7 @@ ElfReportEventA(IN HANDLE hEventLog, NumStrings, DataSize, (PRPC_STRING)&ComputerName, - UserSID, + (PRPC_SID)UserSID, (PRPC_STRING*)Strings, Data, Flags, @@ -1491,7 +1491,7 @@ ElfReportEventW(IN HANDLE hEventLog, NumStrings, DataSize, (PRPC_UNICODE_STRING)&ComputerName, - UserSID, + (PRPC_SID)UserSID, (PRPC_UNICODE_STRING*)Strings, Data, Flags, diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index 42aec43f7c..ec1b84cb20 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -5,9 +5,6 @@ * PURPOSE: Service control manager functions * PROGRAMMER: Emanuele Aliberti * Eric Kohl - * UPDATE HISTORY: - * 19990413 EA created - * 19990515 EA */ /* INCLUDES ******************************************************************/ @@ -22,35 +19,35 @@ handle_t __RPC_USER SVCCTL_HANDLEA_bind(SVCCTL_HANDLEA szMachineName) { handle_t hBinding = NULL; - UCHAR *pszStringBinding; - RPC_STATUS status; + RPC_CSTR pszStringBinding; + RPC_STATUS Status; TRACE("SVCCTL_HANDLEA_bind() called\n"); - status = RpcStringBindingComposeA(NULL, - (UCHAR *)"ncacn_np", - (UCHAR *)szMachineName, - (UCHAR *)"\\pipe\\ntsvcs", + Status = RpcStringBindingComposeA(NULL, + (RPC_CSTR)"ncacn_np", + (RPC_CSTR)szMachineName, + (RPC_CSTR)"\\pipe\\ntsvcs", NULL, - (UCHAR **)&pszStringBinding); - if (status != RPC_S_OK) + &pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringBindingCompose returned 0x%x\n", status); + ERR("RpcStringBindingCompose returned 0x%x\n", Status); return NULL; } /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingA(pszStringBinding, + Status = RpcBindingFromStringBindingA(pszStringBinding, &hBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); } - status = RpcStringFreeA(&pszStringBinding); - if (status != RPC_S_OK) + Status = RpcStringFreeA(&pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringFree returned 0x%x\n", status); + ERR("RpcStringFree returned 0x%x\n", Status); } return hBinding; @@ -61,14 +58,14 @@ void __RPC_USER SVCCTL_HANDLEA_unbind(SVCCTL_HANDLEA szMachineName, handle_t hBinding) { - RPC_STATUS status; + RPC_STATUS Status; TRACE("SVCCTL_HANDLEA_unbind() called\n"); - status = RpcBindingFree(&hBinding); - if (status != RPC_S_OK) + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) { - ERR("RpcBindingFree returned 0x%x\n", status); + ERR("RpcBindingFree returned 0x%x\n", Status); } } @@ -77,35 +74,35 @@ handle_t __RPC_USER SVCCTL_HANDLEW_bind(SVCCTL_HANDLEW szMachineName) { handle_t hBinding = NULL; - LPWSTR pszStringBinding; - RPC_STATUS status; + RPC_WSTR pszStringBinding; + RPC_STATUS Status; TRACE("SVCCTL_HANDLEW_bind() called\n"); - status = RpcStringBindingComposeW(NULL, + Status = RpcStringBindingComposeW(NULL, L"ncacn_np", szMachineName, L"\\pipe\\ntsvcs", NULL, &pszStringBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcStringBindingCompose returned 0x%x\n", status); + ERR("RpcStringBindingCompose returned 0x%x\n", Status); return NULL; } /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingW(pszStringBinding, + Status = RpcBindingFromStringBindingW(pszStringBinding, &hBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); } - status = RpcStringFreeW(&pszStringBinding); - if (status != RPC_S_OK) + Status = RpcStringFreeW(&pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringFree returned 0x%x\n", status); + ERR("RpcStringFree returned 0x%x\n", Status); } return hBinding; @@ -116,18 +113,19 @@ void __RPC_USER SVCCTL_HANDLEW_unbind(SVCCTL_HANDLEW szMachineName, handle_t hBinding) { - RPC_STATUS status; + RPC_STATUS Status; TRACE("SVCCTL_HANDLEW_unbind() called\n"); - status = RpcBindingFree(&hBinding); - if (status != RPC_S_OK) + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) { - ERR("RpcBindingFree returned 0x%x\n", status); + ERR("RpcBindingFree returned 0x%x\n", Status); } } +/* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */ DWORD ScmRpcStatusToWinError(RPC_STATUS Status) { @@ -332,7 +330,6 @@ ChangeServiceConfigA(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RChangeServiceConfigA((SC_RPC_HANDLE)hService, dwServiceType, dwStartType, @@ -417,7 +414,6 @@ ChangeServiceConfigW(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RChangeServiceConfigW((SC_RPC_HANDLE)hService, dwServiceType, dwStartType, @@ -469,7 +465,6 @@ CloseServiceHandle(SC_HANDLE hSCObject) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RCloseServiceHandle((LPSC_RPC_HANDLE)&hSCObject); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -508,7 +503,6 @@ ControlService(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RControlService((SC_RPC_HANDLE)hService, dwControl, lpServiceStatus); @@ -628,7 +622,6 @@ CreateServiceA(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RCreateServiceA((SC_RPC_HANDLE)hSCManager, (LPSTR)lpServiceName, (LPSTR)lpDisplayName, @@ -727,7 +720,6 @@ CreateServiceW(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RCreateServiceW((SC_RPC_HANDLE)hSCManager, lpServiceName, lpDisplayName, @@ -776,7 +768,6 @@ DeleteService(SC_HANDLE hService) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RDeleteService((SC_RPC_HANDLE)hService); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -1494,7 +1485,6 @@ GetServiceDisplayNameA(SC_HANDLE hSCManager, } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - /* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */ dwError = ScmRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; @@ -1732,7 +1722,6 @@ LockServiceDatabase(SC_HANDLE hSCManager) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RLockServiceDatabase((SC_RPC_HANDLE)hSCManager, (SC_RPC_LOCK *)&hLock); } @@ -1801,7 +1790,6 @@ OpenSCManagerA(LPCSTR lpMachineName, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = ROpenSCManagerA((LPSTR)lpMachineName, (LPSTR)lpDatabaseName, dwDesiredAccess, @@ -1846,7 +1834,6 @@ OpenSCManagerW(LPCWSTR lpMachineName, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = ROpenSCManagerW((LPWSTR)lpMachineName, (LPWSTR)lpDatabaseName, dwDesiredAccess, @@ -1895,7 +1882,6 @@ OpenServiceA(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = ROpenServiceA((SC_RPC_HANDLE)hSCManager, (LPSTR)lpServiceName, dwDesiredAccess, @@ -1944,7 +1930,6 @@ OpenServiceW(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = ROpenServiceW((SC_RPC_HANDLE)hSCManager, (LPWSTR)lpServiceName, dwDesiredAccess, @@ -2002,7 +1987,6 @@ QueryServiceConfigA(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceConfigA((SC_RPC_HANDLE)hService, (LPBYTE)lpConfigPtr, dwBufferSize, @@ -2086,7 +2070,6 @@ QueryServiceConfigW(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceConfigW((SC_RPC_HANDLE)hService, (LPBYTE)lpConfigPtr, dwBufferSize, @@ -2190,7 +2173,6 @@ QueryServiceConfig2A(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceConfig2A((SC_RPC_HANDLE)hService, dwInfoLevel, lpTempBuffer, @@ -2308,7 +2290,6 @@ QueryServiceConfig2W(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceConfig2W((SC_RPC_HANDLE)hService, dwInfoLevel, lpTempBuffer, @@ -2404,7 +2385,6 @@ QueryServiceLockStatusA(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceLockStatusA((SC_RPC_HANDLE)hSCManager, (LPBYTE)lpStatusPtr, dwBufferSize, @@ -2466,7 +2446,6 @@ QueryServiceLockStatusW(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceLockStatusW((SC_RPC_HANDLE)hSCManager, (LPBYTE)lpStatusPtr, dwBufferSize, @@ -2516,7 +2495,6 @@ QueryServiceObjectSecurity(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceObjectSecurity((SC_RPC_HANDLE)hService, dwSecurityInformation, (LPBYTE)lpSecurityDescriptor, @@ -2583,7 +2561,6 @@ SetServiceObjectSecurity(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RSetServiceObjectSecurity((SC_RPC_HANDLE)hService, dwSecurityInformation, (LPBYTE)SelfRelativeSD, @@ -2630,7 +2607,6 @@ QueryServiceStatus(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceStatus((SC_RPC_HANDLE)hService, lpServiceStatus); } @@ -2682,7 +2658,6 @@ QueryServiceStatusEx(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceStatusEx((SC_RPC_HANDLE)hService, InfoLevel, lpBuffer, @@ -2790,7 +2765,6 @@ UnlockServiceDatabase(SC_LOCK ScLock) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RUnlockServiceDatabase((LPSC_RPC_LOCK)&ScLock); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -2827,7 +2801,6 @@ NotifyBootConfigStatus(BOOL BootAcceptable) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RNotifyBootConfigStatus(NULL, BootAcceptable); }

1 0

01/01: [TRANSLATION] Completed German translation in stobject (#401)
by Simon Dräger 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82720432eb345e850c0f5… commit 82720432eb345e850c0f5986c587f9e594dcc240 Author: Simon Dräger <20014538+C0nflict(a)users.noreply.github.com> AuthorDate: Sun Feb 25 23:36:05 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 23:36:05 2018 +0100 [TRANSLATION] Completed German translation in stobject (#401) --- dll/shellext/stobject/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/stobject/lang/de-DE.rc b/dll/shellext/stobject/lang/de-DE.rc index cdb3aa2d48..7d0657dcef 100644 --- a/dll/shellext/stobject/lang/de-DE.rc +++ b/dll/shellext/stobject/lang/de-DE.rc @@ -19,7 +19,7 @@ BEGIN IDS_PWR_METER "Batterieanzeige ö&ffnen" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%.2f%% verbleibend" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_CHARGING "%.2f%% und wird geladen" IDS_PWR_UNKNOWN_REMAINING "Unbekannt verbleibend" IDS_PWR_AC "Mit Wechselstrom" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! Stunden (%3!u!%%) verbleibend"

1 0

01/01: [TRANSLATION] Minor German grammatical improvements
by Simon Dräger 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff231236154d1ef35ed76… commit ff231236154d1ef35ed76ba23d08071a209acadd Author: Simon Dräger <20014538+C0nflict(a)users.noreply.github.com> AuthorDate: Sun Feb 25 15:21:35 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 17:26:43 2018 +0100 [TRANSLATION] Minor German grammatical improvements --- base/setup/reactos/lang/de-DE.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 7287cfed83..c8aaea7d4a 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -106,13 +106,13 @@ BEGIN LTEXT "Sie haben die erste Stufe des ReactOS-Setup erfolgreich abgeschlossen.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Wenn eine CD im Laufwerk ist, entfernen Sie sie. Klicken Sie zum Neustart auf Beenden.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Wenn eine CD im Laufwerk ist, entfernen Sie diese. Klicken Sie zum Neustart auf Beenden.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN IDS_TYPETITLE "Willkommen zum ReactOS-Setup" - IDS_TYPESUBTITLE "Wählen Sie einen Setuptyp." + IDS_TYPESUBTITLE "Wählen Sie einen Setuptypen." IDS_DEVICETITLE "Einstellen der Basisgeräte" IDS_DEVICESUBTITLE "Einstellungen der Anzeigegeräte und der Tastatur." IDS_DRIVETITLE "Richte Installationspartition und Systemverzeichnis ein"

1 0

01/01: [ADVAPI32_APITEST] Open services & SCM handles with correct access rights; improve a check order.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f4a4b35e63ccd6a39d05… commit 5f4a4b35e63ccd6a39d054c29a44da3e6d8bea62 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 16:09:21 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 16:11:00 2018 +0100 [ADVAPI32_APITEST] Open services & SCM handles with correct access rights; improve a check order. --- .../rostests/apitests/advapi32/LockServiceDatabase.c | 2 +- modules/rostests/apitests/advapi32/ServiceArgs.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/rostests/apitests/advapi32/LockServiceDatabase.c b/modules/rostests/apitests/advapi32/LockServiceDatabase.c index 850cc4c70a..d52610a030 100644 --- a/modules/rostests/apitests/advapi32/LockServiceDatabase.c +++ b/modules/rostests/apitests/advapi32/LockServiceDatabase.c @@ -77,8 +77,8 @@ static void Test_LockUnlockServiceDatabase(void) SetLastError(0xdeadbeef); hLock = LockServiceDatabase(hScm); - ok(hLock != NULL, "hLock = 0x%p, expected non-zero\n", hLock); ok_err(ERROR_SUCCESS); + ok(hLock != NULL, "hLock = 0x%p, expected non-zero\n", hLock); /* Now unlock it */ if (hLock) diff --git a/modules/rostests/apitests/advapi32/ServiceArgs.c b/modules/rostests/apitests/advapi32/ServiceArgs.c index 18d9b82096..e50ca7bf9f 100644 --- a/modules/rostests/apitests/advapi32/ServiceArgs.c +++ b/modules/rostests/apitests/advapi32/ServiceArgs.c @@ -236,7 +236,7 @@ static SC_HANDLE register_service(PCWSTR extra_args) trace("service_cmd \"%ls\"\n", service_cmd); - service = CreateServiceW(scm_handle, service_nameW, service_nameW, GENERIC_ALL, + service = CreateServiceW(scm_handle, service_nameW, service_nameW, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_IGNORE, service_cmd, NULL, NULL, NULL, NULL, NULL); if (!service && GetLastError() == ERROR_ACCESS_DENIED) @@ -351,11 +351,11 @@ static void test_runner(BOOLEAN unicode, PCWSTR extra_args, int service_argc, vo thread = CreateThread(NULL, 0, pipe_thread, NULL, 0, NULL); ok(thread != NULL, "CreateThread failed: %lu\n", GetLastError()); if (!thread) - return; + goto Quit; service_handle = register_service(extra_args); if (!service_handle) - return; + goto Quit; //trace("starting...\n"); @@ -370,15 +370,20 @@ static void test_runner(BOOLEAN unicode, PCWSTR extra_args, int service_argc, vo CloseServiceHandle(service_handle); ok(WaitForSingleObject(thread, 10000) == WAIT_OBJECT_0, "Timeout waiting for thread\n"); - CloseHandle(thread); - CloseHandle(pipe_handle); + +Quit: + if (thread) + CloseHandle(thread); + + if (pipe_handle != INVALID_HANDLE_VALUE) + CloseHandle(pipe_handle); } START_TEST(ServiceArgs) { argc = winetest_get_mainargs(&argv); - scm_handle = OpenSCManagerW(NULL, NULL, GENERIC_ALL); + scm_handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); ok(scm_handle != NULL, "OpenSCManager failed: %lu\n", GetLastError()); if (!scm_handle) {

1 0

01/01: [CONTRIBUTING] Update .gitmessage
by Alexander Shaposhnikov 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=509dd4e6452ff11addafb… commit 509dd4e6452ff11addafb65f2ae16704b507445b Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sun Feb 25 16:14:41 2018 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 25 16:14:41 2018 +0200 [CONTRIBUTING] Update .gitmessage The template is made more clear and specific. Added non-mandatory width hints. --- .gitmessage | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.gitmessage b/.gitmessage index f0b7ea10e1..75664741de 100644 --- a/.gitmessage +++ b/.gitmessage @@ -1,20 +1,22 @@ -# [MODULE] A short but descriptive summary (#pr-num) - -# A comprehensible description of WHY you did this work. +# Commit message example +# ---------------------- +# [MODULE] A short but descriptive summary (#pr-num) +# +# A comprehensible description of WHY you did this work. Do not limit +# yourself here. +# The width of the description is arbitary, but it is a good idea to +# wrap the text by 72 chars. +# # CORE-XXXX CIDXXXXX - +# ---------------------- # * [MODULE] should usually be the name of the CMake module, written # in all caps. -# -# * Summary should be imperative (not past tense), and not end with -# a period. -# -# * Description of commit should explain WHY a change was made. -# -# * JIRA, Coverity ID references should be placed at the bottom and -# preceded by the newline. -# -# * Pull request should always be referenced in the summary in parens -# unless it doesn't fit. In this case it should be placed after bug -# IDs if any. +# * Summary should be imperative (not past tense) and not end with a +# period. +# * Description of a commit should explain WHY a change was made. +# * JIRA, Coverity ID references should be placed at the bottom row. +# * There must be a newline between summary, description and bug IDs. +# * GitHub Pull Request ID should be referenced in the summary in +# parens. If the resulting summary is longer than 70 chars it may +# be placed last in the ID row to prevent hard wrapping on GitHub.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2018