Ros-diffs December 2024

ros-diffs@reactos.org

17 participants
106 discussions

[reactos] 01/01: [REACTOS] Fix 'seperate' typos

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d936dba7ff2731fb78f39… commit d936dba7ff2731fb78f39c5e059149ad51841325 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Sun Dec 8 08:14:55 2024 +0800 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Dec 11 08:56:06 2024 +0200 [REACTOS] Fix 'seperate' typos --- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c | 2 +- ntoskrnl/cache/section/data.c | 2 +- ntoskrnl/cache/section/fault.c | 4 ++-- sdk/tools/mkisofs/CMakeLists.txt | 2 +- win32ss/gdi/dib/dib32bpp.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 518dd4329d6..50088b84052 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -216,7 +216,7 @@ BEGIN LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in separate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 7ba29c63939..7cb598194ad 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -223,7 +223,7 @@ BEGIN LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in separate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 7d3e5ef59a8..5c7426cba73 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -216,7 +216,7 @@ BEGIN LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorised program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in separate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index e8195754991..be1df9decac 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -216,7 +216,7 @@ BEGIN LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in separate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Cancel", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 6243ce56153..1d7a4be529f 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -216,7 +216,7 @@ BEGIN LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in separate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 2e4478491ba..b702a01f108 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -223,7 +223,7 @@ BEGIN LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in separate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "확인", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "중단", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index f3c20c78acc..4ffb90d81eb 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -216,7 +216,7 @@ BEGIN LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in separate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 516ea2483f2..40013522a90 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -216,7 +216,7 @@ BEGIN LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in separate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END diff --git a/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c b/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c index cd645a4c5a7..ed2d8d12876 100644 --- a/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c +++ b/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c @@ -30,7 +30,7 @@ typedef struct _RTL_SYSTEM_TIME { /* * RTL_TIME_ZONE_INFORMATION is the same as the TIME_ZONE_INFORMATION structure * defined in winbase.h, however we need to define RTL_TIME_ZONE_INFORMATION - * seperately here so we don't depend on winbase.h. + * separately here so we don't depend on winbase.h. * This is used by RtlQueryTimeZoneInformation and RtlSetTimeZoneInformation. */ typedef struct _RTL_TIME_ZONE_INFORMATION { diff --git a/ntoskrnl/cache/section/data.c b/ntoskrnl/cache/section/data.c index 3b4aafac89f..b9afadb1fdf 100644 --- a/ntoskrnl/cache/section/data.c +++ b/ntoskrnl/cache/section/data.c @@ -60,7 +60,7 @@ of this change is that a mapping of a small files takes a bit more than 1/4 of the size in nonpaged kernel space as it did previously. When we need other threads that may be competing for the same page fault to -wait, we have a mechanism seperate from PageOps for dealing with that, which +wait, we have a mechanism separate from PageOps for dealing with that, which was suggested by Travis Geiselbrecht after a conversation I had with Alex Ionescu. That mechanism is the MM_WAIT_ENTRY, which is the all-ones SWAPENTRY. diff --git a/ntoskrnl/cache/section/fault.c b/ntoskrnl/cache/section/fault.c index e869dac88fb..10fc379d48d 100644 --- a/ntoskrnl/cache/section/fault.c +++ b/ntoskrnl/cache/section/fault.c @@ -498,7 +498,7 @@ MmpFaultWorker(PVOID Parameter) /* -This code seperates the action of fault handling into an upper and lower +This code separates the action of fault handling into an upper and lower handler to allow the inner handler to optionally be called in work item if the stack is getting too deep. My experiments show that the third recursive page fault taken at PASSIVE_LEVEL must be shunted away to a @@ -739,7 +739,7 @@ MmAccessFaultCacheSection(KPROCESSOR_MODE Mode, /* -As above, this code seperates the active part of fault handling from a carrier +As above, this code separates the active part of fault handling from a carrier that can use the thread's active fault count to determine whether a work item is required. Also as above, this function repeatedly calls the active not present fault handler until a clear success or failure is received, using a diff --git a/sdk/tools/mkisofs/CMakeLists.txt b/sdk/tools/mkisofs/CMakeLists.txt index 840e837f611..6674d1f5c4a 100644 --- a/sdk/tools/mkisofs/CMakeLists.txt +++ b/sdk/tools/mkisofs/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${REACTOS_BINARY_DIR}/sdk/include) # libschily and libsiconv are licensed under CDDL whereas mkisofs is licensed under GPL. -# As such, we cannot mix the library sources with mkisofs sources and have to build them seperately. +# As such, we cannot mix the library sources with mkisofs sources and have to build them separately. # Later on, they may still be linked together though. # # Reference: http://opensource.stackexchange.com/questions/2094 diff --git a/win32ss/gdi/dib/dib32bpp.c b/win32ss/gdi/dib/dib32bpp.c index 2b752556cda..5cbec6bdd82 100644 --- a/win32ss/gdi/dib/dib32bpp.c +++ b/win32ss/gdi/dib/dib32bpp.c @@ -614,7 +614,7 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo) * Then we do a flip in place at the destination location and we are done. */ if ((BltInfo->SourcePoint.y != BltInfo->DestRect.top) && // The values are not equal and - (abs(BltInfo->SourcePoint.y - BltInfo->DestRect.top) < (DestHeight + 2)) && // they are NOT seperated by > DestHeight + (abs(BltInfo->SourcePoint.y - BltInfo->DestRect.top) < (DestHeight + 2)) && // they are NOT separated by > DestHeight (BltInfo->SourceSurface->pvScan0 == BltInfo->DestSurface->pvScan0)) // and same surface (probably screen) { DPRINT("Flips Need Adjustments, so do move here.\n");

