Commit f2276f5a authored by Jon Griffiths's avatar Jon Griffiths Committed by Alexandre Julliard

include: Provide wide char definitions for CFSTR_*.

parent fc3377d0
...@@ -3268,7 +3268,7 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex) ...@@ -3268,7 +3268,7 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
return NULL; return NULL;
/* Set the FORMATETC structure*/ /* Set the FORMATETC structure*/
SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); 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)))
...@@ -3300,7 +3300,7 @@ UINT GetNumSelected( IDataObject *doSelected ) ...@@ -3300,7 +3300,7 @@ UINT GetNumSelected( IDataObject *doSelected )
if (!doSelected) return 0; if (!doSelected) return 0;
/* Set the FORMATETC structure*/ /* Set the FORMATETC structure*/
SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); 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)))
......
...@@ -439,9 +439,9 @@ LPDATAOBJECT IDataObject_Constructor(HWND hwndOwner, ...@@ -439,9 +439,9 @@ LPDATAOBJECT IDataObject_Constructor(HWND hwndOwner,
dto->apidl = _ILCopyaPidl(apidl, cidl); dto->apidl = _ILCopyaPidl(apidl, cidl);
dto->cidl = cidl; dto->cidl = cidl;
dto->cfShellIDList = RegisterClipboardFormatA(CFSTR_SHELLIDLIST); dto->cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW);
dto->cfFileNameA = RegisterClipboardFormatA(CFSTR_FILENAMEA); dto->cfFileNameA = RegisterClipboardFormatA(CFSTR_FILENAMEA);
dto->cfFileNameW = RegisterClipboardFormatA(CFSTR_FILENAMEW); dto->cfFileNameW = RegisterClipboardFormatW(CFSTR_FILENAMEW);
InitFormatEtc(dto->pFormatEtc[0], dto->cfShellIDList, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[0], dto->cfShellIDList, TYMED_HGLOBAL);
InitFormatEtc(dto->pFormatEtc[1], CF_HDROP, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[1], CF_HDROP, TYMED_HGLOBAL);
InitFormatEtc(dto->pFormatEtc[2], dto->cfFileNameA, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[2], dto->cfFileNameA, TYMED_HGLOBAL);
......
...@@ -712,7 +712,7 @@ HRESULT WINAPI SHGetRealIDL(LPSHELLFOLDER lpsf, LPCITEMIDLIST pidlSimple, LPITEM ...@@ -712,7 +712,7 @@ HRESULT WINAPI SHGetRealIDL(LPSHELLFOLDER lpsf, LPCITEMIDLIST pidlSimple, LPITEM
STGMEDIUM medium; STGMEDIUM medium;
FORMATETC fmt; FORMATETC fmt;
fmt.cfFormat = RegisterClipboardFormatA(CFSTR_SHELLIDLIST); fmt.cfFormat = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW);
fmt.ptd = NULL; fmt.ptd = NULL;
fmt.dwAspect = DVASPECT_CONTENT; fmt.dwAspect = DVASPECT_CONTENT;
fmt.lindex = -1; fmt.lindex = -1;
......
...@@ -128,7 +128,7 @@ static void SF_RegisterClipFmt (IGenericSFImpl * This) ...@@ -128,7 +128,7 @@ static void SF_RegisterClipFmt (IGenericSFImpl * This)
TRACE ("(%p)\n", This); TRACE ("(%p)\n", This);
if (!This->cfShellIDList) { if (!This->cfShellIDList) {
This->cfShellIDList = RegisterClipboardFormatA (CFSTR_SHELLIDLIST); This->cfShellIDList = RegisterClipboardFormatW (CFSTR_SHELLIDLISTW);
} }
} }
......
...@@ -834,7 +834,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_QueryInterface(IShellFolder2 *ifa ...@@ -834,7 +834,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_QueryInterface(IShellFolder2 *ifa
} else if (IsEqualIID(&IID_IDropTarget, riid)) { } else if (IsEqualIID(&IID_IDropTarget, riid)) {
*ppv = STATIC_CAST(IDropTarget, This); *ppv = STATIC_CAST(IDropTarget, This);
if (!cfShellIDList) if (!cfShellIDList)
cfShellIDList = RegisterClipboardFormatA(CFSTR_SHELLIDLIST); cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW);
} else { } else {
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
......
...@@ -889,7 +889,7 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This) ...@@ -889,7 +889,7 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This)
if (0 == CF_IDLIST) if (0 == CF_IDLIST)
{ {
CF_IDLIST = RegisterClipboardFormatA(CFSTR_SHELLIDLIST); CF_IDLIST = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW);
} }
fetc.cfFormat = CF_IDLIST; fetc.cfFormat = CF_IDLIST;
fetc.ptd = NULL; fetc.ptd = NULL;
......
...@@ -234,7 +234,7 @@ static BOOL DoPaste( ...@@ -234,7 +234,7 @@ static BOOL DoPaste(
TRACE("pda=%p\n", pda); TRACE("pda=%p\n", pda);
/* Set the FORMATETC structure*/ /* Set the FORMATETC structure*/
InitFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLISTW), TYMED_HGLOBAL);
/* Get the pidls from IDataObject */ /* Get the pidls from IDataObject */
if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium))) if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium)))
......
...@@ -4720,12 +4720,8 @@ static void InitInstance(HINSTANCE hinstance) ...@@ -4720,12 +4720,8 @@ static void InitInstance(HINSTANCE hinstance)
CoInitialize(NULL); CoInitialize(NULL);
CoGetMalloc(MEMCTX_TASK, &Globals.iMalloc); CoGetMalloc(MEMCTX_TASK, &Globals.iMalloc);
SHGetDesktopFolder(&Globals.iDesktop); SHGetDesktopFolder(&Globals.iDesktop);
#ifdef __WINE__
Globals.cfStrFName = RegisterClipboardFormatA(CFSTR_FILENAME);
#else
Globals.cfStrFName = RegisterClipboardFormat(CFSTR_FILENAME); Globals.cfStrFName = RegisterClipboardFormat(CFSTR_FILENAME);
#endif #endif
#endif
/* load column strings */ /* load column strings */
col = 1; col = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment