October 2009 - Wine-commits

Jacek Caban : mshtml: Improved IHTMLElement2::doScroll stub.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: ae6fed5c4ff376d064655770ddd7ac73a4b171bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6fed5c4ff376d064655770d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 11 21:10:47 2009 +0200 mshtml: Improved IHTMLElement2::doScroll stub. --- dlls/mshtml/htmlelem2.c | 11 ++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 2 + dlls/mshtml/tests/htmldoc.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index fd7cb69..d001eaa 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -130,8 +130,15 @@ static HRESULT WINAPI HTMLElement2_componentFromPoint(IHTMLElement2 *iface, static HRESULT WINAPI HTMLElement2_doScroll(IHTMLElement2 *iface, VARIANT component) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&component)); + + if(!This->node.doc->content_ready + || !This->node.doc->basedoc.doc_obj->in_place_active) + return E_PENDING; + + WARN("stub\n"); + return S_OK; } static HRESULT WINAPI HTMLElement2_put_onscroll(IHTMLElement2 *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 18719fe..2f9e1e5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -472,6 +472,7 @@ struct HTMLDocumentNode { LONG ref; HTMLDOMNode *nodes; + BOOL content_ready; IInternetSecurityManager *secmgr; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index dd47522..023c9c4 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -466,6 +466,8 @@ static void NSAPI nsDocumentObserver_EndLoad(nsIDocumentObserver *iface, nsIDocu TRACE("\n"); + This->doc->basedoc.doc_node->content_ready = TRUE; + task = heap_alloc(sizeof(task_t)); task->doc = &This->doc->basedoc; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7a4d5ee..e02951f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -157,6 +157,7 @@ static BOOL ipsex; static BOOL set_clientsite = FALSE, container_locked = FALSE; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, show_failed; +static BOOL inplace_deactivated; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -211,6 +212,18 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +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 BOOL is_english(void) { return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH @@ -1493,6 +1506,7 @@ static HRESULT WINAPI InPlaceSite_CanInPlaceActivate(IOleInPlaceSiteEx *iface) static HRESULT WINAPI InPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) { CHECK_EXPECT(OnInPlaceActivate); + inplace_deactivated = FALSE; return S_OK; } @@ -1550,6 +1564,7 @@ static HRESULT WINAPI InPlaceSite_OnUIDeactivate(IOleInPlaceSiteEx *iface, BOOL static HRESULT WINAPI InPlaceSite_OnInPlaceDeactivate(IOleInPlaceSiteEx *iface) { CHECK_EXPECT(OnInPlaceDeactivate); + inplace_deactivated = TRUE; return S_OK; } @@ -2565,6 +2580,53 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return DefWindowProc(hwnd, msg, wParam, lParam); } +static void test_doscroll(IUnknown *unk) +{ + IHTMLDocument3 *doc; + IHTMLElement2 *elem2; + IHTMLElement *elem; + VARIANT v; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument3, (void**)&doc); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IHTMLDocument3_get_documentElement(doc, &elem); + IHTMLDocument3_Release(doc); + ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); + switch(load_state) { + case LD_DOLOAD: + case LD_NO: + ok(!elem, "elem != NULL\n"); + default: + break; + case LD_INTERACTIVE: + case LD_COMPLETE: + ok(elem != NULL, "elem == NULL\n"); + } + if(!elem) + return; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement2, (void**)&elem2); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IHTMLElement2 iface: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("left"); + hres = IHTMLElement2_doScroll(elem2, v); + SysFreeString(V_BSTR(&v)); + IHTMLElement2_Release(elem2); + + if(inplace_deactivated) + ok(hres == E_PENDING, "doScroll failed: %08x\n", hres); + else if(load_state == LD_COMPLETE) + ok(hres == S_OK, "doScroll failed: %08x\n", hres); + else + ok(hres == E_PENDING || hres == S_OK, "doScroll failed: %08x\n", hres); +} + static void _test_readyState(unsigned line, IUnknown *unk) { IHTMLDocument2 *htmldoc; @@ -2618,6 +2680,8 @@ static void _test_readyState(unsigned line, IUnknown *unk) ok_(__FILE__,line) (V_VT(&out) == VT_I4, "V_VT(out)=%d\n", V_VT(&out)); ok_(__FILE__,line) (V_I4(&out) == load_state%5, "VT_I4(out)=%d, expected %d\n", V_I4(&out), load_state%5); + test_doscroll((IUnknown*)htmldoc); + IHTMLDocument2_Release(htmldoc); } @@ -3868,6 +3932,7 @@ static void init_test(enum load_state_t ls) { stream_read = 0; protocol_read = 0; ipsex = FALSE; + inplace_deactivated = FALSE; } static void test_HTMLDocument(BOOL do_load)