6 months, 3 weeks

[reactos] 01/01: [FREELDR] Make it more compatible with w2k3 ini file

by Daniel Victor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34e76ade03659b419b360… commit 34e76ade03659b419b36058c402c12128e9daac1 Author: Daniel Victor <ilauncherdeveloper(a)gmail.com> AuthorDate: Fri Nov 22 11:16:17 2024 -0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Dec 11 07:18:34 2024 +0200 [FREELDR] Make it more compatible with w2k3 ini file --- boot/freeldr/freeldr/lib/inifile/ini_init.c | 11 ++++++++-- boot/freeldr/freeldr/settings.c | 33 ++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/lib/inifile/ini_init.c b/boot/freeldr/freeldr/lib/inifile/ini_init.c index 9992b0b7151..4596eac759f 100644 --- a/boot/freeldr/freeldr/lib/inifile/ini_init.c +++ b/boot/freeldr/freeldr/lib/inifile/ini_init.c @@ -38,8 +38,15 @@ BOOLEAN IniFileInitialize(VOID) if (Status != ESUCCESS) { ERR("Error while opening freeldr.ini, Status: %d\n", Status); - UiMessageBoxCritical("Error opening freeldr.ini or file not found.\nYou need to re-install FreeLoader."); - return FALSE; + + /* Try to open boot.ini */ + Status = FsOpenFile("boot.ini", FrLdrBootPath, OpenReadOnly, &FileId); + if (Status != ESUCCESS) + { + ERR("Error while opening boot.ini, Status: %d\n", Status); + UiMessageBoxCritical("Error opening freeldr.ini/boot.ini or file not found.\nYou need to re-install FreeLoader."); + return FALSE; + } } /* Get the file size */ diff --git a/boot/freeldr/freeldr/settings.c b/boot/freeldr/freeldr/settings.c index 7f1e44e51af..fdf284c460c 100644 --- a/boot/freeldr/freeldr/settings.c +++ b/boot/freeldr/freeldr/settings.c @@ -126,12 +126,35 @@ LoadSettings( return; } - /* Open the [FreeLoader] section and load the settings */ - if ((BootMgrInfo.FrLdrSection == 0) && - !IniOpenSection("FreeLoader", &BootMgrInfo.FrLdrSection)) + BOOLEAN FoundLoaderSection = FALSE; + PCSTR LoaderSections[] = { + "FreeLoader", + "Boot Loader", + "FlexBoot", + "MultiBoot", + }; + + /* Search for the first section in LoaderSections and load the settings, + * prioritizing the order in the file. + * If a section is already loaded, skip further checks. */ + if (!BootMgrInfo.FrLdrSection) { - UiMessageBoxCritical("Section [FreeLoader] not found in freeldr.ini"); - return; + for (ULONG i = 0; i < sizeof(LoaderSections) / sizeof(LoaderSections[0]); i++) + { + PCSTR Section = LoaderSections[i]; + + if (IniOpenSection(Section, &BootMgrInfo.FrLdrSection)) + { + FoundLoaderSection = TRUE; + break; + } + } + + if (!FoundLoaderSection) + { + UiMessageBoxCritical("Bootloader Section not found in freeldr.ini"); + return; + } } /* Get the debug string. Always override it with the one from freeldr.ini */

