December 2010 - Wine-Commits

Alexandre Julliard : msxml3: Avoid using an initialized variable.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 4ad97d404d30f9ec62649a7b8180f51b7eb4a759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad97d404d30f9ec62649a7b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 17:46:47 2010 +0100 msxml3: Avoid using an initialized variable. --- dlls/msxml3/schema.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e262f2e..fa4208d 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -767,7 +767,7 @@ static inline schema_cache* impl_from_IXMLDOMSchemaCollection2(IXMLDOMSchemaColl static inline SCHEMA_TYPE schema_type_from_xmlDocPtr(xmlDocPtr schema) { - xmlNodePtr root; + xmlNodePtr root = NULL; if (schema) root = xmlDocGetRootElement(schema); if (root && root->ns)

1 0

Jacek Caban : mshtml: Inherit HTMLObjectElement from new HTMLPluginContainer object.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: bfc49aa7f308f2e7446efae19e1f3adbbff59571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc49aa7f308f2e7446efae19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 9 16:28:18 2010 +0100 mshtml: Inherit HTMLObjectElement from new HTMLPluginContainer object. --- dlls/mshtml/htmlobject.c | 33 +++++++++++++++++++-------------- dlls/mshtml/pluginhost.c | 3 +++ dlls/mshtml/pluginhost.h | 10 +++++++++- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 482bac9..a2f5322 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -29,11 +29,12 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "pluginhost.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - HTMLElement element; + HTMLPluginContainer plugin_container; IHTMLObjectElement IHTMLObjectElement_iface; @@ -50,34 +51,34 @@ static HRESULT WINAPI HTMLObjectElement_QueryInterface(IHTMLObjectElement *iface { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->plugin_container.element.node), riid, ppv); } static ULONG WINAPI HTMLObjectElement_AddRef(IHTMLObjectElement *iface) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->plugin_container.element.node)); } static ULONG WINAPI HTMLObjectElement_Release(IHTMLObjectElement *iface) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->plugin_container.element.node)); } static HRESULT WINAPI HTMLObjectElement_GetTypeInfoCount(IHTMLObjectElement *iface, UINT *pctinfo) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->plugin_container.element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLObjectElement_GetTypeInfo(IHTMLObjectElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->plugin_container.element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLObjectElement_GetIDsOfNames(IHTMLObjectElement *iface, REFIID riid, @@ -85,7 +86,7 @@ static HRESULT WINAPI HTMLObjectElement_GetIDsOfNames(IHTMLObjectElement *iface, LCID lcid, DISPID *rgDispId) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->plugin_container.element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLObjectElement_Invoke(IHTMLObjectElement *iface, DISPID dispIdMember, @@ -93,7 +94,7 @@ static HRESULT WINAPI HTMLObjectElement_Invoke(IHTMLObjectElement *iface, DISPID VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, + return IDispatchEx_Invoke(DISPATCHEX(&This->plugin_container.element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } @@ -390,7 +391,7 @@ static const IHTMLObjectElementVtbl HTMLObjectElementVtbl = { HTMLObjectElement_get_hspace }; -#define HTMLOBJECT_NODE_THIS(iface) DEFINE_THIS2(HTMLObjectElement, element.node, iface) +#define HTMLOBJECT_NODE_THIS(iface) DEFINE_THIS2(HTMLObjectElement, plugin_container.element.node, iface) static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { @@ -405,8 +406,12 @@ static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLObjectElement, riid)) { TRACE("(%p)->(IID_IHTMLObjectElement %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; + }else if(IsEqualGUID(&IID_HTMLPluginContainer, riid)) { + TRACE("(%p)->(IID_HTMLPluginContainer %p)\n", This, ppv); + *ppv = &This->plugin_container; + return S_OK; }else { - return HTMLElement_QI(&This->element.node, riid, ppv); + return HTMLElement_QI(&This->plugin_container.element.node, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv); @@ -420,7 +425,7 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) if(This->nsobject) nsIDOMHTMLObjectElement_Release(This->nsobject); - HTMLElement_destructor(&This->element.node); + HTMLElement_destructor(&This->plugin_container.element.node); } static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p) @@ -466,7 +471,7 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele return E_OUTOFMEMORY; ret->IHTMLObjectElement_iface.lpVtbl = &HTMLObjectElementVtbl; - ret->element.node.vtbl = &HTMLObjectElementImplVtbl; + ret->plugin_container.element.node.vtbl = &HTMLObjectElementImplVtbl; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject); if(NS_FAILED(nsres)) { @@ -475,8 +480,8 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele return E_FAIL; } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLObjectElement_dispex); + HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex); - *elem = &ret->element; + *elem = &ret->plugin_container.element; return S_OK; } diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 27404f6..2af929c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +const IID IID_HTMLPluginContainer = + {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}}; + static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index ab61523..1c80a9c 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -typedef struct HTMLObjectElement HTMLObjectElement; +typedef struct HTMLPluginContainer HTMLPluginContainer; typedef struct { IOleClientSite IOleClientSite_iface; @@ -37,6 +37,14 @@ typedef struct { struct list entry; } PluginHost; +struct HTMLPluginContainer { + HTMLElement element; + + PluginHost *plugin_host; +}; + +extern const IID IID_HTMLPluginContainer; + HRESULT create_plugin_host(HTMLDocumentNode*,IUnknown*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); void detach_plugin_hosts(HTMLDocumentNode*);

1 0

Alexandre Julliard : ws2_32/tests: Avoid size_t in a trace.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: f89d80c27694219624ae5f32cd25015ae9822e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89d80c27694219624ae5f32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 17:46:13 2010 +0100 ws2_32/tests: Avoid size_t in a trace. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 528c657..1b81544 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1237,7 +1237,7 @@ static void test_ip_pktinfo(void) ok(strncmp(iovec[0].buf, msg, sizeof(msg)) == 0, "WSARecvMsg() buffer does not match transmitted data!\n"); ok(hdr.Control.len == IP_PKTINFO_LEN, - "WSARecvMsg() control length mismatch (%d != %d).\n", hdr.Control.len, IP_PKTINFO_LEN); + "WSARecvMsg() control length mismatch (%d).\n", hdr.Control.len); /* Test for the expected IP_PKTINFO return information. */ foundhdr = FALSE;

