[ros-diffs] [reactos] 01/01: [PRINTING] Add x64 print environment keys and folders

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c735dbac351c8672aa0a29...

commit c735dbac351c8672aa0a297668f1c721a9154967
Author:     Timo Kreuzer [e-mail]
AuthorDate: Thu Mar 8 03:02:56 2018 +0100
Commit:     Timo Kreuzer [e-mail]
CommitDate: Mon Mar 9 07:03:47 2020 +0100

[PRINTING] Add x64 print environment keys and folders
---
 boot/bootdata/hivesys.inf                           | 7 +++++++
 boot/bootdata/packages/reactos.dff.in               | 1 +
 sdk/cmake/CMakeMacros.cmake                         | 2 ++
 win32ss/printing/processors/winprint/CMakeLists.txt | 6 +++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf
index a7d15621133..5b45a5fa745 100644
--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@@ -1328,6 +1328,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows NT x86","Direc
 HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows NT x86\Print Processors",,0x00000010
 HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows NT x86\Print Processors\winprint","Driver",,"winprint.dll"

+[AddReg.NTamd64]
+HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows x64","Directory",,"x64"
+HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows x64\Print Processors",,0x00000010
+HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows x64\Print Processors\winprint","Driver",,"winprint.dll"
+
+[AddReg]
+
 HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors",,0x00000010
 HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port","Driver",,"localmon.dll"

diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in
index 349953553fa..fbd0ed8d856 100644
--- a/boot/bootdata/packages/reactos.dff.in
+++ b/boot/bootdata/packages/reactos.dff.in
@@ -84,6 +84,7 @@ Signature = "$Windows NT$"
 63 = 3rdParty
 64 = Resources\Themes\Lunar
 65 = Resources\Themes\Mizu
+66 = system32\spool\prtprocs\x64

.InfEnd

diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake
index 1c92605039f..99a12b2f554 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -301,6 +301,8 @@ macro(dir_to_num dir var)
         set(${var} 64)	
     elseif(${dir} STREQUAL reactos/Resources/Themes/Mizu)
         set(${var} 65)
+    elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/x64)
+        set(${var} 66)
     else()
         message(FATAL_ERROR "Wrong destination: ${dir}")
     endif()
diff --git a/win32ss/printing/processors/winprint/CMakeLists.txt b/win32ss/printing/processors/winprint/CMakeLists.txt
index 49e53a8b9b6..de2c3d73f05 100644
--- a/win32ss/printing/processors/winprint/CMakeLists.txt
+++ b/win32ss/printing/processors/winprint/CMakeLists.txt
@@ -15,4 +15,8 @@ set_module_type(winprint win32dll UNICODE)
 target_link_libraries(winprint wine)
 add_importlibs(winprint spoolss msvcrt kernel32 ntdll)
 add_pch(winprint precomp.h SOURCE)
-add_cd_file(TARGET winprint DESTINATION reactos/system32/spool/prtprocs/w32x86 FOR all)
+if(ARCH STREQUAL "amd64")
+    add_cd_file(TARGET winprint DESTINATION reactos/system32/spool/prtprocs/x64 FOR all)
+else()
+    add_cd_file(TARGET winprint DESTINATION reactos/system32/spool/prtprocs/w32x86 FOR all)
+endif()