Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [FREELDR][INSTALL][FDEBUG] Include FreeLDR tools in LiveCD and HybridCD (#2550)
by Adam Słaboń 15 Apr '20

15 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b24d00ef1b1ddc3f3c1c… commit 7b24d00ef1b1ddc3f3c1ca66639827388de58fd8 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Wed Apr 15 12:37:21 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 15 12:37:21 2020 +0200 [FREELDR][INSTALL][FDEBUG] Include FreeLDR tools in LiveCD and HybridCD (#2550) It might be useful to have them on LiveCD/HybridCD as well. --- boot/freeldr/fdebug/CMakeLists.txt | 2 +- boot/freeldr/install/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/fdebug/CMakeLists.txt b/boot/freeldr/fdebug/CMakeLists.txt index 61d94d8b785..ad446182f13 100644 --- a/boot/freeldr/fdebug/CMakeLists.txt +++ b/boot/freeldr/fdebug/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(fdebug fdebug.c rs232.c fdebug.rc) set_module_type(fdebug win32gui UNICODE) add_importlibs(fdebug comdlg32 user32 gdi32 msvcrt kernel32) -add_cd_file(TARGET fdebug DESTINATION loader NO_CAB FOR bootcd) +add_cd_file(TARGET fdebug DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd livecd hybridcd) diff --git a/boot/freeldr/install/CMakeLists.txt b/boot/freeldr/install/CMakeLists.txt index ed106f2a97d..67d2d8d51cd 100644 --- a/boot/freeldr/install/CMakeLists.txt +++ b/boot/freeldr/install/CMakeLists.txt @@ -21,4 +21,4 @@ add_executable(installfreeldr EXCLUDE_FROM_ALL set_module_type(installfreeldr win32cui) add_importlibs(installfreeldr msvcrt kernel32) -add_cd_file(TARGET installfreeldr DESTINATION loader NO_CAB FOR bootcd) +add_cd_file(TARGET installfreeldr DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd livecd hybridcd)

1 0

[reactos] 05/05: [CSRSRV] Improve validation of CSR API Message's capture buffers.
by Hermès Bélusca-Maïto 15 Apr '20

15 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e2db7733852804b65ecc… commit 7e2db7733852804b65ecc756f09727dfc8f7cce4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 15 01:58:08 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 15 02:07:00 2020 +0200 [CSRSRV] Improve validation of CSR API Message's capture buffers. - Improve capture buffer validation in CsrCaptureArguments(), by implementing the checks done by Windows 2003 (NT 5.2) described in section "Server-Side Validation and Capture" of the article https://www.geoffchappell.com/studies/windows/win32/csrsrv/api/apireqst/cap… - In CsrReleaseCapturedArguments(), protect the data copy back into the client buffer within a SEH block. --- subsystems/win32/csrsrv/api.c | 136 +++++++++++++++++++++++++++++++++++------- 1 file changed, 114 insertions(+), 22 deletions(-) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index 113fb612dbf..8561ee13943 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -1120,34 +1120,68 @@ NTAPI CsrCaptureArguments(IN PCSR_THREAD CsrThread, IN PCSR_API_MESSAGE ApiMessage) { - PCSR_CAPTURE_BUFFER ClientCaptureBuffer = NULL, ServerCaptureBuffer = NULL; + PCSR_PROCESS CsrProcess = CsrThread->Process; + PCSR_CAPTURE_BUFFER ClientCaptureBuffer, ServerCaptureBuffer = NULL; + ULONG_PTR EndOfClientBuffer; + SIZE_T SizeOfBufferThroughOffsetsArray; SIZE_T BufferDistance; - ULONG Length = 0; + ULONG Length; ULONG PointerCount; PULONG_PTR OffsetPointer; ULONG_PTR CurrentOffset; - /* Use SEH to make sure this is valid */ + /* Get the buffer we got from whoever called NTDLL */ + ClientCaptureBuffer = ApiMessage->CsrCaptureData; + + /* Use SEH to validate and capture the client buffer */ _SEH2_TRY { - /* Get the buffer we got from whoever called NTDLL */ - ClientCaptureBuffer = ApiMessage->CsrCaptureData; + /* Check whether at least the buffer's header is inside our mapped section */ + if ( ((ULONG_PTR)ClientCaptureBuffer < CsrProcess->ClientViewBase) || + (((ULONG_PTR)ClientCaptureBuffer + FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray)) + >= CsrProcess->ClientViewBounds) ) + { +#ifdef CSR_DBG + DPRINT1("*** CSRSS: CaptureBuffer outside of ClientView 1\n"); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif + /* Return failure */ + ApiMessage->Status = STATUS_INVALID_PARAMETER; + _SEH2_YIELD(return FALSE); + } + + /* Capture the buffer length */ Length = ClientCaptureBuffer->Size; - /* Now check if the buffer is inside our mapped section */ - if (((ULONG_PTR)ClientCaptureBuffer < CsrThread->Process->ClientViewBase) || - (((ULONG_PTR)ClientCaptureBuffer + Length) >= CsrThread->Process->ClientViewBounds)) + /* + * Now check if the remaining of the buffer is inside our mapped section. + * Take also care for any possible wrap-around of the buffer end-address. + */ + EndOfClientBuffer = (ULONG_PTR)ClientCaptureBuffer + Length; + if ( (EndOfClientBuffer < (ULONG_PTR)ClientCaptureBuffer) || + (EndOfClientBuffer >= CsrProcess->ClientViewBounds) ) { +#ifdef CSR_DBG + DPRINT1("*** CSRSS: CaptureBuffer outside of ClientView 2\n"); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif /* Return failure */ - DPRINT1("*** CSRSS: CaptureBuffer outside of ClientView\n"); ApiMessage->Status = STATUS_INVALID_PARAMETER; _SEH2_YIELD(return FALSE); } - /* Check if the Length is valid */ - if ((FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + - (ClientCaptureBuffer->PointerCount * sizeof(PVOID)) > Length) || - (ClientCaptureBuffer->PointerCount > MAXUSHORT)) + /* Capture the pointer count */ + PointerCount = ClientCaptureBuffer->PointerCount; + + /* + * Check whether the total buffer size and the pointer count are consistent + * -- the array of offsets must be contained inside the buffer. + */ + SizeOfBufferThroughOffsetsArray = + FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + + (PointerCount * sizeof(PVOID)); + if ( (PointerCount > MAXUSHORT) || + (SizeOfBufferThroughOffsetsArray > Length) ) { #ifdef CSR_DBG DPRINT1("*** CSRSS: CaptureBuffer %p has bad length\n", ClientCaptureBuffer); @@ -1160,10 +1194,15 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { +#ifdef CSR_DBG + DPRINT1("*** CSRSS: Took exception during capture %x\n", _SEH2_GetExceptionCode()); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif /* Return failure */ ApiMessage->Status = STATUS_INVALID_PARAMETER; _SEH2_YIELD(return FALSE); - } _SEH2_END; + } + _SEH2_END; /* We validated the client buffer, now allocate the server buffer */ ServerCaptureBuffer = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, Length); @@ -1174,8 +1213,29 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, return FALSE; } - /* Copy the client's buffer */ - RtlMoveMemory(ServerCaptureBuffer, ClientCaptureBuffer, Length); + /* + * Copy the client's buffer and ensure we use the correct buffer length + * and pointer count we captured and used for validation earlier on. + */ + _SEH2_TRY + { + RtlMoveMemory(ServerCaptureBuffer, ClientCaptureBuffer, Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { +#ifdef CSR_DBG + DPRINT1("*** CSRSS: Took exception during capture %x\n", _SEH2_GetExceptionCode()); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif + /* Failure, free the buffer and return */ + RtlFreeHeap(CsrHeap, 0, ServerCaptureBuffer); + ApiMessage->Status = STATUS_INVALID_PARAMETER; + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + ServerCaptureBuffer->Size = Length; + ServerCaptureBuffer->PointerCount = PointerCount; /* Calculate the difference between our buffer and the client's */ BufferDistance = (ULONG_PTR)ServerCaptureBuffer - (ULONG_PTR)ClientCaptureBuffer; @@ -1184,7 +1244,7 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, * All the pointer offsets correspond to pointers which point * to the server data buffer instead of the client one. */ - PointerCount = ServerCaptureBuffer->PointerCount; + // PointerCount = ServerCaptureBuffer->PointerCount; OffsetPointer = ServerCaptureBuffer->PointerOffsetsArray; while (PointerCount--) { @@ -1192,12 +1252,30 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, if (CurrentOffset != 0) { + /* + * Check whether the offset is pointer-aligned and whether + * it points inside CSR_API_MESSAGE::Data.ApiMessageData. + */ + if ( ((CurrentOffset & (sizeof(PVOID)-1)) != 0) || + (CurrentOffset < FIELD_OFFSET(CSR_API_MESSAGE, Data.ApiMessageData)) || + (CurrentOffset >= sizeof(CSR_API_MESSAGE)) ) + { +#ifdef CSR_DBG + DPRINT1("*** CSRSS: CaptureBuffer MessagePointer outside of message\n"); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif + /* Invalid pointer, fail */ + ApiMessage->Status = STATUS_INVALID_PARAMETER; + break; + } + /* Get the pointer corresponding to the offset */ CurrentOffset += (ULONG_PTR)ApiMessage; /* Validate the bounds of the current pointed pointer */ - if ((*(PULONG_PTR)CurrentOffset >= CsrThread->Process->ClientViewBase) && - (*(PULONG_PTR)CurrentOffset < CsrThread->Process->ClientViewBounds)) + if ( (*(PULONG_PTR)CurrentOffset >= ((ULONG_PTR)ClientCaptureBuffer + + SizeOfBufferThroughOffsetsArray)) && + (*(PULONG_PTR)CurrentOffset <= (EndOfClientBuffer - sizeof(PVOID))) ) { /* Modify the pointed pointer to take into account its new position */ *(PULONG_PTR)CurrentOffset += BufferDistance; @@ -1210,6 +1288,7 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, #endif /* Invalid pointer, fail */ ApiMessage->Status = STATUS_INVALID_PARAMETER; + break; } } @@ -1278,7 +1357,7 @@ CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage) /* * All the pointer offsets correspond to pointers which point - * to the client data buffer instead of the server one (revert + * to the client data buffer instead of the server one (reverse * the logic of CsrCaptureArguments()). */ PointerCount = ServerCaptureBuffer->PointerCount; @@ -1299,8 +1378,21 @@ CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage) ++OffsetPointer; } - /* Copy the data back */ - RtlMoveMemory(ClientCaptureBuffer, ServerCaptureBuffer, ServerCaptureBuffer->Size); + /* Copy the data back into the client buffer */ + _SEH2_TRY + { + RtlMoveMemory(ClientCaptureBuffer, ServerCaptureBuffer, ServerCaptureBuffer->Size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { +#ifdef CSR_DBG + DPRINT1("*** CSRSS: Took exception during release %x\n", _SEH2_GetExceptionCode()); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif + /* Return failure */ + ApiMessage->Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Free our allocated buffer */ RtlFreeHeap(CsrHeap, 0, ServerCaptureBuffer);

1 0

[reactos] 04/05: [CSRSRV] CsrCaptureArguments() and CsrReleaseCapturedArguments(): Use better names for the capture buffers.
by Hermès Bélusca-Maïto 15 Apr '20

15 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=358dd50d61541c6d0e8f8… commit 358dd50d61541c6d0e8f837d6c67083ac1f83eec Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 14 23:07:42 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 15 02:06:59 2020 +0200 [CSRSRV] CsrCaptureArguments() and CsrReleaseCapturedArguments(): Use better names for the capture buffers. Rename inaccurate names 'LocalCaptureBuffer' and 'RemoteCaptureBuffer' into 'ClientCaptureBuffer' and 'ServerCaptureBuffer' respectively. (Recall: CSRSRV is the 'Server', and any app doing LPC calls to it is the 'Client'.) --- subsystems/win32/csrsrv/api.c | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index 9c86c58c56d..113fb612dbf 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -1120,7 +1120,7 @@ NTAPI CsrCaptureArguments(IN PCSR_THREAD CsrThread, IN PCSR_API_MESSAGE ApiMessage) { - PCSR_CAPTURE_BUFFER LocalCaptureBuffer = NULL, RemoteCaptureBuffer = NULL; + PCSR_CAPTURE_BUFFER ClientCaptureBuffer = NULL, ServerCaptureBuffer = NULL; SIZE_T BufferDistance; ULONG Length = 0; ULONG PointerCount; @@ -1131,12 +1131,12 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, _SEH2_TRY { /* Get the buffer we got from whoever called NTDLL */ - LocalCaptureBuffer = ApiMessage->CsrCaptureData; - Length = LocalCaptureBuffer->Size; + ClientCaptureBuffer = ApiMessage->CsrCaptureData; + Length = ClientCaptureBuffer->Size; /* Now check if the buffer is inside our mapped section */ - if (((ULONG_PTR)LocalCaptureBuffer < CsrThread->Process->ClientViewBase) || - (((ULONG_PTR)LocalCaptureBuffer + Length) >= CsrThread->Process->ClientViewBounds)) + if (((ULONG_PTR)ClientCaptureBuffer < CsrThread->Process->ClientViewBase) || + (((ULONG_PTR)ClientCaptureBuffer + Length) >= CsrThread->Process->ClientViewBounds)) { /* Return failure */ DPRINT1("*** CSRSS: CaptureBuffer outside of ClientView\n"); @@ -1146,11 +1146,11 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, /* Check if the Length is valid */ if ((FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + - (LocalCaptureBuffer->PointerCount * sizeof(PVOID)) > Length) || - (LocalCaptureBuffer->PointerCount > MAXUSHORT)) + (ClientCaptureBuffer->PointerCount * sizeof(PVOID)) > Length) || + (ClientCaptureBuffer->PointerCount > MAXUSHORT)) { #ifdef CSR_DBG - DPRINT1("*** CSRSS: CaptureBuffer %p has bad length\n", LocalCaptureBuffer); + DPRINT1("*** CSRSS: CaptureBuffer %p has bad length\n", ClientCaptureBuffer); if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); #endif /* Return failure */ @@ -1165,9 +1165,9 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, _SEH2_YIELD(return FALSE); } _SEH2_END; - /* We validated the incoming buffer, now allocate the remote one */ - RemoteCaptureBuffer = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, Length); - if (!RemoteCaptureBuffer) + /* We validated the client buffer, now allocate the server buffer */ + ServerCaptureBuffer = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, Length); + if (!ServerCaptureBuffer) { /* We're out of memory */ ApiMessage->Status = STATUS_NO_MEMORY; @@ -1175,17 +1175,17 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, } /* Copy the client's buffer */ - RtlMoveMemory(RemoteCaptureBuffer, LocalCaptureBuffer, Length); + RtlMoveMemory(ServerCaptureBuffer, ClientCaptureBuffer, Length); /* Calculate the difference between our buffer and the client's */ - BufferDistance = (ULONG_PTR)RemoteCaptureBuffer - (ULONG_PTR)LocalCaptureBuffer; + BufferDistance = (ULONG_PTR)ServerCaptureBuffer - (ULONG_PTR)ClientCaptureBuffer; /* * All the pointer offsets correspond to pointers which point - * to the remote data buffer instead of the local one. + * to the server data buffer instead of the client one. */ - PointerCount = RemoteCaptureBuffer->PointerCount; - OffsetPointer = RemoteCaptureBuffer->PointerOffsetsArray; + PointerCount = ServerCaptureBuffer->PointerCount; + OffsetPointer = ServerCaptureBuffer->PointerOffsetsArray; while (PointerCount--) { CurrentOffset = *OffsetPointer; @@ -1219,15 +1219,15 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, /* Check if we got success */ if (ApiMessage->Status != STATUS_SUCCESS) { - /* Failure. Free the buffer and return */ - RtlFreeHeap(CsrHeap, 0, RemoteCaptureBuffer); + /* Failure, free the buffer and return */ + RtlFreeHeap(CsrHeap, 0, ServerCaptureBuffer); return FALSE; } else { - /* Success, save the previous buffer and use the remote capture buffer */ - RemoteCaptureBuffer->PreviousCaptureBuffer = LocalCaptureBuffer; - ApiMessage->CsrCaptureData = RemoteCaptureBuffer; + /* Success, save the previous buffer and use the server capture buffer */ + ServerCaptureBuffer->PreviousCaptureBuffer = ClientCaptureBuffer; + ApiMessage->CsrCaptureData = ServerCaptureBuffer; } /* Success */ @@ -1254,35 +1254,35 @@ VOID NTAPI CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage) { - PCSR_CAPTURE_BUFFER RemoteCaptureBuffer, LocalCaptureBuffer; + PCSR_CAPTURE_BUFFER ServerCaptureBuffer, ClientCaptureBuffer; SIZE_T BufferDistance; ULONG PointerCount; PULONG_PTR OffsetPointer; ULONG_PTR CurrentOffset; - /* Get the remote capture buffer */ - RemoteCaptureBuffer = ApiMessage->CsrCaptureData; + /* Get the server capture buffer */ + ServerCaptureBuffer = ApiMessage->CsrCaptureData; /* Do not continue if there is no captured buffer */ - if (!RemoteCaptureBuffer) return; + if (!ServerCaptureBuffer) return; - /* If there is one, get the corresponding local capture buffer */ - LocalCaptureBuffer = RemoteCaptureBuffer->PreviousCaptureBuffer; + /* If there is one, get the corresponding client capture buffer */ + ClientCaptureBuffer = ServerCaptureBuffer->PreviousCaptureBuffer; - /* Free the previous one and use again the local capture buffer */ - RemoteCaptureBuffer->PreviousCaptureBuffer = NULL; - ApiMessage->CsrCaptureData = LocalCaptureBuffer; + /* Free the previous one and use again the client capture buffer */ + ServerCaptureBuffer->PreviousCaptureBuffer = NULL; + ApiMessage->CsrCaptureData = ClientCaptureBuffer; /* Calculate the difference between our buffer and the client's */ - BufferDistance = (ULONG_PTR)RemoteCaptureBuffer - (ULONG_PTR)LocalCaptureBuffer; + BufferDistance = (ULONG_PTR)ServerCaptureBuffer - (ULONG_PTR)ClientCaptureBuffer; /* * All the pointer offsets correspond to pointers which point - * to the local data buffer instead of the remote one (revert - * the logic of CsrCaptureArguments). + * to the client data buffer instead of the server one (revert + * the logic of CsrCaptureArguments()). */ - PointerCount = RemoteCaptureBuffer->PointerCount; - OffsetPointer = RemoteCaptureBuffer->PointerOffsetsArray; + PointerCount = ServerCaptureBuffer->PointerCount; + OffsetPointer = ServerCaptureBuffer->PointerOffsetsArray; while (PointerCount--) { CurrentOffset = *OffsetPointer; @@ -1300,10 +1300,10 @@ CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage) } /* Copy the data back */ - RtlMoveMemory(LocalCaptureBuffer, RemoteCaptureBuffer, RemoteCaptureBuffer->Size); + RtlMoveMemory(ClientCaptureBuffer, ServerCaptureBuffer, ServerCaptureBuffer->Size); /* Free our allocated buffer */ - RtlFreeHeap(CsrHeap, 0, RemoteCaptureBuffer); + RtlFreeHeap(CsrHeap, 0, ServerCaptureBuffer); } /*++

1 0

[reactos] 03/05: [CSRSRV] Protect the Server DLL entrypoint calls under SEH.
by Hermès Bélusca-Maïto 15 Apr '20

15 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd77ac67d0fa45f08885a… commit dd77ac67d0fa45f08885a9b511125268ae93860d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 14 22:58:22 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 15 02:06:58 2020 +0200 [CSRSRV] Protect the Server DLL entrypoint calls under SEH. --- subsystems/win32/csrsrv/server.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/subsystems/win32/csrsrv/server.c b/subsystems/win32/csrsrv/server.c index c161bb4166b..4fa35367927 100644 --- a/subsystems/win32/csrsrv/server.c +++ b/subsystems/win32/csrsrv/server.c @@ -205,6 +205,9 @@ CsrLoadServerDll(IN PCHAR DllString, else { /* No handle, so we are loading ourselves */ +#ifdef CSR_DBG + RtlInitAnsiString(&EntryPointString, "CsrServerDllInitialization"); +#endif ServerDllInitProcedure = CsrServerDllInitialization; Status = STATUS_SUCCESS; } @@ -212,8 +215,21 @@ CsrLoadServerDll(IN PCHAR DllString, /* Check if we got the pointer, and call it */ if (NT_SUCCESS(Status)) { - /* Get the result from the Server DLL */ - Status = ServerDllInitProcedure(ServerDll); + /* Call the Server DLL entrypoint */ + _SEH2_TRY + { + Status = ServerDllInitProcedure(ServerDll); + } + _SEH2_EXCEPT(CsrUnhandledExceptionFilter(_SEH2_GetExceptionInformation())) + { + Status = _SEH2_GetExceptionCode(); +#ifdef CSR_DBG + DPRINT1("CSRSS: Exception 0x%lx while calling Server DLL entrypoint %Z!%Z()\n", + Status, &DllName, &EntryPointString); +#endif + } + _SEH2_END; + if (NT_SUCCESS(Status)) { /*

1 0

[reactos] 02/05: [CSRSRV] Only when CSRSRV is compiled in debugging mode, should we display debugging messages and support debug breakpoints.
by Hermès Bélusca-Maïto 15 Apr '20

15 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=835f3ef13dcc4e3372616… commit 835f3ef13dcc4e33726160055e21e10b536e014b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 14 22:53:49 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 15 02:06:58 2020 +0200 [CSRSRV] Only when CSRSRV is compiled in debugging mode, should we display debugging messages and support debug breakpoints. Also, trigger the less fatal breakpoints only if CSRSS/CSRSRV is being debugged (the 'BeingDebugged' flag is set in the current PEB). This will avoid any unhandled breakpoint exceptions when testing/fuzzing running debug builds of ReactOS without any debugger attached. --- subsystems/win32/csrsrv/api.c | 46 +++++++++++++++++++++++++++++---------- subsystems/win32/csrsrv/procsup.c | 7 +++++- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index e8b845597e3..9c86c58c56d 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -78,16 +78,16 @@ CsrCallServerFromServer(IN PCSR_API_MESSAGE ReceiveMsg, ((ServerDll->ValidTable) && !(ServerDll->ValidTable[ApiId]))) { /* We are beyond the Maximum API ID, or it doesn't exist */ - DPRINT1("API: %d\n", ApiId); #ifdef CSR_DBG + DPRINT1("API: %d\n", ApiId); DPRINT1("CSRSS: %lx (%s) is invalid ApiTableIndex for %Z or is an " "invalid API to call from the server.\n", ApiId, ((ServerDll->NameTable) && (ServerDll->NameTable[ApiId])) ? ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", &ServerDll->Name); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); #endif - // DbgBreakPoint(); ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION; } @@ -189,6 +189,7 @@ CsrApiHandleConnectionRequest(IN PCSR_API_MESSAGE ApiMessage) ConnectInfo->ServerProcessId = NtCurrentTeb()->ClientId.UniqueProcess; /* Accept the Connection */ + ASSERT(!AllowConnection || (AllowConnection && CsrProcess)); Status = NtAcceptConnectPort(&ServerPort, AllowConnection ? UlongToPtr(CsrProcess->SequenceNumber) : 0, &ApiMessage->Header, @@ -382,6 +383,7 @@ CsrApiRequestThread(IN PVOID Parameter) /* Make sure the real CID is set */ Teb->RealClientId = Teb->ClientId; +#ifdef CSR_DBG /* Debug check */ if (Teb->CountOfOwnedCriticalSections) { @@ -391,6 +393,7 @@ CsrApiRequestThread(IN PVOID Parameter) &ReceiveMsg, ReplyMsg); DbgBreakPoint(); } +#endif /* Wait for a message to come through */ Status = NtReplyWaitReceivePort(ReplyPort, @@ -404,15 +407,17 @@ CsrApiRequestThread(IN PVOID Parameter) /* Was it a failure or another success code? */ if (!NT_SUCCESS(Status)) { +#ifdef CSR_DBG /* Check for specific status cases */ if ((Status != STATUS_INVALID_CID) && (Status != STATUS_UNSUCCESSFUL) && - ((Status == STATUS_INVALID_HANDLE) || (ReplyPort == CsrApiPort))) + ((Status != STATUS_INVALID_HANDLE) || (ReplyPort == CsrApiPort))) { /* Notify the debugger */ DPRINT1("CSRSS: ReceivePort failed - Status == %X\n", Status); DPRINT1("CSRSS: ReplyPortHandle %lx CsrApiPort %lx\n", ReplyPort, CsrApiPort); } +#endif /* We failed big time, so start out fresh */ ReplyMsg = NULL; @@ -427,6 +432,9 @@ CsrApiRequestThread(IN PVOID Parameter) } } + // ASSERT(ReceiveMsg.Header.u1.s1.TotalLength >= sizeof(PORT_MESSAGE)); + // ASSERT(ReceiveMsg.Header.u1.s1.TotalLength < sizeof(ReceiveMsg)); + /* Use whatever Client ID we got */ Teb->RealClientId = ReceiveMsg.Header.ClientId; @@ -534,9 +542,11 @@ CsrApiRequestThread(IN PVOID Parameter) (!(ServerDll = CsrLoadedServerDll[ServerId]))) { /* We are beyond the Maximum Server ID */ +#ifdef CSR_DBG DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); - // DbgBreakPoint(); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif ReplyMsg = NULL; ReplyPort = CsrApiPort; @@ -736,9 +746,11 @@ CsrApiRequestThread(IN PVOID Parameter) (!(ServerDll = CsrLoadedServerDll[ServerId]))) { /* We are beyond the Maximum Server ID */ +#ifdef CSR_DBG DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); - // DbgBreakPoint(); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif ReplyPort = CsrApiPort; ReplyMsg = &ReceiveMsg; @@ -828,7 +840,10 @@ CsrApiRequestThread(IN PVOID Parameter) else if (ReplyCode == CsrReplyDeadClient) { /* Reply to the death message */ - NtReplyPort(ReplyPort, &ReplyMsg->Header); + NTSTATUS Status2; + Status2 = NtReplyPort(ReplyPort, &ReplyMsg->Header); + if (!NT_SUCCESS(Status2)) + DPRINT1("CSRSS: Error while replying to the death message, Status 0x%lx\n", Status2); /* Reply back to the API port now */ ReplyMsg = NULL; @@ -1042,7 +1057,8 @@ CsrConnectToUser(VOID) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Connected = FALSE; - } _SEH2_END; + } + _SEH2_END; if (!Connected) { @@ -1133,9 +1149,11 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, (LocalCaptureBuffer->PointerCount * sizeof(PVOID)) > Length) || (LocalCaptureBuffer->PointerCount > MAXUSHORT)) { - /* Return failure */ +#ifdef CSR_DBG DPRINT1("*** CSRSS: CaptureBuffer %p has bad length\n", LocalCaptureBuffer); - DbgBreakPoint(); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif + /* Return failure */ ApiMessage->Status = STATUS_INVALID_PARAMETER; _SEH2_YIELD(return FALSE); } @@ -1186,9 +1204,11 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, } else { - /* Invalid pointer, fail */ +#ifdef CSR_DBG DPRINT1("*** CSRSS: CaptureBuffer MessagePointer outside of ClientView\n"); - DbgBreakPoint(); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif + /* Invalid pointer, fail */ ApiMessage->Status = STATUS_INVALID_PARAMETER; } } @@ -1375,8 +1395,10 @@ CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, } /* Failure */ +#ifdef CSR_DBG DPRINT1("CSRSRV: Bad message buffer %p\n", ApiMessage); - DbgBreakPoint(); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif return FALSE; } diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c index 2d88a6b11c4..30cde8a2fea 100644 --- a/subsystems/win32/csrsrv/procsup.c +++ b/subsystems/win32/csrsrv/procsup.c @@ -945,8 +945,10 @@ CsrImpersonateClient(IN PCSR_THREAD CsrThread) if (!NT_SUCCESS(Status)) { /* Failure */ +#ifdef CSR_DBG DPRINT1("CSRSS: Can't impersonate client thread - Status = %lx\n", Status); // if (Status != STATUS_BAD_IMPERSONATION_LEVEL) DbgBreakPoint(); +#endif return FALSE; } @@ -1337,6 +1339,7 @@ CsrShutdownProcesses(IN PLUID CallerLuid, } else if (Result == CsrShutdownCancelled) { +#ifdef CSR_DBG /* Check if this was a forced shutdown */ if (Flags & EWX_FORCE) { @@ -1344,6 +1347,7 @@ CsrShutdownProcesses(IN PLUID CallerLuid, CsrProcess->ClientId.UniqueProcess, i); DbgBreakPoint(); } +#endif /* Shutdown was cancelled, unlock and exit */ CsrReleaseProcessLock(); @@ -1365,7 +1369,8 @@ CsrShutdownProcesses(IN PLUID CallerLuid, } /* We've reached the final loop here, so dereference */ - if (i == CSR_SERVER_DLL_MAX) CsrLockedDereferenceProcess(CsrProcess); + if (i == CSR_SERVER_DLL_MAX) + CsrLockedDereferenceProcess(CsrProcess); } /* Success path */

1 0

[reactos] 01/05: [CSRSRV] s/LPWSTR/PWSTR/ as the former is not NT type.
by Hermès Bélusca-Maïto 15 Apr '20

15 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37b2c1450cf067b327525… commit 37b2c1450cf067b327525ffcd39d63541eb7476c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 14 22:38:51 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 15 02:06:57 2020 +0200 [CSRSRV] s/LPWSTR/PWSTR/ as the former is not NT type. --- sdk/include/reactos/subsys/csr/csrsrv.h | 2 +- subsystems/win32/csrsrv/api.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/subsys/csr/csrsrv.h b/sdk/include/reactos/subsys/csr/csrsrv.h index 8634d3cf834..39fc5adfd2e 100644 --- a/sdk/include/reactos/subsys/csr/csrsrv.h +++ b/sdk/include/reactos/subsys/csr/csrsrv.h @@ -427,7 +427,7 @@ CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, BOOLEAN NTAPI CsrValidateMessageString(IN PCSR_API_MESSAGE ApiMessage, - IN LPWSTR *MessageString); + IN PWSTR *MessageString); #endif // _CSRSRV_H diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index 57da1950ca8..e8b845597e3 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -1401,7 +1401,7 @@ CsrValidateMessageBuffer(IN PCSR_API_MESSAGE ApiMessage, BOOLEAN NTAPI CsrValidateMessageString(IN PCSR_API_MESSAGE ApiMessage, - IN LPWSTR *MessageString) + IN PWSTR *MessageString) { if (MessageString) {

1 0

[reactos] 01/01: [SYSDM.CPL] fr-FR Resize & Reposition 3 buttons CORE-16595
by Joachim Henze 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=feeeca26959404884c8b7… commit feeeca26959404884c8b7115259f90bf58fda1bb Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Apr 14 01:34:34 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Apr 14 01:35:10 2020 +0200 [SYSDM.CPL] fr-FR Resize & Reposition 3 buttons CORE-16595 to avoid text truncation of the button "Environment Variables" --- dll/cpl/sysdm/lang/fr-FR.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 274e8e41cc3..d8c5d387259 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -57,9 +57,9 @@ BEGIN GROUPBOX "Démarrage et Récupération", IDC_STATIC, 6, 131, 244, 52 LTEXT "Les options Démarrage et Récupération indiquent à l'ordinateur comment démarrer et quoi faire si une erreur empêche l'ordinateur de s'arrêter.", IDC_STATIC, 16, 144, 210, 30 PUSHBUTTON "Réglages", IDC_STAREC, 194, 162, 50, 15 - PUSHBUTTON "Paramètres système", IDC_SYSSETTINGS, 6, 192, 80, 15 - PUSHBUTTON "Variables d'en&vironnement", IDC_ENVVAR, 88, 192, 80, 15 - PUSHBUTTON "Rapport d'e&rreurs", IDC_ERRORREPORT, 170, 192, 80, 15 + PUSHBUTTON "Paramètres système", IDC_SYSSETTINGS, 6, 192, 75, 15 + PUSHBUTTON "Variables d'en&vironnement", IDC_ENVVAR, 83, 192, 90, 15 + PUSHBUTTON "Rapport d'e&rreurs", IDC_ERRORREPORT, 175, 192, 75, 15 END IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106

1 0

[reactos] 01/01: [CONSRV] Move process-initialization-specific functions from handle.c into console.c .
by Hermès Bélusca-Maïto 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c05df38e86217cb00cd2e… commit c05df38e86217cb00cd2e904d36ccdcea3de1b31 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 13 23:24:55 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Apr 14 01:19:48 2020 +0200 [CONSRV] Move process-initialization-specific functions from handle.c into console.c . - Move ConSrvInitHandlesTable() & rename it ConSrvInitProcessHandles() since its purpose is to initialize the standard input, output and error handles for a console process. - Move ConSrvAllocateConsole(), ConSrvInheritConsole() and ConSrvRemoveConsole(). --- win32ss/user/winsrv/consrv/console.c | 420 +++++++++++++++++++++++++++++++++ win32ss/user/winsrv/consrv/handle.c | 422 +--------------------------------- win32ss/user/winsrv/consrv/handle.h | 8 + win32ss/user/winsrv/consrv/init.c | 5 - win32ss/user/winsrv/consrv/procinit.h | 34 +-- 5 files changed, 450 insertions(+), 439 deletions(-) diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c index 12351a8b18c..1e35fdea127 100644 --- a/win32ss/user/winsrv/consrv/console.c +++ b/win32ss/user/winsrv/consrv/console.c @@ -551,6 +551,11 @@ ConSrvInitConsole(OUT PHANDLE NewConsoleHandle, *NewConsole = NULL; + DPRINT("Initialization of console '%S' for process '%S' on desktop '%S'\n", + ConsoleInitInfo->ConsoleTitle ? ConsoleInitInfo->ConsoleTitle : L"n/a", + ConsoleInitInfo->AppName ? ConsoleInitInfo->AppName : L"n/a", + ConsoleInitInfo->Desktop ? ConsoleInitInfo->Desktop : L"n/a"); + /* * Load the console settings */ @@ -879,6 +884,421 @@ ConioUnpause(PCONSRV_CONSOLE Console, UCHAR Flags) } +/* CONSOLE PROCESS INITIALIZATION FUNCTIONS ***********************************/ + +static NTSTATUS +ConSrvInitProcessHandles( + IN OUT PCONSOLE_PROCESS_DATA ProcessData, + IN PCONSRV_CONSOLE Console, + OUT PHANDLE pInputHandle, + OUT PHANDLE pOutputHandle, + OUT PHANDLE pErrorHandle) +{ + NTSTATUS Status; + HANDLE InputHandle = INVALID_HANDLE_VALUE, + OutputHandle = INVALID_HANDLE_VALUE, + ErrorHandle = INVALID_HANDLE_VALUE; + + /* + * Initialize the process handles. Use temporary variables to store + * the handles values in such a way that, if we fail, we don't + * return to the caller invalid handle values. + * + * Insert the IO handles. + */ + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + + /* Insert the Input handle */ + Status = ConSrvInsertObject(ProcessData, + &InputHandle, + &Console->InputBuffer.Header, + GENERIC_READ | GENERIC_WRITE, + TRUE, + FILE_SHARE_READ | FILE_SHARE_WRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert the input handle\n"); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + ConSrvFreeHandlesTable(ProcessData); + return Status; + } + + /* Insert the Output handle */ + Status = ConSrvInsertObject(ProcessData, + &OutputHandle, + &Console->ActiveBuffer->Header, + GENERIC_READ | GENERIC_WRITE, + TRUE, + FILE_SHARE_READ | FILE_SHARE_WRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert the output handle\n"); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + ConSrvFreeHandlesTable(ProcessData); + return Status; + } + + /* Insert the Error handle */ + Status = ConSrvInsertObject(ProcessData, + &ErrorHandle, + &Console->ActiveBuffer->Header, + GENERIC_READ | GENERIC_WRITE, + TRUE, + FILE_SHARE_READ | FILE_SHARE_WRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert the error handle\n"); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + ConSrvFreeHandlesTable(ProcessData); + return Status; + } + + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + + /* Return the newly created handles */ + *pInputHandle = InputHandle; + *pOutputHandle = OutputHandle; + *pErrorHandle = ErrorHandle; + + return STATUS_SUCCESS; +} + +NTSTATUS +ConSrvAllocateConsole( + IN OUT PCONSOLE_PROCESS_DATA ProcessData, + OUT PHANDLE pInputHandle, + OUT PHANDLE pOutputHandle, + OUT PHANDLE pErrorHandle, + IN OUT PCONSOLE_INIT_INFO ConsoleInitInfo) +{ + NTSTATUS Status = STATUS_SUCCESS; + HANDLE ConsoleHandle; + PCONSRV_CONSOLE Console; + + /* + * We are about to create a new console. However when ConSrvNewProcess() + * was called, we didn't know that we wanted to create a new console and + * therefore, we by default inherited the handle table from our parent + * process. It's only now that we notice that in fact we do not need + * them, because we've created a new console and thus we must use it. + * + * Therefore, free the handle table so that we can recreate + * a new one later on. + */ + ConSrvFreeHandlesTable(ProcessData); + + /* Initialize a new Console owned by this process */ + Status = ConSrvInitConsole(&ConsoleHandle, + &Console, + ConsoleInitInfo, + ProcessData->Process); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Console initialization failed\n"); + return Status; + } + + /* Assign the new console handle */ + ProcessData->ConsoleHandle = ConsoleHandle; + + /* Initialize the process handles */ + Status = ConSrvInitProcessHandles(ProcessData, + Console, + pInputHandle, + pOutputHandle, + pErrorHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize the process handles\n"); + ConSrvDeleteConsole(Console); + ProcessData->ConsoleHandle = NULL; + return Status; + } + + /* Duplicate the Initialization Events */ + Status = NtDuplicateObject(NtCurrentProcess(), + Console->InitEvents[INIT_SUCCESS], + ProcessData->Process->ProcessHandle, + &ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_SUCCESS], + EVENT_ALL_ACCESS, 0, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDuplicateObject(InitEvents[INIT_SUCCESS]) failed: %lu\n", Status); + ConSrvFreeHandlesTable(ProcessData); + ConSrvDeleteConsole(Console); + ProcessData->ConsoleHandle = NULL; + return Status; + } + + Status = NtDuplicateObject(NtCurrentProcess(), + Console->InitEvents[INIT_FAILURE], + ProcessData->Process->ProcessHandle, + &ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_FAILURE], + EVENT_ALL_ACCESS, 0, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDuplicateObject(InitEvents[INIT_FAILURE]) failed: %lu\n", Status); + NtDuplicateObject(ProcessData->Process->ProcessHandle, + ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_SUCCESS], + NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); + ConSrvFreeHandlesTable(ProcessData); + ConSrvDeleteConsole(Console); + ProcessData->ConsoleHandle = NULL; + return Status; + } + + /* Duplicate the Input Event */ + Status = NtDuplicateObject(NtCurrentProcess(), + Console->InputBuffer.ActiveEvent, + ProcessData->Process->ProcessHandle, + &ConsoleInitInfo->ConsoleStartInfo->InputWaitHandle, + EVENT_ALL_ACCESS, 0, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDuplicateObject(InputWaitHandle) failed: %lu\n", Status); + NtDuplicateObject(ProcessData->Process->ProcessHandle, + ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_FAILURE], + NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); + NtDuplicateObject(ProcessData->Process->ProcessHandle, + ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_SUCCESS], + NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); + ConSrvFreeHandlesTable(ProcessData); + ConSrvDeleteConsole(Console); + ProcessData->ConsoleHandle = NULL; + return Status; + } + + /* Mark the process as having a console */ + ProcessData->ConsoleApp = TRUE; + ProcessData->Process->Flags |= CsrProcessIsConsoleApp; + + /* Return the console handle to the caller */ + ConsoleInitInfo->ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; + + /* + * Insert the process into the processes list of the console, + * and set its foreground priority. + */ + InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); + ConSrvSetProcessFocus(ProcessData->Process, Console->HasFocus); + + /* Add a reference count because the process is tied to the console */ + _InterlockedIncrement(&Console->ReferenceCount); + + /* Update the internal info of the terminal */ + TermRefreshInternalInfo(Console); + + return STATUS_SUCCESS; +} + +NTSTATUS +ConSrvInheritConsole( + IN OUT PCONSOLE_PROCESS_DATA ProcessData, + IN HANDLE ConsoleHandle, + IN BOOLEAN CreateNewHandleTable, + OUT PHANDLE pInputHandle, + OUT PHANDLE pOutputHandle, + OUT PHANDLE pErrorHandle, + IN OUT PCONSOLE_START_INFO ConsoleStartInfo) +{ + NTSTATUS Status = STATUS_SUCCESS; + PCONSRV_CONSOLE Console; + + /* Validate and lock the console */ + if (!ConSrvValidateConsole(&Console, + ConsoleHandle, + CONSOLE_RUNNING, TRUE)) + { + // FIXME: Find another status code + return STATUS_UNSUCCESSFUL; + } + + /* Inherit the console */ + ProcessData->ConsoleHandle = ConsoleHandle; + + if (CreateNewHandleTable) + { + /* + * We are about to create a new console. However when ConSrvNewProcess() + * was called, we didn't know that we wanted to create a new console and + * therefore, we by default inherited the handle table from our parent + * process. It's only now that we notice that in fact we do not need + * them, because we've created a new console and thus we must use it. + * + * Therefore, free the handle table so that we can recreate + * a new one later on. + */ + ConSrvFreeHandlesTable(ProcessData); + + /* Initialize the process handles */ + Status = ConSrvInitProcessHandles(ProcessData, + Console, + pInputHandle, + pOutputHandle, + pErrorHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize the process handles\n"); + ProcessData->ConsoleHandle = NULL; + goto Quit; + } + } + + /* Duplicate the Initialization Events */ + Status = NtDuplicateObject(NtCurrentProcess(), + Console->InitEvents[INIT_SUCCESS], + ProcessData->Process->ProcessHandle, + &ConsoleStartInfo->InitEvents[INIT_SUCCESS], + EVENT_ALL_ACCESS, 0, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDuplicateObject(InitEvents[INIT_SUCCESS]) failed: %lu\n", Status); + ConSrvFreeHandlesTable(ProcessData); + ProcessData->ConsoleHandle = NULL; + goto Quit; + } + + Status = NtDuplicateObject(NtCurrentProcess(), + Console->InitEvents[INIT_FAILURE], + ProcessData->Process->ProcessHandle, + &ConsoleStartInfo->InitEvents[INIT_FAILURE], + EVENT_ALL_ACCESS, 0, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDuplicateObject(InitEvents[INIT_FAILURE]) failed: %lu\n", Status); + NtDuplicateObject(ProcessData->Process->ProcessHandle, + ConsoleStartInfo->InitEvents[INIT_SUCCESS], + NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); + ConSrvFreeHandlesTable(ProcessData); + ProcessData->ConsoleHandle = NULL; + goto Quit; + } + + /* Duplicate the Input Event */ + Status = NtDuplicateObject(NtCurrentProcess(), + Console->InputBuffer.ActiveEvent, + ProcessData->Process->ProcessHandle, + &ConsoleStartInfo->InputWaitHandle, + EVENT_ALL_ACCESS, 0, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDuplicateObject(InputWaitHandle) failed: %lu\n", Status); + NtDuplicateObject(ProcessData->Process->ProcessHandle, + ConsoleStartInfo->InitEvents[INIT_FAILURE], + NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); + NtDuplicateObject(ProcessData->Process->ProcessHandle, + ConsoleStartInfo->InitEvents[INIT_SUCCESS], + NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); + ConSrvFreeHandlesTable(ProcessData); // NOTE: Always free the handle table. + ProcessData->ConsoleHandle = NULL; + goto Quit; + } + + /* Mark the process as having a console */ + ProcessData->ConsoleApp = TRUE; + ProcessData->Process->Flags |= CsrProcessIsConsoleApp; + + /* Return the console handle to the caller */ + ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; + + /* + * Insert the process into the processes list of the console, + * and set its foreground priority. + */ + InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); + ConSrvSetProcessFocus(ProcessData->Process, Console->HasFocus); + + /* Add a reference count because the process is tied to the console */ + _InterlockedIncrement(&Console->ReferenceCount); + + /* Update the internal info of the terminal */ + TermRefreshInternalInfo(Console); + + Status = STATUS_SUCCESS; + +Quit: + /* Unlock the console and return */ + LeaveCriticalSection(&Console->Lock); + return Status; +} + +NTSTATUS +ConSrvRemoveConsole( + IN OUT PCONSOLE_PROCESS_DATA ProcessData) +{ + PCONSRV_CONSOLE Console; + PCONSOLE_PROCESS_DATA ConsoleLeaderProcess; + + DPRINT("ConSrvRemoveConsole\n"); + + /* Mark the process as not having a console anymore */ + ProcessData->ConsoleApp = FALSE; + ProcessData->Process->Flags &= ~CsrProcessIsConsoleApp; + + /* Validate and lock the console */ + if (!ConSrvValidateConsole(&Console, + ProcessData->ConsoleHandle, + CONSOLE_RUNNING, TRUE)) + { + // FIXME: Find another status code + return STATUS_UNSUCCESSFUL; + } + + DPRINT("ConSrvRemoveConsole - Locking OK\n"); + + /* Retrieve the console leader process */ + ConsoleLeaderProcess = ConSrvGetConsoleLeaderProcess(Console); + + /* Close all console handles and free the handle table */ + ConSrvFreeHandlesTable(ProcessData); + + /* Detach the process from the console */ + ProcessData->ConsoleHandle = NULL; + + /* Remove the process from the console's list of processes */ + RemoveEntryList(&ProcessData->ConsoleLink); + + /* Check whether the console should send a last close notification */ + if (Console->NotifyLastClose) + { + /* If we are removing the process which wants the last close notification... */ + if (ProcessData == Console->NotifiedLastCloseProcess) + { + /* ... just reset the flag and the pointer... */ + Console->NotifyLastClose = FALSE; + Console->NotifiedLastCloseProcess = NULL; + } + /* + * ... otherwise, if we are removing the console leader process + * (that cannot be the process wanting the notification, because + * the previous case already dealt with it)... + */ + else if (ProcessData == ConsoleLeaderProcess) + { + /* + * ... reset the flag first (so that we avoid multiple notifications) + * and then send the last close notification. + */ + Console->NotifyLastClose = FALSE; + ConSrvConsoleCtrlEvent(CTRL_LAST_CLOSE_EVENT, Console->NotifiedLastCloseProcess); + + /* Only now, reset the pointer */ + Console->NotifiedLastCloseProcess = NULL; + } + } + + /* Update the internal info of the terminal */ + TermRefreshInternalInfo(Console); + + /* Release the console */ + DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); + ConSrvReleaseConsole(Console, TRUE); + + return STATUS_SUCCESS; +} + + /* CONSOLE PROCESS MANAGEMENT FUNCTIONS ***************************************/ NTSTATUS diff --git a/win32ss/user/winsrv/consrv/handle.c b/win32ss/user/winsrv/consrv/handle.c index 007533583dc..ec1afc9f6cf 100644 --- a/win32ss/user/winsrv/consrv/handle.c +++ b/win32ss/user/winsrv/consrv/handle.c @@ -116,89 +116,6 @@ ConSrvCloseHandle(IN PCONSOLE_IO_HANDLE Handle) } - - - - -/* Forward declaration, used in ConSrvInitHandlesTable */ -static VOID ConSrvFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData); - -static NTSTATUS -ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, - IN PCONSRV_CONSOLE Console, - OUT PHANDLE pInputHandle, - OUT PHANDLE pOutputHandle, - OUT PHANDLE pErrorHandle) -{ - NTSTATUS Status; - HANDLE InputHandle = INVALID_HANDLE_VALUE, - OutputHandle = INVALID_HANDLE_VALUE, - ErrorHandle = INVALID_HANDLE_VALUE; - - /* - * Initialize the handles table. Use temporary variables to store - * the handles values in such a way that, if we fail, we don't - * return to the caller invalid handle values. - * - * Insert the IO handles. - */ - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - - /* Insert the Input handle */ - Status = ConSrvInsertObject(ProcessData, - &InputHandle, - &Console->InputBuffer.Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the input handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - ConSrvFreeHandlesTable(ProcessData); - return Status; - } - - /* Insert the Output handle */ - Status = ConSrvInsertObject(ProcessData, - &OutputHandle, - &Console->ActiveBuffer->Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the output handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - ConSrvFreeHandlesTable(ProcessData); - return Status; - } - - /* Insert the Error handle */ - Status = ConSrvInsertObject(ProcessData, - &ErrorHandle, - &Console->ActiveBuffer->Header, - GENERIC_READ | GENERIC_WRITE, - TRUE, - FILE_SHARE_READ | FILE_SHARE_WRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to insert the error handle\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - ConSrvFreeHandlesTable(ProcessData); - return Status; - } - - /* Return the newly created handles */ - *pInputHandle = InputHandle; - *pOutputHandle = OutputHandle; - *pErrorHandle = ErrorHandle; - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_SUCCESS; -} - NTSTATUS ConSrvInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, IN PCONSOLE_PROCESS_DATA TargetProcessData) @@ -251,7 +168,7 @@ Quit: return Status; } -static VOID +VOID ConSrvFreeHandlesTable(IN PCONSOLE_PROCESS_DATA ProcessData) { RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -470,343 +387,6 @@ ConSrvReleaseObject(IN PCONSOLE_IO_OBJECT Object, } - -NTSTATUS -ConSrvAllocateConsole(PCONSOLE_PROCESS_DATA ProcessData, - PHANDLE pInputHandle, - PHANDLE pOutputHandle, - PHANDLE pErrorHandle, - PCONSOLE_INIT_INFO ConsoleInitInfo) -{ - NTSTATUS Status = STATUS_SUCCESS; - HANDLE ConsoleHandle; - PCONSRV_CONSOLE Console; - - /* - * We are about to create a new console. However when ConSrvNewProcess - * was called, we didn't know that we wanted to create a new console and - * therefore, we by default inherited the handles table from our parent - * process. It's only now that we notice that in fact we do not need - * them, because we've created a new console and thus we must use it. - * - * Therefore, free the handles table so that we can recreate - * a new one later on. - */ - ConSrvFreeHandlesTable(ProcessData); - - /* Initialize a new Console owned by this process */ - DPRINT("Initialization of console '%S' for process '%S' on desktop '%S'\n", - ConsoleInitInfo->ConsoleTitle ? ConsoleInitInfo->ConsoleTitle : L"n/a", - ConsoleInitInfo->AppName ? ConsoleInitInfo->AppName : L"n/a", - ConsoleInitInfo->Desktop ? ConsoleInitInfo->Desktop : L"n/a"); - Status = ConSrvInitConsole(&ConsoleHandle, - &Console, - ConsoleInitInfo, - ProcessData->Process); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Console initialization failed\n"); - return Status; - } - - /* Assign the new console handle */ - ProcessData->ConsoleHandle = ConsoleHandle; - - /* Initialize the handles table */ - Status = ConSrvInitHandlesTable(ProcessData, - Console, - pInputHandle, - pOutputHandle, - pErrorHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize the handles table\n"); - ConSrvDeleteConsole(Console); - ProcessData->ConsoleHandle = NULL; - return Status; - } - - /* Duplicate the Initialization Events */ - Status = NtDuplicateObject(NtCurrentProcess(), - Console->InitEvents[INIT_SUCCESS], - ProcessData->Process->ProcessHandle, - &ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_SUCCESS], - EVENT_ALL_ACCESS, 0, 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtDuplicateObject(InitEvents[INIT_SUCCESS]) failed: %lu\n", Status); - ConSrvFreeHandlesTable(ProcessData); - ConSrvDeleteConsole(Console); - ProcessData->ConsoleHandle = NULL; - return Status; - } - - Status = NtDuplicateObject(NtCurrentProcess(), - Console->InitEvents[INIT_FAILURE], - ProcessData->Process->ProcessHandle, - &ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_FAILURE], - EVENT_ALL_ACCESS, 0, 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtDuplicateObject(InitEvents[INIT_FAILURE]) failed: %lu\n", Status); - NtDuplicateObject(ProcessData->Process->ProcessHandle, - ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_SUCCESS], - NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); - ConSrvFreeHandlesTable(ProcessData); - ConSrvDeleteConsole(Console); - ProcessData->ConsoleHandle = NULL; - return Status; - } - - /* Duplicate the Input Event */ - Status = NtDuplicateObject(NtCurrentProcess(), - Console->InputBuffer.ActiveEvent, - ProcessData->Process->ProcessHandle, - &ConsoleInitInfo->ConsoleStartInfo->InputWaitHandle, - EVENT_ALL_ACCESS, 0, 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtDuplicateObject(InputWaitHandle) failed: %lu\n", Status); - NtDuplicateObject(ProcessData->Process->ProcessHandle, - ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_FAILURE], - NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); - NtDuplicateObject(ProcessData->Process->ProcessHandle, - ConsoleInitInfo->ConsoleStartInfo->InitEvents[INIT_SUCCESS], - NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); - ConSrvFreeHandlesTable(ProcessData); - ConSrvDeleteConsole(Console); - ProcessData->ConsoleHandle = NULL; - return Status; - } - - /* Mark the process as having a console */ - ProcessData->ConsoleApp = TRUE; - ProcessData->Process->Flags |= CsrProcessIsConsoleApp; - - /* Return the console handle to the caller */ - ConsoleInitInfo->ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; - - /* - * Insert the process into the processes list of the console, - * and set its foreground priority. - */ - InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); - ConSrvSetProcessFocus(ProcessData->Process, Console->HasFocus); - - /* Add a reference count because the process is tied to the console */ - _InterlockedIncrement(&Console->ReferenceCount); - - /* Update the internal info of the terminal */ - TermRefreshInternalInfo(Console); - - return STATUS_SUCCESS; -} - -NTSTATUS -ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData, - HANDLE ConsoleHandle, - BOOLEAN CreateNewHandlesTable, - PHANDLE pInputHandle, - PHANDLE pOutputHandle, - PHANDLE pErrorHandle, - PCONSOLE_START_INFO ConsoleStartInfo) -{ - NTSTATUS Status = STATUS_SUCCESS; - PCONSRV_CONSOLE Console; - - /* Validate and lock the console */ - if (!ConSrvValidateConsole(&Console, - ConsoleHandle, - CONSOLE_RUNNING, TRUE)) - { - // FIXME: Find another status code - return STATUS_UNSUCCESSFUL; - } - - /* Inherit the console */ - ProcessData->ConsoleHandle = ConsoleHandle; - - if (CreateNewHandlesTable) - { - /* - * We are about to create a new console. However when ConSrvNewProcess - * was called, we didn't know that we wanted to create a new console and - * therefore, we by default inherited the handles table from our parent - * process. It's only now that we notice that in fact we do not need - * them, because we've created a new console and thus we must use it. - * - * Therefore, free the handles table so that we can recreate - * a new one later on. - */ - ConSrvFreeHandlesTable(ProcessData); - - /* Initialize the handles table */ - Status = ConSrvInitHandlesTable(ProcessData, - Console, - pInputHandle, - pOutputHandle, - pErrorHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize the handles table\n"); - ProcessData->ConsoleHandle = NULL; - goto Quit; - } - } - - /* Duplicate the Initialization Events */ - Status = NtDuplicateObject(NtCurrentProcess(), - Console->InitEvents[INIT_SUCCESS], - ProcessData->Process->ProcessHandle, - &ConsoleStartInfo->InitEvents[INIT_SUCCESS], - EVENT_ALL_ACCESS, 0, 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtDuplicateObject(InitEvents[INIT_SUCCESS]) failed: %lu\n", Status); - ConSrvFreeHandlesTable(ProcessData); - ProcessData->ConsoleHandle = NULL; - goto Quit; - } - - Status = NtDuplicateObject(NtCurrentProcess(), - Console->InitEvents[INIT_FAILURE], - ProcessData->Process->ProcessHandle, - &ConsoleStartInfo->InitEvents[INIT_FAILURE], - EVENT_ALL_ACCESS, 0, 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtDuplicateObject(InitEvents[INIT_FAILURE]) failed: %lu\n", Status); - NtDuplicateObject(ProcessData->Process->ProcessHandle, - ConsoleStartInfo->InitEvents[INIT_SUCCESS], - NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); - ConSrvFreeHandlesTable(ProcessData); - ProcessData->ConsoleHandle = NULL; - goto Quit; - } - - /* Duplicate the Input Event */ - Status = NtDuplicateObject(NtCurrentProcess(), - Console->InputBuffer.ActiveEvent, - ProcessData->Process->ProcessHandle, - &ConsoleStartInfo->InputWaitHandle, - EVENT_ALL_ACCESS, 0, 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtDuplicateObject(InputWaitHandle) failed: %lu\n", Status); - NtDuplicateObject(ProcessData->Process->ProcessHandle, - ConsoleStartInfo->InitEvents[INIT_FAILURE], - NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); - NtDuplicateObject(ProcessData->Process->ProcessHandle, - ConsoleStartInfo->InitEvents[INIT_SUCCESS], - NULL, NULL, 0, 0, DUPLICATE_CLOSE_SOURCE); - ConSrvFreeHandlesTable(ProcessData); // NOTE: Always free the handles table. - ProcessData->ConsoleHandle = NULL; - goto Quit; - } - - /* Mark the process as having a console */ - ProcessData->ConsoleApp = TRUE; - ProcessData->Process->Flags |= CsrProcessIsConsoleApp; - - /* Return the console handle to the caller */ - ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; - - /* - * Insert the process into the processes list of the console, - * and set its foreground priority. - */ - InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); - ConSrvSetProcessFocus(ProcessData->Process, Console->HasFocus); - - /* Add a reference count because the process is tied to the console */ - _InterlockedIncrement(&Console->ReferenceCount); - - /* Update the internal info of the terminal */ - TermRefreshInternalInfo(Console); - - Status = STATUS_SUCCESS; - -Quit: - /* Unlock the console and return */ - LeaveCriticalSection(&Console->Lock); - return Status; -} - -NTSTATUS -ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData) -{ - PCONSRV_CONSOLE Console; - PCONSOLE_PROCESS_DATA ConsoleLeaderProcess; - - DPRINT("ConSrvRemoveConsole\n"); - - /* Mark the process as not having a console anymore */ - ProcessData->ConsoleApp = FALSE; - ProcessData->Process->Flags &= ~CsrProcessIsConsoleApp; - - /* Validate and lock the console */ - if (!ConSrvValidateConsole(&Console, - ProcessData->ConsoleHandle, - CONSOLE_RUNNING, TRUE)) - { - // FIXME: Find another status code - return STATUS_UNSUCCESSFUL; - } - - DPRINT("ConSrvRemoveConsole - Locking OK\n"); - - /* Retrieve the console leader process */ - ConsoleLeaderProcess = ConSrvGetConsoleLeaderProcess(Console); - - /* Close all console handles and free the handles table */ - ConSrvFreeHandlesTable(ProcessData); - - /* Detach the process from the console */ - ProcessData->ConsoleHandle = NULL; - - /* Remove the process from the console's list of processes */ - RemoveEntryList(&ProcessData->ConsoleLink); - - /* Check whether the console should send a last close notification */ - if (Console->NotifyLastClose) - { - /* If we are removing the process which wants the last close notification... */ - if (ProcessData == Console->NotifiedLastCloseProcess) - { - /* ... just reset the flag and the pointer... */ - Console->NotifyLastClose = FALSE; - Console->NotifiedLastCloseProcess = NULL; - } - /* - * ... otherwise, if we are removing the console leader process - * (that cannot be the process wanting the notification, because - * the previous case already dealt with it)... - */ - else if (ProcessData == ConsoleLeaderProcess) - { - /* - * ... reset the flag first (so that we avoid multiple notifications) - * and then send the last close notification. - */ - Console->NotifyLastClose = FALSE; - ConSrvConsoleCtrlEvent(CTRL_LAST_CLOSE_EVENT, Console->NotifiedLastCloseProcess); - - /* Only now, reset the pointer */ - Console->NotifiedLastCloseProcess = NULL; - } - } - - /* Update the internal info of the terminal */ - TermRefreshInternalInfo(Console); - - /* Release the console */ - DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); - ConSrvReleaseConsole(Console, TRUE); - - return STATUS_SUCCESS; -} - - /* PUBLIC SERVER APIS *********************************************************/ /* API_NUMBER: ConsolepOpenConsole */ diff --git a/win32ss/user/winsrv/consrv/handle.h b/win32ss/user/winsrv/consrv/handle.h index d154c5cc17c..525893e2735 100644 --- a/win32ss/user/winsrv/consrv/handle.h +++ b/win32ss/user/winsrv/consrv/handle.h @@ -10,6 +10,14 @@ #pragma once +NTSTATUS +ConSrvInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, + IN PCONSOLE_PROCESS_DATA TargetProcessData); + +VOID +ConSrvFreeHandlesTable(IN PCONSOLE_PROCESS_DATA ProcessData); + + VOID ConSrvInitObject(IN OUT PCONSOLE_IO_OBJECT Object, IN CONSOLE_IO_OBJECT_TYPE Type, diff --git a/win32ss/user/winsrv/consrv/init.c b/win32ss/user/winsrv/consrv/init.c index 448c1836965..4332ae531a4 100644 --- a/win32ss/user/winsrv/consrv/init.c +++ b/win32ss/user/winsrv/consrv/init.c @@ -320,11 +320,6 @@ PCHAR ConsoleServerApiNameTable[ConsolepMaxApiNumber - CONSRV_FIRST_API_NUMBER] /* FUNCTIONS ******************************************************************/ -/* See handle.c */ -NTSTATUS -ConSrvInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, - IN PCONSOLE_PROCESS_DATA TargetProcessData); - NTSTATUS NTAPI ConSrvNewProcess(PCSR_PROCESS SourceProcess, diff --git a/win32ss/user/winsrv/consrv/procinit.h b/win32ss/user/winsrv/consrv/procinit.h index 716ecd0a815..6eac76df2b0 100644 --- a/win32ss/user/winsrv/consrv/procinit.h +++ b/win32ss/user/winsrv/consrv/procinit.h @@ -8,16 +8,24 @@ #pragma once -NTSTATUS ConSrvAllocateConsole(PCONSOLE_PROCESS_DATA ProcessData, - PHANDLE pInputHandle, - PHANDLE pOutputHandle, - PHANDLE pErrorHandle, - PCONSOLE_INIT_INFO ConsoleInitInfo); -NTSTATUS ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData, - HANDLE ConsoleHandle, - BOOLEAN CreateNewHandlesTable, - PHANDLE pInputHandle, - PHANDLE pOutputHandle, - PHANDLE pErrorHandle, - PCONSOLE_START_INFO ConsoleStartInfo); -NTSTATUS ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData); +NTSTATUS +ConSrvAllocateConsole( + IN OUT PCONSOLE_PROCESS_DATA ProcessData, + OUT PHANDLE pInputHandle, + OUT PHANDLE pOutputHandle, + OUT PHANDLE pErrorHandle, + IN OUT PCONSOLE_INIT_INFO ConsoleInitInfo); + +NTSTATUS +ConSrvInheritConsole( + IN OUT PCONSOLE_PROCESS_DATA ProcessData, + IN HANDLE ConsoleHandle, + IN BOOLEAN CreateNewHandleTable, + OUT PHANDLE pInputHandle, + OUT PHANDLE pOutputHandle, + OUT PHANDLE pErrorHandle, + IN OUT PCONSOLE_START_INFO ConsoleStartInfo); + +NTSTATUS +ConSrvRemoveConsole( + IN OUT PCONSOLE_PROCESS_DATA ProcessData);

1 0

[reactos] 01/01: [DXDIAG] fr-FR Translation Addendum CORE-12477 part 3/3
by Joachim Henze 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=951e5f285167be60e87cb… commit 951e5f285167be60e87cbdebdf676127310554cb Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Apr 14 00:42:33 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Apr 14 00:42:33 2020 +0200 [DXDIAG] fr-FR Translation Addendum CORE-12477 part 3/3 Leave english strings untouched regarding space before colon. Thanks to HBelusca for review as well. I hope next one translating these will take care still. --- base/applications/dxdiag/lang/fr-FR.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/dxdiag/lang/fr-FR.rc b/base/applications/dxdiag/lang/fr-FR.rc index 8af8c1f1432..65d9fcbba76 100644 --- a/base/applications/dxdiag/lang/fr-FR.rc +++ b/base/applications/dxdiag/lang/fr-FR.rc @@ -137,14 +137,14 @@ IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - RTEXT "General MIDI DLS Collection :", IDC_STATIC, 0, 0, 100, 10 + RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10 EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - LTEXT "Default Port Acceleration :", IDC_STATIC, 15, 120, 95, 17 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port :", IDC_STATIC, 180, 105, 100, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -182,7 +182,7 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Still can't find the information you're looking for? Here are some additional things you can do :", IDC_STATIC, 5, 0, 300, 10 + LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED

1 0

[reactos] 01/01: [DXDIAG] fr-FR Translation Addendum CORE-12477
by Joachim Henze 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f03c4c4378de97fa93f41… commit f03c4c4378de97fa93f41228fe63594f635917c9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Apr 14 00:06:48 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Apr 14 00:06:48 2020 +0200 [DXDIAG] fr-FR Translation Addendum CORE-12477 Addendum to 0.4.14-dev-1405-g dcc6dcb0bd6cb076fabe6fe0a45f9556eed1b379 Readd all spaces before the colons that I removed, as that is a french speciality and was correct, and also add some more of those that were missing even before my commit (was inconsistent). Thanks to Serge Gautherie, Thomas Faber and hpoussin for the review. --- base/applications/dxdiag/lang/fr-FR.rc | 90 +++++++++++++++++----------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/base/applications/dxdiag/lang/fr-FR.rc b/base/applications/dxdiag/lang/fr-FR.rc index 18f7127facc..8af8c1f1432 100644 --- a/base/applications/dxdiag/lang/fr-FR.rc +++ b/base/applications/dxdiag/lang/fr-FR.rc @@ -20,17 +20,17 @@ BEGIN LTEXT "Cet outil rapporte des informations détaillées à propos des composants ReactX et des drivers installés sur votre système.", IDC_STATIC, 5, 0, 443, 17 LTEXT "Si vous avez connaissance de la section d'où provient le problème, cliquez sur l'onglet approprié. Autrement, vous pouvez utiliser le bouton ""Page suivante"" ci-dessous pour visualiser chaque page.", IDC_STATIC, 5, 15, 443, 25 GROUPBOX "Informations système", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT - LTEXT "Date/heure actuelles:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT - LTEXT "Nom de l'ordinateur:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT - LTEXT "Système d'exploitation:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT - LTEXT "Langue:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT - LTEXT "Fabricant du système:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT - LTEXT "Modèle du système:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT - LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT - LTEXT "Processeur:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT - LTEXT "Mémoire:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT - LTEXT "Fichier cache:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT - LTEXT "Version de ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT + LTEXT "Date/heure actuelles :", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT + LTEXT "Nom de l'ordinateur :", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT + LTEXT "Système d'exploitation :", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT + LTEXT "Langue :", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT + LTEXT "Fabricant du système :", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT + LTEXT "Modèle du système :", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT + LTEXT "BIOS :", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT + LTEXT "Processeur :", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT + LTEXT "Mémoire :", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT + LTEXT "Fichier cache :", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT + LTEXT "Version de ReactX :", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -50,13 +50,13 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Périphérique", IDC_STATIC, 5, 0, 250, 95 - RTEXT "Nom:", IDC_STATIC, 7, 10, 83, 10 - RTEXT "Fabricant:", IDC_STATIC, 7, 20, 83, 10 - RTEXT "Type de puce:", IDC_STATIC, 7, 30, 83, 10 - RTEXT "Type de DAC:", IDC_STATIC, 7, 40, 83, 10 - RTEXT "Mémoire totale approx.:", IDC_STATIC, 7, 50, 83, 10 - RTEXT "Mode d'affichage actuelle:", IDC_STATIC, 7, 60, 83, 10 - RTEXT "Moniteur:", IDC_STATIC, 7, 70, 83, 10 + RTEXT "Nom :", IDC_STATIC, 7, 10, 83, 10 + RTEXT "Fabricant :", IDC_STATIC, 7, 20, 83, 10 + RTEXT "Type de puce :", IDC_STATIC, 7, 30, 83, 10 + RTEXT "Type de DAC :", IDC_STATIC, 7, 40, 83, 10 + RTEXT "Mémoire totale approx. :", IDC_STATIC, 7, 50, 83, 10 + RTEXT "Mode d'affichage actuel :", IDC_STATIC, 7, 60, 83, 10 + RTEXT "Moniteur :", IDC_STATIC, 7, 70, 83, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -65,13 +65,13 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Pilote", IDC_STATIC, 260, 0, 197, 95 - RTEXT "Pilote principal:", IDC_STATIC, 275, 10, 55, 10 - RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10 - RTEXT "Date:", IDC_STATIC, 275, 30, 55, 10 - RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10 - RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 - RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 - RTEXT "Version DDI:", IDC_STATIC, 275, 70, 55, 10 + RTEXT "Pilote principal :", IDC_STATIC, 275, 10, 55, 10 + RTEXT "Version :", IDC_STATIC, 275, 20, 55, 10 + RTEXT "Date :", IDC_STATIC, 275, 30, 55, 10 + RTEXT "WHQL-Logo :", IDC_STATIC, 275, 40, 55, 10 + RTEXT "Mini-VDD :", IDC_STATIC, 275, 50, 55, 10 + RTEXT "vvdddVDD :", IDC_STATIC, 275, 60, 55, 10 + RTEXT "Version DDI :", IDC_STATIC, 275, 70, 55, 10 EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -80,9 +80,9 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Fonctionnalités ReactX", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Accélération DirectDraw:", IDC_STATIC, 15, 115, 110, 12 - RTEXT "Accélération Direct3D:", IDC_STATIC, 15, 130, 110, 12 - RTEXT "Accélération des textures AGP:", IDC_STATIC, 15, 145, 110, 12 + RTEXT "Accélération DirectDraw :", IDC_STATIC, 15, 115, 110, 12 + RTEXT "Accélération Direct3D :", IDC_STATIC, 15, 130, 110, 12 + RTEXT "Accélération des textures AGP :", IDC_STATIC, 15, 145, 110, 12 LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10 LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10 LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10 @@ -100,12 +100,12 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Périphérique", IDC_STATIC, 5, 0, 250, 95 - RTEXT "Nom:", IDC_STATIC, 20, 10, 70, 10 - RTEXT "ID périphérique:", IDC_STATIC, 20, 20, 70, 10 - RTEXT "ID fabricant:", IDC_STATIC, 20, 30, 70, 10 - RTEXT "ID produit:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Type:", IDC_STATIC, 20, 50, 70, 10 - RTEXT "Périphérique par défaut:", IDC_STATIC, 20, 60, 70, 10 + RTEXT "Nom :", IDC_STATIC, 20, 10, 70, 10 + RTEXT "ID périphérique :", IDC_STATIC, 20, 20, 70, 10 + RTEXT "ID fabricant :", IDC_STATIC, 20, 30, 70, 10 + RTEXT "ID produit :", IDC_STATIC, 20, 40, 70, 10 + RTEXT "Type :", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Périphérique par défaut :", IDC_STATIC, 20, 60, 70, 10 EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -113,12 +113,12 @@ BEGIN EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Pilote", IDC_STATIC, 260, 0, 197, 95 - RTEXT "Nom:", IDC_STATIC, 275, 10, 55, 10 - RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10 - RTEXT "Date:", IDC_STATIC, 275, 30, 55, 10 - RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10 - RTEXT "Autres fichiers:", IDC_STATIC, 275, 50, 55, 10 - RTEXT "Fournisseur:", IDC_STATIC, 275, 60, 55, 10 + RTEXT "Nom :", IDC_STATIC, 275, 10, 55, 10 + RTEXT "Version :", IDC_STATIC, 275, 20, 55, 10 + RTEXT "Date :", IDC_STATIC, 275, 30, 55, 10 + RTEXT "WHQL-Logo :", IDC_STATIC, 275, 40, 55, 10 + RTEXT "Autres fichiers :", IDC_STATIC, 275, 50, 55, 10 + RTEXT "Fournisseur :", IDC_STATIC, 275, 60, 55, 10 EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -127,7 +127,7 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Fonctionnalités ReactX", IDC_STATIC, 5, 97, 452, 70 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17 - RTEXT "Son matériel\nNiveau d'accélération:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED + RTEXT "Son matériel\nNiveau d'accélération :", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED PUSHBUTTON "Tester DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP @@ -137,14 +137,14 @@ IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10 + RTEXT "General MIDI DLS Collection :", IDC_STATIC, 0, 0, 100, 10 EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 + LTEXT "Default Port Acceleration :", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 + LTEXT "Test using this port :", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -182,7 +182,7 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 + LTEXT "Still can't find the information you're looking for? Here are some additional things you can do :", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020