Ros-diffs July 2021

ros-diffs@reactos.org

18 participants
142 discussions

[reactos] 01/03: [HAL/APIC] Use APIC_CLOCK_VECTOR everywhere, instead of keeping separate definitions
by Timo Kreuzer 19 Jul '21

19 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aedb97df472ef54744365… commit aedb97df472ef5474436542a3bf0a81402ec5dd1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jul 7 21:58:23 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Jul 19 23:05:03 2021 +0200 [HAL/APIC] Use APIC_CLOCK_VECTOR everywhere, instead of keeping separate definitions --- hal/halx86/apic/rtctimer.c | 4 ++-- hal/halx86/apic/tsc.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hal/halx86/apic/rtctimer.c b/hal/halx86/apic/rtctimer.c index 2d30ad55c43..f4761c5d31f 100644 --- a/hal/halx86/apic/rtctimer.c +++ b/hal/halx86/apic/rtctimer.c @@ -12,12 +12,12 @@ /* INCLUDES *******************************************************************/ #include <hal.h> +#include "apicp.h" #define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ -const UCHAR HalpClockVector = 0xD1; BOOLEAN HalpClockSetMSRate; UCHAR HalpNextMSRate; UCHAR HalpCurrentRate = 9; /* Initial rate 9: 128 Hz / 7.8 ms */ @@ -141,7 +141,7 @@ HalpClockInterruptHandler(IN PKTRAP_FRAME TrapFrame) #endif /* Start the interrupt */ - if (!HalBeginSystemInterrupt(CLOCK_LEVEL, HalpClockVector, &Irql)) + if (!HalBeginSystemInterrupt(CLOCK_LEVEL, APIC_CLOCK_VECTOR, &Irql)) { /* Spurious, just end the interrupt */ KiEoiHelper(TrapFrame); diff --git a/hal/halx86/apic/tsc.c b/hal/halx86/apic/tsc.c index 1ff881206fd..9963156caac 100644 --- a/hal/halx86/apic/tsc.c +++ b/hal/halx86/apic/tsc.c @@ -10,6 +10,7 @@ #include <hal.h> #include "tsc.h" +#include "apicp.h" #define NDEBUG #include <debug.h> @@ -17,10 +18,9 @@ LARGE_INTEGER HalpCpuClockFrequency = {{INITIAL_STALL_COUNT * 1000000}}; UCHAR TscCalibrationPhase; ULONG64 TscCalibrationArray[NUM_SAMPLES]; -UCHAR HalpRtcClockVector = 0xD1; #define RTC_MODE 6 /* Mode 6 is 1024 Hz */ -#define SAMPLE_FREQENCY ((32768 << 1) >> RTC_MODE) +#define SAMPLE_FREQUENCY ((32768 << 1) >> RTC_MODE) /* PRIVATE FUNCTIONS *********************************************************/ @@ -44,7 +44,7 @@ DoLinearRegression( } /* Account for sample frequency */ - SumXY *= SAMPLE_FREQENCY; + SumXY *= SAMPLE_FREQUENCY; /* Return the quotient of the sums */ return (SumXY + (SumXX/2)) / SumXX; @@ -72,22 +72,22 @@ HalpInitializeTsc(VOID) RegisterB = HalpReadCmos(RTC_REGISTER_B); HalpWriteCmos(RTC_REGISTER_B, RegisterB | RTC_REG_B_PI); - /* Modify register A to RTC_MODE to get SAMPLE_FREQENCY */ + /* Modify register A to RTC_MODE to get SAMPLE_FREQUENCY */ RegisterA = HalpReadCmos(RTC_REGISTER_A); RegisterA = (RegisterA & 0xF0) | RTC_MODE; HalpWriteCmos(RTC_REGISTER_A, RegisterA); /* Save old IDT entry */ - PreviousHandler = KeQueryInterruptHandler(HalpRtcClockVector); + PreviousHandler = KeQueryInterruptHandler(APIC_CLOCK_VECTOR); /* Set the calibration ISR */ - KeRegisterInterruptHandler(HalpRtcClockVector, TscCalibrationISR); + KeRegisterInterruptHandler(APIC_CLOCK_VECTOR, TscCalibrationISR); /* Reset TSC value to 0 */ __writemsr(MSR_RDTSC, 0); /* Enable the timer interrupt */ - HalEnableSystemInterrupt(HalpRtcClockVector, CLOCK_LEVEL, Latched); + HalEnableSystemInterrupt(APIC_CLOCK_VECTOR, CLOCK_LEVEL, Latched); /* Read register C, so that the next interrupt can happen */ HalpReadCmos(RTC_REGISTER_C); @@ -101,10 +101,10 @@ HalpInitializeTsc(VOID) HalpWriteCmos(RTC_REGISTER_B, RegisterB & ~RTC_REG_B_PI); /* Disable the timer interrupt */ - HalDisableSystemInterrupt(HalpRtcClockVector, CLOCK_LEVEL); + HalDisableSystemInterrupt(APIC_CLOCK_VECTOR, CLOCK_LEVEL); /* Restore the previous handler */ - KeRegisterInterruptHandler(HalpRtcClockVector, PreviousHandler); + KeRegisterInterruptHandler(APIC_CLOCK_VECTOR, PreviousHandler); /* Calculate an average, using simplified linear regression */ HalpCpuClockFrequency.QuadPart = DoLinearRegression(NUM_SAMPLES - 1,

