Ros-diffs May 2021

ros-diffs@reactos.org

21 participants
183 discussions

[reactos] 04/04: [SMLIB] Implement SmStartCsr and SmStopCsr
by Hervé Poussineau 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a1dac04c7697a74765f4… commit 1a1dac04c7697a74765f4c42b51246f58ad98e12 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue May 25 19:02:16 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue May 25 19:02:16 2021 +0200 [SMLIB] Implement SmStartCsr and SmStopCsr --- sdk/include/reactos/subsys/sm/smmsg.h | 17 ++++++++ sdk/lib/smlib/smclient.c | 81 +++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/sdk/include/reactos/subsys/sm/smmsg.h b/sdk/include/reactos/subsys/sm/smmsg.h index 60a6c2da09d..a5af962fed6 100644 --- a/sdk/include/reactos/subsys/sm/smmsg.h +++ b/sdk/include/reactos/subsys/sm/smmsg.h @@ -263,4 +263,21 @@ SmSessionComplete( IN NTSTATUS SessionStatus ); +NTSTATUS +NTAPI +SmStartCsr( + IN HANDLE SmApiPort, + OUT PULONG pMuSessionId, + IN PUNICODE_STRING CommandLine, + OUT PHANDLE pWindowsSubSysProcessId, + OUT PHANDLE pInitialCommandProcessId +); + +NTSTATUS +NTAPI +SmStopCsr( + IN HANDLE SmApiPort, + IN ULONG SessionId +); + #endif diff --git a/sdk/lib/smlib/smclient.c b/sdk/lib/smlib/smclient.c index 924963d1d0e..d56c8e57d0a 100644 --- a/sdk/lib/smlib/smclient.c +++ b/sdk/lib/smlib/smclient.c @@ -167,3 +167,84 @@ SmSessionComplete(IN HANDLE SmApiPort, /* Return status */ return Status; } + +NTSTATUS +NTAPI +SmStartCsr(IN HANDLE SmApiPort, + OUT PULONG pMuSessionId, + IN PUNICODE_STRING CommandLine, + OUT PHANDLE pWindowsSubSysProcessId, + OUT PHANDLE pInitialCommandProcessId) +{ + NTSTATUS Status; + SM_API_MSG SmApiMsg; + + /* Initialize the generic LPC header */ + RtlZeroMemory(&SmApiMsg, sizeof(SmApiMsg)); + SmApiMsg.h.u1.s1.DataLength = sizeof(SM_EXEC_PGM_MSG) + 8; + SmApiMsg.h.u1.s1.TotalLength = sizeof(SmApiMsg); + + /* Initialize this specific API's parameters */ + SmApiMsg.ApiNumber = SmpStartCsrApi; + if (CommandLine) + { + if (CommandLine->Length > ARRAYSIZE(SmApiMsg.u.StartCsr.Buffer)) + { + DPRINT1("SmStartCsr: Command line too long\n"); + return STATUS_INVALID_PARAMETER; + } + RtlCopyMemory(SmApiMsg.u.StartCsr.Buffer, CommandLine->Buffer, CommandLine->Length); + SmApiMsg.u.StartCsr.Length = CommandLine->Length; + } + + /* Send the message to SMSS */ + Status = NtRequestWaitReplyPort(SmApiPort, &SmApiMsg.h, &SmApiMsg.h); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SmStartCsr: NtRequestWaitReply Failed %lx\n", Status); + } + else + { + /* Upon success, we use the API's return value */ + Status = SmApiMsg.ReturnValue; + } + + /* Give back informations to caller */ + *pMuSessionId = SmApiMsg.u.StartCsr.MuSessionId; + *pWindowsSubSysProcessId = SmApiMsg.u.StartCsr.WindowsSubSysProcessId; + *pInitialCommandProcessId = SmApiMsg.u.StartCsr.SmpInitialCommandProcessId; + + return Status; +} + +NTSTATUS +NTAPI +SmStopCsr(IN HANDLE SmApiPort, + IN ULONG SessionId) +{ + NTSTATUS Status; + SM_API_MSG SmApiMsg; + + /* Initialize the generic LPC header */ + RtlZeroMemory(&SmApiMsg, sizeof(SmApiMsg)); + SmApiMsg.h.u1.s1.DataLength = sizeof(SM_EXEC_PGM_MSG) + 8; + SmApiMsg.h.u1.s1.TotalLength = sizeof(SmApiMsg); + + /* Initialize this specific API's parameters */ + SmApiMsg.ApiNumber = SmpStopCsrApi; + SmApiMsg.u.StopCsr.MuSessionId = SessionId; + + /* Send the message to SMSS */ + Status = NtRequestWaitReplyPort(SmApiPort, &SmApiMsg.h, &SmApiMsg.h); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SmStopCsr: NtRequestWaitReply Failed %lx\n", Status); + } + else + { + /* Upon success, we use the API's return value */ + Status = SmApiMsg.ReturnValue; + } + + return Status; +}

