commit 6139641e5abb3de226ae7d958e68fbd8f2f46c30
author Benny Prijono <bennylp@teluu.com> Tue Feb 14 21:03:15 2006 +0000
committer Benny Prijono <bennylp@teluu.com> Tue Feb 14 21:03:15 2006 +0000
tree 9b4a597308d873fdb95d888dc0cc377f2d6ef02f
parent 5a9091c37450c6a809b4e050f93e2be6f9ef4c22

Changed the unicode functions

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@181 74dad513-b988-da41-8d7b-12977e46ad98

pjlib/src/pj/file_access_win32.c

diff --git a/pjlib/src/pj/file_access_win32.c b/pjlib/src/pj/file_access_win32.c
index bec4904..31b3237 100644
--- a/pjlib/src/pj/file_access_win32.c
+++ b/pjlib/src/pj/file_access_win32.c
@@ -30,12 +30,13 @@
  */
 PJ_DEF(pj_bool_t) pj_file_exists(const char *filename)
 {
+    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256)
     HANDLE hFile;
-    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256);
 
     PJ_ASSERT_RETURN(filename != NULL, 0);
 
-    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename), READ_CONTROL, 
+    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename,sizeof(wfilename)), 
+		       READ_CONTROL, 
 		       FILE_SHARE_READ, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     if (hFile == INVALID_HANDLE_VALUE)
@@ -51,14 +52,15 @@
  */
 PJ_DEF(pj_off_t) pj_file_size(const char *filename)
 {
+    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256)
     HANDLE hFile;
     DWORD sizeLo, sizeHi;
     pj_off_t size;
-    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256);
 
     PJ_ASSERT_RETURN(filename != NULL, -1);
 
-    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename, wfilename), READ_CONTROL, 
+    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename, wfilename,sizeof(wfilename)), 
+		       READ_CONTROL, 
                        FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     if (hFile == INVALID_HANDLE_VALUE)
@@ -86,11 +88,11 @@
  */
 PJ_DEF(pj_status_t) pj_file_delete(const char *filename)
 {
-    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256);
+    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256)
 
     PJ_ASSERT_RETURN(filename != NULL, PJ_EINVAL);
 
-    if (DeleteFile(PJ_STRING_TO_NATIVE(filename,wfilename)) == FALSE)
+    if (DeleteFile(PJ_STRING_TO_NATIVE(filename,wfilename,sizeof(wfilename))) == FALSE)
         return PJ_RETURN_OS_ERROR(GetLastError());
 
     return PJ_SUCCESS;
@@ -102,19 +104,19 @@
  */
 PJ_DEF(pj_status_t) pj_file_move( const char *oldname, const char *newname)
 {
+    PJ_DECL_UNICODE_TEMP_BUF(woldname,256)
+    PJ_DECL_UNICODE_TEMP_BUF(wnewname,256)
     BOOL rc;
-    PJ_DECL_UNICODE_TEMP_BUF(woldname,256);
-    PJ_DECL_UNICODE_TEMP_BUF(wnewname,256);
 
     PJ_ASSERT_RETURN(oldname!=NULL && newname!=NULL, PJ_EINVAL);
 
 #if PJ_WIN32_WINNT >= 0x0400
-    rc = MoveFileEx(PJ_STRING_TO_NATIVE(oldname,woldname), 
-		    PJ_STRING_TO_NATIVE(newname,wnewname), 
+    rc = MoveFileEx(PJ_STRING_TO_NATIVE(oldname,woldname,sizeof(woldname)), 
+		    PJ_STRING_TO_NATIVE(newname,wnewname,sizeof(wnewname)), 
                     MOVEFILE_COPY_ALLOWED|MOVEFILE_REPLACE_EXISTING);
 #else
-    rc = MoveFile(PJ_STRING_TO_NATIVE(oldname, woldname), 
-		  PJ_STRING_TO_NATIVE(newname, wnewname));
+    rc = MoveFile(PJ_STRING_TO_NATIVE(oldname,woldname,sizeof(woldname)), 
+		  PJ_STRING_TO_NATIVE(newname,wnewname,sizeof(wnewname)));
 #endif
 
     if (!rc)
@@ -159,14 +161,15 @@
  */
 PJ_DEF(pj_status_t) pj_file_getstat(const char *filename, pj_file_stat *stat)
 {
+    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256)
     HANDLE hFile;
     DWORD sizeLo, sizeHi;
     FILETIME creationTime, accessTime, writeTime;
-    PJ_DECL_UNICODE_TEMP_BUF(wfilename,256);
 
     PJ_ASSERT_RETURN(filename!=NULL && stat!=NULL, PJ_EINVAL);
 
-    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename), READ_CONTROL, 
+    hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename,sizeof(wfilename)), 
+		       READ_CONTROL, 
 		       FILE_SHARE_READ, NULL,
                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     if (hFile == INVALID_HANDLE_VALUE)