June 2013 - Wine-Commits - list.winehq.org

Andrew Eikum : oleaut32: Always read all imports from the typelib.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 9afd5845e58b0a90f14c87121d4abc0f3ee85eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afd5845e58b0a90f14c87121… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:57:44 2013 -0500 oleaut32: Always read all imports from the typelib. --- dlls/oleaut32/typelib.c | 139 ++++++++++++++--------------------------------- 1 files changed, 42 insertions(+), 97 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 959c87b..4a98952 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1223,8 +1223,6 @@ typedef struct tagTLBContext } TLBContext; -static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, int offset); - static inline BSTR TLB_get_bstr(const TLBString *str) { return str != NULL ? str->str : NULL; @@ -2206,40 +2204,9 @@ static void MSFT_GetTdesc(TLBContext *pcx, INT type, TYPEDESC *pTd, else *pTd=pcx->pLibInfo->pTypeDesc[type/(2*sizeof(INT))]; - if(pTd->vt == VT_USERDEFINED) - MSFT_DoRefType(pcx, pTI->pTypeLib, pTd->u.hreftype); - TRACE_(typelib)("vt type = %X\n", pTd->vt); } -static void MSFT_ResolveReferencedTypes(TLBContext *pcx, ITypeInfoImpl *pTI, TYPEDESC *lpTypeDesc) -{ - /* resolve referenced type if any */ - while (lpTypeDesc) - { - switch (lpTypeDesc->vt) - { - case VT_PTR: - lpTypeDesc = lpTypeDesc->u.lptdesc; - break; - - case VT_CARRAY: - lpTypeDesc = & (lpTypeDesc->u.lpadesc->tdescElem); - break; - - case VT_USERDEFINED: - MSFT_DoRefType(pcx, pTI->pTypeLib, - lpTypeDesc->u.hreftype); - - lpTypeDesc = NULL; - break; - - default: - lpTypeDesc = NULL; - } - } -} - static int TLB_is_propgetput(INVOKEKIND invkind) { return (invkind == INVOKE_PROPERTYGET || @@ -2364,7 +2331,6 @@ MSFT_DoFuncs(TLBContext* pcx, pFuncRec->DataType, &ptfd->funcdesc.elemdescFunc.tdesc, pTI); - MSFT_ResolveReferencedTypes(pcx, pTI, &ptfd->funcdesc.elemdescFunc.tdesc); /* do the parameters/arguments */ if(pFuncRec->nrargs) @@ -2397,8 +2363,6 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadName( pcx, paraminfo.oName ); TRACE_(typelib)("param[%d] = %s\n", j, debugstr_w(TLB_get_bstr(ptfd->pParamDesc[j].Name))); - MSFT_ResolveReferencedTypes(pcx, pTI, &elemdesc->tdesc); - /* default value */ if ( (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) && (pFuncRec->FKCCIC & 0x1000) ) @@ -2501,66 +2465,10 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, pVarRec->OffsValue, pcx); } else ptvd->vardesc.u.oInst=pVarRec->OffsValue; - MSFT_ResolveReferencedTypes(pcx, pTI, &ptvd->vardesc.elemdescVar.tdesc); recoffset += reclength; } } -/* fill in data for a hreftype (offset). When the referenced type is contained - * in the typelib, it's just an (file) offset in the type info base dir. - * If comes from import, it's an offset+1 in the ImpInfo table - * */ -static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, - int offset) -{ - TLBRefType *ref; - - TRACE_(typelib)("TLB context %p, TLB offset %x\n", pcx, offset); - - LIST_FOR_EACH_ENTRY(ref, &pTL->ref_list, TLBRefType, entry) - { - if(ref->reference == offset) return; - } - - ref = heap_alloc_zero(sizeof(TLBRefType)); - list_add_tail(&pTL->ref_list, &ref->entry); - - if(!MSFT_HREFTYPE_INTHISFILE( offset)) { - /* external typelib */ - MSFT_ImpInfo impinfo; - TLBImpLib *pImpLib; - - TRACE_(typelib)("offset %x, masked offset %x\n", offset, offset + (offset & 0xfffffffc)); - - MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx, - pcx->pTblDir->pImpInfo.offset + (offset & 0xfffffffc)); - - LIST_FOR_EACH_ENTRY(pImpLib, &pcx->pLibInfo->implib_list, TLBImpLib, entry) - if(pImpLib->offset==impinfo.oImpFile) - break; - - if(&pImpLib->entry != &pcx->pLibInfo->implib_list){ - ref->reference = offset & (~0x3); - ref->pImpTLInfo = pImpLib; - if(impinfo.flags & MSFT_IMPINFO_OFFSET_IS_GUID) { - ref->guid = MSFT_ReadGuid(impinfo.oGuid, pcx); - TRACE("importing by guid %s\n", debugstr_guid(TLB_get_guidref(ref->guid))); - ref->index = TLB_REF_USE_GUID; - } else - ref->index = impinfo.oGuid; - }else{ - ERR("Cannot find a reference\n"); - ref->reference = -1; - ref->pImpTLInfo = TLB_REF_NOT_FOUND; - } - }else{ - /* in this typelib */ - ref->index = MSFT_HREFTYPE_INDEX(offset); - ref->reference = offset; - ref->pImpTLInfo = TLB_REF_INTERNAL; - } -} - /* process Implemented Interfaces of a com class */ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, int offset) @@ -2576,7 +2484,6 @@ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, for(i=0;i<count;i++){ if(offset<0) break; /* paranoia */ MSFT_ReadLEDWords(&refrec,sizeof(refrec),pcx,offset+pcx->pTblDir->pRefTab.offset); - MSFT_DoRefType(pcx, pTI->pTypeLib, refrec.reftype); pImpl->hRef = refrec.reftype; pImpl->implflags=refrec.flags; MSFT_CustData(pcx, refrec.oCustData, &pImpl->custdata_list); @@ -2668,12 +2575,10 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( { ptiRet->impltypes = TLBImplType_Alloc(1); ptiRet->impltypes[0].hRef = tiBase.datatype1; - MSFT_DoRefType(pcx, pLibInfo, tiBase.datatype1); } break; default: ptiRet->impltypes = TLBImplType_Alloc(1); - MSFT_DoRefType(pcx, pLibInfo, tiBase.datatype1); ptiRet->impltypes[0].hRef = tiBase.datatype1; break; } @@ -2735,6 +2640,46 @@ static HRESULT MSFT_ReadAllStrings(TLBContext *pcx) } } +static HRESULT MSFT_ReadAllRefs(TLBContext *pcx) +{ + TLBRefType *ref; + int offs = 0; + + MSFT_Seek(pcx, pcx->pTblDir->pImpInfo.offset); + while (offs < pcx->pTblDir->pImpInfo.length) { + MSFT_ImpInfo impinfo; + TLBImpLib *pImpLib; + + MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx, DO_NOT_SEEK); + + ref = heap_alloc_zero(sizeof(TLBRefType)); + list_add_tail(&pcx->pLibInfo->ref_list, &ref->entry); + + LIST_FOR_EACH_ENTRY(pImpLib, &pcx->pLibInfo->implib_list, TLBImpLib, entry) + if(pImpLib->offset==impinfo.oImpFile) + break; + + if(&pImpLib->entry != &pcx->pLibInfo->implib_list){ + ref->reference = offs; + ref->pImpTLInfo = pImpLib; + if(impinfo.flags & MSFT_IMPINFO_OFFSET_IS_GUID) { + ref->guid = MSFT_ReadGuid(impinfo.oGuid, pcx); + TRACE("importing by guid %s\n", debugstr_guid(TLB_get_guidref(ref->guid))); + ref->index = TLB_REF_USE_GUID; + } else + ref->index = impinfo.oGuid; + }else{ + ERR("Cannot find a reference\n"); + ref->reference = -1; + ref->pImpTLInfo = TLB_REF_NOT_FOUND; + } + + offs += sizeof(impinfo); + } + + return S_OK; +} + /* Because type library parsing has some degree of overhead, and some apps repeatedly load the same * typelibs over and over, we cache them here. According to MSDN Microsoft have a similar scheme in * place. This will cause a deliberate memory leak, but generally losing RAM for cycles is an acceptable @@ -3501,9 +3446,9 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) } } + MSFT_ReadAllRefs(&cx); + pTypeLibImpl->dispatch_href = tlbHeader.dispatchpos; - if(pTypeLibImpl->dispatch_href != -1) - MSFT_DoRefType(&cx, pTypeLibImpl, pTypeLibImpl->dispatch_href); /* type infos */ if(tlbHeader.nrtypeinfos >= 0 )