1 0

Francois Gouget : winetest: Allow submitting the results if not too many tests have been skipped.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: d9dcafab911e1889f5d59f30998c9dc2bc91be7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9dcafab911e1889f5d59f309… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 9 12:19:08 2010 +0100 winetest: Allow submitting the results if not too many tests have been skipped. Currently the limit is set at 10 tests or subtests. --- programs/winetest/main.c | 50 +++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 22 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 6f922ef..1ea308b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -37,6 +37,9 @@ #include "winetest.h" #include "resource.h" +/* Don't submit the results if more than SKIP_LIMIT tests have been skipped */ +#define SKIP_LIMIT 10 + struct wine_test { char *name; @@ -53,7 +56,7 @@ char *url = NULL; char *email = NULL; BOOL aborting = FALSE; static struct wine_test *wine_tests; -static int nr_of_files, nr_of_tests; +static int nr_of_files, nr_of_tests, nr_of_skips; static int nr_native_dlls; static const char whitespace[] = " \t\r\n"; static const char testexe[] = "_test.exe"; @@ -597,6 +600,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch { report (R_STEP, "Skipping: %s:%s", test->name, subtest); xprintf ("%s:%s skipped %s -\n", test->name, subtest, file); + nr_of_skips++; } else { @@ -703,7 +707,11 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, ULONG_PTR cookie; if (aborting) return TRUE; - if (test_filtered_out( lpszName, NULL )) return TRUE; + if (test_filtered_out( lpszName, NULL )) + { + nr_of_skips++; + return TRUE; + } CharLowerA(lpszName); extract_test (&wine_tests[nr_of_files], tempdir, lpszName); @@ -902,6 +910,7 @@ run_tests (char *logname, char *outdir) report (R_PROGRESS, 0, nr_of_files); nr_of_files = 0; nr_of_tests = 0; + nr_of_skips = 0; if (!EnumResourceNames (NULL, "TESTRES", extract_test_proc, (LPARAM)tempdir)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); @@ -1172,35 +1181,32 @@ int main( int argc, char *argv[] ) SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" ); } - if (!nb_filters) /* don't submit results when filtering */ - { - while (!tag) { - if (!interactive) - report (R_FATAL, "Please specify a tag (-t option) if " - "running noninteractive!"); - if (guiAskTag () == IDABORT) exit (1); - } - report (R_TAG); - - while (!email) { - if (!interactive) - report (R_FATAL, "Please specify an email address (-m option) to enable developers\n" - " to contact you about your report if necessary."); - if (guiAskEmail () == IDABORT) exit (1); - } + while (!tag) { + if (!interactive) + report (R_FATAL, "Please specify a tag (-t option) if " + "running noninteractive!"); + if (guiAskTag () == IDABORT) exit (1); + } + report (R_TAG); - if (!build_id[0]) - report( R_WARNING, "You won't be able to submit results without a valid build id.\n" - "To submit results, winetest needs to be built from a git checkout." ); + while (!email) { + if (!interactive) + report (R_FATAL, "Please specify an email address (-m option) to enable developers\n" + " to contact you about your report if necessary."); + if (guiAskEmail () == IDABORT) exit (1); } + if (!build_id[0]) + report( R_WARNING, "You won't be able to submit results without a valid build id.\n" + "To submit results, winetest needs to be built from a git checkout." ); + if (!logname) { logname = run_tests (NULL, outdir); if (aborting) { DeleteFileA(logname); exit (0); } - if (build_id[0] && !nb_filters && !nr_native_dlls && + if (build_id[0] && nr_of_skips <= SKIP_LIMIT && !nr_native_dlls && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError());

