wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Jacek Caban : mshtml: Added IHTMLImgElement::onerror implementation.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 8ac7e950a926ecc159ba7b75b658934c49409d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac7e950a926ecc159ba7b75b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:58:03 2012 +0200 mshtml: Added IHTMLImgElement::onerror implementation. --- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlimg.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0950c5e..7454549 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -164,7 +164,7 @@ static const event_info_t event_info[] = { {dragstartW, ondragstartW, EVENTT_MOUSE, DISPID_EVMETH_ONDRAGSTART, EVENT_CANCELABLE}, {errorW, onerrorW, EVENTT_NONE, DISPID_EVMETH_ONERROR, - 0}, + EVENT_NODEHANDLER}, {focusW, onfocusW, EVENTT_HTML, DISPID_EVMETH_ONFOCUS, EVENT_DEFAULTLISTENER}, {keydownW, onkeydownW, EVENTT_KEY, DISPID_EVMETH_ONKEYDOWN, @@ -195,7 +195,7 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE} }; -static const eventid_t node_handled_list[] = { EVENTID_LOAD }; +static const eventid_t node_handled_list[] = { EVENTID_ERROR, EVENTID_LOAD }; eventid_t str_to_eid(LPCWSTR str) { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index a83f73d..79a3044 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -420,15 +420,19 @@ static HRESULT WINAPI HTMLImgElement_get_onload(IHTMLImgElement *iface, VARIANT static HRESULT WINAPI HTMLImgElement_put_onerror(IHTMLImgElement *iface, VARIANT v) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->element.node, EVENTID_ERROR, &v); } static HRESULT WINAPI HTMLImgElement_get_onerror(IHTMLImgElement *iface, VARIANT *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_ERROR, p); } static HRESULT WINAPI HTMLImgElement_put_onabort(IHTMLImgElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Detach also internal listeners in detach_events.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 039a9a5aad9ddc265a848b354dd021addb7ff9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=039a9a5aad9ddc265a848b354… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:57:53 2012 +0200 mshtml: Detach also internal listeners in detach_events. --- dlls/mshtml/htmldoc.c | 2 -- dlls/mshtml/htmlevent.c | 15 ++++++++------- dlls/mshtml/nsevents.c | 45 +++++++++++++++++++++++++++++---------------- 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3cbfe8d..1d483d4 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2046,8 +2046,6 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_events(This); if(This->body_event_target) release_event_target(This->body_event_target); - if(This->nsevent_listener) - release_nsevents(This); if(This->catmgr) ICatInformation_Release(This->catmgr); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cfba560..0950c5e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1191,15 +1191,16 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve void detach_events(HTMLDocumentNode *doc) { - int i; - - if(!doc->event_vector) - return; + if(doc->event_vector) { + int i; - for(i=0; i < EVENTID_LAST; i++) { - if(doc->event_vector[i]) - detach_nsevent(doc, event_info[i].name); + for(i=0; i < EVENTID_LAST; i++) { + if(doc->event_vector[i]) + detach_nsevent(doc, event_info[i].name); + } } + + release_nsevents(doc); } diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index d4cdc10..542b8c7 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -37,6 +37,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static const PRUnichar blurW[] = {'b','l','u','r',0}; +static const PRUnichar focusW[] = {'f','o','c','u','s',0}; +static const PRUnichar keypressW[] = {'k','e','y','p','r','e','s','s',0}; +static const PRUnichar loadW[] = {'l','o','a','d',0}; + typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; nsDocumentEventListener *This; @@ -363,7 +368,7 @@ void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR typ nsIDOMEventTarget_Release(target); } -void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) +static void detach_nslistener(HTMLDocumentNode *doc, const WCHAR *type, nsEventListener *listener, cpp_bool is_capture) { nsIDOMEventTarget *target; nsAString type_str; @@ -380,22 +385,35 @@ void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) nsAString_InitDepend(&type_str, type); nsres = nsIDOMEventTarget_RemoveEventListener(target, &type_str, - &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, TRUE); + &listener->nsIDOMEventListener_iface, is_capture); nsAString_Finish(&type_str); nsIDOMEventTarget_Release(target); if(NS_FAILED(nsres)) ERR("RemoveEventTarget failed: %08x\n", nsres); } +void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) +{ + detach_nslistener(doc, type, &doc->nsevent_listener->htmlevent_listener, TRUE); +} + void release_nsevents(HTMLDocumentNode *doc) { + nsDocumentEventListener *listener = doc->nsevent_listener; + TRACE("%p %p\n", doc, doc->nsevent_listener); - if(doc->nsevent_listener) { - doc->nsevent_listener->doc = NULL; - release_listener(doc->nsevent_listener); - doc->nsevent_listener = NULL; - } + if(!listener) + return; + + detach_nslistener(doc, blurW, &listener->blur_listener, TRUE); + detach_nslistener(doc, focusW, &listener->focus_listener, TRUE); + detach_nslistener(doc, keypressW, &listener->keypress_listener, FALSE); + detach_nslistener(doc, loadW, &listener->load_listener, TRUE); + + listener->doc = NULL; + release_listener(listener); + doc->nsevent_listener = NULL; } void init_nsevents(HTMLDocumentNode *doc) @@ -404,11 +422,6 @@ void init_nsevents(HTMLDocumentNode *doc) nsIDOMEventTarget *target; nsresult nsres; - static const PRUnichar wsz_blur[] = {'b','l','u','r',0}; - static const PRUnichar wsz_focus[] = {'f','o','c','u','s',0}; - static const PRUnichar wsz_keypress[] = {'k','e','y','p','r','e','s','s',0}; - static const PRUnichar wsz_load[] = {'l','o','a','d',0}; - listener = heap_alloc(sizeof(nsDocumentEventListener)); if(!listener) return; @@ -432,10 +445,10 @@ void init_nsevents(HTMLDocumentNode *doc) return; } - init_event(target, wsz_blur, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, wsz_focus, &listener->focus_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, wsz_keypress, &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); - init_event(target, wsz_load, &listener->load_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, blurW, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, focusW, &listener->focus_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, keypressW, &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); + init_event(target, loadW, &listener->load_listener.nsIDOMEventListener_iface, TRUE); nsIDOMEventTarget_Release(target); }

