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

shell32: Remove superfluous pointer casts.

Browse Source
This commit is contained in:
Michael Stefaniuc 2009-02-18 22:46:39 +01:00 committed by Alexandre Julliard
parent 8324ed6cc9
commit 6c54ad3dba
24 changed files with 95 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/appbar.c
View File

@ -109,7 +109,7 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data)
return 0; return 0;
} }
response = (struct appbar_response*)return_view; response = return_view;
ret = response->result; ret = response->result;
*data = response->abd; *data = response->abd;

5
dlls/shell32/autocomplete.c
View File

@ -167,7 +167,7 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface(
IsEqualIID(riid, &IID_IAutoComplete) || IsEqualIID(riid, &IID_IAutoComplete) ||
IsEqualIID(riid, &IID_IAutoComplete2)) IsEqualIID(riid, &IID_IAutoComplete2))
{ {
*ppvObj = (IAutoComplete2*)This; *ppvObj = This;
} }
else if (IsEqualIID(riid, &IID_IAutoCompleteDropDown)) else if (IsEqualIID(riid, &IID_IAutoCompleteDropDown))
{ {
@ -483,8 +483,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
} }
return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam);
case WM_KEYUP: case WM_KEYUP:
GetWindowTextW( hwnd, hwndText, 255);
GetWindowTextW( hwnd, (LPWSTR)hwndText, 255);
switch(wParam) { switch(wParam) {
case VK_RETURN: case VK_RETURN:

10
dlls/shell32/brsfolder.c
View File

@ -686,7 +686,7 @@ static BOOL BrsFolder_OnCommand( browse_info *info, UINT id )
static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection, static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection,
BOOL is_str, HTREEITEM *pItem) BOOL is_str, HTREEITEM *pItem)
{ {
LPITEMIDLIST pidlSelection = (LPITEMIDLIST)selection; LPITEMIDLIST pidlSelection = selection;
LPCITEMIDLIST pidlCurrent, pidlRoot; LPCITEMIDLIST pidlCurrent, pidlRoot;
TVITEMEXW item; TVITEMEXW item;
BOOL bResult = FALSE; BOOL bResult = FALSE;
@ -701,7 +701,7 @@ static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection,
goto done; goto done;
hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL,
(LPOLESTR)selection, NULL, &pidlSelection, NULL); selection, NULL, &pidlSelection, NULL);
IShellFolder_Release(psfDesktop); IShellFolder_Release(psfDesktop);
if (FAILED(hr)) if (FAILED(hr))
goto done; goto done;
@ -751,7 +751,7 @@ static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection,
bResult = TRUE; bResult = TRUE;
done: done:
if (pidlSelection && pidlSelection != (LPITEMIDLIST)selection) if (pidlSelection && pidlSelection != selection)
ILFree(pidlSelection); ILFree(pidlSelection);
if (pItem) if (pItem)
@ -778,9 +778,9 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL
if (!is_str) if (!is_str)
return BrsFolder_OnSetSelectionW(info, selection, is_str); return BrsFolder_OnSetSelectionW(info, selection, is_str);
if ((length = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, NULL, 0)) && if ((length = MultiByteToWideChar(CP_ACP, 0, selection, -1, NULL, 0)) &&
(selectionW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR))) && (selectionW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR))) &&
MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, selectionW, length)) MultiByteToWideChar(CP_ACP, 0, selection, -1, selectionW, length))
{ {
result = BrsFolder_OnSetSelectionW(info, selectionW, is_str); result = BrsFolder_OnSetSelectionW(info, selectionW, is_str);
} }

16
dlls/shell32/changenotify.c
View File

