[GDI32_VISTA] Move D3DKMT functions out of gdi32. CORE-17433

win32ss/CMakeLists.txt

@@ -11,6 +11,7 @@ if(USE_DIBLIB)
 endif()
 
 add_subdirectory(gdi/gdi32)
+add_subdirectory(gdi/gdi32_vista)
 add_subdirectory(printing)
 add_subdirectory(reactx)
 add_subdirectory(user/user32)

win32ss/gdi/gdi32/gdi32.spec

@@ -608,6 +608,3 @@
 608 stdcall bMakePathNameW(wstr wstr wstr long)
 609 stdcall cGetTTFFromFOT(long long long long long long long)
 610 stdcall gdiPlaySpoolStream(long long long long long long)
-; FIXME: Wine DX Dlls need these
-@ stdcall D3DKMTCreateDCFromMemory(ptr)
-@ stdcall D3DKMTDestroyDCFromMemory(ptr)

win32ss/gdi/gdi32/objects/dc.c

@@ -1579,16 +1579,3 @@ SelectObject(
 
     return NULL;
 }
-
-/***********************************************************************
- *           D3DKMTCreateDCFromMemory    (GDI32.@)
- */
-DWORD WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc )
-{
-    return NtGdiDdDDICreateDCFromMemory( desc );
-}
-
-DWORD WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc )
-{
-    return NtGdiDdDDIDestroyDCFromMemory( desc );
-}

win32ss/gdi/gdi32_vista/CMakeLists.txt

@@ -0,0 +1,26 @@
+
+include_directories(
+    include
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
+
+spec2def(gdi32_vista.dll gdi32_vista.spec ADD_IMPORTLIB)
+
+list(APPEND SOURCE
+    dc.c)
+
+add_library(gdi32_vista MODULE
+    ${SOURCE}
+    gdi32_vista.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi32_vista.def)
+
+set_module_type(gdi32_vista
+    win32dll
+    ENTRYPOINT 0
+    UNICODE)
+
+target_link_libraries(gdi32_vista win32ksys)
+
+#add_importlibs(gdi32_vista user32 advapi32 kernel32 ntdll)
+#add_pch(gdi32_vista include/precomp.h SOURCE)
+add_dependencies(gdi32_vista psdk)
+add_cd_file(TARGET gdi32_vista DESTINATION reactos/system32 FOR all)

win32ss/gdi/gdi32_vista/dc.c

@@ -0,0 +1,26 @@
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define NTOS_MODE_USER
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <ndk/rtlfuncs.h>
+#include <wingdi.h>
+#include <winddi.h>
+#include <prntfont.h>
+#include <ntgdityp.h>
+#include <ntgdi.h>
+
+/***********************************************************************
+ *           D3DKMTCreateDCFromMemory    (GDI32.@)
+ */
+DWORD WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc )
+{
+    return NtGdiDdDDICreateDCFromMemory( desc );
+}
+
+DWORD WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc )
+{
+    return NtGdiDdDDIDestroyDCFromMemory( desc );
+}

win32ss/gdi/gdi32_vista/gdi32_vista.rc

@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION  "GDI Client DLL"
+#define REACTOS_STR_INTERNAL_NAME     "gdi32_vista"
+#define REACTOS_STR_ORIGINAL_FILENAME "gdi32_vista.dll"
+#include <reactos/version.rc>

win32ss/gdi/gdi32_vista/gdi32_vista.spec

@@ -0,0 +1,2 @@
+@ stdcall D3DKMTCreateDCFromMemory(ptr)
+@ stdcall D3DKMTDestroyDCFromMemory(ptr)