1 0

Jacek Caban : mshtml: Added support for IDispatch-only ActiveX objects.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 8791ce15e9e6d327d3f0c1185aaa9aed67ce592d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8791ce15e9e6d327d3f0c1185… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:57:42 2012 +0200 mshtml: Added support for IDispatch-only ActiveX objects. --- dlls/mshtml/pluginhost.c | 47 ++++++++++++++++++++++--------------------- dlls/mshtml/tests/activex.c | 46 +++++++++++++++++++++++++++++++++-------- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 9309310..f059670 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -185,9 +185,9 @@ static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; IQuickActivate *quick_activate; + IOleObject *ole_obj = NULL; IOleCommandTarget *cmdtrg; IViewObjectEx *view_obj; - IOleObject *ole_obj; IDispatchEx *dispex; IDispatch *disp; RECT rect; @@ -223,29 +223,28 @@ static void activate_plugin(PluginHost *host) IQuickActivate_Release(quick_activate); if(FAILED(hres)) FIXME("QuickActivate failed: %08x\n", hres); - - load_plugin(host); }else { DWORD status = 0; hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); - if(FAILED(hres)) { - FIXME("Plugin does not support IOleObject\n"); - return; - } - - hres = IOleObject_GetMiscStatus(ole_obj, DVASPECT_CONTENT, &status); - TRACE("GetMiscStatus returned %08x %x\n", hres, status); + if(SUCCEEDED(hres)) { + hres = IOleObject_GetMiscStatus(ole_obj, DVASPECT_CONTENT, &status); + TRACE("GetMiscStatus returned %08x %x\n", hres, status); - hres = IOleObject_SetClientSite(ole_obj, &host->IOleClientSite_iface); - IOleObject_Release(ole_obj); - if(FAILED(hres)) { - FIXME("SetClientSite failed: %08x\n", hres); - return; + hres = IOleObject_SetClientSite(ole_obj, &host->IOleClientSite_iface); + IOleObject_Release(ole_obj); + if(FAILED(hres)) { + FIXME("SetClientSite failed: %08x\n", hres); + return; + } + }else { + TRACE("Plugin does not support IOleObject\n"); } + } - load_plugin(host); + load_plugin(host); + if(ole_obj) { hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IViewObjectEx, (void**)&view_obj); if(SUCCEEDED(hres)) { DWORD view_status = 0; @@ -288,11 +287,13 @@ static void activate_plugin(PluginHost *host) return; } - get_pos_rect(host, &rect); - hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); - IOleObject_Release(ole_obj); - if(FAILED(hres)) - WARN("DoVerb failed: %08x\n", hres); + if(ole_obj) { + get_pos_rect(host, &rect); + hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); + IOleObject_Release(ole_obj); + if(FAILED(hres)) + WARN("DoVerb failed: %08x\n", hres); + } if(host->ip_object) { HWND hwnd; @@ -390,7 +391,7 @@ HRESULT get_plugin_dispid(HTMLPluginContainer *plugin_container, WCHAR *name, DI }else if(plugin_container->props_len == plugin_container->props_size) { DISPID *new_props; - new_props = heap_realloc(plugin_container->props, plugin_container->props_size*2); + new_props = heap_realloc(plugin_container->props, plugin_container->props_size*2*sizeof(DISPID)); if(!new_props) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 0972392..feb178e 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -95,11 +95,13 @@ DEFINE_EXPECT(wrapped_func); enum { TEST_FLASH, - TEST_NOQUICKACT + TEST_NOQUICKACT, + TEST_DISPONLY }; static HWND container_hwnd, plugin_hwnd; static int plugin_behavior; +static BOOL no_quickact; #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7f6680746}" @@ -1204,24 +1206,24 @@ static void init_wrapped_iface(void) static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { - *ppv = &OleControl; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleControl; }else if(IsEqualGUID(riid, &IID_IQuickActivate)) { - *ppv = plugin_behavior == TEST_NOQUICKACT ? NULL : &QuickActivate; + *ppv = no_quickact ? NULL : &QuickActivate; }else if(IsEqualGUID(riid, &IID_IPersistPropertyBag)) { - *ppv = plugin_behavior == TEST_NOQUICKACT ? NULL : &PersistPropertyBag; + *ppv = no_quickact ? NULL : &PersistPropertyBag; }else if(IsEqualGUID(riid, &IID_IDispatch)) { *ppv = &Dispatch; }else if(IsEqualGUID(riid, &IID_IViewObject) || IsEqualGUID(riid, &IID_IViewObject2) || IsEqualGUID(riid, &IID_IViewObjectEx)) { - *ppv = &ViewObjectEx; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &ViewObjectEx; }else if(IsEqualGUID(riid, &IID_IOleObject)) { - *ppv = &OleObject; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleObject; }else if(IsEqualGUID(riid, &IID_ITestActiveX)) { CHECK_EXPECT(QI_ITestActiveX); *ppv = &wrapped_iface; }else if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) || IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { - *ppv = &OleInPlaceObjectWindowless; + *ppv = plugin_behavior == TEST_DISPONLY ? NULL : &OleInPlaceObjectWindowless; }else { trace("QI %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -2081,11 +2083,18 @@ static void release_doc(IHTMLDocument2 *doc) } } +static void init_test(int behavior) +{ + plugin_behavior = behavior; + + no_quickact = behavior == TEST_NOQUICKACT || behavior == TEST_DISPONLY; +} + static void test_flash_ax(void) { IHTMLDocument2 *doc; - plugin_behavior = TEST_FLASH; + init_test(TEST_FLASH); /* * We pump messages until both document is loaded and plugin instance is created. @@ -2147,7 +2156,7 @@ static void test_noquickact_ax(void) { IHTMLDocument2 *doc; - plugin_behavior = TEST_NOQUICKACT; + init_test(TEST_NOQUICKACT); SET_EXPECT(CreateInstance); SET_EXPECT(FreezeEvents_TRUE); @@ -2188,6 +2197,23 @@ static void test_noquickact_ax(void) CHECK_CALLED(SetClientSite_NULL); } +static void test_nooleobj_ax(void) +{ + IHTMLDocument2 *doc; + + init_test(TEST_DISPONLY); + + SET_EXPECT(CreateInstance); + SET_EXPECT(Invoke_READYSTATE); + + doc = create_doc(object_ax_str, &called_CreateInstance); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(Invoke_READYSTATE); + + release_doc(doc); +} + static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProc(hwnd, msg, wParam, lParam); @@ -2305,6 +2331,8 @@ START_TEST(activex) test_flash_ax(); trace("Testing plugin without IQuickActivate iface...\n"); test_noquickact_ax(); + trace("Testing plugin with IDispatch iface only...\n"); + test_nooleobj_ax(); init_registry(FALSE); }else { skip("Could not register ActiveX\n");

1 0

Jacek Caban : mshtml: Remove old channel from load group in nsIAsyncVerifyRedirectCallback:: AsyncOnChannelRedirect.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 5fad02d0f16ce74ddc98af5eedb09d8be52435b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fad02d0f16ce74ddc98af5ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:57:26 2012 +0200 mshtml: Remove old channel from load group in nsIAsyncVerifyRedirectCallback::AsyncOnChannelRedirect. --- dlls/mshtml/navigate.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1255121..2c6d826 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1200,17 +1200,16 @@ static nsrefcnt NSAPI nsAsyncVerifyRedirectCallback_Release(nsIAsyncVerifyRedire static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAsyncVerifyRedirectCallback *iface, nsresult result) { nsRedirectCallback *This = impl_from_nsIAsyncVerifyRedirectCallback(iface); + nsChannel *old_nschannel; + nsresult nsres; TRACE("(%p)->(%08x)\n", This, result); - if(This->bsc->nschannel) - nsIHttpChannel_Release(&This->bsc->nschannel->nsIHttpChannel_iface); + old_nschannel = This->bsc->nschannel; nsIChannel_AddRef(&This->nschannel->nsIHttpChannel_iface); This->bsc->nschannel = This->nschannel; if(This->nschannel->load_group) { - nsresult nsres; - nsres = nsILoadGroup_AddRequest(This->nschannel->load_group, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL); if(NS_FAILED(nsres)) @@ -1228,6 +1227,14 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAs } } + if(old_nschannel) { + nsres = nsILoadGroup_RemoveRequest(old_nschannel->load_group, + (nsIRequest*)&old_nschannel->nsIHttpChannel_iface, NULL, NS_OK); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + nsIHttpChannel_Release(&old_nschannel->nsIHttpChannel_iface); + } + return NS_OK; } @@ -1480,6 +1487,8 @@ static HRESULT handle_redirect(nsChannelBSC *This, const WCHAR *new_url) hres = create_redirect_nschannel(new_url, This->nschannel, &new_channel); if(SUCCEEDED(hres)) { + TRACE("%p %p->%p\n", This, This->nschannel, new_channel); + hres = create_redirect_callback(new_channel, This, &callback); nsIChannel_Release(&new_channel->nsIHttpChannel_iface); }

1 0

Morten Rønne : wininet/tests: Added more tests for urlcache, including a new flag in CacheEntryType.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: e0f93874c832f38a34b5d80a0c6f1d9da9746be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f93874c832f38a34b5d80a0… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sun Mar 25 18:45:33 2012 +0200 wininet/tests: Added more tests for urlcache, including a new flag in CacheEntryType. --- dlls/wininet/tests/urlcache.c | 80 ++++++++++++++++++++++++++++++++++------- include/wininet.h | 1 + 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index c37e791..3b4627c 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -347,6 +347,7 @@ static void test_urlcacheA(void) HANDLE hFile; BYTE zero_byte = 0; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; + LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo2; DWORD cbCacheEntryInfo; static const FILETIME filetime_zero; FILETIME now; @@ -361,7 +362,7 @@ static void test_urlcacheA(void) create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); - ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, NULL, NULL); + ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); cbCacheEntryInfo = 0; ret = GetUrlCacheEntryInfo(TEST_URL1, NULL, &cbCacheEntryInfo); @@ -381,9 +382,11 @@ static void test_urlcacheA(void) lpCacheEntryInfo->CacheEntryType); ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); - HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); - /* A subsequent commit with a different time/type doesn't change the type */ + /* Make sure there is a notable change in timestamps */ + Sleep(1000); + + /* A subsequent commit with a different time/type doesn't change most of the entry */ GetSystemTimeAsFileTime(&now); ret = CommitUrlCacheEntry(TEST_URL1, NULL, now, now, NORMAL_CACHE_ENTRY, (LPBYTE)ok_header, strlen(ok_header), NULL, NULL); @@ -393,26 +396,41 @@ static void test_urlcacheA(void) ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); - ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo, &cbCacheEntryInfo); + lpCacheEntryInfo2 = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo2, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* but it does change the time.. */ todo_wine - ok(memcmp(&lpCacheEntryInfo->ExpireTime, &filetime_zero, sizeof(FILETIME)), + ok(memcmp(&lpCacheEntryInfo2->ExpireTime, &filetime_zero, sizeof(FILETIME)), "expected positive ExpireTime\n"); todo_wine - ok(memcmp(&lpCacheEntryInfo->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), + ok(memcmp(&lpCacheEntryInfo2->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected positive LastModifiedTime\n"); - ok(lpCacheEntryInfo->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || - broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), + ok(lpCacheEntryInfo2->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || + broken(lpCacheEntryInfo2->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", - lpCacheEntryInfo->CacheEntryType); + lpCacheEntryInfo2->CacheEntryType); /* and set the headers. */ todo_wine - ok(lpCacheEntryInfo->dwHeaderInfoSize == 19, - "expected headers size 19, got %d\n", - lpCacheEntryInfo->dwHeaderInfoSize); + ok(lpCacheEntryInfo2->dwHeaderInfoSize == 19, + "expected headers size 19, got %d\n", + lpCacheEntryInfo2->dwHeaderInfoSize); + /* Hit rate gets incremented by 1 */ + todo_wine + ok((lpCacheEntryInfo->dwHitRate + 1) == lpCacheEntryInfo2->dwHitRate, + "HitRate not incremented by one on commit\n"); + /* Last access time should be updated */ + todo_wine + ok(!(lpCacheEntryInfo->LastAccessTime.dwHighDateTime == lpCacheEntryInfo2->LastAccessTime.dwHighDateTime && + lpCacheEntryInfo->LastAccessTime.dwLowDateTime == lpCacheEntryInfo2->LastAccessTime.dwLowDateTime), + "Last accessed time was not updated by commit\n"); + /* File extension should be unset */ + todo_wine + ok(lpCacheEntryInfo2->lpszFileExtension == NULL, + "Fileextension isn't unset: %s\n", + lpCacheEntryInfo2->lpszFileExtension); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo2); ret = CommitUrlCacheEntry(TEST_URL, filenameA, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); @@ -560,6 +578,18 @@ static void test_urlcacheA(void) "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); check_file_exists(filenameA); } + + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + memset(lpCacheEntryInfo, 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + todo_wine + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + todo_wine + ok(lpCacheEntryInfo->CacheEntryType & DELETED_CACHE_ENTRY, + "CacheEntryType hasn't DELETED_CACHE_ENTRY set, (flags %08x)\n", + lpCacheEntryInfo->CacheEntryType); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pUnlockUrlCacheEntryFileA) { check_file_exists(filenameA); @@ -637,6 +667,7 @@ static void test_urlcacheA(void) ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); @@ -705,7 +736,30 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); + + /* Recommit of Url entry keeps dwExemptDelta */ + U(*lpCacheEntryInfo).dwExemptDelta = 8600; + ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo, + CACHE_ENTRY_EXEMPT_DELTA_FC); + ok(ret, "SetUrlCacheEntryInfo failed: %d\n", GetLastError()); + + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA1, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + create_and_write_file(filenameA1, &zero_byte, sizeof(zero_byte)); + + ret = CommitUrlCacheEntry(TEST_URL, filenameA1, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY, + (LPBYTE)ok_header, strlen(ok_header), "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(U(*lpCacheEntryInfo).dwExemptDelta == 8600, + "expected dwExemptDelta 8600, got %d\n", + U(*lpCacheEntryInfo).dwExemptDelta); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + if (pDeleteUrlCacheEntryA) { ret = pDeleteUrlCacheEntryA(TEST_URL); diff --git a/include/wininet.h b/include/wininet.h index 6db41ca..530a693 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1496,6 +1496,7 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define EDITED_CACHE_ENTRY 0x00000008 #define COOKIE_CACHE_ENTRY 0x00100000 #define URLHISTORY_CACHE_ENTRY 0x00200000 +#define DELETED_CACHE_ENTRY 0x00400000 #define TRACK_OFFLINE_CACHE_ENTRY 0x00000010 #define TRACK_ONLINE_CACHE_ENTRY 0x00000020 #define SPARSE_CACHE_ENTRY 0x00010000

1 0

Morten Rønne : wininet/tests: Fixed text errors in tests.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: fb81502a504145ae2e6831afaea3957612606fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb81502a504145ae2e6831afa… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sat Mar 31 12:38:32 2012 +0200 wininet/tests: Fixed text errors in tests. --- dlls/wininet/tests/urlcache.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index ed42395..c37e791 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -87,7 +87,7 @@ static void test_find_url_cache_entriesA(void) if (!ret) break; } - ok(found, "committed url cache entry not found during enumeration\n"); + ok(found, "Committed url cache entry not found during enumeration\n"); ret = FindCloseUrlCache(hEnumHandle); ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); @@ -494,7 +494,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -647,7 +647,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -657,7 +657,7 @@ static void test_urlcacheA(void) "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, - "expected dwExemptDelta 864000, got %d\n", + "expected dwExemptDelta 86400, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); if (pDeleteUrlCacheEntryA) @@ -679,7 +679,7 @@ static void test_urlcacheA(void) cbCacheEntryInfo = 0; SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfo(TEST_URL, NULL, &cbCacheEntryInfo); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); @@ -689,7 +689,7 @@ static void test_urlcacheA(void) "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, - "expected dwExemptDelta 864000, got %d\n", + "expected dwExemptDelta 86400, got %d\n", U(*lpCacheEntryInfo).dwExemptDelta); U(*lpCacheEntryInfo).dwExemptDelta = 0; ret = SetUrlCacheEntryInfoA(TEST_URL, lpCacheEntryInfo,

