Module: wine Branch: master Commit: 366fcaf1a7c341ee636c6d20cf076d6f3e7deece URL: http://source.winehq.org/git/wine.git/?a=commit;h=366fcaf1a7c341ee636c6d20cf...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Dec 3 12:09:17 2008 +0100
shell32: Remove some unused functions.
---
dlls/shell32/shellole.c | 21 +------------------ dlls/shell32/shellreg.c | 11 ---------- dlls/shell32/shlfsbind.c | 47 ---------------------------------------------- 3 files changed, 2 insertions(+), 77 deletions(-)
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index eae8bc3..e67556f 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -47,7 +47,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
-extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +extern INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax); /* shlwapi.24 */
/************************************************************************** * Default ClassFactory types @@ -77,23 +77,6 @@ static const struct { };
-/* FIXME: this should be SHLWAPI.24 since we can't yet import by ordinal */ - -DWORD WINAPI __SHGUIDToStringW (REFGUID guid, LPWSTR str) -{ - WCHAR sFormat[52] = {'{','%','0','8','l','x','-','%','0','4', - 'x','-','%','0','4','x','-','%','0','2', - 'x','%','0','2','x','-','%','0','2','x', - '%','0','2','x','%','0','2','x','%','0', - '2','x','%','0','2','x','%','0','2','x', - '}','\0'}; - - return wsprintfW ( str, sFormat, - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - -}
/************************************************************************* * SHCoCreateInstance [SHELL32.102] @@ -153,7 +136,7 @@ HRESULT WINAPI SHCoCreateInstance( }
/* we look up the dll path in the registry */ - __SHGUIDToStringW(myclsid, sClassID); + SHStringFromGUIDW(myclsid, sClassID, sizeof(sClassID)/sizeof(WCHAR)); lstrcpyW(sKeyName, sCLSID); lstrcatW(sKeyName, sClassID); lstrcatW(sKeyName, sInProcServer32); diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 9ed8f9a..fe87e96 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -129,17 +129,6 @@ HRESULT WINAPI SHRegQueryValueExW ( }
/************************************************************************* - * SHRegDeleteKeyA [SHELL32.?] - */ -HRESULT WINAPI SHRegDeleteKeyA( - HKEY hkey, - LPCSTR pszSubKey) -{ - FIXME("hkey=%p, %s\n", hkey, debugstr_a(pszSubKey)); - return 0; -} - -/************************************************************************* * SHRegDeleteKeyW [SHELL32.512] */ HRESULT WINAPI SHRegDeleteKeyW( diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index aa4ce97..8dbfc45 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -103,53 +103,6 @@ HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC return ret; }
-HRESULT WINAPI FileSystemBindData_GetFindData(LPBC pbc, WIN32_FIND_DATAW *pfd) -{ - LPUNKNOWN pUnk; - IFileSystemBindData *pfsbd = NULL; - HRESULT ret; - - TRACE("%p, %p\n", pbc, pfd); - - if (!pfd) - return E_INVALIDARG; - - ret = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &pUnk); - if (SUCCEEDED(ret)) - { - ret = IUnknown_QueryInterface(pUnk, &IID_IFileSystemBindData, (LPVOID *)&pfsbd); - if (SUCCEEDED(ret)) - { - ret = IFileSystemBindData_GetFindData(pfsbd, pfd); - IFileSystemBindData_Release(pfsbd); - } - IUnknown_Release(pUnk); - } - return ret; -} - -HRESULT WINAPI FileSystemBindData_SetFindData(LPBC pbc, const WIN32_FIND_DATAW *pfd) -{ - LPUNKNOWN pUnk; - IFileSystemBindData *pfsbd = NULL; - HRESULT ret; - - TRACE("%p, %p\n", pbc, pfd); - - ret = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &pUnk); - if (SUCCEEDED(ret)) - { - ret = IUnknown_QueryInterface(pUnk, &IID_IFileSystemBindData, (LPVOID *)&pfsbd); - if (SUCCEEDED(ret)) - { - ret = IFileSystemBindData_SetFindData(pfsbd, pfd); - IFileSystemBindData_Release(pfsbd); - } - IUnknown_Release(pUnk); - } - return ret; -} - static HRESULT WINAPI IFileSystemBindData_fnQueryInterface( IFileSystemBindData *iface, REFIID riid, LPVOID *ppV) {