@ -135,7 +135,7 @@ static LPNOTIFICATIONLIST FindNode( HANDLE hitem )
{ {
LPNOTIFICATIONLIST ptr; LPNOTIFICATIONLIST ptr;
for( ptr = head; ptr; ptr = ptr->next ) for( ptr = head; ptr; ptr = ptr->next )
if( ptr == (LPNOTIFICATIONLIST) hitem ) if( ptr == hitem )
return ptr; return ptr;
return NULL; return NULL;
} }
@ -315,16 +315,16 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID
switch (typeFlag) switch (typeFlag)
{ {
case SHCNF_PATHA: case SHCNF_PATHA:
if (dwItem1) Pidls[0] = SHSimpleIDListFromPathA((LPCSTR)dwItem1); if (dwItem1) Pidls[0] = SHSimpleIDListFromPathA(dwItem1);
if (dwItem2) Pidls[1] = SHSimpleIDListFromPathA((LPCSTR)dwItem2); if (dwItem2) Pidls[1] = SHSimpleIDListFromPathA(dwItem2);
break; break;
case SHCNF_PATHW: case SHCNF_PATHW:
if (dwItem1) Pidls[0] = SHSimpleIDListFromPathW((LPCWSTR)dwItem1); if (dwItem1) Pidls[0] = SHSimpleIDListFromPathW(dwItem1);
if (dwItem2) Pidls[1] = SHSimpleIDListFromPathW((LPCWSTR)dwItem2); if (dwItem2) Pidls[1] = SHSimpleIDListFromPathW(dwItem2);
break; break;
case SHCNF_IDLIST: case SHCNF_IDLIST:
Pidls[0] = (LPCITEMIDLIST)dwItem1; Pidls[0] = dwItem1;
Pidls[1] = (LPCITEMIDLIST)dwItem2; Pidls[1] = dwItem2;
break; break;
case SHCNF_PRINTERA: case SHCNF_PRINTERA:
case SHCNF_PRINTERW: case SHCNF_PRINTERW:
@ -458,7 +458,7 @@ HANDLE WINAPI SHChangeNotification_Lock(
/* LeaveCriticalSection(&SHELL32_ChangenotifyCS); */ /* LeaveCriticalSection(&SHELL32_ChangenotifyCS); */
return (HANDLE) node; return node;
} }
/************************************************************************* /*************************************************************************

4
dlls/shell32/control.c
View File

@ -244,7 +244,7 @@ static BOOL Control_CreateListView (CPanel *panel)
static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs)
{ {
CPanel* panel = (CPanel*)cs->lpCreateParams; CPanel* panel = cs->lpCreateParams;
HMENU hMenu, hSubMenu; HMENU hMenu, hSubMenu;
CPlApplet* applet; CPlApplet* applet;
MENUITEMINFOW mii; MENUITEMINFOW mii;
@ -292,7 +292,7 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs)
if (!item) if (!item)
continue; continue;
item->applet = (CPlApplet *) applet; item->applet = applet;
item->id = i; item->id = i;
mii.cbSize = sizeof(MENUITEMINFOW); mii.cbSize = sizeof(MENUITEMINFOW);

2
dlls/shell32/cpanelfolder.c
View File

@ -205,7 +205,7 @@ static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface)
if (!refCount) { if (!refCount) {
TRACE("-- destroying IShellFolder(%p)\n", This); TRACE("-- destroying IShellFolder(%p)\n", This);
SHFree(This->pidlRoot); SHFree(This->pidlRoot);
LocalFree((HLOCAL) This); LocalFree(This);
} }
return refCount; return refCount;
} }

4
dlls/shell32/dataobject.c
View File

@ -64,7 +64,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnQueryInterface(
} }
else if(IsEqualIID(riid, &IID_IEnumFORMATETC)) else if(IsEqualIID(riid, &IID_IEnumFORMATETC))
{ {
*ppvObj = (IEnumFORMATETC*)This; *ppvObj = This;
} }
if(*ppvObj) if(*ppvObj)
@ -232,7 +232,7 @@ static HRESULT WINAPI IDataObject_fnQueryInterface(LPDATAOBJECT iface, REFIID ri
} }
else if(IsEqualIID(riid, &IID_IDataObject)) /*IDataObject*/ else if(IsEqualIID(riid, &IID_IDataObject)) /*IDataObject*/
{ {
*ppvObj = (IDataObject*)This; *ppvObj = This;
} }
if(*ppvObj) if(*ppvObj)

10
dlls/shell32/debughlp.c
View File

@ -82,21 +82,21 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl)
case PT_DRIVE1: case PT_DRIVE1:
case PT_DRIVE2: case PT_DRIVE2:
case PT_DRIVE3: case PT_DRIVE3:
return (LPSTR)pdata->u.drive.szDriveName; return pdata->u.drive.szDriveName;
case PT_FOLDER: case PT_FOLDER:
case PT_FOLDER1: case PT_FOLDER1:
case PT_VALUE: case PT_VALUE:
case PT_IESPECIAL1: case PT_IESPECIAL1:
case PT_IESPECIAL2: case PT_IESPECIAL2:
return (LPSTR)pdata->u.file.szNames; return pdata->u.file.szNames;
case PT_WORKGRP: case PT_WORKGRP:
case PT_COMP: case PT_COMP:
case PT_NETWORK: case PT_NETWORK:
case PT_NETPROVIDER: case PT_NETPROVIDER:
case PT_SHARE: case PT_SHARE:
return (LPSTR)pdata->u.network.szNames; return pdata->u.network.szNames;
} }
} }
return NULL; return NULL;
@ -160,10 +160,10 @@ LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl)
case PT_VALUE: case PT_VALUE:
case PT_IESPECIAL1: case PT_IESPECIAL1:
case PT_IESPECIAL2: case PT_IESPECIAL2:
return (LPSTR)(pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1); return pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1;
case PT_WORKGRP: case PT_WORKGRP:
return (LPSTR)(pdata->u.network.szNames + strlen (pdata->u.network.szNames) + 1); return pdata->u.network.szNames + strlen (pdata->u.network.szNames) + 1;
} }
} }
return NULL; return NULL;

