SHELL32: remove an unused function
Mike McCormack
mike at codeweavers.com
Sat Mar 19 00:39:49 CST 2005
ChangeLog:
* remove an unused function
-------------- next part --------------
Index: dlls/shell32/cpanelfolder.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/cpanelfolder.c,v
retrieving revision 1.14
diff -u -p -r1.14 cpanelfolder.c
--- dlls/shell32/cpanelfolder.c 17 Mar 2005 20:53:37 -0000 1.14
+++ dlls/shell32/cpanelfolder.c 19 Mar 2005 06:39:12 -0000
@@ -904,20 +904,8 @@ static IPersistFolder2Vtbl vt_PersistFol
ICPanel_PersistFolder2_GetCurFolder
};
-HRESULT WINAPI CPanel_GetIconLocationA(LPITEMIDLIST pidl, LPSTR szIconFile, UINT cchMax, int* piIndex)
-{
- PIDLCPanelStruct* pcpanel = _ILGetCPanelPointer(pidl);
-
- if (!pcpanel)
- return E_INVALIDARG;
-
- lstrcpyA(szIconFile, pcpanel->szName);
- *piIndex = pcpanel->iconIdx!=-1? pcpanel->iconIdx: 0;
-
- return S_OK;
-}
-
-HRESULT WINAPI CPanel_GetIconLocationW(LPITEMIDLIST pidl, LPWSTR szIconFile, UINT cchMax, int* piIndex)
+HRESULT CPanel_GetIconLocationW(LPITEMIDLIST pidl,
+ LPWSTR szIconFile, UINT cchMax, int* piIndex)
{
PIDLCPanelStruct* pcpanel = _ILGetCPanelPointer(pidl);
@@ -935,7 +923,8 @@ HRESULT WINAPI CPanel_GetIconLocationW(L
* IShellExecuteHookW Implementation
*/
-static HRESULT WINAPI IShellExecuteHookW_fnQueryInterface(IShellExecuteHookW* iface, REFIID riid, void** ppvObject)
+static HRESULT WINAPI IShellExecuteHookW_fnQueryInterface(
+ IShellExecuteHookW* iface, REFIID riid, void** ppvObject)
{
_ICOM_THIS_From_IShellExecuteHookW(ICPanelImpl, iface);
@@ -1087,10 +1076,8 @@ static HRESULT WINAPI IShellExecuteHookA
static IShellExecuteHookAVtbl vt_ShellExecuteHookA =
{
-
IShellExecuteHookA_fnQueryInterface,
IShellExecuteHookA_fnAddRef,
IShellExecuteHookA_fnRelease,
-
IShellExecuteHookA_fnExecute
};
Index: dlls/shell32/shell32_main.h
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell32_main.h,v
retrieving revision 1.94
diff -u -p -r1.94 shell32_main.h
--- dlls/shell32/shell32_main.h 14 Mar 2005 10:49:03 -0000 1.94
+++ dlls/shell32/shell32_main.h 19 Mar 2005 06:39:12 -0000
@@ -93,8 +93,7 @@ HRESULT WINAPI IDropTargetHelper_Constru
HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV);
HRESULT WINAPI IControlPanel_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
HRESULT WINAPI UnixFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
-HRESULT WINAPI CPanel_GetIconLocationA(LPITEMIDLIST pidl, LPSTR szIconFile, UINT cchMax, int* piIndex);
-HRESULT WINAPI CPanel_GetIconLocationW(LPITEMIDLIST pidl, LPWSTR szIconFile, UINT cchMax, int* piIndex);
+extern HRESULT CPanel_GetIconLocationW(LPITEMIDLIST, LPWSTR, UINT, int*);
HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize);
HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize);
More information about the wine-patches
mailing list