May 2010 - Wine-commits - list.winehq.org

Andrey Turkin : oleaut32: Implement ITypeInfo::GetDocumentation.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 57c784e205609343dba274c9f123da9c414a0c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c784e205609343dba274c9f… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon May 17 02:27:14 2010 +0400 oleaut32: Implement ITypeInfo::GetDocumentation. --- dlls/oleaut32/tests/typelib.c | 49 +++++++++++++++++++++++-- dlls/oleaut32/typelib2.c | 81 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 124 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f0f577a..a081163 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -973,6 +973,7 @@ if(use_midl_tlb) { static void test_CreateTypeLib(void) { static const WCHAR stdoleW[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static OLECHAR typelibW[] = {'t','y','p','e','l','i','b',0}; + static OLECHAR helpfileW[] = {'C',':','\\','b','o','g','u','s','.','h','l','p',0}; static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; static OLECHAR interface2W[] = {'i','n','t','e','r','f','a','c','e','2',0}; static OLECHAR interface3W[] = {'i','n','t','e','r','f','a','c','e','3',0}; @@ -1052,16 +1053,19 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeLib_SetName(createtl, typelibW); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeLib_SetHelpFileName(createtl, helpfileW); + ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeLib_GetDocumentation(tl, -1, NULL, NULL, NULL, NULL); ok(hres == S_OK, "got %08x\n", hres); - hres = ITypeLib_GetDocumentation(tl, -1, &name, NULL, NULL, NULL); + hres = ITypeLib_GetDocumentation(tl, -1, &name, NULL, NULL, &helpfile); ok(hres == S_OK, "got %08x\n", hres); ok(!memcmp(name, typelibW, sizeof(typelibW)), "name = %s\n", wine_dbgstr_w(name)); + ok(!memcmp(helpfile, helpfileW, sizeof(helpfileW)), "helpfile = %s\n", wine_dbgstr_w(helpfile)); SysFreeString(name); - - ITypeLib_Release(tl); + SysFreeString(helpfile); hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); @@ -1069,9 +1073,33 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface1); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeLib_GetDocumentation(tl, 0, &name, NULL, NULL, NULL); + ok(hres == S_OK, "got %08x\n", hres); + ok(!memcmp(name, interface1W, sizeof(interface1W)), "name = %s\n", wine_dbgstr_w(name)); + + SysFreeString(name); + + ITypeLib_Release(tl); + + name = (BSTR)0xdeadbeef; + helpfile = (BSTR)0xdeadbeef; + hres = ITypeInfo_GetDocumentation(interface1, -1, &name, &docstring, &helpcontext, &helpfile); + ok(hres == S_OK, "got %08x\n", hres); + ok(!memcmp(name, interface1W, sizeof(interface1W)), "name = %s\n", wine_dbgstr_w(name)); + ok(docstring == NULL, "docstring != NULL\n"); + ok(helpcontext == 0, "helpcontext != 0\n"); + ok(!memcmp(helpfile, helpfileW, sizeof(helpfileW)), "helpfile = %s\n", wine_dbgstr_w(helpfile)); + + SysFreeString(name); + SysFreeString(helpfile); + + hres = ITypeInfo_GetDocumentation(interface1, 0, &name, NULL, NULL, NULL); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + hres = ITypeInfo_GetRefTypeInfo(interface1, 0, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); + hres = ICreateTypeInfo_LayOut(createti); ok(hres == S_OK, "got %08x\n", hres); @@ -1212,6 +1240,15 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetDocumentation(interface1, 0, &name, &docstring, &helpcontext, &helpfile); + ok(hres == S_OK, "got %08x\n", hres); + ok(name == NULL, "name != NULL\n"); + ok(docstring == NULL, "docstring != NULL\n"); + ok(helpcontext == 0x201, "helpcontext != 0x201\n"); + ok(!memcmp(helpfile, helpfileW, sizeof(helpfileW)), "helpfile = %s\n", wine_dbgstr_w(helpfile)); + + SysFreeString(helpfile); + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 1000, NULL, 1); ok(hres == E_INVALIDARG, "got %08x\n", hres); @@ -1227,6 +1264,12 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names1, 1); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetDocumentation(interface1, 0, &name, NULL, NULL, NULL); + ok(hres == S_OK, "got %08x\n", hres); + ok(!memcmp(name, func1W, sizeof(func1W)), "name = %s\n", wine_dbgstr_w(name)); + + SysFreeString(name); + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 3, names2, 3); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 22a3a23..c870b4f 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3163,8 +3163,83 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation( DWORD* pdwHelpContext, BSTR* pBstrHelpFile) { - FIXME("(%p,%d,%p,%p,%p,%p), stub!\n", iface, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface); + HRESULT status = TYPE_E_ELEMENTNOTFOUND; + INT nameoffset, docstringoffset, helpcontext; + + TRACE("(%p,%d,%p,%p,%p,%p)\n", iface, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + + if (memid == -1) + { + nameoffset = This->typeinfo->NameOffset; + docstringoffset = This->typeinfo->docstringoffs; + helpcontext = This->typeinfo->helpcontext; + status = S_OK; + } else { + CyclicList *iter; + if (This->typedata) { + for(iter=This->typedata->next->next; iter!=This->typedata->next; iter=iter->next) { + if (iter->indice == memid) { + const int *typedata = iter->u.data; + int size = typedata[0] - typedata[5]*(typedata[4]&0x1000?16:12); + + nameoffset = iter->name; + /* FIXME implement this once SetFuncDocString is implemented */ + docstringoffset = -1; + helpcontext = (size < 7*sizeof(int)) ? 0 : typedata[6]; + + status = S_OK; + break; + } + } + } + } + + if (!status) { + WCHAR *string; + if (pBstrName) { + if (nameoffset == -1) + *pBstrName = NULL; + else { + MSFT_NameIntro *name = (MSFT_NameIntro*)&This->typelib-> + typelib_segment_data[MSFT_SEG_NAME][nameoffset]; + ctl2_decode_name((char*)&name->namelen, &string); + *pBstrName = SysAllocString(string); + if(!*pBstrName) + return E_OUTOFMEMORY; + } + } + + if (pBstrDocString) { + if (docstringoffset == -1) + *pBstrDocString = NULL; + else { + MSFT_NameIntro *name = (MSFT_NameIntro*)&This->typelib-> + typelib_segment_data[MSFT_SEG_NAME][docstringoffset]; + ctl2_decode_name((char*)&name->namelen, &string); + *pBstrDocString = SysAllocString(string); + if(!*pBstrDocString) { + if (pBstrName) SysFreeString(*pBstrName); + return E_OUTOFMEMORY; + } + } + } + + if (pdwHelpContext) { + *pdwHelpContext = helpcontext; + } + + if (pBstrHelpFile) { + status = ITypeLib_GetDocumentation((ITypeLib*)&This->typelib->lpVtblTypeLib2, + -1, NULL, NULL, NULL, pBstrHelpFile); + if (status) { + if (pBstrName) SysFreeString(*pBstrName); + if (pBstrDocString) SysFreeString(*pBstrDocString); + } + } + } + + return status; } /****************************************************************************** @@ -4549,7 +4624,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation( if(!iter) return TYPE_E_ELEMENTNOTFOUND; - return ITypeInfo_GetDocumentation((ITypeInfo*)iter->lpVtblTypeInfo2, + return ITypeInfo_GetDocumentation((ITypeInfo*)&iter->lpVtblTypeInfo2, -1, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); }

1 0

Andrey Turkin : oleaut32: Fix ICreateTypeLib2::SetFuncAndParamNames.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: b4025a3ed17c647240016b701fe1c457764bb41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4025a3ed17c647240016b701… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon May 17 02:27:34 2010 +0400 oleaut32: Fix ICreateTypeLib2::SetFuncAndParamNames. Getters and setters for same property can have an identical name --- dlls/oleaut32/tests/typelib.c | 12 ++++++++++++ dlls/oleaut32/typelib2.c | 26 ++++++++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a081163..ff7defb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -982,10 +982,12 @@ static void test_CreateTypeLib(void) { static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; static OLECHAR func1W[] = {'f','u','n','c','1',0}; static OLECHAR func2W[] = {'f','u','n','c','2',0}; + static OLECHAR prop1W[] = {'P','r','o','p','1',0}; static OLECHAR param1W[] = {'p','a','r','a','m','1',0}; static OLECHAR param2W[] = {'p','a','r','a','m','2',0}; static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; + static OLECHAR *propname[] = {prop1W, param1W}; static const GUID custguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x70}}; char filename[MAX_PATH]; @@ -1171,6 +1173,16 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_SetFuncHelpContext(createti, 1, 0xabcdefab); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, propname, 1); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 1, propname, 1); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 1, propname, 2); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + + funcdesc.invkind = INVOKE_PROPERTYPUTREF; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index c870b4f..c1a3bd9 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2132,21 +2132,27 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( if(index >= This->typeinfo->cElement || !cNames) return TYPE_E_ELEMENTNOTFOUND; - len = ctl2_encode_name(This->typelib, rgszNames[0], &namedata); - for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { - if(i == index) - iter = iter2; - else if(iter2->name!=-1 && !memcmp(namedata, - This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len)) - return TYPE_E_AMBIGUOUSNAME; - - i++; - } + for(iter=This->typedata->next->next, i=0; i<index; i++) + iter=iter->next; /* 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)) return TYPE_E_ELEMENTNOTFOUND; + len = ctl2_encode_name(This->typelib, rgszNames[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 inv1 = iter2->u.data[4] >> 3; + INT inv2 = iter->u.data[4] >> 3; + if (!((inv1&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv2&INVOKE_PROPERTYGET)) && + !((inv2&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv1&INVOKE_PROPERTYGET))) + return TYPE_E_AMBIGUOUSNAME; + } + } + offset = ctl2_alloc_name(This->typelib, rgszNames[0]); if(offset == -1) return E_OUTOFMEMORY;

1 0

Andrey Turkin : oleaut32: Implement ICreateTypeInfo2::SetFuncCustData.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 40b59afac87a9a5c8b08151700275ab7023064b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b59afac87a9a5c8b0815170… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon May 17 02:27:50 2010 +0400 oleaut32: Implement ICreateTypeInfo2::SetFuncCustData. --- dlls/oleaut32/typelib2.c | 113 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 87 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index c1a3bd9..ada89b3 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1316,6 +1316,69 @@ static HRESULT ctl2_add_default_value( } } +/**************************************************************************** + * funcrecord_reallochdr + * + * Ensure FuncRecord data block contains header of required size + * + * PARAMS + * + * typedata [IO] - reference to pointer to data block + * need [I] - required size of block in bytes + * + * RETURNS + * + * Number of additionally allocated bytes + */ +static INT funcrecord_reallochdr(INT **typedata, int need) +{ + int tail = (*typedata)[5]*((*typedata)[4]&0x1000?16:12); + int hdr = (*typedata)[0] - tail; + int i; + + if (hdr >= need) + return 0; + + *typedata = HeapReAlloc(GetProcessHeap(), 0, *typedata, need + tail); + if (!*typedata) + return -1; + + if (tail) + memmove((char*)*typedata + need, (const char*)*typedata + hdr, tail); + (*typedata)[0] = need + tail; + + /* fill in default values */ + for(i = (hdr+3)/4; (i+1)*4 <= need; i++) + { + switch(i) + { + case 2: + (*typedata)[i] = 0; + break; + case 7: + (*typedata)[i] = -1; + break; + case 8: + (*typedata)[i] = -1; + break; + case 9: + (*typedata)[i] = -1; + break; + case 10: + (*typedata)[i] = -1; + break; + case 11: + (*typedata)[i] = 0; + break; + case 12: + (*typedata)[i] = -1; + break; + } + } + + return need - hdr; +} + /*================== ICreateTypeInfo2 Implementation ===================================*/ /****************************************************************************** @@ -2162,14 +2225,11 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( namedata = This->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset; *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; - if(iter->u.data[4]&0x1000) - len = iter->u.data[5]; - else - len = 0; + len = iter->u.data[0]/4 - iter->u.data[5]*3; for (i = 1; i < cNames; i++) { offset = ctl2_alloc_name(This->typelib, rgszNames[i]); - iter->u.data[(i*3) + 4 + len] = offset; + iter->u.data[len + ((i-1)*3) + 1] = offset; } return S_OK; @@ -2307,8 +2367,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext( { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; CyclicList *func; - int *typedata; - int size; TRACE("(%p,%d,%d)\n", iface, index, dwHelpContext); @@ -2322,24 +2380,11 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext( if(index-- == 0) break; - typedata = func->u.data; - - /* Compute func size without arguments */ - size = typedata[0] - typedata[5]*(typedata[4]&0x1000?16:12); - - /* Allocate memory for HelpContext if needed */ - if(size < 7*sizeof(int)) { - typedata = HeapReAlloc(GetProcessHeap(), 0, typedata, typedata[0]+sizeof(int)); - if(!typedata) - return E_OUTOFMEMORY; - - memmove(&typedata[7], &typedata[6], typedata[0]-sizeof(int)*6); - typedata[0] += sizeof(int); - This->typedata->next->u.val += sizeof(int); - func->u.data = typedata; - } + This->typedata->next->u.val += funcrecord_reallochdr(&func->u.data, 7*sizeof(int)); + if(!func->u.data) + return E_OUTOFMEMORY; - typedata[6] = dwHelpContext; + func->u.data[6] = dwHelpContext; return S_OK; } @@ -2741,8 +2786,24 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncCustData( REFGUID guid, /* [I] The GUID used as a key to retrieve the custom data. */ VARIANT* pVarVal) /* [I] The custom data. */ { - FIXME("(%p,%d,%s,%p), stub!\n", iface, index, debugstr_guid(guid), pVarVal); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + CyclicList *iter; + UINT i; + + TRACE("(%p,%d,%s,%p)\n", iface, index, debugstr_guid(guid), pVarVal); + + if(index >= This->typeinfo->cElement) + return TYPE_E_ELEMENTNOTFOUND; + + for(iter=This->typedata->next->next, i=0; i<index; i++) + iter=iter->next; + + This->typedata->next->u.val += funcrecord_reallochdr(&iter->u.data, 13*sizeof(int)); + if(!iter->u.data) + return E_OUTOFMEMORY; + + iter->u.data[4] |= 0x80; + return ctl2_set_custdata(This->typelib, guid, pVarVal, &iter->u.data[12]); } /******************************************************************************

1 0

Andrey Turkin : oleaut32: Distinguish between variables and functions in ICreateTypeInfo functions.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 5e4c16b348a5baf448b8a8876b0785ce247bc6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4c16b348a5baf448b8a8876… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon May 17 02:28:01 2010 +0400 oleaut32: Distinguish between variables and functions in ICreateTypeInfo functions. --- dlls/oleaut32/typelib2.c | 91 ++++++++++++++++++++++++++++++---------------- 1 files changed, 59 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index ada89b3..df36268 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -118,10 +118,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(typelib2); /*================== Implementation Structures ===================================*/ /* Used for storing cyclic list. Tail address is kept */ +enum tagCyclicListElementType { + CyclicListFunc, + CyclicListVar +}; typedef struct tagCyclicList { struct tagCyclicList *next; int indice; int name; + enum tagCyclicListElementType type; union { int val; @@ -1873,6 +1878,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( /* update the index data */ insert->indice = pFuncDesc->memid; insert->name = -1; + insert->type = CyclicListFunc; /* insert type data to list */ if(index == This->typeinfo->cElement) { @@ -2125,6 +2131,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* update the index data */ insert->indice = 0x40000000 + index; insert->name = -1; + insert->type = CyclicListVar; /* figure out type widths and whatnot */ ctl2_encode_typedesc(This->typelib, &pVarDesc->elemdescVar.tdesc, @@ -2192,11 +2199,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( if(!rgszNames) return E_INVALIDARG; - if(index >= This->typeinfo->cElement || !cNames) + if(index >= (This->typeinfo->cElement&0xFFFF) || !cNames) return TYPE_E_ELEMENTNOTFOUND; - for(iter=This->typedata->next->next, i=0; i<index; i++) - iter=iter->next; + for(iter=This->typedata->next->next, i=0; /* empty */; iter=iter->next) + if (iter->type == CyclicListFunc) + if (i++ >= index) + 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)) @@ -2205,14 +2214,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( len = ctl2_encode_name(This->typelib, rgszNames[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)) - { + This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len)) { /* getters/setters can have a same name */ - INT inv1 = iter2->u.data[4] >> 3; - INT inv2 = iter->u.data[4] >> 3; - if (!((inv1&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv2&INVOKE_PROPERTYGET)) && - !((inv2&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv1&INVOKE_PROPERTYGET))) - return TYPE_E_AMBIGUOUSNAME; + if (iter2->type == CyclicListFunc) { + INT inv1 = iter2->u.data[4] >> 3; + INT inv2 = iter->u.data[4] >> 3; + if (((inv1&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv2&INVOKE_PROPERTYGET)) || + ((inv2&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv1&INVOKE_PROPERTYGET))) + continue; + } + + return TYPE_E_AMBIGUOUSNAME; } } @@ -2269,9 +2281,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName( namedata[9] |= 0x20; } - iter = This->typedata->next->next; - for(i=0; i<index; i++) - iter = iter->next; + for(iter = This->typedata->next->next, i = 0; /* empty */; iter = iter->next) + if (iter->type == CyclicListVar) + if (i++ >= index) + break; iter->name = offset; return S_OK; @@ -2373,12 +2386,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext( if(This->typeinfo->cElement<index) return TYPE_E_ELEMENTNOTFOUND; - if(This->typeinfo->cElement == index) + if(This->typeinfo->cElement == index && This->typedata->type == CyclicListFunc) func = This->typedata; else for(func=This->typedata->next->next; func!=This->typedata; func=func->next) - if(index-- == 0) - break; + if (func->type == CyclicListFunc) + if(index-- == 0) + break; This->typedata->next->u.val += funcrecord_reallochdr(&func->u.data, 7*sizeof(int)); if(!func->u.data) @@ -2438,7 +2452,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( ICreateTypeInfo2* iface) { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; - CyclicList *iter, *iter2, **typedata; + CyclicList *iter, *iter2, *last = NULL, **typedata; HREFTYPE hreftype; HRESULT hres; unsigned user_vft = 0; @@ -2552,10 +2566,14 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( return E_OUTOFMEMORY; /* Assign IDs and VTBL entries */ - i = 0; - if(This->typedata->u.data[3]&1) - user_vft = This->typedata->u.data[3]&0xffff; + for(iter=This->typedata->next->next; iter!=This->typedata->next; iter=iter->next) + if (iter->type == CyclicListFunc) + last = iter; + + if(last && last->u.data[3]&1) + user_vft = last->u.data[3]&0xffff; + i = 0; for(iter=This->typedata->next->next; iter!=This->typedata->next; iter=iter->next) { /* Assign MEMBERID if MEMBERID_NIL was specified */ if(iter->indice == MEMBERID_NIL) { @@ -2579,6 +2597,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( } } + if (iter->type != CyclicListFunc) + continue; + typedata[i] = iter; iter->u.data[0] = (iter->u.data[0]&0xffff) | (i<<16); @@ -2788,15 +2809,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncCustData( { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; CyclicList *iter; - UINT i; TRACE("(%p,%d,%s,%p)\n", iface, index, debugstr_guid(guid), pVarVal); - if(index >= This->typeinfo->cElement) + if(index >= (This->typeinfo->cElement&0xFFFF)) return TYPE_E_ELEMENTNOTFOUND; - for(iter=This->typedata->next->next, i=0; i<index; i++) - iter=iter->next; + for(iter=This->typedata->next->next; /* empty */; iter=iter->next) + if (iter->type == CyclicListFunc) + if (index-- == 0) + break; This->typedata->next->u.val += funcrecord_reallochdr(&iter->u.data, 13*sizeof(int)); if(!iter->u.data) @@ -3247,15 +3269,20 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation( if (This->typedata) { for(iter=This->typedata->next->next; iter!=This->typedata->next; iter=iter->next) { if (iter->indice == memid) { - const int *typedata = iter->u.data; - int size = typedata[0] - typedata[5]*(typedata[4]&0x1000?16:12); - - nameoffset = iter->name; - /* FIXME implement this once SetFuncDocString is implemented */ - docstringoffset = -1; - helpcontext = (size < 7*sizeof(int)) ? 0 : typedata[6]; + if (iter->type == CyclicListFunc) { + const int *typedata = iter->u.data; + int size = typedata[0] - typedata[5]*(typedata[4]&0x1000?16:12); + + nameoffset = iter->name; + /* FIXME implement this once SetFuncDocString is implemented */ + docstringoffset = -1; + helpcontext = (size < 7*sizeof(int)) ? 0 : typedata[6]; + + status = S_OK; + } else { + FIXME("Not implemented for variable members\n"); + } - status = S_OK; break; } }

1 0

Andrey Turkin : oleaut32: Set flag for retval params in ICreateTypeInfo:: AddFuncDesc.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 16468517bb9fed3569365449320617d6bb70af51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16468517bb9fed35693654493… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon May 17 02:28:11 2010 +0400 oleaut32: Set flag for retval params in ICreateTypeInfo::AddFuncDesc. --- dlls/oleaut32/typelib2.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index df36268..b5ebea3 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1766,7 +1766,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( CyclicList *iter, *insert; int *typedata; - int i, num_defaults = 0; + int i, num_defaults = 0, num_retval = 0; int decoded_size; HRESULT hres; @@ -1806,9 +1806,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( return TYPE_E_INCONSISTENTPROPFUNCS; /* get number of arguments with default values specified */ - for (i = 0; i < pFuncDesc->cParams; i++) + for (i = 0; i < pFuncDesc->cParams; i++) { if(pFuncDesc->lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) num_defaults++; + if(pFuncDesc->lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL) + num_retval++; + } if (!This->typedata) { This->typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); @@ -1840,6 +1843,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( typedata[3] = ((sizeof(FUNCDESC) + decoded_size) << 16) | (unsigned short)(pFuncDesc->oVft?pFuncDesc->oVft+1:0); typedata[4] = (pFuncDesc->callconv << 8) | (pFuncDesc->invkind << 3) | pFuncDesc->funckind; if(num_defaults) typedata[4] |= 0x1000; + if (num_retval) typedata[4] |= 0x4000; typedata[5] = pFuncDesc->cParams; /* NOTE: High word of typedata[3] is total size of FUNCDESC + size of all ELEMDESCs for params + TYPEDESCs for pointer params and return types. */

1 0

Michael Stefaniuc : msvfw32: Replace long with LONG.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: bdc85b69f60ab6c62742abf889ccd7e17e5b5c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc85b69f60ab6c62742abf88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 17 01:09:05 2010 +0200 msvfw32: Replace long with LONG. --- dlls/msvfw32/mciwnd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index 96b6420..bf23a63 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -48,7 +48,7 @@ typedef struct int alias; UINT dev_type; UINT mode; - long position; + LONG position; SIZE size; /* size of the original frame rect */ int zoom; LPWSTR lpName; @@ -158,7 +158,7 @@ static inline void MCIWND_notify_pos(MCIWndInfo *mwi) { if (mwi->dwStyle & MCIWNDF_NOTIFYPOS) { - long new_pos = SendMessageW(mwi->hWnd, MCIWNDM_GETPOSITIONW, 0, 0); + LONG new_pos = SendMessageW(mwi->hWnd, MCIWNDM_GETPOSITIONW, 0, 0); if (new_pos != mwi->position) { mwi->position = new_pos;

1 0

Henri Verbeet : wined3d: Handle depth/ stencil surfaces in IWineD3DSurfaceImpl_LoadLocation().
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 44ab3d70f1987b239291f753a95c93eabddddb57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ab3d70f1987b239291f753a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 17 11:14:45 2010 +0200 wined3d: Handle depth/stencil surfaces in IWineD3DSurfaceImpl_LoadLocation(). --- dlls/wined3d/device.c | 1 + dlls/wined3d/drawprim.c | 3 +++ dlls/wined3d/surface.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2b8f231..cf23b3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4483,6 +4483,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (location == SFLAG_DS_ONSCREEN && depth_stencil != This->onscreen_depth_stencil) device_switch_onscreen_ds(This, context, depth_stencil); prepare_ds_clear(depth_stencil, context, location, &draw_rect, Count, clear_rect); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)depth_stencil, SFLAG_INDRAWABLE, TRUE); glDepthMask(GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1f904ea..3da4093 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -634,9 +634,12 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT surface_load_ds_location(This->depth_stencil, context, location); if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) + { surface_modify_ds_location(This->depth_stencil, location, This->depth_stencil->ds_current_size.cx, This->depth_stencil->ds_current_size.cy); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)This->depth_stencil, SFLAG_INDRAWABLE, TRUE); + } } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index db4a58b..4b70622 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4390,6 +4390,22 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D BOOL drawable_read_ok = TRUE; BOOL in_fbo = FALSE; + if (This->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + if (flag == SFLAG_INTEXTURE) + { + struct wined3d_context *context = context_acquire(device, NULL); + surface_load_ds_location(This, context, SFLAG_DS_OFFSCREEN); + context_release(context); + return WINED3D_OK; + } + else + { + FIXME("Unimplemented location %#x for depth/stencil buffers.\n", flag); + return WINED3DERR_INVALIDCALL; + } + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (surface_is_offscreen(This))

1 0

Michael Stefaniuc : winhttp: Remove redundant "not NULL" check for the " server" arg.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 8e8f743cb068ed2ac589d715f8db65bea3df6b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8f743cb068ed2ac589d715f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 17 01:11:35 2010 +0200 winhttp: Remove redundant "not NULL" check for the "server" arg. --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 5557250..acf7eb9 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -503,7 +503,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->session = session; list_add_head( &session->hdr.children, &connect->hdr.entry ); - if (server && !(connect->hostname = strdupW( server ))) goto end; + if (!(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; if (!set_server_for_hostname( connect, server, port ))

1 0

Michael Stefaniuc : dmloader: Remove redundant "not NULL" check of the pDesc arg.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 8a3daa63e0b8530c3d8859421213bf4429fdf6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3daa63e0b8530c3d8859421… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 17 01:11:57 2010 +0200 dmloader: Remove redundant "not NULL" check of the pDesc arg. --- dlls/dmloader/container.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index a1fa878..a267816 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -145,8 +145,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_EnumObject if (strlenW (pContainedObject->wszAlias) > DMUS_MAX_FILENAME) result = DMUS_S_STRING_TRUNCATED; } - if (pDesc) - *pDesc = pContainedObject->Desc; + *pDesc = pContainedObject->Desc; return result; } dwCount++;

1 0

Michael Stefaniuc : mshtml: Remove redundant "not NULL" check for the p arg (coccicheck).
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: eb90d475cdebc1972a04c0e5c703ed9d4f01df4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb90d475cdebc1972a04c0e5c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 17 01:12:18 2010 +0200 mshtml: Remove redundant "not NULL" check for the p arg (coccicheck). --- dlls/mshtml/htmlelem.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b0cb791..5bf2915 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1803,13 +1803,11 @@ static HRESULT WINAPI HTMLFiltersCollection_get_length(IHTMLFiltersCollection *i { HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); - FIXME("(%p)->(%p) Always returning 0\n", This, p); - - if(!p) - return E_POINTER; + if(!p) + return E_POINTER; - if(p) - *p = 0; + FIXME("(%p)->(%p) Always returning 0\n", This, p); + *p = 0; return S_OK; }

1 0