2
dlls/shell32/dragdrophelper.c
View File

@ -129,7 +129,7 @@ static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface)
if (!refCount) { if (!refCount) {
TRACE ("-- destroying (%p)\n", This); TRACE ("-- destroying (%p)\n", This);
LocalFree ((HLOCAL) This); LocalFree (This);
return 0; return 0;
} }
return refCount; return refCount;

2
dlls/shell32/enumidlist.c
View File

@ -224,7 +224,7 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface(
{ *ppvObj = This; { *ppvObj = This;
} }
else if(IsEqualIID(riid, &IID_IEnumIDList)) /*IEnumIDList*/ else if(IsEqualIID(riid, &IID_IEnumIDList)) /*IEnumIDList*/
{ *ppvObj = (IEnumIDList*)This; { *ppvObj = This;
} }
if(*ppvObj) if(*ppvObj)

6
dlls/shell32/folders.c
View File

@ -108,15 +108,15 @@ static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFII
} }
else if (IsEqualIID(riid, &IID_IPersistFile)) /*IExtractIcon*/ else if (IsEqualIID(riid, &IID_IPersistFile)) /*IExtractIcon*/
{ {
*ppvObj = (IPersistFile*)&(This->lpvtblPersistFile); *ppvObj = &This->lpvtblPersistFile;
} }
else if (IsEqualIID(riid, &IID_IExtractIconA)) /*IExtractIcon*/ else if (IsEqualIID(riid, &IID_IExtractIconA)) /*IExtractIcon*/
{ {
*ppvObj = (IExtractIconA*)&(This->lpvtblExtractIconA); *ppvObj = &This->lpvtblExtractIconA;
} }
else if (IsEqualIID(riid, &IID_IExtractIconW)) /*IExtractIcon*/ else if (IsEqualIID(riid, &IID_IExtractIconW)) /*IExtractIcon*/
{ {
*ppvObj = (IExtractIconW*)This; *ppvObj = This;
} }
if(*ppvObj) if(*ppvObj)

3
dlls/shell32/iconcache.c
View File

@ -77,7 +77,8 @@ static CRITICAL_SECTION SHELL32_SicCS = { &critsect_debug, -1, 0, 0, 0, 0 };
* Callback for DPA_Search * Callback for DPA_Search
*/ */
static INT CALLBACK SIC_CompareEntries( LPVOID p1, LPVOID p2, LPARAM lparam) static INT CALLBACK SIC_CompareEntries( LPVOID p1, LPVOID p2, LPARAM lparam)
{ LPSIC_ENTRY e1 = (LPSIC_ENTRY)p1, e2 = (LPSIC_ENTRY)p2; {
LPSIC_ENTRY e1 = p1, e2 = p2;
TRACE("%p %p %8lx\n", p1, p2, lparam); TRACE("%p %p %8lx\n", p1, p2, lparam);

14
dlls/shell32/pidl.c
View File

@ -299,7 +299,7 @@ HRESULT WINAPI ILLoadFromStream (IStream * pStream, LPITEMIDLIST * ppPidl)
IStream_AddRef (pStream); IStream_AddRef (pStream);
if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead))) if (SUCCEEDED(IStream_Read(pStream, &wLen, 2, &dwBytesRead)))
{ {
TRACE("PIDL length is %d\n", wLen); TRACE("PIDL length is %d\n", wLen);
if (wLen != 0) if (wLen != 0)
@ -354,7 +354,7 @@ HRESULT WINAPI ILSaveToStream (IStream * pStream, LPCITEMIDLIST pPidl)
wLen = ILGetSize(pPidl); wLen = ILGetSize(pPidl);
if (SUCCEEDED(IStream_Write(pStream, (LPVOID)&wLen, 2, NULL))) if (SUCCEEDED(IStream_Write(pStream, &wLen, 2, NULL)))
{ {
if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL))) if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL)))
ret = S_OK; ret = S_OK;
@ -1977,21 +1977,21 @@ LPSTR _ILGetTextPointer(LPCITEMIDLIST pidl)
case PT_DRIVE1: case PT_DRIVE1:
case PT_DRIVE2: case PT_DRIVE2:
case PT_DRIVE3: case PT_DRIVE3:
return (LPSTR)pdata->u.drive.szDriveName; return pdata->u.drive.szDriveName;
case PT_FOLDER: case PT_FOLDER:
case PT_FOLDER1: case PT_FOLDER1:
case PT_VALUE: case PT_VALUE:
case PT_IESPECIAL1: case PT_IESPECIAL1:
case PT_IESPECIAL2: case PT_IESPECIAL2:
return (LPSTR)pdata->u.file.szNames; return pdata->u.file.szNames;
case PT_WORKGRP: case PT_WORKGRP:
case PT_COMP: case PT_COMP:
case PT_NETWORK: case PT_NETWORK:
case PT_NETPROVIDER: case PT_NETPROVIDER:
case PT_SHARE: case PT_SHARE:
return (LPSTR)pdata->u.network.szNames; return pdata->u.network.szNames;
} }
return NULL; return NULL;
} }
@ -2015,10 +2015,10 @@ static LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl)
case PT_VALUE: case PT_VALUE:
case PT_IESPECIAL1: case PT_IESPECIAL1:
case PT_IESPECIAL2: case PT_IESPECIAL2:
return (LPSTR)(pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1); return pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1;
case PT_WORKGRP: case PT_WORKGRP:
return (LPSTR)(pdata->u.network.szNames + strlen (pdata->u.network.szNames) + 1); return pdata->u.network.szNames + strlen (pdata->u.network.szNames) + 1;
} }
return NULL; return NULL;
} }

12
dlls/shell32/shelllink.c
View File

@ -311,7 +311,7 @@ static ULONG ShellLink_Release( IShellLinkImpl *This )
if (This->pPidl) if (This->pPidl)
ILFree(This->pPidl); ILFree(This->pPidl);
LocalFree((HANDLE)This); LocalFree(This);
return 0; return 0;
} }
@ -585,20 +585,20 @@ static HRESULT Stream_LoadString( IStream* stm, BOOL unicode, LPWSTR *pstr )
/* convert to unicode if necessary */ /* convert to unicode if necessary */
if( !unicode ) if( !unicode )
{ {
count = MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, NULL, 0 ); count = MultiByteToWideChar( CP_ACP, 0, temp, len, NULL, 0 );
str = HeapAlloc( GetProcessHeap(), 0, (count+1)*sizeof (WCHAR) ); str = HeapAlloc( GetProcessHeap(), 0, (count+1)*sizeof (WCHAR) );
if( !str ) if( !str )
{ {
HeapFree( GetProcessHeap(), 0, temp ); HeapFree( GetProcessHeap(), 0, temp );
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, str, count ); MultiByteToWideChar( CP_ACP, 0, temp, len, str, count );
HeapFree( GetProcessHeap(), 0, temp ); HeapFree( GetProcessHeap(), 0, temp );
} }
else else
{ {
count /= 2; count /= 2;
str = (LPWSTR) temp; str = temp;
} }
str[count] = 0; str[count] = 0;
@ -637,7 +637,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data )
TRACE("Read %d bytes\n",chunk->size); TRACE("Read %d bytes\n",chunk->size);
*data = (LPVOID) chunk; *data = chunk;
return S_OK; return S_OK;
} }
@ -1308,7 +1308,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid,
hr = E_FAIL; hr = E_FAIL;
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
*ppv = (IUnknown*) psl; *ppv = psl;
IPersistFile_Release(ppf); IPersistFile_Release(ppf);
} }

2
dlls/shell32/shellole.c
View File

@ -518,7 +518,7 @@ void WINAPI DragAcceptFiles(HWND hWnd, BOOL b)
void WINAPI DragFinish(HDROP h) void WINAPI DragFinish(HDROP h)
{ {
TRACE("\n"); TRACE("\n");
GlobalFree((HGLOBAL)h); GlobalFree(h);
} }
/************************************************************************* /*************************************************************************

18
dlls/shell32/shellord.c
View File

@ -382,7 +382,7 @@ int WINAPIV ShellMessageBoxW(
__ms_va_end(args); __ms_va_end(args);
ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType); ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType);
LocalFree((HLOCAL)pszTemp); LocalFree(pszTemp);
return ret; return ret;
} }
@ -440,7 +440,7 @@ int WINAPIV ShellMessageBoxA(
__ms_va_end(args); __ms_va_end(args);
ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType); ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType);
LocalFree((HLOCAL)pszTemp); LocalFree(pszTemp);
return ret; return ret;
} }
@ -663,7 +663,7 @@ static INT SHADD_create_add_mru_data(HANDLE mruhandle, LPCSTR doc_name, LPCSTR n
/* Add the new entry into the MRU list /* Add the new entry into the MRU list
*/ */
return AddMRUData(mruhandle, (LPCVOID)buffer, *len); return AddMRUData(mruhandle, buffer, *len);
} }
/************************************************************************* /*************************************************************************
@ -814,15 +814,15 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
switch (uFlags) switch (uFlags)
{ {
case SHARD_PIDL: case SHARD_PIDL:
SHGetPathFromIDListA((LPCITEMIDLIST) pv, doc_name); SHGetPathFromIDListA(pv, doc_name);
break; break;
case SHARD_PATHA: case SHARD_PATHA:
lstrcpynA(doc_name, (LPCSTR)pv, MAX_PATH); lstrcpynA(doc_name, pv, MAX_PATH);
break; break;
case SHARD_PATHW: case SHARD_PATHW:
WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)pv, -1, doc_name, MAX_PATH, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, pv, -1, doc_name, MAX_PATH, NULL, NULL);
break; break;
default: default:
@ -970,9 +970,9 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
/* Set the document path or pidl */ /* Set the document path or pidl */
if (uFlags == SHARD_PIDL) { if (uFlags == SHARD_PIDL) {
hres = IShellLinkA_SetIDList(psl, (LPCITEMIDLIST) pv); hres = IShellLinkA_SetIDList(psl, pv);
} else { } else {
hres = IShellLinkA_SetPath(psl, (LPCSTR) pv); hres = IShellLinkA_SetPath(psl, pv);
} }
if(FAILED(hres)) { if(FAILED(hres)) {
/* bombed */ /* bombed */
@ -1771,7 +1771,7 @@ void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa)
psxa->pspsx[i]->lpVtbl->Release(psxa->pspsx[i]); psxa->pspsx[i]->lpVtbl->Release(psxa->pspsx[i]);
} }
LocalFree((HLOCAL)psxa); LocalFree(psxa);
} }
} }

4
dlls/shell32/shfldr_fs.c
View File

@ -196,7 +196,7 @@ static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface)
SHFree (This->pidlRoot); SHFree (This->pidlRoot);
SHFree (This->sPathTarget); SHFree (This->sPathTarget);
LocalFree ((HLOCAL) This); LocalFree (This);
} }
return refCount; return refCount;
} }
@ -324,7 +324,7 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path)
return NULL; return NULL;
/* see if the caller bound File System Bind Data */ /* see if the caller bound File System Bind Data */
r = IBindCtx_GetObjectParam( pbc, (LPOLESTR) szfsbc, &param ); r = IBindCtx_GetObjectParam( pbc, szfsbc, &param );
if (FAILED(r)) if (FAILED(r))
return NULL; return NULL;

2
dlls/shell32/shfldr_mycomp.c
View File

@ -187,7 +187,7 @@ static ULONG WINAPI ISF_MyComputer_fnRelease (IShellFolder2 * iface)
{ {
TRACE ("-- destroying IShellFolder(%p)\n", This); TRACE ("-- destroying IShellFolder(%p)\n", This);
SHFree (This->pidlRoot); SHFree (This->pidlRoot);
LocalFree ((HLOCAL) This); LocalFree (This);
} }
return refCount; return refCount;
} }

8
dlls/shell32/shfldr_unixfs.c
View File

