Alexandre Julliard : msvcp90: Add wrappers for functions that don' t exist in old msvcrt versions.

Alexandre Julliard julliard at winehq.org
Mon Jan 13 12:46:32 CST 2014


Module: wine
Branch: master
Commit: 645540beed24327a145b7571ba5fe6d58f890f48
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=645540beed24327a145b7571ba5fe6d58f890f48

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jan 13 12:52:17 2014 +0100

msvcp90: Add wrappers for functions that don't exist in old msvcrt versions.

---

 dlls/msvcp90/locale.c  |    7 +++----
 dlls/msvcp90/msvcp90.h |    7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 0ae1d8d..263bb8c 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -20,7 +20,6 @@
 
 #include <stdarg.h>
 
-#include "msvcp90.h"
 #include "locale.h"
 #include "errno.h"
 #include "limits.h"
@@ -29,14 +28,14 @@
 #include "wchar.h"
 #include "wctype.h"
 #include "time.h"
-
-#include "wine/list.h"
-
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
+#include "msvcp90.h"
 #include "wine/unicode.h"
+#include "wine/list.h"
 #include "wine/debug.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(msvcp);
 
 char* __cdecl _Getdays(void);
diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h
index b04faab..026a04d 100644
--- a/dlls/msvcp90/msvcp90.h
+++ b/dlls/msvcp90/msvcp90.h
@@ -515,3 +515,10 @@ typedef struct {
     double real;
     double imag;
 } complex_double;
+
+#if _MSVCP_VER < 80
+#define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0)
+#define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0)
+#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) ))
+#define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) ))
+#endif




More information about the wine-cvs mailing list