From: Aleksey Bragin Date: Thu, 5 Aug 2010 21:28:34 +0000 (+0000) Subject: - Sync ole32 and oleaut32 regtests to Wine-1.3. X-Git-Tag: ReactOS-0.3.12~220 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=cf3a6fe7c576fd1ab76e73de5a348f25c075df80 - Sync ole32 and oleaut32 regtests to Wine-1.3. svn path=/trunk/; revision=48467 --- diff --git a/rostests/winetests/ole32/compobj.c b/rostests/winetests/ole32/compobj.c index 755d15a9f66..9d469b4b174 100644 --- a/rostests/winetests/ole32/compobj.c +++ b/rostests/winetests/ole32/compobj.c @@ -35,8 +35,6 @@ #include "wine/test.h" -extern const IID GUID_NULL; - /* functions that are not present on all versions of Windows */ HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); diff --git a/rostests/winetests/ole32/dragdrop.c b/rostests/winetests/ole32/dragdrop.c index 55a516776b3..18674dd5b09 100644 --- a/rostests/winetests/ole32/dragdrop.c +++ b/rostests/winetests/ole32/dragdrop.c @@ -31,8 +31,7 @@ #include "wine/test.h" -static int droptarget_addref_called; -static int droptarget_release_called; +static int droptarget_refs; /* helper macros to make tests a bit leaner */ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -54,14 +53,14 @@ static HRESULT WINAPI DropTarget_QueryInterface(IDropTarget* iface, REFIID riid, static ULONG WINAPI DropTarget_AddRef(IDropTarget* iface) { - droptarget_addref_called++; - return 2; + droptarget_refs++; + return droptarget_refs; } static ULONG WINAPI DropTarget_Release(IDropTarget* iface) { - droptarget_release_called++; - return 1; + droptarget_refs--; + return droptarget_refs; } static HRESULT WINAPI DropTarget_DragEnter(IDropTarget* iface, @@ -314,10 +313,10 @@ static void test_Register_Revoke(void) hr = RegisterDragDrop((HWND)0xdeadbeef, &DropTarget); ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with garbage hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); - ok(droptarget_addref_called == 0, "DropTarget_AddRef shouldn't have been called\n"); + ok(droptarget_refs == 0, "DropTarget refs should be zero not %d\n", droptarget_refs); hr = RegisterDragDrop(hwnd, &DropTarget); ok_ole_success(hr, "RegisterDragDrop"); - ok(droptarget_addref_called == 1, "DropTarget_AddRef should have been called once, not %d times\n", droptarget_addref_called); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); prop = GetPropA(hwnd, "OleDropTargetInterface"); ok(prop == &DropTarget, "expected IDropTarget pointer %p, got %p\n", &DropTarget, prop); @@ -325,15 +324,15 @@ static void test_Register_Revoke(void) hr = RegisterDragDrop(hwnd, &DropTarget); ok(hr == DRAGDROP_E_ALREADYREGISTERED, "RegisterDragDrop with already registered hwnd should return DRAGDROP_E_ALREADYREGISTERED instead of 0x%08x\n", hr); - ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); OleUninitialize(); - ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); hr = RevokeDragDrop(hwnd); ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_release_called == 1 || - broken(droptarget_release_called == 0), /* NT4 */ - "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); + ok(droptarget_refs == 0 || + broken(droptarget_refs == 1), /* NT4 */ + "DropTarget refs should be zero not %d\n", droptarget_refs); hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); diff --git a/rostests/winetests/ole32/ole2.c b/rostests/winetests/ole32/ole2.c index f796cd70249..8d23df5ef3d 100644 --- a/rostests/winetests/ole32/ole2.c +++ b/rostests/winetests/ole32/ole2.c @@ -1585,13 +1585,13 @@ static const IUnknownVtbl UnknownVtbl = Unknown_Release }; -static IUnknown Unknown2 = { &UnknownVtbl }; +static IUnknown Unknown = { &UnknownVtbl }; static void test_OleLockRunning(void) { HRESULT hr; - hr = OleLockRunning((LPUNKNOWN)&Unknown2, TRUE, FALSE); + hr = OleLockRunning((LPUNKNOWN)&Unknown, TRUE, FALSE); ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); } diff --git a/rostests/winetests/oleaut32/olepicture.c b/rostests/winetests/oleaut32/olepicture.c index ab4fb48e076..f00055ef036 100644 --- a/rostests/winetests/oleaut32/olepicture.c +++ b/rostests/winetests/oleaut32/olepicture.c @@ -216,6 +216,13 @@ test_pic_with_stream(LPSTREAM stream, unsigned int imgsize) ok(hres == S_OK,"IPicture_get_Handle does not return S_OK, but 0x%08x\n", hres); ok(handle != 0, "IPicture_get_Handle returns a NULL handle, but it should be non NULL\n"); + if (handle) + { + BITMAP bmp; + GetObject((HGDIOBJ)handle, sizeof(BITMAP), &bmp); + todo_wine ok(bmp.bmBits != 0, "not a dib\n"); + } + width = 0; hres = IPicture_get_Width (pic, &width); ok(hres == S_OK,"IPicture_get_Width does not return S_OK, but 0x%08x\n", hres); @@ -932,11 +939,11 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( NoStatStreamImpl* const This=(NoStatStreamImpl*)iface; if (ppvObject==0) return E_INVALIDARG; *ppvObject = 0; - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) + if (IsEqualIID(&IID_IUnknown, riid)) { *ppvObject = This; } - else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) + else if (IsEqualIID(&IID_IStream, riid)) { *ppvObject = This; } diff --git a/rostests/winetests/oleaut32/tmarshal.rc b/rostests/winetests/oleaut32/tmarshal.rc index ecc1f778d9a..cbb3b189599 100644 --- a/rostests/winetests/oleaut32/tmarshal.rc +++ b/rostests/winetests/oleaut32/tmarshal.rc @@ -28,10 +28,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" /* @makedep: tmarshal.tlb */ -1 TYPELIB LOADONCALL DISCARDABLE tmarshal.tlb +1 TYPELIB tmarshal.tlb /* @makedep: test_tlb.tlb */ -2 TYPELIB LOADONCALL DISCARDABLE test_tlb.tlb +2 TYPELIB test_tlb.tlb /* @makedep: test_reg.tlb */ -3 TYPELIB LOADONCALL DISCARDABLE test_reg.tlb +3 TYPELIB test_reg.tlb diff --git a/rostests/winetests/oleaut32/typelib.c b/rostests/winetests/oleaut32/typelib.c index 4eef2600a66..eb17105c38a 100644 --- a/rostests/winetests/oleaut32/typelib.c +++ b/rostests/winetests/oleaut32/typelib.c @@ -56,8 +56,19 @@ #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) +static HRESULT WINAPI (*pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); +static HRESULT WINAPI (*pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); + static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; +static void init_function_pointers(void) +{ + HMODULE hmod = GetModuleHandleA("oleaut32.dll"); + + pRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "RegisterTypeLibForUser"); + pUnRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "UnRegisterTypeLibForUser"); +} + static void ref_count_test(LPCWSTR type_lib) { ITypeLib *iface; @@ -108,6 +119,7 @@ static void test_TypeComp(void) static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; static WCHAR wszClone[] = {'C','l','o','n','e',0}; static WCHAR wszclone[] = {'c','l','o','n','e',0}; + static WCHAR wszJunk[] = {'J','u','n','k',0}; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -283,6 +295,17 @@ static void test_TypeComp(void) ITypeInfo_ReleaseFuncDesc(pTypeInfo, bindptr.lpfuncdesc); ITypeInfo_Release(pTypeInfo); + /* tests non-existent members */ + desckind = 0xdeadbeef; + bindptr.lptcomp = (ITypeComp*)0xdeadbeef; + pTypeInfo = (ITypeInfo*)0xdeadbeef; + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszJunk); + hr = ITypeComp_Bind(pTypeComp, wszJunk, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + ok(desckind == DESCKIND_NONE, "desckind should have been DESCKIND_NONE, was: %d\n", desckind); + ok(pTypeInfo == NULL, "pTypeInfo should have been NULL, was: %p\n", pTypeInfo); + ok(bindptr.lptcomp == NULL, "bindptr should have been NULL, was: %p\n", bindptr.lptcomp); + ITypeComp_Release(pTypeComp); ITypeInfo_Release(pFontTypeInfo); ITypeLib_Release(pTypeLib); @@ -477,32 +500,70 @@ static void test_TypeInfo(void) "ITypeInfo_GetIDsOfNames should have returned DISP_E_UNKNOWNNAME instead of 0x%08x\n", hr); - /* test invalid memberid */ - dispparams.cNamedArgs = 0; dispparams.cArgs = 0; dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = NULL; + + /* test dispparams not NULL */ + + /* invalid member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* invalid member id -- correct flags -- cNamedArgs not bigger than cArgs */ hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* invalid member id -- wrong flags -- cNamedArgs bigger than cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* invalid member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &pwszClone, 1, &dispidMember); ok_ole_success(hr, ITypeInfo_GetIDsOfNames); - /* test correct memberid, but wrong flags */ + /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs not bigger than cArgs + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == 0x8002000e, "ITypeInfo_Invoke should have returned 0x8002000e instead of 0x%08x\n", hr); */ + + /* correct member id -- wrong flags -- cNamedArgs bigger than cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); - /* test NULL dispparams */ + /* test NULL dispparams */ + + /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs not bigger than cArgs */ hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); - /* test dispparams->cNamedArgs being bigger than dispparams->cArgs */ + /* correct member id -- wrong flags -- cNamedArgs bigger than cArgs */ dispparams.cNamedArgs = 1; - hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "ITypeInfo_Invoke should have returned E_INVALIDARG instead of 0x%08x\n", hr); ITypeInfo_Release(pTypeInfo); + + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IDispatch, &pTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); @@ -528,11 +589,41 @@ static void test_TypeInfo(void) VariantClear(&var); } - /* test invoking a method with a [restricted] keyword */ - hr = ITypeInfo_Invoke(pTypeInfo, NULL, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - todo_wine { + /* test invoking a method with a [restricted] keyword */ + + /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs not bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + + /* correct member id -- wrong flags -- cNamedArgs bigger than cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + + /* test NULL dispparams */ + + /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ + dispparams.cNamedArgs = 0; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs not bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + + /* correct member id -- wrong flags -- cNamedArgs bigger than cArgs */ + dispparams.cNamedArgs = 1; + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, NULL, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); + /* correct member id -- correct flags -- cNamedArgs bigger than cArgs */ + hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_METHOD, NULL, NULL, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08x\n", hr); - } ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); @@ -2094,7 +2185,7 @@ static void test_create_typelibs(void) } -static void test_register_typelib(void) +static void test_register_typelib(BOOL system_registration) { HRESULT hr; WCHAR filename[MAX_PATH]; @@ -2124,13 +2215,32 @@ static void test_register_typelib(void) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE } }; + trace("Starting %s typelib registration tests\n", + system_registration ? "system" : "user"); + + if (!system_registration && (!pRegisterTypeLibForUser || !pUnRegisterTypeLibForUser)) + { + win_skip("User typelib registration functions are not available\n"); + return; + } + filenameA = create_test_typelib(3); MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); ok(SUCCEEDED(hr), "got %08x\n", hr); - hr = RegisterTypeLib(typelib, filename, NULL); + if (system_registration) + hr = RegisterTypeLib(typelib, filename, NULL); + else + hr = pRegisterTypeLibForUser(typelib, filename, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + ITypeLib_Release(typelib); + DeleteFileA(filenameA); + return; + } ok(SUCCEEDED(hr), "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); @@ -2193,7 +2303,10 @@ static void test_register_typelib(void) ITypeInfo_Release(typeinfo); } - hr = UnRegisterTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); + if (system_registration) + hr = UnRegisterTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); + else + hr = pUnRegisterTypeLibForUser(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); ok(SUCCEEDED(hr), "got %08x\n", hr); ITypeLib_Release(typelib); @@ -2204,6 +2317,8 @@ START_TEST(typelib) { const char *filename; + init_function_pointers(); + ref_count_test(wszStdOle2); test_TypeComp(); test_CreateDispTypeInfo(); @@ -2218,7 +2333,8 @@ START_TEST(typelib) DeleteFile( filename ); } - test_register_typelib(); + test_register_typelib(TRUE); + test_register_typelib(FALSE); test_create_typelibs(); }