wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

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 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 all the IServiceProvider ifaces .
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 389a7f547ec9f97a72b394078015a018fb49eb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=389a7f547ec9f97a72b394078… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 01:43:10 2010 +0100 mshtml: COM cleanup for all the IServiceProvider ifaces. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 22 ++++++++++++---------- dlls/mshtml/mshtml_private.h | 5 ++--- dlls/mshtml/navigate.c | 21 +++++++++++---------- dlls/mshtml/pluginhost.c | 3 ++- dlls/mshtml/script.c | 21 +++++++++++---------- dlls/mshtml/service.c | 17 ++++++++++------- 7 files changed, 49 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=389a7f547ec9f97a72b39…

1 0

Nikolay Sivov : oleaut32: Get rid of some magic offset values, use structure for that.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 22022d13d154b194d328294f31db7dc13a09d0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22022d13d154b194d328294f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 27 03:43:19 2010 +0300 oleaut32: Get rid of some magic offset values, use structure for that. --- dlls/oleaut32/typelib.c | 25 ++++++++++++++----------- dlls/oleaut32/typelib.h | 3 +-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 36328a6..72e1932 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2094,7 +2094,7 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, { int infolen, nameoffset, reclength; char recbuf[256]; - MSFT_VarRecord * pVarRec=(MSFT_VarRecord *) recbuf; + MSFT_VarRecord *pVarRec = (MSFT_VarRecord*)recbuf; int i; int recoffset; @@ -2111,17 +2111,20 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, offset + infolen + (2*cFuncs + cVars + i + 1) * sizeof(INT)); (*pptvd)->Name=MSFT_ReadName(pcx, nameoffset); /* read the variable information record */ - MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); - reclength &=0xff; - MSFT_ReadLEDWords(pVarRec, reclength - sizeof(INT), pcx, DO_NOT_SEEK); - /* Optional data */ - if(reclength >(6*sizeof(INT)) ) - (*pptvd)->HelpContext=pVarRec->HelpContext; - if(reclength >(7*sizeof(INT)) ) + MSFT_ReadLEDWords(&reclength, sizeof(pVarRec->Info), pcx, recoffset); + reclength &= 0xff; + MSFT_ReadLEDWords(&pVarRec->DataType, reclength - FIELD_OFFSET(MSFT_VarRecord, DataType), pcx, DO_NOT_SEEK); + + /* optional data */ + if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpContext)) + (*pptvd)->HelpContext = pVarRec->HelpContext; + + if(reclength > FIELD_OFFSET(MSFT_VarRecord, oHelpString)) (*pptvd)->HelpString = MSFT_ReadString(pcx, pVarRec->oHelpString) ; - if(reclength >(8*sizeof(INT)) ) - if(reclength >(9*sizeof(INT)) ) - (*pptvd)->HelpStringContext=pVarRec->HelpStringContext; + + if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpStringContext)) + (*pptvd)->HelpStringContext = pVarRec->HelpStringContext; + /* fill the VarDesc Structure */ MSFT_ReadLEDWords(&(*pptvd)->vardesc.memid, sizeof(INT), pcx, offset + infolen + (cFuncs + i + 1) * sizeof(INT)); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 3b5f09b..210db33 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -231,7 +231,7 @@ typedef struct { /* Variable description data */ typedef struct { -/* INT recsize; // record size including some xtra stuff */ + INT Info; /* record size including some extra stuff */ INT DataType; /* data type of the variable */ INT Flags; /* VarFlags (LOWORD) */ #ifdef WORDS_BIGENDIAN @@ -250,7 +250,6 @@ typedef struct { INT res9; /* unknown (-1) */ INT oCustData; /* custom data for variable */ INT HelpStringContext; - } MSFT_VarRecord; /* Structure of the reference data */

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

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: 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: Add a helper to return INVOKEKIND flags value.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: b6313c702e6c7b43d58a47c9f2f2bcf7d6d9e57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6313c702e6c7b43d58a47c9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 25 04:25:09 2010 +0300 oleaut32: Add a helper to return INVOKEKIND flags value. --- dlls/oleaut32/typelib2.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 9b3015b..78192b1 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -240,6 +240,13 @@ static inline UINT cti2_get_func_count(const MSFT_TypeInfoBase *typeinfo) return typeinfo->cElement & 0xFFFF; } +/* NOTE: entry always assumed to be a function */ +static inline INVOKEKIND ctl2_get_invokekind(const CyclicList *func) +{ + /* INVOKEKIND uses bit flags up to 8 */ + return (func->u.data[4] >> 3) & 0xF; +} + /**************************************************************************** * ctl2_init_header * @@ -2348,17 +2355,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( break; /* cNames == cParams for put or putref accessor, cParams+1 otherwise */ - if(cNames != iter->u.data[5] + ((iter->u.data[4]>>3)&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF) ? 0 : 1)) + if(cNames != iter->u.data[5] + (ctl2_get_invokekind(iter) & (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF) ? 0 : 1)) return TYPE_E_ELEMENTNOTFOUND; + 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 */ if (iter2->type == CyclicListFunc) { - INT inv1 = iter2->u.data[4] >> 3; - INT inv2 = iter->u.data[4] >> 3; + INVOKEKIND inv1 = ctl2_get_invokekind(iter2); + INVOKEKIND inv2 = ctl2_get_invokekind(iter); + if (((inv1&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv2&INVOKE_PROPERTYGET)) || ((inv2&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv1&INVOKE_PROPERTYGET))) continue; @@ -2801,13 +2810,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( for(i=0; i< cti2_get_func_count(This->typeinfo); i++) { if(typedata[i]->u.data[4]>>16 > i) { - int inv; + INVOKEKIND inv = ctl2_get_invokekind(typedata[i]); - inv = (typedata[i]->u.data[4]>>3) & 0xf; i = typedata[i]->u.data[4] >> 16; while(i > typedata[i]->u.data[4]>>16) { - int invkind = (typedata[i]->u.data[4]>>3) & 0xf; + INVOKEKIND invkind = ctl2_get_invokekind(typedata[i]); if(inv & invkind) { HeapFree(GetProcessHeap(), 0, typedata);

1 0

Eric Pouech : msvcr90: Fix an integer overflow on 64 bit system for qsort_s tests.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: cecddb321628e80d416b40a2f2eac2fded9dcb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecddb321628e80d416b40a2f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 18:00:20 2010 +0100 msvcr90: Fix an integer overflow on 64 bit system for qsort_s tests. --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 449c0bc..24a6517 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -509,7 +509,7 @@ static void test_qsort_s(void) /* overflow without side effects, other overflow values crash */ g_qsort_s_context_counter = 0; - p_qsort_s((void*)arr2, (1 << (8*sizeof(size_t) - 1)) + 1, sizeof(int), intcomparefunc, &g_qsort_s_context_counter); + p_qsort_s((void*)arr2, (((size_t)1) << (8*sizeof(size_t) - 1)) + 1, sizeof(int), intcomparefunc, &g_qsort_s_context_counter); ok(g_qsort_s_context_counter == 0, "callback shouldn't have been called\n"); ok(arr2[0] == 23, "should remain unsorted, arr2[0] is %d\n", arr2[0]); ok(arr2[1] == 42, "should remain unsorted, arr2[1] is %d\n", arr2[1]);

1 0

Eric Pouech : urlmon: Fixed traces on 64bit systems.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 495e55c07d10cb6d1bf18b29da4e9e234ed6afc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495e55c07d10cb6d1bf18b29d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 18:00:14 2010 +0100 urlmon: Fixed traces on 64bit systems. --- dlls/urlmon/uri.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 681327f..825c6c5 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1818,7 +1818,7 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) TRACE("(%p %p %x): Found valid IPv6 literal %s len=%d\n", ptr, data, flags, debugstr_wn(start, *ptr-start), - *ptr-start); + (int)(*ptr-start)); return TRUE; } @@ -1860,7 +1860,7 @@ static BOOL parse_ipvfuture(const WCHAR **ptr, parse_data *data, DWORD flags) { data->host_type = Uri_HOST_UNKNOWN; TRACE("(%p %p %x): Parsed IPvFuture address %s len=%d\n", ptr, data, flags, - debugstr_wn(start, *ptr-start), *ptr-start); + debugstr_wn(start, *ptr-start), (int)(*ptr-start)); return TRUE; }

1 0

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 December 2010