Author: akhaldi Date: Tue Jun 14 18:51:43 2011 New Revision: 52236
URL: http://svn.reactos.org/svn/reactos?rev=52236&view=rev Log: * Revert r52232.
Added: trunk/reactos/include/reactos/msvchelper.h - copied unchanged from r52231, trunk/reactos/include/reactos/msvchelper.h Removed: trunk/reactos/include/reactos/wine/math.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt trunk/reactos/dll/3rdparty/CMakeLists.txt trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h
Modified: trunk/reactos/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/C... ============================================================================== --- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -2,9 +2,7 @@ add_subdirectory(arp) add_subdirectory(dwnl) add_subdirectory(finger) -if(NOT MSVC) - add_subdirectory(ftp) # FIXME: fix msvc build -endif() +add_subdirectory(ftp) add_subdirectory(ipconfig) add_subdirectory(net) add_subdirectory(netstat) @@ -12,7 +10,7 @@ add_subdirectory(ping) add_subdirectory(route) if(NOT MSVC) - add_subdirectory(telnet) # FIXME: fix msvc build +add_subdirectory(telnet) endif() add_subdirectory(tracert) add_subdirectory(whois)
Modified: trunk/reactos/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/CMakeLists.txt... ============================================================================== --- trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -5,8 +5,7 @@ add_subdirectory(libjpeg) add_subdirectory(libpng) add_subdirectory(libtiff) - +add_subdirectory(libxslt) if(NOT MSVC) - add_subdirectory(libxslt) - add_subdirectory(mesa32) +add_subdirectory(mesa32) endif()
Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt?... ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -16,9 +16,7 @@ add_subdirectory(dsound) #add_subdirectory(dsound_new) #disabled in trunk add_subdirectory(dxdiagn) -if(NOT MSVC) - add_subdirectory(ksproxy) #FIXME: fix msvc build -endif() +add_subdirectory(ksproxy) add_subdirectory(ksuser) add_subdirectory(msdmo) #add_subdirectory(msdvbnp) #disabled in trunk
Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMake... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -6,6 +6,10 @@ -DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +if(MSVC) + add_definitions(-FImsvchelper.h) +endif()
set_rc_compiler()
Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMake... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -6,6 +6,10 @@ -DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +if(MSVC) + add_definitions(-FImsvchelper.h) +endif()
set_rc_compiler()
Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/st... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -963,7 +963,7 @@ fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f * INFINITY; + fogstart = -1.0f / 0.0f; fogend = 0.0f; } break;
Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/wi... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -196,8 +196,8 @@ } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn * INFINITY; /* +INF / -INF */ - else return NAN; + if(m == 0) return sgn / 0.0f; /* +INF / -INF */ + else return 0.0f / 0.0f; /* NAN */ } }
@@ -218,8 +218,8 @@ } else { - if (m == 0) return sgn * INFINITY; /* +INF / -INF */ - else return NAN; + if (m == 0) return sgn / 0.0f; /* +INF / -INF */ + else return 0.0f / 0.0f; /* NAN */ } }
Removed: trunk/reactos/include/reactos/wine/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/math.h... ============================================================================== --- trunk/reactos/include/reactos/wine/math.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/math.h (removed) @@ -1,26 +1,0 @@ -#ifndef __WINE_MATH_H_ -#define __WINE_MATH_H_ - -#include <crt/math.h> - -#ifdef _MSC_VER -__forceinline float _NaN() -{ - unsigned long NaN = 0x7fc00000; - return *(float*)&NaN; -} -#define NAN _NaN() - -__forceinline float _Infinity() -{ - unsigned long Infinity = 0x7f800000; - return *(float*)&Infinity; -} -#define INFINITY _Infinity() - -#else -#define NAN (0.0f / 0.0f) -#define INFINITY (1.0F/0.0F) -#endif - -#endif /* __WINE_MATH_H_ */
-
akhaldi＠svn.reactos.org