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

comdlg32: Take nMaxFile into account when converting A->W. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-03-12 21:18:40 +03:00 committed by Alexandre Julliard
parent 6e5a0777fd
commit a44a608378
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/comdlg32/filedlg.c
View File

@ -383,18 +383,26 @@ static void init_filedlg_infoW(OPENFILENAMEW *ofn, FileOpenDlgInfos *info)
static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info) static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info)
{ {
OPENFILENAMEW ofnW; OPENFILENAMEW ofnW;
int len;
ofnW = *(OPENFILENAMEW *)ofn; ofnW = *(OPENFILENAMEW *)ofn;
ofnW.lpstrInitialDir = heap_strdupAtoW(ofn->lpstrInitialDir); ofnW.lpstrInitialDir = heap_strdupAtoW(ofn->lpstrInitialDir);
ofnW.lpstrFile = heap_strdupAtoW(ofn->lpstrFile);
ofnW.lpstrDefExt = heap_strdupAtoW(ofn->lpstrDefExt); ofnW.lpstrDefExt = heap_strdupAtoW(ofn->lpstrDefExt);
ofnW.lpstrTitle = heap_strdupAtoW(ofn->lpstrTitle); ofnW.lpstrTitle = heap_strdupAtoW(ofn->lpstrTitle);
if (ofn->lpstrFile)
{
len = MultiByteToWideChar(CP_ACP, 0, ofn->lpstrFile, ofn->nMaxFile, NULL, 0);
ofnW.lpstrFile = MemAlloc(len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, ofn->lpstrFile, ofn->nMaxFile, ofnW.lpstrFile, len);
ofnW.nMaxFile = len;
}
if (ofn->lpstrFilter) if (ofn->lpstrFilter)
{ {
int n, len;
LPCSTR s; LPCSTR s;
int n;
/* filter is a list... title\0ext\0......\0\0 */ /* filter is a list... title\0ext\0......\0\0 */
s = ofn->lpstrFilter; s = ofn->lpstrFilter;