Expose the MBCS->UTF8 convert routine in the Win32 backend. (CVS 5917)

FossilOrigin-Name: f4411f0c8075adc8a37002ac7ad958ff3158c0c0

diff --git a/manifest b/manifest
index d7506f4249fcac751685a5507dbb2ea9abc7086f..0e438e456b29157aa996400381b928284e562a7f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Application-defined\spage\scache\sdocumentation\supdates.\s(CVS\s5916)
-D 2008-11-18T19:18:09
+C Expose\sthe\sMBCS->UTF8\sconvert\sroutine\sin\sthe\sWin32\sbackend.\s(CVS\s5917)
+D 2008-11-18T19:18:52
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 6cbc7db84c23804c368bc7ffe51367412212d7b2
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -138,7 +138,7 @@ F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c 63be0987dbeb42e9b08c831863d2a315953b86e1
 F src/os_unix.c 16b0981836576ad7e0c96f094bd2f41a339d078f
-F src/os_win.c b1cd079217818e610d6a62c6c71f1e5366a70efe
+F src/os_win.c 08d0b059ac01f32e8813bb96fc573486592b83f5
 F src/pager.c d328fcea0bfb3abbc174dba6e6b1ca7c0e1ed7ba
 F src/pager.h 4a57b219c0765fe1870238064e3f46e4eb2cf5af
 F src/parse.y 2c4758b4c5ead6de8cf7112f5a7cce7561d313fe
@@ -658,7 +658,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P d68e2795e72f1bfc0bf3b8e75cdec2e0b3d5bfcb
-R e674c380ec3d98c94fd560231dd11c92
+P db0f1203591fcc4c554c47cdf28abe279cf7f1d5
+R 32b837ae630be87201430ff0ce6dd755
 U drh
-Z 7fccbfebb63a85d4f415b73c1ae13548
+Z 1b9e339fcbcd4e1282090097fa631f9c

diff --git a/manifest.uuid b/manifest.uuid
index 2bc6f59e649a7b0a9aff7eda4bf4109803c6845c..bcefdb44836fe5634c71a456b916616f772bfdce 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-db0f1203591fcc4c554c47cdf28abe279cf7f1d5
\ No newline at end of file
+f4411f0c8075adc8a37002ac7ad958ff3158c0c0
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index ab797a6e1244b513a1fb3a78e646741b6a29f2ab..901482d94f29b865a38e41bb45a348e563b23c17 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to windows.
 **
-** $Id: os_win.c,v 1.138 2008/11/13 18:20:43 shane Exp $
+** $Id: os_win.c,v 1.139 2008/11/18 19:18:52 drh Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_WIN               /* This file is used for windows only */
@@ -252,7 +252,7 @@ static char *unicodeToMbcs(const WCHAR *zWideFilename){
 ** Convert multibyte character string to UTF-8.  Space to hold the
 ** returned string is obtained from malloc().
 */
-static char *mbcsToUtf8(const char *zFilename){
+char *sqlite3_win32_mbcs_to_utf8(const char *zFilename){
   char *zFilenameUtf8;
   WCHAR *zTmpWide;
 
@@ -1140,7 +1140,7 @@ static int getTempname(int nBuf, char *zBuf){
     char *zUtf8;
     char zMbcsPath[MAX_PATH];
     GetTempPathA(MAX_PATH-30, zMbcsPath);
-    zUtf8 = mbcsToUtf8(zMbcsPath);
+    zUtf8 = sqlite3_win32_mbcs_to_utf8(zMbcsPath);
     if( zUtf8 ){
       sqlite3_snprintf(MAX_PATH-30, zTempPath, "%s", zUtf8);
       free(zUtf8);
@@ -1481,7 +1481,7 @@ static int winFullPathname(
     }
     GetFullPathNameA((char*)zConverted, nByte, zTemp, 0);
     free(zConverted);
-    zOut = mbcsToUtf8(zTemp);
+    zOut = sqlite3_win32_mbcs_to_utf8(zTemp);
     free(zTemp);
 #endif
   }