wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Jacek Caban : mshtml: Added ITravelLogClient stub implementation.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: e174d1d31bd5c77f7d4c27f74392ff1747a13a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e174d1d31bd5c77f7d4c27f74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 15:10:25 2012 +0100 mshtml: Added ITravelLogClient stub implementation. --- dlls/mshtml/htmlwindow.c | 60 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 2 + dlls/mshtml/tests/htmldoc.c | 1 + 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 654f2e0..7848b76 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -168,6 +168,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; + }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { + TRACE("(%p)->(IID_ITravelLogClient %p)\n", This, ppv); + *ppv = &This->ITravelLogClient_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -1945,6 +1948,62 @@ static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = { HTMLPrivateWindow_GetAddressBarUrl }; +static inline HTMLWindow *impl_from_ITravelLogClient(ITravelLogClient *iface) +{ + return CONTAINING_RECORD(iface, HTMLWindow, ITravelLogClient_iface); +} + +static HRESULT WINAPI TravelLogClient_QueryInterface(ITravelLogClient *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + + return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); +} + +static ULONG WINAPI TravelLogClient_AddRef(ITravelLogClient *iface) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + + return IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); +} + +static ULONG WINAPI TravelLogClient_Release(ITravelLogClient *iface) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + + return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); +} + +static HRESULT WINAPI TravelLogClient_FindWindowByIndex(ITravelLogClient *iface, DWORD dwID, IUnknown **ppunk) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + FIXME("(%p)->(%d %p)\n", This, dwID, ppunk); + return E_NOTIMPL; +} + +static HRESULT WINAPI TravelLogClient_GetWindowData(ITravelLogClient *iface, IStream *pStream, LPWINDOWDATA pWinData) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + FIXME("(%p)->(%p %p)\n", This, pStream, pWinData); + return E_NOTIMPL; +} + +static HRESULT WINAPI TravelLogClient_LoadHistoryPosition(ITravelLogClient *iface, LPWSTR pszUrlLocation, DWORD dwPosition) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + FIXME("(%p)->(%s %d)\n", This, debugstr_w(pszUrlLocation), dwPosition); + return E_NOTIMPL; +} + +static const ITravelLogClientVtbl TravelLogClientVtbl = { + TravelLogClient_QueryInterface, + TravelLogClient_AddRef, + TravelLogClient_Release, + TravelLogClient_FindWindowByIndex, + TravelLogClient_GetWindowData, + TravelLogClient_LoadHistoryPosition +}; + static inline HTMLWindow *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLWindow, IDispatchEx_iface); @@ -2385,6 +2444,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->IHTMLPrivateWindow_iface.lpVtbl = &HTMLPrivateWindowVtbl; window->IDispatchEx_iface.lpVtbl = &WindowDispExVtbl; window->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; + window->ITravelLogClient_iface.lpVtbl = &TravelLogClientVtbl; window->ref = 1; window->doc_obj = doc_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 684d396..90fab6d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -27,6 +27,7 @@ #include "dispex.h" #include "objsafe.h" #include "htiframe.h" +#include "tlogstg.h" #include "wine/list.h" #include "wine/unicode.h" @@ -294,6 +295,7 @@ struct HTMLWindow { IHTMLPrivateWindow IHTMLPrivateWindow_iface; IDispatchEx IDispatchEx_iface; IServiceProvider IServiceProvider_iface; + ITravelLogClient ITravelLogClient_iface; LONG ref; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 710b1f5..a847998 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -34,6 +34,7 @@ #include "mshtml_test.h" #include "objsafe.h" #include "htiface.h" +#include "tlogstg.h" static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); @@ -253,6 +254,7 @@ static const IID * const window_iids[] = { &IID_IHTMLWindow3, &IID_IDispatchEx, &IID_IServiceProvider, + &IID_ITravelLogClient, NULL }; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 85fbd9b..0177c16 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -42,6 +42,7 @@ #include "perhist.h" #include "shobjidl.h" #include "htiface.h" +#include "tlogstg.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);

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

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: 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: 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

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

