[ros-diffs] [janderwald] 50740: - Fix wined3d compilation with msvc - Does not link yet

Author: janderwald
Date: Wed Feb 16 13:57:06 2011
New Revision: 50740

URL: http://svn.reactos.org/svn/reactos?rev=50740&view=rev
Log:
- Fix wined3d compilation with msvc
- Does not link yet

Modified:
    branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/wined3d/state.c
    branches/cmake-bringup/include/reactos/wine/wined3d.idl

Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed Feb 16
13:57:06 2011
@@ -46,6 +46,7 @@
     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)

Modified: branches/cmake-bringup/dll/directx/wine/wined3d/state.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/state.c [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/state.c [iso-8859-1] Wed Feb 16
13:57:06 2011
@@ -1,4 +1,4 @@
-/*
+/*
  * Direct3D state management
  *
  * Copyright 2002 Lionel Ulmer
@@ -1027,7 +1027,7 @@
             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;

Modified: branches/cmake-bringup/include/reactos/wine/wined3d.idl
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w…
==============================================================================
--- branches/cmake-bringup/include/reactos/wine/wined3d.idl [iso-8859-1] (original)
+++ branches/cmake-bringup/include/reactos/wine/wined3d.idl [iso-8859-1] Wed Feb 16
13:57:06 2011
@@ -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 @@
     );
 }
 
-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);