1 0

Stefan Leichter : atl80: Add stub for AtlCreateRegistrar.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 7bffd907908a18a16b34d16245c817ec0d605d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bffd907908a18a16b34d1624… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 4 22:31:02 2012 +0200 atl80: Add stub for AtlCreateRegistrar. --- dlls/atl80/Makefile.in | 2 ++ dlls/atl80/atl80.c | 31 +++++++++++++++++++++++++++++++ dlls/atl80/atl80.spec | 2 +- 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index d144f83..c310fdb 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,3 +1,5 @@ MODULE = atl80.dll +C_SRCS = atl80.c + @MAKE_DLL_RULES@ diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c new file mode 100644 index 0000000..ab1a5ab --- /dev/null +++ b/dlls/atl80/atl80.c @@ -0,0 +1,31 @@ +/* + * Copyright 2012 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "atliface.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl80); + +HRESULT WINAPI AtlCreateRegistrar(IRegistrar** ppReg) +{ + FIXME("(%p) stub\n", ppReg); + return E_NOTIMPL; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index d2b0cff..7035991 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -48,7 +48,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stub AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AltWinModuleRegisterClassExW 63 stub AltWinModuleRegisterClassExA 64 stub AltCallTermFunc

1 0

Stefan Leichter : atl80: New dll.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 887f009df63b134b3c1eb36e17b84cf3fc33b446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887f009df63b134b3c1eb36e1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 4 22:31:02 2012 +0200 atl80: New dll. --- configure | 1 + configure.ac | 1 + dlls/atl80/Makefile.in | 3 ++ dlls/atl80/atl80.spec | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 604bd9e..c4a49ee 100755 --- a/configure +++ b/configure @@ -14898,6 +14898,7 @@ wine_fn_config_dll apphelp enable_apphelp wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test +wine_fn_config_dll atl80 enable_atl80 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 implib,po diff --git a/configure.ac b/configure.ac index 6fed66c..cfa492c 100644 --- a/configure.ac +++ b/configure.ac @@ -2404,6 +2404,7 @@ WINE_CONFIG_DLL(apphelp) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) +WINE_CONFIG_DLL(atl80) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[implib,po]) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in new file mode 100644 index 0000000..d144f83 --- /dev/null +++ b/dlls/atl80/Makefile.in @@ -0,0 +1,3 @@ +MODULE = atl80.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec new file mode 100644 index 0000000..d2b0cff --- /dev/null +++ b/dlls/atl80/atl80.spec @@ -0,0 +1,56 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl.AtlUnmarshalPtr +15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject +16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit +17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects +18 stdcall AtlModuleRegisterServer(ptr long ptr) atl.AtlModuleRegisterServer +19 stdcall AtlModuleRegisterTypeLib(ptr wstr) atl.AtlModuleRegisterTypeLib +20 stdcall AtlModuleRevokeClassObjects(ptr) atl.AtlModuleRevokeClassObjects +21 stdcall AtlModuleTerm(ptr) atl.AtlModuleTerm +22 stdcall AtlModuleUnregisterServer(ptr ptr) atl.AtlModuleUnregisterServer +23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD +24 stub AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl.AtlInternalQueryInterface +34 stub AtlGetVersion +35 stub AtlAxDialogBoxW +36 stub AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl.AtlAxAttachControl +42 stdcall AtlAxWinInit() atl.AtlAxWinInit +43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData +44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl.AtlAxGetHost +49 stub AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl.AtlIPersistStreamInit_Save +52 stub AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stub AtlGetObjectSourceInterface +55 stub AtlModuleUnRegisterTypeLib +56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib +57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stub AtlCreateRegistrar +62 stub AltWinModuleRegisterClassExW +63 stub AltWinModuleRegisterClassExA +64 stub AltCallTermFunc +65 stub AltWinModuleInit +66 stub AltWinModuleTerm

1 0

Aric Stewart : quartz: Add VMRWindowlessControl9 to VMR9.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: e4656ebc886ac7f06e7559a933a4473c95ab3910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4656ebc886ac7f06e7559a93… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:38:10 2012 -0500 quartz: Add VMRWindowlessControl9 to VMR9. --- dlls/quartz/vmr9.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 196 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b8b81c2..b92cc19 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -54,6 +54,7 @@ typedef struct IUnknown IUnknown_inner; IAMFilterMiscFlags IAMFilterMiscFlags_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; + IVMRWindowlessControl9 IVMRWindowlessControl9_iface; IVMRSurfaceAllocatorEx9 *allocator; IVMRImagePresenter9 *presenter; @@ -67,6 +68,9 @@ typedef struct DWORD_PTR cookie; + /* for Windowless Mode */ + HWND hWndClippingWindow; + RECT source_rect; RECT target_rect; LONG VideoWidth; @@ -108,6 +112,11 @@ static inline VMR9Impl *impl_from_IVMRFilterConfig9( IVMRFilterConfig9 *iface) return CONTAINING_RECORD(iface, VMR9Impl, IVMRFilterConfig9_iface); } +static inline VMR9Impl *impl_from_IVMRWindowlessControl9( IVMRWindowlessControl9 *iface) +{ + return CONTAINING_RECORD(iface, VMR9Impl, IVMRWindowlessControl9_iface); +} + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -448,6 +457,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->IAMFilterMiscFlags_iface; else if (IsEqualIID(riid, &IID_IVMRFilterConfig9)) *ppv = &This->IVMRFilterConfig9_iface; + else if (IsEqualIID(riid, &IID_IVMRWindowlessControl9) && This->mode == VMR9Mode_Windowless) + *ppv = &This->IVMRWindowlessControl9_iface; else { HRESULT hr; @@ -913,6 +924,189 @@ static const IVMRFilterConfig9Vtbl VMR9_FilterConfig_Vtbl = VMR9FilterConfig_GetRenderingMode }; +static HRESULT WINAPI VMR9WindowlessControl_QueryInterface(IVMRWindowlessControl9 *iface, REFIID riid, LPVOID * ppv) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI VMR9WindowlessControl_AddRef(IVMRWindowlessControl9 *iface) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI VMR9WindowlessControl_Release(IVMRWindowlessControl9 *iface) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI VMR9WindowlessControl_GetNativeVideoSize(IVMRWindowlessControl9 *iface, LONG *width, LONG *height, LONG *arwidth, LONG *arheight) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + TRACE("(%p/%p)->(%p, %p, %p, %p)\n", iface, This, width, height, arwidth, arheight); + + if (!width || !height || !arwidth || !arheight) + { + ERR("Got no pointer\n"); + return E_POINTER; + } + + *width = This->bmiheader.biWidth; + *height = This->bmiheader.biHeight; + *arwidth = This->bmiheader.biWidth; + *arheight = This->bmiheader.biHeight; + + return S_OK; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetMinIdealVideoSize(IVMRWindowlessControl9 *iface, LONG *width, LONG *height) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetMaxIdealVideoSize(IVMRWindowlessControl9 *iface, LONG *width, LONG *height) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessControl9 *iface, const RECT *source, const RECT *dest) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + TRACE("(%p/%p)->(%p, %p)\n", iface, This, source, dest); + + EnterCriticalSection(&This->renderer.filter.csFilter); + + if (source) + This->source_rect = *source; + if (dest) + { + This->target_rect = *dest; + if (This->baseControlWindow.baseWindow.hWnd) + { + FIXME("Output rectangle: starting at %dx%d, up to point %dx%d\n", dest->left, dest->top, dest->right, dest->bottom); + SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left, + dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); + } + } + + LeaveCriticalSection(&This->renderer.filter.csFilter); + + return S_OK; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *source, RECT *dest) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + if (source) + *source = This->source_rect; + + if (dest) + *dest = This->target_rect; + + FIXME("(%p/%p)->(%p/%p) stub\n", iface, This, source, dest); + return S_OK; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetAspectRatioMode(IVMRWindowlessControl9 *iface, DWORD *mode) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessControl9 *iface, DWORD mode) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND hwnd) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + TRACE("(%p/%p)->(%p)\n", iface, This, hwnd); + + EnterCriticalSection(&This->renderer.filter.csFilter); + This->hWndClippingWindow = hwnd; + if (!hwnd) + IVMRSurfaceAllocatorEx9_TerminateDevice(This->allocator, This->cookie); + LeaveCriticalSection(&This->renderer.filter.csFilter); + return S_OK; +} + +static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 *iface, HWND hwnd, HDC hdc) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_DisplayModeChanged(IVMRWindowlessControl9 *iface) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetCurrentImage(IVMRWindowlessControl9 *iface, BYTE **dib) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_SetBorderColor(IVMRWindowlessControl9 *iface, COLORREF color) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetBorderColor(IVMRWindowlessControl9 *iface, COLORREF *color) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static const IVMRWindowlessControl9Vtbl VMR9_WindowlessControl_Vtbl = +{ + VMR9WindowlessControl_QueryInterface, + VMR9WindowlessControl_AddRef, + VMR9WindowlessControl_Release, + VMR9WindowlessControl_GetNativeVideoSize, + VMR9WindowlessControl_GetMinIdealVideoSize, + VMR9WindowlessControl_GetMaxIdealVideoSize, + VMR9WindowlessControl_SetVideoPosition, + VMR9WindowlessControl_GetVideoPosition, + VMR9WindowlessControl_GetAspectRatioMode, + VMR9WindowlessControl_SetAspectRatioMode, + VMR9WindowlessControl_SetVideoClippingWindow, + VMR9WindowlessControl_RepaintVideo, + VMR9WindowlessControl_DisplayModeChanged, + VMR9WindowlessControl_GetCurrentImage, + VMR9WindowlessControl_SetBorderColor, + VMR9WindowlessControl_GetBorderColor +}; + HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) { HRESULT hr; @@ -933,7 +1127,9 @@ HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) pVMR9->mode = 0; pVMR9->allocator = NULL; pVMR9->presenter = NULL; + pVMR9->hWndClippingWindow = NULL; pVMR9->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + pVMR9->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; hr = BaseRenderer_Init(&pVMR9->renderer, &VMR9_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); if (FAILED(hr))

