Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 01:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Thomas Faber 2021-11-13 11:43:41 -05:00
parent 757bed81b1
commit 49bb853b24
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
12 changed files with 66 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/apisets/CMakeLists.txt
View file

@ -200,7 +200,7 @@ add_apiset(api-ms-win-downlevel-shlwapi-l1-1-0 0x611f0000 shlwapi)
add_apiset(api-ms-win-downlevel-shlwapi-l2-1-0 0x61200000 shlwapi)
add_apiset(api-ms-win-downlevel-user32-l1-1-0 0x61210000 user32)
add_apiset(api-ms-win-downlevel-version-l1-1-0 0x61220000 version)
add_apiset(api-ms-win-dx-d3dkmt-l1-1-0 0x61230000 gdi32)
add_apiset(api-ms-win-dx-d3dkmt-l1-1-0 0x61230000 gdi32_vista gdi32)
add_apiset(api-ms-win-eventing-classicprovider-l1-1-0 0x61290000 advapi32)
add_apiset(api-ms-win-eventing-consumer-l1-1-0 0x612a0000 advapi32)
add_apiset(api-ms-win-eventing-controller-l1-1-0 0x612b0000 advapi32)

4
dll/apisets/api-ms-win-dx-d3dkmt-l1-1-0.spec
View file

@ -14,7 +14,7 @@
@ stub D3DKMTCreateAllocation
@ stub D3DKMTCreateAllocation2
@ stub D3DKMTCreateContext
@ stdcall D3DKMTCreateDCFromMemory() gdi32.D3DKMTCreateDCFromMemory
@ stdcall D3DKMTCreateDCFromMemory() gdi32_vista.D3DKMTCreateDCFromMemory
@ stub D3DKMTCreateDevice
@ stub D3DKMTCreateKeyedMutex
@ stub D3DKMTCreateKeyedMutex2
@ -24,7 +24,7 @@
@ stub D3DKMTCreateSynchronizationObject2
@ stub D3DKMTDestroyAllocation
@ stub D3DKMTDestroyContext
@ stdcall D3DKMTDestroyDCFromMemory() gdi32.D3DKMTDestroyDCFromMemory
@ stdcall D3DKMTDestroyDCFromMemory() gdi32_vista.D3DKMTDestroyDCFromMemory
@ stub D3DKMTDestroyDevice
@ stub D3DKMTDestroyKeyedMutex
@ stub D3DKMTDestroyOutputDupl

1
dll/apisets/update.py
View file

@ -405,6 +405,7 @@ def generate_specnames(dll_dir):
yield (os.path.join(dll_dir, 'appcompat', 'apphelp', 'apphelp.spec'), 'apphelp')
yield (os.path.join(dll_dir, '..', 'win32ss', 'user', 'user32', 'user32.spec'), 'user32')
yield (os.path.join(dll_dir, '..', 'win32ss', 'gdi', 'gdi32', 'gdi32.spec'), 'gdi32')
yield (os.path.join(dll_dir, '..', 'win32ss', 'gdi', 'gdi32_vista', 'gdi32_vista.spec'), 'gdi32_vista')
def run(wineroot):
global NL_CHAR

2
dll/directx/wine/wined3d/CMakeLists.txt
View file

@ -49,7 +49,7 @@ add_library(d3dwine MODULE
set_module_type(d3dwine win32dll)
target_link_libraries(d3dwine wine)
add_importlibs(d3dwine user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll)
add_importlibs(d3dwine user32 opengl32 gdi32 gdi32_vista advapi32 msvcrt kernel32 ntdll)
add_pch(d3dwine precomp.h SOURCE)
add_cd_file(TARGET d3dwine DESTINATION reactos/system32 FOR all)

2
modules/rostests/winetests/gdi32/CMakeLists.txt
View file

@ -31,7 +31,7 @@ if(MSVC AND ARCH STREQUAL "amd64")
endif()
set_module_type(gdi32_winetest win32cui)
add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32)
add_importlibs(gdi32_winetest gdi32 gdi32_vista user32 advapi32 msvcrt kernel32)
if(MSVC)
add_importlibs(gdi32_winetest ntdll)

1
win32ss/CMakeLists.txt
View file

@ -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)

3
win32ss/gdi/gdi32/gdi32.spec
View file

@ -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)

13
win32ss/gdi/gdi32/objects/dc.c
View file

@ -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 );
}

26
win32ss/gdi/gdi32_vista/CMakeLists.txt Normal file
View file

@ -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)

26
win32ss/gdi/gdi32_vista/dc.c Normal file
View file

@ -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 );
}

5
win32ss/gdi/gdi32_vista/gdi32_vista.rc Normal file
View file

@ -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>

2
win32ss/gdi/gdi32_vista/gdi32_vista.spec Normal file
View file

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