Ros-diffs

ros-diffs@reactos.org

10 participants
80994 discussions

[reactos] 04/07: [KMTEST/x64] Fix tests for RtlCaptureContextKM

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a54be9726d7fc4e38479a… commit a54be9726d7fc4e38479a5141f83e3f90f565ad0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 13 14:19:27 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 18 10:22:26 2024 +0300 [KMTEST/x64] Fix tests for RtlCaptureContextKM --- .../apitests/rtl/amd64/RtlCaptureContext.c | 60 ++++++++++++++++------ 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/modules/rostests/apitests/rtl/amd64/RtlCaptureContext.c b/modules/rostests/apitests/rtl/amd64/RtlCaptureContext.c index 80917428485..286d6bfd5d8 100644 --- a/modules/rostests/apitests/rtl/amd64/RtlCaptureContext.c +++ b/modules/rostests/apitests/rtl/amd64/RtlCaptureContext.c @@ -132,20 +132,6 @@ START_TEST(RtlCaptureContext) ok_eq_hex(CapturedContext.FltSave.DataOffset, 0x00890088); ok_eq_hex(CapturedContext.FltSave.DataSelector, 0x008a); ok_eq_hex(CapturedContext.FltSave.Reserved3, 0x0000); -#else - ok_eq_hex(CapturedContext.FltSave.ControlWord, 0xcccc); - ok_eq_hex(CapturedContext.FltSave.StatusWord, 0xcccc); - ok_eq_hex(CapturedContext.FltSave.TagWord, 0xcc); - ok_eq_hex(CapturedContext.FltSave.Reserved1, 0xcc); - ok_eq_hex(CapturedContext.FltSave.MxCsr_Mask, 0xcccccccc); - ok_eq_hex(CapturedContext.FltSave.ErrorOpcode, 0xcccc); - ok_eq_hex(CapturedContext.FltSave.ErrorOffset, 0xcccccccc); - ok_eq_hex(CapturedContext.FltSave.ErrorSelector, 0xcccc); - ok_eq_hex(CapturedContext.FltSave.Reserved2, 0xcccc); - ok_eq_hex(CapturedContext.FltSave.DataOffset, 0xcccccccc); - ok_eq_hex(CapturedContext.FltSave.DataSelector, 0xcccc); - ok_eq_hex(CapturedContext.FltSave.Reserved3, 0xcccc); -#endif /* We get the value from OriginalContext.MxCsr, since we set that later in the wrapper */ ok_eq_hex(CapturedContext.FltSave.MxCsr, OriginalContext.MxCsr); @@ -167,14 +153,54 @@ START_TEST(RtlCaptureContext) ok_eq_hex64(CapturedContext.Legacy[6].High, OriginalContext.Legacy[6].High & 0xFF); ok_eq_hex64(CapturedContext.Legacy[7].Low, OriginalContext.Legacy[7].Low); ok_eq_hex64(CapturedContext.Legacy[7].High, OriginalContext.Legacy[7].High & 0xFF); +#else + ok_eq_hex(CapturedContext.FltSave.ControlWord, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.StatusWord, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.TagWord, 0xcc); + ok_eq_hex(CapturedContext.FltSave.Reserved1, 0xcc); + ok_eq_hex(CapturedContext.FltSave.MxCsr_Mask, 0xcccccccc); + ok_eq_hex(CapturedContext.FltSave.ErrorOpcode, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.ErrorOffset, 0xcccccccc); + ok_eq_hex(CapturedContext.FltSave.ErrorSelector, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.Reserved2, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.DataOffset, 0xcccccccc); + ok_eq_hex(CapturedContext.FltSave.DataSelector, 0xcccc); + ok_eq_hex(CapturedContext.FltSave.Reserved3, 0xcccc); + + /* We get the value from OriginalContext.MxCsr, since we set that later in the wrapper */ + ok_eq_hex(CapturedContext.FltSave.MxCsr, 0xcccccccc); + + /* Legacy floating point registers are truncated to 10 bytes */ + ok_eq_hex64(CapturedContext.Legacy[0].Low, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[0].High, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[1].Low, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[1].High, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[2].Low, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[2].High, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[3].Low, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[3].High, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[4].Low, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[4].High, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[5].Low, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[5].High, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[6].Low, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[6].High, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[7].Low, 0xcccccccccccccccc); + ok_eq_hex64(CapturedContext.Legacy[7].High, 0xcccccccccccccccc); +#endif /* We don't pass in segments, but expect the default values */ - ok_eq_hex(CapturedContext.SegCs, 0x33); ok_eq_hex(CapturedContext.SegDs, 0x2b); ok_eq_hex(CapturedContext.SegEs, 0x2b); ok_eq_hex(CapturedContext.SegFs, 0x53); ok_eq_hex(CapturedContext.SegGs, 0x2b); +#ifndef KMT_KERNEL_MODE // User mode + ok_eq_hex(CapturedContext.SegCs, 0x33); ok_eq_hex(CapturedContext.SegSs, 0x2b); +#else + ok_eq_hex(CapturedContext.SegCs, 0x10); + ok_eq_hex(CapturedContext.SegSs, 0x18); +#endif /* For Rsp and Rip we get the expected value back from the asm wrapper */ ok_eq_hex64(CapturedContext.Rsp, InOutContext.Rsp); @@ -212,7 +238,9 @@ START_TEST(RtlCaptureContext) ok_eq_hex64(InOutContext.R15, OriginalContext.R15); /* Eflags is changed (parity is flaky) */ +#ifndef KMT_KERNEL_MODE // User mode ok_eq_hex64(InOutContext.EFlags & ~0x04, OriginalContext.EFlags & 0x782); +#endif /* MxCsr is the one we passed in in OriginalContext.MxCsr */ ok_eq_hex(InOutContext.MxCsr, OriginalContext.MxCsr); @@ -235,7 +263,9 @@ START_TEST(RtlCaptureContext) ok_eq_hex64(CapturedContext.EFlags, OriginalContext.EFlags | 2); /* Parity flag is flaky */ +#ifndef KMT_KERNEL_MODE // User mode ok_eq_hex64(InOutContext.EFlags & ~4, CapturedContext.EFlags); +#endif /* MxCsr is captured/returned as passed in */ ok_eq_hex64(InOutContext.MxCsr, CapturedContext.MxCsr);

