From 6fb6b3dc44fdcc01b9f930ede0da03f1d18ec56c Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Tue, 15 Feb 2011 16:01:02 +0000 Subject: [PATCH] [shell32] - Fix some compilation issues with msc svn path=/branches/cmake-bringup/; revision=50708 --- dll/win32/shell32/shelllink.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/shelllink.c b/dll/win32/shell32/shelllink.c index fb60fab4316..78c25c45ffc 100644 --- a/dll/win32/shell32/shelllink.c +++ b/dll/win32/shell32/shelllink.c @@ -187,9 +187,13 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWor /* strdup on the process heap */ static LPWSTR __inline HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) { + INT len; + LPWSTR p; + assert(str); - INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); + + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len );