6 months, 3 weeks

[reactos] 01/01: [ACPPAGE] Update German (de-DE) translation

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e897a5654d0951311b974… commit e897a5654d0951311b9745d05f377d4685dc05ce Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Nov 18 22:51:22 2024 +0100 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Tue Dec 10 22:37:02 2024 +0100 [ACPPAGE] Update German (de-DE) translation --- dll/shellext/acppage/lang/de-DE.rc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dll/shellext/acppage/lang/de-DE.rc b/dll/shellext/acppage/lang/de-DE.rc index a1232a3c17a..352ae5699ce 100644 --- a/dll/shellext/acppage/lang/de-DE.rc +++ b/dll/shellext/acppage/lang/de-DE.rc @@ -1,3 +1,14 @@ +/* + * PROJECT: ReactOS Compatibility Layer Shell Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2005 Klemens Friedl <frik85(a)gmail.com> + * Copyright 2013 Daniel Reimer <reimer.daniel(a)freenet.de> + * Copyright 2014 Zehnvor <sixlivezehn(a)googlemail.com> + * Copyright 2017 Robert Naumann <gonzomdx(a)gmail.com> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226 @@ -30,8 +41,8 @@ BEGIN PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED PUSHBUTTON "&OK",IDOK,174,114,60,14 PUSHBUTTON "&Abbrechen",IDCANCEL,240,114,60,14 - LTEXT "Available modes",-1,6,6,52,8 - LTEXT "Selected modes",-1,168,6,51,8 + LTEXT "Verfügbare Modi",-1,6,6,53,8 + LTEXT "Ausgewählte Modi",-1,168,6,58,8 END STRINGTABLE

6 months, 3 weeks

[reactos] 01/01: [SETUPAPI] Implement CM_Set_Class_Registry_PropertyA()

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b667d82f0bd7a0be6c0e4… commit b667d82f0bd7a0be6c0e4ece3dd77f530976bee8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 9 21:53:08 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 9 21:53:35 2024 +0100 [SETUPAPI] Implement CM_Set_Class_Registry_PropertyA() --- dll/win32/setupapi/cfgmgr.c | 71 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index ffef4d5590c..bfd1da4a5f7 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -7843,10 +7843,77 @@ CM_Set_Class_Registry_PropertyA( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - FIXME("CM_Set_Class_Registry_PropertyA(%p %lx %p %lu %lx %p)\n", + LPWSTR lpBuffer; + ULONG ulType; + CONFIGRET ret; + + TRACE("CM_Set_Class_Registry_PropertyA(%p %lx %p %lu %lx %p)\n", ClassGuid, ulProperty, Buffer, ulLength, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + if (ClassGuid == NULL) + return CR_INVALID_POINTER; + + if ((Buffer == NULL) && (ulLength != 0)) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (Buffer == NULL) + { + ret = CM_Set_Class_Registry_PropertyW(ClassGuid, + ulProperty, + Buffer, + ulLength, + ulFlags, + hMachine); + } + else + { + /* Get property type */ + ulType = GetRegistryPropertyType(ulProperty); + + /* Allocate buffer if needed */ + if ((ulType == REG_SZ) || (ulType == REG_MULTI_SZ)) + { + lpBuffer = MyMalloc(ulLength * sizeof(WCHAR)); + if (lpBuffer == NULL) + { + ret = CR_OUT_OF_MEMORY; + } + else + { + if (!MultiByteToWideChar(CP_ACP, 0, Buffer, + ulLength, lpBuffer, ulLength)) + { + MyFree(lpBuffer); + ret = CR_FAILURE; + } + else + { + ret = CM_Set_Class_Registry_PropertyW(ClassGuid, + ulProperty, + lpBuffer, + ulLength * sizeof(WCHAR), + ulFlags, + hMachine); + MyFree(lpBuffer); + } + } + } + else + { + ret = CM_Set_Class_Registry_PropertyW(ClassGuid, + ulProperty, + Buffer, + ulLength, + ulFlags, + hMachine); + } + + } + + return ret; }

