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

comdlg32: Init clipboard format only once in filedlg. 

Signed-off-by: Lauri Kenttä <lauri.kentta@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Lauri Kenttä 2016-07-06 13:27:42 +03:00 committed by Alexandre Julliard
parent b6bb4c1b92
commit 86a993ea3c
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/comdlg32/filedlg.c
View File

@ -3619,6 +3619,25 @@ static void FILEDLG95_LOOKIN_Clean(HWND hwnd)
RemovePropA(fodInfos->DlgInfos.hwndLookInCB,LookInInfosStr); RemovePropA(fodInfos->DlgInfos.hwndLookInCB,LookInInfosStr);
} }
/***********************************************************************
* get_def_format
*
* Fill the FORMATETC used in the shell id list
*/
static FORMATETC get_def_format(void)
{
static CLIPFORMAT cfFormat;
FORMATETC formatetc;
if (!cfFormat) cfFormat = RegisterClipboardFormatA(CFSTR_SHELLIDLISTA);
formatetc.cfFormat = cfFormat;
formatetc.ptd = 0;
formatetc.dwAspect = DVASPECT_CONTENT;
formatetc.lindex = -1;
formatetc.tymed = TYMED_HGLOBAL;
return formatetc;
}
/*********************************************************************** /***********************************************************************
* FILEDLG95_FILENAME_FillFromSelection * FILEDLG95_FILENAME_FillFromSelection
* *
@ -3766,15 +3785,6 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U
return nFileCount; return nFileCount;
} }
#define SETDefFormatEtc(fe,cf,med) \
{ \
(fe).cfFormat = cf;\
(fe).dwAspect = DVASPECT_CONTENT; \
(fe).ptd =NULL;\
(fe).tymed = med;\
(fe).lindex = -1;\
};
/* /*
* DATAOBJECT Helper functions * DATAOBJECT Helper functions
*/ */
@ -3808,7 +3818,7 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
{ {
STGMEDIUM medium; STGMEDIUM medium;
FORMATETC formatetc; FORMATETC formatetc = get_def_format();
LPITEMIDLIST pidl = NULL; LPITEMIDLIST pidl = NULL;
TRACE("sv=%p index=%u\n", doSelected, nPidlIndex); TRACE("sv=%p index=%u\n", doSelected, nPidlIndex);
@ -3816,9 +3826,6 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
if (!doSelected) if (!doSelected)
return NULL; return NULL;
/* Set the FORMATETC structure*/
SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLISTA), TYMED_HGLOBAL);
/* Get the pidls from IDataObject */ /* Get the pidls from IDataObject */
if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium))) if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium)))
{ {
@ -3842,15 +3849,12 @@ static UINT GetNumSelected( IDataObject *doSelected )
{ {
UINT retVal = 0; UINT retVal = 0;
STGMEDIUM medium; STGMEDIUM medium;
FORMATETC formatetc; FORMATETC formatetc = get_def_format();
TRACE("sv=%p\n", doSelected); TRACE("sv=%p\n", doSelected);
if (!doSelected) return 0; if (!doSelected) return 0;
/* Set the FORMATETC structure*/
SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLISTA), TYMED_HGLOBAL);
/* Get the pidls from IDataObject */ /* Get the pidls from IDataObject */
if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium))) if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium)))
{ {