@ -499,7 +499,7 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, void *pIDL) {
((LPSHITEMID)pIDL)->cb = cbLen; ((LPSHITEMID)pIDL)->cb = cbLen;
/* Set shell32's standard SHITEMID data fields. */ /* Set shell32's standard SHITEMID data fields. */
pIDLData = _ILGetDataPointer((LPCITEMIDLIST)pIDL); pIDLData = _ILGetDataPointer(pIDL);
pIDLData->type = S_ISDIR(fileStat.st_mode) ? PT_FOLDER : PT_VALUE; pIDLData->type = S_ISDIR(fileStat.st_mode) ? PT_FOLDER : PT_VALUE;
pIDLData->u.file.dwFileSize = (DWORD)fileStat.st_size; pIDLData->u.file.dwFileSize = (DWORD)fileStat.st_size;
UNIXFS_seconds_since_1970_to_dos_date_time(fileStat.st_mtime, &pIDLData->u.file.uFileDate, UNIXFS_seconds_since_1970_to_dos_date_time(fileStat.st_mtime, &pIDLData->u.file.uFileDate,
@ -1093,14 +1093,14 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetUIObjectOf(IShellFolder2* ifac
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
if (cidl != 1) return E_INVALIDARG; if (cidl != 1) return E_INVALIDARG;
pidl = ILCombine(This->m_pidlLocation, apidl[0]); pidl = ILCombine(This->m_pidlLocation, apidl[0]);
*ppvOut = (LPVOID)IExtractIconA_Constructor(pidl); *ppvOut = IExtractIconA_Constructor(pidl);
SHFree(pidl); SHFree(pidl);
return S_OK; return S_OK;
} else if (IsEqualIID(&IID_IExtractIconW, riid)) { } else if (IsEqualIID(&IID_IExtractIconW, riid)) {
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
if (cidl != 1) return E_INVALIDARG; if (cidl != 1) return E_INVALIDARG;
pidl = ILCombine(This->m_pidlLocation, apidl[0]); pidl = ILCombine(This->m_pidlLocation, apidl[0]);
*ppvOut = (LPVOID)IExtractIconW_Constructor(pidl); *ppvOut = IExtractIconW_Constructor(pidl);
SHFree(pidl); SHFree(pidl);
return S_OK; return S_OK;
} else if (IsEqualIID(&IID_IDropTarget, riid)) { } else if (IsEqualIID(&IID_IDropTarget, riid)) {
@ -2287,7 +2287,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Next(IEnumIDList* iface,
* and see if it passes the filter. * and see if it passes the filter.
*/ */
lstrcpyA(pszRelativePath, pDirEntry->d_name); lstrcpyA(pszRelativePath, pDirEntry->d_name);
rgelt[i] = (LPITEMIDLIST)SHAlloc( rgelt[i] = SHAlloc(
UNIXFS_shitemid_len_from_filename(pszRelativePath, NULL, NULL)+sizeof(USHORT)); UNIXFS_shitemid_len_from_filename(pszRelativePath, NULL, NULL)+sizeof(USHORT));
if (!UNIXFS_build_shitemid(This->m_szFolder, rgelt[i]) || if (!UNIXFS_build_shitemid(This->m_szFolder, rgelt[i]) ||
!UNIXFS_is_pidl_of_type(rgelt[i], This->m_fFilter)) !UNIXFS_is_pidl_of_type(rgelt[i], This->m_fFilter))

8
dlls/shell32/shlfileop.c
View File

@ -126,7 +126,7 @@ static INT_PTR ConfirmMsgBox_Paint(HWND hDlg)
/* this will remap the rect to dialog coords */ /* this will remap the rect to dialog coords */
MapWindowPoints(GetDlgItem(hDlg, IDD_MESSAGE), hDlg, (LPPOINT)&r, 2); MapWindowPoints(GetDlgItem(hDlg, IDD_MESSAGE), hDlg, (LPPOINT)&r, 2);
hOldFont = SelectObject(hdc, (HFONT)SendDlgItemMessageW(hDlg, IDD_MESSAGE, WM_GETFONT, 0, 0)); hOldFont = SelectObject(hdc, (HFONT)SendDlgItemMessageW(hDlg, IDD_MESSAGE, WM_GETFONT, 0, 0));
DrawTextW(hdc, (LPWSTR)GetPropW(hDlg, CONFIRM_MSG_PROP), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK); DrawTextW(hdc, GetPropW(hDlg, CONFIRM_MSG_PROP), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK);
SelectObject(hdc, hOldFont); SelectObject(hdc, hOldFont);
EndPaint(hDlg, &ps); EndPaint(hDlg, &ps);
return TRUE; return TRUE;
@ -143,7 +143,7 @@ static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam)
SetWindowTextW(hDlg, info->lpszCaption); SetWindowTextW(hDlg, info->lpszCaption);
ShowWindow(GetDlgItem(hDlg, IDD_MESSAGE), SW_HIDE); ShowWindow(GetDlgItem(hDlg, IDD_MESSAGE), SW_HIDE);
SetPropW(hDlg, CONFIRM_MSG_PROP, (HANDLE)info->lpszText); SetPropW(hDlg, CONFIRM_MSG_PROP, info->lpszText);
SendDlgItemMessageW(hDlg, IDD_ICON, STM_SETICON, (WPARAM)info->hIcon, 0); SendDlgItemMessageW(hDlg, IDD_ICON, STM_SETICON, (WPARAM)info->hIcon, 0);
/* compute the text height and resize the dialog */ /* compute the text height and resize the dialog */
@ -1569,12 +1569,12 @@ void WINAPI SHFreeNameMappings(HANDLE hNameMapping)
for (; i>= 0; i--) for (; i>= 0; i--)
{ {
LPSHNAMEMAPPINGW lp = DSA_GetItemPtr((HDSA)hNameMapping, i); LPSHNAMEMAPPINGW lp = DSA_GetItemPtr(hNameMapping, i);
SHFree(lp->pszOldPath); SHFree(lp->pszOldPath);
SHFree(lp->pszNewPath); SHFree(lp->pszNewPath);
} }
DSA_Destroy((HDSA)hNameMapping); DSA_Destroy(hNameMapping);
} }
} }

