From fb127d43919ed445f08685a7952ecd2a51512af9 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 16 Feb 2011 13:57:06 +0000 Subject: [PATCH] - Fix wined3d compilation with msvc - Does not link yet svn path=/branches/cmake-bringup/; revision=50740 --- dll/directx/wine/wined3d/CMakeLists.txt | 1 + dll/directx/wine/wined3d/state.c | 4 ++-- include/reactos/wine/wined3d.idl | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index 5c58a112959..25586d7db37 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -46,6 +46,7 @@ list(APPEND SOURCE volumetexture.c wined3d_main.c version.rc + ${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) if(ARCH MATCHES amd64) diff --git a/dll/directx/wine/wined3d/state.c b/dll/directx/wine/wined3d/state.c index 6a415eee807..319237287af 100644 --- a/dll/directx/wine/wined3d/state.c +++ b/dll/directx/wine/wined3d/state.c @@ -1,4 +1,4 @@ -/* +/* * Direct3D state management * * Copyright 2002 Lionel Ulmer @@ -1027,7 +1027,7 @@ void state_fogstartend(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f / 0.0f; + fogstart = -INFINITY; fogend = 0.0f; } break; diff --git a/include/reactos/wine/wined3d.idl b/include/reactos/wine/wined3d.idl index 83e2bae9740..be08827e6d8 100644 --- a/include/reactos/wine/wined3d.idl +++ b/include/reactos/wine/wined3d.idl @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2003 The wine-d3d team * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira @@ -3374,7 +3374,7 @@ interface IWineD3DDevice : IUnknown ); } -IWineD3D *WineDirect3DCreate(UINT dxVersion, void *parent); -IWineD3DClipper *WineDirect3DCreateClipper(void); -void wined3d_mutex_lock(void); -void wined3d_mutex_unlock(void); +IWineD3D * __stdcall WineDirect3DCreate(UINT dxVersion, void *parent); +IWineD3DClipper * __stdcall WineDirect3DCreateClipper(void); +void __stdcall wined3d_mutex_lock(void); +void __stdcall wined3d_mutex_unlock(void);