[vlc-devel] commit: WinCE: fix missing functions (Geoffroy Couprie )

[git version control]

vlc | branch: master | Geoffroy Couprie <geo.couprie at gmail.com> | Tue Sep 30 12:05:21 2008 +0200| [b973e326f271b9bbc9a15fc61d4ee091d7c4a2d5] | committer: Geoffroy Couprie 

WinCE: fix missing functions

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b973e326f271b9bbc9a15fc61d4ee091d7c4a2d5
---

 include/vlc_fixups.h |   42 ++++++++++++++++++++++++++++++++++++++++++
 src/extras/libc.c    |    4 ++--
 src/modules/os.c     |    9 +++++----
 src/text/unicode.c   |   15 ++++++++++++---
 4 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index c74069f..09c467b 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -44,12 +44,54 @@ static inline char *strdup (const char *str)
 # include <stdarg.h>
 static inline int vasprintf (char **strp, const char *fmt, va_list ap)
 {
+#ifndef UNDER_CE
     int len = vsnprintf (NULL, 0, fmt, ap) + 1;
     char *res = (char *)malloc (len);
     if (res == NULL)
         return -1;
     *strp = res;
     return vsprintf (res, fmt, ap);
+#else
+    /* HACK: vsnprintf in the WinCE API behaves like
+     * the one in glibc 2.0 and doesn't return the number of characters
+     * it needed to copy the string.
+     * cf http://msdn.microsoft.com/en-us/library/1kt27hek.aspx
+     * and cf the man page of vsnprintf
+     *
+     Guess we need no more than 50 bytes. */
+    int n, size = 50;
+    char *res, *np;
+
+    if ((res = (char *) malloc (size)) == NULL)
+        return -1;
+
+    while (1)
+    {
+        n = vsnprintf (res, size, fmt, ap);
+
+        /* If that worked, return the string. */
+        if (n > -1 && n < size)
+        {
+            *strp = res;
+            return n;
+        }
+
+        /* Else try again with more space. */
+        if (n == -1)
+            size *= 2;  /* twice the old size */
+
+        if ((np = (char *) realloc (res, size)) == NULL)
+        {
+            free(res);
+            return -1;
+        }
+        else
+        {
+            res = np;
+        }
+
+    }
+#endif /* UNDER_CE */
 }
 #endif
 
diff --git a/src/extras/libc.c b/src/extras/libc.c
index f20b8a3..70b5d66 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -234,7 +234,7 @@ char *vlc_strsep( char **ppsz_string, const char *psz_delimiters )
  * vlc_*dir_wrapper: wrapper under Windows to return the list of drive letters
  * when called with an empty argument or just '\'
  *****************************************************************************/
-#if defined(WIN32) && !defined(UNDER_CE)
+#if defined(WIN32)
 #   include <assert.h>
 
 typedef struct vlc_DIR
@@ -330,7 +330,7 @@ void vlc_rewinddir( void *_p_dir )
 /* This one is in the libvlccore exported symbol list */
 int vlc_wclosedir( void *_p_dir )
 {
-#if defined(WIN32) && !defined(UNDER_CE)
+#if defined(WIN32)
     vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
     int i_ret = 0;
 
diff --git a/src/modules/os.c b/src/modules/os.c
index 6770a3f..91a5c12 100644
--- a/src/modules/os.c
+++ b/src/modules/os.c
@@ -183,16 +183,17 @@ int module_Load( vlc_object_t *p_this, const char *psz_file,
     wchar_t psz_wfile[MAX_PATH];
     MultiByteToWideChar( CP_ACP, 0, psz_file, -1, psz_wfile, MAX_PATH );
 
+#ifndef UNDER_CE
     /* FIXME: this is not thread-safe -- Courmisch */
     UINT mode = SetErrorMode (SEM_FAILCRITICALERRORS);
     SetErrorMode (mode|SEM_FAILCRITICALERRORS);
+#endif
 
-#ifdef UNDER_CE
-    handle = LoadLibrary( psz_wfile );
-#else
     handle = LoadLibraryW( psz_wfile );
-#endif
+
+#ifndef UNDER_CE
     SetErrorMode (mode);
+#endif
 
     if( handle == NULL )
     {
diff --git a/src/text/unicode.c b/src/text/unicode.c
index 2fc7de7..299e366 100644
--- a/src/text/unicode.c
+++ b/src/text/unicode.c
@@ -262,7 +262,10 @@ char *ToLocaleDup (const char *utf8)
  */
 int utf8_open (const char *filename, int flags, mode_t mode)
 {
-#ifdef WIN32
+#ifdef UNDER_CE
+    /*_open translates to wchar internally on WinCE*/
+    return _open (filename, flags, mode);
+#elif defined (WIN32)
     /* for Windows NT and above */
     wchar_t wpath[MAX_PATH + 1];
 
@@ -571,7 +574,10 @@ int utf8_scandir( const char *dirname, char ***namelist,
 static int utf8_statEx( const char *filename, struct stat *buf,
                         bool deref )
 {
-#if defined (WIN32)
+#ifdef UNDER_CE
+    /*_stat translates to wchar internally on WinCE*/
+    return _stat( filename, buf );
+#elif defined (WIN32)
     /* for Windows NT and above */
     wchar_t wpath[MAX_PATH + 1];
 
@@ -631,7 +637,10 @@ int utf8_lstat( const char *filename, struct stat *buf)
  */
 int utf8_unlink( const char *filename )
 {
-#if defined (WIN32)
+#ifdef UNDER_CE
+    /*_open translates to wchar internally on WinCE*/
+    return _unlink( filename );
+#elif defined (WIN32)
     /* for Windows NT and above */
     wchar_t wpath[MAX_PATH + 1];