6 months, 3 weeks

[reactos] 01/01: [VIDEOPRT] VideoPortInitialize(): Display the invalid and expected struct sizes on error

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01a10da73d8281fc77865… commit 01a10da73d8281fc77865d751d62369c28e13772 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Dec 9 13:42:44 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 9 13:42:44 2024 +0100 [VIDEOPRT] VideoPortInitialize(): Display the invalid and expected struct sizes on error --- win32ss/drivers/videoprt/videoprt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 97c5290b76f..53e158ab695 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -794,7 +794,11 @@ VideoPortInitialize( break; default: - ERR_(VIDEOPRT, "Invalid HwInitializationData size.\n"); + ERR_(VIDEOPRT, "Invalid HwInitializationData size %lu (expected %lu, %lu or %lu)\n", + HwInitializationData->HwInitDataSize, + SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA, + SIZE_OF_W2K_VIDEO_HW_INITIALIZATION_DATA, + sizeof(VIDEO_HW_INITIALIZATION_DATA)); return STATUS_UNSUCCESSFUL; }

6 months, 3 weeks

[reactos] 04/04: [REACTOS] Rename ReactOS_LogOn.wav to ReactOS_Startup.wav

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d9f67c79b1f23b3dbbdd… commit 4d9f67c79b1f23b3dbbdd80f6702df88febca6b1 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Dec 5 12:17:24 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Mon Dec 9 09:52:57 2024 +0700 [REACTOS] Rename ReactOS_LogOn.wav to ReactOS_Startup.wav CORE-13951 --- boot/bootdata/hivedef.inf | 8 ++++---- media/sounds/CMakeLists.txt | 2 +- media/sounds/{ReactOS_LogOn.wav => ReactOS_Startup.wav} | Bin 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 6ca744345cc..6f4b78d8ab6 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -2076,14 +2076,14 @@ HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion",,0x00000012 HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Current","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\SystemQuestion\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart",,0x00000012 -HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Current","",0x00020000,"" -HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Default","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Current","",0x00020000,"%SystemRoot%\media\ReactOS_Startup.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\SystemStart\.Default","",0x00020000,"%SystemRoot%\media\ReactOS_Startup.wav" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff",,0x00000012 HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Current","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogoff\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon",,0x00000012 -HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Current","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" -HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Default","",0x00020000,"%SystemRoot%\media\ReactOS_LogOn.wav" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Current","",0x00020000,"" +HKCU,"AppEvents\Schemes\Apps\.Default\WindowsLogon\.Default","",0x00020000,"" HKCU,"AppEvents\Schemes\Apps\Explorer","",0x00000002,"ReactOS Explorer" HKCU,"AppEvents\Schemes\Apps\Explorer","DispFileName",0x00000000,"@mmsys.cpl,-5854" HKCU,"AppEvents\Schemes\Apps\Explorer\EmptyRecycleBin",,0x00000012 diff --git a/media/sounds/CMakeLists.txt b/media/sounds/CMakeLists.txt index 03da1c51adc..952de0b9353 100644 --- a/media/sounds/CMakeLists.txt +++ b/media/sounds/CMakeLists.txt @@ -1,5 +1,5 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Critical_Stop.wav DESTINATION reactos/media FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_LogOn.wav DESTINATION reactos/media FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Startup.wav DESTINATION reactos/media FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Notify.wav DESTINATION reactos/media FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Recycle.wav DESTINATION reactos/media FOR all) diff --git a/media/sounds/ReactOS_LogOn.wav b/media/sounds/ReactOS_Startup.wav similarity index 100% rename from media/sounds/ReactOS_LogOn.wav rename to media/sounds/ReactOS_Startup.wav

