From 1bdefebc9ecb5eac6a7c608d1d6770f36281a5be Mon Sep 17 00:00:00 2001
From: hpoussin <32227662+hpoussin@users.noreply.github.com>
Date: Sun, 2 Apr 2023 16:33:15 +0200
Subject: [PATCH] Enable framebuf_new driver (#4775)

Replace framebuf display driver by framebuf_new display driver
Compile framebuf_new as framebuf.dll, and add it to bootcd/livecd
Remove old framebuf from compilation, to not conflict
---
 win32ss/drivers/displays/CMakeLists.txt           |  2 +-
 .../drivers/displays/framebuf_new/CMakeLists.txt  | 15 ++++++++-------
 win32ss/drivers/displays/framebuf_new/debug.c     |  2 +-
 .../framebuf_new/{framebuf_new.rc => framebuf.rc} |  0
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename win32ss/drivers/displays/framebuf_new/{framebuf_new.rc => framebuf.rc} (100%)

diff --git a/win32ss/drivers/displays/CMakeLists.txt b/win32ss/drivers/displays/CMakeLists.txt
index ff7fd43541e..e390c7492e4 100644
--- a/win32ss/drivers/displays/CMakeLists.txt
+++ b/win32ss/drivers/displays/CMakeLists.txt
@@ -1,4 +1,4 @@
 
-add_subdirectory(framebuf)
+#add_subdirectory(framebuf)
 add_subdirectory(framebuf_new)
 add_subdirectory(vga)
diff --git a/win32ss/drivers/displays/framebuf_new/CMakeLists.txt b/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
index 13f52bd7055..a41e8df5692 100644
--- a/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
+++ b/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
@@ -7,12 +7,13 @@ list(APPEND SOURCE
     screen.c
     driver.h)
 
-add_library(framebuf_new MODULE
+add_library(framebuf MODULE
     ${SOURCE}
-    framebuf_new.rc)
+    framebuf.rc)
 
-set_module_type(framebuf_new kerneldll ENTRYPOINT DrvEnableDriver 12)
-target_link_libraries(framebuf_new libcntpr)
-add_importlibs(framebuf_new win32k)
-add_pch(framebuf_new driver.h SOURCE)
-add_dependencies(framebuf_new psdk)
+set_module_type(framebuf kerneldll ENTRYPOINT DrvEnableDriver 12)
+target_link_libraries(framebuf libcntpr)
+add_importlibs(framebuf win32k)
+add_pch(framebuf driver.h SOURCE)
+add_dependencies(framebuf psdk)
+add_cd_file(TARGET framebuf DESTINATION reactos/system32 FOR all)
diff --git a/win32ss/drivers/displays/framebuf_new/debug.c b/win32ss/drivers/displays/framebuf_new/debug.c
index 0578932b4e5..e5d1186f5c3 100644
--- a/win32ss/drivers/displays/framebuf_new/debug.c
+++ b/win32ss/drivers/displays/framebuf_new/debug.c
@@ -10,7 +10,7 @@
 
 #if DBG
 
-ULONG DebugLevel = 0xFFFFFFFF;
+ULONG DebugLevel = 0;
 
 /*****************************************************************************
  *
diff --git a/win32ss/drivers/displays/framebuf_new/framebuf_new.rc b/win32ss/drivers/displays/framebuf_new/framebuf.rc
similarity index 100%
rename from win32ss/drivers/displays/framebuf_new/framebuf_new.rc
rename to win32ss/drivers/displays/framebuf_new/framebuf.rc