1 0

Andrew Eikum : oleaut32: Use implementation bitflag in href.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 7adad427454e60cf9513d47309a462f71a9b737f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7adad427454e60cf9513d4730… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:57:33 2013 -0500 oleaut32: Use implementation bitflag in href. --- dlls/oleaut32/typelib.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 69269f2..959c87b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6054,8 +6054,11 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( { if(index >= This->cImplTypes) hr = TYPE_E_ELEMENTNOTFOUND; - else + else{ *pRefType = This->impltypes[index].hRef; + if(This->typekind == TKIND_INTERFACE) + *pRefType |= 0x2; + } } if(TRACE_ON(ole))

1 0

Andrew Eikum : oleaut32: Always search external references in GetRefTypeInfo.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: d983e6d590e67d73456011c703f0eba64dd48e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d983e6d590e67d73456011c70… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:57:13 2013 -0500 oleaut32: Always search external references in GetRefTypeInfo. --- dlls/oleaut32/typelib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 02875c3..69269f2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7441,8 +7441,6 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( goto end; } } - result = TYPE_E_ELEMENTNOTFOUND; - goto end; } LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry)

1 0

Ričardas Barkauskas : wininet/tests: Test some connection closing specifics.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 188b39ab2b8ffebd1e1dbe80b77d43867606a4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=188b39ab2b8ffebd1e1dbe80b… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Jun 5 18:35:41 2013 +0300 wininet/tests: Test some connection closing specifics. --- dlls/wininet/tests/http.c | 179 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 171 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=188b39ab2b8ffebd1e1db…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFRAMEARRAY.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 8c882f68190b05c9135b97e57ee9444f533e8874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c882f68190b05c9135b97e57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:14 2013 +0200 d3drm: Avoid LPDIRECT3DRMFRAMEARRAY. --- dlls/d3drm/frame.c | 12 +++---- dlls/d3drm/tests/d3drm.c | 90 +++++++++++++++++++++++----------------------- include/d3drmobj.h | 6 ++-- 3 files changed, 53 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c882f68190b05c9135b9…

