shell32: Remove unneeded casts (1 of 3)
Andrew Talbot
andrew.talbot at talbotville.com
Sat Jan 19 10:54:24 CST 2008
Changelog:
shell32: Remove unneeded casts.
diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index ebe6826..4c32b3f 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -578,8 +578,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
if (hr != S_OK)
break;
- if ((LPWSTR)strstrW(strs, hwndText) == strs) {
-
+ if (strstrW(strs, hwndText) == strs) {
if (This->options & ACO_AUTOAPPEND) {
SetWindowTextW(hwnd, strs);
SendMessageW(hwnd, EM_SETSEL, lstrlenW(hwndText), lstrlenW(strs));
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 6eeab5e..45e7519 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -290,7 +290,7 @@ static HTREEITEM InsertTreeViewItem( browse_info *info, IShellFolder * lpsf,
tvins.hInsertAfter = NULL;
tvins.hParent = hParent;
- return (HTREEITEM)TreeView_InsertItemW( info->hwndTreeView, &tvins );
+ return TreeView_InsertItemW( info->hwndTreeView, &tvins );
}
/******************************************************************************
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 4cd17e9..6c1882b 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -423,7 +423,7 @@ DWORD WINAPI NTSHChangeNotifyRegister(
FIXME("(%p,0x%08x,0x%08x,0x%08x,0x%08x,%p):semi stub.\n",
hwnd,events1,events2,msg,count,idlist);
- return (DWORD) SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist);
+ return SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist);
}
/*************************************************************************
@@ -448,7 +448,7 @@ HANDLE WINAPI SHChangeNotification_Lock(
{
idlist = SHAlloc( sizeof(LPCITEMIDLIST *) * node->cidl );
for(i=0; i<node->cidl; i++)
- idlist[i] = (LPCITEMIDLIST)node->pidlSignaled;
+ idlist[i] = node->pidlSignaled;
*lpwEventId = node->wSignalledEvent;
*lppidls = (LPITEMIDLIST*)idlist;
node->wSignalledEvent = 0;
diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c
index aa09edf..fb6672d 100644
--- a/dlls/shell32/cpanelfolder.c
+++ b/dlls/shell32/cpanelfolder.c
@@ -288,7 +288,7 @@ static PIDLCPanelStruct* _ILGetCPanelPointer(LPCITEMIDLIST pidl)
LPPIDLDATA pdata = _ILGetDataPointer(pidl);
if (pdata && pdata->type==PT_CPLAPPLET)
- return (PIDLCPanelStruct*)&(pdata->u.cpanel);
+ return &pdata->u.cpanel;
return NULL;
}
@@ -436,14 +436,14 @@ static BOOL CreateCPanelEnumList(
if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
strcpy(p, wfd.cFileName);
- SHELL_RegisterCPanelApp((IEnumIDList*)iface, szPath);
+ SHELL_RegisterCPanelApp(iface, szPath);
}
} while(FindNextFileA(hFile, &wfd));
FindClose(hFile);
}
- SHELL_RegisterRegistryCPanelApps((IEnumIDList*)iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls");
- SHELL_RegisterRegistryCPanelApps((IEnumIDList*)iface, HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls");
+ SHELL_RegisterRegistryCPanelApps(iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls");
+ SHELL_RegisterRegistryCPanelApps(iface, HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls");
}
return TRUE;
}
diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c
index ea794ad..129f753 100644
--- a/dlls/shell32/dde.c
+++ b/dlls/shell32/dde.c
@@ -111,7 +111,7 @@ static HDDEDATA CALLBACK DdeCallback(
case XTYP_WILDCONNECT:
return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2);
case XTYP_REQUEST:
- return (HDDEDATA)Dde_OnRequest(uFmt, hconv, hsz1, hsz2);
+ return Dde_OnRequest(uFmt, hconv, hsz1, hsz2);
case XTYP_EXECUTE:
return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata);
case XTYP_DISCONNECT:
diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index f972cfc..6c5db44 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -103,7 +103,7 @@ void WINAPI RunFileDlg(
MessageBoxA (hwndOwner, "Couldn't find dialog.", "Nix", MB_OK) ;
return;
}
- if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes)))
+ if(!(template = LoadResource(shell32_hInstance, hRes)))
{
MessageBoxA (hwndOwner, "Couldn't load dialog.", "Nix", MB_OK) ;
return;
More information about the wine-patches
mailing list