Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-09 20:30:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge in Winehq commits.

Browse source 
svn path=/trunk/; revision=9948
This commit is contained in:
Steven Edwards 2004-06-30 19:07:22 +00:00
parent 3ec9c96584
commit 3af5a16e60
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/shell32/classes.c
View file

@ -265,7 +265,7 @@ BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, LPDWORD
*
* Gets the name of a registred class
*/
static WCHAR swEmpty[] = {0};
static const WCHAR swEmpty[] = {0};
BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len)
{

10
reactos/lib/shell32/shlfsbind.c
View file

@ -58,11 +58,11 @@ static struct ICOM_VTABLE(IFileSystemBindData) sbvt =
IFileSystemBindData_fnQueryInterface,
IFileSystemBindData_fnAddRef,
IFileSystemBindData_fnRelease,
IFileSystemBindData_fnSetFindData,
IFileSystemBindData_fnGetFindData,
IFileSystemBindData_fnSetFindData,
};
static WCHAR wFileSystemBindData[] = {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d','D','a','t','a',0};
static const WCHAR wFileSystemBindData[] = {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d','D','a','t','a',0};
HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV)
{
@ -93,7 +93,7 @@ HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC
bindOpts.grfMode = STGM_CREATE;
bindOpts.dwTickCountDeadline = 0;
IBindCtx_SetBindOptions(*ppV, &bindOpts);
IBindCtx_RegisterObjectParam(*ppV, wFileSystemBindData, (LPUNKNOWN)sb);
IBindCtx_RegisterObjectParam(*ppV, (LPOLESTR)wFileSystemBindData, (LPUNKNOWN)sb);
IFileSystemBindData_Release((IFileSystemBindData*)sb);
}
@ -113,7 +113,7 @@ HRESULT WINAPI FileSystemBindData_GetFindData(LPBC pbc, WIN32_FIND_DATAW *pfd)
if (!pfd)
return E_INVALIDARG;
ret = IBindCtx_GetObjectParam(pbc, wFileSystemBindData, &pUnk);
ret = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &pUnk);
if (SUCCEEDED(ret))
{
ret = IUnknown_QueryInterface(pUnk, &IID_IFileSystemBindData, (LPVOID *)&pfsbd);
@ -135,7 +135,7 @@ HRESULT WINAPI FileSystemBindData_SetFindData(LPBC pbc, const WIN32_FIND_DATAW *
TRACE("%p, %p\n", pbc, pfd);
ret = IBindCtx_GetObjectParam(pbc, wFileSystemBindData, &pUnk);
ret = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &pUnk);
if (SUCCEEDED(ret))
{
ret = IUnknown_QueryInterface(pUnk, &IID_IFileSystemBindData, (LPVOID *)&pfsbd);

4
reactos/lib/shell32/shv_bg_cmenu.c
View file

@ -223,7 +223,7 @@ static BOOL DoPaste(
TRACE("\n");
if(SUCCEEDED(pOleGetClipboard(&pda)))
if(SUCCEEDED(OleGetClipboard(&pda)))
{
STGMEDIUM medium;
FORMATETC formatetc;
@ -277,7 +277,7 @@ static BOOL DoPaste(
SHFree(pidl);
/* release the medium*/
pReleaseStgMedium(&medium);
ReleaseStgMedium(&medium);
}
IDataObject_Release(pda);
}