1 0

Alistair Leslie-Hughes : dbs.idl: Add missing DBPROPNUM* enums.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 06db5a986d3d37e58a9553c98eb50528f0b1ffe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06db5a986d3d37e58a9553c98… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 4 09:48:39 2013 +1000 dbs.idl: Add missing DBPROPNUM* enums. --- include/dbs.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index 46d55ad..a517bf2 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -347,6 +347,112 @@ enum DBPROPENUM DBPROP_NOTIFYROWSETCHANGED = 0x000000d3, }; +enum DBPROPENUM15 { + DBPROP_FILTERCOMPAREOPS = 0x000000d1, + DBPROP_FINDCOMPAREOPS = 0x000000d2, + DBPROP_IChapteredRowset = 0x000000ca, + DBPROP_IDBAsynchStatus = 0x000000cb, + DBPROP_IRowsetFind = 0x000000cc, + DBPROP_IRowsetView = 0x000000d4, + DBPROP_IViewChapter = 0x000000d5, + DBPROP_IViewFilter = 0x000000d6, + DBPROP_IViewRowset = 0x000000d7, + DBPROP_IViewSort = 0x000000d8, + DBPROP_INIT_ASYNCH = 0x000000c8, + DBPROP_MAXOPENCHAPTERS = 0x000000c7, + DBPROP_MAXORSINFILTER = 0x000000cd, + DBPROP_MAXSORTCOLUMNS = 0x000000ce, + DBPROP_ROWSET_ASYNCH = 0x000000c9, + DBPROP_SORTONINDEX = 0x000000cf +}; + +enum DBPROPENUM20 { + DBPROP_IMultipleResults = 0x000000d9, + DBPROP_DATASOURCE_TYPE = 0x000000fb, + MDPROP_AXES = 0x000000fc, + MDPROP_FLATTENING_SUPPORT = 0x000000fd, + MDPROP_MDX_JOINCUBES = 0x000000fe, + MDPROP_NAMED_LEVELS = 0x000000ff, + MDPROP_RANGEROWSET = 0x00000100, + MDPROP_MDX_SLICER = 0x000000da, + MDPROP_MDX_CUBEQUALIFICATION = 0x000000db, + MDPROP_MDX_OUTERREFERENCE = 0x000000dc, + MDPROP_MDX_QUERYBYPROPERTY = 0x000000dd, + MDPROP_MDX_CASESUPPORT = 0x000000de, + MDPROP_MDX_STRING_COMPOP = 0x000000e0, + MDPROP_MDX_DESCFLAGS = 0x000000e1, + MDPROP_MDX_SET_FUNCTIONS = 0x000000e2, + MDPROP_MDX_MEMBER_FUNCTIONS = 0x000000e3, + MDPROP_MDX_NUMERIC_FUNCTIONS = 0x000000e4, + MDPROP_MDX_FORMULAS = 0x000000e5, + MDPROP_AGGREGATECELL_UPDATE = 0x000000e6, + MDPROP_MDX_AGGREGATECELL_UPDATE = MDPROP_AGGREGATECELL_UPDATE, + MDPROP_MDX_OBJQUALIFICATION = 0x00000105, + MDPROP_MDX_NONMEASURE_EXPRESSIONS = 0x00000106, + DBPROP_ACCESSORDER = 0x000000e7, + DBPROP_BOOKMARKINFO = 0x000000e8, + DBPROP_INIT_CATALOG = 0x000000e9, + DBPROP_ROW_BULKOPS = 0x000000ea, + DBPROP_PROVIDERFRIENDLYNAME = 0x000000eb, + DBPROP_LOCKMODE = 0x000000ec, + DBPROP_MULTIPLECONNECTIONS = 0x000000ed, + DBPROP_UNIQUEROWS = 0x000000ee, + DBPROP_SERVERDATAONINSERT = 0x000000ef, + DBPROP_STORAGEFLAGS = 0x000000f0, + DBPROP_CONNECTIONSTATUS = 0x000000f4, + DBPROP_ALTERCOLUMN = 0x000000f5, + DBPROP_COLUMNLCID = 0x000000f6, + DBPROP_RESETDATASOURCE = 0x000000f7, + DBPROP_INIT_OLEDBSERVICES = 0x000000f8, + DBPROP_IRowsetRefresh = 0x000000f9, + DBPROP_SERVERNAME = 0x000000fa, + DBPROP_IParentRowset = 0x00000101, + DBPROP_HIDDENCOLUMNS = 0x00000102, + DBPROP_PROVIDERMEMORY = 0x00000103, + DBPROP_CLIENTCURSOR = 0x00000104 +}; + + +enum DBPROPENUM21 { + DBPROP_TRUSTEE_USERNAME = 0x000000f1, + DBPROP_TRUSTEE_AUTHENTICATION = 0x000000f2, + DBPROP_TRUSTEE_NEWAUTHENTICATION = 0x000000f3, + DBPROP_IRow = 0x00000107, + DBPROP_IRowChange = 0x00000108, + DBPROP_IRowSchemaChange = 0x00000109, + DBPROP_IGetRow = 0x0000010a, + DBPROP_IScopedOperations = 0x0000010b, + DBPROP_IBindResource = 0x0000010c, + DBPROP_ICreateRow = 0x0000010d, + DBPROP_INIT_BINDFLAGS = 0x0000010e, + DBPROP_INIT_LOCKOWNER = 0x0000010f, + DBPROP_GENERATEURL = 0x00000111, + DBPROP_IDBBinderProperties = 0x00000112, + DBPROP_IColumnsInfo2 = 0x00000113, + DBPROP_IRegisterProvider = 0x00000114, + DBPROP_IGetSession = 0x00000115, + DBPROP_IGetSourceRow = 0x00000116, + DBPROP_IRowsetCurrentIndex = 0x00000117, + DBPROP_OPENROWSETSUPPORT = 0x00000118, + DBPROP_COL_ISLONG = 0x00000119 +}; + +enum DBPROPENUM25 { + DBPROP_COL_SEED = 0x0000011a, + DBPROP_COL_INCREMENT = 0x0000011b, + DBPROP_INIT_GENERALTIMEOUT = 0x0000011c, + DBPROP_COMSERVICES = 0x0000011d +}; + +enum DBPROPENUM26 { + DBPROP_OUTPUTSTREAM = 0x0000011e, + DBPROP_OUTPUTENCODING = 0x0000011f, + DBPROP_TABLESTATISTICS = 0x00000120, + DBPROP_SKIPROWCOUNTRESULTS = 0x00000123, + DBPROP_IRowsetBookmark = 0x00000124, + MDPROP_VISUALMODE = 0x00000125, +}; + cpp_quote("#ifdef DBINITCONSTANTS") cpp_quote("#ifdef __cplusplus") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\")

