system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 17:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell32: Fix compiler warnings with flag -Wcast-qual.

Browse source
This commit is contained in:
Mikhail Maroukhine 2010-03-28 14:57:39 +07:00 committed by Alexandre Julliard
parent dc525dabd6
commit cc7eaa3293
3 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dlls/shell32/debughlp.c
View file

@ -35,7 +35,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(pidl);
static
LPITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl)
LPCITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl)
{
WORD len;
@ -44,7 +44,7 @@ LPITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl)
len = pidl->mkid.cb;
if (len)
{
return (LPITEMIDLIST) (((LPBYTE)pidl)+len);
return (LPCITEMIDLIST) (((const BYTE*)pidl)+len);
}
}
return NULL;
@ -57,17 +57,17 @@ BOOL _dbg_ILIsDesktop(LPCITEMIDLIST pidl)
}
static
LPPIDLDATA _dbg_ILGetDataPointer(LPCITEMIDLIST pidl)
const PIDLDATA* _dbg_ILGetDataPointer(LPCITEMIDLIST pidl)
{
if(pidl && pidl->mkid.cb != 0x00)
return (LPPIDLDATA)pidl->mkid.abID;
return (const PIDLDATA*)pidl->mkid.abID;
return NULL;
}
static
LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl)
LPCSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl)
{
LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl);
const PIDLDATA* pdata =_dbg_ILGetDataPointer(pidl);
if (pdata)
{
@ -103,9 +103,9 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl)
}
static
LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl)
LPCWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl)
{
LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl);
const PIDLDATA* pdata =_dbg_ILGetDataPointer(pidl);
if (pdata)
{
@ -140,7 +140,7 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl)
return NULL;
case PT_VALUEW:
return (LPWSTR)pdata->u.file.szNames;
return (LPCWSTR)pdata->u.file.szNames;
}
}
return NULL;
@ -148,9 +148,9 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl)
static
LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl)
LPCSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl)
{
LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl);
const PIDLDATA* pdata =_dbg_ILGetDataPointer(pidl);
if (pdata)
{
@ -170,9 +170,9 @@ LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl)
}
static
LPWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl)
LPCWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl)
{
LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl);
const PIDLDATA* pdata =_dbg_ILGetDataPointer(pidl);
if (pdata)
{
@ -190,7 +190,7 @@ LPWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl)
return NULL;
case PT_VALUEW:
return (LPWSTR)(pdata->u.file.szNames + lstrlenW ((LPWSTR)pdata->u.file.szNames) + 1);
return (LPCWSTR)(pdata->u.file.szNames + lstrlenW ((LPCWSTR)pdata->u.file.szNames) + 1);
}
}
return NULL;
@ -218,8 +218,8 @@ IID* _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl)
static
void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize)
{
LPSTR szSrc;
LPWSTR szSrcW;
LPCSTR szSrc;
LPCWSTR szSrcW;
GUID const * riid;
if (!pidl) return;
@ -277,10 +277,10 @@ void pdump (LPCITEMIDLIST pidl)
if (_ILIsUnicode(pidltemp))
{
DWORD dwAttrib = 0;
LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp);
const PIDLDATA* pData = _dbg_ILGetDataPointer(pidltemp);
DWORD type = pData ? pData->type : 0;
LPWSTR szLongName = _dbg_ILGetTextPointerW(pidltemp);
LPWSTR szShortName = _dbg_ILGetSTextPointerW(pidltemp);
LPCWSTR szLongName = _dbg_ILGetTextPointerW(pidltemp);
LPCWSTR szShortName = _dbg_ILGetSTextPointerW(pidltemp);
char szName[MAX_PATH];
_dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH);
@ -294,10 +294,10 @@ void pdump (LPCITEMIDLIST pidl)
else
{
DWORD dwAttrib = 0;
LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp);
const PIDLDATA* pData = _dbg_ILGetDataPointer(pidltemp);
DWORD type = pData ? pData->type : 0;
LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp);
LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp);
LPCSTR szLongName = _dbg_ILGetTextPointer(pidltemp);
LPCSTR szShortName = _dbg_ILGetSTextPointer(pidltemp);
char szName[MAX_PATH];
_dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH);

5
dlls/shell32/shlexec.c
View file

@ -809,8 +809,9 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
}
else
{
LPWSTR p,space;
for (p=(LPWSTR)start; (space=strchrW(p, ' ')); p=space+1)
LPCWSTR p;
LPWSTR space;
for (p=start; (space=strchrW(p, ' ')); p=space+1)
{
int idx = space-start;
memcpy(command, start, idx*sizeof(WCHAR));

2
dlls/shell32/trash.c
View file

@ -358,7 +358,7 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data)
return E_INVALIDARG;
if (data != NULL)
*data = *(WIN32_FIND_DATAW *)(id->abID+1);
*data = *(const WIN32_FIND_DATAW *)(id->abID+1);
return S_OK;
}