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

CFM_GETSPEC always returns a space-separated list.

This commit is contained in:
Mike McCormack 2004-11-29 16:59:14 +00:00 committed by Alexandre Julliard
parent 7469973023
commit bc42b2e19e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/commdlg/filedlg.c
View File

@ -841,7 +841,7 @@ HRESULT FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer)
/* get path and filenames */ /* get path and filenames */
SHGetPathFromIDListW(fodInfos->ShellInfos.pidlAbsCurrent,lpstrCurrentDir); SHGetPathFromIDListW(fodInfos->ShellInfos.pidlAbsCurrent,lpstrCurrentDir);
n = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed); n = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' ');
TRACE("path >%s< filespec >%s< %d files\n", TRACE("path >%s< filespec >%s< %d files\n",
debugstr_w(lpstrCurrentDir),debugstr_w(lpstrFileList),n); debugstr_w(lpstrCurrentDir),debugstr_w(lpstrFileList),n);
@ -897,7 +897,7 @@ HRESULT FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer)
TRACE("CDM_GETSPEC:\n"); TRACE("CDM_GETSPEC:\n");
FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed); FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' ');
if( fodInfos->unicode ) if( fodInfos->unicode )
{ {
LPWSTR bufW = buffer; LPWSTR bufW = buffer;
@ -1709,7 +1709,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
TRACE("hwnd=%p\n", hwnd); TRACE("hwnd=%p\n", hwnd);
/* get the files from the edit control */ /* get the files from the edit control */
nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed); nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, '\0');
/* try if the user selected a folder in the shellview */ /* try if the user selected a folder in the shellview */
if(nFileCount == 0) if(nFileCount == 0)
@ -3029,9 +3029,11 @@ static HRESULT COMDLG32_StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPI
/*********************************************************************** /***********************************************************************
* FILEDLG95_FILENAME_GetFileNames * FILEDLG95_FILENAME_GetFileNames
* *
* copies the filenames to a 0-delimited string list (A\0B\0C\0\0) * Copies the filenames to a delimited string list.
* The delimiter is specified by the parameter 'separator',
* usually either a space or a nul
*/ */
int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed) int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator)
{ {
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
UINT nStrCharCount = 0; /* index in src buffer */ UINT nStrCharCount = 0; /* index in src buffer */
@ -3054,7 +3056,7 @@ int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * s
*lpstrFileList = MemAlloc( (nStrLen+2)*sizeof(WCHAR) ); *lpstrFileList = MemAlloc( (nStrLen+2)*sizeof(WCHAR) );
*sizeUsed = 0; *sizeUsed = 0;
/* build 0-delimited file list from filenames */ /* build delimited file list from filenames */
while ( nStrCharCount <= nStrLen ) while ( nStrCharCount <= nStrLen )
{ {
if ( lpstrEdit[nStrCharCount]=='"' ) if ( lpstrEdit[nStrCharCount]=='"' )
@ -3066,7 +3068,7 @@ int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * s
(*sizeUsed)++; (*sizeUsed)++;
nStrCharCount++; nStrCharCount++;
} }
(*lpstrFileList)[nFileIndex++] = '\0'; (*lpstrFileList)[nFileIndex++] = separator;
(*sizeUsed)++; (*sizeUsed)++;
nFileCount++; nFileCount++;
} }

2
dlls/commdlg/filedlgbrowser.h
View File

@ -161,6 +161,6 @@ BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl);
/* Functions used by the EDIT box */ /* Functions used by the EDIT box */
void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd); void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd);
int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed); int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator);
#endif /*SHBROWSER_H*/ #endif /*SHBROWSER_H*/