1 0

Alistair Leslie-Hughes : oledb32: Support more default properties.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 7f1473ac59ef434a42c13e87373f5bf24456a496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1473ac59ef434a42c13e873… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 3 16:26:32 2013 +1000 oledb32: Support more default properties. --- dlls/oledb32/datainit.c | 30 +++++++++++++++++++++++++++--- dlls/oledb32/tests/Makefile.in | 2 +- dlls/oledb32/tests/database.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 62e2e50..b6ba0e1 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -296,12 +296,36 @@ struct dbproperty { VARTYPE type; }; +static const WCHAR conn_timeout[] = {'C','o','n','n','e','c','t',' ','T','i','m','e','o','u','t',0}; static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; -static const WCHAR persistsiW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR extemdedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; +static const WCHAR gen_timeout[] = {'G','e','n','e','r','a','l',' ','T','i','m','e','o','u','t',0}; +static const WCHAR initcatW[] = {'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g',0}; +static const WCHAR localeIDW[] = {'L','o','c','a','l','e',' ','I','d','e','n','t','i','f','i','e','r',0}; +static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; +static const WCHAR modeW[] = {'M','o','d','e',0}; +static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0}; +static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0}; +static const WCHAR persiststW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR promptW[] = {'P','r','o','m','p','t',0}; +static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0}; +static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0}; static const struct dbproperty dbproperties[] = { - { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, - { persistsiW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL } + { conn_timeout,DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { extemdedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { gen_timeout, DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { initcatW, DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { localeIDW, DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { locationW, DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { persiststW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { promptW, DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { useridW, DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, }; static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index 07a4892..bb1f0b3 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oledb32.dll -IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32 C_SRCS = \ convert.c \ diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d744c86..518bba7 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "msdadc.h" #include "msdasc.h" +#include "shlobj.h" #include "wine/test.h" @@ -36,6 +37,8 @@ static void test_GetDataSource(WCHAR *initstring) IDBInitialize *dbinit = NULL; HRESULT hr; + trace("Data Source: %s\n", wine_dbgstr_w(initstring)); + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); ok(hr == S_OK, "got %08x\n", hr); @@ -44,11 +47,43 @@ static void test_GetDataSource(WCHAR *initstring) if(SUCCEEDED(hr)) { IDBProperties *props = NULL; + IMalloc *ppM = NULL; + + hr = SHGetMalloc(&ppM); + if (FAILED(hr)) + { + ok(0, "Couldn't get IMalloc object.\n"); + goto end; + } hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) + { + ULONG cnt; + DBPROPINFOSET *pInfoset; + OLECHAR *ary; + + hr = IDBProperties_GetPropertyInfo(props, 0, NULL, &cnt, &pInfoset, &ary); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ULONG i; + for(i =0; i < pInfoset->cPropertyInfos; i++) + { + trace("(0x%04x) '%s' %d\n", pInfoset->rgPropertyInfos[i].dwPropertyID, wine_dbgstr_w(pInfoset->rgPropertyInfos[i].pwszDescription), + pInfoset->rgPropertyInfos[i].vtType); + } + + IMalloc_Free(ppM, ary); + } + IDBProperties_Release(props); + } + + IMalloc_Release(ppM); + +end: IDBInitialize_Release(dbinit); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_init().
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 1366e3a5bfd610d9702426a625ca7cc29bb0d91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1366e3a5bfd610d9702426a62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:10 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_init(). --- dlls/wined3d/texture.c | 74 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e4ef6e8..8cf9fc2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -27,16 +27,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, - UINT layer_count, UINT level_count, enum wined3d_resource_type resource_type, struct wined3d_device *device, - DWORD usage, const struct wined3d_format *format, enum wined3d_pool pool, UINT width, UINT height, UINT depth, + UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { + const struct wined3d_format *format = wined3d_get_format(&device->adapter->gl_info, desc->format); HRESULT hr; - hr = resource_init(&texture->resource, device, resource_type, format, - WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, 0, - parent, parent_ops, resource_ops); - if (FAILED(hr)) + TRACE("texture %p, texture_ops %p, layer_count %u, level_count %u, resource_type %s, format %s, " + "multisample_type %#x, multisample_quality %#x, usage %s, pool %s, width %u, height %u, depth %u, " + "device %p, parent %p, parent_ops %p, resource_ops %p.\n", + texture, texture_ops, layer_count, level_count, debug_d3dresourcetype(desc->resource_type), + debug_d3dformat(desc->format), desc->multisample_type, desc->multisample_quality, + debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, + device, parent, parent_ops, resource_ops); + + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, + desc->multisample_type, desc->multisample_quality, desc->usage, desc->pool, + desc->width, desc->height, desc->depth, 0, parent, parent_ops, resource_ops))) { WARN("Failed to initialize resource, returning %#x\n", hr); return hr; @@ -54,7 +61,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->layer_count = layer_count; texture->level_count = level_count; - texture->filter_type = (usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; + texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; texture->texture_rgb.dirty = TRUE; texture->texture_srgb.dirty = TRUE; @@ -759,7 +766,6 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); struct wined3d_resource_desc desc; unsigned int i, j; HRESULT hr; @@ -822,8 +828,19 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt } } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, WINED3D_RTYPE_CUBE_TEXTURE, device, - usage, format, pool, edge_length, edge_length, 1, parent, parent_ops, &texture2d_resource_ops))) + desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; + desc.format = format_id; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = usage; + desc.pool = pool; + desc.width = edge_length; + desc.height = edge_length; + desc.depth = 1; + desc.size = 0; + + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, + &desc, device, parent, parent_ops, &texture2d_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -836,7 +853,6 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt texture->target = GL_TEXTURE_CUBE_MAP_ARB; /* Generate all the surfaces. */ - wined3d_resource_get_desc(&texture->resource, &desc); desc.resource_type = WINED3D_RTYPE_SURFACE; for (i = 0; i < texture->level_count; ++i) { @@ -880,7 +896,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); struct wined3d_resource_desc desc; UINT pow2_width, pow2_height; unsigned int i; @@ -948,8 +963,19 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he TRACE("Calculated levels = %u.\n", levels); } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, WINED3D_RTYPE_TEXTURE, device, - usage, format, pool, width, height, 1, parent, parent_ops, &texture2d_resource_ops))) + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = format_id; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = usage; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = 1; + desc.size = 0; + + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, + &desc, device, parent, parent_ops, &texture2d_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -970,7 +996,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he texture->min_mip_lookup = minMipLookup_noFilter; } else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] && (width != pow2_width || height != pow2_height) - && !(format->id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE] + && !(format_id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE] && wined3d_settings.rendertargetlock_mode == RTL_READTEX)) { texture->pow2_matrix[0] = (float)width; @@ -1007,7 +1033,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); /* Generate all the surfaces. */ - wined3d_resource_get_desc(&texture->resource, &desc); desc.resource_type = WINED3D_RTYPE_SURFACE; for (i = 0; i < texture->level_count; ++i) { @@ -1152,7 +1177,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, U enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); + struct wined3d_resource_desc desc; UINT tmp_w, tmp_h, tmp_d; unsigned int i; HRESULT hr; @@ -1219,8 +1244,19 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, U } } - if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, WINED3D_RTYPE_VOLUME_TEXTURE, device, - usage, format, pool, width, height, depth, parent, parent_ops, &texture3d_resource_ops))) + desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + desc.format = format_id; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = usage; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = depth; + desc.size = 0; + + if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, + &desc, device, parent, parent_ops, &texture3d_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr;