1 0

[reactos] 01/01: [BOOTDATA] Update readme.txt
by Joachim Henze 18 Jul '21

18 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a559d830b546c0f76c37b… commit a559d830b546c0f76c37bf0a2e9b1de0128ee58f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Jul 19 01:05:00 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Jul 19 01:05:00 2021 +0200 [BOOTDATA] Update readme.txt Consistency regarding URLs: - some URLs had the trailing slash, some had not - moving all URLs to EOL makes it more convenient to copy-paste them --- boot/bootdata/readme.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/readme.txt b/boot/bootdata/readme.txt index cf8353a1a34..8723d7e37ca 100644 --- a/boot/bootdata/readme.txt +++ b/boot/bootdata/readme.txt @@ -1,6 +1,6 @@ ======================== ReactOS™ Version 0.4.x -Updated August 31, 2016 +Updated July 19, 2021 ======================== 1. What is ReactOS? @@ -10,7 +10,7 @@ ReactOS™ is an Open Source effort to develop a quality operating system that i compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). -More information is available at: https://reactos.org/ +More information is available at: https://reactos.org 2. Relationship with the WINE project @@ -65,9 +65,9 @@ ReactOS - amongst other topics. Contributors to the project are always welcome. 7. Frequently Asked Questions ----------------------------- -Some of your questions may be answered in: https://reactos.org/faq/ -In addition, the ReactOS forum: https://reactos.org/forum/ may contain -complementary, yet non-official, information. +Some of your questions may be answered in: https://reactos.org/faq +In addition, the ReactOS forum: https://reactos.org/forum +may contain complementary, yet non-official, information. 8. Authors

1 0

[reactos] 01/01: [FONTEXT] Add de-DE translation CORE-17692
by Joachim Henze 18 Jul '21

