January 2012 - Wine-commits

Hans Leidekker : msi: Pass the file identifier instead of the filename in action data for SelfRegModules /SelfUnregModules.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 09a49fd784ca1a3c366ed326a6a46595b5e22fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a49fd784ca1a3c366ed326a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 20 14:26:16 2012 +0100 msi: Pass the file identifier instead of the filename in action data for SelfRegModules/SelfUnregModules. --- dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2347902..16ac4f0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4456,7 +4456,7 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) MSIFILE *file; MSIRECORD *uirow; - filename = MSI_RecordGetString(row,1); + filename = MSI_RecordGetString( row, 1 ); file = msi_get_loaded_file( package, filename ); if (!file) { @@ -4474,7 +4474,7 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) register_dll( file->TargetPath, FALSE ); uirow = MSI_CreateRecord( 2 ); - MSI_RecordSetStringW( uirow, 1, filename ); + MSI_RecordSetStringW( uirow, 1, file->File ); MSI_RecordSetStringW( uirow, 2, file->Component->Directory ); msi_ui_actiondata( package, szSelfRegModules, uirow ); msiobj_release( &uirow->hdr ); @@ -4524,7 +4524,7 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) register_dll( file->TargetPath, TRUE ); uirow = MSI_CreateRecord( 2 ); - MSI_RecordSetStringW( uirow, 1, filename ); + MSI_RecordSetStringW( uirow, 1, file->File ); MSI_RecordSetStringW( uirow, 2, file->Component->Directory ); msi_ui_actiondata( package, szSelfUnregModules, uirow ); msiobj_release( &uirow->hdr );

1 0

