May 2013 - Wine-Commits - list.winehq.org

Jacek Caban : msxml3: Correctly handle VT_NULL in IXMLHTTPRequest::send.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: 2dd4e497d6046252f6641b9670f06d9795be33cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd4e497d6046252f6641b967… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 10 14:21:41 2013 +0200 msxml3: Correctly handle VT_NULL in IXMLHTTPRequest::send. --- dlls/msxml3/httprequest.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 682381d..e2ede0e 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -736,26 +736,30 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * /* fall through */ case VT_EMPTY: case VT_ERROR: + case VT_NULL: ptr = NULL; size = 0; break; } - bsc->body = GlobalAlloc(GMEM_FIXED, size); - if (!bsc->body) + if (size) { - if (V_VT(body) == VT_BSTR) - heap_free(ptr); - else if (V_VT(body) == (VT_ARRAY|VT_UI1)) - SafeArrayUnaccessData(sa); + bsc->body = GlobalAlloc(GMEM_FIXED, size); + if (!bsc->body) + { + if (V_VT(body) == VT_BSTR) + heap_free(ptr); + else if (V_VT(body) == (VT_ARRAY|VT_UI1)) + SafeArrayUnaccessData(sa); - heap_free(bsc); - return E_OUTOFMEMORY; - } + heap_free(bsc); + return E_OUTOFMEMORY; + } - send_data = GlobalLock(bsc->body); - memcpy(send_data, ptr, size); - GlobalUnlock(bsc->body); + send_data = GlobalLock(bsc->body); + memcpy(send_data, ptr, size); + GlobalUnlock(bsc->body); + } if (V_VT(body) == VT_BSTR) heap_free(ptr);

1 0

