Ros-diffs November 2021

ros-diffs@reactos.org

23 participants
97 discussions

[reactos] 01/01: [NTVDM] Log the command line used when starting NTVDM.
by Hermès Bélusca-Maïto 22 Nov '21

22 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a4ca215ab5472221dfa6… commit 6a4ca215ab5472221dfa6150be949c6328112b5e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 22 03:08:30 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 22 03:10:14 2021 +0100 [NTVDM] Log the command line used when starting NTVDM. --- subsystems/mvdm/ntvdm/ntvdm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/subsystems/mvdm/ntvdm/ntvdm.c b/subsystems/mvdm/ntvdm/ntvdm.c index 4e5cd99a1c0..d7e88cb20ad 100644 --- a/subsystems/mvdm/ntvdm/ntvdm.c +++ b/subsystems/mvdm/ntvdm/ntvdm.c @@ -506,11 +506,15 @@ wmain(INT argc, WCHAR *argv[]) } #endif + DPRINT1("\n\n\n" + "NTVDM - Starting...\n" + "Command Line: '%s'\n" + "\n\n", + GetCommandLineA()); + /* Load the global VDM settings */ LoadGlobalSettings(&GlobalSettings); - DPRINT1("\n\n\nNTVDM - Starting...\n\n\n"); - /* Initialize the console */ if (!ConsoleInit()) {

1 0

