Re: Fixed selecting multiple files in common file dialog 95-style

[Huw Davies]

On Sun, Sep 15, 2002 at 08:31:27PM +0200, Josef Meixner wrote:
> Index: dlls/commdlg/filedlg95.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/commdlg/filedlg95.c,v
> retrieving revision 1.80
> diff -r1.80 filedlg95.c
> [snip]
> 1457c1464,1466
> <     memcpy( ofn->lpstrFile + nSizePath, lpstrFileList, sizeUsed*sizeof(WCHAR) );
> ---
> > memset( ofn->lpstrFile + nSizePath, 0, sizeof(WCHAR) );
> >     memcpy( ofn->lpstrFile + nSizePath + sizeof(WCHAR), lpstrFileList,
> >       sizeUsed*sizeof(WCHAR) );
>
> 1463,1466c1472,1483
> <     WideCharToMultiByte(CP_ACP, 0, lpstrPathSpec, -1,
> <           ofn->lpstrFile, ofn->nMaxFile, NULL, NULL);
> <     WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed,
> <           &ofn->lpstrFile[nSizePath], ofn->nMaxFile - nSizePath, NULL, NULL);
> ---
> > if (ofn->lpstrFile != NULL)
> >     {
> >       WideCharToMultiByte(CP_ACP, 0, lpstrPathSpec, -1,
> >       	  ofn->lpstrFile, ofn->nMaxFile, NULL, NULL);
> >       if (ofn->nMaxFile > nSizePath + 1)
> >       {
> >   ofn->lpstrFile[nSizePath] = '\0';
> >   WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed,
> >       	    ofn->lpstrFile + nSizePath + 1,
> >       	    ofn->nMaxFile - nSizePath, NULL, NULL);
> >       }
> >     }

The last two hunks of this patch aren't right.  Alexandre, please use
this one instead.

Huw.
-- 
Huw Davies
huw(a)codeweavers.com