Skip to content

Commit

Permalink
Merge branch 'windivs7-pulls' of https://github.com/jpbandroid/windivs
Browse files Browse the repository at this point in the history
…into windivs7-dev
  • Loading branch information
errortek committed Sep 16, 2023
2 parents 0bb6116 + 29a33f6 commit 56964c4
Show file tree
Hide file tree
Showing 223 changed files with 93,915 additions and 20,499 deletions.
2 changes: 1 addition & 1 deletion boot/bootdata/hivesft.inf
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontMapper",,0x00000012
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\HotFix",,0x00000012
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IME Compatibility",,0x00000012

HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadIMM",0x00010003,1
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadIMM",0x00010003,0
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadCTFIME",0x00010003,0

; DOS Device ports
Expand Down
5 changes: 5 additions & 0 deletions dll/directx/wine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ endif()
add_subdirectory(amstream)
add_subdirectory(d3d8)
add_subdirectory(d3d9)
add_subdirectory(d3d10)
add_subdirectory(d3d10_1)
add_subdirectory(d3d10core)
add_subdirectory(d3d11)
add_subdirectory(d3dcompiler_43)
add_subdirectory(d3drm)
add_subdirectory(d3dx9_24)
Expand Down Expand Up @@ -41,6 +45,7 @@ add_subdirectory(dplayx)
add_subdirectory(dpnhpast)
add_subdirectory(dsound)
add_subdirectory(dxdiagn)
add_subdirectory(dxgi)
add_subdirectory(msdmo)
add_subdirectory(qcap)
add_subdirectory(qedit)
Expand Down
34 changes: 34 additions & 0 deletions dll/directx/wine/d3d10/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

add_definitions(
-D__WINESRC__
-DUSE_WIN32_OPENGL)

include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/psdk)

spec2def(d3d10.dll d3d10.spec ADD_IMPORTLIB)

list(APPEND SOURCE
d3d10_main.c
effect.c
shader.c
stateblock.c
utils.c
d3d10_private.h)

add_library(d3d10 SHARED
${SOURCE}
version.rc
${CMAKE_CURRENT_BINARY_DIR}/d3d10_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/d3d10.def)

if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
target_compile_options(d3d10 PRIVATE -Wno-incompatible-pointer-types -Wno-unused-but-set-variable -Wno-switch -Wno-error) # Our favourite compiler :)
endif()

set_module_type(d3d10 win32dll)
target_link_libraries(d3d10 wine dxguid uuid)
add_importlibs(d3d10 d3d11 d3dwine msvcrt d3dcompiler_43 d3d10core dxgi kernel32 ntdll)
add_pch(d3d10 d3d10_private.h SOURCE)
add_dependencies(d3d10 wineheaders d3d_idl_headers)
add_cd_file(TARGET d3d10 DESTINATION reactos/system32 FOR all)
12 changes: 12 additions & 0 deletions dll/directx/wine/d3d10/Makefile.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
MODULE = d3d10.dll
IMPORTLIB = d3d10
IMPORTS = dxguid uuid d3d10core d3dcompiler dxgi

C_SRCS = \
d3d10_main.c \
effect.c \
shader.c \
stateblock.c \
utils.c

RC_SRCS = version.rc
30 changes: 30 additions & 0 deletions dll/directx/wine/d3d10/d3d10.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 1 stub RevertToOldImplementation
@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr)
@ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr)
@ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob
@ stdcall D3D10CreateDevice(ptr long ptr long long ptr)
@ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr)
@ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr)
@ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr)
@ stdcall D3D10CreateStateBlock(ptr ptr ptr)
@ stub D3D10DisassembleEffect
@ stdcall D3D10DisassembleShader(ptr long long ptr ptr)
@ stdcall D3D10GetGeometryShaderProfile(ptr)
@ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob
@ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob
@ stdcall D3D10GetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob
@ stdcall D3D10GetPixelShaderProfile(ptr)
@ stdcall D3D10GetShaderDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo
@ stub D3D10GetVersion
@ stdcall D3D10GetVertexShaderProfile(ptr)
@ stub D3D10PreprocessShader
@ stdcall D3D10ReflectShader(ptr long ptr)
@ stub D3D10RegisterLayers
@ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr)
@ stdcall D3D10StateBlockMaskDisableAll(ptr)
@ stdcall D3D10StateBlockMaskDisableCapture(ptr long long long)
@ stdcall D3D10StateBlockMaskEnableAll(ptr)
@ stdcall D3D10StateBlockMaskEnableCapture(ptr long long long)
@ stdcall D3D10StateBlockMaskGetSetting(ptr long long)
@ stdcall D3D10StateBlockMaskIntersect(ptr ptr ptr)
@ stdcall D3D10StateBlockMaskUnion(ptr ptr ptr)
Loading

0 comments on commit 56964c4

Please sign in to comment.