[ros-diffs] [akhaldi] 59946: [FRAMEDYN] * Fix the MSVC build for real now, so that we don't keep fixing it bit by bit until r60000.

Author: akhaldi
Date: Sun Sep  1 15:51:32 2013
New Revision: 59946

URL: http://svn.reactos.org/svn/reactos?rev=59946&view=rev
Log:
[FRAMEDYN]
* Fix the MSVC build for real now, so that we don't keep fixing it bit by bit until
r60000.

Modified:
    trunk/reactos/dll/win32/framedyn/CMakeLists.txt
    trunk/reactos/dll/win32/framedyn/chstring.cpp

Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/framedyn/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt	[iso-8859-1] Sun Sep  1 15:51:32 2013
@@ -1,31 +1,16 @@
+
 set_cpp(WITH_RUNTIME)
-
-if(NOT MSVC)
-spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB)
-else()
-spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB)
-endif()
-
-list(APPEND SOURCE
-    main.c
-    chstring.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def)
-
-add_library(framedyn SHARED
-    ${SOURCE})
-
+list(APPEND SOURCE main.c chstring.cpp)
+add_library(framedyn SHARED ${SOURCE})
 set_module_type(framedyn win32dll UNICODE)
-
-add_importlibs(framedyn
-    msvcrt
-    kernel32
-    oleaut32
-    ntdll)
+add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll)
 
 if(NOT MSVC)
     # FIXME: http://www.cmake.org/Bug/view.php?id=12998
     #add_target_compile_flags(framedyn "-fexceptions
-Wno-deprecated-declarations")
     set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fexceptions
-Wno-deprecated-declarations")
+    spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB)
+    list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def)
 endif()
 
 add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all)

Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin…
==============================================================================
--- trunk/reactos/dll/win32/framedyn/chstring.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/framedyn/chstring.cpp	[iso-8859-1] Sun Sep  1 15:51:32 2013
@@ -844,7 +844,7 @@
     CopyBeforeWrite();
 
     // Let's use appropriate helper
-    wcslwr(m_pchData);
+    _wcslwr(m_pchData);
 }
 
 /*
@@ -856,7 +856,7 @@
     CopyBeforeWrite();
 
     // Let's use appropriate helper
-    wcsrev(m_pchData);
+    _wcsrev(m_pchData);
 }
 
 /*
@@ -868,7 +868,7 @@
     CopyBeforeWrite();
 
     // Let's use appropriate helper
-    wcsupr(m_pchData);
+    _wcsupr(m_pchData);
 }
 
 /*