Piotr Caban : urlmon: Store display_uri in BindProtocol structure.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 6bc361f2fc132f3d818dd054b467122145d03394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc361f2fc132f3d818dd054b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 20 14:52:16 2012 +0100 urlmon: Store display_uri in BindProtocol structure. --- dlls/urlmon/bindprot.c | 8 +++----- dlls/urlmon/urlmon_main.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 7c2aca6..aef74fc 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -342,6 +342,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) IInternetProtocol_Release(&This->filter_proxy->IInternetProtocol_iface); if(This->uri) IUri_Release(This->uri); + SysFreeString(This->display_uri); set_binding_sink(This, NULL, NULL); @@ -546,15 +547,12 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr &This->IInternetBindInfo_iface, 0, NULL); IInternetProtocolEx_Release(protocolex); }else { - BSTR display_uri; - - hres = IUri_GetDisplayUri(pUri, &display_uri); + hres = IUri_GetDisplayUri(pUri, &This->display_uri); if(FAILED(hres)) return hres; - hres = IInternetProtocol_Start(protocol, display_uri, &This->IInternetProtocolSink_iface, + hres = IInternetProtocol_Start(protocol, This->display_uri, &This->IInternetProtocolSink_iface, &This->IInternetBindInfo_iface, 0, 0); - SysFreeString(display_uri); } return hres; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index a185f10..28723e1 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -211,6 +211,7 @@ typedef struct { DWORD buf_size; LPWSTR mime; IUri *uri; + BSTR display_uri; ProtocolProxy *filter_proxy; } BindProtocol;

1 0

Piotr Caban : urlmon: Added support for PI_FORCE_ASYNC flag in IInternetProtocol:: Switch implementation.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 1559fceeeaf590e37279beed882444f09df3d2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1559fceeeaf590e37279beed8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 20 14:52:34 2012 +0100 urlmon: Added support for PI_FORCE_ASYNC flag in IInternetProtocol::Switch implementation. --- dlls/urlmon/bindprot.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index aef74fc..0941e25 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -939,7 +939,8 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface return E_OUTOFMEMORY; memcpy(data, pProtocolData, sizeof(PROTOCOLDATA)); - if(!do_direct_notif(This)) { + if((This->pi&PI_APARTMENTTHREADED && pProtocolData->grfFlags&PI_FORCE_ASYNC) + || !do_direct_notif(This)) { switch_task_t *task; task = heap_alloc(sizeof(switch_task_t));

1 0

Piotr Caban : urlmon: Added IInternetProtocol:: Switch PI_FORCE_ASYNC flag test.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 601ba02b265c01ca3040f27c5b60592bf76afdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601ba02b265c01ca3040f27c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 20 14:52:50 2012 +0100 urlmon: Added IInternetProtocol::Switch PI_FORCE_ASYNC flag test. --- dlls/urlmon/tests/url.c | 64 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index fe98089..787c119 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -206,6 +206,7 @@ static BOOL only_check_prot_args = FALSE; static BOOL invalid_cn_accepted = FALSE; static BOOL abort_start = FALSE; static BOOL abort_progress = FALSE; +static BOOL async_switch = FALSE; static LPCWSTR urls[] = { winetest_data_urlW, @@ -803,9 +804,22 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink_AddRef(pOIProtSink); protocol_sink = pOIProtSink; - CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); - return S_OK; + if(async_switch) { + PROTOCOLDATA data; + + memset(&data, 0, sizeof(data)); + data.grfFlags = PI_FORCE_ASYNC; + prot_state = 0; + hres = IInternetProtocolSink_Switch(pOIProtSink, &data); + ok(hres == S_OK, "Switch failed: %08x\n", hres); + SET_EXPECT(Continue); + SetEvent(complete_event2); + return E_PENDING; + } else { + CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); + return S_OK; + } } if(test_protocol == FILE_TEST) { @@ -936,6 +950,18 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, return S_OK; switch(prot_state) { + case 0: + hres = IInternetProtocolSink_ReportProgress(protocol_sink, + BINDSTATUS_SENDINGREQUEST, NULL); + ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); + + hres = IInternetProtocolSink_ReportProgress(protocol_sink, + BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); + ok(hres == S_OK, + "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + + bscf |= BSCF_FIRSTDATANOTIFICATION|BSCF_INTERMEDIATEDATANOTIFICATION; + break; case 1: { IServiceProvider *service_provider; IHttpNegotiate *http_negotiate; @@ -990,6 +1016,15 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, if(prot_state != 2 || !test_abort) SET_EXPECT(Read); switch(prot_state) { + case 0: + hres = IInternetProtocolSink_ReportResult(protocol_sink, S_OK, 0, NULL); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + SET_EXPECT(OnProgress_SENDINGREQUEST); + SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); + SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); + SET_EXPECT(LockRequest); + SET_EXPECT(OnStopBinding); + break; case 1: if(bind_to_object) { SET_EXPECT(Obj_OnProgress_MIMETYPEAVAILABLE); @@ -1083,6 +1118,17 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ok(cb != 0, "cb == 0\n"); ok(pcbRead != NULL, "pcbRead == NULL\n"); + if(async_switch) { + if(prot_state++ > 1) { + *pcbRead = 0; + return S_FALSE; + } else { + memset(pv, '?', cb); + *pcbRead = cb; + return S_OK; + } + } + if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { HRESULT hres; @@ -2687,6 +2733,7 @@ static BOOL test_RegisterBindStatusCallback(void) #define BINDTEST_INVALID_CN 0x0200 #define BINDTEST_ABORT_START 0x0400 #define BINDTEST_ABORT_PROGRESS 0x0800 +#define BINDTEST_ASYNC_SWITCH 0x1000 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2716,7 +2763,10 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) test_abort = (flags & BINDTEST_ABORT) != 0; abort_start = (flags & BINDTEST_ABORT_START) != 0; abort_progress = (flags & BINDTEST_ABORT_PROGRESS) != 0; + async_switch = (flags & BINDTEST_ASYNC_SWITCH) != 0; is_async_prot = protocol == HTTP_TEST || protocol == HTTPS_TEST || protocol == FTP_TEST || protocol == WINETEST_TEST; + prot_state = 0; + ResetEvent(complete_event); } static void test_BindToStorage(int protocol, DWORD flags, DWORD t) @@ -2907,6 +2957,13 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) } } + if(async_switch) { + CHECK_CALLED(OnProgress_SENDINGREQUEST); + CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); + CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); + CHECK_CALLED(LockRequest); + CHECK_CALLED(OnStopBinding); + } if(!no_callback) { CLEAR_CALLED(QueryInterface_IBindStatusCallbackEx); /* IE 8 */ CHECK_CALLED(GetBindInfo); @@ -3750,6 +3807,9 @@ START_TEST(url) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + trace("winetest test (async switch)...\n"); + test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_ASYNC_SWITCH, TYMED_ISTREAM); + trace("about test (no read)...\n"); test_BindToStorage(ABOUT_TEST, BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM);

1 0

Piotr Caban : urlmon/tests: Test if url reported in IInternetProtocol:: Start is valid during binding.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 259cd7933612abdef0f88f446589ec489176ce7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=259cd7933612abdef0f88f446… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 20 14:53:02 2012 +0100 urlmon/tests: Test if url reported in IInternetProtocol::Start is valid during binding. --- dlls/urlmon/tests/url.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 787c119..b9291ac 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -192,6 +192,7 @@ static const WCHAR emptyW[] = {0}; static BOOL stopped_binding = FALSE, stopped_obj_binding = FALSE, emulate_protocol = FALSE, data_available = FALSE, http_is_first = TRUE, bind_to_object = FALSE, filedwl_api; static DWORD read = 0, bindf = 0, prot_state = 0, thread_id, tymed, security_problem; +static const WCHAR *reported_url; static CHAR mime_type[512]; static IInternetProtocolSink *protocol_sink = NULL; static IBinding *current_binding; @@ -620,6 +621,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, read = 0; + reported_url = szUrl; if(!filedwl_api) /* FIXME */ ok(szUrl && !lstrcmpW(szUrl, urls[test_protocol]), "wrong url %s\n", wine_dbgstr_w(szUrl)); ok(pOIProtSink != NULL, "pOIProtSink == NULL\n"); @@ -944,6 +946,7 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, CHECK_EXPECT(Continue); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); + ok(reported_url && !lstrcmpW(reported_url, urls[test_protocol]), "wrong url %s\n", wine_dbgstr_w(reported_url)); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); if(!pProtocolData)

1 0

Nikolay Sivov : msxml3: Use debugstr_* functions instead of wine_* prefixed for consistency.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: ae5c984b12f8810c866c08084d9f0b66326c31d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5c984b12f8810c866c08084… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 20 04:00:47 2012 +0300 msxml3: Use debugstr_* functions instead of wine_* prefixed for consistency. --- dlls/msxml3/domdoc.c | 10 +++++----- dlls/msxml3/schema.c | 10 +++++----- dlls/msxml3/selection.c | 2 +- dlls/msxml3/stylesheet.c | 8 ++++---- dlls/msxml3/xslpattern.l | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8943507..72f9a31 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2828,7 +2828,7 @@ static HRESULT WINAPI domdoc_setProperty( { hr = E_FAIL; WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", - wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); + debugstr_w(bstr), debugstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); continue; } @@ -2849,7 +2849,7 @@ static HRESULT WINAPI domdoc_setProperty( { hr = E_FAIL; WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", - wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); + debugstr_w(bstr), debugstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); continue; } @@ -2876,7 +2876,7 @@ static HRESULT WINAPI domdoc_setProperty( else { WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", - wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokInner, pTokEnd-pTokInner)); + debugstr_w(bstr), debugstr_an((const char*)pTokInner, pTokEnd-pTokInner)); list_add_tail(pNsList, &ns_entry->entry); ns_entry = NULL; @@ -2906,7 +2906,7 @@ static HRESULT WINAPI domdoc_setProperty( return S_OK; } - FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + FIXME("Unknown property %s\n", debugstr_w(p)); return E_FAIL; } @@ -2966,7 +2966,7 @@ static HRESULT WINAPI domdoc_getProperty( return S_OK; } - FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + FIXME("Unknown property %s\n", debugstr_w(p)); return E_FAIL; } diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2312f6d..2c97639 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -589,7 +589,7 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) xmlNsPtr ns; HRESULT hr; - TRACE("(dt:%s, %s)\n", debugstr_dt(dt), wine_dbgstr_a((char const*)content)); + TRACE("(dt:%s, %s)\n", debugstr_dt(dt), debugstr_a((char const*)content)); if (!datatypes_schema) { @@ -688,7 +688,7 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, { xmlParserInputPtr input; - TRACE("(%s %s %p)\n", wine_dbgstr_a(URL), wine_dbgstr_a(ID), ctxt); + TRACE("(%s %s %p)\n", debugstr_a(URL), debugstr_a(ID), ctxt); assert(MSXML_hInstance != NULL); assert(datatypes_rsrc != NULL); @@ -922,7 +922,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr); if (b != VARIANT_TRUE) { - FIXME("Failed to load doc at %s\n", wine_dbgstr_w(V_BSTR(&url))); + FIXME("Failed to load doc at %s\n", debugstr_w(V_BSTR(&url))); IXMLDOMDocument3_Release(domdoc); return NULL; } @@ -1142,7 +1142,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri cache_entry* entry; xmlChar* name; - TRACE("(%p)->(%s %p)\n", This, wine_dbgstr_w(uri), node); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(uri), node); if (This->version == MSXML6) return E_NOTIMPL; @@ -1165,7 +1165,7 @@ static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); - TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(uri)); + TRACE("(%p)->(%s)\n", This, debugstr_w(uri)); xmlHashRemoveEntry(This->cache, name, cache_free); heap_free(name); diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 8871817..ba173f9 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -749,7 +749,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); HRESULT hr; - TRACE("(%p, %s, %p)\n", node, wine_dbgstr_a((char const*)query), out); + TRACE("(%p, %s, %p)\n", node, debugstr_a((char const*)query), out); *out = NULL; if (!This || !ctxt || !query) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 5ee71af..9106b40 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -418,7 +418,7 @@ static HRESULT WINAPI xslprocessor_setStartMode( { xslprocessor *This = impl_from_IXSLProcessor( iface ); - FIXME("(%p)->(%s %s): stub\n", This, wine_dbgstr_w(p), wine_dbgstr_w(uri)); + FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(p), debugstr_w(uri)); return E_NOTIMPL; } @@ -557,8 +557,8 @@ static HRESULT WINAPI xslprocessor_addParameter( { xslprocessor *This = impl_from_IXSLProcessor( iface ); - FIXME("(%p)->(%s %s %s): stub\n", This, wine_dbgstr_w(p), debugstr_variant(&var), - wine_dbgstr_w(uri)); + FIXME("(%p)->(%s %s %s): stub\n", This, debugstr_w(p), debugstr_variant(&var), + debugstr_w(uri)); return E_NOTIMPL; } @@ -569,7 +569,7 @@ static HRESULT WINAPI xslprocessor_addObject( { xslprocessor *This = impl_from_IXSLProcessor( iface ); - FIXME("(%p)->(%p %s): stub\n", This, obj, wine_dbgstr_w(uri)); + FIXME("(%p)->(%p %s): stub\n", This, obj, debugstr_w(uri)); return E_NOTIMPL; } diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index caea1be..eb84e40 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -155,7 +155,7 @@ ANY (.) xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p; - TRACE("(%s)\n", wine_dbgstr_a((char const*)xslpat_str)); + TRACE("(%s)\n", debugstr_a((char const*)xslpat_str)); memset(&p, 0, sizeof(parser_param)); p.ctx = ctxt; p.in = xslpat_str; @@ -166,7 +166,7 @@ xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) xslpattern_parse(&p, p.yyscanner); - TRACE("=> %s\n", wine_dbgstr_a((char const*)p.out)); + TRACE("=> %s\n", debugstr_a((char const*)p.out)); xslpattern_lex_destroy(p.yyscanner); if (p.err)

1 0

Nikolay Sivov : msxml3: Move some xdr tests data to a table.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 7c319885547f700da7dbe098efaacbbdaf9e65e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c319885547f700da7dbe098e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 20 04:01:36 2012 +0300 msxml3: Move some xdr tests data to a table. --- dlls/msxml3/tests/schema.c | 972 +++++++++----------------------------------- 1 files changed, 193 insertions(+), 779 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c319885547f700da7dbe…

1 0

Hans Leidekker : winhttp: Download PAC scripts in a separate session.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: f37b94e69a92ae1f5c984f51f7df6110831ab083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37b94e69a92ae1f5c984f51f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 20 09:04:51 2012 +0100 winhttp: Download PAC scripts in a separate session. --- dlls/winhttp/session.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b4ed568..2d899ab 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1905,11 +1905,11 @@ done: return ret; } -static BSTR download_script( HINTERNET ses, const WCHAR *url ) +static BSTR download_script( const WCHAR *url ) { static const WCHAR typeW[] = {'*','/','*',0}; static const WCHAR *acceptW[] = {typeW, NULL}; - HINTERNET con, req = NULL; + HINTERNET ses, con = NULL, req = NULL; WCHAR *hostname; URL_COMPONENTSW uc; DWORD size = 4096, offset, to_read, bytes_read, flags = 0; @@ -1924,6 +1924,7 @@ static BSTR download_script( HINTERNET ses, const WCHAR *url ) memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); hostname[uc.dwHostNameLength] = 0; + if (!(ses = WinHttpOpen( NULL, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ))) goto done; if (!(con = WinHttpConnect( ses, hostname, uc.nPort, 0 ))) goto done; if (uc.nScheme == INTERNET_SCHEME_HTTPS) flags |= WINHTTP_FLAG_SECURE; if (!(req = WinHttpOpenRequest( con, NULL, uc.lpszUrlPath, NULL, NULL, acceptW, flags ))) goto done; @@ -1955,6 +1956,7 @@ static BSTR download_script( HINTERNET ses, const WCHAR *url ) done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); heap_free( buffer ); heap_free( hostname ); if (!script) set_last_error( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); @@ -2005,7 +2007,7 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO if (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL) pac_url = options->lpszAutoConfigUrl; else pac_url = detected_pac_url; - if (!(script = download_script( hsession, pac_url ))) goto done; + if (!(script = download_script( pac_url ))) goto done; ret = run_script( script, url, info ); SysFreeString( script );