1 0

[reactos] 03/04: [SMSS] Implement SmpStartCsr
by Hervé Poussineau 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=735d2b4c93fc29d92c3de… commit 735d2b4c93fc29d92c3de543c4e0a62fd380deca Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 24 11:50:16 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue May 25 18:48:16 2021 +0200 [SMSS] Implement SmpStartCsr --- base/system/smss/smloop.c | 40 ++++++++++++++++++++++++++++++++++++++-- base/system/smss/smss.h | 7 +++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/base/system/smss/smloop.c b/base/system/smss/smloop.c index ff5067a44ad..d44b6f026bc 100644 --- a/base/system/smss/smloop.c +++ b/base/system/smss/smloop.c @@ -153,8 +153,44 @@ SmpStartCsr(IN PSM_API_MSG SmApiMsg, IN PSMP_CLIENT_CONTEXT ClientContext, IN HANDLE SmApiPort) { - DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + PSM_START_CSR_MSG SmStartCsr = &SmApiMsg->u.StartCsr; + UNICODE_STRING InitialCommand; + HANDLE InitialCommandProcess, InitialCommandProcessId, WindowsSubSysProcessId; + NTSTATUS Status; + + Status = SmpLoadSubSystemsForMuSession(&SmStartCsr->MuSessionId, + &WindowsSubSysProcessId, + &InitialCommand); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: SmpLoadSubSystemsForMuSession failed with status 0x%08x\n", Status); + return Status; + } + + if (SmStartCsr->Length) + { + InitialCommand.Length = InitialCommand.MaximumLength = SmStartCsr->Length; + InitialCommand.Buffer = SmStartCsr->Buffer; + } + + Status = SmpExecuteInitialCommand(SmStartCsr->MuSessionId, + &InitialCommand, + &InitialCommandProcess, + &InitialCommandProcessId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: SmpExecuteInitialCommand failed with status 0x%08x\n", Status); + /* FIXME: undo effects of SmpLoadSubSystemsForMuSession */ + ASSERT(FALSE); + return Status; + } + + NtClose(InitialCommandProcess); + + SmStartCsr->WindowsSubSysProcessId = WindowsSubSysProcessId; + SmStartCsr->SmpInitialCommandProcessId = InitialCommandProcessId; + + return STATUS_SUCCESS; } NTSTATUS diff --git a/base/system/smss/smss.h b/base/system/smss/smss.h index c59ecfff605..7b2ad99e670 100644 --- a/base/system/smss/smss.h +++ b/base/system/smss/smss.h @@ -289,6 +289,13 @@ SmpCheckDuplicateMuSessionId( IN ULONG MuSessionId ); +NTSTATUS +NTAPI +SmpExecuteInitialCommand(IN ULONG MuSessionId, + IN PUNICODE_STRING InitialCommand, + IN HANDLE InitialCommandProcess, + OUT PHANDLE ReturnPid); + NTSTATUS NTAPI SmpExecuteImage(

1 0

[reactos] 02/04: [NTOS:MM] Finish implementation of MmSessionDelete
by Hervé Poussineau 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98882fb0894130bf63bdb… commit 98882fb0894130bf63bdb3496621ca555a1737c2 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 24 11:51:51 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue May 25 18:48:16 2021 +0200 [NTOS:MM] Finish implementation of MmSessionDelete --- ntoskrnl/mm/ARM3/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/session.c b/ntoskrnl/mm/ARM3/session.c index 1a596786f80..c849c9952c3 100644 --- a/ntoskrnl/mm/ARM3/session.c +++ b/ntoskrnl/mm/ARM3/session.c @@ -904,7 +904,7 @@ MmSessionDelete(IN ULONG SessionId) /* Remove one reference count */ KeEnterCriticalRegion(); - /* FIXME: Do it */ + MiDereferenceSession(); KeLeaveCriticalRegion(); /* All done */

1 0

[reactos] 01/04: [NTOS:MM] MiDereferenceSession: return as soon as session is destroyed
by Hervé Poussineau 25 May '21

25 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eac0afc6feef17224c95b… commit eac0afc6feef17224c95b6048a5766d666f5fec5 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon May 24 16:38:57 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue May 25 18:48:16 2021 +0200 [NTOS:MM] MiDereferenceSession: return as soon as session is destroyed This leads to some simplifications in the following code. --- ntoskrnl/mm/ARM3/session.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/mm/ARM3/session.c b/ntoskrnl/mm/ARM3/session.c index b897a491bb0..1a596786f80 100644 --- a/ntoskrnl/mm/ARM3/session.c +++ b/ntoskrnl/mm/ARM3/session.c @@ -364,10 +364,11 @@ MiDereferenceSession(VOID) { /* No more references left, kill the session completely */ MiDereferenceSessionFinal(); + return; } - /* Check if tis is the session leader or the last process in the session */ - if ((Process->Vm.Flags.SessionLeader) || (ReferenceCount == 0)) + /* Check if this is the session leader */ + if (Process->Vm.Flags.SessionLeader) { /* Get the global session address before we kill the session mapping */ SessionGlobal = MmSessionSpace->GlobalVirtualAddress; @@ -377,13 +378,9 @@ MiDereferenceSession(VOID) BYTES_TO_PAGES(MmSessionSize) * sizeof(MMPDE)); KeFlushEntireTb(FALSE, FALSE); - /* Is this the session leader? */ - if (Process->Vm.Flags.SessionLeader) - { - /* Clean up the references here. */ - ASSERT(Process->Session == NULL); - MiReleaseProcessReferenceToSessionDataPage(SessionGlobal); - } + /* Clean up the references here. */ + ASSERT(Process->Session == NULL); + MiReleaseProcessReferenceToSessionDataPage(SessionGlobal); } /* Reset the current process' session flag */