1 0

Jacek Caban : mshtml: Moved QueryService call to hlink_frame_navigate.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 4aa48041fafaff23751be52edfd0f212ddd18ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa48041fafaff23751be52ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 11 21:11:03 2009 +0200 mshtml: Moved QueryService call to hlink_frame_navigate. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 43 +++++++++++++++++++++++++---------------- dlls/mshtml/nsio.c | 20 +----------------- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2f9e1e5..4a10fea 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -607,7 +607,7 @@ BOOL install_wine_gecko(BOOL); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); -void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); +HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD); void call_property_onchanged(ConnectionPoint*,DISPID); HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 267168f..7c7376d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1160,14 +1160,27 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis } } -void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, - LPCWSTR uri, nsIInputStream *post_data_stream, DWORD hlnf) +HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, + nsIInputStream *post_data_stream, DWORD hlnf) { + IHlinkFrame *hlink_frame; + IServiceProvider *sp; BSCallback *callback; IBindCtx *bindctx; IMoniker *mon; IHlink *hlink; - HRESULT hr; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(doc->doc_obj->client, &IID_IServiceProvider, + (void**)&sp); + if(FAILED(hres)) + return hres; + + hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, + (void**)&hlink_frame); + IServiceProvider_Release(sp); + if(FAILED(hres)) + return hres; callback = &create_channelbsc(NULL)->bsc; @@ -1178,21 +1191,15 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, debugstr_an(callback->post_data, callback->post_data_len)); } - hr = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); - if (FAILED(hr)) { - IBindStatusCallback_Release(STATUSCLB(callback)); - return; - } + hres = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); + if(SUCCEEDED(hres)) + hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, + &IID_IHlink, (LPVOID*)&hlink); - hr = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); - if (FAILED(hr)) { - IBindCtx_Release(bindctx); - IBindStatusCallback_Release(STATUSCLB(callback)); - return; - } + if(SUCCEEDED(hres)) + hres = CreateURLMoniker(NULL, url, &mon); - hr = CreateURLMoniker(NULL, uri, &mon); - if (SUCCEEDED(hr)) { + if(SUCCEEDED(hres)) { IHlink_SetMonikerReference(hlink, 0, mon, NULL); if(hlnf & HLNF_OPENINNEWWINDOW) { @@ -1200,11 +1207,13 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ } - IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); + hres = IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); IMoniker_Release(mon); } + IHlinkFrame_Release(hlink_frame); IBindCtx_Release(bindctx); IBindStatusCallback_Release(STATUSCLB(callback)); + return hres; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8ed0108..f10db48 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -128,7 +128,6 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) static BOOL before_async_open(nsChannel *channel, NSContainer *container) { HTMLDocumentObj *doc = container->doc; - IServiceProvider *service_provider; DWORD hlnf = 0; LPCWSTR uri; HRESULT hres; @@ -154,23 +153,8 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) if(!hlnf && !exec_shldocvw_67(doc, uri)) return FALSE; - hres = IOleClientSite_QueryInterface(doc->client, &IID_IServiceProvider, - (void**)&service_provider); - if(SUCCEEDED(hres)) { - IHlinkFrame *hlink_frame; - - hres = IServiceProvider_QueryService(service_provider, &IID_IHlinkFrame, - &IID_IHlinkFrame, (void**)&hlink_frame); - IServiceProvider_Release(service_provider); - if(SUCCEEDED(hres)) { - hlink_frame_navigate(&doc->basedoc, hlink_frame, uri, channel->post_data_stream, hlnf); - IHlinkFrame_Release(hlink_frame); - - return FALSE; - } - } - - return TRUE; + hres = hlink_frame_navigate(&doc->basedoc, uri, channel->post_data_stream, hlnf); + return hres != S_OK; } #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface)

