Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 05:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix wined3d compilation with msvc

Browse source 
- Does not link yet

svn path=/branches/cmake-bringup/; revision=50740
This commit is contained in:
Johannes Anderwald 2011-02-16 13:57:06 +00:00
parent 4c8c01ba70
commit fb127d4391
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,7 @@ list(APPEND SOURCE
volumetexture.c volumetexture.c
wined3d_main.c wined3d_main.c
version.rc version.rc
${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c
${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
if(ARCH MATCHES amd64) if(ARCH MATCHES amd64)

4
dll/directx/wine/wined3d/state.c
View file

@ -1,4 +1,4 @@
/* /*
* Direct3D state management * Direct3D state management
* *
* Copyright 2002 Lionel Ulmer * Copyright 2002 Lionel Ulmer
@ -1027,7 +1027,7 @@ void state_fogstartend(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w
fogend = tmpvalue.f; fogend = tmpvalue.f;
/* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/
if(fogstart == fogend) { if(fogstart == fogend) {
fogstart = -1.0f / 0.0f; fogstart = -INFINITY;
fogend = 0.0f; fogend = 0.0f;
} }
break; break;

10
include/reactos/wine/wined3d.idl
View file

@ -1,4 +1,4 @@
/* /*
* Copyright 2002-2003 The wine-d3d team * Copyright 2002-2003 The wine-d3d team
* Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Jason Edmeades
* Copyright 2002-2003 Raphael Junqueira * Copyright 2002-2003 Raphael Junqueira
@ -3374,7 +3374,7 @@ interface IWineD3DDevice : IUnknown
); );
} }
IWineD3D *WineDirect3DCreate(UINT dxVersion, void *parent); IWineD3D * __stdcall WineDirect3DCreate(UINT dxVersion, void *parent);
IWineD3DClipper *WineDirect3DCreateClipper(void); IWineD3DClipper * __stdcall WineDirect3DCreateClipper(void);
void wined3d_mutex_lock(void); void __stdcall wined3d_mutex_lock(void);
void wined3d_mutex_unlock(void); void __stdcall wined3d_mutex_unlock(void);