3 months, 3 weeks

[reactos] 03/07: [COM_APITEST] Fix 2 tests to pass on Windows 2003

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70529929735e8db1918f8… commit 70529929735e8db1918f88a6461167587467a36f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 13 14:06:09 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 18 10:22:26 2024 +0300 [COM_APITEST] Fix 2 tests to pass on Windows 2003 --- modules/rostests/apitests/com/com_apitest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index c60ac28d451..1241f823fa5 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -205,8 +205,8 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IMenuPopup), TRUE }, { ID_NAME(IID_IModalWindow) }, { ID_NAME(IID_IMoniker) }, - { ID_NAME(IID_IMruDataList) }, - { ID_NAME(IID_IMruPidlList) }, + { ID_NAME(IID_IMruDataList), TRUE }, + { ID_NAME(IID_IMruPidlList), TRUE }, { ID_NAME(IID_IMultiMonitorDockingSite), TRUE }, { ID_NAME(IID_IMultiQI), TRUE }, { ID_NAME(IID_INameSpaceTreeControl), TRUE },

3 months, 3 weeks

[reactos] 02/07: [TESTS] Disable cmd:reactos, it's broken

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73c6e99e14cc2155bb3e8… commit 73c6e99e14cc2155bb3e89fd5b1c0178544a1144 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 13 14:02:59 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 18 10:22:26 2024 +0300 [TESTS] Disable cmd:reactos, it's broken --- modules/rostests/win32/cmd/testlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/win32/cmd/testlist.c b/modules/rostests/win32/cmd/testlist.c index bf8b9f138e7..938165372d2 100644 --- a/modules/rostests/win32/cmd/testlist.c +++ b/modules/rostests/win32/cmd/testlist.c @@ -7,6 +7,6 @@ extern void func_reactos(void); const struct test winetest_testlist[] = { - { "reactos", func_reactos }, + //{ "reactos", func_reactos }, This test is broken { 0, 0 } };

3 months, 3 weeks

[reactos] 01/07: [BROWSEUI_APITEST] Comment out tests that fail on Windows

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5140a990fee96f6cb9fce… commit 5140a990fee96f6cb9fce1b268a1896d70ae60cd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 13 14:00:14 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 18 10:22:26 2024 +0300 [BROWSEUI_APITEST] Comment out tests that fail on Windows @Katayama Hirofumi please investigate. --- modules/rostests/apitests/browseui/IAutoComplete.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/browseui/IAutoComplete.cpp b/modules/rostests/apitests/browseui/IAutoComplete.cpp index 6afff3d181b..16ffb54e1c5 100644 --- a/modules/rostests/apitests/browseui/IAutoComplete.cpp +++ b/modules/rostests/apitests/browseui/IAutoComplete.cpp @@ -449,7 +449,7 @@ DoTestCaseA(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | LVS_NOCOLUMNHEADER | \ LVS_OWNERDATA | LVS_OWNERDRAWFIXED | LVS_SINGLESEL | LVS_REPORT) // 0x54005405 if (bLong) - ok(style == LIST_STYLE_1, "style was 0x%08lx\n", style); + (void)0; // ok(style == LIST_STYLE_1, "style was 0x%08lx\n", style); broken on Windows else ok(style == LIST_STYLE_2, "style was 0x%08lx\n", style); ok_long(exstyle, 0); @@ -493,7 +493,7 @@ DoTestCaseA(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, // check item count INT nListCount = ListView_GetItemCount(hwndList); if (nListCount < 1000) - ok_int(nListCount, nCount); + (void)0; // ok_int(nListCount, nCount); broken on Windows else ok_int(nListCount, 1000);

3 months, 3 weeks