Nikolay Sivov : mshtml: Respond to SID_SContainerDispatch service id.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 478ddf7b6c6a2532e1aaab1467ac717ebc1e2685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478ddf7b6c6a2532e1aaab146… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 20 15:12:13 2012 +0300 mshtml: Respond to SID_SContainerDispatch service id. --- dlls/mshtml/service.c | 5 +++++ dlls/mshtml/tests/htmldoc.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index ed95f49..9cafbf0 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -249,6 +249,11 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return IOleUndoManager_QueryInterface(This->doc_obj->undomgr, riid, ppv); } + if(IsEqualGUID(&SID_SContainerDispatch, guidService)) { + TRACE("SID_SContainerDispatch\n"); + return IHTMLDocument2_QueryInterface(&This->IHTMLDocument2_iface, riid, ppv); + } + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); if(This->doc_obj->client) { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a79e50e..85fbd9b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -47,6 +47,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -7135,6 +7136,46 @@ static BOOL check_ie(void) return SUCCEEDED(hres); } +static void test_ServiceProvider(void) +{ + IHTMLDocument3 *doc3, *doc3_2; + IServiceProvider *provider; + IHTMLDocument2 *doc, *doc2; + IUnknown *unk; + HRESULT hres; + + doc = create_document(); + if(!doc) + return; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IServiceProvider, (void**)&provider); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(iface_cmp((IUnknown*)doc2, (IUnknown*)doc), "got wrong pointer\n"); + IHTMLDocument2_Release(doc2); + + hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(iface_cmp((IUnknown*)doc3, (IUnknown*)doc), "got wrong pointer\n"); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3_2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(iface_cmp((IUnknown*)doc3_2, (IUnknown*)doc), "got wrong pointer\n"); + ok(iface_cmp((IUnknown*)doc3_2, (IUnknown*)doc3), "got wrong pointer\n"); + IHTMLDocument3_Release(doc3); + IHTMLDocument3_Release(doc3_2); + + hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(iface_cmp((IUnknown*)doc, unk), "got wrong pointer\n"); + + IUnknown_Release(unk); + IServiceProvider_Release(provider); + release_document(doc); +} + START_TEST(htmldoc) { CoInitialize(NULL); @@ -7169,6 +7210,7 @@ START_TEST(htmldoc) test_UIActivate(TRUE, TRUE, TRUE); test_HTMLDoc_ISupportErrorInfo(); test_IPersistHistory(); + test_ServiceProvider(); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Alexandre Julliard : widl: We no longer need to avoid windows. h in generated headers.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 42e583f1f6b2c0c9f963251495661ea8c11be005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e583f1f6b2c0c9f96325149… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 15:59:02 2012 +0100 widl: We no longer need to avoid windows.h in generated headers. --- tools/widl/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index fc9cbf1..00d6e76 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1366,7 +1366,7 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n\n" ); - fprintf(header, "#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)\n"); + fprintf(header, "#ifndef COM_NO_WINDOWS_H\n"); fprintf(header, "#include <windows.h>\n"); fprintf(header, "#include <ole2.h>\n"); fprintf(header, "#endif\n\n");

1 0

Alexandre Julliard : include: Allow using windows.h in Wine code.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 25441f40f8c9e719b201caf7ad98b30b44c8e55e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25441f40f8c9e719b201caf7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 15:14:31 2012 +0100 include: Allow using windows.h in Wine code. --- dlls/windowscodecs/icnsformat.c | 24 ++++++++++++++++++++++++ include/aclapi.h | 4 +--- include/d3d8.h | 6 +----- include/d3d9.h | 6 +----- include/d3dtypes.h | 5 +---- include/dmplugin.h | 2 -- include/dmusicc.h | 2 -- include/dmusicf.h | 2 -- include/dmusici.h | 4 ---- include/dshow.h | 6 +----- include/mapidefs.h | 5 +---- include/oledlg.h | 4 +--- include/pdh.h | 6 +----- include/rpc.h | 10 +--------- include/sddl.h | 4 ++-- include/snmp.h | 6 +----- include/tapi.h | 4 +--- include/usp10.h | 4 +--- include/windows.h | 8 ++++---- include/winsock.h | 6 +----- 20 files changed, 43 insertions(+), 75 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index de38715..c777581 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -25,6 +25,18 @@ #define GetCurrentProcess GetCurrentProcess_Mac #define GetCurrentThread GetCurrentThread_Mac #define LoadResource LoadResource_Mac +#define AnimatePalette AnimatePalette_Mac +#define EqualRgn EqualRgn_Mac +#define FillRgn FillRgn_Mac +#define FrameRgn FrameRgn_Mac +#define GetPixel GetPixel_Mac +#define InvertRgn InvertRgn_Mac +#define LineTo LineTo_Mac +#define OffsetRgn OffsetRgn_Mac +#define PaintRgn PaintRgn_Mac +#define Polygon Polygon_Mac +#define ResizePalette ResizePalette_Mac +#define SetRectRgn SetRectRgn_Mac #define EqualRect EqualRect_Mac #define FillRect FillRect_Mac #define FrameRect FrameRect_Mac @@ -40,6 +52,18 @@ #undef GetCurrentProcess #undef GetCurrentThread #undef LoadResource +#undef AnimatePalette +#undef EqualRgn +#undef FillRgn +#undef FrameRgn +#undef GetPixel +#undef InvertRgn +#undef LineTo +#undef OffsetRgn +#undef PaintRgn +#undef Polygon +#undef ResizePalette +#undef SetRectRgn #undef EqualRect #undef FillRect #undef FrameRect diff --git a/include/aclapi.h b/include/aclapi.h index 249cd03..cd818bc 100644 --- a/include/aclapi.h +++ b/include/aclapi.h @@ -19,9 +19,7 @@ #ifndef __WINE_ACLAPI_H #define __WINE_ACLAPI_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +#include <windows.h> #include <accctrl.h> #ifdef __cplusplus diff --git a/include/d3d8.h b/include/d3d8.h index e98c369..010ab83 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -27,11 +27,7 @@ #define COM_NO_WINDOWS_H #include <objbase.h> - -#ifndef __WINESRC__ -# include <windows.h> -#endif - +#include <windows.h> #include <d3d8types.h> #include <d3d8caps.h> diff --git a/include/d3d9.h b/include/d3d9.h index 0ceb23f..e7636e5 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -28,11 +28,7 @@ #define COM_NO_WINDOWS_H #include <objbase.h> - -#ifndef __WINESRC__ -# include <windows.h> -#endif - +#include <windows.h> #include <d3d9types.h> #include <d3d9caps.h> diff --git a/include/d3dtypes.h b/include/d3dtypes.h index a4030e6..256d99a 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -25,10 +25,7 @@ #ifndef __WINE_D3DTYPES_H #define __WINE_D3DTYPES_H -#ifndef __WINESRC__ -# include <windows.h> -#endif - +#include <windows.h> #include <float.h> #include <ddraw.h> diff --git a/include/dmplugin.h b/include/dmplugin.h index 6cf3114..ccd9f6b 100644 --- a/include/dmplugin.h +++ b/include/dmplugin.h @@ -21,9 +21,7 @@ #ifndef __WINE_DMUSIC_PLUGIN_H #define __WINE_DMUSIC_PLUGIN_H -#ifndef __WINESRC__ #include <windows.h> -#endif /* __WINESRC__ */ #define COM_NO_WINDOWS_H #include <objbase.h> diff --git a/include/dmusicc.h b/include/dmusicc.h index 7aac00b..9c07737 100644 --- a/include/dmusicc.h +++ b/include/dmusicc.h @@ -20,9 +20,7 @@ #ifndef __WINE_DMUSIC_CORE_H #define __WINE_DMUSIC_CORE_H -#ifndef __WINESRC__ #include <windows.h> -#endif /* __WINESRC__ */ #define COM_NO_WINDOWS_H #include <objbase.h> diff --git a/include/dmusicf.h b/include/dmusicf.h index 6906ecc..bf488e5 100644 --- a/include/dmusicf.h +++ b/include/dmusicf.h @@ -21,9 +21,7 @@ #ifndef __WINE_DMUSIC_FILEFORMATS_H #define __WINE_DMUSIC_FILEFORMATS_H -#ifndef __WINESRC__ #include <windows.h> -#endif /* __WINESRC__ */ #define COM_NO_WINDOWS_H #include <objbase.h> diff --git a/include/dmusici.h b/include/dmusici.h index 82a137b..81fc3f8 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -21,11 +21,7 @@ #ifndef __WINE_DMUSIC_PERFORMANCE_H #define __WINE_DMUSIC_PERFORMANCE_H -#ifndef __WINESRC__ #include <windows.h> -#else -#include <oleauto.h> /* VARIANT */ -#endif /* __WINESRC__ */ #define COM_NO_WINDOWS_H #include <objbase.h> diff --git a/include/dshow.h b/include/dshow.h index 3451609..50e581c 100644 --- a/include/dshow.h +++ b/include/dshow.h @@ -21,13 +21,9 @@ #define AM_NOVTABLE +#include <windows.h> #ifndef __WINESRC__ -# include <windows.h> # include <windowsx.h> -#else -# include <windef.h> -# include <wingdi.h> -# include <objbase.h> #endif #include <olectl.h> #include <ddraw.h> diff --git a/include/mapidefs.h b/include/mapidefs.h index cd6d8b0..2206e70 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -20,10 +20,7 @@ #ifndef MAPIDEFS_H #define MAPIDEFS_H -#ifndef __WINESRC__ -# include <windows.h> -#endif - +#include <windows.h> #include <winerror.h> #include <objbase.h> #include <stddef.h> diff --git a/include/oledlg.h b/include/oledlg.h index 29f842f..f009d76 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -21,9 +21,7 @@ #ifndef __WINE_OLEDLG_H #define __WINE_OLEDLG_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +#include <windows.h> #include <shellapi.h> #include <commdlg.h> #include <ole2.h> diff --git a/include/pdh.h b/include/pdh.h index 30591ac..a25eb2e 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -21,11 +21,7 @@ #ifndef _PDH_H_ #define _PDH_H_ -#ifdef __WINESRC__ -# include <windef.h> -#else -# include <windows.h> -#endif +#include <windows.h> #include <winperf.h> #ifdef __cplusplus diff --git a/include/rpc.h b/include/rpc.h index 3e7e129..eb7d041 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -19,15 +19,7 @@ */ #ifndef RPC_NO_WINDOWS_H -# ifdef __WINESRC__ -# ifndef RC_INVOKED -# include <stdarg.h> -# endif -# include <windef.h> -# include <winbase.h> -# else -# include <windows.h> -# endif +# include <windows.h> #endif #ifndef __WINE_RPC_H diff --git a/include/sddl.h b/include/sddl.h index 866b699..badd6fa 100644 --- a/include/sddl.h +++ b/include/sddl.h @@ -26,7 +26,7 @@ extern "C" { #define SDDL_REVISION_1 1 #define SDDL_REVISION SDDL_REVISION_1 -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS /* Component tags */ #ifndef UNICODE # define SDDL_OWNER "O" @@ -91,7 +91,7 @@ extern "C" { static const WCHAR SDDL_ACE_END[] = { ')',0 }; # endif #endif /* UNICODE */ -#endif /* __WINESRC__ */ +#endif /* WINE_NO_UNICODE_MACROS */ BOOL WINAPI ConvertSidToStringSidA( PSID, LPSTR* ); BOOL WINAPI ConvertSidToStringSidW( PSID, LPWSTR* ); diff --git a/include/snmp.h b/include/snmp.h index cedf7b0..0530fc6 100644 --- a/include/snmp.h +++ b/include/snmp.h @@ -18,11 +18,7 @@ #ifndef _WINE_SNMP_H #define _WINE_SNMP_H -#ifndef __WINESRC__ -# include <windows.h> -#else -# include <windef.h> -#endif +#include <windows.h> #include <pshpack4.h> diff --git a/include/tapi.h b/include/tapi.h index 564b118..9af7ea5 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -21,9 +21,7 @@ #ifndef __WINE_TAPI_H #define __WINE_TAPI_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +#include <windows.h> #include <basetsd.h> #include <oaidl.h> diff --git a/include/usp10.h b/include/usp10.h index e84eeb7..09416ae 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -20,9 +20,7 @@ #ifndef __USP10_H #define __USP10_H -#ifndef __WINESRC__ -# include <windows.h> -#endif +#include <windows.h> /* FIXME: #include <specstrings.h> */ #ifdef __cplusplus diff --git a/include/windows.h b/include/windows.h index 14f6ce9..ec5c6a2 100644 --- a/include/windows.h +++ b/include/windows.h @@ -19,10 +19,6 @@ #ifndef __WINE_WINDOWS_H #define __WINE_WINDOWS_H -#ifdef __WINESRC__ -#error Wine should not include windows.h internally -#endif - #if defined(_MSC_VER) && (_MSC_VER >= 800) && !defined(__cplusplus) /* TYPE_ALIGNMENT generates this - move it outside the warning push/pop scope. */ # pragma warning(disable:4116) @@ -49,6 +45,8 @@ #include <winnetwk.h> /* Not so essential ones */ +#ifndef __WINESRC__ + #ifndef WIN32_LEAN_AND_MEAN #include <cderr.h> @@ -102,6 +100,8 @@ #include <imm.h> #endif /* !NOIMM */ +#endif /* __WINESRC__ */ + #endif /* RC_INVOKED && !NOWINRES */ #endif /* _INC_WINDOWS */ #endif /* __WINE_WINDOWS_H */ diff --git a/include/winsock.h b/include/winsock.h index a938d59..06e6309 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -107,11 +107,7 @@ #endif /* __WINE_WINSOCKAPI_STDLIB_H */ -#ifndef __WINESRC__ -# include <windows.h> -#else -# include <windef.h> -#endif +#include <windows.h> #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_

1 0

André Hentschel : d3drm: Forward all IUnknown methods to IDirect3DRM.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 0c0b6a10965eef238ce6a7aaabdff80bec2365d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0b6a10965eef238ce6a7aaa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 19 22:06:08 2012 +0100 d3drm: Forward all IUnknown methods to IDirect3DRM. --- dlls/d3drm/d3drm.c | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 2850c7f..879d8b0 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -452,23 +452,13 @@ static HRESULT WINAPI IDirect3DRM2Impl_QueryInterface(IDirect3DRM2* iface, REFII static ULONG WINAPI IDirect3DRM2Impl_AddRef(IDirect3DRM2* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - TRACE("(%p/%p)\n", iface, This); - - return InterlockedIncrement(&This->ref); + return IDirect3DRM_AddRef(&This->IDirect3DRM_iface); } static ULONG WINAPI IDirect3DRM2Impl_Release(IDirect3DRM2* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p/%p)\n", iface, This); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + return IDirect3DRM_Release(&This->IDirect3DRM_iface); } /*** IDirect3DRM2 methods ***/ @@ -883,23 +873,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_QueryInterface(IDirect3DRM3* iface, REFII static ULONG WINAPI IDirect3DRM3Impl_AddRef(IDirect3DRM3* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - TRACE("(%p/%p)\n", iface, This); - - return InterlockedIncrement(&This->ref); + return IDirect3DRM_AddRef(&This->IDirect3DRM_iface); } static ULONG WINAPI IDirect3DRM3Impl_Release(IDirect3DRM3* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p/%p)\n", iface, This); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + return IDirect3DRM_Release(&This->IDirect3DRM_iface); } /*** IDirect3DRM3 methods ***/

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
98
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 January 2012