1 0

Frédéric Delanoy : rpcrt4: Make some switch fallthroughs explicit (Coverity).
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: ca75c4a84b220d5e83c42110c7b492095db8b27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca75c4a84b220d5e83c42110c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 20 09:54:24 2012 +0100 rpcrt4: Make some switch fallthroughs explicit (Coverity). --- dlls/rpcrt4/ndr_marshall.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f0482e6..ca73aea 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1179,7 +1179,8 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, while (pFormat[0] != RPC_FC_END) { switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; @@ -1259,7 +1260,8 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("pFormat[0] = 0x%x\n", pFormat[0]); switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; @@ -1333,7 +1335,8 @@ static void EmbeddedPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, while (pFormat[0] != RPC_FC_END) { switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; @@ -1405,7 +1408,8 @@ static ULONG EmbeddedPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, while (pFormat[0] != RPC_FC_END) { switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; @@ -1463,7 +1467,8 @@ static void EmbeddedPointerFree(PMIDL_STUB_MESSAGE pStubMsg, while (pFormat[0] != RPC_FC_END) { switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0;

1 0

Michael Stefaniuc : dsound: Merge IDirectSoundNotify into the secondary buffer object.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: c7f5f10aab5a66a5bde93d31263afa095183c3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f5f10aab5a66a5bde93d312… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 20 00:28:16 2012 +0100 dsound: Merge IDirectSoundNotify into the secondary buffer object. --- dlls/dsound/buffer.c | 138 +++++++++++++----------------------------- dlls/dsound/dsound_private.h | 9 +-- 2 files changed, 46 insertions(+), 101 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 0d03686..18af3f9 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -40,59 +40,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); * IDirectSoundNotify */ -struct IDirectSoundNotifyImpl +static inline struct IDirectSoundBufferImpl *impl_from_IDirectSoundNotify(IDirectSoundNotify *iface) { - /* IUnknown fields */ - const IDirectSoundNotifyVtbl *lpVtbl; - LONG ref; - IDirectSoundBufferImpl* dsb; -}; + return CONTAINING_RECORD(iface, struct IDirectSoundBufferImpl, IDirectSoundNotify_iface); +} -static HRESULT IDirectSoundNotifyImpl_Create(IDirectSoundBufferImpl *dsb, - IDirectSoundNotifyImpl **pdsn); -static HRESULT IDirectSoundNotifyImpl_Destroy(IDirectSoundNotifyImpl *pdsn); +static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(IDirectSoundNotify *iface, REFIID riid, + void **ppobj) +{ + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); -static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface( - LPDIRECTSOUNDNOTIFY iface,REFIID riid,LPVOID *ppobj -) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj); - if (This->dsb == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } - - return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER)This->dsb, riid, ppobj); + return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); } -static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(LPDIRECTSOUNDNOTIFY iface) +static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - ULONG ref = InterlockedIncrement(&(This->ref)); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + ULONG ref = InterlockedIncrement(&This->refn); + TRACE("(%p) ref was %d\n", This, ref - 1); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); + return ref; } -static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) +static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - ULONG ref = InterlockedDecrement(&(This->ref)); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + ULONG ref = InterlockedDecrement(&This->refn); + TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { - This->dsb->notify = NULL; - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); - } + if (!ref && !InterlockedDecrement(&This->numIfaces)) + secondarybuffer_destroy(This); + return ref; } -static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( - LPDIRECTSOUNDNOTIFY iface,DWORD howmuch,LPCDSBPOSITIONNOTIFY notify -) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; +static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, + DWORD howmuch, const DSBPOSITIONNOTIFY *notify) +{ + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify); if (howmuch > 0 && notify == NULL) { @@ -110,20 +103,20 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( if (howmuch > 0) { /* Make an internal copy of the caller-supplied array. * Replace the existing copy if one is already present. */ - HeapFree(GetProcessHeap(), 0, This->dsb->notifies); - This->dsb->notifies = HeapAlloc(GetProcessHeap(), 0, + HeapFree(GetProcessHeap(), 0, This->notifies); + This->notifies = HeapAlloc(GetProcessHeap(), 0, howmuch * sizeof(DSBPOSITIONNOTIFY)); - if (This->dsb->notifies == NULL) { + if (This->notifies == NULL) { WARN("out of memory\n"); return DSERR_OUTOFMEMORY; } - CopyMemory(This->dsb->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); - This->dsb->nrofnotifies = howmuch; + CopyMemory(This->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); + This->nrofnotifies = howmuch; } else { - HeapFree(GetProcessHeap(), 0, This->dsb->notifies); - This->dsb->notifies = NULL; - This->dsb->nrofnotifies = 0; + HeapFree(GetProcessHeap(), 0, This->notifies); + This->notifies = NULL; + This->nrofnotifies = 0; } return S_OK; @@ -137,40 +130,6 @@ static const IDirectSoundNotifyVtbl dsnvt = IDirectSoundNotifyImpl_SetNotificationPositions, }; -static HRESULT IDirectSoundNotifyImpl_Create( - IDirectSoundBufferImpl * dsb, - IDirectSoundNotifyImpl **pdsn) -{ - IDirectSoundNotifyImpl * dsn; - TRACE("(%p,%p)\n",dsb,pdsn); - - dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dsn)); - - if (dsn == NULL) { - WARN("out of memory\n"); - return DSERR_OUTOFMEMORY; - } - - dsn->ref = 0; - dsn->lpVtbl = &dsnvt; - dsn->dsb = dsb; - dsb->notify = dsn; - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)dsb); - - *pdsn = dsn; - return DS_OK; -} - -static HRESULT IDirectSoundNotifyImpl_Destroy( - IDirectSoundNotifyImpl *pdsn) -{ - TRACE("(%p)\n",pdsn); - - while (IDirectSoundNotifyImpl_Release((LPDIRECTSOUNDNOTIFY)pdsn) > 0); - - return DS_OK; -} - /******************************************************************************* * IDirectSoundBuffer */ @@ -800,15 +759,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(IDirectSoundBuffer8 } if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { - if (!This->notify) - IDirectSoundNotifyImpl_Create(This, &(This->notify)); - if (This->notify) { - IDirectSoundNotify_AddRef((LPDIRECTSOUNDNOTIFY)This->notify); - *ppobj = This->notify; - return S_OK; - } - WARN("IID_IDirectSoundNotify\n"); - return E_NOINTERFACE; + IDirectSoundNotify_AddRef(&This->IDirectSoundNotify_iface); + *ppobj = &This->IDirectSoundNotify_iface; + return S_OK; } if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { @@ -889,11 +842,13 @@ HRESULT IDirectSoundBufferImpl_Create( TRACE("Created buffer at %p\n", dsb); dsb->ref = 0; + dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; dsb->numIfaces = 0; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt; + dsb->IDirectSoundNotify_iface.lpVtbl = &dsnvt; dsb->IDirectSound3DBuffer_iface.lpVtbl = &ds3dbvt; dsb->IKsPropertySet_iface.lpVtbl = &iksbvt; @@ -915,7 +870,6 @@ HRESULT IDirectSoundBufferImpl_Create( dsb->buflen = dsbd->dwBufferBytes; dsb->freq = dsbd->lpwfxFormat->nSamplesPerSec; - dsb->notify = NULL; dsb->notifies = NULL; dsb->nrofnotifies = 0; @@ -1036,12 +990,6 @@ HRESULT IDirectSoundBufferImpl_Destroy( * this object until it is ready to be deleted */ InterlockedIncrement(&pdsb->numIfaces); - if (pdsb->notify) { - WARN("notify not NULL\n"); - IDirectSoundNotifyImpl_Destroy(pdsb->notify); - pdsb->notify = NULL; - } - secondarybuffer_destroy(pdsb); return S_OK; @@ -1080,12 +1028,12 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->buffer->ref++; list_add_head(&dsb->buffer->buffers, &dsb->entry); dsb->ref = 0; + dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; dsb->numIfaces = 0; dsb->state = STATE_STOPPED; dsb->buf_mixpos = dsb->sec_mixpos = 0; - dsb->notify = NULL; dsb->notifies = NULL; dsb->nrofnotifies = 0; dsb->device = device; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d63ee24..10bd281 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -48,7 +48,6 @@ typedef struct IDirectSound8_IDirectSound8 IDirectSound8_IDirectSound8; typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; typedef struct IDirectSoundCaptureImpl IDirectSoundCaptureImpl; typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl; -typedef struct IDirectSoundNotifyImpl IDirectSoundNotifyImpl; typedef struct DirectSoundDevice DirectSoundDevice; typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice; @@ -163,11 +162,12 @@ HRESULT DirectSoundDevice_VerifyCertification(DirectSoundDevice * device, struct IDirectSoundBufferImpl { IDirectSoundBuffer8 IDirectSoundBuffer8_iface; + IDirectSoundNotify IDirectSoundNotify_iface; IDirectSound3DListener IDirectSound3DListener_iface; /* only primary buffer */ IDirectSound3DBuffer IDirectSound3DBuffer_iface; /* only secondary buffer */ IKsPropertySet IKsPropertySet_iface; LONG numIfaces; /* "in use interfaces" refcount */ - LONG ref, ref3D, refiks; + LONG ref, refn, ref3D, refiks; /* IDirectSoundBufferImpl fields */ DirectSoundDevice* device; RTL_RWLOCK lock; @@ -183,12 +183,9 @@ struct IDirectSoundBufferImpl ULONG freqneeded, freqAdjust, freqAcc, freqAccNext; /* used for mixing */ DWORD primary_mixpos, buf_mixpos, sec_mixpos; - - /* IDirectSoundNotifyImpl fields */ - IDirectSoundNotifyImpl* notify; + /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; - /* DirectSound3DBuffer fields */ DS3DBUFFER ds3db_ds3db; LONG ds3db_lVolume;

1 0