X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..c12822fec7f87e7734cabbfcf23b99685fc371ce:/src/msw/mslu.cpp

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index b34c033f12..65ab5f9630 100644
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/mslu.cpp
+// Name:        src/msw/mslu.cpp
 // Purpose:     Fixes for bugs in MSLU
 // Author:      Vaclav Slavik
 // Modified by:
@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
-#include <dir.h>
+    #pragma hdrstop
+    #include <dir.h>
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/utils.h"
 #endif
 
@@ -31,7 +30,7 @@
 bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
 {
 #if wxUSE_UNICODE_MSLU
-    return (wxGetOsVersion() == wxWIN95);
+    return (wxGetOsVersion() == wxOS_WINDOWS_9X);
 #else
     return false;
 #endif
@@ -66,7 +65,7 @@ bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
     #include <direct.h>
 #endif
 
-// Undef redirection macros defined in wx/msw/mslu.h:
+// Undef redirection macros defined in wx/msw/wrapwin.h:
 #undef DrawStateW
 #undef GetOpenFileNameW
 #undef GetSaveFileNameW
@@ -121,7 +120,7 @@ static void wxFixOPENFILENAME(LPOPENFILENAME ofn)
             ofn->nFileOffset = wxStrlen(ofn->lpstrFile)+1;
         }
     }
-#endif
+#endif // OFN_EXPLORER
 }
 
 WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn)
@@ -148,29 +147,39 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn)
 
 #if wxUSE_BASE
 
-WXDLLIMPEXP_BASE int wxMSLU__trename(const wxChar *oldname,
-                                     const wxChar *newname)
+WXDLLIMPEXP_BASE int wxMSLU__wrename(const wchar_t *oldname,
+                                     const wchar_t *newname)
 {
     if ( wxUsingUnicowsDll() )
         return rename(wxConvFile.cWX2MB(oldname), wxConvFile.cWX2MB(newname));
     else
-        return _trename(oldname, newname);
+        return _wrename(oldname, newname);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__wremove(const wchar_t *name)
 {
     if ( wxUsingUnicowsDll() )
         return remove(wxConvFile.cWX2MB(name));
     else
-        return _tremove(name);
+        return _wremove(name);
 }
 
-WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name,const wxChar* mode)
+WXDLLIMPEXP_BASE FILE* wxMSLU__wfopen(const wchar_t *name,const wchar_t* mode)
 {
     if ( wxUsingUnicowsDll() )
         return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode));
     else
-        return _tfopen(name,mode);
+        return _wfopen(name,mode);
+}
+
+WXDLLIMPEXP_BASE FILE* wxMSLU__wfreopen(const wchar_t *name,
+                                        const wchar_t* mode,
+                                        FILE *stream)
+{
+    if ( wxUsingUnicowsDll() )
+        return freopen(wxConvFile.cWX2MB(name), wxConvFile.cWX2MB(mode), stream);
+    else
+        return _wfreopen(name, mode, stream);
 }
 
 #if defined( __VISUALC__ ) \
@@ -178,7 +187,7 @@ WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name,const wxChar* mode)
     || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
     || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
 
-WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name, int flags, int mode)
+WXDLLIMPEXP_BASE int wxMSLU__wopen(const wchar_t *name, int flags, int mode)
 {
     if ( wxUsingUnicowsDll() )
 #ifdef __BORLANDC__
@@ -190,7 +199,7 @@ WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name, int flags, int mode)
         return _wopen(name, flags, mode);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name, int mode)
+WXDLLIMPEXP_BASE int wxMSLU__waccess(const wchar_t *name, int mode)
 {
     if ( wxUsingUnicowsDll() )
         return _access(wxConvFile.cWX2MB(name), mode);
@@ -198,7 +207,7 @@ WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name, int mode)
         return _waccess(name, mode);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wchar_t *name)
 {
     if ( wxUsingUnicowsDll() )
         return _mkdir(wxConvFile.cWX2MB(name));
@@ -206,7 +215,7 @@ WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name)
         return _wmkdir(name);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wchar_t *name)
 {
     if ( wxUsingUnicowsDll() )
         return _rmdir(wxConvFile.cWX2MB(name));
@@ -214,7 +223,7 @@ WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name)
         return _wrmdir(name);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
+WXDLLIMPEXP_BASE int wxMSLU__wstat(const wchar_t *name, struct _stat *buffer)
 {
     if ( wxUsingUnicowsDll() )
         return _stat((const char*)wxConvFile.cWX2MB(name), buffer);
@@ -222,13 +231,25 @@ WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
         return _wstat(name, buffer);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer)
+#ifdef __BORLANDC__
+//here _stati64 is defined as stati64, see wx/filefn.h
+#undef _stati64
+WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wchar_t *name, struct _stati64 *buffer)
+ {
+     if ( wxUsingUnicowsDll() )
+        return _stati64((const char*)wxConvFile.cWX2MB(name), (stati64 *) buffer);
+    else
+        return _wstati64(name, (stati64 *) buffer);
+}
+#else
+WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wchar_t *name, struct _stati64 *buffer)
 {
     if ( wxUsingUnicowsDll() )
         return _stati64((const char*)wxConvFile.cWX2MB(name), buffer);
     else
         return _wstati64(name, buffer);
 }
+#endif //__BORLANDC__
 
 #endif // compilers having wopen() &c