18 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e177edbadf8d6e8c2065… commit 6e177edbadf8d6e8c2065b51bf9daca2435269d2 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Jul 19 00:33:39 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Jul 19 00:33:39 2021 +0200 [FONTEXT] Add de-DE translation CORE-17692 --- dll/shellext/fontext/fontext.rc | 3 +++ dll/shellext/fontext/lang/de-DE.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dll/shellext/fontext/fontext.rc b/dll/shellext/fontext/fontext.rc index f4cb69b8af0..ee368d3d20c 100644 --- a/dll/shellext/fontext/fontext.rc +++ b/dll/shellext/fontext/fontext.rc @@ -13,6 +13,9 @@ IDR_FONTEXT REGISTRY "res/fontext.rgs" /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif diff --git a/dll/shellext/fontext/lang/de-DE.rc b/dll/shellext/fontext/lang/de-DE.rc new file mode 100644 index 00000000000..e0b8e82ccf4 --- /dev/null +++ b/dll/shellext/fontext/lang/de-DE.rc @@ -0,0 +1,33 @@ +/* + * PROJECT: ReactOS FontExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: German resource translation + * COPYRIGHT: Copyright 2021 Joachim Henze (Joachim.Henze(a)reactos.org) + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_REACTOS_FONTS_FOLDER "ReactOS Schriftartenordner" +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Schriftartname" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Dateiname" + IDS_COL_SIZE "Größe" + IDS_COL_MODIFIED "Geändert" + IDS_COL_ATTR "Attribute" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Ö&ffnen" +END

1 0

[reactos] 01/01: [FONTEXT] Improve it-IT.rc comments
by Joachim Henze 18 Jul '21

18 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b98717c6a8969675f205… commit 7b98717c6a8969675f20589882f9849b0ad4148e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jul 18 23:56:31 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jul 18 23:56:31 2021 +0200 [FONTEXT] Improve it-IT.rc comments addendum to (#831) --- dll/shellext/fontext/lang/it-IT.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/fontext/lang/it-IT.rc b/dll/shellext/fontext/lang/it-IT.rc index 0fc5ec71f20..137435a3a01 100644 --- a/dll/shellext/fontext/lang/it-IT.rc +++ b/dll/shellext/fontext/lang/it-IT.rc @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Font Text + * PROJECT: ReactOS FontExt Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Italian translation resource * COPYRIGHT: Copyright 2018 George Bișoc (george.bisoc(a)reactos.org) */ - + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE

1 0

[reactos] 01/01: [SYSSETUP] Update de-DE.rc
by Joachim Henze 18 Jul '21

18 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1078340f5c611f15755f8… commit 1078340f5c611f15755f80b546002a8992692fa1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jul 18 17:51:44 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jul 18 17:51:44 2021 +0200 [SYSSETUP] Update de-DE.rc The buttons name on the last dialog of 2nd stage is "Fertig" and not "Beenden". So make the help-texts consistent with that. --- dll/win32/syssetup/lang/de-DE.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 083b1c3fa8e..e7eaf437d63 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -121,9 +121,9 @@ CAPTION "Fertigstellung der Installation" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Fertigstellung des ReactOS Installationsassistenten", IDC_FINISHTITLE, 115, 9, 195, 37 - LTEXT "Die Installation von ReactOS wurde erfolgreich fertiggestellt.\n\nWenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 115, 58, 195, 100 + LTEXT "Die Installation von ReactOS wurde erfolgreich fertiggestellt.\n\nWenn Sie auf Fertig klicken, wird der Computer neu gestartet.", IDC_STATIC, 115, 58, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Entfernen Sie die CD und klicken Sie auf Beenden, um den Computer neuzustarten.", IDC_STATIC, 115, 160, 195, 31 + LTEXT "Entfernen Sie die CD und klicken Sie auf Fertig, um den Computer neuzustarten.", IDC_STATIC, 115, 160, 195, 31 END IDD_GPL DIALOGEX 0, 0, 333, 230

1 0