1 0

Michael Stefaniuc : msxml3: Use ifaces instead of vtbl pointers in BindStatusCallback.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 4038523b4e30c5bbee20d1e83c78ec780019c902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4038523b4e30c5bbee20d1e83… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:37 2010 +0100 msxml3: Use ifaces instead of vtbl pointers in BindStatusCallback. --- dlls/msxml3/httprequest.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index b016016..9e8cf69 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -105,8 +105,8 @@ static void httprequest_setreadystate(httprequest *This, READYSTATE state) struct BindStatusCallback { - const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; - const IHttpNegotiateVtbl *lpHttpNegotiateVtbl; + IBindStatusCallback IBindStatusCallback_iface; + IHttpNegotiate IHttpNegotiate_iface; LONG ref; IBinding *binding; @@ -121,12 +121,12 @@ struct BindStatusCallback static inline BindStatusCallback *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) { - return (BindStatusCallback *)((char*)iface - FIELD_OFFSET(BindStatusCallback, lpBindStatusCallbackVtbl)); + return CONTAINING_RECORD(iface, BindStatusCallback, IBindStatusCallback_iface); } static inline BindStatusCallback *impl_from_IHttpNegotiate( IHttpNegotiate *iface ) { - return (BindStatusCallback *)((char*)iface - FIELD_OFFSET(BindStatusCallback, lpHttpNegotiateVtbl)); + return CONTAINING_RECORD(iface, BindStatusCallback, IHttpNegotiate_iface); } void BindStatusCallback_Detach(BindStatusCallback *bsc) @@ -135,7 +135,7 @@ void BindStatusCallback_Detach(BindStatusCallback *bsc) { if (bsc->binding) IBinding_Abort(bsc->binding); bsc->request = NULL; - IBindStatusCallback_Release((IBindStatusCallback*)bsc); + IBindStatusCallback_Release(&bsc->IBindStatusCallback_iface); } } @@ -151,11 +151,11 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IBindStatusCallback, riid)) { - *ppv = &This->lpBindStatusCallbackVtbl; + *ppv = &This->IBindStatusCallback_iface; } else if (IsEqualGUID(&IID_IHttpNegotiate, riid)) { - *ppv = &This->lpHttpNegotiateVtbl; + *ppv = &This->IHttpNegotiate_iface; } else if (IsEqualGUID(&IID_IServiceProvider, riid) || IsEqualGUID(&IID_IBindStatusCallbackEx, riid) || @@ -344,19 +344,19 @@ static HRESULT WINAPI BSCHttpNegotiate_QueryInterface(IHttpNegotiate *iface, REFIID riid, void **ppv) { BindStatusCallback *This = impl_from_IHttpNegotiate(iface); - return IBindStatusCallback_QueryInterface((IBindStatusCallback*)This, riid, ppv); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); } static ULONG WINAPI BSCHttpNegotiate_AddRef(IHttpNegotiate *iface) { BindStatusCallback *This = impl_from_IHttpNegotiate(iface); - return IBindStatusCallback_AddRef((IBindStatusCallback*)This); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); } static ULONG WINAPI BSCHttpNegotiate_Release(IHttpNegotiate *iface) { BindStatusCallback *This = impl_from_IHttpNegotiate(iface); - return IBindStatusCallback_Release((IBindStatusCallback*)This); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); } static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, @@ -433,8 +433,8 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * return E_OUTOFMEMORY; } - bsc->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; - bsc->lpHttpNegotiateVtbl = &BSCHttpNegotiateVtbl; + bsc->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; + bsc->IHttpNegotiate_iface.lpVtbl = &BSCHttpNegotiateVtbl; bsc->ref = 1; bsc->request = This; bsc->binding = NULL; @@ -465,7 +465,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * FIXME("unsupported body data type %d\n", V_VT(body)); } - hr = RegisterBindStatusCallback(pbc, (IBindStatusCallback*)bsc, NULL, 0); + hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); if (hr == S_OK) { IMoniker *moniker; @@ -484,7 +484,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * if (FAILED(hr)) { - IBindStatusCallback_Release((IBindStatusCallback*)bsc); + IBindStatusCallback_Release(&bsc->IBindStatusCallback_iface); bsc = NULL; }

1 0

Michael Stefaniuc : msimtf: Use an iface instead of a vtbl pointer in ActiveIMMApp.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: d24e87fdafcf4f1b57a56829f5dd8158cf25bf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24e87fdafcf4f1b57a56829f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:32 2010 +0100 msimtf: Use an iface instead of a vtbl pointer in ActiveIMMApp. --- dlls/msimtf/activeimmapp.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 73ce075..4178992 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -42,10 +42,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimtf); typedef struct tagActiveIMMApp { - const IActiveIMMAppVtbl *vtbl; + IActiveIMMApp IActiveIMMApp_iface; LONG refCount; } ActiveIMMApp; +static inline ActiveIMMApp *impl_from_IActiveIMMApp(IActiveIMMApp *iface) +{ + return CONTAINING_RECORD(iface, ActiveIMMApp, IActiveIMMApp_iface); +} + static void ActiveIMMApp_Destructor(ActiveIMMApp* This) { TRACE("\n"); @@ -55,7 +60,7 @@ static void ActiveIMMApp_Destructor(ActiveIMMApp* This) static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, REFIID iid, LPVOID *ppvOut) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IActiveIMMApp)) @@ -75,13 +80,13 @@ static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, static ULONG WINAPI ActiveIMMApp_AddRef(IActiveIMMApp* iface) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ActiveIMMApp_Release(IActiveIMMApp* iface) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); ULONG ret; ret = InterlockedDecrement(&This->refCount); @@ -818,7 +823,7 @@ HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (This == NULL) return E_OUTOFMEMORY; - This->vtbl = &ActiveIMMAppVtbl; + This->IActiveIMMApp_iface.lpVtbl = &ActiveIMMAppVtbl; This->refCount = 1; TRACE("returning %p\n",This);