1 0

[reactos] 01/01: [NTOS:CC] Fix use of unintialized variable (caught by RTC1)
by Timo Kreuzer 24 May '21

24 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd08ae2c0f55b98a28354… commit dd08ae2c0f55b98a283544d71152322ce6a5147e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 23 13:25:59 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon May 24 22:00:11 2021 +0200 [NTOS:CC] Fix use of unintialized variable (caught by RTC1) --- ntoskrnl/cc/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index cb99d809a5d..c59c103a46b 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1045,7 +1045,7 @@ CcFlushCache ( { if (vacb->Dirty) { - IO_STATUS_BLOCK VacbIosb; + IO_STATUS_BLOCK VacbIosb = { 0 }; Status = CcRosFlushVacb(vacb, &VacbIosb); if (!NT_SUCCESS(Status)) {

1 0

[reactos] 01/01: [NTOS:MM] MiIsPdeForAddressValid is NOT an INIT function!
by Timo Kreuzer 24 May '21

24 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=184d3a684976c08b49c44… commit 184d3a684976c08b49c44118ed4af2437ad85709 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 23 17:01:30 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon May 24 18:45:47 2021 +0200 [NTOS:MM] MiIsPdeForAddressValid is NOT an INIT function! --- ntoskrnl/include/internal/amd64/mm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index bdb0066a8d4..e62df71cfe0 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -295,7 +295,6 @@ MI_IS_MAPPED_PTE(PMMPTE PointerPte) (PointerPte->u.Hard.PageFrameNumber != 0)); } -CODE_SEG("INIT") FORCEINLINE BOOLEAN MiIsPdeForAddressValid(PVOID Address)

1 0

[reactos] 04/04: [GITHUB] Add ARM builder
by Mark Jansen 24 May '21

24 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1538a82b88a8043d3541… commit c1538a82b88a8043d3541aa09ddfda5197cdea96 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun May 23 17:16:56 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon May 24 17:34:49 2021 +0200 [GITHUB] Add ARM builder This only builds rapps for now CORE-17517 --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f302a1f048d..7b40db8ca25 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,6 +128,37 @@ jobs: name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{github.sha}} path: build/msvc_pdb + build-msvc-arm: + strategy: + matrix: + arch: [arm] + toolset: ['14.2', '14.1'] # VS 2019, 2017 + fail-fast: false + runs-on: windows-latest + steps: + - name: Install ninja + run: choco install -y ninja + - name: Install Flex & Bison + run: | + curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z + 7z x flexbison.7z -O${{github.workspace}}\bin + echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Activate VS cmd (arm) + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: x86_arm + toolset: ${{matrix.toolset}} + - name: Source checkout + uses: actions/checkout@v2 + with: + path: src + - name: Configure + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 + - name: Build rapps + run: cmake --build build --target rapps + build-clang-cl: strategy: matrix:

1 0

[reactos] 03/04: [HOST-TOOLS] Configure environment for MSVC cross-compiling
by Mark Jansen 24 May '21

24 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f94b23d2b4d4bdea986f… commit 5f94b23d2b4d4bdea986ffeb8fa2b6059ec81ccd Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 11 15:57:14 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon May 24 17:34:49 2021 +0200 [HOST-TOOLS] Configure environment for MSVC cross-compiling This makes ARM builds on a non-arm host work again. CORE-17542 CORE-17517 --- sdk/cmake/host-tools.cmake | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 6c550c57d4a..1f00f74e6a2 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -29,6 +29,48 @@ function(setup_host_tools) set(HOST_MODULE_SUFFIX ".so") endif() + # Normalize to the same format as our own ARCH, and add one for the VC shell + string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" lowercase_CMAKE_HOST_SYSTEM_PROCESSOR) + if(lowercase_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86 OR lowercase_CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^i[3456]86$") + set(HOST_ARCH i386) + set(VCVARSALL_ARCH x86) + elseif(lowercase_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR lowercase_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL amd64) + set(HOST_ARCH amd64) + set(VCVARSALL_ARCH amd64_x86) # x64 host-tools are not happy compiling for x86... + elseif(lowercase_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm) + set(HOST_ARCH arm) + set(VCVARSALL_ARCH arm) + else() + message(FATAL_ERROR "Unknown host architecture: ${lowercase_CMAKE_HOST_SYSTEM_PROCESSOR}") + endif() + + if(ARCH STREQUAL HOST_ARCH) + set(HOST_TOOLS_CMAKE_COMMAND "${CMAKE_COMMAND}") + message("Not cross-compiling, no special host-tools cmake command") + elseif(MSVC) + message("Compiling on ${HOST_ARCH} for ${ARCH} (MSVC)") + set(HOST_TOOLS_CMAKE_COMMAND "${REACTOS_BINARY_DIR}/host-tools/cmake_shim.cmd") + if(MSVC_VERSION EQUAL 1900) + file(WRITE ${HOST_TOOLS_CMAKE_COMMAND} + "@call \"$ENV{VCINSTALLDIR}\\vcvarsall.bat\" ${VCVARSALL_ARCH}\n" + "\"${CMAKE_COMMAND}\" %*" + ) + elseif(MSVC_VERSION GREATER_EQUAL 1910) + # 2017 and 2019 use the same folder structure + file(WRITE ${HOST_TOOLS_CMAKE_COMMAND} + "@set VSCMD_ARG_no_logo=1\n" + "@call \"$ENV{VCINSTALLDIR}\\Auxiliary\\Build\\vcvarsall.bat\" /clean_env\n" + "@call \"$ENV{VCINSTALLDIR}\\Auxiliary\\Build\\vcvarsall.bat\" ${VCVARSALL_ARCH}\n" + "\"${CMAKE_COMMAND}\" %*" + ) + else() + message(FATAL "Unable to figure out vcvarsall path") + endif() + else() + set(HOST_TOOLS_CMAKE_COMMAND "${CMAKE_COMMAND}") + message("Cross-compiling on non-msvc, no special host-tools cmake command") + endif() + # CMake might choose clang if it finds it in the PATH. Always prefer cl for host tools if (MSVC) list(APPEND CMAKE_HOST_TOOLS_EXTRA_ARGS @@ -40,6 +82,7 @@ function(setup_host_tools) SOURCE_DIR ${REACTOS_SOURCE_DIR} PREFIX ${REACTOS_BINARY_DIR}/host-tools BINARY_DIR ${REACTOS_BINARY_DIR}/host-tools/bin + CMAKE_COMMAND ${HOST_TOOLS_CMAKE_COMMAND} CMAKE_ARGS -UCMAKE_TOOLCHAIN_FILE -DARCH:STRING=${ARCH}

1 0

[reactos] 02/04: [SDK] Remove duplicate definition
by Mark Jansen 24 May '21

24 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a555892027eaa949589af… commit a555892027eaa949589afc160ea3bfed5f167e3b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 11 15:56:18 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon May 24 17:34:49 2021 +0200 [SDK] Remove duplicate definition --- sdk/include/asm/ksx.template.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/asm/ksx.template.h b/sdk/include/asm/ksx.template.h index d19b8e2600b..232ad290dca 100644 --- a/sdk/include/asm/ksx.template.h +++ b/sdk/include/asm/ksx.template.h @@ -779,7 +779,7 @@ OFFSET(ThSpecialApcDisable, KTHREAD, SpecialApcDisable), //OFFSET(ThVfpState, KTHREAD, VfpState), #endif OFFSET(ThNextProcessor, KTHREAD, NextProcessor), -OFFSET(ThProcess, KTHREAD, Process), +//OFFSET(ThProcess, KTHREAD, Process), OFFSET(ThPreviousMode, KTHREAD, PreviousMode), OFFSET(ThPriorityDecrement, KTHREAD, PriorityDecrement), // obsolete OFFSET(ThAdjustReason, KTHREAD, AdjustReason),

1 0

[reactos] 01/04: [CMAKE] Add some arm/arm64 specific paths
by Mark Jansen 24 May '21

24 May '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0911e8f457a3a6a461ed9… commit 0911e8f457a3a6a461ed9925eedcc28c98927ed7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 11 15:55:23 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon May 24 17:34:28 2021 +0200 [CMAKE] Add some arm/arm64 specific paths CORE-17517 CORE-17518 --- boot/bootdata/packages/reactos.dff.in | 12 ++++++++++++ sdk/cmake/CMakeMacros.cmake | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 950d98acf49..de8d43c9d46 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -94,6 +94,18 @@ Signature = "$Windows NT$" 70 = winsxs\amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef 71 = winsxs\amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef +72 = winsxs\arm_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef +73 = winsxs\arm_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef +74 = winsxs\arm_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef +75 = winsxs\arm_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef +76 = winsxs\arm_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef + +77 = winsxs\arm64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef +78 = winsxs\arm64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef +79 = winsxs\arm64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef +80 = winsxs\arm64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef +81 = winsxs\arm64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef + .InfEnd ; Contents of disk diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 370673676e0..54856d8d357 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -233,6 +233,30 @@ macro(dir_to_num dir var) set(${var} 70) elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) set(${var} 71) + + elseif(${dir} STREQUAL reactos/winsxs/arm_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef) + set(${var} 72) + elseif(${dir} STREQUAL reactos/winsxs/arm_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef) + set(${var} 73) + elseif(${dir} STREQUAL reactos/winsxs/arm_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef) + set(${var} 74) + elseif(${dir} STREQUAL reactos/winsxs/arm_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef) + set(${var} 75) + elseif(${dir} STREQUAL reactos/winsxs/arm_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) + set(${var} 76) + + elseif(${dir} STREQUAL reactos/winsxs/arm64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef) + set(${var} 77) + elseif(${dir} STREQUAL reactos/winsxs/arm64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef) + set(${var} 78) + elseif(${dir} STREQUAL reactos/winsxs/arm64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef) + set(${var} 79) + elseif(${dir} STREQUAL reactos/winsxs/arm64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef) + set(${var} 80) + elseif(${dir} STREQUAL reactos/winsxs/arm64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) + set(${var} 81) + + else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

1 0

← Newer
1
2
3
4
5
6
7
...
19
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 May 2021