[reactos] 01/01: [EVENTVWR] Add a context menu to TreeView items. (#3828)
by Jose Carlos Jesus 17 Jul '21

17 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4bfe8f78bd359e0a2fa9… commit e4bfe8f78bd359e0a2fa9e6ca4bdbd105ea2b78d Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Jul 17 18:26:48 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 17 19:26:48 2021 +0200 [EVENTVWR] Add a context menu to TreeView items. (#3828) Same as in Windows XP/2003. + Specify a default extension when opening or saving an event-log file. --- base/applications/mscutils/eventvwr/eventvwr.c | 33 ++++++++++++++++++++--- base/applications/mscutils/eventvwr/lang/bg-BG.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/de-DE.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/el-GR.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/en-US.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/es-ES.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/fr-FR.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/he-IL.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/it-IT.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/ja-JP.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/ko-KR.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/no-NO.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/pl-PL.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/pt-BR.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/pt-PT.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/ro-RO.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/ru-RU.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/sk-SK.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/sq-AL.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/sv-SE.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/tr-TR.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/uk-UA.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/zh-CN.rc | 13 +++++++++ base/applications/mscutils/eventvwr/lang/zh-TW.rc | 13 +++++++++ base/applications/mscutils/eventvwr/resource.h | 1 + 26 files changed, 343 insertions(+), 3 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 94e67095b73..fad78d4e3bc 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -3271,7 +3271,7 @@ InitInstance(HINSTANCE hInstance) sfn.lpstrFilter = szSaveFilter; sfn.lpstrInitialDir = NULL; sfn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_SHAREAWARE; - sfn.lpstrDefExt = NULL; + sfn.lpstrDefExt = L"evt"; ShowWindow(hwndMainWindow, Settings.wpPos.showCmd); UpdateWindow(hwndMainWindow); @@ -3673,11 +3673,38 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_INITMENUPOPUP: lParam = lParam; break; +#endif case WM_CONTEXTMENU: - lParam = lParam; + { + RECT rc; + HTREEITEM hItem; + TVHITTESTINFO hInfo = {0}; + + INT xPos = GET_X_LPARAM(lParam); + INT yPos = GET_Y_LPARAM(lParam); + + GetWindowRect(hwndTreeView, &rc); + hInfo.pt.x = xPos - rc.left; + hInfo.pt.y = yPos - rc.top; + + hItem = TreeView_HitTest(hwndTreeView, &hInfo); + if (hItem) + { + TreeView_SelectItem(hwndTreeView, hItem); + + if (TreeView_GetParent(hwndTreeView, hItem)) + { + HMENU hCtxMenu = GetSubMenu(LoadMenuW(hInst, MAKEINTRESOURCEW(IDM_EVENTWR_CTX)), 0); + + DWORD dwCmdID = TrackPopupMenuEx(hCtxMenu, + TPM_LEFTALIGN | TPM_TOPALIGN | TPM_NONOTIFY | TPM_RETURNCMD, + xPos, yPos, hWnd, NULL); + SendMessageW(hWnd, WM_COMMAND, (WPARAM)dwCmdID, (LPARAM)hwndTreeView); + } + } break; -#endif + } case WM_SETCURSOR: { diff --git a/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/base/applications/mscutils/eventvwr/lang/bg-BG.rc index 3dd9bcca011..8c0f17dcb8c 100644 --- a/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -38,6 +38,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index 391c6ac3fbc..d81bdeb866e 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -38,6 +38,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/de-DE.rc b/base/applications/mscutils/eventvwr/lang/de-DE.rc index 41157b6fc57..15d7513c4bd 100644 --- a/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/el-GR.rc b/base/applications/mscutils/eventvwr/lang/el-GR.rc index 87a7f74ebfd..7a3f50ade65 100644 --- a/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/en-US.rc b/base/applications/mscutils/eventvwr/lang/en-US.rc index c46d2aed5c0..7c0ab9ad289 100644 --- a/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -46,6 +46,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/es-ES.rc b/base/applications/mscutils/eventvwr/lang/es-ES.rc index a3b07afa669..61b25f5f5a6 100644 --- a/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/base/applications/mscutils/eventvwr/lang/fr-FR.rc index 4fe1bc9a56c..72ae329631f 100644 --- a/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/he-IL.rc b/base/applications/mscutils/eventvwr/lang/he-IL.rc index 60628fc6fa0..cc3aeafe816 100644 --- a/base/applications/mscutils/eventvwr/lang/he-IL.rc +++ b/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/it-IT.rc b/base/applications/mscutils/eventvwr/lang/it-IT.rc index 4f16211f663..9ab86233288 100644 --- a/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index 48b1bb86c1c..36b294476ee 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index 39f6f6a50c1..fd59e816a82 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/no-NO.rc b/base/applications/mscutils/eventvwr/lang/no-NO.rc index 345d3c9dc21..3d4c5510fc3 100644 --- a/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -38,6 +38,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index dbd32e5235e..d5776b7d000 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -42,6 +42,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/base/applications/mscutils/eventvwr/lang/pt-BR.rc index 470eb9ef43e..0928635bbe0 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/pt-PT.rc b/base/applications/mscutils/eventvwr/lang/pt-PT.rc index e772a447c92..5e5f06808a9 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-PT.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-PT.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Abrir o ficheiro de registo...", IDM_OPEN_EVENTLOG + MENUITEM "&Guardar ficheiro de registo como...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Limpar todos os Eventos", IDM_CLEAR_EVENTS + MENUITEM "&Alterar o nome\tF2", IDM_RENAME_EVENTLOG + MENUITEM "&Definições...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index 376cee163f2..d58eef4cd48 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -43,6 +43,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/base/applications/mscutils/eventvwr/lang/ru-RU.rc index ab2c5dddd69..2707591fb6d 100644 --- a/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/base/applications/mscutils/eventvwr/lang/sk-SK.rc index 072972af511..fd82f2a3224 100644 --- a/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -43,6 +43,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/base/applications/mscutils/eventvwr/lang/sq-AL.rc index 7138479a413..b15aa7a76a7 100644 --- a/base/applications/mscutils/eventvwr/lang/sq-AL.rc +++ b/base/applications/mscutils/eventvwr/lang/sq-AL.rc @@ -46,6 +46,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index 56e5e79f08a..8b49756f82c 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/base/applications/mscutils/eventvwr/lang/tr-TR.rc index 0d1cc0c44b7..f3e9612e7ab 100644 --- a/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -46,6 +46,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/base/applications/mscutils/eventvwr/lang/uk-UA.rc index 0ee63800b8e..67fdb14f99e 100644 --- a/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index 89a4193cf21..d4d4bf3a668 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -40,6 +40,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/lang/zh-TW.rc b/base/applications/mscutils/eventvwr/lang/zh-TW.rc index 7e8a4fc39fe..ff4e3d26026 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-TW.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-TW.rc @@ -41,6 +41,19 @@ BEGIN END END +IDM_EVENTWR_CTX MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG + MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM SEPARATOR + MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS + MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + END +END + IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT diff --git a/base/applications/mscutils/eventvwr/resource.h b/base/applications/mscutils/eventvwr/resource.h index 7cc384c7669..db8f341b9a1 100644 --- a/base/applications/mscutils/eventvwr/resource.h +++ b/base/applications/mscutils/eventvwr/resource.h @@ -79,6 +79,7 @@ #define IDM_SAVE_SETTINGS 32784 #define IDM_HELP 32785 #define IDM_ABOUT 32786 +#define IDM_EVENTWR_CTX 32787 /* String IDs */

1 0

[reactos] 01/01: [ADVAPI32][SERVICES] Use the context handle to encrypt and decrypt service passwords
by Eric Kohl 17 Jul '21

17 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cae349811a5737127113… commit 4cae349811a5737127113c3135f9e2d3f3d5e4fb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 17 16:26:16 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 17 16:26:16 2021 +0200 [ADVAPI32][SERVICES] Use the context handle to encrypt and decrypt service passwords --- base/system/services/config.c | 3 ++- base/system/services/rpcserver.c | 8 +++++--- base/system/services/services.h | 1 + dll/win32/advapi32/service/scm.c | 15 ++++++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/base/system/services/config.c b/base/system/services/config.c index a4b809b76f7..db1b0dafc79 100644 --- a/base/system/services/config.c +++ b/base/system/services/config.c @@ -699,6 +699,7 @@ done: DWORD ScmDecryptPassword( + _In_ PVOID ContextHandle, _In_ PBYTE pPassword, _In_ DWORD dwPasswordSize, _Out_ PWSTR *pClearTextPassword) @@ -709,7 +710,7 @@ ScmDecryptPassword( NTSTATUS Status; /* Get the session key */ - Status = SystemFunction028(NULL, + Status = SystemFunction028(ContextHandle, SessionKey); if (!NT_SUCCESS(Status)) { diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 136d86b1e50..741dc1c84e1 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -4,7 +4,7 @@ * FILE: base/system/services/rpcserver.c * PURPOSE: RPC server interface for the advapi32 calls * COPYRIGHT: Copyright 2005-2006 Eric Kohl - * Copyright 2006-2007 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright 2006-2007 Hervé Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> */ @@ -2208,7 +2208,8 @@ RChangeServiceConfigW( if (*(LPWSTR)lpPassword != 0) { /* Decrypt the password */ - dwError = ScmDecryptPassword(lpPassword, + dwError = ScmDecryptPassword(hService, + lpPassword, dwPwSize, &lpClearTextPassword); if (dwError != ERROR_SUCCESS) @@ -2609,7 +2610,8 @@ RCreateServiceW( if (lpPassword != NULL && *(LPWSTR)lpPassword != 0) { /* Decrypt the password */ - dwError = ScmDecryptPassword(lpPassword, + dwError = ScmDecryptPassword(hSCManager, + lpPassword, dwPwSize, &lpClearTextPassword); if (dwError != ERROR_SUCCESS) diff --git a/base/system/services/services.h b/base/system/services/services.h index 6a9dd5d3783..cbaa4a93329 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -155,6 +155,7 @@ ScmDeleteRegKey( DWORD ScmDecryptPassword( + _In_ PVOID ContextHandle, _In_ PBYTE pPassword, _In_ DWORD dwPasswordSize, _Out_ PWSTR *pDecryptedPassword); diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index f373f311add..621e5753247 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -171,6 +171,7 @@ ScmRpcStatusToWinError(RPC_STATUS Status) static DWORD ScmEncryptPassword( + _In_ PVOID ContextHandle, _In_ PCWSTR pClearTextPassword, _Out_ PBYTE *pEncryptedPassword, _Out_ PDWORD pEncryptedPasswordSize) @@ -181,7 +182,7 @@ ScmEncryptPassword( NTSTATUS Status; /* Get the session key */ - Status = SystemFunction028(NULL, + Status = SystemFunction028(ContextHandle, SessionKey); if (!NT_SUCCESS(Status)) { @@ -417,7 +418,8 @@ ChangeServiceConfigA(SC_HANDLE hService, (int)(strlen(lpPassword) + 1)); /* Encrypt the unicode password */ - dwError = ScmEncryptPassword(lpPasswordW, + dwError = ScmEncryptPassword(hService, + lpPasswordW, &lpEncryptedPassword, &dwPasswordSize); if (dwError != ERROR_SUCCESS) @@ -517,7 +519,8 @@ ChangeServiceConfigW(SC_HANDLE hService, if (lpPassword != NULL) { - dwError = ScmEncryptPassword(lpPassword, + dwError = ScmEncryptPassword(hService, + lpPassword, &lpEncryptedPassword, &dwPasswordSize); if (dwError != ERROR_SUCCESS) @@ -742,7 +745,8 @@ CreateServiceA(SC_HANDLE hSCManager, (int)(strlen(lpPassword) + 1)); /* Encrypt the password */ - dwError = ScmEncryptPassword(lpPasswordW, + dwError = ScmEncryptPassword(hSCManager, + lpPasswordW, &lpEncryptedPassword, &dwPasswordSize); if (dwError != ERROR_SUCCESS) @@ -856,7 +860,8 @@ CreateServiceW(SC_HANDLE hSCManager, if (lpPassword != NULL) { /* Encrypt the password */ - dwError = ScmEncryptPassword(lpPassword, + dwError = ScmEncryptPassword(hSCManager, + lpPassword, &lpEncryptedPassword, &dwPasswordSize); if (dwError != ERROR_SUCCESS)

1 0

[reactos] 01/01: [IMM32] Rewrite ImmGetStatusWindowPos (#3824)
by Katayama Hirofumi MZ 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3965c9373297284e1986d… commit 3965c9373297284e1986d11735d4a575e54e130f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 16 07:30:55 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jul 16 07:30:55 2021 +0900 [IMM32] Rewrite ImmGetStatusWindowPos (#3824) Rewrite ImmGetStatusWindowPos function. CORE-11700 --- dll/win32/imm32/imm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e93c522d2d9..dc62b77bfd2 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -2369,16 +2369,21 @@ UINT WINAPI ImmGetRegisterWordStyleW( */ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - InputContextData *data = get_imc_data(hIMC); + LPINPUTCONTEXT pIC; + BOOL ret; - TRACE("(%p, %p)\n", hIMC, lpptPos); + TRACE("ImmGetStatusWindowPos(%p, %p)\n", hIMC, lpptPos); - if (!data || !lpptPos) + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) return FALSE; - *lpptPos = data->IMC.ptStatusWndPos; + ret = !!(pIC->fdwInit & INIT_STATUSWNDPOS); + if (ret) + *lpptPos = pIC->ptStatusWndPos; - return TRUE; + ImmUnlockIMC(hIMC); + return ret; } /***********************************************************************

1 0

[reactos] 01/01: [IMM32] Rewrite ImmGetCandidateWindow (#3823)
by Katayama Hirofumi MZ 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0966e3214637d5d37be3b… commit 0966e3214637d5d37be3bf1078229dfc9022e702 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 16 03:04:00 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jul 16 03:04:00 2021 +0900 [IMM32] Rewrite ImmGetCandidateWindow (#3823) Rewrite ImmGetCandidateWindow function. CORE-11700 --- dll/win32/imm32/imm.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 8c40da91928..e93c522d2d9 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); #define IMM_INIT_MAGIC 0x19650412 +#define IMM_INVALID_CANDFORM ULONG_MAX + BOOL WINAPI User32InitializeImmEntryTable(DWORD); typedef struct _tagImmHkl{ @@ -1449,22 +1451,25 @@ DWORD WINAPI ImmGetCandidateListW( BOOL WINAPI ImmGetCandidateWindow( HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) { - InputContextData *data = get_imc_data(hIMC); - - TRACE("%p, %d, %p\n", hIMC, dwIndex, lpCandidate); - - if (!data || !lpCandidate) - return FALSE; + BOOL ret = FALSE; + LPINPUTCONTEXT pIC; + LPCANDIDATEFORM pCF; - if (dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) - return FALSE; + TRACE("ImmGetCandidateWindow(%p, %lu, %p)\n", hIMC, dwIndex, lpCandidate); - if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) return FALSE; - *lpCandidate = data->IMC.cfCandForm[dwIndex]; + pCF = &pIC->cfCandForm[dwIndex]; + if (pCF->dwIndex != IMM_INVALID_CANDFORM) + { + *lpCandidate = *pCF; + ret = TRUE; + } - return TRUE; + ImmUnlockIMC(hIMC); + return ret; } static VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW)

1 0

[reactos] 01/01: [NTOS:PS] Support using QUOTA_LIMITS_EX in NtSetInformationProcess(ProcessQuotaLimits)
by Hervé Poussineau 15 Jul '21

15 Jul '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad370238d75a8caa12e1e… commit ad370238d75a8caa12e1ef061c1c84ab440db2fe Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Jul 15 08:55:06 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jul 15 19:33:45 2021 +0200 [NTOS:PS] Support using QUOTA_LIMITS_EX in NtSetInformationProcess(ProcessQuotaLimits) Both QUOTA_LIMITS and QUOTA_LIMITS_EX are already supported in PspSetQuotaLimits, but this was broken by a330b56787951d897eec0706b4649a452f8ba623 --- ntoskrnl/include/internal/ps_i.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/ps_i.h b/ntoskrnl/include/internal/ps_i.h index 3e54c27b636..21f8368fa88 100644 --- a/ntoskrnl/include/internal/ps_i.h +++ b/ntoskrnl/include/internal/ps_i.h @@ -27,7 +27,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( QUOTA_LIMITS, ULONG, - ICIF_QUERY | ICIF_SET + ICIF_QUERY | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), /* ProcessIoCounters */

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2021