[PATCH] comdlg32: Take nMaxFile into account when converting A->W
Nikolay Sivov
nsivov at codeweavers.com
Sun Mar 12 13:18:40 CDT 2017
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
This patch changes behaviour to what it was before c23a91cb638262f1d60f4437650c7440d3c70c19,
spotted by Sebastian.
dlls/comdlg32/filedlg.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 0c9f34a84e..305ac62d72 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -383,18 +383,26 @@ static void init_filedlg_infoW(OPENFILENAMEW *ofn, FileOpenDlgInfos *info)
static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info)
{
OPENFILENAMEW ofnW;
+ int len;
ofnW = *(OPENFILENAMEW *)ofn;
ofnW.lpstrInitialDir = heap_strdupAtoW(ofn->lpstrInitialDir);
- ofnW.lpstrFile = heap_strdupAtoW(ofn->lpstrFile);
ofnW.lpstrDefExt = heap_strdupAtoW(ofn->lpstrDefExt);
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)
{
- int n, len;
LPCSTR s;
+ int n;
/* filter is a list... title\0ext\0......\0\0 */
s = ofn->lpstrFilter;
--
2.11.0
More information about the wine-patches
mailing list