Jacek Caban : ole32: Added more default handler QueryInterface tests.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: fdc4d40d18231d5297e7b34c00ac7aeaba26644f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc4d40d18231d5297e7b34c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 10 10:42:35 2013 +0200 ole32: Added more default handler QueryInterface tests. --- dlls/ole32/tests/defaulthandler.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 5da7ced..e524f97 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -54,8 +54,15 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_NOT_CALLED(func) \ + do { \ + ok(!called_ ## func, "unexpected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + DEFINE_EXPECT(CF_QueryInterface_ClassFactory); DEFINE_EXPECT(CF_CreateInstance); +DEFINE_EXPECT(CF_QueryInterface_IMarshal); static const char *debugstr_guid(REFIID riid) { @@ -178,6 +185,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r *ppv = iface; return S_OK; }else if(IsEqualGUID(riid, &IID_IMarshal)) { + CHECK_EXPECT(CF_QueryInterface_IMarshal); *ppv = NULL; return E_NOINTERFACE; }else if(IsEqualGUID(riid, &IID_IClassFactory)) { @@ -262,11 +270,15 @@ static void test_default_handler_run(void) ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); IRunnableObject_Release(ro); + SET_EXPECT(CF_QueryInterface_IMarshal); CoRevokeClassObject(class_reg); + todo_wine CHECK_CALLED(CF_QueryInterface_IMarshal); + SET_EXPECT(CF_QueryInterface_IMarshal); hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, CLSCTX_LOCAL_SERVER, 0, &class_reg); ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + todo_wine CHECK_NOT_CALLED(CF_QueryInterface_IMarshal); hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); @@ -283,7 +295,9 @@ static void test_default_handler_run(void) CHECK_CALLED(CF_CreateInstance); IRunnableObject_Release(ro); + SET_EXPECT(CF_QueryInterface_IMarshal); CoRevokeClassObject(class_reg); + todo_wine CHECK_CALLED(CF_QueryInterface_IMarshal); } START_TEST(defaulthandler)

1 0

Andrew Eikum : oleaut32: Finish COM cleanup for ITypeInfo objects.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: ab7fffaafa4dc55e667f9e051f54ecac0b27eed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7fffaafa4dc55e667f9e051… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 9 15:23:12 2013 -0500 oleaut32: Finish COM cleanup for ITypeInfo objects. --- dlls/oleaut32/typelib.c | 90 ++++++++++++++++++++++++++--------------------- 1 files changed, 50 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab7fffaafa4dc55e667f9…

1 0

Nikolay Sivov : comctl32: Handle WM_ENABLE to update disabled style bit and repaint.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: 2620e3cbe079bc4b7d974a4c32b4b0b2b527f6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2620e3cbe079bc4b7d974a4c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 10 14:57:39 2013 +0400 comctl32: Handle WM_ENABLE to update disabled style bit and repaint. --- dlls/comctl32/trackbar.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index f65297c..ee0f927 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1749,6 +1749,19 @@ TRACKBAR_KeyUp (const TRACKBAR_INFO *infoPtr, INT nVirtKey) } +static LRESULT +TRACKBAR_Enable (TRACKBAR_INFO *infoPtr, BOOL enable) +{ + if (enable) + infoPtr->dwStyle &= ~WS_DISABLED; + else + infoPtr->dwStyle |= WS_DISABLED; + + InvalidateRect(infoPtr->hwndSelf, &infoPtr->rcThumb, TRUE); + + return 1; +} + static LRESULT WINAPI TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1876,7 +1889,8 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: return TRACKBAR_Destroy (infoPtr); -/* case WM_ENABLE: */ + case WM_ENABLE: + return TRACKBAR_Enable (infoPtr, (BOOL)wParam); case WM_ERASEBKGND: return 0;

1 0

Dmitry Timoshkov : kernel32: Actually test normal ExitProcess behaviour.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: f435322dfa4d688af419c26bba03eb518cfc8ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f435322dfa4d688af419c26bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 10 19:17:37 2013 +0900 kernel32: Actually test normal ExitProcess behaviour. --- dlls/kernel32/tests/loader.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 22d83aa..ac171bd 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1169,12 +1169,12 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) break; } - if (test_dll_phase == 0 || test_dll_phase == 3) + if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3) ok(param != NULL, "dll: param %p\n", param); else ok(!param, "dll: param %p\n", param); - if (test_dll_phase == 0) expected_code = 195; + if (test_dll_phase == 0 || test_dll_phase == 1) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; else expected_code = STILL_ACTIVE; @@ -1199,9 +1199,25 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) for (i = 0; i < attached_thread_count; i++) { + /* Calling GetExitCodeThread() without waiting for thread termination + * leads to different results due to a race condition. + */ + if (expected_code != STILL_ACTIVE) + { + ret = WaitForSingleObject(attached_thread[i], 1000); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 1) todo_wine + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); + else + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); + } ret = GetExitCodeThread(attached_thread[i], &code); trace("dll: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 1) todo_wine + ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); + else ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } @@ -1212,7 +1228,13 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (expected_code == STILL_ACTIVE) ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); else + { + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 1) todo_wine ok(ret == WAIT_ABANDONED, "expected WAIT_ABANDONED, got %#x\n", ret); + else + ok(ret == WAIT_ABANDONED, "expected WAIT_ABANDONED, got %#x\n", ret); + } /* semaphore is not abandoned on thread termination */ ret = WaitForSingleObject(semaphore, 0); @@ -1228,8 +1250,16 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) else { ret = WaitForSingleObject(attached_thread[0], 0); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 1) todo_wine + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); + else ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); ret = WaitForSingleObject(attached_thread[1], 0); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 1) todo_wine + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); + else ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } @@ -1548,7 +1578,11 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(!ret, "NtSetInformationProcess error %#x\n", ret); break; - case 1: + case 1: /* normal ExitProcess */ + ret = pRtlDllShutdownInProgress(); + ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + break; + case 2: /* ExitProcess will be called by the PROCESS_DETACH handler */ ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret);

1 0

Jacek Caban : ieframe: Added more InternetExplorer object tests.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: f77aabeceb692f485bd7bd5992fa20f386e7e8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77aabeceb692f485bd7bd599… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 10 10:42:10 2013 +0200 ieframe: Added more InternetExplorer object tests. --- dlls/ieframe/tests/ie.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 167 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 00e802f..51cd8b3 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -26,8 +26,147 @@ #include "winbase.h" #include "ole2.h" #include "exdisp.h" +#include "exdispid.h" #include "mshtml.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); + +static BOOL navigate_complete; + +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + +static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI Dispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_NAVIGATECOMPLETE2: + CHECK_EXPECT(Invoke_NAVIGATECOMPLETE2); + navigate_complete = TRUE; + return S_OK; + } + + return E_NOTIMPL; +} + +static IDispatchVtbl DispatchVtbl = { + Dispatch_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + Dispatch_Invoke +}; + +static IDispatch Dispatch = { &DispatchVtbl }; + +static void advise_cp(IUnknown *unk, BOOL init) +{ + IConnectionPointContainer *container; + IConnectionPoint *point; + HRESULT hres; + + static DWORD cookie = 100; + + hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IConnectionPointContainer_FindConnectionPoint(container, &DIID_DWebBrowserEvents2, &point); + IConnectionPointContainer_Release(container); + ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + if(FAILED(hres)) + return; + + if(init) { + hres = IConnectionPoint_Advise(point, (IUnknown*)&Dispatch, &cookie); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + }else { + hres = IConnectionPoint_Unadvise(point, cookie); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + } + + IConnectionPoint_Release(point); + +} + static void test_visible(IWebBrowser2 *wb) { VARIANT_BOOL b; @@ -66,6 +205,29 @@ static void test_html_window(IWebBrowser2 *wb) IHTMLWindow2_Release(html_window); } +static void test_navigate(IWebBrowser2 *wb, const char *url) +{ + VARIANT urlv, emptyv; + MSG msg; + HRESULT hres; + + SET_EXPECT(Invoke_NAVIGATECOMPLETE2); + + V_VT(&urlv) = VT_BSTR; + V_BSTR(&urlv) = a2bstr(url); + V_VT(&emptyv) = VT_EMPTY; + hres = IWebBrowser2_Navigate2(wb, &urlv, &emptyv, &emptyv, &emptyv, &emptyv); + ok(hres == S_OK, "Navigate2 failed: %08x\n", hres); + SysFreeString(V_BSTR(&urlv)); + + while(!navigate_complete && GetMessageW(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); +} + static void test_InternetExplorer(void) { IWebBrowser2 *wb; @@ -80,11 +242,16 @@ static void test_InternetExplorer(void) if(hres != S_OK) return; + advise_cp(unk, TRUE); + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); test_visible(wb); test_html_window(wb); + test_navigate(wb, "http://test.winehq.org/tests/hello.html"); + + advise_cp(unk, FALSE); IWebBrowser2_Release(wb); ref = IUnknown_Release(unk);

1 0

Andrew Eikum : oleaut32: Finish COM cleanup for ITypeLib objects.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: b301234f3af173008d53eb2041b36cfabe49ebb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b301234f3af173008d53eb204… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 9 15:23:39 2013 -0500 oleaut32: Finish COM cleanup for ITypeLib objects. --- dlls/oleaut32/typelib.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3d0c88e..d42dd34 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1018,6 +1018,16 @@ typedef struct tagITypeLibImpl static const ITypeLib2Vtbl tlbvt; static const ITypeCompVtbl tlbtcvt; +static inline ITypeLibImpl *impl_from_ITypeLib2(ITypeLib2 *iface) +{ + return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeLib2_iface); +} + +static inline ITypeLibImpl *impl_from_ITypeLib(ITypeLib *iface) +{ + return impl_from_ITypeLib2((ITypeLib2*)iface); +} + static inline ITypeLibImpl *impl_from_ITypeComp( ITypeComp *iface ) { return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeComp_iface); @@ -2977,7 +2987,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath } if(*ppTypeLib) { - ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib; + ITypeLibImpl *impl = impl_from_ITypeLib2(*ppTypeLib); TRACE("adding to cache\n"); impl->path = heap_alloc((strlenW(pszPath)+1) * sizeof(WCHAR)); @@ -4231,11 +4241,6 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) return &pTypeLibImpl->ITypeLib2_iface; } -static inline ITypeLibImpl *impl_from_ITypeLib2(ITypeLib2 *iface) -{ - return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeLib2_iface); -} - static HRESULT WINAPI ITypeLib2_fnQueryInterface(ITypeLib2 *iface, REFIID riid, void **ppv) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); @@ -7102,7 +7107,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( SysFreeString(libnam); } if(SUCCEEDED(result)) { - ref_type->pImpTLInfo->pImpTypeLib = (ITypeLibImpl*)pTLib; + ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib); ITypeLib_AddRef(pTLib); } }

