Use FormatMessageA() instead of FormatMessage() in the w32 VFS.

Ticket #2687. (CVS 4468)

FossilOrigin-Name: 38674fd287e0ca67e27c46a3ad0db4dcc8ed1e0c

diff --git a/manifest b/manifest
index a9c0bf6ef4d68768095b14d7cca8688195938253..8f9eaf09aef833d4a59cd2b4813b0c2f717064c6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sthe\sname\son\sthe\snew\stest\sscript\sfor\sticket\s#2686.\s(CVS\s4467)
-D 2007-10-04T18:52:15
+C Use\sFormatMessageA()\sinstead\sof\sFormatMessage()\sin\sthe\sw32\sVFS.\nTicket\s#2687.\s(CVS\s4468)
+D 2007-10-05T14:49:46
 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -118,7 +118,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c 308bd8ad6977f66f608228cccaecc4cbc1a24693
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
-F src/os_win.c 99960c7b9dad8dab72e47068afb7941492bfeaac
+F src/os_win.c b2b6aa5f72c84f24c2afd49abfa751abab0e5b79
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c 0a92a08192785af79547b017cda45eb683b22552
 F src/pager.h d783e7f184afdc33adff37ba58d4e029bd8793b3
@@ -581,7 +581,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 755fcaf7e355042d88fed6b9b49669300b010695
-R c192a5dcfb8cde1191f8dc38b631436e
+P d261e2c731ef97d86fa9dc3caa1ce31ee9ce78ae
+R bc765c2cc9806a318609586e7909d1b2
 U drh
-Z f2026b8a433720ce0929b82a000a15a4
+Z dd0ca0580c7369afba4a15a0eb23d6d2

diff --git a/manifest.uuid b/manifest.uuid
index 1f1ae183fd2f170a0941bc530614a24e1582cc1a..2fb9dd289bcf7c7f835ccbab523150413c10dc29 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d261e2c731ef97d86fa9dc3caa1ce31ee9ce78ae
\ No newline at end of file
+38674fd287e0ca67e27c46a3ad0db4dcc8ed1e0c
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index bcb1c6ec2c8a0e5f1c85317a0a477ab37c852334..46d251fa73084ec6c83b408809691b60158653fa 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1403,7 +1403,7 @@ static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
   return (void*)h;
 }
 static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
-  FormatMessage(
+  FormatMessageA(
     FORMAT_MESSAGE_FROM_SYSTEM,
     NULL,
     GetLastError(),