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

commdlg: File name and extension offsets are not guaranteed to be the same in W->A conversions.

This commit is contained in:
Aric Stewart 2007-12-03 20:24:23 +09:00 committed by Alexandre Julliard
parent 90d8741d23
commit 9649ca2aa2
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/comdlg32/filedlg.c
View File

@ -2140,7 +2140,6 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
if(lstrlenW(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile - if(lstrlenW(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile -
((fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) ? 1 : 0)) ((fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) ? 1 : 0))
{ {
LPWSTR lpszTemp;
/* fill destination buffer */ /* fill destination buffer */
if (fodInfos->ofnInfos->lpstrFile) if (fodInfos->ofnInfos->lpstrFile)
@ -2164,13 +2163,31 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
} }
} }
/* set filename offset */ if(fodInfos->unicode)
lpszTemp = PathFindFileNameW(lpstrPathAndFile); {
fodInfos->ofnInfos->nFileOffset = (lpszTemp - lpstrPathAndFile); LPWSTR lpszTemp;
/* set extension offset */ /* set filename offset */
lpszTemp = PathFindExtensionW(lpstrPathAndFile); lpszTemp = PathFindFileNameW(lpstrPathAndFile);
fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - lpstrPathAndFile) + 1 : 0; fodInfos->ofnInfos->nFileOffset = (lpszTemp - lpstrPathAndFile);
/* set extension offset */
lpszTemp = PathFindExtensionW(lpstrPathAndFile);
fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - lpstrPathAndFile) + 1 : 0;
}
else
{
LPSTR lpszTemp;
LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos;
/* set filename offset */
lpszTemp = PathFindFileNameA(ofn->lpstrFile);
fodInfos->ofnInfos->nFileOffset = (lpszTemp - ofn->lpstrFile);
/* set extension offset */
lpszTemp = PathFindExtensionA(ofn->lpstrFile);
fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - ofn->lpstrFile) + 1 : 0;
}
/* set the lpstrFileTitle */ /* set the lpstrFileTitle */
if(fodInfos->ofnInfos->lpstrFileTitle) if(fodInfos->ofnInfos->lpstrFileTitle)
@ -3658,12 +3675,20 @@ static void CALLBACK FD32_UpdateResult(const FD31_DATA *lfs)
if (priv->ofnA) if (priv->ofnA)
{ {
LPSTR lpszTemp;
if (ofnW->nMaxFile && if (ofnW->nMaxFile &&
!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1, !WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL )) priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL ))
priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0; priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0;
priv->ofnA->nFileOffset = ofnW->nFileOffset;
priv->ofnA->nFileExtension = ofnW->nFileExtension; /* offsets are not guarenteed to be the same in WCHAR to MULTIBYTE conversion */
/* set filename offset */
lpszTemp = PathFindFileNameA(priv->ofnA->lpstrFile);
priv->ofnA->nFileOffset = (lpszTemp - priv->ofnA->lpstrFile);
/* set extension offset */
lpszTemp = PathFindExtensionA(priv->ofnA->lpstrFile);
priv->ofnA->nFileExtension = (*lpszTemp) ? (lpszTemp - priv->ofnA->lpstrFile) + 1 : 0;
} }
} }