Jacek Caban : wininet: Rename WININET_strdup_WtoA to heap_strdupWtoA.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5d6f01b76bbbc03cbc8da3786aa9664dd4053a84
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5d6f01b76bbbc03cbc8da3786a...

Author: Jacek Caban 
Date:   Fri Jul 17 01:12:04 2009 +0200

wininet: Rename WININET_strdup_WtoA to heap_strdupWtoA.

---

dlls/wininet/ftp.c      |    2 +-
 dlls/wininet/internet.h |   15 ++++++++++-----
 dlls/wininet/utility.c  |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index ed7dbe8..dbb54cb 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -2609,7 +2609,7 @@ static BOOL FTP_SendCommand(INT nSocket, FTP_COMMAND ftpCmd, LPCWSTR lpszParam,
    INTERNET_STATUS_CALLBACK lpfnStatusCB, object_header_t *hdr, DWORD_PTR dwContext)
 {
     BOOL ret;
-    LPSTR lpszParamA = lpszParam?WININET_strdup_WtoA(lpszParam):NULL;
+    LPSTR lpszParamA = heap_strdupWtoA(lpszParam);
     ret = FTP_SendCommandA(nSocket, ftpCmd, lpszParamA, lpfnStatusCB, hdr, dwContext);
     HeapFree(GetProcessHeap(), 0, lpszParamA);
     return ret;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index e13e70b..39d8083 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -87,12 +87,17 @@ static inline WCHAR *heap_strdupAtoW(const char *str)
     return ret;
 }

-static inline LPSTR WININET_strdup_WtoA( LPCWSTR str )
+static inline char *heap_strdupWtoA(LPCWSTR str)
 {
-    int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL);
-    LPSTR ret = HeapAlloc( GetProcessHeap(), 0, len );
-    if (ret)
-        WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL);
+    char *ret = NULL;
+
+    if(str) {
+        DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL);
+        ret = HeapAlloc(GetProcessHeap(), 0, size);
+        if(ret)
+            WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL);
+    }
+
     return ret;
 }

diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c
index 93c51cd..66fbecd 100644
--- a/dlls/wininet/utility.c
+++ b/dlls/wininet/utility.c
@@ -324,7 +324,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext,
             break;
         case INTERNET_STATUS_RESOLVING_NAME:
         case INTERNET_STATUS_REDIRECT:
-            lpvNewInfo = WININET_strdup_WtoA(lpvStatusInfo);
+            lpvNewInfo = heap_strdupWtoA(lpvStatusInfo);
             break;
         }
     }