1 0

Michael Stefaniuc : riched20/tests: Use an iface instead of a vtbl pointer in ITextHostTestImpl.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 0acf4a297bc6b2faf5d15eccb41bf40c1e5040df URL: http://source.winehq.org/git/wine.git/?a=commit;h=0acf4a297bc6b2faf5d15eccb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 9 10:27:13 2010 +0100 riched20/tests: Use an iface instead of a vtbl pointer in ITextHostTestImpl. --- dlls/riched20/tests/txtsrv.c | 95 ++++++++++++++++++++++-------------------- 1 files changed, 50 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0acf4a297bc6b2faf5d15…

1 0

Michael Stefaniuc : riched20: Standardize the COM usage in clipboard.c.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 9a6f5ad23969675c111c7949a5528d6af3c797bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6f5ad23969675c111c7949a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 9 10:27:26 2010 +0100 riched20: Standardize the COM usage in clipboard.c. --- dlls/riched20/clipboard.c | 56 ++++++++++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 15ce97b..f7514a2 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static UINT cfRTF = 0; typedef struct DataObjectImpl { - const IDataObjectVtbl *lpVtbl; + IDataObject IDataObject_iface; LONG ref; FORMATETC *fmtetc; @@ -36,7 +36,7 @@ typedef struct DataObjectImpl { } DataObjectImpl; typedef struct EnumFormatImpl { - const IEnumFORMATETCVtbl *lpVtbl; + IEnumFORMATETC IEnumFORMATETC_iface; LONG ref; FORMATETC *fmtetc; @@ -47,9 +47,19 @@ typedef struct EnumFormatImpl { static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); +static inline DataObjectImpl *impl_from_IDataObject(IDataObject *iface) +{ + return CONTAINING_RECORD(iface, DataObjectImpl, IDataObject_iface); +} + +static inline EnumFormatImpl *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) +{ + return CONTAINING_RECORD(iface, EnumFormatImpl, IEnumFORMATETC_iface); +} + static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFIID riid, LPVOID *ppvObj) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); TRACE("%p %s\n", This, debugstr_guid(riid)); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { @@ -63,7 +73,7 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII static ULONG WINAPI EnumFormatImpl_AddRef(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; @@ -71,7 +81,7 @@ static ULONG WINAPI EnumFormatImpl_AddRef(IEnumFORMATETC *iface) static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -86,7 +96,7 @@ static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count = 0; TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); @@ -105,7 +115,7 @@ static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count = 0; TRACE("(%p)->(%d)\n", This, celt); @@ -116,7 +126,7 @@ static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt) static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)\n", This); This->cur = 0; @@ -125,7 +135,7 @@ static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFormatImpl_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); HRESULT hr; TRACE("(%p)->(%p)\n", This, ppenum); @@ -153,7 +163,7 @@ static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT fmtetc_cnt, I TRACE("\n"); ret = heap_alloc(sizeof(EnumFormatImpl)); - ret->lpVtbl = &VT_EnumFormatImpl; + ret->IEnumFORMATETC_iface.lpVtbl = &VT_EnumFormatImpl; ret->ref = 1; ret->cur = 0; ret->fmtetc_cnt = fmtetc_cnt; @@ -165,7 +175,7 @@ static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT fmtetc_cnt, I static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, LPVOID *ppvObj) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { @@ -179,7 +189,7 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r static ULONG WINAPI DataObjectImpl_AddRef(IDataObject* iface) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; @@ -187,7 +197,7 @@ static ULONG WINAPI DataObjectImpl_AddRef(IDataObject* iface) static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n",This, ref); @@ -203,7 +213,7 @@ static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); TRACE("(%p)->(fmt=0x%08x tym=0x%08x)\n", This, pformatetc->cfFormat, pformatetc->tymed); if(pformatetc->lindex != -1) @@ -227,14 +237,14 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor static HRESULT WINAPI DataObjectImpl_GetDataHere(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p): stub\n", This); return E_NOTIMPL; } static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC *pformatetc) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); UINT i; BOOL foundFormat = FALSE; TRACE("(%p)->(fmt=0x%08x tym=0x%08x)\n", This, pformatetc->cfFormat, pformatetc->tymed); @@ -255,7 +265,7 @@ static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC static HRESULT WINAPI DataObjectImpl_GetCanonicalFormatEtc(IDataObject* iface, FORMATETC *pformatetcIn, FORMATETC *pformatetcOut) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); TRACE("(%p)->(%p,%p)\n", This, pformatetcIn, pformatetcOut); if(pformatetcOut) { @@ -268,7 +278,7 @@ static HRESULT WINAPI DataObjectImpl_GetCanonicalFormatEtc(IDataObject* iface, F static HRESULT WINAPI DataObjectImpl_SetData(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium, BOOL fRelease) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p): stub\n", This); return E_NOTIMPL; } @@ -276,7 +286,7 @@ static HRESULT WINAPI DataObjectImpl_SetData(IDataObject* iface, FORMATETC *pfor static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); TRACE("(%p)->(%d)\n", This, dwDirection); if(dwDirection != DATADIR_GET) { @@ -291,21 +301,21 @@ static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwD static HRESULT WINAPI DataObjectImpl_DAdvise(IDataObject* iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p): stub\n", This); return E_NOTIMPL; } static HRESULT WINAPI DataObjectImpl_DUnadvise(IDataObject* iface, DWORD dwConnection) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p): stub\n", This); return E_NOTIMPL; } static HRESULT WINAPI DataObjectImpl_EnumDAdvise(IDataObject* iface, IEnumSTATDATA **ppenumAdvise) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p): stub\n", This); return E_NOTIMPL; } @@ -399,7 +409,7 @@ HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, if(cfRTF == 0) cfRTF = RegisterClipboardFormatA("Rich Text Format"); - obj->lpVtbl = &VT_DataObjectImpl; + obj->IDataObject_iface.lpVtbl = &VT_DataObjectImpl; obj->ref = 1; obj->unicode = get_unicode_text(editor, start, nChars); obj->rtf = NULL;