[reactos] 01/01: [LICCPA] Update Romanian (ro-RO) translation (#7295)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8c7597b17a731b16be31… commit e8c7597b17a731b16be319da1d3822b1fd98d1b0 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Sep 18 02:10:05 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 18 01:10:05 2024 +0200 [LICCPA] Update Romanian (ro-RO) translation (#7295) --- dll/cpl/liccpa/lang/ro-RO.rc | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dll/cpl/liccpa/lang/ro-RO.rc b/dll/cpl/liccpa/lang/ro-RO.rc index b11cf106bdf..e655ea4df75 100644 --- a/dll/cpl/liccpa/lang/ro-RO.rc +++ b/dll/cpl/liccpa/lang/ro-RO.rc @@ -1,33 +1,35 @@ /* - * FILE: dll/cpl/liccpa/lang/ro-RO.rc - * ReactOS Project (https://reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Exploitation System + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_PROPPAGE1 DIALOGEX 20, 40, 315, 104 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU -CAPTION "Alegeți modul de licențiere" +CAPTION "Alegere a modului de licențiere" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Mod de licențiere client", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "Mod de licențiere a clientului", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 CONTROL "Per dispozitiv sau per utilizator", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 147, 12 - CONTROL "Per server. Numărul de conexiuni paralele:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "Per server. Numărul de conexiuni simultane:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 CONTROL "Produs:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 - CONTROL "Con&firmă", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 - CONTROL "A&nulează", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 - CONTROL "Informații", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 + CONTROL "OK", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 + CONTROL "Revocare", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 + CONTROL "Ajutor", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 CONTROL "Replicare…", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 - CONTROL "Adaugă licențe", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 - CONTROL "Elimină licențe", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "Adăugare de licențe", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 + CONTROL "Eliminare de licențe", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 END STRINGTABLE BEGIN - IDS_CPLNAME_1 "Gestionar de licențe" - IDS_CPLDESCRIPTION_1 "Gestionar de licențe" + IDS_CPLNAME_1 "Manager de licențe" + IDS_CPLDESCRIPTION_1 "Manager de licențe" IDS_REACTOS "ReactOS - S.O. Public" END

3 months, 3 weeks

[reactos] 01/01: [ACPPAGE] Update Romanian (ro-RO) translation (#7294)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5fab184d80d2a95b926c9… commit 5fab184d80d2a95b926c91f2cde68dc5dd8483fc Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Sep 18 02:09:26 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 18 01:09:26 2024 +0200 [ACPPAGE] Update Romanian (ro-RO) translation (#7294) --- dll/shellext/acppage/lang/ro-RO.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/shellext/acppage/lang/ro-RO.rc b/dll/shellext/acppage/lang/ro-RO.rc index 76bcda12f18..ba528da4631 100644 --- a/dll/shellext/acppage/lang/ro-RO.rc +++ b/dll/shellext/acppage/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2016-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT @@ -15,20 +15,20 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Dacă aveți probleme cu acest program în ReactOS, selectați un sistem de operare care să fie raportat aplicației.\nConștientizați că aceasta este o funcționalitate în dezvoltare.", IDC_EXPLANATION, 7, 7, 210, 31 GROUPBOX "Modul de compatibilitate", IDC_COMPATGROUP, 7, 41, 210, 49 - CHECKBOX "Lansați acest program în modul de compatibilitate pentru:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 196, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Rulare a acestui program în modul de compatibilitate pentru:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 196, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Setări de afișare", -1, 7, 99, 210, 61, BS_GROUPBOX - CHECKBOX "Lansează în 256 culori", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Lansează în rezoluție de 640x480 pixeli", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Dezactivează temele vizuale", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - PUSHBUTTON "E&ditează modurile de compatibilitate…", IDC_EDITCOMPATIBILITYMODES, 87, 167, 130, 15 + CHECKBOX "Rulare în 256 culori", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Rulare în rezoluție de 640x480 pixeli", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Dezactivare a temelor vizuale", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + PUSHBUTTON "&Editre a modurilor de compatibilitate…", IDC_EDITCOMPATIBILITYMODES, 87, 167, 130, 15 LTEXT "",IDC_ENABLED_LAYERS,7,185,210,21 - CONTROL "Aflați mai multe despre <A>compatibilitate de program</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY + CONTROL "Aflați mai multe despre <A>compatibilitatea programelor</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Editează modurile de compatibilitate" +CAPTION "Editare a modurilor de compatibilitate" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL @@ -36,8 +36,8 @@ BEGIN PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED - PUSHBUTTON "Con&firmă",IDOK,174,114,60,14 - PUSHBUTTON "A&nulează",IDCANCEL,240,114,60,14 + PUSHBUTTON "OK",IDOK,174,114,60,14 + PUSHBUTTON "Revocare",IDCANCEL,240,114,60,14 LTEXT "Modurile disponibile",-1,6,6,76,8 LTEXT "Modurile selectate",-1,168,6,76,8 END @@ -45,7 +45,7 @@ END STRINGTABLE BEGIN IDS_COMPAT_TITLE "Compatibilitate" - IDS_FAILED_NETWORK "Modurile de compatibilitate nu pot fi setate pentru acest program deoarece rezidă pe o unitate de stocare în rețea." + IDS_FAILED_NETWORK "Modurile de compatibilitate nu pot fi setate pentru acest program pentru că este un disc de rețea." IDS_FAILED_PROTECTED "Modurile de compatibilitate nu pot fi setate pentru acest program deoarece este parte din ReactOS." END

3 months, 3 weeks

[reactos] 01/01: [SHUTDOWN] Update Romanian (ro-RO) translation (#7293)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f9723ae3b4078735fa8b… commit 8f9723ae3b4078735fa8bde64ff87fcc8843f20a Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Sep 18 02:08:22 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 18 01:08:22 2024 +0200 [SHUTDOWN] Update Romanian (ro-RO) translation (#7293) --- base/applications/shutdown/lang/ro-RO.rc | 84 ++++++++++++++++---------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/base/applications/shutdown/lang/ro-RO.rc b/base/applications/shutdown/lang/ro-RO.rc index b583e466b8b..4ab07099529 100644 --- a/base/applications/shutdown/lang/ro-RO.rc +++ b/base/applications/shutdown/lang/ro-RO.rc @@ -14,24 +14,24 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Închidere la distanță" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Con&firmă", IDC_OK, 125, 232, 50, 14 - PUSHBUTTON "A&nulează", IDC_CANCEL, 178, 232, 50, 14 - LTEXT "C&alculatoare:", IDC_STATIC, 9, 9, 35, 36 + DEFPUSHBUTTON "OK", IDC_OK, 125, 232, 50, 14 + PUSHBUTTON "Revocare", IDC_CANCEL, 178, 232, 50, 14 + LTEXT "&Computere:", IDC_STATIC, 9, 9, 35, 36 LISTBOX IDC_COMPUTER_LIST, 8, 19, 162, 55 PUSHBUTTON "A&dăugare…", IDC_ADD_SYSTEM, 179, 19, 50, 14 - PUSHBUTTON "&Elimină", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED - PUSHBUTTON "Spe&cificare…", IDC_BROWSE_SYSTEM, 179, 53, 50, 14 + PUSHBUTTON "&Eliminare", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED + PUSHBUTTON "&Specificare…", IDC_BROWSE_SYSTEM, 179, 53, 50, 14 LTEXT "Acțiune", IDC_ACTION, 11, 81, 20, 14 COMBOBOX IDC_ACTION_TYPE, 37, 79, 129, 14, WS_TABSTOP | CBS_DROPDOWN - CHECKBOX "A&vertizează utilizatorii", IDC_WARN_USERS, 175, 79, 55, 14, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Avertismente afișate pentru", IDC_SHOW_WARN_ONE, 11, 99, 65, 14 + CHECKBOX "A&vertizare a utilizatorilor", IDC_WARN_USERS, 175, 79, 55, 14, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Afișare de avertismente pentru", IDC_SHOW_WARN_ONE, 11, 99, 65, 14 EDITTEXT IDC_SHOW_WARN, 78, 97, 41, 14 LTEXT "secunde", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 - GROUPBOX "Jurnal de evenimente-închideri", IDC_STATIC, 5, 114, 224, 114 + GROUPBOX "Închidere Urmăritorul de evenimente", IDC_STATIC, 5, 114, 224, 114 LTEXT "Motiv:", IDC_STATIC, 16, 130, 27, 8 CHECKBOX "Planificat", IDC_PLANNED, 175, 130, 40, 12, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_REASON_CODE, 17, 142, 198, 13, WS_TABSTOP | CBS_DROPDOWN - LTEXT "Co&mentariu:", IDC_COMMENT_CAPTION, 16, 159, 38, 8 + LTEXT "C&omentariu:", IDC_COMMENT_CAPTION, 16, 159, 38, 8 EDITTEXT IDC_COMMENT_TEXT, 17, 171, 198, 50, WS_VSCROLL END @@ -41,59 +41,59 @@ BEGIN IDS_USAGE "Utilitar de închidere ReactOS\n\ \n\ Utilizare: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ - [/m \\\\calculator][/t xxx][/d [p|u:]xx:yy [/c «comentariu»]]\n\ + [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c «comentariu»]]\n\ \n\ Fără argumente sau /? Este afișat acest manual.\n\ - /i Afișarea interfeței grafice de utilizator (GUI). Această\n\ - opțiune trebuie să preceadă.\n\ - /l Desautentificare locală. Nu poate fi utilizată cu /m sau /d.\n\ - /s Închidere calculator.\n\ - /r Repornire calculator.\n\ - /g Repornire calculator plus repornirea tuturor aplicațiilor\n\ + /i Afișează interfeța grafică de utilizator (GUI). Această\n\ + opțiune trebuie să fie prima.\n\ + /l Face Log off local. Nu poate fi utilizată cu /m sau /d.\n\ + /s Închide computerul.\n\ + /r Repornește computerul.\n\ + /g Repornește computerul și se repornesc toate aplicațiile\n\ înregistrate.\n\ - /a Anularea unei închideri întârziate. Poate fi utilizată doar în\n\ + /a Anulează o închidere întârziată. Poate fi utilizată doar în\n\ perioada de întârziere.\n\ - /p Închiderea calculatorului fără avertisment sau cronometrare\n\ - inversă. Poate fi utilizată cu /d sau /f.\n\ - /h Hibernarea calculatorului local. Utilizabilă cu /f.\n\ - /e Documentarea motivului pentru închiderea neprevăzută.\n\ - /m \\\\calculator Specificarea unui calculator țintă (adresă UNC/IP).\n\ + /p Închide computerul local fără nicio cronometrare sau\n\ + avertisment. Poate fi utilizată cu /d sau /f.\n\ + /h Hibernează computerului local. Utilizabilă cu /f.\n\ + /e Documentează motivului pentru închiderea neprevăzută.\n\ + /m \\\\computer Specificarea unui computer țintă (adresă UNC/IP).\n\ /t xxx Setează cronometrarea unei perioade de xxx secunde înainte de\n\ închidere. Domeniul de valori valide este de la 0 la 315360000\n\ (10 ani), 30 fiind valoarea implicită.\n\ - /c „comentariu” Comentarea motivului pentru închidere sau repornire.\n\ + /c ""comentariu"" Comentează motivului pentru închidere sau repornire.\n\ Sunt permise maxim 512 caractere.\n\ - /f Forțarea închiderii aplicațiilor curente fără avertizarea\n\ - utilizatorilor. Dacă nu sunt specificați alți parametri, această\n\ - opțiune implică și deautentificarea.\n\ + /f Forțează închiderea aplicațiilor curente fără avertizarea\n\ + utilizatorilor. Dacă specificați alți parametri, această\n\ + opțiune implică și log off-ul.\n\ /d [p|u:]xx:yy Oferă un ca motiv un cod pentru închidere sau repornire.\n\ - p indică planificarea închiderii sau repornirii calculatorului.\n\ + p indică planificarea închiderii sau repornirii computerului.\n\ u indică faptul că motivul este definit de utilizator.\n\ Dacă nici p nici u nu sunt specificați, închiderea sau repornirea\n\ nu sunt planificate.\n\ xx este codul pentru motivul major (întreg pozitiv sub 256).\n\ yy este codul pentru motivul minor (întreg pozitiv sub 65536).\n" - IDS_ERROR_SHUTDOWN_REBOOT "Eroare: Închiderea și repornirea nu pot fi în același timp.\n" + IDS_ERROR_SHUTDOWN_REBOOT "Eroare: Imposibil de închis și repornit în același timp.\n" IDS_ERROR_TIMEOUT "Eroare: Valoarea %u a cronometrului este în afara limitelor valide (0-315360000).\n" - IDS_ERROR_ABORT "Eroare: Închiderea sistemului nu poate fi anulată.\n" - IDS_ERROR_LOGOFF "Eroare: Deautentificarea din sistem nu poate fi executată.\n" - IDS_ERROR_SHUTDOWN "Eroare: Sistemul nu poate fi închis.\n" - IDS_ERROR_RESTART "Eroare: Sistemul nu poate fi repornit.\n" + IDS_ERROR_ABORT "Eroare: Imposibil de anulat închiderea sistemului.\n" + IDS_ERROR_LOGOFF "Eroare: Imposibil de executat log off-ul din sistem.\n" + IDS_ERROR_SHUTDOWN "Eroare: Imposibil de închis sistemul.\n" + IDS_ERROR_RESTART "Eroare: Imposibil de repornit sistemul.\n" IDS_ERROR_MAX_COMMENT_LENGTH "Eroare: Numărul de caractere al comentariului depășește limita impusă de sistem.\n" - IDS_ERROR_HIBERNATE "Eroare: Sistemul nu poate fi pus în hibernare.\n" - IDS_ERROR_HIBERNATE_LOCAL "Eroare: Hibernarea nu poate fi comandată la distanță.\n" + IDS_ERROR_HIBERNATE "Eroare: Imposibil de trimis sistemul în modul de hibernare.\n" + IDS_ERROR_HIBERNATE_LOCAL "Eroare: Modul de hibernare nu poate fi pornit de la distanță.\n" IDS_ERROR_HIBERNATE_ENABLED "Eroare: Modul de hibernare nu este activat.\n" IDS_ERROR_DIALOG_CAPTION "Închidere la distanță" - IDS_ERROR_DIALOG_INIT "Nu s-a putut afișa interfața grafică de utilizator." + IDS_ERROR_DIALOG_INIT "Imposibil de afișat interfața grafică de utilizator." END /* Remote shutdown action strings */ STRINGTABLE BEGIN - IDS_ACTION_SHUTDOWN "Închide sistemul" - IDS_ACTION_RESTART "Repornește sistemul" - IDS_ACTION_UNEXPECTED_SHUTDOWN "Adnotează închiderea neprevăzută" + IDS_ACTION_SHUTDOWN "Închidere a sistemului" + IDS_ACTION_RESTART "Repornire a sistemului" + IDS_ACTION_UNEXPECTED_SHUTDOWN "Adnotare a opririi neașteptate" END /* Remote shutdown reason strings */ @@ -106,8 +106,8 @@ BEGIN IDS_REASON_OS_RECONFIGURE "Sistem de operare: Reconfigurare" IDS_REASON_APP_MAINTENANCE "Aplicații: Mentenanță" IDS_REASON_APP_INSTALL "Aplicații: Instalare" - IDS_REASON_APP_UNRESPONSIVE "Aplicații: Neresponsivitate" - IDS_REASON_APP_UNSTABLE "Aplicații: Instabilitate" - IDS_REASON_SECURITY "Probleme de securitate" - IDS_REASON_NETWORK "Pierdere conexiune de rețea" + IDS_REASON_APP_UNRESPONSIVE "Aplicații: Nu răspunde" + IDS_REASON_APP_UNSTABLE "Aplicații: Instabil" + IDS_REASON_SECURITY "Problemă de securitate" + IDS_REASON_NETWORK "Pierdere a conexiunii la rețea" END

3 months, 3 weeks

[reactos] 01/01: [NTOS:MM] Properly handle execution in NX section

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96c65e94e1621efb8989a… commit 96c65e94e1621efb8989aa5ee93961ad1690c6ba Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Sep 9 17:05:53 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Sep 16 16:04:43 2024 +0300 [NTOS:MM] Properly handle execution in NX section This prevents processes from looping forever, thinking the fault was already resolbed, because the page is writable. --- ntoskrnl/mm/mmfault.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/mmfault.c b/ntoskrnl/mm/mmfault.c index cfd6d756d15..5dbdc7a8ac2 100644 --- a/ntoskrnl/mm/mmfault.c +++ b/ntoskrnl/mm/mmfault.c @@ -22,7 +22,8 @@ NTSTATUS NTAPI MmpAccessFault(KPROCESSOR_MODE Mode, ULONG_PTR Address, - BOOLEAN FromMdl) + BOOLEAN FromMdl, + ULONG FaultCode) { PMMSUPPORT AddressSpace; MEMORY_AREA* MemoryArea; @@ -36,6 +37,14 @@ MmpAccessFault(KPROCESSOR_MODE Mode, return(STATUS_UNSUCCESSFUL); } + /* Instruction fetch and the page is present. + This means the page is NX and we cannot do anything to "fix" it. */ + if (MI_IS_INSTRUCTION_FETCH(FaultCode)) + { + DPRINT1("Page fault instruction fetch at %p\n", Address); + return STATUS_ACCESS_VIOLATION; + } + /* * Find the memory area for the faulting address */ @@ -285,7 +294,7 @@ Retry: if (!MI_IS_NOT_PRESENT_FAULT(FaultCode)) { /* Call access fault */ - Status = MmpAccessFault(Mode, (ULONG_PTR)Address, TrapInformation ? FALSE : TRUE); + Status = MmpAccessFault(Mode, (ULONG_PTR)Address, TrapInformation ? FALSE : TRUE, FaultCode); } else {

3 months, 3 weeks

[reactos] 01/01: [RTL][KERNEL32][ROSAUTOTEST] Disable debug prompts during autotest

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd3c571d3627f6026f130… commit fd3c571d3627f6026f130122f07d6747a67b8ded Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Sep 10 20:00:24 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Sep 16 10:10:55 2024 +0300 [RTL][KERNEL32][ROSAUTOTEST] Disable debug prompts during autotest This fixes timeouts + reboots for user mode assertion failures on the testbots. As a bonus it now shows a backtrace. --- dll/win32/kernel32/client/proc.c | 6 ++++++ modules/rostests/rosautotest/main.cpp | 39 +++++++++++++++++++++++++++++++++++ sdk/include/ndk/pstypes.h | 3 ++- sdk/lib/rtl/assert.c | 6 ++++++ 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index b88212b3c59..669ede0e2f9 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -1628,6 +1628,12 @@ FatalExit(IN int ExitCode) CHAR Action[2]; DbgPrint("FatalExit...\n\n"); + /* Check for reactos specific flag (set by rosautotest) */ + if (RtlGetNtGlobalFlags() & FLG_DISABLE_DEBUG_PROMPTS) + { + RtlRaiseStatus(STATUS_FATAL_APP_EXIT); + } + while (TRUE) { DbgPrompt("A (Abort), B (Break), I (Ignore)? ", Action, sizeof(Action)); diff --git a/modules/rostests/rosautotest/main.cpp b/modules/rostests/rosautotest/main.cpp index d671696e6d0..e808d5da91a 100644 --- a/modules/rostests/rosautotest/main.cpp +++ b/modules/rostests/rosautotest/main.cpp @@ -7,6 +7,8 @@ #include "precomp.h" #include <cstdio> +#include <ndk/setypes.h> +#include <ndk/exfuncs.h> CConfiguration Configuration; @@ -43,6 +45,41 @@ IntPrintUsage() << " The test to be run. Needs to be a test of the specified module." << endl; } +static +VOID +SetNtGlobalFlags() +{ + ULONG NtGlobalFlags = 0; + BOOLEAN PrivilegeEnabled; + NTSTATUS Status; + + /* Enable SeDebugPrivilege */ + Status = RtlAdjustPrivilege(SE_DEBUG_PRIVILEGE, TRUE, FALSE, &PrivilegeEnabled); + if (!NT_SUCCESS(Status)) + { + DbgPrint("Failed to enable SeDebugPrivilege: 0x%08lx\n", Status); + return; + } + + /* Get current NtGlobalFlags */ + Status = NtQuerySystemInformation(SystemFlagsInformation, &NtGlobalFlags, sizeof(NtGlobalFlags), NULL); + if (!NT_SUCCESS(Status)) + { + DbgPrint("Failed to get NtGlobalFlags: 0x%08lx\n", Status); + return; + } + + /* Disable debug prompts */ + NtGlobalFlags |= FLG_DISABLE_DEBUG_PROMPTS; + + /* Set new NtGlobalFlags */ + Status = NtSetSystemInformation(SystemFlagsInformation, &NtGlobalFlags, sizeof(NtGlobalFlags)); + if (!NT_SUCCESS(Status)) + { + DbgPrint("Failed to set NtGlobalFlags: 0x%08lx\n", Status); + } +} + /** * Main entry point */ @@ -51,6 +88,8 @@ wmain(int argc, wchar_t* argv[]) { int ReturnValue = 1; + SetNtGlobalFlags(); + try { stringstream ss; diff --git a/sdk/include/ndk/pstypes.h b/sdk/include/ndk/pstypes.h index 3a47b04a560..155b2e37d89 100644 --- a/sdk/include/ndk/pstypes.h +++ b/sdk/include/ndk/pstypes.h @@ -83,7 +83,8 @@ extern POBJECT_TYPE NTSYSAPI PsJobType; #define FLG_ENABLE_HANDLE_TYPE_TAGGING 0x01000000 #define FLG_HEAP_PAGE_ALLOCS 0x02000000 #define FLG_DEBUG_INITIAL_COMMAND_EX 0x04000000 -#define FLG_VALID_BITS 0x07FFFFFF +#define FLG_DISABLE_DEBUG_PROMPTS 0x08000000 // ReactOS-specific +#define FLG_VALID_BITS 0x0FFFFFFF // // Flags for NtCreateProcessEx diff --git a/sdk/lib/rtl/assert.c b/sdk/lib/rtl/assert.c index 6f4facb6239..0a7e803ee31 100644 --- a/sdk/lib/rtl/assert.c +++ b/sdk/lib/rtl/assert.c @@ -42,6 +42,12 @@ RtlAssert(IN PVOID FailedAssertion, (PSTR)FileName, LineNumber); + /* Check for reactos specific flag (set by rosautotest) */ + if (RtlGetNtGlobalFlags() & FLG_DISABLE_DEBUG_PROMPTS) + { + RtlRaiseStatus(STATUS_ASSERTION_FAILURE); + } + /* Prompt for action */ DbgPrompt("Break repeatedly, break Once, Ignore, " "terminate Process or terminate Thread (boipt)? ",

3 months, 3 weeks

[reactos] 01/01: [RAPPS] Respect partial settings configuration (#7247)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=301675c112f65de2ae1f1… commit 301675c112f65de2ae1f1cc0a1378ecb90df9613 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Sep 16 00:51:53 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 16 00:51:53 2024 +0200 [RAPPS] Respect partial settings configuration (#7247) Instead of defaulting all settings if any setting is missing, respect any setting that is already set and default the rest. --- base/applications/rapps/settings.cpp | 89 ++++++++++++++++++++++++------------ base/applications/rapps/winmain.cpp | 5 -- 2 files changed, 59 insertions(+), 35 deletions(-) diff --git a/base/applications/rapps/settings.cpp b/base/applications/rapps/settings.cpp index b0a0c191ebd..b23c2dd7a49 100644 --- a/base/applications/rapps/settings.cpp +++ b/base/applications/rapps/settings.cpp @@ -8,6 +8,7 @@ #include "rapps.h" #include "settings.h" +#define SETTINGSSUBKEY L"Software\\ReactOS\\" RAPPS_NAME class SettingsField { @@ -109,7 +110,7 @@ class SettingsFieldString : public SettingsField LPCWSTR m_RegName; // key name in registery }; -void +static void AddInfoFields(ATL::CAtlList<SettingsField *> &infoFields, SETTINGS_INFO &settings) { infoFields.AddTail(new SettingsFieldBool(&(settings.bSaveWndPos), L"bSaveWndPos")); @@ -127,11 +128,9 @@ AddInfoFields(ATL::CAtlList<SettingsField *> &infoFields, SETTINGS_INFO &setting infoFields.AddTail(new SettingsFieldString((settings.szNoProxyFor), MAX_PATH, L"NoProxyFor")); infoFields.AddTail(new SettingsFieldBool(&(settings.bUseSource), L"bUseSource")); infoFields.AddTail(new SettingsFieldString((settings.szSourceURL), INTERNET_MAX_URL_LENGTH, L"SourceURL")); - - return; } -BOOL +static BOOL SaveAllSettings(CRegKey &key, SETTINGS_INFO &settings) { BOOL bAllSuccess = TRUE; @@ -153,10 +152,10 @@ SaveAllSettings(CRegKey &key, SETTINGS_INFO &settings) return bAllSuccess; } -BOOL +static BOOL LoadAllSettings(CRegKey &key, SETTINGS_INFO &settings) { - BOOL bAllSuccess = TRUE; + BOOL bLoadedAny = FALSE; ATL::CAtlList<SettingsField *> infoFields; AddInfoFields(infoFields, settings); @@ -165,27 +164,18 @@ LoadAllSettings(CRegKey &key, SETTINGS_INFO &settings) while (InfoListPosition) { SettingsField *Info = infoFields.GetNext(InfoListPosition); - if (!Info->Load(key)) - { - bAllSuccess = FALSE; - // TODO: error log - } + if (Info->Load(key)) + bLoadedAny = TRUE; + //else + // TODO: error log delete Info; } - return bAllSuccess; + return bLoadedAny; } -VOID -FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) +static void +GetDefaultDownloadDirectory(CStringW &szDownloadDir) { - CStringW szDownloadDir; - ZeroMemory(pSettingsInfo, sizeof(SETTINGS_INFO)); - - pSettingsInfo->bSaveWndPos = TRUE; - pSettingsInfo->bUpdateAtStart = FALSE; - pSettingsInfo->bLogEnabled = TRUE; - pSettingsInfo->bUseSource = FALSE; - if (FAILED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, szDownloadDir.GetBuffer(MAX_PATH)))) { szDownloadDir.ReleaseBuffer(); @@ -201,29 +191,68 @@ FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) PathAppendW(szDownloadDir.GetBuffer(MAX_PATH), L"\\RAPPS Downloads"); szDownloadDir.ReleaseBuffer(); +} + +static VOID +ValidateStringSettings(PSETTINGS_INFO pSettingsInfo) +{ + if (!pSettingsInfo->szDownloadDir[0]) + { + CStringW szDownloadDir; + GetDefaultDownloadDirectory(szDownloadDir); - CStringW::CopyChars( - pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir), szDownloadDir.GetString(), - szDownloadDir.GetLength() + 1); + CStringW::CopyChars(pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir), + szDownloadDir.GetString(), szDownloadDir.GetLength() + 1); + } +} + +VOID +FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) +{ + ZeroMemory(pSettingsInfo, sizeof(*pSettingsInfo)); + pSettingsInfo->bSaveWndPos = TRUE; + pSettingsInfo->bUpdateAtStart = FALSE; + pSettingsInfo->bLogEnabled = TRUE; + pSettingsInfo->bUseSource = FALSE; pSettingsInfo->bDelInstaller = FALSE; pSettingsInfo->Maximized = FALSE; pSettingsInfo->Left = CW_USEDEFAULT; pSettingsInfo->Top = CW_USEDEFAULT; pSettingsInfo->Width = 680; pSettingsInfo->Height = 450; + + ValidateStringSettings(pSettingsInfo); } BOOL LoadSettings(PSETTINGS_INFO pSettingsInfo) { + BOOL bLoadedAny = FALSE; + + FillDefaultSettings(pSettingsInfo); + ATL::CRegKey RegKey; - if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\" RAPPS_NAME, KEY_READ) != ERROR_SUCCESS) + if (RegKey.Open(HKEY_CURRENT_USER, SETTINGSSUBKEY, KEY_READ) == ERROR_SUCCESS) { - return FALSE; + bLoadedAny = LoadAllSettings(RegKey, *pSettingsInfo); } - return LoadAllSettings(RegKey, *pSettingsInfo); + ValidateStringSettings(pSettingsInfo); // Handles the case where a REG_SZ is present but empty + + if (!bLoadedAny) + { + // This the first launch, write at least one item so ParseCmdAndExecute() does not + // trigger another DB update in another process instance between now and SaveSettings(). + ATL::CRegKey RegKey; + if (RegKey.Create(HKEY_CURRENT_USER, SETTINGSSUBKEY, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, NULL) == ERROR_SUCCESS) + { + SettingsFieldBool field(&(pSettingsInfo->bUpdateAtStart), L"bUpdateAtStart"); + field.Save(RegKey); + } + } + return bLoadedAny; } BOOL @@ -245,8 +274,8 @@ SaveSettings(HWND hwnd, PSETTINGS_INFO pSettingsInfo) (wp.showCmd == SW_MAXIMIZE || (wp.showCmd == SW_SHOWMINIMIZED && (wp.flags & WPF_RESTORETOMAXIMIZED))); } - if (RegKey.Create(HKEY_CURRENT_USER, L"Software\\ReactOS\\" RAPPS_NAME, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) != ERROR_SUCCESS) + if (RegKey.Create(HKEY_CURRENT_USER, SETTINGSSUBKEY, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, NULL) != ERROR_SUCCESS) { return FALSE; } diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index be2294c7504..9c32c4cd887 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -40,12 +40,7 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nSh } hInst = hInstance; - BOOL bIsFirstLaunch = !LoadSettings(&SettingsInfo); - if (bIsFirstLaunch) - { - FillDefaultSettings(&SettingsInfo); - } InitLogs(); InitCommonControls();

3 months, 3 weeks

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