1 0

Jacek Caban : mshtml: Added IHTMLLocation::put_href implementation.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 47c27742d046f8a5c3da94613c541a17cbedf257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c27742d046f8a5c3da94613… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 11 21:11:35 2009 +0200 mshtml: Added IHTMLLocation::put_href implementation. --- dlls/mshtml/htmllocation.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 25 +++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 45899b4..891e7b8 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -134,8 +134,15 @@ static HRESULT WINAPI HTMLLocation_Invoke(IHTMLLocation *iface, DISPID dispIdMem static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->window || !This->window->doc) { + FIXME("No document available\n"); + return E_FAIL; + } + + return navigate_url(This->window->doc, v); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4a10fea..44a816e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -608,6 +608,7 @@ BOOL install_wine_gecko(BOOL); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD); +HRESULT navigate_url(HTMLDocumentNode*,OLECHAR*); void call_property_onchanged(ConnectionPoint*,DISPID); HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 7c7376d..92d95fc 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" #define UTF16_STR "utf-16" +static WCHAR emptyW[] = {0}; + typedef struct { const nsIInputStreamVtbl *lpInputStreamVtbl; @@ -1217,3 +1219,26 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, IBindStatusCallback_Release(STATUSCLB(callback)); return hres; } + +HRESULT navigate_url(HTMLDocumentNode *doc, OLECHAR *url) +{ + OLECHAR *translated_url = NULL; + HRESULT hres; + + if(!url) + url = emptyW; + + if(doc->basedoc.doc_obj->hostui) { + hres = IDocHostUIHandler_TranslateUrl(doc->basedoc.doc_obj->hostui, 0, url, + &translated_url); + if(hres == S_OK) + url = translated_url; + } + + hres = hlink_frame_navigate(&doc->basedoc, url, NULL, 0); + if(FAILED(hres)) + FIXME("hlink_frame_navigate failed: %08x\n", hres); + + CoTaskMemFree(translated_url); + return hres; +} diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index e02951f..79d7786 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -148,6 +148,7 @@ DEFINE_EXPECT(EnableModeless_FALSE); DEFINE_EXPECT(Frame_EnableModeless_TRUE); DEFINE_EXPECT(Frame_EnableModeless_FALSE); DEFINE_EXPECT(Frame_GetWindow); +DEFINE_EXPECT(TranslateUrl); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -665,6 +666,7 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB DWORD site_data = 0xdeadbeef; hres = IHlink_GetTargetFrameName(pihlNavigate, &frame_name); + todo_wine ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); ok(frame_name == NULL, "frame_name = %p\n", frame_name); @@ -676,6 +678,7 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB hres = IHlink_GetHlinkSite(pihlNavigate, &site, &site_data); ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); ok(site == NULL, "site = %p\n, expected NULL\n", site); + todo_wine ok(site_data == 0xdeadbeef, "site_data = %x\n", site_data); } @@ -2107,8 +2110,13 @@ static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, ID static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(TranslateUrl); + ok(!dwTranslate, "dwTranslate = %x\n", dwTranslate); + ok(!strcmp_wa(pchURLIn, "about:blank"), "pchURLIn = %s\n", wine_dbgstr_w(pchURLIn)); + ok(ppchURLOut != NULL, "ppchURLOut == NULL\n"); + ok(!*ppchURLOut, "*ppchURLOut = %p\n", *ppchURLOut); + + return S_FALSE; } static HRESULT WINAPI DocHostUIHandler_FilterDataObject(IDocHostUIHandler2 *iface, IDataObject *pDO, @@ -2997,6 +3005,34 @@ static void test_Persist(IUnknown *unk, IMoniker *mon) } } +static void test_put_href(IUnknown *unk) +{ + IHTMLLocation *location; + IHTMLDocument2 *doc; + BSTR str; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); + ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + + location = NULL; + hres = IHTMLDocument2_get_location(doc, &location); + IHTMLDocument2_Release(doc); + ok(hres == S_OK, "get_location failed: %08x\n", hres); + ok(location != NULL, "location == NULL\n"); + + SET_EXPECT(TranslateUrl); + SET_EXPECT(Navigate); + str = a2bstr("about:blank"); + hres = IHTMLLocation_put_href(location, str); + SysFreeString(str); + ok(hres == S_OK, "put_href failed: %08x\n", hres); + CHECK_CALLED(TranslateUrl); + CHECK_CALLED(Navigate); + + IHTMLLocation_Release(location); +} + static const OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { 0, OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ @@ -4118,6 +4154,8 @@ static void test_HTMLDocument_http(void) test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_put_href(unk); + test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE); test_IsDirty(unk, S_FALSE);