2
dlls/shell32/shlfsbind.c
View File

@ -114,7 +114,7 @@ static HRESULT WINAPI IFileSystemBindData_fnQueryInterface(
if (IsEqualIID(riid, &IID_IUnknown)) if (IsEqualIID(riid, &IID_IUnknown))
*ppV = This; *ppV = This;
else if (IsEqualIID(riid, &IID_IFileSystemBindData)) else if (IsEqualIID(riid, &IID_IFileSystemBindData))
*ppV = (IFileSystemBindData*)This; *ppV = This;
if (*ppV) if (*ppV)
{ {

37
dlls/shell32/shlview.c
View File

@ -455,8 +455,8 @@ static INT CALLBACK ShellView_ListViewCompareItems(LPVOID lParam1, LPVOID lParam
FILETIME fd1, fd2; FILETIME fd1, fd2;
char strName1[MAX_PATH], strName2[MAX_PATH]; char strName1[MAX_PATH], strName2[MAX_PATH];
BOOL bIsFolder1, bIsFolder2,bIsBothFolder; BOOL bIsFolder1, bIsFolder2,bIsBothFolder;
LPITEMIDLIST pItemIdList1 = (LPITEMIDLIST) lParam1; LPITEMIDLIST pItemIdList1 = lParam1;
LPITEMIDLIST pItemIdList2 = (LPITEMIDLIST) lParam2; LPITEMIDLIST pItemIdList2 = lParam2;
LISTVIEW_SORT_INFO *pSortInfo = (LPLISTVIEW_SORT_INFO) lpData; LISTVIEW_SORT_INFO *pSortInfo = (LPLISTVIEW_SORT_INFO) lpData;
@ -945,7 +945,7 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This)
ShellExecuteExW(&shexinfo); /* Discard error/success info */ ShellExecuteExW(&shexinfo); /* Discard error/success info */
ILFree((LPITEMIDLIST)shexinfo.lpIDList); ILFree(shexinfo.lpIDList);
} }
} }
@ -1029,7 +1029,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL
ZeroMemory(&cmi, sizeof(cmi)); ZeroMemory(&cmi, sizeof(cmi));
cmi.cbSize = sizeof(cmi); cmi.cbSize = sizeof(cmi);
cmi.hwnd = This->hWndParent; /* this window has to answer CWM_GETISHELLBROWSER */ cmi.hwnd = This->hWndParent; /* this window has to answer CWM_GETISHELLBROWSER */
cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); cmi.lpVerb = MAKEINTRESOURCEA(uCommand);
IContextMenu_InvokeCommand(pContextMenu, &cmi); IContextMenu_InvokeCommand(pContextMenu, &cmi);
} }
} }
@ -1054,7 +1054,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL
ZeroMemory(&cmi, sizeof(cmi)); ZeroMemory(&cmi, sizeof(cmi));
cmi.cbSize = sizeof(cmi); cmi.cbSize = sizeof(cmi);
cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); cmi.lpVerb = MAKEINTRESOURCEA(uCommand);
cmi.hwnd = This->hWndParent; cmi.hwnd = This->hWndParent;
IContextMenu2_InvokeCommand(pCM, &cmi); IContextMenu2_InvokeCommand(pCM, &cmi);
@ -1625,7 +1625,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara
{ {
case WM_NCCREATE: case WM_NCCREATE:
lpcs = (LPCREATESTRUCTW)lParam; lpcs = (LPCREATESTRUCTW)lParam;
pThis = (IShellViewImpl*)(lpcs->lpCreateParams); pThis = lpcs->lpCreateParams;
SetWindowLongPtrW(hWnd, GWLP_USERDATA, (ULONG_PTR)pThis); SetWindowLongPtrW(hWnd, GWLP_USERDATA, (ULONG_PTR)pThis);
pThis->hWnd = hWnd; /*set the window handle*/ pThis->hWnd = hWnd; /*set the window handle*/
break; break;
@ -1687,27 +1687,27 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 * iface,REFIID rii
} }
else if(IsEqualIID(riid, &IID_IShellView)) else if(IsEqualIID(riid, &IID_IShellView))
{ {
*ppvObj = (IShellView*)This; *ppvObj = This;
} }
else if(IsEqualIID(riid, &IID_IShellView2)) else if(IsEqualIID(riid, &IID_IShellView2))
{ {
*ppvObj = (IShellView2*)This; *ppvObj = This;
} }
else if(IsEqualIID(riid, &IID_IOleCommandTarget)) else if(IsEqualIID(riid, &IID_IOleCommandTarget))
{ {
*ppvObj = (IOleCommandTarget*)&(This->lpvtblOleCommandTarget); *ppvObj = &This->lpvtblOleCommandTarget;
} }
else if(IsEqualIID(riid, &IID_IDropTarget)) else if(IsEqualIID(riid, &IID_IDropTarget))
{ {
*ppvObj = (IDropTarget*)&(This->lpvtblDropTarget); *ppvObj = &This->lpvtblDropTarget;
} }
else if(IsEqualIID(riid, &IID_IDropSource)) else if(IsEqualIID(riid, &IID_IDropSource))
{ {
*ppvObj = (IDropSource*)&(This->lpvtblDropSource); *ppvObj = &This->lpvtblDropSource;
} }
else if(IsEqualIID(riid, &IID_IViewObject)) else if(IsEqualIID(riid, &IID_IViewObject))
{ {
*ppvObj = (IViewObject*)&(This->lpvtblViewObject); *ppvObj = &This->lpvtblViewObject;
} }
if(*ppvObj) if(*ppvObj)
@ -2104,18 +2104,11 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2C
if (!RegisterClassW(&wc)) return E_FAIL; if (!RegisterClassW(&wc)) return E_FAIL;
} }
wnd = CreateWindowExW(0, wnd = CreateWindowExW(0, SV_CLASS_NAME, NULL, WS_CHILD | WS_TABSTOP,
SV_CLASS_NAME, view_params->prcView->left, view_params->prcView->top,
NULL,
WS_CHILD | WS_TABSTOP,
view_params->prcView->left,
view_params->prcView->top,
view_params->prcView->right - view_params->prcView->left, view_params->prcView->right - view_params->prcView->left,
view_params->prcView->bottom - view_params->prcView->top, view_params->prcView->bottom - view_params->prcView->top,
This->hWndParent, This->hWndParent, 0, shell32_hInstance, This);
0,
shell32_hInstance,
(LPVOID)This);
CheckToolbar(This); CheckToolbar(This);

