ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shlwapi: Last parameter in SHUnicodeToAnsiCP is an int.

This commit is contained in:
Detlef Riekenberg 2009-06-30 22:32:52 +02:00 committed by Alexandre Julliard
parent 1daf40a837
commit 2e19130976
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shlwapi/shlwapi.spec
View File

@ -215,7 +215,7 @@
215 stdcall -noname SHAnsiToUnicode(str ptr long) 215 stdcall -noname SHAnsiToUnicode(str ptr long)
216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long)
217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) 217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr)
218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr ptr) 218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long)
219 stdcall -noname QISearch(long long long long) 219 stdcall -noname QISearch(long long long long)
220 stdcall -noname SHSetDefaultDialogFont(ptr long) 220 stdcall -noname SHSetDefaultDialogFont(ptr long)
221 stdcall -noname SHRemoveDefaultDialogFont(ptr) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr)

70
dlls/shlwapi/string.c
View File

@ -2477,20 +2477,24 @@ DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen)
* CodePage [I] Code page to use for the conversion * CodePage [I] Code page to use for the conversion
* lpSrcStr [I] Source Unicode string to convert * lpSrcStr [I] Source Unicode string to convert
* lpDstStr [O] Destination for converted Ascii string * lpDstStr [O] Destination for converted Ascii string
* lpiLen [I/O] Input length of lpDstStr/destination for length of lpDstStr * dstlen [I] Length of buffer at lpDstStr
* *
* RETURNS * RETURNS
* Success: The number of characters that result from the conversion. * Success: The length in bytes of the result at lpDstStr (including the terminator)
* Failure: 0. * Failure: When using CP_UTF8, CP_UTF7 or 0xc350 as codePage, 0 is returned and
* the result is not nul-terminated.
* When using a different codepage, the length in bytes of the truncated
* result at lpDstStr (including the terminator) is returned and
* lpDstStr is always nul-terminated.
*
*/ */
INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, int dstlen)
LPINT lpiLen)
{ {
static const WCHAR emptyW[] = { '\0' }; static const WCHAR emptyW[] = { '\0' };
int len , reqLen; int len , reqLen;
LPSTR mem; LPSTR mem;
if (!lpDstStr || !lpiLen) if (!lpDstStr || !dstlen)
return 0; return 0;
if (!lpSrcStr) if (!lpSrcStr)
@ -2509,41 +2513,41 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr,
case CP_UTF8: case CP_UTF8:
{ {
DWORD dwMode = 0; DWORD dwMode = 0;
INT nWideCharCount = len - 1; INT lenW = len - 1;
INT needed = dstlen - 1;
HRESULT hr;
if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, /* try the user supplied buffer first */
&nWideCharCount, lpDstStr, hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, lpDstStr, &needed);
lpiLen) == S_OK) if (hr == S_OK)
return 0;
if (nWideCharCount < len - 1)
{ {
mem = HeapAlloc(GetProcessHeap(), 0, *lpiLen); lpDstStr[needed] = '\0';
return needed + 1;
}
/* user buffer too small. exclude termination and copy as much as possible */
lenW = len;
hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, NULL, &needed);
needed++;
mem = HeapAlloc(GetProcessHeap(), 0, needed);
if (!mem) if (!mem)
return 0; return 0;
*lpiLen = 0; hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, mem, &needed);
if (hr == S_OK)
if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len,
mem, lpiLen) != S_OK)
{ {
SHTruncateString(mem, *lpiLen); reqLen = SHTruncateString(mem, dstlen);
lstrcpynA(lpDstStr, mem, *lpiLen + 1); if (reqLen > 0) memcpy(lpDstStr, mem, reqLen-1);
HeapFree(GetProcessHeap(), 0, mem);
return *lpiLen + 1;
} }
HeapFree(GetProcessHeap(), 0, mem); HeapFree(GetProcessHeap(), 0, mem);
return *lpiLen; return 0;
}
lpDstStr[*lpiLen] = '\0';
return *lpiLen;
} }
default: default:
break; break;
} }
reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, /* try the user supplied buffer first */
*lpiLen, NULL, NULL); reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, dstlen, NULL, NULL);
if (!reqLen && GetLastError() == ERROR_INSUFFICIENT_BUFFER) if (!reqLen && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
{ {
@ -2556,12 +2560,12 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr,
reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem, reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem,
reqLen, NULL, NULL); reqLen, NULL, NULL);
reqLen = SHTruncateString(mem, *lpiLen); reqLen = SHTruncateString(mem, dstlen -1);
reqLen++; reqLen++;
lstrcpynA(lpDstStr, mem, *lpiLen); lstrcpynA(lpDstStr, mem, reqLen);
HeapFree(GetProcessHeap(), 0, mem); HeapFree(GetProcessHeap(), 0, mem);
lpDstStr[reqLen-1] = '\0';
} }
} }
} }
@ -2586,9 +2590,7 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr,
*/ */
INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen)
{ {
INT myint = iLen; return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, iLen);
return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, &myint);
} }
/************************************************************************* /*************************************************************************