1 0

Ken Thomases : winecoreaudio: Consolidate formatting of FOURCC values in a function.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 1b5ca01aeb8aa437951bda9b7b17f5a3ff67e59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5ca01aeb8aa437951bda9b7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:11:19 2009 -0500 winecoreaudio: Consolidate formatting of FOURCC values in a function. --- dlls/winecoreaudio.drv/audio.c | 48 ++++++++--------------------------- dlls/winecoreaudio.drv/audiounit.c | 29 +++++++++++---------- dlls/winecoreaudio.drv/coreaudio.h | 10 +++++++ dlls/winecoreaudio.drv/midi.c | 5 ++- dlls/winecoreaudio.drv/mixer.c | 35 +++++--------------------- 5 files changed, 46 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b5ca01aeb8aa437951bd…

1 0

Andrew Eikum : ole32: Use rgiidExclude in StorageImpl::CopyTo.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 7b475390e4a661a60c708097850c411cb4ae4ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b475390e4a661a60c7080978… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 9 10:53:31 2009 -0500 ole32: Use rgiidExclude in StorageImpl::CopyTo. --- dlls/ole32/storage32.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9c38a65..b9c2f29 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1462,10 +1462,8 @@ static HRESULT WINAPI StorageImpl_CopyTo( HRESULT hr; IStorage *pstgTmp, *pstgChild; IStream *pstrTmp, *pstrChild; - BOOL skip = FALSE; - - if ((ciidExclude != 0) || (rgiidExclude != NULL)) - FIXME("Exclude option not implemented\n"); + BOOL skip = FALSE, skip_storage = FALSE, skip_stream = FALSE; + int i; TRACE("(%p, %d, %p, %p, %p)\n", iface, ciidExclude, rgiidExclude, @@ -1488,6 +1486,16 @@ static HRESULT WINAPI StorageImpl_CopyTo( IStorage_Stat( iface, &curElement, STATFLAG_NONAME); IStorage_SetClass( pstgDest, &curElement.clsid ); + for(i = 0; i < ciidExclude; ++i) + { + if(IsEqualGUID(&IID_IStorage, &rgiidExclude[i])) + skip_storage = TRUE; + else if(IsEqualGUID(&IID_IStream, &rgiidExclude[i])) + skip_stream = TRUE; + else + WARN("Unknown excluded GUID: %s\n", debugstr_guid(&rgiidExclude[i])); + } + do { /* @@ -1518,6 +1526,9 @@ static HRESULT WINAPI StorageImpl_CopyTo( if (curElement.type == STGTY_STORAGE) { + if(skip_storage) + continue; + /* * open child source storage */ @@ -1571,6 +1582,9 @@ static HRESULT WINAPI StorageImpl_CopyTo( } else if (curElement.type == STGTY_STREAM) { + if(skip_stream) + continue; + /* * create a new stream in destination storage. If the stream already * exist, it will be deleted and a new one will be created.

1 0

Andrew Eikum : ole32/tests: Add tests for IStorage:: CopyTo with IID exclusions.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 7e7ed92b5d0cbec523455eec97a054c95207b8f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7ed92b5d0cbec523455eec9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 9 10:53:33 2009 -0500 ole32/tests: Add tests for IStorage::CopyTo with IID exclusions. --- dlls/ole32/tests/storage32.c | 154 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index acff5e2..cd62d72 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2081,6 +2081,158 @@ cleanup: DeleteFileW(file2_name); } +static void test_copyto_iidexclusions_storage(void) +{ + IStorage *file1 = NULL, *file2 = NULL, *stg_tmp; + IStream *strm_tmp; + WCHAR buf[64]; + HRESULT hr; + + /* create & populate file1 */ + hr = StgCreateDocfile(file1_name, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &file1); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = create_test_file(file1); + if(FAILED(hr)) + goto cleanup; + + /* create file2 */ + hr = StgCreateDocfile(file2_name, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &file2); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + /* copy file1 to file2 with iid exclusions */ + hr = IStorage_CopyTo(file1, 1, &IID_IStorage, NULL, file2); + ok(hr == S_OK, "CopyTo failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + /* verify that file1 copied over, respecting exclusions */ + hr = IStorage_OpenStorage(file2, stgA_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStorage should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStorage_Release(stg_tmp); + + hr = IStorage_OpenStream(file2, strmA_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStream should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStream_Release(strm_tmp); + + hr = IStorage_OpenStorage(file2, stgB_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStorage should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStorage_Release(stg_tmp); + + hr = IStorage_OpenStream(file2, strmB_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStream should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStream_Release(strm_tmp); + + hr = IStorage_OpenStream(file2, strmC_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == S_OK, "OpenStream failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + memset(buf, 0, sizeof(buf)); + hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); + ok(hr == S_OK, "Read failed: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + ok(lstrcmpW(buf, strmC_name) == 0, + "Expected %s to be read, got %s\n", wine_dbgstr_w(strmC_name), wine_dbgstr_w(buf)); + + IStream_Release(strm_tmp); + } + +cleanup: + if(file1) + IStorage_Release(file1); + if(file2) + IStorage_Release(file2); + + DeleteFileW(file1_name); + DeleteFileW(file2_name); +} + +static void test_copyto_iidexclusions_stream(void) +{ + IStorage *file1 = NULL, *file2 = NULL, *stg_tmp; + IStream *strm_tmp; + HRESULT hr; + + /* create & populate file1 */ + hr = StgCreateDocfile(file1_name, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &file1); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = create_test_file(file1); + if(FAILED(hr)) + goto cleanup; + + /* create file2 */ + hr = StgCreateDocfile(file2_name, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &file2); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + /* copy file1 to file2 with iid exclusions */ + hr = IStorage_CopyTo(file1, 1, &IID_IStream, NULL, file2); + ok(hr == S_OK, "CopyTo failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + /* verify that file1 copied over, respecting exclusions */ + hr = IStorage_OpenStorage(file2, stgA_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg_tmp); + ok(hr == S_OK, "OpenStorage failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + hr = IStorage_OpenStream(stg_tmp, strmA_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStream should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStream_Release(strm_tmp); + + IStorage_Release(stg_tmp); + } + + hr = IStorage_OpenStorage(file2, stgB_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg_tmp); + ok(hr == S_OK, "OpenStorage failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + hr = IStorage_OpenStream(stg_tmp, strmB_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStream should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStream_Release(strm_tmp); + + IStorage_Release(stg_tmp); + } + + hr = IStorage_OpenStream(file2, strmC_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStream should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStream_Release(strm_tmp); + +cleanup: + if(file1) + IStorage_Release(file1); + if(file2) + IStorage_Release(file2); + + DeleteFileW(file1_name); + DeleteFileW(file2_name); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2113,4 +2265,6 @@ START_TEST(storage32) test_references(); test_copyto(); test_copyto_snbexclusions(); + test_copyto_iidexclusions_storage(); + test_copyto_iidexclusions_stream(); }

1 0

Juan Lang : winegcc: Examine each argument of compile command rather than only the first.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 3e30306bb38171da0d38250dd49cda6b6f6ef562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e30306bb38171da0d38250dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 9 10:14:52 2009 -0700 winegcc: Examine each argument of compile command rather than only the first. --- tools/winegcc/winegcc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f81b7ea..b3e58e0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -320,7 +320,12 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: - gcc_defs = strendswith(comp_args->base[0], "gcc") || strendswith(comp_args->base[0], "g++"); + for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) + { + const char *cc = comp_args->base[j]; + + gcc_defs = strendswith(cc, "gcc") || strendswith(cc, "g++"); + } break; }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.31
by Jeremy Newman 12 Oct '09

12 Oct '09

Module: website Branch: master Commit: 70cf07cb57ae75b57592a5d2c2cf7910f2f1d86b URL: http://source.winehq.org/git/website.git/?a=commit;h=70cf07cb57ae75b57592a5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 9 20:53:31 2009 +0200 Polish translation for release 1.1.31 --- news/pl/2009100901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/pl/2009100901.xml b/news/pl/2009100901.xml new file mode 100644 index 0000000..e7cf3c3 --- /dev/null +++ b/news/pl/2009100901.xml @@ -0,0 +1,19 @@ +<news> +<date>Październik 9, 2009</date> +<title>Wydano Wine 1.1.31</title> +<body> + Wydanie rozwojowe Wine 1.1.31 jest już dostępne. + <a href="{$root}/announce/1.1.31">Co nowego</a> w tym wydaniu: +<ul> + <li>Vastly improved monthcal control.</li> + <li>Porawa wydajności dla sekcji DIB.</li> + <li>Kilka porawek sterowników dźwiękowych.</li> + <li>Początek wsparcia ActiveX w JScript.</li> + <li>Więcej pracy włożonej w Direct3D 10.</li> + <li>Więcej podziałów 16-bitowych bibliotek dll na osobne moduły.</li> + <li>Wsparcie dla załączników w MAPI.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.31.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexander Nicolaysen Sørnes : bugs: Fix isDuplicate() behaviour when the buglink is in the DB
by Alexander Nicolaysen Sørnes 11 Oct '09

11 Oct '09

Module: appdb Branch: master Commit: 496b46031236e40c8dacec4ec092ae02cb9c8a26 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=496b46031236e40c8dacec4e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 11 20:15:57 2009 +0200 bugs: Fix isDuplicate() behaviour when the buglink is in the DB --- include/bugs.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 4318c46..0a6d099 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -205,8 +205,8 @@ class Bug $sQuery = "SELECT COUNT(linkId) as count FROM buglinks WHERE versionId = '?' - AND bug_id = '?'"; - if($hResult = query_parameters($sQuery, $this->iVersionId, $this->iBug_id)) + AND bug_id = '?' AND linkId != '?'"; + if($hResult = query_parameters($sQuery, $this->iVersionId, $this->iBug_id, $this->iLinkId)) { if(($oRow = query_fetch_object($hResult))) {

1 0

Alexandre Julliard : Wine release 1.1.31
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: website Branch: master Commit: a11f4c9e497adfbc9440fd6f28f1f90603620391 URL: http://source.winehq.org/git/website.git/?a=commit;h=a11f4c9e497adfbc9440fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 18:13:09 2009 +0200 Wine release 1.1.31 --- news/en/2009100901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/en/2009100901.xml b/news/en/2009100901.xml new file mode 100644 index 0000000..2c49a61 --- /dev/null +++ b/news/en/2009100901.xml @@ -0,0 +1,19 @@ +<news> +<date>October 9, 2009</date> +<title>Wine 1.1.31 Released</title> +<body> + The Wine development release 1.1.31 is now available. + <a href="{$root}/announce/1.1.31">What's new</a> in this release: +<ul> + <li>Vastly improved monthcal control.</li> + <li>Performance improvements for DIB sections.</li> + <li>Several sound driver fixes.</li> + <li>Beginning of ActiveX support in JScript.</li> + <li>More Direct3D 10 work.</li> + <li>More 16-bit dlls split off to separate modules.</li> + <li>Support for attachments in MAPI.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.31.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0