Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS/Mm] Fix SWAPENTRY bit-check in MmCreatePageFileMapping

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03283371c101521b7eab4… commit 03283371c101521b7eab459c2be71ecce6f0a1d8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jan 4 23:17:57 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 28 01:19:47 2023 +0300 [NTOS/Mm] Fix SWAPENTRY bit-check in MmCreatePageFileMapping Test for the highest bit, not for bit 3 / 7. --- ntoskrnl/mm/i386/page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index e0f7a304c8b..df13cb013e2 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -598,7 +598,7 @@ MmCreatePageFileMapping(PEPROCESS Process, /* And we don't support creating for other process */ ASSERT(Process == PsGetCurrentProcess()); - if (SwapEntry & (1 << (sizeof(SWAPENTRY) - 1))) + if (SwapEntry & ((ULONG_PTR)1 << (RTL_BITS_OF(SWAPENTRY) - 1))) { KeBugCheck(MEMORY_MANAGEMENT); }

1 year, 6 months

[reactos] 01/01: [SHELL32] *.rc: AGAIN! Use 1996 as birth year in IDD_ABOUT for consistency

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=058b746bbe0884e27f8c2… commit 058b746bbe0884e27f8c24d8f56cfb3270cc5f51 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Sep 27 22:23:31 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Sep 27 22:23:31 2023 +0200 [SHELL32] *.rc: AGAIN! Use 1996 as birth year in IDD_ABOUT for consistency We do use the birth year 1996 instead of 1998 within our msgina pictures already, and also within the [SDK] for autogenerated file-info. Since SHELL32 IDD_ABOUT is used by many applications it makes sense to harmonize with that. Was done already during 0.4.15-dev for SHELL32, but we have to do it again, since some recent translation PRs to match the en-US.rc again. --- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index c61f8875535..82ba06904c7 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -142,7 +142,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "Autoriõigus 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "Autoriõigus 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index e41a4b769a3..197e6a853fa 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -137,7 +137,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "זכויות יוצרים 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "זכויות יוצרים 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " צוות ReactOS\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 609c2bb38a8..1e22c50b0d8 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -142,7 +142,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "कॉपीराइट 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "कॉपीराइट 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " रिऐक्ट ओएस टीम\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 2ad102e0fc6..fa976a2f9fe 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -138,7 +138,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "Drept de autor 1998-", IDC_STATIC, 35, 75, 68, 10 + LTEXT "Drept de autor 1996-", IDC_STATIC, 35, 75, 68, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10 LTEXT " Echipa ReactOS\0", IDC_STATIC, 120, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index b45a252a61f..910816daf69 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -137,7 +137,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "Telif Hakkı 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "Telif Hakkı 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Takımı\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 32f4421c1b0..24a81bf627b 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -145,7 +145,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "版权所有 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "版权所有 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX

1 year, 6 months

[reactos] 01/01: [MAZESCR] Avoid (DLGPROC) cast, fix a typo (#5694)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29c0e23fd4a5de8ae15b9… commit 29c0e23fd4a5de8ae15b9f0efecf7f2833c30761 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Wed Sep 27 19:37:44 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 27 17:37:44 2023 +0000 [MAZESCR] Avoid (DLGPROC) cast, fix a typo (#5694) May help a bit with x64. Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> --- modules/rosapps/applications/screensavers/mazescr/maze.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/rosapps/applications/screensavers/mazescr/maze.c b/modules/rosapps/applications/screensavers/mazescr/maze.c index 1b1ed42340b..bff5bdd63a6 100644 --- a/modules/rosapps/applications/screensavers/mazescr/maze.c +++ b/modules/rosapps/applications/screensavers/mazescr/maze.c @@ -632,7 +632,7 @@ static BOOL OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct) return TRUE; } -BOOL WINAPI AboutProc(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam) +INT_PTR CALLBACK AboutProc(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam) { switch(message){ case WM_COMMAND: @@ -684,7 +684,6 @@ LRESULT CALLBACK ScreenSaverProc( start_timer(hWnd, solve_delay); break; - case 3: if (!solve_maze(hWnd)) { @@ -696,7 +695,6 @@ LRESULT CALLBACK ScreenSaverProc( start_timer(hWnd, post_solve_delay); } break; - default: initialize_maze(); @@ -711,14 +709,12 @@ LRESULT CALLBACK ScreenSaverProc( break; } break; - case WM_DESTROY: // message: window being destroyed DeleteObject(hBrushLiving); DeleteObject(hBrushDead); ReleaseDC(hWnd, hDC); break; - - default: // Passes it on if unproccessed + default: // Passes it on if unprocessed return DefScreenSaverProc(hWnd, message, wParam, lParam); } return 0; @@ -757,7 +753,7 @@ BOOL WINAPI ScreenSaverConfigureDialog(HWND hWnd, UINT message, WPARAM wparam, L EndDialog(hWnd, TRUE); break; case IDABOUT: - DialogBox(hMainInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hWnd, (DLGPROC)AboutProc); + DialogBox(hMainInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hWnd, AboutProc); break; } case WM_HSCROLL:

1 year, 6 months

[reactos] 01/01: [CMICONTROL] Fix MSVC 14.2 dbg x64 warning C4267 (#5696)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e69d2e8b89f34ddb99442… commit e69d2e8b89f34ddb99442f36a75c5e3d61f34629 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Wed Sep 27 19:34:32 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 27 17:34:32 2023 +0000 [CMICONTROL] Fix MSVC 14.2 dbg x64 warning C4267 (#5696) Can be observed on the buildbots: 2023-09-17T14:19:34.2051345Z [10663/14808] Building CXX object drivers\wdm\audio\drivers\CMIDriver\cmicontrol\CMakeFiles\cmicontrol.dir\main.cpp.obj 2023-09-17T14:19:34.2052611Z D:\a\reactos\reactos\src\drivers\wdm\audio\drivers\CMIDriver\cmicontrol\main.cpp(818): warning C4267: '=': conversion from 'size_t' to 'unsigned int', possible loss of data --- drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp index e5711703966..7317b363456 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp @@ -799,7 +799,7 @@ void printUsage() void deleteDriverFiles() { TCHAR SysDir[MAX_PATH]; - unsigned int len; + size_t len; if (GetSystemDirectory(SysDir, sizeof(SysDir))==0) { PrintLastError("GetSystemDirectory()"); return;

1 year, 6 months

[reactos] 01/01: [NTOS:MM] Fix 'eanbled' typo in a comment (#5728)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ca88bef80e7f732a289e… commit 9ca88bef80e7f732a289ee266da20dac2c7391d2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Sep 27 19:31:42 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 27 17:31:42 2023 +0000 [NTOS:MM] Fix 'eanbled' typo in a comment (#5728) --- ntoskrnl/mm/ARM3/pagfault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 14460552b1c..62451086dda 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2742,7 +2742,7 @@ MmSetExecuteOptions(IN ULONG ExecuteOptions) CurrentProcess->Flags.ImageDispatchEnable = TRUE; } - /* These are turned on by default if no-execution is also eanbled */ + /* These are turned on by default if no-execution is also enabled */ if (CurrentProcess->Flags.ExecuteEnable) { CurrentProcess->Flags.ExecuteDispatchEnable = TRUE;

1 year, 6 months

[reactos] 01/01: [NTOS] Implement support for opting out of NX policy

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8227c5d380fa1fbee6649… commit 8227c5d380fa1fbee6649e4dbb686447ab8e7ff1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 1 18:11:26 2023 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:04:19 2023 +0300 [NTOS] Implement support for opting out of NX policy Fixes crash in ntdll_winetest info on x64. --- ntoskrnl/mm/ARM3/pagfault.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index b9a855662d9..14460552b1c 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2333,14 +2333,26 @@ UserFault: } } +#if _MI_HAS_NO_EXECUTE /* Check for execution of non-executable memory */ if (MI_IS_INSTRUCTION_FETCH(FaultCode) && !MI_IS_PAGE_EXECUTABLE(&TempPte)) { + /* Check if execute enable was set */ + if (CurrentProcess->Pcb.Flags.ExecuteEnable) + { + /* Fix up the PTE to be executable */ + TempPte.u.Hard.NoExecute = 0; + MI_UPDATE_VALID_PTE(PointerPte, TempPte); + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_SUCCESS; + } + /* Return the status */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); return STATUS_ACCESS_VIOLATION; } +#endif /* The fault has already been resolved by a different thread */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread);

1 year, 6 months

[reactos] 01/01: [CRT/x64] Fix a bug in __C_specific_handler

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6133cc016df7eee387c57… commit 6133cc016df7eee387c57dd47607c575cd9083a7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Mar 14 23:28:47 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:02:21 2023 +0300 [CRT/x64] Fix a bug in __C_specific_handler Fixes crash of compiler_apitest pseh --- sdk/lib/crt/except/amd64/ehandler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/crt/except/amd64/ehandler.c b/sdk/lib/crt/except/amd64/ehandler.c index b32b821d6c9..9a1e1e759be 100644 --- a/sdk/lib/crt/except/amd64/ehandler.c +++ b/sdk/lib/crt/except/amd64/ehandler.c @@ -107,12 +107,12 @@ __C_specific_handler( FilterResult = ExceptionFilter(&ExceptionPointers, EstablisherFrame); } - if (FilterResult == EXCEPTION_CONTINUE_EXECUTION) + if (FilterResult < 0 /* EXCEPTION_CONTINUE_EXECUTION */) { return ExceptionContinueExecution; } - if (FilterResult == EXCEPTION_EXECUTE_HANDLER) + if (FilterResult > 0 /* EXCEPTION_EXECUTE_HANDLER */) { JumpTarget = (ImageBase + ScopeTable->ScopeRecord[i].JumpTarget);

1 year, 6 months

[reactos] 03/03: [LSASRV] Fix usage of self-relative security descriptor in LsarQuerySecurityObject

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf4aa7ea9da0b0008b378… commit cf4aa7ea9da0b0008b378032ba229da6a7ee22f0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 23 17:43:14 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:01:45 2023 +0300 [LSASRV] Fix usage of self-relative security descriptor in LsarQuerySecurityObject --- dll/win32/lsasrv/lsarpc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/lsasrv/lsarpc.c b/dll/win32/lsasrv/lsarpc.c index 62d245b9d42..de22cf47097 100644 --- a/dll/win32/lsasrv/lsarpc.c +++ b/dll/win32/lsasrv/lsarpc.c @@ -201,7 +201,7 @@ LsarQuerySecurityObject( PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) { PLSA_DB_OBJECT DbObject = NULL; - PSECURITY_DESCRIPTOR RelativeSd = NULL; + PISECURITY_DESCRIPTOR_RELATIVE RelativeSd = NULL; PSECURITY_DESCRIPTOR ResultSd = NULL; PLSAPR_SR_SECURITY_DESCRIPTOR SdData = NULL; ACCESS_MASK DesiredAccess = 0; @@ -256,16 +256,16 @@ LsarQuerySecurityObject( /* Invalidate the SD information that was not requested */ if (!(SecurityInformation & OWNER_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Owner = NULL; + RelativeSd->Owner = 0; if (!(SecurityInformation & GROUP_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Group = NULL; + RelativeSd->Group = 0; if (!(SecurityInformation & DACL_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_DACL_PRESENT; + RelativeSd->Control &= ~SE_DACL_PRESENT; if (!(SecurityInformation & SACL_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_SACL_PRESENT; + RelativeSd->Control &= ~SE_SACL_PRESENT; /* Calculate the required SD size */ Status = RtlMakeSelfRelativeSD(RelativeSd, @@ -298,7 +298,7 @@ LsarQuerySecurityObject( } /* Fill the SD data buffer and return it to the caller */ - SdData->Length = RelativeSdSize; + SdData->Length = ResultSdSize; SdData->SecurityDescriptor = (PBYTE)ResultSd; *SecurityDescriptor = SdData;

1 year, 6 months

[reactos] 02/03: [SAMSRV] Fix usage of self-relative security descriptor in SamrQuerySecurityObject

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5127433416c39779a3393… commit 5127433416c39779a3393f429d7eda1fd51b6e58 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Sep 20 11:48:49 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:01:45 2023 +0300 [SAMSRV] Fix usage of self-relative security descriptor in SamrQuerySecurityObject Fixes crash of netapi32_winetest access --- dll/win32/samsrv/samrpc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index 5c8bdff6f78..68b22684b6f 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -332,7 +332,7 @@ SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, { PSAM_DB_OBJECT SamObject; PSAMPR_SR_SECURITY_DESCRIPTOR SdData = NULL; - PSECURITY_DESCRIPTOR RelativeSd = NULL; + PISECURITY_DESCRIPTOR_RELATIVE RelativeSd = NULL; PSECURITY_DESCRIPTOR ResultSd = NULL; ACCESS_MASK DesiredAccess = 0; ULONG RelativeSdSize = 0; @@ -397,16 +397,16 @@ SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, /* Invalidate the SD information that was not requested */ if (!(SecurityInformation & OWNER_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Owner = NULL; + RelativeSd->Owner = 0; if (!(SecurityInformation & GROUP_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Group = NULL; + RelativeSd->Group = 0; if (!(SecurityInformation & DACL_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_DACL_PRESENT; + RelativeSd->Control &= ~SE_DACL_PRESENT; if (!(SecurityInformation & SACL_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_SACL_PRESENT; + RelativeSd->Control &= ~SE_SACL_PRESENT; /* Calculate the required SD size */ Status = RtlMakeSelfRelativeSD(RelativeSd, @@ -439,7 +439,7 @@ SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, } /* Fill the SD data buffer and return it to the caller */ - SdData->Length = RelativeSdSize; + SdData->Length = ResultSdSize; SdData->SecurityDescriptor = (PBYTE)ResultSd; *SecurityDescriptor = SdData;

1 year, 6 months

[reactos] 01/03: [RTL] Improve usage of absolte vs self-relative security descriptors

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df053d4e4339b5bb1151e… commit df053d4e4339b5bb1151ea3d3986c22e42ac7e8f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 23 17:49:27 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:01:45 2023 +0300 [RTL] Improve usage of absolte vs self-relative security descriptors - RtlpQuerySecurityDescriptor: Change argument type of first parameter from PISECURITY_DESCRIPTOR to PSECURITY_DESCRIPTOR, since it handles both absolute and self-relative SDs. - RtlMakeSelfRelativeSD: rename first parameter from AbsoluteSD to SecurityDescriptor, since it handles both absolute and self-relative SDs. - SepGetGroupFromDescriptor/SepGetOwnerFromDescriptor/SepGetDaclFromDescriptor/SepGetSaclFromDescriptor: Change parameter type from PVOID to PSECURITY_DESCRIPTOR for clarity. --- ntoskrnl/include/internal/se.h | 8 ++++---- sdk/lib/rtl/sd.c | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 1679d2fe86a..c7cbdda046a 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -87,7 +87,7 @@ typedef struct _TOKEN_AUDIT_POLICY_INFORMATION FORCEINLINE PSID SepGetGroupFromDescriptor( - _Inout_ PVOID _Descriptor) + _Inout_ PSECURITY_DESCRIPTOR _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; PISECURITY_DESCRIPTOR_RELATIVE SdRel; @@ -107,7 +107,7 @@ SepGetGroupFromDescriptor( FORCEINLINE PSID SepGetOwnerFromDescriptor( - _Inout_ PVOID _Descriptor) + _Inout_ PSECURITY_DESCRIPTOR _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; PISECURITY_DESCRIPTOR_RELATIVE SdRel; @@ -127,7 +127,7 @@ SepGetOwnerFromDescriptor( FORCEINLINE PACL SepGetDaclFromDescriptor( - _Inout_ PVOID _Descriptor) + _Inout_ PSECURITY_DESCRIPTOR _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; PISECURITY_DESCRIPTOR_RELATIVE SdRel; @@ -149,7 +149,7 @@ SepGetDaclFromDescriptor( FORCEINLINE PACL SepGetSaclFromDescriptor( - _Inout_ PVOID _Descriptor) + _Inout_ PSECURITY_DESCRIPTOR _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; PISECURITY_DESCRIPTOR_RELATIVE SdRel; diff --git a/sdk/lib/rtl/sd.c b/sdk/lib/rtl/sd.c index ea7e3bb44f5..d4ff245c3d8 100644 --- a/sdk/lib/rtl/sd.c +++ b/sdk/lib/rtl/sd.c @@ -42,7 +42,7 @@ RtlpValidateSDOffsetAndSize(IN ULONG Offset, VOID NTAPI -RtlpQuerySecurityDescriptor(IN PISECURITY_DESCRIPTOR SecurityDescriptor, +RtlpQuerySecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, OUT PSID *Owner, OUT PULONG OwnerSize, OUT PSID *PrimaryGroup, @@ -644,7 +644,7 @@ RtlAbsoluteToSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSecurityDescriptor, */ NTSTATUS NTAPI -RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSD, +RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR SecurityDescriptor, OUT PSECURITY_DESCRIPTOR SelfRelativeSD, IN OUT PULONG BufferLength) { @@ -652,12 +652,11 @@ RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSD, PACL Sacl, Dacl; ULONG OwnerLength, GroupLength, SaclLength, DaclLength, TotalLength; ULONG_PTR Current; - PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)AbsoluteSD; PISECURITY_DESCRIPTOR_RELATIVE RelSd = (PISECURITY_DESCRIPTOR_RELATIVE)SelfRelativeSD; PAGED_CODE_RTL(); /* Query all components */ - RtlpQuerySecurityDescriptor(Sd, + RtlpQuerySecurityDescriptor(SecurityDescriptor, &Owner, &OwnerLength, &Group, @@ -687,7 +686,7 @@ RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSD, /* Copy the header fields */ RtlCopyMemory(RelSd, - Sd, + SecurityDescriptor, FIELD_OFFSET(SECURITY_DESCRIPTOR_RELATIVE, Owner)); /* Set the current copy pointer */

1 year, 6 months

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