1 0

Jacek Caban : ieframe: Added stub IExternalConnection interface to InternetExplorer object.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: 778c6455705161bd54c2e54e986909c501f56d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778c6455705161bd54c2e54e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 10 10:42:20 2013 +0200 ieframe: Added stub IExternalConnection interface to InternetExplorer object. --- dlls/ieframe/ie.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ieframe/ieframe.h | 1 + 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index afbd2e9..42602f9 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -51,6 +51,9 @@ static HRESULT WINAPI InternetExplorer_QueryInterface(IWebBrowser2 *iface, REFII }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = &This->doc_host->doc_host.cps.IConnectionPointContainer_iface; + }else if(IsEqualGUID(&IID_IExternalConnection, riid)) { + TRACE("(%p)->(IID_IExternalConnection %p)\n", This, ppv); + *ppv = &This->IExternalConnection_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; @@ -705,6 +708,52 @@ static const IWebBrowser2Vtbl InternetExplorerVtbl = InternetExplorer_put_Resizable }; +static inline InternetExplorer *impl_from_IExternalConnection(IExternalConnection *iface) +{ + return CONTAINING_RECORD(iface, InternetExplorer, IExternalConnection_iface); +} + +static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + return IWebBrowser2_QueryInterface(&This->IWebBrowser2_iface, riid, ppv); +} + +static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + return IWebBrowser2_AddRef(&This->IWebBrowser2_iface); +} + +static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + return IWebBrowser2_Release(&This->IWebBrowser2_iface); +} + +static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + FIXME("(%p)\n", This); + return 2; +} + +static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, + DWORD reserved, BOOL fLastReleaseCloses) +{ + InternetExplorer *This = impl_from_IExternalConnection(iface); + FIXME("(%p)\n", This); + return 1; +} + +static const IExternalConnectionVtbl ExternalConnectionVtbl = { + ExternalConnection_QueryInterface, + ExternalConnection_AddRef, + ExternalConnection_Release, + ExternalConnection_AddConnection, + ExternalConnection_ReleaseConnection +}; + static inline InternetExplorer *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, InternetExplorer, IServiceProvider_iface); @@ -755,5 +804,6 @@ static const IServiceProviderVtbl ServiceProviderVtbl = void InternetExplorer_WebBrowser_Init(InternetExplorer *This) { This->IWebBrowser2_iface.lpVtbl = &InternetExplorerVtbl; + This->IExternalConnection_iface.lpVtbl = &ExternalConnectionVtbl; This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index bbb3e4c..709789c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -224,6 +224,7 @@ typedef struct { struct InternetExplorer { IWebBrowser2 IWebBrowser2_iface; + IExternalConnection IExternalConnection_iface; IServiceProvider IServiceProvider_iface; HlinkFrame hlink_frame;

1 0

Andrew Eikum : oleaut32: Finish COM cleanup for internal loading structures .
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: d7313b21e84028303adc9c3df1e5533383c4ec5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7313b21e84028303adc9c3df… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 9 15:23:36 2013 -0500 oleaut32: Finish COM cleanup for internal loading structures. --- dlls/oleaut32/typelib.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b20d587..3d0c88e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2476,6 +2476,11 @@ typedef struct TLB_PEFile LPVOID typelib_base; } TLB_PEFile; +static inline TLB_PEFile *pefile_impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, TLB_PEFile, IUnknown_iface); +} + static HRESULT WINAPI TLB_PEFile_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -2490,13 +2495,13 @@ static HRESULT WINAPI TLB_PEFile_QueryInterface(IUnknown *iface, REFIID riid, vo static ULONG WINAPI TLB_PEFile_AddRef(IUnknown *iface) { - TLB_PEFile *This = (TLB_PEFile *)iface; + TLB_PEFile *This = pefile_impl_from_IUnknown(iface); return InterlockedIncrement(&This->refs); } static ULONG WINAPI TLB_PEFile_Release(IUnknown *iface) { - TLB_PEFile *This = (TLB_PEFile *)iface; + TLB_PEFile *This = pefile_impl_from_IUnknown(iface); ULONG refs = InterlockedDecrement(&This->refs); if (!refs) { @@ -2571,6 +2576,11 @@ typedef struct TLB_NEFile LPVOID typelib_base; } TLB_NEFile; +static inline TLB_NEFile *nefile_impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, TLB_NEFile, IUnknown_iface); +} + static HRESULT WINAPI TLB_NEFile_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -2585,13 +2595,13 @@ static HRESULT WINAPI TLB_NEFile_QueryInterface(IUnknown *iface, REFIID riid, vo static ULONG WINAPI TLB_NEFile_AddRef(IUnknown *iface) { - TLB_NEFile *This = (TLB_NEFile *)iface; + TLB_NEFile *This = nefile_impl_from_IUnknown(iface); return InterlockedIncrement(&This->refs); } static ULONG WINAPI TLB_NEFile_Release(IUnknown *iface) { - TLB_NEFile *This = (TLB_NEFile *)iface; + TLB_NEFile *This = nefile_impl_from_IUnknown(iface); ULONG refs = InterlockedDecrement(&This->refs); if (!refs) { @@ -2788,6 +2798,11 @@ typedef struct TLB_Mapping LPVOID typelib_base; } TLB_Mapping; +static inline TLB_Mapping *mapping_impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, TLB_Mapping, IUnknown_iface); +} + static HRESULT WINAPI TLB_Mapping_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -2802,13 +2817,13 @@ static HRESULT WINAPI TLB_Mapping_QueryInterface(IUnknown *iface, REFIID riid, v static ULONG WINAPI TLB_Mapping_AddRef(IUnknown *iface) { - TLB_Mapping *This = (TLB_Mapping *)iface; + TLB_Mapping *This = mapping_impl_from_IUnknown(iface); return InterlockedIncrement(&This->refs); } static ULONG WINAPI TLB_Mapping_Release(IUnknown *iface) { - TLB_Mapping *This = (TLB_Mapping *)iface; + TLB_Mapping *This = mapping_impl_from_IUnknown(iface); ULONG refs = InterlockedDecrement(&This->refs); if (!refs) {

1 0

Christian Costa : d3dx9_36: Add tests for D3DXGetImageInfoFromFileInMemory with bmp with 1 to 8 bpp.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: 2fc4b953d84b0ba510d293cf77452e84bd114978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc4b953d84b0ba510d293cf7… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 10 17:33:23 2013 +0200 d3dx9_36: Add tests for D3DXGetImageInfoFromFileInMemory with bmp with 1 to 8 bpp. --- dlls/d3dx9_36/tests/surface.c | 68 +++++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index b46f33b..15707f7 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -45,7 +45,7 @@ static inline void _check_release(unsigned int line, IUnknown *obj, int exp) } /* 1x1 bmp (1 bpp) */ -static const unsigned char bmp01[66] = { +static const unsigned char bmp_1bpp[] = { 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, @@ -53,6 +53,33 @@ static const unsigned char bmp01[66] = { 0x00,0x00 }; +/* 1x1 bmp (2 bpp) */ +static const unsigned char bmp_2bpp[] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; + +/* 1x1 bmp (4 bpp) */ +static const unsigned char bmp_4bpp[] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x04,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; + +/* 1x1 bmp (8 bpp) */ +static const unsigned char bmp_8bpp[] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x08,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; + /* 2x2 A8R8G8B8 pixel data */ static const unsigned char pixdata[] = { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff @@ -340,7 +367,7 @@ static void test_D3DXGetImageInfo(void) hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ testdummy_ok = SUCCEEDED(hr); - hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */ + hr = create_file("testbitmap.bmp", bmp_1bpp, sizeof(bmp_1bpp)); /* valid image */ testbitmap_ok = SUCCEEDED(hr); /* D3DXGetImageInfoFromFile */ @@ -403,13 +430,13 @@ static void test_D3DXGetImageInfo(void) /* D3DXGetImageInfoFromFileInMemory */ - hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01), &info); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); - hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01)+5, &info); /* too large size */ + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp)+5, &info); /* too large size */ ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); - hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01), NULL); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXGetImageInfoFromFileInMemory(noimage, sizeof(noimage), NULL); @@ -419,17 +446,17 @@ static void test_D3DXGetImageInfo(void) ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); todo_wine { - hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01)-1, &info); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp)-1, &info); ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); } - hr = D3DXGetImageInfoFromFileInMemory(bmp01+1, sizeof(bmp01)-1, &info); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp+1, sizeof(bmp_1bpp)-1, &info); ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); - hr = D3DXGetImageInfoFromFileInMemory(bmp01, 0, &info); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, 0, &info); ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXGetImageInfoFromFileInMemory(bmp01, 0, NULL); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXGetImageInfoFromFileInMemory(noimage, 0, &info); @@ -450,6 +477,21 @@ static void test_D3DXGetImageInfo(void) hr = D3DXGetImageInfoFromFileInMemory(NULL, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + /* test BMP support */ + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + hr = D3DXGetImageInfoFromFileInMemory(bmp_2bpp, sizeof(bmp_2bpp), &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + hr = D3DXGetImageInfoFromFileInMemory(bmp_4bpp, sizeof(bmp_4bpp), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + hr = D3DXGetImageInfoFromFileInMemory(bmp_8bpp, sizeof(bmp_8bpp), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); /* test DDS support */ hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit), &info); @@ -590,7 +632,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ testdummy_ok = SUCCEEDED(hr); - hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */ + hr = create_file("testbitmap.bmp", bmp_1bpp, sizeof(bmp_1bpp)); /* valid image */ testbitmap_ok = SUCCEEDED(hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL); @@ -640,16 +682,16 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFileInMemory */ - hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp_1bpp, sizeof(bmp_1bpp), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); - hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, 0, NULL, D3DX_DEFAULT, 0, NULL); + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp_1bpp, 0, NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, bmp_1bpp, sizeof(bmp_1bpp), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, NULL, 8, NULL, D3DX_DEFAULT, 0, NULL);

1 0