6 months, 3 weeks

[reactos] 03/04: [WINLOGON] Implement startup sound support (HACK)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2557948179d8073737054… commit 2557948179d807373705407eca291591041e0b1b Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Dec 4 01:00:28 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Mon Dec 9 09:52:57 2024 +0700 [WINLOGON] Implement startup sound support (HACK) CORE-13951 --- base/system/winlogon/sas.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index f00bbf50b18..8b169f73df6 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -285,6 +285,22 @@ PlaySoundRoutine( return Ret; } +static +BOOL +IsFirstLogon(VOID) +{ + /* FIXME: All of this is a HACK, designed specifically for PlayLogonSoundThread. + * Don't call IsFirstLogon multiple times inside the same function. And please + * note that this function is not thread-safe. */ + static BOOL bFirstLogon = TRUE; + if (bFirstLogon) + { + bFirstLogon = FALSE; + return TRUE; + } + return FALSE; +} + DWORD WINAPI PlayLogonSoundThread( @@ -347,7 +363,9 @@ PlayLogonSoundThread( } else { - PlaySoundRoutine(L"WindowsLogon", TRUE, SND_ALIAS | SND_NODEFAULT); + PlaySoundRoutine(IsFirstLogon() ? L"SystemStart" : L"WindowsLogon", + TRUE, + SND_ALIAS | SND_NODEFAULT); RevertToSelf(); } return 0;

6 months, 3 weeks

[reactos] 02/04: [WINLOGON] Implement shutdown sound support

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37375fcc4dbe1d7629463… commit 37375fcc4dbe1d7629463d528aa09dad75b4c937 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Dec 4 00:19:26 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Mon Dec 9 09:52:57 2024 +0700 [WINLOGON] Implement shutdown sound support CORE-13951 --- base/system/winlogon/sas.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 0bb363fd87f..f00bbf50b18 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -367,13 +367,17 @@ PlayLogonSound( static VOID -PlayLogoffSound( - _In_ PWLSESSION Session) +PlayLogoffShutdownSound( + _In_ PWLSESSION Session, + _In_ BOOL bShutdown) { if (!ImpersonateLoggedOnUser(Session->UserToken)) return; - PlaySoundRoutine(L"WindowsLogoff", FALSE, SND_ALIAS | SND_NODEFAULT); + /* NOTE: Logoff and shutdown sounds play synchronously */ + PlaySoundRoutine(bShutdown ? L"SystemExit" : L"WindowsLogoff", + FALSE, + SND_ALIAS | SND_NODEFAULT); RevertToSelf(); } @@ -848,7 +852,7 @@ HandleLogoff( SwitchDesktop(Session->WinlogonDesktop); - PlayLogoffSound(Session); + PlayLogoffShutdownSound(Session, WLX_SHUTTINGDOWN(wlxAction)); SetWindowStationUser(Session->InteractiveWindowStation, &LuidNone, NULL, 0);

6 months, 3 weeks

[reactos] 01/04: [WINLOGON] Move logoff flags handling code to HandleLogoff

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77bfc12e0f2a5f59573da… commit 77bfc12e0f2a5f59573dae13e1de5d0bc2320799 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Tue Dec 3 23:55:11 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Mon Dec 9 09:52:57 2024 +0700 [WINLOGON] Move logoff flags handling code to HandleLogoff --- base/system/winlogon/sas.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index c9675ba314d..0bb363fd87f 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -786,8 +786,8 @@ DestroyLogoffSecurityAttributes( static NTSTATUS HandleLogoff( - IN OUT PWLSESSION Session, - IN UINT Flags) + _Inout_ PWLSESSION Session, + _In_ DWORD wlxAction) { PLOGOFF_SHUTDOWN_DATA LSData; PSECURITY_ATTRIBUTES psa; @@ -802,7 +802,13 @@ HandleLogoff( ERR("Failed to allocate mem for thread data\n"); return STATUS_NO_MEMORY; } - LSData->Flags = Flags; + + LSData->Flags = EWX_LOGOFF; + if (wlxAction == WLX_SAS_ACTION_FORCE_LOGOFF) + { + LSData->Flags |= EWX_FORCE; + } + LSData->Session = Session; Status = CreateLogoffSecurityAttributes(&psa); @@ -1065,12 +1071,9 @@ DoGenericAction( case WLX_SAS_ACTION_SHUTDOWN_REBOOT: /* 0x0b */ if (Session->LogonState != STATE_LOGGED_OFF) { - UINT LogOffFlags = EWX_LOGOFF; - if (wlxAction == WLX_SAS_ACTION_FORCE_LOGOFF) - LogOffFlags |= EWX_FORCE; if (!Session->Gina.Functions.WlxIsLogoffOk(Session->Gina.Context)) break; - if (!NT_SUCCESS(HandleLogoff(Session, LogOffFlags))) + if (!NT_SUCCESS(HandleLogoff(Session, wlxAction))) { RemoveStatusMessage(Session); break;

6 months, 3 weeks

[reactos] 01/01: [SETUPAPI] Implement CM_Set_Class_Registry_PropertyW()

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18c3f39c1866a4b033c15… commit 18c3f39c1866a4b033c151c4731d5d23ba5027bb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 8 23:03:30 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 8 23:03:30 2024 +0100 [SETUPAPI] Implement CM_Set_Class_Registry_PropertyW() The conversion of text SDs to binary SDs is not implemented yet. --- dll/win32/setupapi/cfgmgr.c | 64 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 30a38e81134..ffef4d5590c 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -7863,10 +7863,70 @@ CM_Set_Class_Registry_PropertyW( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - FIXME("CM_Set_Class_Registry_PropertyW(%p %lx %p %lu %lx %p)\n", + RPC_BINDING_HANDLE BindingHandle = NULL; + WCHAR szGuidString[PNP_MAX_GUID_STRING_LEN + 1]; + ULONG ulType = 0; + CONFIGRET ret; + + TRACE("CM_Set_Class_Registry_PropertyW(%p %lx %p %lu %lx %p)\n", ClassGuid, ulProperty, Buffer, ulLength, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + if (ClassGuid == NULL) + return CR_INVALID_POINTER; + + if ((Buffer == NULL) && (ulLength != 0)) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (pSetupStringFromGuid(ClassGuid, + szGuidString, + PNP_MAX_GUID_STRING_LEN) != 0) + return CR_INVALID_DATA; + + if ((ulProperty < CM_CRP_MIN) || (ulProperty > CM_CRP_MAX)) + return CR_INVALID_PROPERTY; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + ulType = GetRegistryPropertyType(ulProperty); + if ((ulType == REG_DWORD) && (ulLength != sizeof(DWORD))) + return CR_INVALID_DATA; + + if (ulProperty == CM_CRP_SECURITY_SDS) + { + FIXME("Conversion from text SD to binary SD is not implemented yet!\n"); + return CR_CALL_NOT_IMPLEMENTED; + } + + RpcTryExcept + { + ret = PNP_SetClassRegProp(BindingHandle, + szGuidString, + ulProperty, + ulType, + (LPBYTE)Buffer, + ulLength, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; }

6 months, 3 weeks

← Newer
1
...
5
6
7
8
9
10
11
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2024