Module: wine Branch: master Commit: d159b332288000140c807bab4aad423150b90bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d159b332288000140c807bab4a...
Author: Jacek Caban jacek@codeweavers.com Date: Sat Jan 6 17:05:58 2007 +0100
shlwapi: Forward CLSIDFromProgIDWrap to ole32 (with test).
---
dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/tests/Makefile.in | 1 + dlls/shlwapi/tests/clsid.c | 26 +++++++++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 369e242..1a0be45 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -432,7 +432,7 @@ 432 stub -noname SHSendMessageBroadcastA 433 stub -noname SHSendMessageBroadcastW 434 stdcall @(long long long long long long ptr) user32.SendMessageTimeoutW -435 stub -noname CLSIDFromProgIDWrap +435 stdcall -noname CLSIDFromProgIDWrap(wstr ptr) ole32.CLSIDFromProgID 436 stdcall -noname CLSIDFromStringWrap(wstr ptr) 437 stdcall -noname IsOS(long) 438 stub -noname SHLoadRegUIStringA diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 59b0e72..8d48932 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shlwapi.dll IMPORTS = shlwapi advapi32 ole32 oleaut32 kernel32 +EXTRALIBS = -luuid
CTESTS = \ clist.c \ diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index b4457ef..66712a5 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -19,7 +19,6 @@
#include <stdio.h>
-#define INITGUID #include "wine/test.h" #include "winbase.h" #include "winerror.h" @@ -27,6 +26,10 @@ #include "winuser.h" #include "shlguid.h" #include "shobjidl.h" +#include "olectl.h" + +#define INITGUID +#include "initguid.h"
/* Function ptrs for ordinal calls */ static HMODULE hShlwapi = 0; @@ -153,6 +156,26 @@ static void test_ClassIDs(void) ok(szBuff[0] == '{', "Didn't write to buffer with ok length\n"); }
+static void test_CLSIDFromProgIDWrap(void) +{ + HRESULT (WINAPI *pCLSIDFromProgIDWrap)(LPCOLESTR,LPCLSID); + CLSID clsid = IID_NULL; + HRESULT hres; + + static const WCHAR wszStdPicture[] = {'S','t','d','P','i','c','t','u','r','e',0}; + + pCLSIDFromProgIDWrap = (void*)GetProcAddress(hShlwapi,(char*)435); + + hres = pCLSIDFromProgIDWrap(wszStdPicture, &clsid); + ok(hres == S_OK, "CLSIDFromProgIDWrap failed: %08x\n", hres); + ok(IsEqualGUID(&CLSID_StdPicture, &clsid), "wrong clsid\n"); + + hres = pCLSIDFromProgIDWrap(NULL, &clsid); + ok(hres == E_INVALIDARG, "CLSIDFromProgIDWrap failed: %08x, expected E_INVALIDARG\n", hres); + + hres = pCLSIDFromProgIDWrap(wszStdPicture, NULL); + ok(hres == E_INVALIDARG, "CLSIDFromProgIDWrap failed: %08x, expected E_INVALIDARG\n", hres); +}
START_TEST(clsid) { @@ -165,6 +188,7 @@ START_TEST(clsid) }
test_ClassIDs(); + test_CLSIDFromProgIDWrap();
if (hShlwapi) FreeLibrary(hShlwapi);