Specify ASCII versions of Win32 API functions. (CVS 1785)

FossilOrigin-Name: 48b31540db5f0212a7e37e4833b760615afe13a3

diff --git a/manifest b/manifest
index d722cf0bce01ce220e5939c8431ec0beb2164089..2e4162cc38b1e6d9fa60fcde9c218bba06e73991 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\scapi3.tcl.\s(CVS\s1784)
-D 2004-06-30T13:28:33
+C Specify\sASCII\sversions\sof\sWin32\sAPI\sfunctions.\s(CVS\s1785)
+D 2004-06-30T14:29:00
 F Makefile.in f5788bf4daea9b25424df5ccb529ac3438efb2b2
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -48,7 +48,7 @@ F src/os_test.c 6bf10100de2ca199a91fe7ac6474561c8a7166ae
 F src/os_test.h 6a26a4978492e4bbdbf385554958418ff02db162
 F src/os_unix.c 7df6ae05faa5b84164193d3694cb71b66661bbf3
 F src/os_unix.h 00c1f82b526ab2fb7ee5ddd555ea4ed68363c93a
-F src/os_win.c 84549f6cc815237533c5d0eb3697352b03478d96
+F src/os_win.c 54181eb73cb4783c4241feca9eaa490768b39008
 F src/os_win.h babd4e912967c6b09088cfe38a45e8005a07ba44
 F src/pager.c 5f8cdc92ee9efb5a7849dc8b561b53122b700c78
 F src/pager.h 269b6cfc114dba0148203446e41dd19f9647dd53
@@ -233,7 +233,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P e78b0ff30fb630bc9835a7545525eea64924bafc
-R 5a53fa7c23614312cd45bc36b92cf7b4
-U danielk1977
-Z 1ffda58858ec478fc2be1aff401663fe
+P 982389b25d26201116fdfd390aa4b9964b5adf69
+R a445afa4ee22d0970e162e104688d0f4
+U drh
+Z c7a89af0952ba90c542c15f7c9130aa4

diff --git a/manifest.uuid b/manifest.uuid
index b3b048785065ad8d7ce261764c6556d398966d50..ad409a73dd654cfec6ec977abd1c341cdbdf68fd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-982389b25d26201116fdfd390aa4b9964b5adf69
\ No newline at end of file
+48b31540db5f0212a7e37e4833b760615afe13a3
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 9404859fe4e6ecc35aac5f1c1c729120e819b1c4..f070e77e864706af5fed4f2b5e9138ea0a6ec498 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -34,7 +34,7 @@
 ** Delete the named file
 */
 int sqlite3OsDelete(const char *zFilename){
-  DeleteFile(zFilename);
+  DeleteFileA(zFilename);
   TRACE2("DELETE \"%s\"\n", zFilename);
   return SQLITE_OK;
 }
@@ -43,7 +43,7 @@ int sqlite3OsDelete(const char *zFilename){
 ** Return TRUE if the named file exists.
 */
 int sqlite3OsFileExists(const char *zFilename){
-  return GetFileAttributes(zFilename) != 0xffffffff;
+  return GetFileAttributesA(zFilename) != 0xffffffff;
 }
 
 /*
@@ -66,7 +66,7 @@ int sqlite3OsOpenReadWrite(
 ){
   HANDLE h;
   assert( !id->isOpen );
-  h = CreateFile(zFilename,
+  h = CreateFileA(zFilename,
      GENERIC_READ | GENERIC_WRITE,
      FILE_SHARE_READ | FILE_SHARE_WRITE,
      NULL,
@@ -75,7 +75,7 @@ int sqlite3OsOpenReadWrite(
      NULL
   );
   if( h==INVALID_HANDLE_VALUE ){
-    h = CreateFile(zFilename,
+    h = CreateFileA(zFilename,
        GENERIC_READ,
        FILE_SHARE_READ,
        NULL,
@@ -124,7 +124,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   }else{
     fileflags = FILE_FLAG_RANDOM_ACCESS;
   }
-  h = CreateFile(zFilename,
+  h = CreateFileA(zFilename,
      GENERIC_READ | GENERIC_WRITE,
      0,
      NULL,
@@ -154,7 +154,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
 int sqlite3OsOpenReadOnly(const char *zFilename, OsFile *id){
   HANDLE h;
   assert( !id->isOpen );
-  h = CreateFile(zFilename,
+  h = CreateFileA(zFilename,
      GENERIC_READ,
      0,
      NULL,
@@ -208,7 +208,7 @@ int sqlite3OsTempFileName(char *zBuf){
     "0123456789";
   int i, j;
   char zTempPath[SQLITE_TEMPNAME_SIZE];
-  GetTempPath(SQLITE_TEMPNAME_SIZE-30, zTempPath);
+  GetTempPathA(SQLITE_TEMPNAME_SIZE-30, zTempPath);
   for(i=strlen(zTempPath); i>0 && zTempPath[i-1]=='\\'; i--){}
   zTempPath[i] = 0;
   for(;;){
@@ -667,10 +667,10 @@ char *sqlite3OsFullPathname(const char *zRelative){
   char *zNotUsed;
   char *zFull;
   int nByte;
-  nByte = GetFullPathName(zRelative, 0, 0, &zNotUsed) + 1;
+  nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1;
   zFull = sqliteMalloc( nByte );
   if( zFull==0 ) return 0;
-  GetFullPathName(zRelative, nByte, zFull, &zNotUsed);
+  GetFullPathNameA(zRelative, nByte, zFull, &zNotUsed);
   return zFull;
 }