December 2010 - Wine-commits

Michael Stefaniuc : mshtml: COM cleanup for all the IOleCommandTarget ifaces.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 541a49edc2302f2036af689608011dee91089544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=541a49edc2302f2036af68960… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 01:44:54 2010 +0100 mshtml: COM cleanup for all the IOleCommandTarget ifaces. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/olecmd.c | 26 +++++++++++++++----------- dlls/mshtml/txtrange.c | 21 ++++++++++++--------- dlls/mshtml/view.c | 4 ++-- 5 files changed, 31 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=541a49edc2302f2036af6…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IOleControl iface.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 6c7a78eca038d841fe19acdd2bd9a1cea244c1ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7a78eca038d841fe19acdd2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 01:46:09 2010 +0100 mshtml: COM cleanup for the IOleControl iface. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/oleobj.c | 32 +++++++++++++++++--------------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f1cdd4f..ff07d0d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1779,7 +1779,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IOleCommandTarget_iface; }else if(IsEqualGUID(&IID_IOleControl, riid)) { TRACE("(%p)->(IID_IOleControl, %p)\n", This, ppv); - *ppv = CONTROL(This); + *ppv = &This->IOleControl_iface; }else if(IsEqualGUID(&IID_IHlinkTarget, riid)) { TRACE("(%p)->(IID_IHlinkTarget, %p)\n", This, ppv); *ppv = HLNKTARGET(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7c99f36..b44dce4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -359,7 +359,7 @@ struct HTMLDocument { IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; IServiceProvider IServiceProvider_iface; IOleCommandTarget IOleCommandTarget_iface; - const IOleControlVtbl *lpOleControlVtbl; + IOleControl IOleControl_iface; const IHlinkTargetVtbl *lpHlinkTargetVtbl; IPersistStreamInit IPersistStreamInit_iface; const IDispatchExVtbl *lpIDispatchExVtbl; @@ -625,7 +625,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define CONTROL(x) ((IOleControl*) &(x)->lpOleControlVtbl) #define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 166af0c..2aa30f1 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -216,9 +216,10 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite } if(This->doc_obj->usermode == UNKNOWN_USERMODE) - IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERMODE); + IOleControl_OnAmbientPropertyChange(&This->IOleControl_iface, DISPID_AMBIENT_USERMODE); - IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_OFFLINEIFNOTCONNECTED); + IOleControl_OnAmbientPropertyChange(&This->IOleControl_iface, + DISPID_AMBIENT_OFFLINEIFNOTCONNECTED); hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_SILENT, &silent); if(SUCCEEDED(hres)) { @@ -228,8 +229,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite FIXME("silent == true\n"); } - IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERAGENT); - IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_PALETTE); + IOleControl_OnAmbientPropertyChange(&This->IOleControl_iface, DISPID_AMBIENT_USERAGENT); + IOleControl_OnAmbientPropertyChange(&This->IOleControl_iface, DISPID_AMBIENT_PALETTE); return S_OK; } @@ -573,36 +574,39 @@ static const IOleDocumentVtbl OleDocumentVtbl = { * IOleControl implementation */ -#define CONTROL_THIS(iface) DEFINE_THIS(HTMLDocument, OleControl, iface) +static inline HTMLDocument *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IOleControl_iface); +} static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) { - HTMLDocument *This = CONTROL_THIS(iface); + HTMLDocument *This = impl_from_IOleControl(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI OleControl_AddRef(IOleControl *iface) { - HTMLDocument *This = CONTROL_THIS(iface); + HTMLDocument *This = impl_from_IOleControl(iface); return htmldoc_addref(This); } static ULONG WINAPI OleControl_Release(IOleControl *iface) { - HTMLDocument *This = CONTROL_THIS(iface); + HTMLDocument *This = impl_from_IOleControl(iface); return htmldoc_release(This); } static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) { - HTMLDocument *This = CONTROL_THIS(iface); + HTMLDocument *This = impl_from_IOleControl(iface); FIXME("(%p)->(%p)\n", This, pCI); return E_NOTIMPL; } static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *pMsg) { - HTMLDocument *This = CONTROL_THIS(iface); + HTMLDocument *This = impl_from_IOleControl(iface); FIXME("(%p)->(%p)\n", This, pMsg); return E_NOTIMPL; } @@ -644,7 +648,7 @@ static HRESULT on_change_dlcontrol(HTMLDocument *This) static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) { - HTMLDocument *This = CONTROL_THIS(iface); + HTMLDocument *This = impl_from_IOleControl(iface); IOleClientSite *client; VARIANT res; HRESULT hres; @@ -734,13 +738,11 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL bFreeze) { - HTMLDocument *This = CONTROL_THIS(iface); + HTMLDocument *This = impl_from_IOleControl(iface); FIXME("(%p)->(%x)\n", This, bFreeze); return E_NOTIMPL; } -#undef CONTROL_THIS - static const IOleControlVtbl OleControlVtbl = { OleControl_QueryInterface, OleControl_AddRef, @@ -873,7 +875,7 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) { This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IOleDocument_iface.lpVtbl = &OleDocumentVtbl; - This->lpOleControlVtbl = &OleControlVtbl; + This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->lpObjectWithSiteVtbl = &ObjectWithSiteVtbl; This->IOleContainer_iface.lpVtbl = &OleContainerVtbl; }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHlinkTarget iface.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: a8bb1ab85b697c97e962a2f829b6a6c415a9c233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8bb1ab85b697c97e962a2f82… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 01:47:29 2010 +0100 mshtml: COM cleanup for the IHlinkTarget iface. --- dlls/mshtml/hlink.c | 23 +++++++++++++---------- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index 900a0ec..965318f 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -36,43 +36,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); * IHlinkTarget implementation */ -#define HLINKTRG_THIS(iface) DEFINE_THIS(HTMLDocument, HlinkTarget, iface) +static inline HTMLDocument *impl_from_IHlinkTarget(IHlinkTarget *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IHlinkTarget_iface); +} static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); return htmldoc_addref(This); } static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); return htmldoc_release(This); } static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext *pihlbc) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); FIXME("(%p)->(%p)\n", This, pihlbc); return E_NOTIMPL; } static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext **ppihlbc) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); FIXME("(%p)->(%p)\n", This, ppihlbc); return E_NOTIMPL; } static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, LPCWSTR pwzJumpLocation) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation)); @@ -87,7 +90,7 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLocation, DWORD dwAssign, IMoniker **ppimkLocation) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation); return E_NOTIMPL; } @@ -95,7 +98,7 @@ static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLoc static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, LPCWSTR pwzLocation, LPWSTR *ppwzFriendlyName) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwzLocation), ppwzFriendlyName); return E_NOTIMPL; } @@ -113,5 +116,5 @@ static const IHlinkTargetVtbl HlinkTargetVtbl = { void HTMLDocument_Hlink_Init(HTMLDocument *This) { - This->lpHlinkTargetVtbl = &HlinkTargetVtbl; + This->IHlinkTarget_iface.lpVtbl = &HlinkTargetVtbl; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ff07d0d..c25f7f3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1782,7 +1782,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IOleControl_iface; }else if(IsEqualGUID(&IID_IHlinkTarget, riid)) { TRACE("(%p)->(IID_IHlinkTarget, %p)\n", This, ppv); - *ppv = HLNKTARGET(This); + *ppv = &This->IHlinkTarget_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = CONPTCONT(&This->cp_container); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b44dce4..97940e2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -360,7 +360,7 @@ struct HTMLDocument { IServiceProvider IServiceProvider_iface; IOleCommandTarget IOleCommandTarget_iface; IOleControl IOleControl_iface; - const IHlinkTargetVtbl *lpHlinkTargetVtbl; + IHlinkTarget IHlinkTarget_iface; IPersistStreamInit IPersistStreamInit_iface; const IDispatchExVtbl *lpIDispatchExVtbl; const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; @@ -625,7 +625,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) #define OBJSITE(x) ((IObjectWithSite*) &(x)->lpObjectWithSiteVtbl)

1 0

Michael Stefaniuc : mshtml: COM cleanup for the ISupportErrorInfo iface.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 2efc64fbc245a28f0e1f5dbd5e4d4b6265749133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2efc64fbc245a28f0e1f5dbd5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 01:48:10 2010 +0100 mshtml: COM cleanup for the ISupportErrorInfo iface. --- dlls/mshtml/htmldoc.c | 15 +++++++++------ dlls/mshtml/mshtml_private.h | 4 +--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c25f7f3..466fc05 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1511,23 +1511,26 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) update_cp_events(This->window, &This->doc_node->node.event_target, cp, This->doc_node->node.nsnode); } -#define SUPPINFO_THIS(iface) DEFINE_THIS(HTMLDocument, SupportErrorInfo, iface) +static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, ISupportErrorInfo_iface); +} static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **ppv) { - HTMLDocument *This = SUPPINFO_THIS(iface); + HTMLDocument *This = impl_from_ISupportErrorInfo(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface) { - HTMLDocument *This = SUPPINFO_THIS(iface); + HTMLDocument *This = impl_from_ISupportErrorInfo(iface); return htmldoc_addref(This); } static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface) { - HTMLDocument *This = SUPPINFO_THIS(iface); + HTMLDocument *This = impl_from_ISupportErrorInfo(iface); return htmldoc_release(This); } @@ -1794,7 +1797,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDocument2_iface; }else if(IsEqualGUID(&IID_ISupportErrorInfo, riid)) { TRACE("(%p)->(IID_ISupportErrorInfo %p)\n", This, ppv); - *ppv = SUPPERRINFO(This); + *ppv = &This->ISupportErrorInfo_iface; }else if(IsEqualGUID(&IID_IPersistHistory, riid)) { TRACE("(%p)->(IID_IPersistHistory %p)\n", This, ppv); *ppv = &This->IPersistHistory_iface; @@ -1837,7 +1840,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) { doc->IHTMLDocument2_iface.lpVtbl = &HTMLDocumentVtbl; doc->lpIDispatchExVtbl = &DocDispatchExVtbl; - doc->lpSupportErrorInfoVtbl = &SupportErrorInfoVtbl; + doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->unk_impl = unk_impl; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 97940e2..355c325 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -363,7 +363,7 @@ struct HTMLDocument { IHlinkTarget IHlinkTarget_iface; IPersistStreamInit IPersistStreamInit_iface; const IDispatchExVtbl *lpIDispatchExVtbl; - const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; + ISupportErrorInfo ISupportErrorInfo_iface; const IObjectWithSiteVtbl *lpObjectWithSiteVtbl; IOleContainer IOleContainer_iface; @@ -668,8 +668,6 @@ struct HTMLDocumentNode { #define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) -#define SUPPERRINFO(x) ((ISupportErrorInfo*) &(x)->lpSupportErrorInfoVtbl) - #define HOSTSECMGR(x) ((IInternetHostSecurityManager*) &(x)->lpIInternetHostSecurityManagerVtbl) #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc)))

1 0

Nikolay Sivov : oleaut32: Allow all property methods to have the same name.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 069b8e50ebd0f6d03b14d4f6efcb910172641135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069b8e50ebd0f6d03b14d4f6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 25 17:56:11 2010 +0300 oleaut32: Allow all property methods to have the same name. --- dlls/oleaut32/tests/typelib.c | 70 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 16 +++++---- 2 files changed, 79 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2eb1147..a5535f3 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2929,6 +2929,75 @@ static void test_SetVarHelpContext(void) DeleteFileA(filenameA); } +static void test_SetFuncAndParamNames(void) +{ + static OLECHAR nameW[] = {'n','a','m','e',0}; + static OLECHAR prop[] = {'p','r','o','p',0}; + static OLECHAR *propW[] = {prop}; + CHAR filenameA[MAX_PATH]; + WCHAR filenameW[MAX_PATH]; + ICreateTypeLib2 *ctl; + ICreateTypeInfo *cti; + FUNCDESC funcdesc; + ELEMDESC edesc; + HRESULT hr; + + GetTempFileNameA(".", "tlb", 0, filenameA); + MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filenameW, MAX_PATH); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &ctl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl, nameW, TKIND_DISPATCH, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + /* get method */ + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_DISPATCH; + funcdesc.callconv = CC_STDCALL; + funcdesc.elemdescFunc.tdesc.vt = VT_VOID; + funcdesc.wFuncFlags = FUNCFLAG_FBINDABLE; + + /* put method */ + memset(&edesc, 0, sizeof(edesc)); + edesc.tdesc.vt = VT_BSTR; + U(edesc).idldesc.dwReserved = 0; + U(edesc).idldesc.wIDLFlags = IDLFLAG_FIN; + + funcdesc.lprgelemdescParam = &edesc; + funcdesc.invkind = INVOKE_PROPERTYPUT; + funcdesc.cParams = 1; + + hr = ICreateTypeInfo_AddFuncDesc(cti, 0, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* setter name */ + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 0, propW, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* putref method */ + funcdesc.invkind = INVOKE_PROPERTYPUTREF; + hr = ICreateTypeInfo_AddFuncDesc(cti, 1, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* putref name */ + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 1, propW, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + funcdesc.invkind = INVOKE_PROPERTYGET; + funcdesc.cParams = 0; + hr = ICreateTypeInfo_AddFuncDesc(cti, 2, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* getter name */ + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 2, propW, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ICreateTypeInfo_Release(cti); + ICreateTypeLib2_Release(ctl); + DeleteFileA(filenameA); +} + START_TEST(typelib) { const char *filename; @@ -2946,6 +3015,7 @@ START_TEST(typelib) test_inheritance(); test_CreateTypeLib(); test_SetVarHelpContext(); + test_SetFuncAndParamNames(); if ((filename = create_test_typelib(2))) { diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 78192b1..70f0937 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2361,15 +2361,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( TRACE("function name %s\n", debugstr_w(names[0])); len = ctl2_encode_name(This->typelib, names[0], &namedata); for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { - if(iter2->name!=-1 && !memcmp(namedata, - This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len)) { - /* getters/setters can have a same name */ + + int cmp = memcmp(namedata, This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len); + if (iter2->name != -1 && cmp == 0) { if (iter2->type == CyclicListFunc) { - INVOKEKIND inv1 = ctl2_get_invokekind(iter2); - INVOKEKIND inv2 = ctl2_get_invokekind(iter); + INVOKEKIND inv1 = ctl2_get_invokekind(iter); + INVOKEKIND inv2 = ctl2_get_invokekind(iter2); - if (((inv1&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv2&INVOKE_PROPERTYGET)) || - ((inv2&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv1&INVOKE_PROPERTYGET))) + /* it's allowed to have PUT, PUTREF and GET methods with the same name */ + if ((inv1 != inv2) && + (inv1 & (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF|INVOKE_PROPERTYGET)) && + (inv2 & (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF|INVOKE_PROPERTYGET))) continue; }

1 0

Nikolay Sivov : oleaut32: Get SYSKIND value with a helper.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: c9249229356b4fef49b32b67c5ccbe6700dc350c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9249229356b4fef49b32b67c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 25 18:24:27 2010 +0300 oleaut32: Get SYSKIND value with a helper. --- dlls/oleaut32/typelib2.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 70f0937..8b59bf4 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -247,6 +247,11 @@ static inline INVOKEKIND ctl2_get_invokekind(const CyclicList *func) return (func->u.data[4] >> 3) & 0xF; } +static inline SYSKIND ctl2_get_syskind(const ICreateTypeLib2Impl *This) +{ + return This->typelib_header.varflags & 0xF; +} + /**************************************************************************** * ctl2_init_header * @@ -419,7 +424,7 @@ static int ctl2_encode_name( converted_name[1] = 0x00; - value = LHashValOfNameSysA(This->typelib_header.varflags & 0x0f, This->typelib_header.lcid, converted_name + 4); + value = LHashValOfNameSysA(ctl2_get_syskind(This), This->typelib_header.lcid, converted_name + 4); converted_name[2] = value; converted_name[3] = value >> 8; @@ -1140,7 +1145,7 @@ static int ctl2_encode_typedesc( case VT_INT: *encoded_tdesc = 0x80000000 | (VT_I4 << 16) | VT_INT; - if ((This->typelib_header.varflags & 0x0f) == SYS_WIN16) { + if (ctl2_get_syskind(This) == SYS_WIN16) { *width = 2; *alignment = 2; } else { @@ -1151,7 +1156,7 @@ static int ctl2_encode_typedesc( case VT_UINT: *encoded_tdesc = 0x80000000 | (VT_UI4 << 16) | VT_UINT; - if ((This->typelib_header.varflags & 0x0f) == SYS_WIN16) { + if (ctl2_get_syskind(This) == SYS_WIN16) { *width = 2; *alignment = 2; } else { @@ -4984,9 +4989,9 @@ static HRESULT WINAPI ITypeLib2_fnGetLibAttr( } (*ppTLibAttr)->lcid = This->typelib_header.lcid; - (*ppTLibAttr)->syskind = This->typelib_header.varflags&0x3; - (*ppTLibAttr)->wMajorVerNum = This->typelib_header.version&0xffff; - (*ppTLibAttr)->wMinorVerNum = This->typelib_header.version>>16; + (*ppTLibAttr)->syskind = ctl2_get_syskind(This); + (*ppTLibAttr)->wMajorVerNum = LOWORD(This->typelib_header.version); + (*ppTLibAttr)->wMinorVerNum = HIWORD(This->typelib_header.version); (*ppTLibAttr)->wLibFlags = This->typelib_header.flags; return S_OK; }

1 0

Nikolay Sivov : oleaut32: Move common define to a header.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 677302cf22dcab8e1ee9052c5f2a02cd6d07a194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=677302cf22dcab8e1ee9052c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 27 01:35:37 2010 +0300 oleaut32: Move common define to a header. --- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib.h | 5 ++++- dlls/oleaut32/typelib2.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0ea185c..36328a6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2744,7 +2744,7 @@ static HRESULT TLB_Mapping_Open(LPCWSTR path, LPVOID *ppBase, DWORD *pdwTLBLengt * find the type of the typelib file and map the typelib resource into * the memory */ -#define MSFT_SIGNATURE 0x5446534D /* "MSFT" */ + #define SLTG_SIGNATURE 0x47544c53 /* "SLTG" */ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib) { diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 058c6a2..3b5f09b 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -52,8 +52,11 @@ * it is at the beginning of a type lib file * */ + +#define MSFT_SIGNATURE 0x5446534D /* "MSFT" */ + typedef struct tagMSFT_Header { -/*0x00*/INT magic1; /* 0x5446534D "MSFT" */ +/*0x00*/INT magic1; /* 0x5446534D "MSFT" */ INT magic2; /* 0x00010002 version nr? */ INT posguid; /* position of libid in guid table */ /* (should be, else -1) */ diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8b59bf4..ce79254 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -260,7 +260,7 @@ static inline SYSKIND ctl2_get_syskind(const ICreateTypeLib2Impl *This) static void ctl2_init_header( ICreateTypeLib2Impl *This) /* [I] The typelib to initialize. */ { - This->typelib_header.magic1 = 0x5446534d; + This->typelib_header.magic1 = MSFT_SIGNATURE; This->typelib_header.magic2 = 0x00010002; This->typelib_header.posguid = -1; This->typelib_header.lcid = This->typelib_header.lcid2 = GetUserDefaultLCID();

1 0

Marcus Meissner : winealsa.drv: Re-add capcontrols initialization.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 4b5641add1d8d2184945a91d2c899164d59f8093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5641add1d8d2184945a91d2… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Dec 26 14:36:47 2010 +0100 winealsa.drv: Re-add capcontrols initialization. --- dlls/winealsa.drv/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 93c8927..90760eb 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -431,7 +431,7 @@ static void ALSA_MixerInit(void) info = HeapAlloc( GetProcessHeap(), 0, snd_ctl_card_info_sizeof()); for (x = 0; x < MAX_MIXERS; ++x) { - int card, err, capcontrols, total_elems = 0; + int card, err, capcontrols = 0, total_elems = 0; char cardind[6], cardname[10]; snd_ctl_t *ctl;

1 0

Eric Pouech : dbghelp: Fix ELF file computation on 64bit systems.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: cf06ef640d11798510c6e497999a219147f60600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf06ef640d11798510c6e4979… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 15:20:33 2010 +0100 dbghelp: Fix ELF file computation on 64bit systems. --- dlls/dbghelp/elf_module.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a0acb8f..b3502ca 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -102,8 +102,8 @@ const char* elf_map_section(struct image_section_map* ism) { struct elf_file_map* fmap = &ism->fmap->u.elf; - unsigned pgsz = getpagesize(); - unsigned ofst, size; + unsigned long pgsz = getpagesize(); + unsigned long ofst, size; assert(ism->fmap->modtype == DMT_ELF); if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum || @@ -168,8 +168,8 @@ void elf_unmap_section(struct image_section_map* ism) if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) { - unsigned pgsz = getpagesize(); - unsigned ofst, size; + unsigned long pgsz = getpagesize(); + unsigned long ofst, size; ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); size = ((fmap->sect[ism->sidx].shdr.sh_offset + @@ -236,7 +236,7 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) struct stat statbuf; int i; Elf_Phdr phdr; - unsigned tmp, page_mask = getpagesize() - 1; + unsigned long tmp, page_mask = getpagesize() - 1; char* filename; unsigned len; BOOL ret = FALSE;

1 0

Eric Pouech : winedbg: Don't print extra \n in print_basic.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: dc6b9c2a58c504e8bf54e34dcbe181e0a7137988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6b9c2a58c504e8bf54e34dc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 15:21:05 2010 +0100 winedbg: Don't print extra \n in print_basic. --- programs/winedbg/memory.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 1c8388c..de7bef9 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -546,7 +546,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) case 'd': dbg_print_longlong(res, TRUE); - dbg_printf("\n"); return; case 'c': @@ -570,7 +569,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) if (lvalue->type.id == dbg_itype_segptr) { dbg_print_longlong(types_extract_as_longlong(lvalue, NULL), TRUE); - dbg_printf("\n"); } else print_typed_basic(lvalue); }

1 0