[PRINTING] Add x64 print environment keys and folders
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 8 Mar 2018 02:02:56 +0000 (03:02 +0100)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 9 Mar 2020 06:03:47 +0000 (07:03 +0100)
boot/bootdata/hivesys.inf
boot/bootdata/packages/reactos.dff.in
sdk/cmake/CMakeMacros.cmake
win32ss/printing/processors/winprint/CMakeLists.txt

index a7d1562..5b45a5f 100644 (file)
@@ -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"
 
index 3499535..fbd0ed8 100644 (file)
@@ -84,6 +84,7 @@ Signature = "$Windows NT$"
 63 = 3rdParty
 64 = Resources\Themes\Lunar
 65 = Resources\Themes\Mizu
+66 = system32\spool\prtprocs\x64
 
 .InfEnd
 
index 1c92605..99a12b2 100644 (file)
@@ -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()
index 49e53a8..de2c3d7 100644 (file)
@@ -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()