[reactos] 01/01: [WIN32K] Fix 'use after free' in NtGdiStretchDIBitsInternal (#4122)
by Doug Lyons 22 Nov '21

22 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b538b9abb8c5bb834f855… commit b538b9abb8c5bb834f855173fb77459456382d56 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Nov 21 19:57:36 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 22 02:57:36 2021 +0100 [WIN32K] Fix 'use after free' in NtGdiStretchDIBitsInternal (#4122) CORE-17861 --- win32ss/gdi/ntgdi/dibobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index e8d3acc3d2d..c2b5a8fbb42 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -1489,7 +1489,6 @@ NtGdiStretchDIBitsInternal( if (pdc) DC_UnlockDc(pdc); } - if (pbmiSafe) ExFreePoolWithTag(pbmiSafe, 'imBG'); if (pvBits) ExFreePoolWithTag(pvBits, TAG_DIB); /* This is not what MSDN says is returned from this function, but it @@ -1504,6 +1503,8 @@ NtGdiStretchDIBitsInternal( LinesCopied = pbmiSafe->bmiHeader.biHeight; } + ExFreePoolWithTag(pbmiSafe, 'imBG'); + return LinesCopied; }

1 0

[reactos] 01/01: [SMSS] Use NULL for NULL pointers.
by Hermès Bélusca-Maïto 21 Nov '21

21 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f766ca5e4270e37f3fb1a… commit f766ca5e4270e37f3fb1acd707dc909ec405e05c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 22 00:15:53 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 22 00:16:32 2021 +0100 [SMSS] Use NULL for NULL pointers. --- base/system/smss/smss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/smss/smss.c b/base/system/smss/smss.c index 0da3fa6e741..6e9fb6081c0 100644 --- a/base/system/smss/smss.c +++ b/base/system/smss/smss.c @@ -305,7 +305,7 @@ SmpExecuteInitialCommand(IN ULONG MuSessionId, if (!SmApiPort) { /* Connect to ourselves, as a client */ - Status = SmConnectToSm(0, 0, 0, &SmApiPort); + Status = SmConnectToSm(NULL, NULL, 0, &SmApiPort); if (!NT_SUCCESS(Status)) { DPRINT1("SMSS: Unable to connect to SM - Status == %lx\n", Status);

1 0

[reactos] 03/03: [CSRSRV] Update the status.h file with updated information.
by Hermès Bélusca-Maïto 21 Nov '21

21 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c17aeec0315e1131e58a0… commit c17aeec0315e1131e58a0643d9614834f2f036c8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 22 00:07:48 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 22 00:13:35 2021 +0100 [CSRSRV] Update the status.h file with updated information. --- subsystems/win32/csrsrv/status.h | 107 ++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 58 deletions(-) diff --git a/subsystems/win32/csrsrv/status.h b/subsystems/win32/csrsrv/status.h index ee5e6db22c6..c8b922f905a 100644 --- a/subsystems/win32/csrsrv/status.h +++ b/subsystems/win32/csrsrv/status.h @@ -36,57 +36,55 @@ * the external Wait API for creating, removing and/or notifying waits. */ -/* Exported APIs Location Status - *------------------------------------------------------------------- - * CsrAddStaticServerThread 753E679E 1 - server.c - IMPLEMENTED - * CsrCallServerFromServer 753E4FD9 2 - api.c - IMPLEMENTED - * CsrConnectToUser 753E4E48 3 - api.c - IMPLEMENTED - * CsrCreateProcess 753E6FD3 4 - procsup.c - IMPLEMENTED - * CsrCreateRemoteThread 753E73BD 5 - thredsup.c - IMPLEMENTED - * CsrCreateThread 753E72DA 6 - thredsup.c - IMPLEMENTED - * CsrCreateWait 753E770E 7 - wait.c - IMPLEMENTED - * CsrDebugProcess 753E7682 8 - procsup.c - IMPLEMENTED - * CsrDebugProcessStop 753E768A 9 - procsup.c - IMPLEMENTED - * CsrDereferenceProcess 753E6281 10 - procsup.c - IMPLEMENTED - * CsrDereferenceThread 753E6964 11 - thredsup.c - IMPLEMENTED - * CsrDereferenceWait 753E7886 12 - wait.c - IMPLEMENTED - * CsrDestroyProcess 753E7225 13 - procsup.c - IMPLEMENTED - * CsrDestroyThread 753E7478 14 - thredsup.c - IMPLEMENTED - * CsrExecServerThread 753E6841 15 - thredsup.c - IMPLEMENTED - * CsrGetProcessLuid 753E632F 16 - procsup.c - IMPLEMENTED - * CsrImpersonateClient 753E60F8 17 - thredsup.c - IMPLEMENTED - * CsrLockProcessByClientId 753E668F 18 - procsup.c - IMPLEMENTED - * CsrLockThreadByClientId 753E6719 19 - thredsup.c - IMPLEMENTED - * CsrMoveSatisfiedWait 753E7909 20 - wait.c - IMPLEMENTED - * CsrNotifyWait 753E782F 21 - wait.c - IMPLEMENTED - * CsrPopulateDosDevices 753E37A5 22 - init.c - IMPLEMENTED - * CsrQueryApiPort 753E4E42 23 - api.c - IMPLEMENTED - * CsrReferenceThread 753E61E5 24 - thredsup.c - IMPLEMENTED - * CsrRevertToSelf 753E615A 25 - thredsup.c - IMPLEMENTED - * CsrServerInitialization 753E3D75 26 - server.c - IMPLEMENTED - * CsrSetBackgroundPriority 753E5E87 27 - procsup.c - IMPLEMENTED - * CsrSetCallingSpooler 753E6425 28 - server.c - IMPLEMENTED - * CsrSetForegroundPriority 753E5E67 29 - procsup.c - IMPLEMENTED - * CsrShutdownProcesses 753E7547 30 - procsup.c - IMPLEMENTED - * CsrUnhandledExceptionFilter 753E3FE3 31 - server.c - IMPLEMENTED - * CsrUnlockProcess 753E66FD 32 - procsup.c - IMPLEMENTED - * CsrUnlockThread 753E7503 33 - thredsup.c - IMPLEMENTED - * CsrValidateMessageBuffer 753E528D 34 - api.c - IMPLEMENTED - * CsrValidateMessageString 753E5323 35 - api.c - IMPLEMENTED +/* Exported APIs Location Status + *------------------------------------------------------------ + * CsrAddStaticServerThread 1 - server.c - IMPLEMENTED + * CsrCallServerFromServer 2 - api.c - IMPLEMENTED + * CsrConnectToUser 3 - api.c - IMPLEMENTED + * CsrCreateProcess 4 - procsup.c - IMPLEMENTED + * CsrCreateRemoteThread 5 - thredsup.c - IMPLEMENTED + * CsrCreateThread 6 - thredsup.c - IMPLEMENTED + * CsrCreateWait 7 - wait.c - IMPLEMENTED + * CsrDebugProcess 8 - procsup.c - IMPLEMENTED + * CsrDebugProcessStop 9 - procsup.c - IMPLEMENTED + * CsrDereferenceProcess 10 - procsup.c - IMPLEMENTED + * CsrDereferenceThread 11 - thredsup.c - IMPLEMENTED + * CsrDereferenceWait 12 - wait.c - IMPLEMENTED + * CsrDestroyProcess 13 - procsup.c - IMPLEMENTED + * CsrDestroyThread 14 - thredsup.c - IMPLEMENTED + * CsrExecServerThread 15 - thredsup.c - IMPLEMENTED + * CsrGetProcessLuid 16 - procsup.c - IMPLEMENTED + * CsrImpersonateClient 17 - thredsup.c - IMPLEMENTED + * CsrLockProcessByClientId 18 - procsup.c - IMPLEMENTED + * CsrLockThreadByClientId 19 - thredsup.c - IMPLEMENTED + * CsrMoveSatisfiedWait 20 - wait.c - IMPLEMENTED + * CsrNotifyWait 21 - wait.c - IMPLEMENTED + * CsrPopulateDosDevices 22 - init.c - IMPLEMENTED + * CsrQueryApiPort 23 - api.c - IMPLEMENTED + * CsrReferenceThread 24 - thredsup.c - IMPLEMENTED + * CsrRevertToSelf 25 - thredsup.c - IMPLEMENTED + * CsrServerInitialization 26 - server.c - IMPLEMENTED + * CsrSetBackgroundPriority 27 - procsup.c - IMPLEMENTED + * CsrSetCallingSpooler 28 - server.c - IMPLEMENTED + * CsrSetForegroundPriority 29 - procsup.c - IMPLEMENTED + * CsrShutdownProcesses 30 - procsup.c - IMPLEMENTED + * CsrUnhandledExceptionFilter 31 - server.c - IMPLEMENTED + * CsrUnlockProcess 32 - procsup.c - IMPLEMENTED + * CsrUnlockThread 33 - thredsup.c - IMPLEMENTED + * CsrValidateMessageBuffer 34 - api.c - IMPLEMENTED + * CsrValidateMessageString 35 - api.c - IMPLEMENTED */ /* Public CSR API Interface Status (server.c) - * CsrSrvClientConnect - IMPLEMENTED - * CsrSrvUnusedFunction - IMPLEMENTED - * CsrSrvIdentifyAlertableThread - IMPLEMENTED - * CsrSrvSetPriorityClass - IMPLEMENTED + * CsrSrvClientConnect - IMPLEMENTED + * CsrSrvUnusedFunction - IMPLEMENTED */ /* Public SB API Interface Status (session.c) - * CsrSbCreateSession - IMPLEMENTED - * CsrSbForeignSessionComplete - IMPLEMENTED - * CsrSbTerminateSession - UNIMPLEMENTED - * CsrSbCreateProcess - UNIMPLEMENTED + * CsrSbCreateSession - IMPLEMENTED + * CsrSbForeignSessionComplete - IMPLEMENTED + * CsrSbTerminateSession - UNIMPLEMENTED + * CsrSbCreateProcess - UNIMPLEMENTED */ /* What's missing: @@ -94,18 +92,11 @@ * - SMSS needs to be partly re-written to match some things done here. * Among other things, SmConnectToSm, SmCompleteSession and the other * Sm* Exported APIs have to be properly implemented, as well as the - * callback calling and SM LPC APIs. [DONE!] + * callback calling and SM LPC APIs. [PARTLY DONE!] * - * - NTDLL needs to get the Csr* routines properly implemented. [DONE!] - * - * - KERNEL32, USER32 need to register with their servers properly. - * Additionally, user32 needs to have ClientThreadStartup implemented - * properly and do the syscall NtUserInitialize (I think) which also - * needs to be implemented in win32k.sys. All this should be less then - * 100 lines of code. [KERNEL32 50% DONE, USER32 NOT DONE] - * - * - The skeleton code for winsrv and basesrv which connects with CSR/CSRSRV - * needs to be written. [DONE!] - * - * - The kernel's LPC implementation needs to be made compatible. [DONE!] + * - USER32 needs to register with winsrv properly. Additionally, it + * needs to have ClientThreadStartup implemented properly and do the + * syscall NtUserInitialize (I think) which also needs to be implemented + * in win32k.sys. All this should be less then 100 lines of code. + * [NOT DONE] */

1 0

[reactos] 02/03: [NTDLL:CSR][CSRSRV] Start to deprecate CSR functions removed on Windows 2003.
by Hermès Bélusca-Maïto 21 Nov '21

21 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7353af1e3dce135d77341… commit 7353af1e3dce135d773411635d385495916a1ea0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 21 23:46:11 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 22 00:13:34 2021 +0100 [NTDLL:CSR][CSRSRV] Start to deprecate CSR functions removed on Windows 2003. The server-side CsrSrvIdentifyAlertableThread and CsrSrvSetPriorityClass functions are completely removed in Win2k3+, and are since stubbed by CsrSrvUnusedFunction instead. They however were present up to Windows XP, albeit with an extremely minimal implementation. The corresponding client-side CsrIdentifyAlertableThread and CsrSetPriorityClass now become just stubs that either trivially succeed or fail, respectively. See https://www.geoffchappell.com/studies/windows/win32/csrsrv/api/srvinit/apid… for more information. - Fix typo "al*T*ertable" --> "alertable". - Remove ROS-specific CSRSS_IDENTIFY_ALERTABLE_THREAD that was deprecated since ages (at least before 2005)! --- dll/ntdll/csr/api.c | 47 ++++++++++++++++++++------------- sdk/include/reactos/subsys/csr/csr.h | 8 +++--- sdk/include/reactos/subsys/csr/csrmsg.h | 19 +++++++------ subsystems/win32/csrsrv/api.h | 2 ++ subsystems/win32/csrsrv/server.c | 41 +++++++++++++++++++++------- 5 files changed, 75 insertions(+), 42 deletions(-) diff --git a/dll/ntdll/csr/api.c b/dll/ntdll/csr/api.c index fd0687e3b7f..b0ddf0478a7 100644 --- a/dll/ntdll/csr/api.c +++ b/dll/ntdll/csr/api.c @@ -35,29 +35,29 @@ CsrNewThread(VOID) */ NTSTATUS NTAPI -CsrSetPriorityClass(HANDLE hProcess, - PULONG PriorityClass) +CsrIdentifyAlertableThread(VOID) { +#if (NTDDI_VERSION < NTDDI_WS03) NTSTATUS Status; CSR_API_MESSAGE ApiMessage; - PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.Data.SetPriorityClass; + PCSR_IDENTIFY_ALERTABLE_THREAD IdentifyAlertableThread; /* Set up the data for CSR */ - DbgBreakPoint(); - SetPriorityClass->hProcess = hProcess; - SetPriorityClass->PriorityClass = *PriorityClass; + IdentifyAlertableThread = &ApiMessage.Data.IdentifyAlertableThread; + IdentifyAlertableThread->Cid = NtCurrentTeb()->ClientId; /* Call it */ Status = CsrClientCallServer(&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpSetPriorityClass), - sizeof(CSR_SET_PRIORITY_CLASS)); - - /* Return what we got, if requested */ - if (*PriorityClass) *PriorityClass = SetPriorityClass->PriorityClass; + CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpIdentifyAlertableThread), + sizeof(*IdentifyAlertableThread)); /* Return to caller */ return Status; +#else + /* Deprecated */ + return STATUS_SUCCESS; +#endif } /* @@ -65,25 +65,36 @@ CsrSetPriorityClass(HANDLE hProcess, */ NTSTATUS NTAPI -CsrIdentifyAlertableThread(VOID) +CsrSetPriorityClass(IN HANDLE Process, + IN OUT PULONG PriorityClass) { +#if (NTDDI_VERSION < NTDDI_WS03) NTSTATUS Status; CSR_API_MESSAGE ApiMessage; - PCSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; + PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.Data.SetPriorityClass; /* Set up the data for CSR */ - DbgBreakPoint(); - IdentifyAlertableThread = &ApiMessage.Data.IdentifyAlertableThread; - IdentifyAlertableThread->Cid = NtCurrentTeb()->ClientId; + SetPriorityClass->hProcess = Process; + SetPriorityClass->PriorityClass = *PriorityClass; /* Call it */ Status = CsrClientCallServer(&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpIdentifyAlertable), - sizeof(CSR_IDENTIFY_ALTERTABLE_THREAD)); + CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpSetPriorityClass), + sizeof(*SetPriorityClass)); + + /* Return what we got, if requested */ + if (*PriorityClass) *PriorityClass = SetPriorityClass->PriorityClass; /* Return to caller */ return Status; +#else + UNREFERENCED_PARAMETER(Process); + UNREFERENCED_PARAMETER(PriorityClass); + + /* Deprecated */ + return STATUS_INVALID_PARAMETER; +#endif } /* EOF */ diff --git a/sdk/include/reactos/subsys/csr/csr.h b/sdk/include/reactos/subsys/csr/csr.h index e778b11051e..ae531e2a0ae 100644 --- a/sdk/include/reactos/subsys/csr/csr.h +++ b/sdk/include/reactos/subsys/csr/csr.h @@ -80,10 +80,6 @@ CsrProbeForWrite(IN PVOID Address, IN ULONG Length, IN ULONG Alignment); -NTSTATUS -NTAPI -CsrIdentifyAlertableThread(VOID); - HANDLE NTAPI CsrGetProcessId(VOID); @@ -92,6 +88,10 @@ NTSTATUS NTAPI CsrNewThread(VOID); +NTSTATUS +NTAPI +CsrIdentifyAlertableThread(VOID); + NTSTATUS NTAPI CsrSetPriorityClass(IN HANDLE Process, diff --git a/sdk/include/reactos/subsys/csr/csrmsg.h b/sdk/include/reactos/subsys/csr/csrmsg.h index 4823d3a1261..759e6eab0e9 100644 --- a/sdk/include/reactos/subsys/csr/csrmsg.h +++ b/sdk/include/reactos/subsys/csr/csrmsg.h @@ -25,7 +25,7 @@ typedef enum _CSRSRV_API_NUMBER CsrpClientConnect = CSRSRV_FIRST_API_NUMBER, CsrpThreadConnect, CsrpProfileControl, - CsrpIdentifyAlertable, + CsrpIdentifyAlertableThread, CsrpSetPriorityClass, CsrpMaxApiNumber @@ -65,10 +65,12 @@ C_ASSERT(sizeof(CSR_API_CONNECTINFO) == 0x24); C_ASSERT(sizeof(CSR_API_CONNECTINFO) <= LPC_MAX_DATA_LENGTH); -typedef struct _CSR_IDENTIFY_ALTERTABLE_THREAD +#if (NTDDI_VERSION < NTDDI_WS03) + +typedef struct _CSR_IDENTIFY_ALERTABLE_THREAD { CLIENT_ID Cid; -} CSR_IDENTIFY_ALTERTABLE_THREAD, *PCSR_IDENTIFY_ALTERTABLE_THREAD; +} CSR_IDENTIFY_ALERTABLE_THREAD, *PCSR_IDENTIFY_ALERTABLE_THREAD; typedef struct _CSR_SET_PRIORITY_CLASS { @@ -76,11 +78,7 @@ typedef struct _CSR_SET_PRIORITY_CLASS ULONG PriorityClass; } CSR_SET_PRIORITY_CLASS, *PCSR_SET_PRIORITY_CLASS; -typedef struct -{ - HANDLE UniqueThread; - CLIENT_ID Cid; -} CSRSS_IDENTIFY_ALERTABLE_THREAD, *PCSRSS_IDENTIFY_ALERTABLE_THREAD; +#endif // (NTDDI_VERSION < NTDDI_WS03) typedef struct _CSR_CLIENT_CONNECT { @@ -114,9 +112,10 @@ typedef struct _CSR_API_MESSAGE union { CSR_CLIENT_CONNECT CsrClientConnect; +#if (NTDDI_VERSION < NTDDI_WS03) CSR_SET_PRIORITY_CLASS SetPriorityClass; - CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; - + CSR_IDENTIFY_ALERTABLE_THREAD IdentifyAlertableThread; +#endif // // This padding is used to make the CSR_API_MESSAGE structure // large enough to hold full other API_MESSAGE-type structures diff --git a/subsystems/win32/csrsrv/api.h b/subsystems/win32/csrsrv/api.h index 0c1fe773471..a9df4217d95 100644 --- a/subsystems/win32/csrsrv/api.h +++ b/subsystems/win32/csrsrv/api.h @@ -66,8 +66,10 @@ extern HANDLE CsrObjectDirectory; CSR_API(CsrSrvClientConnect); CSR_API(CsrSrvUnusedFunction); +#if (NTDDI_VERSION < NTDDI_WS03) CSR_API(CsrSrvIdentifyAlertableThread); CSR_API(CsrSrvSetPriorityClass); +#endif NTSTATUS diff --git a/subsystems/win32/csrsrv/server.c b/subsystems/win32/csrsrv/server.c index 3fce78b7fc5..e8998ab738a 100644 --- a/subsystems/win32/csrsrv/server.c +++ b/subsystems/win32/csrsrv/server.c @@ -27,19 +27,29 @@ HANDLE CsrSrvSharedSection = NULL; PCSR_API_ROUTINE CsrServerApiDispatchTable[CsrpMaxApiNumber] = { CsrSrvClientConnect, - CsrSrvUnusedFunction, - CsrSrvUnusedFunction, - CsrSrvIdentifyAlertableThread, + CsrSrvUnusedFunction, // <= WinNT4: CsrSrvThreadConnect + CsrSrvUnusedFunction, // <= WinNT4: CsrSrvProfileControl +#if (NTDDI_VERSION < NTDDI_WS03) + CsrSrvIdentifyAlertableThread CsrSrvSetPriorityClass +#else + CsrSrvUnusedFunction, // <= WinXP : CsrSrvIdentifyAlertableThread + CsrSrvUnusedFunction // <= WinXP : CsrSrvSetPriorityClass +#endif }; BOOLEAN CsrServerApiServerValidTable[CsrpMaxApiNumber] = { TRUE, FALSE, - TRUE, + FALSE, +#if (NTDDI_VERSION < NTDDI_WS03) TRUE, TRUE +#else + FALSE, + FALSE +#endif }; /* @@ -501,9 +511,11 @@ CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, return STATUS_SUCCESS; } +#if (NTDDI_VERSION < NTDDI_WS03) + /*++ * @name CsrSrvIdentifyAlertableThread - * @implemented NT4 + * @implemented NT4, up to WinXP * * The CsrSrvIdentifyAlertableThread CSR API marks a CSR Thread as alertable. * @@ -515,13 +527,16 @@ CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, * * @return STATUS_SUCCESS. * - * @remarks None. + * @remarks Deprecated. * *--*/ CSR_API(CsrSrvIdentifyAlertableThread) { PCSR_THREAD CsrThread = CsrGetClientThread(); + UNREFERENCED_PARAMETER(ApiMessage); + UNREFERENCED_PARAMETER(ReplyCode); + /* Set the alertable flag */ CsrThread->Flags |= CsrThreadAlertable; @@ -531,7 +546,7 @@ CSR_API(CsrSrvIdentifyAlertableThread) /*++ * @name CsrSrvSetPriorityClass - * @implemented NT4 + * @implemented NT4, up to WinXP * * The CsrSrvSetPriorityClass CSR API is deprecated. * @@ -543,23 +558,26 @@ CSR_API(CsrSrvIdentifyAlertableThread) * * @return STATUS_SUCCESS. * - * @remarks None. + * @remarks Deprecated. * *--*/ CSR_API(CsrSrvSetPriorityClass) { + UNREFERENCED_PARAMETER(ApiMessage); + UNREFERENCED_PARAMETER(ReplyCode); + /* Deprecated */ return STATUS_SUCCESS; } +#endif // (NTDDI_VERSION < NTDDI_WS03) + /*++ * @name CsrSrvUnusedFunction * @implemented NT4 * * The CsrSrvUnusedFunction CSR API is a stub for deprecated APIs. * - * The CsrSrvSetPriorityClass CSR API is deprecated. - * * @param ApiMessage * Pointer to the CSR API Message for this request. * @@ -574,6 +592,9 @@ CSR_API(CsrSrvSetPriorityClass) *--*/ CSR_API(CsrSrvUnusedFunction) { + UNREFERENCED_PARAMETER(ApiMessage); + UNREFERENCED_PARAMETER(ReplyCode); + /* Deprecated */ return STATUS_INVALID_PARAMETER; }

1 0

[reactos] 01/03: [NTDLL_APITEST] Test that NtQueryInformationProcess(ProcessWx86Information) can work without a ReturnLength pointer.
by Hermès Bélusca-Maïto 21 Nov '21

21 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d575e828d70de86cb0add… commit d575e828d70de86cb0adde9c59a40eef987f9c9f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 20 01:48:09 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 22 00:13:33 2021 +0100 [NTDLL_APITEST] Test that NtQueryInformationProcess(ProcessWx86Information) can work without a ReturnLength pointer. --- modules/rostests/apitests/ntdll/NtQueryInformationProcess.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c b/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c index 1fd990a3ef6..9469d4d492c 100644 --- a/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c +++ b/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c @@ -310,6 +310,15 @@ Test_ProcessWx86Information(void) ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); /* Query the VDM power */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + &VdmPower, + sizeof(VdmPower), + NULL); + ok_hex(Status, STATUS_SUCCESS); + ok(VdmPower == 0 || VdmPower == 1, "The VDM power value must be within the boundary between 0 and 1, not anything else! Got %lu\n", VdmPower); + + /* Same but with ReturnLength */ Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessWx86Information, &VdmPower,

1 0

[reactos] 01/01: [NTOS:SE] Don't assert on levels that don't allow impersonation.
by Thomas Faber 21 Nov '21

21 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88e3ef5fa06d030d86f5d… commit 88e3ef5fa06d030d86f5d91a43f727922496da8e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Nov 21 17:18:25 2021 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Nov 21 17:19:03 2021 -0500 [NTOS:SE] Don't assert on levels that don't allow impersonation. --- ntoskrnl/se/token.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index cd320a8dcdf..fa4a0e8d847 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -3582,11 +3582,13 @@ SeTokenCanImpersonate( /* * SecurityAnonymous and SecurityIdentification levels do not - * allow impersonation. If we get such levels from the call - * then something's seriously wrong. + * allow impersonation. */ - ASSERT(ImpersonationLevel != SecurityAnonymous && - ImpersonationLevel != SecurityIdentification); + if (ImpersonationLevel == SecurityAnonymous || + ImpersonationLevel == SecurityIdentification) + { + return FALSE; + } /* Time to lock our tokens */ SepAcquireTokenLockShared(ProcessToken);

1 0

[reactos] 01/01: [NTOS:EX] Fix version specific return value for NtSetSystemInformation:SystemFlagsInformation
by Eric Kohl 21 Nov '21

21 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e5dcf7937cf121da9a61… commit 3e5dcf7937cf121da9a61e8a05455720ffd5b171 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 21 21:41:31 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 21 21:42:04 2021 +0100 [NTOS:EX] Fix version specific return value for NtSetSystemInformation:SystemFlagsInformation --- ntoskrnl/ex/sysinfo.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index 7fcc3e8260d..43ff88faaff 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -1226,7 +1226,11 @@ SSI_DEF(SystemFlagsInformation) if (!SeSinglePrivilegeCheck(SeDebugPrivilege, ExGetPreviousMode())) { +#if (NTDDI_VERSION < NTDDI_WIN7) + return STATUS_ACCESS_VIOLATION; +#else return STATUS_ACCESS_DENIED; +#endif } NtGlobalFlag = ((PSYSTEM_FLAGS_INFORMATION) Buffer)->Flags;

1 0

[reactos] 01/01: [RICHED20] select_style(): Check font_cache too
by Serge Gautherie 21 Nov '21

21 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de330367661338396ae89… commit de330367661338396ae896ae061ed03a20ac170e Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Nov 5 18:24:21 2021 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Nov 21 13:07:59 2021 -0500 [RICHED20] select_style(): Check font_cache too Already upstreamed as wine-6.21-347-g177f808. CORE-17843 --- dll/win32/riched20/style.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/riched20/style.c b/dll/win32/riched20/style.c index 8b9c2126b1b..37c0509621f 100644 --- a/dll/win32/riched20/style.c +++ b/dll/win32/riched20/style.c @@ -429,7 +429,7 @@ void select_style( ME_Context *c, ME_Style *s ) c->orig_font = NULL; } - if (c->current_style) + if (c->current_style && c->current_style->font_cache) { release_font_cache( c->current_style->font_cache ); c->current_style->font_cache = NULL;

1 0

[reactos] 03/03: [NTOS:SE] Fix always-true assert in SeTokenCanImpersonate.
by Thomas Faber 21 Nov '21

21 Nov '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d84022d7fd41492136842… commit d84022d7fd4149213684207a33f524cd2c00d3b8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Nov 21 09:34:07 2021 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Nov 21 12:57:50 2021 -0500 [NTOS:SE] Fix always-true assert in SeTokenCanImpersonate. Courtesy of VS analysis warning C6289: Incorrect operator: mutual exclusion over || is always a non-zero constant. Did you intend to use && instead? --- ntoskrnl/se/token.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index fb1b0a52159..cd320a8dcdf 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -3585,7 +3585,7 @@ SeTokenCanImpersonate( * allow impersonation. If we get such levels from the call * then something's seriously wrong. */ - ASSERT(ImpersonationLevel != SecurityAnonymous || + ASSERT(ImpersonationLevel != SecurityAnonymous && ImpersonationLevel != SecurityIdentification); /* Time to lock our tokens */

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
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 November 2021