/////////////////////////////////////////////////////////////////////////////
-// Name: msw/mslu.cpp
+// Name: src/msw/mslu.cpp
// Purpose: Fixes for bugs in MSLU
// Author: Vaclav Slavik
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
+ #include <dir.h>
#endif
#ifndef WX_PRECOMP
- #include "wx/defs.h"
+ #include "wx/utils.h"
+#endif
+
+//------------------------------------------------------------------------
+// Check for use of MSLU
+//------------------------------------------------------------------------
+
+#if wxUSE_BASE
+
+bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
+{
+#if wxUSE_UNICODE_MSLU
+ return (wxGetOsVersion() == wxOS_WINDOWS_9X);
+#else
+ return false;
#endif
+}
+
+#endif // wxUSE_BASE
+
#if wxUSE_UNICODE_MSLU
#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
ofn->nFileOffset = wxStrlen(ofn->lpstrFile)+1;
}
}
-#endif
+#endif // OFN_EXPLORER
}
WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn)
// Missing libc file manipulation functions in Win9x
//------------------------------------------------------------------------
-WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname)
+#if wxUSE_BASE
+
+WXDLLIMPEXP_BASE int wxMSLU__trename(const wxChar *oldname,
+ const wxChar *newname)
{
if ( wxUsingUnicowsDll() )
return rename(wxConvFile.cWX2MB(oldname), wxConvFile.cWX2MB(newname));
return _trename(oldname, newname);
}
-WXDLLEXPORT int wxMSLU__tremove(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name)
{
if ( wxUsingUnicowsDll() )
return remove(wxConvFile.cWX2MB(name));
return _tremove(name);
}
+WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name,const wxChar* mode)
+{
+ if ( wxUsingUnicowsDll() )
+ return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode));
+ else
+ return _tfopen(name,mode);
+}
+
#if defined( __VISUALC__ ) \
|| ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
- || ( defined(__MWERKS__) && defined(__WXMSW__) )
+ || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
+ || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
-WXDLLEXPORT int wxMSLU__wopen(const wxChar *name, int flags, int mode)
+WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name, int flags, int mode)
{
if ( wxUsingUnicowsDll() )
+#ifdef __BORLANDC__
+ return open(wxConvFile.cWX2MB(name), flags, mode);
+#else
return _open(wxConvFile.cWX2MB(name), flags, mode);
+#endif
else
return _wopen(name, flags, mode);
}
-WXDLLEXPORT int wxMSLU__waccess(const wxChar *name, int mode)
+WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name, int mode)
{
if ( wxUsingUnicowsDll() )
return _access(wxConvFile.cWX2MB(name), mode);
return _waccess(name, mode);
}
-WXDLLEXPORT int wxMSLU__wmkdir(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name)
{
if ( wxUsingUnicowsDll() )
return _mkdir(wxConvFile.cWX2MB(name));
return _wmkdir(name);
}
-WXDLLEXPORT int wxMSLU__wrmdir(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name)
{
if ( wxUsingUnicowsDll() )
return _rmdir(wxConvFile.cWX2MB(name));
return _wrmdir(name);
}
-WXDLLEXPORT int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
+WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
{
if ( wxUsingUnicowsDll() )
return _stat((const char*)wxConvFile.cWX2MB(name), buffer);
return _wstat(name, buffer);
}
-#endif
+#ifdef __BORLANDC__
+//here _stati64 is defined as stati64, see wx/filefn.h
+#undef _stati64
+WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *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 wxChar *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
+
+#endif // wxUSE_BASE
#endif // wxUSE_UNICODE_MSLU