1 0

Aric Stewart : quartz: Add VMRFilterConfig9 to VMR9.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: eb4972017e5188500c8144ecac81f75eba02884f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4972017e5188500c8144eca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:38:07 2012 -0500 quartz: Add VMRFilterConfig9 to VMR9. --- dlls/quartz/vmr9.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 07e3428..b8b81c2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -53,12 +53,20 @@ typedef struct IUnknown IUnknown_inner; IAMFilterMiscFlags IAMFilterMiscFlags_iface; + IVMRFilterConfig9 IVMRFilterConfig9_iface; + IVMRSurfaceAllocatorEx9 *allocator; + IVMRImagePresenter9 *presenter; + BOOL allocator_is_ex; + + VMR9Mode mode; BITMAPINFOHEADER bmiheader; IUnknown * outer_unk; BOOL bUnkOuterValid; BOOL bAggregatable; + DWORD_PTR cookie; + RECT source_rect; RECT target_rect; LONG VideoWidth; @@ -95,6 +103,11 @@ static inline VMR9Impl *impl_from_IAMFilterMiscFlags( IAMFilterMiscFlags *iface) return CONTAINING_RECORD(iface, VMR9Impl, IAMFilterMiscFlags_iface); } +static inline VMR9Impl *impl_from_IVMRFilterConfig9( IVMRFilterConfig9 *iface) +{ + return CONTAINING_RECORD(iface, VMR9Impl, IVMRFilterConfig9_iface); +} + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -433,6 +446,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->baseControlVideo.IBasicVideo_iface; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_iface; + else if (IsEqualIID(riid, &IID_IVMRFilterConfig9)) + *ppv = &This->IVMRFilterConfig9_iface; else { HRESULT hr; @@ -494,6 +509,11 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) { TRACE("Destroying\n"); + if (This->allocator) + IVMRSurfaceAllocator9_Release(This->allocator); + if (This->presenter) + IVMRImagePresenter9_Release(This->presenter); + CoTaskMemFree(This); } return refCount; @@ -762,6 +782,137 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { AMFilterMiscFlags_GetMiscFlags }; +static HRESULT WINAPI VMR9FilterConfig_QueryInterface(IVMRFilterConfig9 *iface, REFIID riid, LPVOID * ppv) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI VMR9FilterConfig_AddRef(IVMRFilterConfig9 *iface) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI VMR9FilterConfig_Release(IVMRFilterConfig9 *iface) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI VMR9FilterConfig_SetImageCompositor(IVMRFilterConfig9 *iface, IVMRImageCompositor9 *compositor) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, compositor); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD max) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD *max) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD renderflags) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, renderflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_GetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD *renderflags) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, renderflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface, DWORD mode) +{ + HRESULT hr = S_OK; + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + TRACE("(%p/%p)->(%u)\n", iface, This, mode); + + EnterCriticalSection(&This->renderer.filter.csFilter); + if (This->mode) + { + LeaveCriticalSection(&This->renderer.filter.csFilter); + return VFW_E_WRONG_STATE; + } + + if (This->allocator) + IVMRSurfaceAllocator9_Release(This->allocator); + if (This->presenter) + IVMRImagePresenter9_Release(This->presenter); + + This->allocator = NULL; + This->presenter = NULL; + + switch (mode) + { + case VMR9Mode_Windowed: + case VMR9Mode_Windowless: + This->allocator = NULL; + This->presenter = NULL; + This->allocator_is_ex = 0; + This->cookie = ~0; + break; + case VMR9Mode_Renderless: + break; + default: + LeaveCriticalSection(&This->renderer.filter.csFilter); + return E_INVALIDARG; + } + + This->mode = mode; + LeaveCriticalSection(&This->renderer.filter.csFilter); + return hr; +} + +static HRESULT WINAPI VMR9FilterConfig_GetRenderingMode(IVMRFilterConfig9 *iface, DWORD *mode) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + TRACE("(%p/%p)->(%p) stub\n", iface, This, mode); + if (!mode) + return E_POINTER; + + if (This->mode) + *mode = This->mode; + else + *mode = VMR9Mode_Windowed; + + return S_OK; +} + +static const IVMRFilterConfig9Vtbl VMR9_FilterConfig_Vtbl = +{ + VMR9FilterConfig_QueryInterface, + VMR9FilterConfig_AddRef, + VMR9FilterConfig_Release, + VMR9FilterConfig_SetImageCompositor, + VMR9FilterConfig_SetNumberOfStreams, + VMR9FilterConfig_GetNumberOfStreams, + VMR9FilterConfig_SetRenderingPrefs, + VMR9FilterConfig_GetRenderingPrefs, + VMR9FilterConfig_SetRenderingMode, + VMR9FilterConfig_GetRenderingMode +}; + HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) { HRESULT hr; @@ -779,6 +930,11 @@ HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) pVMR9->IUnknown_inner.lpVtbl = &IInner_VTable; pVMR9->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + pVMR9->mode = 0; + pVMR9->allocator = NULL; + pVMR9->presenter = NULL; + pVMR9->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + hr = BaseRenderer_Init(&pVMR9->renderer, &VMR9_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); if (FAILED(hr)) goto fail;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012