1 0

Jason Edmeades : cmd: set "var=value" ignores trailing characters.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 56a33a8c558f6b37bf219e289e48cb514cf697fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a33a8c558f6b37bf219e289… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Jun 3 22:38:15 2013 +0100 cmd: set "var=value" ignores trailing characters. --- programs/cmd/builtins.c | 19 +++++++++++++++---- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 9 ++++++--- 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3c06e13..c2ccdc8 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4038,8 +4038,13 @@ void WCMD_setshow_env (WCHAR *s) { s += 2; while (*s && (*s==' ' || *s=='\t')) s++; - if (*s=='\"') - WCMD_strip_quotes(s); + /* set /P "var=value"jim ignores anything after the last quote */ + if (*s=='\"') { + WCHAR *lastquote; + lastquote = WCMD_strip_quotes(s); + if (lastquote) *lastquote = 0x00; + WINE_TRACE("set: Stripped command line '%s'\n", wine_dbgstr_w(s)); + } /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { @@ -4104,8 +4109,14 @@ void WCMD_setshow_env (WCHAR *s) { } else { DWORD gle; - if (*s=='\"') - WCMD_strip_quotes(s); + /* set "var=value"jim ignores anything after the last quote */ + if (*s=='\"') { + WCHAR *lastquote; + lastquote = WCMD_strip_quotes(s); + if (lastquote) *lastquote = 0x00; + WINE_TRACE("set: Stripped command line '%s'\n", wine_dbgstr_w(s)); + } + p = strchrW (s, '='); if (p == NULL) { env = GetEnvironmentStringsW(); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 45617cf..48a8362 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -286,6 +286,24 @@ set WINE_FOO=foo(a)space@ echo '%WINE_FOO%' set WINE_FOO=foo(a)tab@ echo '%WINE_FOO%' +rem Space symbol must appear in `var` +set WINE_FOO=value(a)space@ +echo '%WINE_FOO%' +rem Space symbol must NOT appear in `var` +set "WINE_FOO=value"@space@ +echo '%WINE_FOO%' +rem Mixed examples: +set WINE_FOO=jim fred +echo '%WINE_FOO%' +set WINE_FOO="jim" fred +echo '%WINE_FOO%' +set "WINE_FOO=jim fred" +echo '%WINE_FOO%' +set "WINE_FOO=jim" fred +echo '%WINE_FOO%' +rem Only the final quote ends the string +set "WINE_FOO=apple"banana"grape"orange +echo '%WINE_FOO%' set WINE_FOO= echo ------------ Testing variable expansion ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 99ed738..77e4178 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -251,6 +251,13 @@ foo '' 'foo(a)space@' 'foo(a)tab@' +'value(a)space@' +'value' +'jim fred' +'"jim" fred' +'jim fred' +'jim' +'apple"banana"grape' ------------ Testing variable expansion ------------ ~dp0 should be directory containing batch file @pwd@\ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 418f8c9..e5a0138 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -115,7 +115,7 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); -void WCMD_strip_quotes(WCHAR *cmd); +WCHAR *WCMD_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 876bbef..0d4575b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -496,20 +496,23 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr) { /************************************************************************* * WCMD_strip_quotes * - * Remove first and last quote WCHARacters, preserving all other text + * Remove first and last quote WCHARacters, preserving all other text + * Returns the location of the final quote */ -void WCMD_strip_quotes(WCHAR *cmd) { - WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL; +WCHAR *WCMD_strip_quotes(WCHAR *cmd) { + WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL, *lastquote; while((*dest=*src) != '\0') { if (*src=='\"') lastq=dest; dest++, src++; } + lastquote = lastq; if (lastq) { dest=lastq++; while ((*dest++=*lastq++) != 0) ; } + return lastquote; }

1 0

Andrew Eikum : oleaut32: Fix ITypeInfo::GetNames for functions.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 3983bbf7d9a34ae07900eedb8b98ea1282ddb8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3983bbf7d9a34ae07900eedb8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:56:42 2013 -0500 oleaut32: Fix ITypeInfo::GetNames for functions. --- dlls/oleaut32/typelib.c | 51 ++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index af36a3b..02875c3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2392,12 +2392,7 @@ MSFT_DoFuncs(TLBContext* pcx, elemdesc->u.paramdesc.wParamFlags = paraminfo.Flags; /* name */ - if (paraminfo.oName == -1) - /* this occurs for [propput] or [propget] methods, so - * we should just set the name of the parameter to the - * name of the method. */ - ptfd->pParamDesc[j].Name = ptfd->Name; - else + if (paraminfo.oName != -1) ptfd->pParamDesc[j].Name = MSFT_ReadName( pcx, paraminfo.oName ); TRACE_(typelib)("param[%d] = %s\n", j, debugstr_w(TLB_get_bstr(ptfd->pParamDesc[j].Name))); @@ -5959,29 +5954,38 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, const TLBVarDesc *pVDesc; int i; TRACE("(%p) memid=0x%08x Maxname=%d\n", This, memid, cMaxNames); + + if(!rgBstrNames) + return E_INVALIDARG; + + *pcNames = 0; + pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->cFuncs, memid); if(pFDesc) { - /* function found, now return function and parameter names */ - for(i=0; i<cMaxNames && i <= pFDesc->funcdesc.cParams; i++) - { - if(!i) - *rgBstrNames=SysAllocString(TLB_get_bstr(pFDesc->Name)); - else - rgBstrNames[i]=SysAllocString(TLB_get_bstr(pFDesc->pParamDesc[i-1].Name)); - } - *pcNames=i; + if(!cMaxNames || !pFDesc->Name) + return S_OK; + + *rgBstrNames = SysAllocString(TLB_get_bstr(pFDesc->Name)); + ++(*pcNames); + + for(i = 0; i < pFDesc->funcdesc.cParams; ++i){ + if(*pcNames >= cMaxNames || !pFDesc->pParamDesc[i].Name) + return S_OK; + rgBstrNames[*pcNames] = SysAllocString(TLB_get_bstr(pFDesc->pParamDesc[i].Name)); + ++(*pcNames); + } + return S_OK; + } + + pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->cVars, memid); + if(pVDesc) + { + *rgBstrNames=SysAllocString(TLB_get_bstr(pVDesc->Name)); + *pcNames=1; } else { - pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->cVars, memid); - if(pVDesc) - { - *rgBstrNames=SysAllocString(TLB_get_bstr(pVDesc->Name)); - *pcNames=1; - } - else - { if(This->impltypes && (This->typekind==TKIND_INTERFACE || This->typekind==TKIND_DISPATCH)) { /* recursive search */ @@ -6002,7 +6006,6 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, } *pcNames=0; return TYPE_E_ELEMENTNOTFOUND; - } } return S_OK; }

1 0