1 0

Francois Gouget : winetest: Add a trace in the log when skipping a subtest.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: aa424f8159b02f2215886e4c58975b91f191cab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa424f8159b02f2215886e4c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 9 12:05:19 2010 +0100 winetest: Add a trace in the log when skipping a subtest. --- programs/winetest/main.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 883006c..6f922ef 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -575,8 +575,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) test->subtests = heap_realloc (test->subtests, allocated * sizeof(char*)); } - if (!test_filtered_out( test->name, index )) - test->subtests[test->subtest_count++] = heap_strdup(index); + test->subtests[test->subtest_count++] = heap_strdup(index); index = strtok (NULL, whitespace); } test->subtests = heap_realloc (test->subtests, @@ -592,14 +591,23 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) static void run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const char *tempdir) { - int status; const char* file = get_test_source_file(test->name, subtest); - char *cmd = strmake (NULL, "%s %s", test->exename, subtest); - xprintf ("%s:%s start %s -\n", test->name, subtest, file); - status = run_ex (cmd, out_file, tempdir, 120000); - heap_free (cmd); - xprintf ("%s:%s done (%d)\n", test->name, subtest, status); + if (test_filtered_out( test->name, subtest )) + { + report (R_STEP, "Skipping: %s:%s", test->name, subtest); + xprintf ("%s:%s skipped %s -\n", test->name, subtest, file); + } + else + { + int status; + char *cmd = strmake (NULL, "%s %s", test->exename, subtest); + report (R_STEP, "Running: %s:%s", test->name, subtest); + xprintf ("%s:%s start %s -\n", test->name, subtest, file); + status = run_ex (cmd, out_file, tempdir, 120000); + heap_free (cmd); + xprintf ("%s:%s done (%d)\n", test->name, subtest, status); + } } static BOOL CALLBACK @@ -924,9 +932,7 @@ run_tests (char *logname, char *outdir) for (j = 0; j < test->subtest_count; j++) { if (aborting) break; - report (R_STEP, "Running: %s:%s", test->name, - test->subtests[j]); - run_test (test, test->subtests[j], logfile, tempdir); + run_test (test, test->subtests[j], logfile, tempdir); } if (test->maindllpath) {

1 0

Michael Stefaniuc : itss: Standardize the COM usage in storage.c.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 965aea8d8ea768db1a5268e39af7bec54a6ba1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965aea8d8ea768db1a5268e39… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:31 2010 +0100 itss: Standardize the COM usage in storage.c. --- dlls/itss/storage.c | 73 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 79c863a..4f687c6 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); typedef struct _ITSS_IStorageImpl { - const IStorageVtbl *vtbl_IStorage; + IStorage IStorage_iface; LONG ref; struct chmFile *chmfile; WCHAR dir[1]; @@ -59,20 +59,35 @@ struct enum_info typedef struct _IEnumSTATSTG_Impl { - const IEnumSTATSTGVtbl *vtbl_IEnumSTATSTG; + IEnumSTATSTG IEnumSTATSTG_iface; LONG ref; struct enum_info *first, *last, *current; } IEnumSTATSTG_Impl; typedef struct _IStream_Impl { - const IStreamVtbl *vtbl_IStream; + IStream IStream_iface; LONG ref; ITSS_IStorageImpl *stg; ULONGLONG addr; struct chmUnitInfo ui; } IStream_Impl; +static inline ITSS_IStorageImpl *impl_from_IStorage(IStorage *iface) +{ + return CONTAINING_RECORD(iface, ITSS_IStorageImpl, IStorage_iface); +} + +static inline IEnumSTATSTG_Impl *impl_from_IEnumSTATSTG(IEnumSTATSTG *iface) +{ + return CONTAINING_RECORD(iface, IEnumSTATSTG_Impl, IEnumSTATSTG_iface); +} + +static inline IStream_Impl *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, IStream_Impl, IStream_iface); +} + static HRESULT ITSS_create_chm_storage( struct chmFile *chmfile, const WCHAR *dir, IStorage** ppstgOpen ); static IStream_Impl* ITSS_create_stream( @@ -85,7 +100,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_QueryInterface( REFIID riid, void** ppvObject) { - IEnumSTATSTG_Impl *This = (IEnumSTATSTG_Impl *)iface; + IEnumSTATSTG_Impl *This = impl_from_IEnumSTATSTG(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumSTATSTG)) @@ -102,14 +117,14 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_QueryInterface( static ULONG WINAPI ITSS_IEnumSTATSTG_AddRef( IEnumSTATSTG* iface) { - IEnumSTATSTG_Impl *This = (IEnumSTATSTG_Impl *)iface; + IEnumSTATSTG_Impl *This = impl_from_IEnumSTATSTG(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI ITSS_IEnumSTATSTG_Release( IEnumSTATSTG* iface) { - IEnumSTATSTG_Impl *This = (IEnumSTATSTG_Impl *)iface; + IEnumSTATSTG_Impl *This = impl_from_IEnumSTATSTG(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -134,7 +149,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Next( STATSTG* rgelt, ULONG* pceltFetched) { - IEnumSTATSTG_Impl *This = (IEnumSTATSTG_Impl *)iface; + IEnumSTATSTG_Impl *This = impl_from_IEnumSTATSTG(iface); DWORD len, n; struct enum_info *cur; @@ -186,7 +201,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Skip( IEnumSTATSTG* iface, ULONG celt) { - IEnumSTATSTG_Impl *This = (IEnumSTATSTG_Impl *)iface; + IEnumSTATSTG_Impl *This = impl_from_IEnumSTATSTG(iface); DWORD n; struct enum_info *cur; @@ -210,7 +225,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Skip( static HRESULT WINAPI ITSS_IEnumSTATSTG_Reset( IEnumSTATSTG* iface) { - IEnumSTATSTG_Impl *This = (IEnumSTATSTG_Impl *)iface; + IEnumSTATSTG_Impl *This = impl_from_IEnumSTATSTG(iface); TRACE("%p\n", This ); @@ -243,7 +258,7 @@ static IEnumSTATSTG_Impl *ITSS_create_enum( void ) IEnumSTATSTG_Impl *stgenum; stgenum = HeapAlloc( GetProcessHeap(), 0, sizeof (IEnumSTATSTG_Impl) ); - stgenum->vtbl_IEnumSTATSTG = &IEnumSTATSTG_vtbl; + stgenum->IEnumSTATSTG_iface.lpVtbl = &IEnumSTATSTG_vtbl; stgenum->ref = 1; stgenum->first = NULL; stgenum->last = NULL; @@ -262,7 +277,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_QueryInterface( REFIID riid, void** ppvObject) { - ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; + ITSS_IStorageImpl *This = impl_from_IStorage(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IStorage)) @@ -279,14 +294,14 @@ static HRESULT WINAPI ITSS_IStorageImpl_QueryInterface( static ULONG WINAPI ITSS_IStorageImpl_AddRef( IStorage* iface) { - ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; + ITSS_IStorageImpl *This = impl_from_IStorage(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI ITSS_IStorageImpl_Release( IStorage* iface) { - ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; + ITSS_IStorageImpl *This = impl_from_IStorage(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -320,7 +335,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStream( DWORD reserved2, IStream** ppstm) { - ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; + ITSS_IStorageImpl *This = impl_from_IStorage(iface); IStream_Impl *stm; DWORD len; struct chmUnitInfo ui; @@ -364,7 +379,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStream( if( !stm ) return E_FAIL; - *ppstm = (IStream*) stm; + *ppstm = &stm->IStream_iface; return S_OK; } @@ -390,7 +405,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( DWORD reserved, IStorage** ppstg) { - ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; + ITSS_IStorageImpl *This = impl_from_IStorage(iface); static const WCHAR szRoot[] = { '/', 0 }; struct chmFile *chmfile; WCHAR *path, *p; @@ -498,7 +513,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_EnumElements( DWORD reserved3, IEnumSTATSTG** ppenum) { - ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; + ITSS_IStorageImpl *This = impl_from_IStorage(iface); IEnumSTATSTG_Impl* stgenum; TRACE("%p %d %p %d %p\n", This, reserved1, reserved2, reserved3, ppenum ); @@ -515,7 +530,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_EnumElements( stgenum->current = stgenum->first; - *ppenum = (IEnumSTATSTG*) stgenum; + *ppenum = &stgenum->IEnumSTATSTG_iface; return S_OK; } @@ -607,12 +622,12 @@ static HRESULT ITSS_create_chm_storage( len = strlenW( dir ) + 1; stg = HeapAlloc( GetProcessHeap(), 0, sizeof (ITSS_IStorageImpl) + len*sizeof(WCHAR) ); - stg->vtbl_IStorage = &ITSS_IStorageImpl_Vtbl; + stg->IStorage_iface.lpVtbl = &ITSS_IStorageImpl_Vtbl; stg->ref = 1; stg->chmfile = chmfile; strcpyW( stg->dir, dir ); - *ppstgOpen = (IStorage*) stg; + *ppstgOpen = &stg->IStorage_iface; ITSS_LockModule(); return S_OK; @@ -645,7 +660,7 @@ static HRESULT WINAPI ITSS_IStream_QueryInterface( REFIID riid, void** ppvObject) { - IStream_Impl *This = (IStream_Impl *)iface; + IStream_Impl *This = impl_from_IStream(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ISequentialStream) @@ -663,20 +678,20 @@ static HRESULT WINAPI ITSS_IStream_QueryInterface( static ULONG WINAPI ITSS_IStream_AddRef( IStream* iface) { - IStream_Impl *This = (IStream_Impl *)iface; + IStream_Impl *This = impl_from_IStream(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI ITSS_IStream_Release( IStream* iface) { - IStream_Impl *This = (IStream_Impl *)iface; + IStream_Impl *This = impl_from_IStream(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) { - IStorage_Release( (IStorage*) This->stg ); + IStorage_Release( &This->stg->IStorage_iface ); HeapFree(GetProcessHeap(), 0, This); ITSS_UnlockModule(); } @@ -690,7 +705,7 @@ static HRESULT WINAPI ITSS_IStream_Read( ULONG cb, ULONG* pcbRead) { - IStream_Impl *This = (IStream_Impl *)iface; + IStream_Impl *This = impl_from_IStream(iface); ULONG count; TRACE("%p %p %u %p\n", This, pv, cb, pcbRead); @@ -720,7 +735,7 @@ static HRESULT WINAPI ITSS_IStream_Seek( DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { - IStream_Impl *This = (IStream_Impl *)iface; + IStream_Impl *This = impl_from_IStream(iface); LONGLONG newpos; TRACE("%p %s %u %p\n", This, @@ -809,7 +824,7 @@ static HRESULT WINAPI ITSS_IStream_Stat( STATSTG* pstatstg, DWORD grfStatFlag) { - IStream_Impl *This = (IStream_Impl *)iface; + IStream_Impl *This = impl_from_IStream(iface); TRACE("%p %p %d\n", This, pstatstg, grfStatFlag); @@ -858,12 +873,12 @@ static IStream_Impl *ITSS_create_stream( IStream_Impl *stm; stm = HeapAlloc( GetProcessHeap(), 0, sizeof (IStream_Impl) ); - stm->vtbl_IStream = &ITSS_IStream_vtbl; + stm->IStream_iface.lpVtbl = &ITSS_IStream_vtbl; stm->ref = 1; stm->addr = 0; stm->ui = *ui; stm->stg = stg; - IStorage_AddRef( (IStorage*) stg ); + IStorage_AddRef( &stg->IStorage_iface ); ITSS_LockModule();

1 0