8
dlls/shell32/shpolicy.c
View File

@ -897,15 +897,15 @@ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey)
{ {
if (SHELL_OsIsUnicode()) if (SHELL_OsIsUnicode())
{ {
if (lstrcmpiW((LPCWSTR)inpRegKey, strRegistryPolicyW) && if (lstrcmpiW(inpRegKey, strRegistryPolicyW) &&
lstrcmpiW((LPCWSTR)inpRegKey, strPolicyW)) lstrcmpiW(inpRegKey, strPolicyW))
/* doesn't match, fail */ /* doesn't match, fail */
return 0; return 0;
} }
else else
{ {
if (lstrcmpiA((LPCSTR)inpRegKey, strRegistryPolicyA) && if (lstrcmpiA(inpRegKey, strRegistryPolicyA) &&
lstrcmpiA((LPCSTR)inpRegKey, strPolicyA)) lstrcmpiA(inpRegKey, strPolicyA))
/* doesn't match, fail */ /* doesn't match, fail */
return 0; return 0;
} }

6
dlls/shell32/tests/shlexec.c
View File

@ -1212,7 +1212,7 @@ typedef struct
static DWORD CALLBACK ddeThread(LPVOID arg) static DWORD CALLBACK ddeThread(LPVOID arg)
{ {
dde_thread_info_t *info = (dde_thread_info_t *)arg; dde_thread_info_t *info = arg;
assert(info && info->filename); assert(info && info->filename);
PostThreadMessage(info->threadIdParent, PostThreadMessage(info->threadIdParent,
WM_QUIT, WM_QUIT,
@ -1266,7 +1266,7 @@ static void test_dde(void)
denyNextConnection = TRUE; denyNextConnection = TRUE;
ddeExec[0] = 0; ddeExec[0] = 0;
assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, &threadId)); assert(CreateThread(NULL, 0, ddeThread, &info, 0, &threadId));
while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg);
rc = msg.wParam > 32 ? 33 : msg.wParam; rc = msg.wParam > 32 ? 33 : msg.wParam;
if ((test->todo & 0x1)==0) if ((test->todo & 0x1)==0)
@ -1419,7 +1419,7 @@ static void test_dde_default_app(void)
* so don't wait for it */ * so don't wait for it */
SetEvent(hEvent); SetEvent(hEvent);
assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, &threadId)); assert(CreateThread(NULL, 0, ddeThread, &info, 0, &threadId));
while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg);
rc = msg.wParam > 32 ? 33 : msg.wParam; rc = msg.wParam > 32 ? 33 : msg.wParam;