Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[gvg] 20136: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Robert Shearman <rob(a)codeweavers.com> - Make dump functions const. - OLE: Implement undocumented behaviour in DispCallFunc. Fix DispCallFunc to work with MSDN-undocumented behaviour used by Office 2003 and document the function. - OLE: Implement ITypeInfo_AddressOfMember. - OLE: Update the type of the oVft parameter for DispCallFunc. - OLE: ITypeInfo_Invoke parameter naming change. Rename the dwFlags parameter of ITypeInfo_Invoke since it is not a DWORD, but an unsigned short. - OLE: Support HREFTYPEs For ITypeInfos Add support for reading the hreftype of a typeinfo, return it to the application in ITypeComp_Bind for the DESKIND_APPOBJECT case and support referencing it in ITypeInfo_GetRefTypeInfo. - OLE: fix function name loading Correctly get the name of the second function of a propget/propput pair in MSFT typelibs when the name offset is set to -1. - OLE: fix invoking dispinterface functions Fix invoking dispinterface functions by using the internal representation of the function, not the one returned to applications. - OLE: Move the dispinterface return value handling to functions that return the FUNCDESC to the user. - OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind. - OLE: Fix brokenness in typelib marshaller caused by dispinterface retval fix. - Fix more fallout from dispinterface retval patch: make typelib marshaler use the internal function description so that it calls dispinterface functions with the correct number of parameters again. - Also fixes some memory leaks caused by the fact that a corresponding ReleaseXDesc function has to be called for each GetXDesc. Michael Stefaniuc <mstefani(a)redhat.de> - Fix VarBstrCmp for NULL input BSTRs (MSDN is wrong). Modified: trunk/reactos/lib/oleaut32/tmarshal.c Modified: trunk/reactos/lib/oleaut32/typelib.c Modified: trunk/reactos/lib/oleaut32/typelib.h Modified: trunk/reactos/lib/oleaut32/vartype.c _____ Modified: trunk/reactos/lib/oleaut32/tmarshal.c --- trunk/reactos/lib/oleaut32/tmarshal.c 2005-12-12 23:53:06 UTC (rev 20135) +++ trunk/reactos/lib/oleaut32/tmarshal.c 2005-12-12 23:54:50 UTC (rev 20136) @@ -304,12 +304,12 @@ */ static int _nroffuncs(ITypeInfo *tinfo) { int n, max = 0; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; HRESULT hres; n=0; while (1) { - hres = ITypeInfo_GetFuncDesc(tinfo,n,&fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo,n,&fdesc); if (hres) return max+1; if (fdesc->oVft/4 > max) @@ -1053,6 +1053,7 @@ (DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst), buf ); + ITypeInfo2_ReleaseVarDesc(tinfo2, vdesc); if (debugout && (i<tattr->cVars-1)) TRACE_(olerelay)(","); } if (debugout) TRACE_(olerelay)("}"); @@ -1108,7 +1109,7 @@ /* Searches function, also in inherited interfaces */ static HRESULT _get_funcdesc( - ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, FUNCDESC **fdesc, BSTR *iname, BSTR *fname) + ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, const FUNCDESC **fdesc, BSTR *iname, BSTR *fname) { int i = 0, j = 0; HRESULT hres; @@ -1120,7 +1121,8 @@ ITypeInfo_AddRef(*tactual); while (1) { - hres = ITypeInfo_GetFuncDesc(tinfo, i, fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i, fdesc); + if (hres) { ITypeInfo *tinfo2; HREFTYPE href; @@ -1164,7 +1166,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) { DWORD *args = ((DWORD*)&tpinfo)+1, *xargs; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; HRESULT hres; int i, relaydeb = TRACE_ON(olerelay); marshal_state buf; @@ -1451,7 +1453,7 @@ HRESULT hres; ITypeInfo *tinfo; int i, nroffuncs; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; TMProxyImpl *proxy; TYPEATTR *typeattr; @@ -1647,7 +1649,7 @@ LPRPCSTUBBUFFER iface, RPCOLEMESSAGE* xmsg,IRpcChannelBuffer*rpcchanbuf) { int i; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; TMStubImpl *This = (TMStubImpl *)iface; HRESULT hres; DWORD *args, res, *xargs, nrofargs; _____ Modified: trunk/reactos/lib/oleaut32/typelib.c --- trunk/reactos/lib/oleaut32/typelib.c 2005-12-12 23:53:06 UTC (rev 20135) +++ trunk/reactos/lib/oleaut32/typelib.c 2005-12-12 23:54:50 UTC (rev 20136) @@ -86,6 +86,7 @@ const GUID CLSID_PSOAInterface = { 0x00020424, 0, 0, { 0xC0, 0, 0, 0, 0, 0, 0, 0x46 } }; static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt); +static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); /*********************************************************************** ***** * FromLExxx @@ -975,6 +976,7 @@ TYPEATTR TypeAttr ; /* _lots_ of type information. */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */ int index; /* index in this typelib; */ + HREFTYPE hreftype; /* hreftype for app object binding */ /* type libs seem to store the doc strings in ascii * so why should we do it in unicode? */ @@ -1025,7 +1027,7 @@ /* debug */ -static void dump_TypeDesc(TYPEDESC *pTD,char *szVarType) { +static void dump_TypeDesc(const TYPEDESC *pTD,char *szVarType) { if (pTD->vt & VT_RESERVED) szVarType += strlen(strcpy(szVarType, "reserved | ")); if (pTD->vt & VT_BYREF) @@ -1072,7 +1074,7 @@ } } -static void dump_ELEMDESC(ELEMDESC *edesc) { +static void dump_ELEMDESC(const ELEMDESC *edesc) { char buf[200]; USHORT flags = edesc->u.paramdesc.wParamFlags; dump_TypeDesc(&edesc->tdesc,buf); @@ -1088,7 +1090,7 @@ if (flags & PARAMFLAG_FHASCUSTDATA) MESSAGE(" PARAMFLAG_FHASCUSTDATA"); MESSAGE("\n\t\tu.paramdesc.lpex %p\n",edesc->u.paramdesc.pparamdescex); } -static void dump_FUNCDESC(FUNCDESC *funcdesc) { +static void dump_FUNCDESC(const FUNCDESC *funcdesc) { int i; MESSAGE("memid is %08lx\n",funcdesc->memid); for (i=0;i<funcdesc->cParams;i++) { @@ -1140,7 +1142,7 @@ "TKIND_MAX" }; -static void dump_TLBFuncDescOne(TLBFuncDesc * pfd) +static void dump_TLBFuncDescOne(const TLBFuncDesc * pfd) { int i; if (!TRACE_ON(typelib)) @@ -1155,7 +1157,7 @@ MESSAGE("\thelpstring: %s\n", debugstr_w(pfd->HelpString)); MESSAGE("\tentry: %s\n", debugstr_w(pfd->Entry)); } -static void dump_TLBFuncDesc(TLBFuncDesc * pfd) +static void dump_TLBFuncDesc(const TLBFuncDesc * pfd) { while (pfd) { @@ -1163,7 +1165,7 @@ pfd = pfd->next; }; } -static void dump_TLBVarDesc(TLBVarDesc * pvd) +static void dump_TLBVarDesc(const TLBVarDesc * pvd) { while (pvd) { @@ -1172,7 +1174,7 @@ }; } -static void dump_TLBImpLib(TLBImpLib *import) +static void dump_TLBImpLib(const TLBImpLib *import) { TRACE_(typelib)("%s %s\n", debugstr_guid(&(import->guid)), debugstr_w(import->name)); @@ -1180,7 +1182,7 @@ import->wVersionMinor, import->lcid, import->offset); } -static void dump_TLBRefType(TLBRefType * prt) +static void dump_TLBRefType(const TLBRefType * prt) { while (prt) { @@ -1199,7 +1201,7 @@ }; } -static void dump_TLBImplType(TLBImplType * impl) +static void dump_TLBImplType(const TLBImplType * impl) { while (impl) { TRACE_(typelib)( @@ -1209,7 +1211,7 @@ } } -void dump_Variant(VARIANT * pvar) +void dump_Variant(const VARIANT * pvar) { SYSTEMTIME st; @@ -1264,7 +1266,7 @@ TRACE("}\n"); } -static void dump_DispParms(DISPPARAMS * pdp) +static void dump_DispParms(const DISPPARAMS * pdp) { int index = 0; @@ -1277,7 +1279,7 @@ } } -static void dump_TypeInfo(ITypeInfoImpl * pty) +static void dump_TypeInfo(const ITypeInfoImpl * pty) { TRACE("%p ref=%lu\n", pty, pty->ref); TRACE("attr:%s\n", debugstr_guid(&(pty->TypeAttr.guid))); @@ -1292,7 +1294,7 @@ dump_TLBImplType(pty->impltypelist); } -static void dump_VARDESC(VARDESC *v) +static void dump_VARDESC(const VARDESC *v) { MESSAGE("memid %ld\n",v->memid); MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema)); @@ -1334,49 +1336,55 @@ HeapFree(GetProcessHeap(), 0, ptr); } -/* deep copy a typedesc */ -static void copy_typedesc(TYPEDESC *out, const TYPEDESC *in) +/* returns the size required for a deep copy of a typedesc into a + * flat buffer */ +static SIZE_T TLB_SizeTypeDesc( const TYPEDESC *tdesc, BOOL alloc_initial_space ) { - out->vt = in->vt; - switch(in->vt) { + SIZE_T size = 0; + + if (alloc_initial_space) + size += sizeof(TYPEDESC); + + switch (tdesc->vt) + { case VT_PTR: - out->u.lptdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(TYPEDESC)); - copy_typedesc(out->u.lptdesc, in->u.lptdesc); - break; - case VT_USERDEFINED: - out->u.hreftype = in->u.hreftype; - break; + case VT_SAFEARRAY: + size += TLB_SizeTypeDesc(tdesc->u.lptdesc, TRUE); + break; case VT_CARRAY: - out->u.lpadesc = HeapAlloc(GetProcessHeap(), 0, sizeof(ARRAYDESC) + - (in->u.lpadesc->cDims - 1) * sizeof(SAFEARRAYBOUND)); - copy_typedesc(&out->u.lpadesc->tdescElem, &in->u.lpadesc->tdescElem); - out->u.lpadesc->cDims = in->u.lpadesc->cDims; - memcpy(out->u.lpadesc->rgbounds, in->u.lpadesc->rgbounds, in->u.lpadesc->cDims * sizeof(SAFEARRAYBOUND)); - break; - default: - break; + size += FIELD_OFFSET(ARRAYDESC, rgbounds[tdesc->u.lpadesc->cDims]); + size += TLB_SizeTypeDesc(&tdesc->u.lpadesc->tdescElem, FALSE); + break; } + return size; } -/* free()s any allocated memory pointed to by the tdesc. NB does not - free the tdesc itself - this is because the tdesc is typically part - of a larger structure */ -static void free_deep_typedesc(TYPEDESC *tdesc) +/* deep copy a typedesc into a flat buffer */ +static void *TLB_CopyTypeDesc( TYPEDESC *dest, const TYPEDESC *src, void *buffer ) { - switch(tdesc->vt) { + if (!dest) + { + dest = buffer; + buffer = (char *)buffer + sizeof(TYPEDESC); + } + + *dest = *src; + + switch (src->vt) + { case VT_PTR: - free_deep_typedesc(tdesc->u.lptdesc); - HeapFree(GetProcessHeap(), 0, tdesc->u.lptdesc); - tdesc->u.lptdesc = NULL; - break; + case VT_SAFEARRAY: + dest->u.lptdesc = buffer; + buffer = TLB_CopyTypeDesc(NULL, src->u.lptdesc, buffer); + break; case VT_CARRAY: - free_deep_typedesc(&tdesc->u.lpadesc->tdescElem); - HeapFree(GetProcessHeap(), 0, tdesc->u.lpadesc); - tdesc->u.lpadesc = NULL; - break; - default: - break; + dest->u.lpadesc = buffer; + memcpy(dest->u.lpadesc, src->u.lpadesc, FIELD_OFFSET(ARRAYDESC, rgbounds[src->u.lpadesc->cDims])); + buffer = (char *)buffer + FIELD_OFFSET(ARRAYDESC, rgbounds[src->u.lpadesc->cDims]); + buffer = TLB_CopyTypeDesc(&dest->u.lpadesc->tdescElem, &src->u.lpadesc->tdescElem, buffer); + break; } + return buffer; } /********************************************************************** @@ -1441,6 +1449,22 @@ TRACE_(typelib)("%s\n", debugstr_guid(pGuid)); } +static HREFTYPE MSFT_ReadHreftype( TLBContext *pcx, int offset ) +{ + MSFT_NameIntro niName; + + if (offset < 0) + { + ERR_(typelib)("bad offset %d\n", offset); + return -1; + } + + MSFT_ReadLEDWords(&niName, sizeof(niName), pcx, + pcx->pTblDir->pNametab.offset+offset); + + return niName.hreftype; +} + static BSTR MSFT_ReadName( TLBContext *pcx, int offset) { char * name; @@ -1525,7 +1549,7 @@ if(offset <0) { /* data are packed in here */ V_VT(pVar) = (offset & 0x7c000000 )>> 26; - V_I2(pVar) = offset & 0x3ffffff; + V_I4(pVar) = offset & 0x3ffffff; return; } MSFT_ReadLEWords(&(V_VT(pVar)), sizeof(VARTYPE), pcx, @@ -1678,6 +1702,7 @@ char recbuf[512]; MSFT_FuncRecord * pFuncRec=(MSFT_FuncRecord *) recbuf; + TLBFuncDesc *ptfd_prev = NULL; TRACE_(typelib)("\n"); @@ -1691,7 +1716,12 @@ MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx, offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT)); - (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); + /* nameoffset is sometimes -1 on the second half of a propget/propput + * pair of functions */ + if ((nameoffset == -1) && (i > 0)) + (*pptfd)->Name = SysAllocString(ptfd_prev->Name); + else + (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); /* read the function information record */ MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); @@ -1773,14 +1803,15 @@ for ( j = 0 ; j < pFuncRec->nrargs ; j++ ) { - TYPEDESC* lpArgTypeDesc = 0; + TYPEDESC *lpArgTypeDesc; + ELEMDESC *elemdesc = &(*pptfd)->funcdesc.lprgelemdescParam[j]; MSFT_GetTdesc(pcx, paraminfo.DataType, - &(*pptfd)->funcdesc.lprgelemdescParam[j].tdesc, + &elemdesc->tdesc, pTI); - (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc.wParamFlags = paraminfo.Flags; + elemdesc->u.paramdesc.wParamFlags = paraminfo.Flags; /* name */ if (paraminfo.oName == -1) @@ -1793,17 +1824,9 @@ MSFT_ReadName( pcx, paraminfo.oName ); TRACE_(typelib)("param[%d] = %s\n", j, debugstr_w((*pptfd)->pParamDesc[j].Name)); - /* SEEK value = jump to offset, - * from there jump to the end of record, - * go back by (j-1) arguments - */ - MSFT_ReadLEDWords( &paraminfo , - sizeof(MSFT_ParameterInfo), pcx, - recoffset + reclength - ((pFuncRec->nrargs - j - 1) - * sizeof(MSFT_ParameterInfo))); - lpArgTypeDesc = - & ((*pptfd)->funcdesc.lprgelemdescParam[j].tdesc); + lpArgTypeDesc = &elemdesc->tdesc; + /* resolve referenced type if any */ while ( lpArgTypeDesc != NULL ) { switch ( lpArgTypeDesc->vt ) @@ -1827,59 +1850,16 @@ lpArgTypeDesc = NULL; } } - } - - /* parameter is the return value! */ - if ( paraminfo.Flags & PARAMFLAG_FRETVAL ) - { - TYPEDESC* lpArgTypeDesc; - - (*pptfd)->funcdesc.elemdescFunc = - (*pptfd)->funcdesc.lprgelemdescParam[j]; - - lpArgTypeDesc = & ((*pptfd)->funcdesc.elemdescFunc.tdesc) ; - - while ( lpArgTypeDesc != NULL ) - { - switch ( lpArgTypeDesc->vt ) - { - case VT_PTR: - lpArgTypeDesc = lpArgTypeDesc->u.lptdesc; - break; - case VT_CARRAY: - lpArgTypeDesc = - & (lpArgTypeDesc->u.lpadesc->tdescElem); - - break; - - case VT_USERDEFINED: - MSFT_DoRefType(pcx, - pTI, - lpArgTypeDesc->u.hreftype); - - lpArgTypeDesc = NULL; - break; - - default: - lpArgTypeDesc = NULL; - } - } - } - - /* second time around */ - for(j=0;j<pFuncRec->nrargs;j++) - { /* default value */ - if ( (PARAMFLAG_FHASDEFAULT & - (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc.wParamFlags) && - ((pFuncRec->FKCCIC) & 0x1000) ) + if ( (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) && + (pFuncRec->FKCCIC & 0x1000) ) { INT* pInt = (INT *)((char *)pFuncRec + reclength - (pFuncRec->nrargs * 4 + 1) * sizeof(INT) ); - PARAMDESC* pParamDesc = & (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc; + PARAMDESC* pParamDesc = &elemdesc->u.paramdesc; pParamDesc->pparamdescex = TLB_Alloc(sizeof(PARAMDESCEX)); pParamDesc->pparamdescex->cBytes = sizeof(PARAMDESCEX); @@ -1887,6 +1867,8 @@ MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), pInt[j], pcx); } + else + elemdesc->u.paramdesc.pparamdescex = NULL; /* custom info */ if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) { @@ -1894,13 +1876,23 @@ pFuncRec->OptAttr[7+j], &(*pptfd)->pParamDesc[j].pCustData); } - } + + /* SEEK value = jump to offset, + * from there jump to the end of record, + * go back by (j-1) arguments + */ + MSFT_ReadLEDWords( &paraminfo , + sizeof(MSFT_ParameterInfo), pcx, + recoffset + reclength - ((pFuncRec->nrargs - j - 1) + * sizeof(MSFT_ParameterInfo))); + } } /* scode is not used: archaic win16 stuff FIXME: right? */ (*pptfd)->funcdesc.cScodes = 0 ; (*pptfd)->funcdesc.lprgscode = NULL ; + ptfd_prev = *pptfd; pptfd = & ((*pptfd)->next); recoffset += reclength; } @@ -2082,6 +2074,7 @@ /* name, eventually add to a hash table */ ptiRet->Name=MSFT_ReadName(pcx, tiBase.NameOffset); + ptiRet->hreftype = MSFT_ReadHreftype(pcx, tiBase.NameOffset); TRACE_(typelib)("reading %s\n", debugstr_w(ptiRet->Name)); /* help info */ ptiRet->DocString=MSFT_ReadString(pcx, tiBase.docstringoffs); @@ -4077,8 +4070,124 @@ DESCKIND * pDescKind, BINDPTR * pBindPtr) { - FIXME("(%s, %lx, 0x%x, %p, %p, %p): stub\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); - return E_NOTIMPL; + ITypeLibImpl *This = impl_from_ITypeComp(iface); + ITypeInfoImpl *pTypeInfo; + + TRACE("(%s, 0x%lx, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + + *pDescKind = DESCKIND_NONE; + pBindPtr->lptcomp = NULL; + *ppTInfo = NULL; + + for (pTypeInfo = This->pTypeInfo; pTypeInfo; pTypeInfo = pTypeInfo->next) + { + TRACE("testing %s\n", debugstr_w(pTypeInfo->Name)); + + /* FIXME: check wFlags here? */ + /* FIXME: we should use a hash table to look this info up using lHash + * instead of an O(n) search */ + if ((pTypeInfo->TypeAttr.typekind == TKIND_ENUM) || + (pTypeInfo->TypeAttr.typekind == TKIND_MODULE)) + { + if (pTypeInfo->Name && !strcmpW(pTypeInfo->Name, szName)) + { + *pDescKind = DESCKIND_TYPECOMP; + pBindPtr->lptcomp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + ITypeComp_AddRef(pBindPtr->lptcomp); + TRACE("module or enum: %s\n", debugstr_w(szName)); + return S_OK; + } + } + + if ((pTypeInfo->TypeAttr.typekind == TKIND_MODULE) || + (pTypeInfo->TypeAttr.typekind == TKIND_ENUM)) + { + ITypeComp *pSubTypeComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + HRESULT hr; + + hr = ITypeComp_Bind(pSubTypeComp, szName, lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + if (SUCCEEDED(hr) && (*pDescKind != DESCKIND_NONE)) + { + TRACE("found in module or in enum: %s\n", debugstr_w(szName)); + return S_OK; + } + } + + if ((pTypeInfo->TypeAttr.typekind == TKIND_COCLASS) && + (pTypeInfo->TypeAttr.wTypeFlags & TYPEFLAG_FAPPOBJECT)) + { + ITypeComp *pSubTypeComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + HRESULT hr; + ITypeInfo *subtypeinfo; + BINDPTR subbindptr; + DESCKIND subdesckind; + + hr = ITypeComp_Bind(pSubTypeComp, szName, lHash, wFlags, + &subtypeinfo, &subdesckind, &subbindptr); + if (SUCCEEDED(hr) && (subdesckind != DESCKIND_NONE)) + { + TYPEDESC tdesc_appobject = + { + { + (TYPEDESC *)pTypeInfo->hreftype + }, + VT_USERDEFINED + }; + const VARDESC vardesc_appobject = + { + -2, /* memid */ + NULL, /* lpstrSchema */ + { + 0 /* oInst */ + }, + { + /* ELEMDESC */ + { + /* TYPEDESC */ + { + &tdesc_appobject + }, + VT_PTR + }, + }, + 0, /* wVarFlags */ + VAR_STATIC /* varkind */ + }; + + TRACE("found in implicit app object: %s\n", debugstr_w(szName)); + + /* cleanup things filled in by Bind call so we can put our + * application object data in there instead */ + switch (subdesckind) + { + case DESCKIND_FUNCDESC: + ITypeInfo_ReleaseFuncDesc(subtypeinfo, subbindptr.lpfuncdesc); + break; + case DESCKIND_VARDESC: + ITypeInfo_ReleaseVarDesc(subtypeinfo, subbindptr.lpvardesc); + break; + default: + break; + } + if (subtypeinfo) ITypeInfo_Release(subtypeinfo); + + if (pTypeInfo->hreftype == -1) + FIXME("no hreftype for interface %p\n", pTypeInfo); + + hr = TLB_AllocAndInitVarDesc(&vardesc_appobject, &pBindPtr->lpvardesc); + if (FAILED(hr)) + return hr; + + *pDescKind = DESCKIND_IMPLICITAPPOBJ; + *ppTInfo = (ITypeInfo *)pTypeInfo; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; + } + } + } + + TRACE("name not found %s\n", debugstr_w(szName)); + return S_OK; } static HRESULT WINAPI ITypeLibComp_fnBindType( @@ -4114,6 +4223,7 @@ pTypeInfoImpl->lpVtbl = &tinfvt; pTypeInfoImpl->lpVtblTypeComp = &tcompvt; pTypeInfoImpl->ref=1; + pTypeInfoImpl->hreftype = -1; } TRACE("(%p)\n", pTypeInfoImpl); return (ITypeInfo2*) pTypeInfoImpl; @@ -4213,13 +4323,24 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, LPTYPEATTR *ppTypeAttr) { - ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + const ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + SIZE_T size; + TRACE("(%p)\n",This); - *ppTypeAttr = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppTypeAttr)); + + size = sizeof(**ppTypeAttr); + if (This->TypeAttr.typekind == TKIND_ALIAS) + size += TLB_SizeTypeDesc(&This->TypeAttr.tdescAlias, FALSE); + + *ppTypeAttr = HeapAlloc(GetProcessHeap(), 0, size); + if (!*ppTypeAttr) + return E_OUTOFMEMORY; + memcpy(*ppTypeAttr, &This->TypeAttr, sizeof(**ppTypeAttr)); - if(This->TypeAttr.typekind == TKIND_ALIAS) /* need to deep copy typedesc */ - copy_typedesc(&(*ppTypeAttr)->tdescAlias, &This->TypeAttr.tdescAlias); + if (This->TypeAttr.typekind == TKIND_ALIAS) + TLB_CopyTypeDesc(&(*ppTypeAttr)->tdescAlias, + &This->TypeAttr.tdescAlias, (void *)(*ppTypeAttr + 1)); if((*ppTypeAttr)->typekind == TKIND_DISPATCH) { (*ppTypeAttr)->cFuncs = (*ppTypeAttr)->cbSizeVft / 4; /* This should include all the inherited @@ -4248,6 +4369,144 @@ return S_OK; } +static SIZE_T TLB_SizeElemDesc( const ELEMDESC *elemdesc ) +{ + SIZE_T size = TLB_SizeTypeDesc(&elemdesc->tdesc, FALSE); + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + size += sizeof(*elemdesc->u.paramdesc.pparamdescex); + return size; +} + +static HRESULT TLB_CopyElemDesc( const ELEMDESC *src, ELEMDESC *dest, char **buffer ) +{ + memcpy(dest, src, sizeof(ELEMDESC)); + *buffer = TLB_CopyTypeDesc(&dest->tdesc, &src->tdesc, *buffer); + if (src->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + { + const PARAMDESCEX *pparamdescex_src = src->u.paramdesc.pparamdescex; + PARAMDESCEX *pparamdescex_dest = dest->u.paramdesc.pparamdescex = (PARAMDESCEX *)*buffer; + *buffer += sizeof(PARAMDESCEX); + memcpy(pparamdescex_dest, pparamdescex_src, sizeof(PARAMDESCEX)); + VariantInit(&pparamdescex_dest->varDefaultValue); + return VariantCopy(&pparamdescex_dest->varDefaultValue, + (VARIANTARG *)&pparamdescex_src->varDefaultValue); + } + else + dest->u.paramdesc.pparamdescex = NULL; + return S_OK; +} + +static void TLB_FreeElemDesc( ELEMDESC *elemdesc ) +{ + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); +} + +static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_ptr, BOOL dispinterface ) +{ + FUNCDESC *dest; + char *buffer; + SIZE_T size = sizeof(*src); + SHORT i; + HRESULT hr; + + size += sizeof(*src->lprgscode) * src->cScodes; + size += TLB_SizeElemDesc(&src->elemdescFunc); + for (i = 0; i < src->cParams; i++) + { + size += sizeof(ELEMDESC); + size += TLB_SizeElemDesc(&src->lprgelemdescParam[i]); + } + + dest = (FUNCDESC *)SysAllocStringByteLen(NULL, size); + if (!dest) return E_OUTOFMEMORY; + + memcpy(dest, src, sizeof(FUNCDESC)); + buffer = (char *)(dest + 1); + + dest->lprgscode = (SCODE *)buffer; + memcpy(dest->lprgscode, src->lprgscode, sizeof(*src->lprgscode) * src->cScodes); + buffer += sizeof(*src->lprgscode) * src->cScodes; + + hr = TLB_CopyElemDesc(&src->elemdescFunc, &dest->elemdescFunc, &buffer); + if (FAILED(hr)) + { + SysFreeString((BSTR)dest); + return hr; + } + + dest->lprgelemdescParam = (ELEMDESC *)buffer; + buffer += sizeof(ELEMDESC) * src->cParams; + for (i = 0; i < src->cParams; i++) + { + hr = TLB_CopyElemDesc(&src->lprgelemdescParam[i], &dest->lprgelemdescParam[i], &buffer); + if (FAILED(hr)) + break; + } + if (FAILED(hr)) + { + /* undo the above actions */ + for (i = i - 1; i >= 0; i--) + TLB_FreeElemDesc(&dest->lprgelemdescParam[i]); + TLB_FreeElemDesc(&dest->elemdescFunc); + SysFreeString((BSTR)dest); + return hr; + } + + /* special treatment for dispinterfaces: this makes functions appear + * to return their [retval] value when it is really returning an + * HRESULT */ + if (dispinterface && dest->elemdescFunc.tdesc.vt == VT_HRESULT) + { + if (dest->cParams && + (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) + { + ELEMDESC *elemdesc = &dest->lprgelemdescParam[dest->cParams - 1]; + if (elemdesc->tdesc.vt != VT_PTR) + { + ERR("elemdesc should have started with VT_PTR instead of:\n"); + if (ERR_ON(ole)) + dump_ELEMDESC(elemdesc); + return E_UNEXPECTED; + } + + /* copy last parameter to the return value. we are using a flat + * buffer so there is no danger of leaking memory in + * elemdescFunc */ + dest->elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; + + /* remove the last parameter */ + dest->cParams--; + } + else + /* otherwise this function is made to appear to have no return + * value */ + dest->elemdescFunc.tdesc.vt = VT_VOID; + + } + + *dest_ptr = dest; + return S_OK; +} + +HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) +{ + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + const TLBFuncDesc *pFDesc; + int i; + + for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) + ; + + if (pFDesc) + { + *ppFuncDesc = &pFDesc->funcdesc; + return S_OK; + } + + return E_INVALIDARG; +} + /* ITypeInfo::GetFuncDesc * * Retrieves the FUNCDESC structure that contains information about a @@ -4258,17 +4517,72 @@ LPFUNCDESC *ppFuncDesc) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int i; - TLBFuncDesc * pFDesc; + const FUNCDESC *internal_funcdesc; + HRESULT hr; + TRACE("(%p) index %d\n", This, index); - for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) - ; - if(pFDesc){ - /* FIXME: must do a copy here */ - *ppFuncDesc=&pFDesc->funcdesc; - return S_OK; + + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc); + if (FAILED(hr)) + return hr; + + return TLB_AllocAndInitFuncDesc( + internal_funcdesc, + ppFuncDesc, + This->TypeAttr.typekind == TKIND_DISPATCH); +} + +static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr ) +{ + VARDESC *dest; + char *buffer; + SIZE_T size = sizeof(*src); + HRESULT hr; + + if (src->lpstrSchema) size += (strlenW(src->lpstrSchema) + 1) * sizeof(WCHAR); + if (src->varkind == VAR_CONST) + size += sizeof(VARIANT); + size += TLB_SizeElemDesc(&src->elemdescVar); + + dest = (VARDESC *)SysAllocStringByteLen(NULL, size); + if (!dest) return E_OUTOFMEMORY; + + *dest = *src; + buffer = (char *)(dest + 1); + if (src->lpstrSchema) + { + int len; + dest->lpstrSchema = (LPOLESTR)buffer; + len = strlenW(src->lpstrSchema); + memcpy(dest->lpstrSchema, src->lpstrSchema, (len + 1) * sizeof(WCHAR)); + buffer += (len + 1) * sizeof(WCHAR); } - return E_INVALIDARG; + + if (src->varkind == VAR_CONST) + { + HRESULT hr; + + dest->u.lpvarValue = (VARIANT *)buffer; + *dest->u.lpvarValue = *src->u.lpvarValue; + buffer += sizeof(VARIANT); + VariantInit(dest->u.lpvarValue); + hr = VariantCopy(dest->u.lpvarValue, src->u.lpvarValue); + if (FAILED(hr)) + { + SysFreeString((BSTR)dest_ptr); + return hr; + } + } + hr = TLB_CopyElemDesc(&src->elemdescVar, &dest->elemdescVar, &buffer); + if (FAILED(hr)) + { + if (src->varkind == VAR_CONST) + VariantClear(dest->u.lpvarValue); + SysFreeString((BSTR)dest); + return hr; + } + *dest_ptr = dest; + return S_OK; } /* ITypeInfo::GetVarDesc @@ -4281,15 +4595,16 @@ { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; - TLBVarDesc * pVDesc; + const TLBVarDesc *pVDesc; + TRACE("(%p) index %d\n", This, index); + for(i=0, pVDesc=This->varlist; i!=index && pVDesc; i++, pVDesc=pVDesc->next) ; - if(pVDesc){ - /* FIXME: must do a copy here */ - *ppVarDesc=&pVDesc->vardesc; - return S_OK; - } + + if (pVDesc) + return TLB_AllocAndInitVarDesc(&pVDesc->vardesc, ppVarDesc); + return E_INVALIDARG; } @@ -4858,10 +5173,49 @@ /*********************************************************************** * DispCallFunc (OLEAUT32.@) + * + * Invokes a function of the specifed calling convention, passing the + * specified arguments and returns the result. + * + * PARAMS + * pvInstance [I] Optional pointer to the instance whose function to invoke. + * oVft [I] The offset in the vtable. See notes. + * cc [I] Calling convention of the function to call. + * vtReturn [I] The return type of the function. + * cActuals [I] Number of parameters. + * prgvt [I] The types of the parameters to pass. This is used for sizing only. + * prgpvarg [I] The arguments to pass. + * pvargResult [O] The return value of the function. Can be NULL. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * NOTES + * The HRESULT return value of this function is not affected by the return + * value of the user supplied function, which is returned in pvargResult. + * + * If pvInstance is NULL then a non-object function is to be called and oVft + * is the address of the function to call. + * + * The cc parameter can be one of the following values: + *|CC_FASTCALL + *|CC_CDECL + *|CC_PASCAL + *|CC_STDCALL + *|CC_FPFASTCALL + *|CC_SYSCALL + *|CC_MPWCDECL + *|CC_MPWPASCAL + * + * BUGS + * Native accepts arguments in the reverse order. I.e. the first item in the + * prgpvarg array is the last argument in the C/C++ declaration of the + * function to be called. */ HRESULT WINAPI DispCallFunc( - void* pvInstance, ULONG oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, + void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) { int i, argsize, argspos; @@ -4872,10 +5226,10 @@ pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); - /* DispCallFunc is only used to invoke methods belonging to an - * IDispatch-derived COM interface. So we need to add a first parameter - * to the list of arguments, to supply the interface pointer */ - argsize = 1; + argsize = 0; + if (pvInstance) + argsize++; /* for This pointer */ + for (i=0;i<cActuals;i++) { TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); @@ -4883,8 +5237,14 @@ argsize += _argsize(prgvt[i]); } args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); - args[0] = (DWORD)pvInstance; /* this is the fake IDispatch interface pointer */ - argspos = 1; + + argspos = 0; + if (pvInstance) + { + args[0] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ + argspos++; + } + for (i=0;i<cActuals;i++) { VARIANT *arg = prgpvarg[i]; @@ -4893,7 +5253,16 @@ argspos += _argsize(prgvt[i]); } - hres = _invoke((*(FARPROC**)pvInstance)[oVft/sizeof(void *)],cc,argsize,args); + if (pvInstance) [truncated at 1000 lines; 323 more skipped]

18 years, 9 months

[gvg] 20135: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Made the Drag&Drop cursors' rubber band visible on a white background. - Correct the hot spot position of the drag&drop 'move' and 'link' cursors. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Robert Shearman <rob(a)codeweavers.com> - Delegate advises to the remote object to enable the client to receive data change notifications. - Implement IOleObject_DoVerb function by running the object and then delegating to the remote IOleObject_DoVerb function. - Call DefaultHandler_Stop if we fail to start the server running correctly and a few formatting fixes. - Call the equivalent delegate function for all of the simple functions. - OLE: Fix a typo where brackets were missing. - Implement some user marshal functions and add tests. Modified: trunk/reactos/include/wine/objidl.h Deleted: trunk/reactos/lib/ole32/Makefile.in Modified: trunk/reactos/lib/ole32/compobj_private.h Modified: trunk/reactos/lib/ole32/defaulthandler.c Modified: trunk/reactos/lib/ole32/ole32.spec Modified: trunk/reactos/lib/ole32/ole32.xml Modified: trunk/reactos/lib/ole32/ole32res.rc Modified: trunk/reactos/lib/ole32/oleobj.c Modified: trunk/reactos/lib/ole32/rpc.c Added: trunk/reactos/lib/ole32/usrmarshal.c Modified: trunk/reactos/w32api/include/wtypes.h _____ Modified: trunk/reactos/include/wine/objidl.h --- trunk/reactos/include/wine/objidl.h 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/include/wine/objidl.h 2005-12-12 23:53:06 UTC (rev 20135) @@ -2120,5 +2120,37 @@ #endif /* __IMultiQI_INTERFACE_DEFINED__ */ +typedef struct _GDI_OBJECT { + DWORD ObjectType; + union { + wireHBITMAP hBitmap; + wireHPALETTE hPalette; + wireHGLOBAL hGeneric; + } u; +} GDI_OBJECT; +typedef struct _userSTGMEDIUM { + struct { + DWORD tymed; + union { + wireHMETAFILEPICT hMetaFilePict; + wireHENHMETAFILE hHEnhMetaFile; + GDI_OBJECT *hGdiHandle; + wireHGLOBAL hGlobal; + LPOLESTR lpszFileName; + BYTE_BLOB *pstm; + BYTE_BLOB *pstg; + } u; + } DUMMYSTRUCTNAME; + IUnknown *pUnkForRelease; +} userSTGMEDIUM; +typedef userSTGMEDIUM *wireSTGMEDIUM; +typedef userSTGMEDIUM *wireASYNC_STGMEDIUM; +typedef STGMEDIUM ASYNC_STGMEDIUM; +typedef STGMEDIUM *LPSTGMEDIUM; +typedef struct _FLAG_STGMEDIUM { + long ContextFlags; + long fPassOwnership; + STGMEDIUM Stgmed; +} FLAG_STGMEDIUM; #endif /* __WINE_OBJIDL_H */ _____ Deleted: trunk/reactos/lib/ole32/Makefile.in --- trunk/reactos/lib/ole32/Makefile.in 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/lib/ole32/Makefile.in 2005-12-12 23:53:06 UTC (rev 20135) @@ -1,78 +0,0 @@ -EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = ole32.dll -IMPORTLIB = libole32.$(IMPLIBEXT) -IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll -EXTRALIBS = -luuid $(LIBUNICODE) - -C_SRCS = \ - antimoniker.c \ - bindctx.c \ - clipboard.c \ - compobj.c \ - compositemoniker.c \ - datacache.c \ - defaulthandler.c \ - dictionary.c \ - errorinfo.c \ - filemoniker.c \ - ftmarshal.c \ - git.c \ - hglobalstream.c \ - ifs.c \ - itemmoniker.c \ - marshal.c \ - memlockbytes.c \ - moniker.c \ - ole2.c \ - ole2stubs.c \ - ole2impl.c \ - ole32_main.c \ - oleobj.c \ - oleproxy.c \ - regsvr.c \ - rpc.c \ - stg_bigblockfile.c \ - stg_prop.c \ - stg_stream.c \ - storage32.c \ - stubmanager.c - -C_SRCS16 = \ - memlockbytes16.c \ - ole16.c \ - ole2_16.c \ - ole2nls.c \ - storage.c - -SPEC_SRCS16 = \ - compobj.spec \ - ole2.spec \ - ole2conv.spec \ - ole2nls.spec \ - ole2prox.spec \ - ole2thk.spec \ - storage.spec - -RC_SRCS = ole32res.rc -RC_BINSRC = ole32res.rc -RC_BINARIES = \ - drag_copy.cur \ - drag_link.cur \ - drag_move.cur \ - nodrop.cur - -IDL_SRCS = \ - dcom.idl - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: - -# note: this will get overwritten by make depend -$(ALL_OBJS): $(IDL_SRCS:.idl=.h) _____ Modified: trunk/reactos/lib/ole32/compobj_private.h --- trunk/reactos/lib/ole32/compobj_private.h 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/lib/ole32/compobj_private.h 2005-12-12 23:53:06 UTC (rev 20135) @@ -263,4 +263,8 @@ #define CHARS_IN_GUID 39 /* including NULL */ +/* Exported non-interface Data Advise Holder functions */ +HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); +void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface); + #endif /* __WINE_OLE_COMPOBJ_H */ _____ Modified: trunk/reactos/lib/ole32/defaulthandler.c --- trunk/reactos/lib/ole32/defaulthandler.c 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/lib/ole32/defaulthandler.c 2005-12-12 23:53:06 UTC (rev 20135) @@ -55,8 +55,11 @@ #include "winbase.h" #include "winuser.h" #include "winerror.h" +#include "ole2.h" + +#include "compobj_private.h" + #include "wine/unicode.h" -#include "ole2.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -108,6 +111,8 @@ IOleObject *pOleDelegate; /* IPersistStorage delegate */ IPersistStorage *pPSDelegate; + /* IDataObject delegate */ + IDataObject *pDataDelegate; /* connection cookie for the advise on the delegate OLE object */ DWORD dwAdvConn; @@ -307,9 +312,13 @@ IOleClientSite* pClientSite) { DefaultHandler *This = impl_from_IOleObject(iface); + HRESULT hr = S_OK; TRACE("(%p, %p)\n", iface, pClientSite); + if (This->pOleDelegate) + hr = IOleObject_SetClientSite(This->pOleDelegate, pClientSite); + /* * Make sure we release the previous client site if there * was one. @@ -371,6 +380,9 @@ debugstr_w(szContainerApp), debugstr_w(szContainerObj)); + if (This->pOleDelegate) + IOleObject_SetHostNames(This->pOleDelegate, szContainerApp, szContainerObj); + /* Be sure to cleanup before re-assinging the strings. */ HeapFree( GetProcessHeap(), 0, This->containerApp ); This->containerApp = NULL; @@ -404,6 +416,12 @@ /* FIXME: call IOleCache_OnStop */ + DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); + if (This->pDataDelegate) + { + IDataObject_Release(This->pDataDelegate); + This->pDataDelegate = NULL; + } if (This->pPSDelegate) { IPersistStorage_Release(This->pPSDelegate); @@ -452,11 +470,16 @@ DWORD dwWhichMoniker, IMoniker* pmk) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %ld, %p)\n", iface, dwWhichMoniker, pmk); + if (This->pOleDelegate) + return IOleObject_SetMoniker(This->pOleDelegate, dwWhichMoniker, pmk); + return S_OK; } @@ -478,6 +501,11 @@ TRACE("(%p, %ld, %ld, %p)\n", iface, dwAssign, dwWhichMoniker, ppmk); + if (This->pOleDelegate) + return IOleObject_GetMoniker(This->pOleDelegate, dwAssign, dwWhichMoniker, + ppmk); + + /* FIXME: dwWhichMoniker == OLEWHICHMK_CONTAINER only? */ if (This->clientSite) { return IOleClientSite_GetMoniker(This->clientSite, @@ -503,9 +531,14 @@ BOOL fCreation, DWORD dwReserved) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %p, %d, %ld)\n", iface, pDataObject, fCreation, dwReserved); + if (This->pOleDelegate) + return IOleObject_InitFromData(This->pOleDelegate, pDataObject, fCreation, + dwReserved); return OLE_E_NOTRUNNING; } @@ -521,9 +554,15 @@ DWORD dwReserved, IDataObject** ppDataObject) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %ld, %p)\n", iface, dwReserved, ppDataObject); + if (This->pOleDelegate) + return IOleObject_GetClipboardData(This->pOleDelegate, dwReserved, + ppDataObject); + return OLE_E_NOTRUNNING; } @@ -536,8 +575,17 @@ HWND hwndParent, LPCRECT lprcPosRect) { - FIXME(": Stub\n"); - return E_NOTIMPL; + DefaultHandler *This = impl_from_IOleObject(iface); + IRunnableObject *pRunnableObj = (IRunnableObject *)&This->lpvtblIRunnableObject; + HRESULT hr; + + TRACE("(%ld, %p, %p, %ld, %p, %s)\n", iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect)); + + hr = IRunnableObject_Run(pRunnableObj, NULL); + if (FAILED(hr)) return hr; + + return IOleObject_DoVerb(This->pOleDelegate, iVerb, lpmsg, pActiveSite, + lindex, hwndParent, lprcPosRect); } /*********************************************************************** * @@ -650,8 +698,14 @@ DWORD dwDrawAspect, SIZEL* psizel) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %lx, (%ld x %ld))\n", iface, dwDrawAspect, psizel->cx, psizel->cy); + + if (This->pOleDelegate) + IOleObject_SetExtent(This->pOleDelegate, dwDrawAspect, psizel); + return OLE_E_NOTRUNNING; } @@ -676,8 +730,10 @@ TRACE("(%p, %lx, %p)\n", iface, dwDrawAspect, psizel); + if (This->pOleDelegate) + return IOleObject_GetExtent(This->pOleDelegate, dwDrawAspect, psizel); + hres = IUnknown_QueryInterface(This->dataCache, &IID_IViewObject2, (void**)&cacheView); - if (FAILED(hres)) return E_UNEXPECTED; @@ -824,7 +880,7 @@ } /*********************************************************************** * - * DefaultHandler_SetExtent (IOleObject) + * DefaultHandler_SetColorScheme (IOleObject) * * This method is meaningless if the server is not running * @@ -834,7 +890,13 @@ IOleObject* iface, struct tagLOGPALETTE* pLogpal) { + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p, %p))\n", iface, pLogpal); + + if (This->pOleDelegate) + return IOleObject_SetColorScheme(This->pOleDelegate, pLogpal); + return OLE_E_NOTRUNNING; } @@ -1212,24 +1274,29 @@ if (This->pOleDelegate) return S_OK; - hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_IOleObject, (void **)&This->pOleDelegate); + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER, + &IID_IOleObject, (void **)&This->pOleDelegate); if (FAILED(hr)) return hr; - hr = IOleObject_Advise(This->pOleDelegate, (IAdviseSink *)&This->lpvtblIAdviseSink, &This->dwAdvConn); + hr = IOleObject_Advise(This->pOleDelegate, + (IAdviseSink *)&This->lpvtblIAdviseSink, + &This->dwAdvConn); if (SUCCEEDED(hr) && This->clientSite) hr = IOleObject_SetClientSite(This->pOleDelegate, This->clientSite); if (SUCCEEDED(hr)) { - IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, (void **)&This->pPSDelegate); + IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, + (void **)&This->pPSDelegate); if (This->pPSDelegate) hr = IPersistStorage_InitNew(This->pPSDelegate, NULL); } if (SUCCEEDED(hr) && This->containerApp) - hr = IOleObject_SetHostNames(This->pOleDelegate, This->containerApp, This->containerObj); + hr = IOleObject_SetHostNames(This->pOleDelegate, This->containerApp, + This->containerObj); /* FIXME: do more stuff here: * - IOleObject_GetMiscStatus @@ -1237,8 +1304,16 @@ * - IOleCache_OnRun */ - /* FIXME: if we failed, Close the object */ + if (SUCCEEDED(hr)) + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, + (void **)&This->pDataDelegate); + if (SUCCEEDED(hr) && This->dataAdviseHolder) + hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); + + if (FAILED(hr)) + DefaultHandler_Stop(This); + return hr; } @@ -1510,6 +1585,7 @@ This->containerObj = NULL; This->pOleDelegate = NULL; This->pPSDelegate = NULL; + This->pDataDelegate = NULL; This->dwAdvConn = 0; _____ Modified: trunk/reactos/lib/ole32/ole32.spec --- trunk/reactos/lib/ole32/ole32.spec 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/lib/ole32/ole32.spec 2005-12-12 23:53:06 UTC (rev 20135) @@ -1,8 +1,8 @@ @ stdcall BindMoniker(ptr long ptr ptr) -@ stub CLIPFORMAT_UserFree -@ stub CLIPFORMAT_UserMarshal -@ stub CLIPFORMAT_UserSize -@ stub CLIPFORMAT_UserUnmarshal +@ stdcall CLIPFORMAT_UserFree(ptr ptr) +@ stdcall CLIPFORMAT_UserMarshal(ptr ptr ptr) +@ stdcall CLIPFORMAT_UserSize(ptr long ptr) +@ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) @ stdcall CLSIDFromProgID(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) @ stdcall CoAddRefServerProcess() @@ -107,30 +107,34 @@ @ stdcall GetHGlobalFromStream(ptr ptr) @ stub GetHookInterface @ stdcall GetRunningObjectTable(long ptr) -@ stub HACCEL_UserFree -@ stub HACCEL_UserMarshal -@ stub HACCEL_UserSize -@ stub HACCEL_UserUnmarshal -@ stub HBITMAP_UserFree -@ stub HBITMAP_UserMarshal -@ stub HBITMAP_UserSize -@ stub HBITMAP_UserUnmarshal +@ stdcall HACCEL_UserFree(ptr ptr) +@ stdcall HACCEL_UserMarshal(ptr ptr ptr) +@ stdcall HACCEL_UserSize(ptr long ptr) +@ stdcall HACCEL_UserUnmarshal(ptr ptr ptr) +@ stdcall HBITMAP_UserFree(ptr ptr) +@ stdcall HBITMAP_UserMarshal(ptr ptr ptr) +@ stdcall HBITMAP_UserSize(ptr long ptr) +@ stdcall HBITMAP_UserUnmarshal(ptr ptr ptr) @ stub HBRUSH_UserFree @ stub HBRUSH_UserMarshal @ stub HBRUSH_UserSize @ stub HBRUSH_UserUnmarshal -@ stub HENHMETAFILE_UserFree -@ stub HENHMETAFILE_UserMarshal -@ stub HENHMETAFILE_UserSize -@ stub HENHMETAFILE_UserUnmarshal -@ stub HGLOBAL_UserFree -@ stub HGLOBAL_UserMarshal -@ stub HGLOBAL_UserSize -@ stub HGLOBAL_UserUnmarshal -@ stub HMENU_UserFree -@ stub HMENU_UserMarshal -@ stub HMENU_UserSize -@ stub HMENU_UserUnmarshal +@ stdcall HDC_UserFree(ptr ptr) +@ stdcall HDC_UserMarshal(ptr ptr ptr) +@ stdcall HDC_UserSize(ptr long ptr) +@ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HENHMETAFILE_UserFree(ptr ptr) +@ stdcall HENHMETAFILE_UserMarshal(ptr ptr ptr) +@ stdcall HENHMETAFILE_UserSize(ptr long ptr) +@ stdcall HENHMETAFILE_UserUnmarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserFree(ptr ptr) +@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserSize(ptr long ptr) +@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) +@ stdcall HMENU_UserFree(ptr ptr) +@ stdcall HMENU_UserMarshal(ptr ptr ptr) +@ stdcall HMENU_UserSize(ptr long ptr) +@ stdcall HMENU_UserUnmarshal(ptr ptr ptr) @ stub HMETAFILEPICT_UserFree @ stub HMETAFILEPICT_UserMarshal @ stub HMETAFILEPICT_UserSize @@ -139,14 +143,14 @@ @ stub HMETAFILE_UserMarshal @ stub HMETAFILE_UserSize @ stub HMETAFILE_UserUnmarshal -@ stub HPALETTE_UserFree -@ stub HPALETTE_UserMarshal -@ stub HPALETTE_UserSize -@ stub HPALETTE_UserUnmarshal -@ stub HWND_UserFree -@ stub HWND_UserMarshal -@ stub HWND_UserSize -@ stub HWND_UserUnmarshal +@ stdcall HPALETTE_UserFree(ptr ptr) +@ stdcall HPALETTE_UserMarshal(ptr ptr ptr) +@ stdcall HPALETTE_UserSize(ptr long ptr) +@ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr) +@ stdcall HWND_UserFree(ptr ptr) +@ stdcall HWND_UserMarshal(ptr ptr ptr) +@ stdcall HWND_UserSize(ptr long ptr) +@ stdcall HWND_UserUnmarshal(ptr ptr ptr) @ stdcall IIDFromString(wstr ptr) CLSIDFromString @ stub I_RemoteMain @ stdcall IsAccelerator(long long ptr long) @@ -227,14 +231,14 @@ @ stdcall RegisterDragDrop(long ptr) @ stdcall ReleaseStgMedium(ptr) @ stdcall RevokeDragDrop(long) -@ stub SNB_UserFree -@ stub SNB_UserMarshal -@ stub SNB_UserSize -@ stub SNB_UserUnmarshal -@ stub STGMEDIUM_UserFree -@ stub STGMEDIUM_UserMarshal -@ stub STGMEDIUM_UserSize -@ stub STGMEDIUM_UserUnmarshal +@ stdcall SNB_UserFree(ptr ptr) +@ stdcall SNB_UserMarshal(ptr ptr ptr) +@ stdcall SNB_UserSize(ptr long ptr) +@ stdcall SNB_UserUnmarshal(ptr ptr ptr) +@ stdcall STGMEDIUM_UserFree(ptr ptr) +@ stdcall STGMEDIUM_UserMarshal(ptr ptr ptr) +@ stdcall STGMEDIUM_UserSize(ptr long ptr) +@ stdcall STGMEDIUM_UserUnmarshal(ptr ptr ptr) @ stdcall SetConvertStg(ptr long) @ stub SetDocumentBitStg @ stdcall SetErrorInfo(long ptr) _____ Modified: trunk/reactos/lib/ole32/ole32.xml --- trunk/reactos/lib/ole32/ole32.xml 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/lib/ole32/ole32.xml 2005-12-12 23:53:06 UTC (rev 20135) @@ -48,6 +48,7 @@ <file>stg_stream.c</file> <file>storage32.c</file> <file>stubmanager.c</file> + <file>usrmarshal.c</file> <file>ole32res.rc</file> <file>ole32.spec</file> </module> _____ Modified: trunk/reactos/lib/ole32/ole32res.rc --- trunk/reactos/lib/ole32/ole32res.rc 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/lib/ole32/ole32res.rc 2005-12-12 23:53:06 UTC (rev 20135) @@ -62,22 +62,22 @@ /* BINRES drag_move.cur */ 1 CURSOR drag_move.cur /* { - '00 00 02 00 01 00 20 20 00 00 12 00 16 00 30 01' + '00 00 02 00 01 00 20 20 00 00 01 00 01 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 05 55 00 00 0A AA 80 00 04 01 00 00 08 00' - '80 00 04 01 00 00 08 00 80 00 05 55 00 00 0A EA' + '80 00 04 01 00 00 08 00 80 00 05 55 00 00 0A AA' '80 00 00 C0 00 00 01 80 00 00 01 80 00 00 03 00' '00 00 23 00 00 00 36 00 00 00 3E 00 00 00 3F C0' '00 00 3F 80 00 00 3F 00 00 00 3E 00 00 00 3C 00' '00 00 38 00 00 00 30 00 00 00 20 00 00 00 00 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - 'FF FF FA AA FF FF F5 55 7F FF FB FE FF FF F7 FF' - '7F FF FB FE FF FF F7 FF 7F FF FA AA FF FF F5 15' + 'FF FF F0 00 7F FF F0 00 7F FF F3 FE 7F FF F3 FE' + '7F FF F3 FE 7F FF F3 FE 7F FF F0 00 7F FF F0 00' '7F FF FE 1F FF FF FC 3F FF FF BC 3F FF FF 98 7F' 'FF FF 88 7F FF FF 80 FF FF FF 80 0F FF FF 80 1F' 'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF' @@ -95,15 +95,15 @@ '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 07 F0 00 00 07 70 00 00 07' '70 00 05 54 10 00 0A A7 70 00 04 07 70 00 08 07' - 'F0 00 04 00 00 00 08 00 80 00 05 55 00 00 0A EA' + 'F0 00 04 00 00 00 08 00 80 00 05 55 00 00 0A AA' '80 00 00 C0 00 00 01 80 00 00 01 80 00 00 03 00' '00 00 23 00 00 00 36 00 00 00 3E 00 00 00 3F C0' '00 00 3F 80 00 00 3F 00 00 00 3E 00 00 00 3C 00' '00 00 38 00 00 00 30 00 00 00 20 00 00 00 00 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF F0 07 FF FF F0 07 FF FF F0 07 FF FF F0' - '07 FF FA A0 07 FF F5 50 07 FF FB F0 07 FF F7 F0' - '07 FF FB F0 07 FF F7 FF 7F FF FA AA FF FF F5 15' + '07 FF F0 00 07 FF F0 00 07 FF F3 F0 07 FF F3 F0' + '07 FF F3 F0 07 FF F3 FE 7F FF F0 00 7F FF F0 00' '7F FF FE 1F FF FF FC 3F FF FF BC 3F FF FF 98 7F' 'FF FF 88 7F FF FF 80 FF FF FF 80 0F FF FF 80 1F' 'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF' @@ -114,22 +114,22 @@ /* BINRES drag_link.cur */ 3 CURSOR drag_link.cur /* { - '00 00 02 00 01 00 20 20 00 00 12 00 16 00 30 01' + '00 00 02 00 01 00 20 20 00 00 01 00 01 00 30 01' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' '00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 07 F0 00 00 06 F0 00 00 06' 'F0 00 05 57 50 00 0A A7 90 00 04 07 10 00 08 07' - 'F0 00 04 00 00 00 08 00 80 00 05 55 00 00 0A EA' + 'F0 00 04 00 00 00 08 00 80 00 05 55 00 00 0A AA' '80 00 00 C0 00 00 01 80 00 00 01 80 00 00 03 00' '00 00 23 00 00 00 36 00 00 00 3E 00 00 00 3F C0' '00 00 3F 80 00 00 3F 00 00 00 3E 00 00 00 3C 00' '00 00 38 00 00 00 30 00 00 00 20 00 00 00 00 00' '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF' 'FF FF FF F0 07 FF FF F0 07 FF FF F0 07 FF FF F0' - '07 FF FA A0 07 FF F5 50 07 FF FB F0 07 FF F7 F0' - '07 FF FB F0 07 FF F7 FF 7F FF FA AA FF FF F5 15' + '07 FF F0 00 07 FF F0 00 07 FF F3 F0 07 FF F3 F0' + '07 FF F3 F0 07 FF F3 FE 7F FF F0 00 7F FF F0 00' '7F FF FE 1F FF FF FC 3F FF FF BC 3F FF FF 98 7F' 'FF FF 88 7F FF FF 80 FF FF FF 80 0F FF FF 80 1F' 'FF FF 80 3F FF FF 80 7F FF FF 80 FF FF FF 81 FF' _____ Modified: trunk/reactos/lib/ole32/oleobj.c --- trunk/reactos/lib/ole32/oleobj.c 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/lib/ole32/oleobj.c 2005-12-12 23:53:06 UTC (rev 20135) @@ -351,6 +351,7 @@ IAdviseSink *sink; FORMATETC fmat; DWORD advf; + DWORD remote_connection; } DataAdviseConnection; typedef struct DataAdviseHolder @@ -362,6 +363,9 @@ DataAdviseConnection* Connections; } DataAdviseHolder; +/* this connection has also has been advised to the delegate data object */ +#define WINE_ADVF_REMOTE 0x80000000 + /*********************************************************************** ******* * DataAdviseHolder_Destructor */ @@ -520,7 +524,7 @@ */ This->Connections[index].sink = pAdvise; memcpy(&(This->Connections[index].fmat), pFetc, sizeof(FORMATETC)); - This->Connections[index].advf = advf; + This->Connections[index].advf = advf & ~WINE_ADVF_REMOTE; if (This->Connections[index].sink != NULL) { IAdviseSink_AddRef(This->Connections[index].sink); @@ -636,6 +640,33 @@ DataAdviseHolder_SendOnDataChange }; +HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) +{ + DataAdviseHolder *This = (DataAdviseHolder *)iface; + DWORD index; + HRESULT hr = S_OK; + + for(index = 0; index < This->maxCons; index++) + { + if(This->Connections[index].sink != NULL) + { + hr = IDataObject_DAdvise(pDelegate, &This->Connections[index].fmat, + This->Connections[index].advf, + This->Connections[index].sink, + &This->Connections[index].remote_connection); + if (FAILED(hr)) break; + This->Connections[index].advf |= WINE_ADVF_REMOTE; + } + } + /* FIXME: store pDelegate somewhere */ + return hr; +} + +void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface) +{ + /* FIXME: Unadvise all remote interfaces */ +} + /*********************************************************************** ******* * DataAdviseHolder_Constructor */ _____ Modified: trunk/reactos/lib/ole32/rpc.c --- trunk/reactos/lib/ole32/rpc.c 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/lib/ole32/rpc.c 2005-12-12 23:53:06 UTC (rev 20135) @@ -624,7 +624,7 @@ HKEY key; HRESULT hres; WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; - DWORD size = MAX_PATH+1 * sizeof(WCHAR); + DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo; _____ Copied: trunk/reactos/lib/ole32/usrmarshal.c (from rev 20134, vendor/wine/dlls/ole32/current/usrmarshal.c) Property changes on: trunk/reactos/lib/ole32/usrmarshal.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/w32api/include/wtypes.h --- trunk/reactos/w32api/include/wtypes.h 2005-12-12 23:04:15 UTC (rev 20134) +++ trunk/reactos/w32api/include/wtypes.h 2005-12-12 23:53:06 UTC (rev 20135) @@ -191,6 +191,133 @@ } ByObjectId; } tagged_union; } uCLSSPEC; + +#define WDT_INPROC_CALL (0x48746457) + +#define WDT_REMOTE_CALL (0x52746457) + +#define WDT_INPROC64_CALL (0x50746457) + +typedef struct _userCLIPFORMAT { + long fContext; + union { + DWORD dwValue; + LPWSTR pwszName; + } u; +} userCLIPFORMAT; +typedef userCLIPFORMAT *wireCLIPFORMAT; +typedef WORD CLIPFORMAT; + +typedef struct _RemotableHandle { + long fContext; + union { + long hInproc; + long hRemote; + } u; +} RemotableHandle; +typedef RemotableHandle *wireHACCEL; +typedef RemotableHandle *wireHBRUSH; +typedef RemotableHandle *wireHDC; +typedef RemotableHandle *wireHFONT; +typedef RemotableHandle *wireHICON; +typedef RemotableHandle *wireHMENU; +typedef RemotableHandle *wireHWND; + +typedef struct _BYTE_BLOB { + unsigned long clSize; + byte abData[1]; +} BYTE_BLOB; +typedef BYTE_BLOB *UP_BYTE_BLOB; +typedef struct _FLAGGED_BYTE_BLOB { + unsigned long fFlags; + unsigned long clSize; + byte abData[1]; +} FLAGGED_BYTE_BLOB; +typedef FLAGGED_BYTE_BLOB *UP_FLAGGED_BYTE_BLOB; + +typedef struct _userHENHMETAFILE { + long fContext; + union { + long hInproc; + BYTE_BLOB *hRemote; + long hGlobal; + } u; +} userHENHMETAFILE; +typedef userHENHMETAFILE *wireHENHMETAFILE; +typedef struct tagRemHMETAFILEPICT { + long mm; + long xExt; + long yExt; + unsigned long cbData; + byte data[1]; +} RemHMETAFILEPICT; +typedef struct _userHMETAFILE { + long fContext; + union { + long hInproc; + BYTE_BLOB *hRemote; + long hGlobal; + } u; +} userHMETAFILE; +typedef userHMETAFILE *wireHMETAFILE; +typedef struct _remoteMETAFILEPICT { + long mm; + long xExt; + long yExt; + userHMETAFILE *hMF; +} remoteMETAFILEPICT; +typedef struct _userHMETAFILEPICT { + long fContext; + union { + long hInproc; + remoteMETAFILEPICT *hRemote; + long hGlobal; + } u; +} userHMETAFILEPICT; +typedef userHMETAFILEPICT *wireHMETAFILEPICT; +typedef struct _userBITMAP { + LONG bmType; + LONG bmWidth; + LONG bmHeight; + LONG bmWidthBytes; + WORD bmPlanes; + WORD bmBitsPixel; + ULONG cbSize; + byte pBuffer[1]; +} userBITMAP; +typedef struct _userHBITMAP { + long fContext; + union { + long hInproc; + userBITMAP *hRemote; + long hGlobal; + } u; +} userHBITMAP; +typedef userHBITMAP *wireHBITMAP; +typedef struct tagrpcLOGPALETTE { + WORD palVersion; + WORD palNumEntries; + PALETTEENTRY palPalEntry[1]; +} rpcLOGPALETTE; +typedef struct _userHPALETTE { + long fContext; + union { + long hInproc; + rpcLOGPALETTE *hRemote; + long hGlobal; + } u; +} userHPALETTE; +typedef userHPALETTE *wireHPALETTE; +typedef struct _userHGLOBAL { + long fContext; + union { + long hInproc; + FLAGGED_BYTE_BLOB *hRemote; + long hGlobal; + } u; +} userHGLOBAL; +typedef userHGLOBAL *wireHGLOBAL; + #ifdef __cplusplus } #endif

18 years, 9 months

[gvg] 20134: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Francois Gouget <fgouget(a)free.fr> - Better stick to the PSDK types and to the dsrole.h prototype. Update win32.api. Paul Vriens <Paul.Vriens(a)xs4all.nl> - Added some stubbed Ds-calls Start of conformance tests for these Ds-calls. Ge van Geldorp <gvg(a)reactos.org> - Match PSDK STATUS_* definitions. Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Add a few missing #includes. - Add some prototypes to include/ for already existing functions in netapi32. Modified: trunk/reactos/lib/netapi32/browsr.c Added: trunk/reactos/lib/netapi32/ds.c Modified: trunk/reactos/lib/netapi32/netapi32.c Modified: trunk/reactos/lib/netapi32/netapi32.spec Modified: trunk/reactos/lib/netapi32/netapi32.xml Modified: trunk/reactos/lib/netapi32/wksta.c Added: trunk/reactos/w32api/include/dsrole.h _____ Modified: trunk/reactos/lib/netapi32/browsr.c --- trunk/reactos/lib/netapi32/browsr.c 2005-12-12 23:01:12 UTC (rev 20133) +++ trunk/reactos/lib/netapi32/browsr.c 2005-12-12 23:04:15 UTC (rev 20134) @@ -25,6 +25,7 @@ #include "winerror.h" #include "lmcons.h" #include "lmbrowsr.h" +#include "lmshare.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); _____ Copied: trunk/reactos/lib/netapi32/ds.c (from rev 20133, vendor/wine/dlls/netapi32/current/ds.c) Property changes on: trunk/reactos/lib/netapi32/ds.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/netapi32/netapi32.c --- trunk/reactos/lib/netapi32/netapi32.c 2005-12-12 23:01:12 UTC (rev 20133) +++ trunk/reactos/lib/netapi32/netapi32.c 2005-12-12 23:04:15 UTC (rev 20134) @@ -19,6 +19,7 @@ #include "config.h" #include "wine/debug.h" +#include "lm.h" #include "netbios.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); _____ Modified: trunk/reactos/lib/netapi32/netapi32.spec --- trunk/reactos/lib/netapi32/netapi32.spec 2005-12-12 23:01:12 UTC (rev 20133) +++ trunk/reactos/lib/netapi32/netapi32.spec 2005-12-12 23:04:15 UTC (rev 20134) @@ -1,3 +1,18 @@ +@ stub DsAddressToSiteNames +@ stub DsAddressToSiteNamesEx +@ stub DsDeregisterDnsHostRecords +@ stub DsEnumerateDomainTrusts +@ stub DsGetDcClose +@ stub DsGetDcName +@ stub DsGetDcNext +@ stub DsGetDcOpen +@ stub DsGetDcSiteCoverage +@ stub DsGetForestTrustInformationW +@ stub DsGetSiteName +@ stub DsMergeForestTrustInformationW +@ stdcall DsRoleFreeMemory(ptr) +@ stdcall DsRoleGetPrimaryDomainInformation(wstr long ptr) +@ stub DsValidateSubnetName @ stub I_BrowserDebugCall @ stub I_BrowserDebugTrace @ stdcall I_BrowserQueryEmulatedDomains(wstr ptr ptr) _____ Modified: trunk/reactos/lib/netapi32/netapi32.xml --- trunk/reactos/lib/netapi32/netapi32.xml 2005-12-12 23:01:12 UTC (rev 20133) +++ trunk/reactos/lib/netapi32/netapi32.xml 2005-12-12 23:04:15 UTC (rev 20134) @@ -17,6 +17,7 @@ <file>access.c</file> <file>apibuf.c</file> <file>browsr.c</file> + <file>ds.c</file> <file>nbcmdqueue.c</file> <file>nbnamecache.c</file> <file>nbt.c</file> _____ Modified: trunk/reactos/lib/netapi32/wksta.c --- trunk/reactos/lib/netapi32/wksta.c 2005-12-12 23:01:12 UTC (rev 20133) +++ trunk/reactos/lib/netapi32/wksta.c 2005-12-12 23:04:15 UTC (rev 20134) @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdlib.h> +#include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" @@ -34,8 +35,6 @@ #include "lmwksta.h" #include "iphlpapi.h" #include "winerror.h" -#undef WIN32_NO_STATUS -#include "ntstatus.h" #include "winreg.h" #include "ntsecapi.h" #include "netbios.h" _____ Added: trunk/reactos/w32api/include/dsrole.h --- trunk/reactos/w32api/include/dsrole.h 2005-12-12 23:01:12 UTC (rev 20133) +++ trunk/reactos/w32api/include/dsrole.h 2005-12-12 23:04:15 UTC (rev 20134) @@ -0,0 +1,84 @@ +/* + * Directory Services definitions + * + * Copyright 2005 Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_DSROLE_H +#define __WINE_DSROLE_H + +#define DSROLE_PRIMARY_DS_RUNNING 0x00000001 +#define DSROLE_PRIMARY_DS_MIXED_MODE 0x00000002 +#define DSROLE_UPGRADE_IN_PROGRESS 0x00000004 +#define DSROLE_PRIMARY_DOMAIN_GUID_PRESENT 0x01000000 + +typedef enum _DSROLE_PRIMARY_DOMAIN_INFO_LEVEL +{ + DsRolePrimaryDomainInfoBasic = 1, + DsRoleUpgradeStatus, + DsRoleOperationState +} DSROLE_PRIMARY_DOMAIN_INFO_LEVEL; + +typedef enum _DSROLE_MACHINE_ROLE +{ + DsRole_RoleStandaloneWorkstation = 0, + DsRole_RoleMemberWorkstation, + DsRole_RoleStandaloneServer, + DsRole_RoleMemberServer, + DsRole_RoleBackupDomainController, + DsRole_RolePrimaryDomainController +} DSROLE_MACHINE_ROLE; + +typedef enum _DSROLE_SERVER_STATE +{ + DsRoleServerUnknown = 0, + DsRoleServerPrimary, + DsRoleServerBackup +} DSROLE_SERVER_STATE; + +typedef enum _DSROLE_OPERATION_STATE +{ + DsRoleOperationIdle = 0, + DsRoleOperationActive, + DsRoleOperationNeedReboot +} DSROLE_OPERATION_STATE; + +typedef struct _DSROLE_PRIMARY_DOMAIN_INFO_BASIC +{ + DSROLE_MACHINE_ROLE MachineRole; + ULONG Flags; + LPWSTR DomainNameFlat; + LPWSTR DomainNameDns; + LPWSTR DomainForestName; + GUID DomainGuid; +} DSROLE_PRIMARY_DOMAIN_INFO_BASIC, *PDSROLE_PRIMARY_DOMAIN_INFO_BASIC; + +typedef struct _DSROLE_UPGRADE_STATUS_INFO +{ + ULONG OperationState; + DSROLE_SERVER_STATE PreviousServerState; +} DSROLE_UPGRADE_STATUS_INFO, *PDSROLE_UPGRADE_STATUS_INFO; + +typedef struct _DSROLE_OPERATION_STATE_INFO +{ + DSROLE_OPERATION_STATE OperationState; +} DSROLE_OPERATION_STATE_INFO, *PDSROLE_OPERATION_STATE_INFO; + +VOID WINAPI DsRoleFreeMemory(IN PVOID Buffer); +DWORD WINAPI DsRoleGetPrimaryDomainInformation(IN LPCWSTR lpServer OPTIONAL, IN DSROLE_PRIMARY_DOMAIN_INFO_LEVEL InfoLevel, OUT PBYTE *Buffer); + +#endif /* __WINE_DSROLE_H */ Property changes on: trunk/reactos/w32api/include/dsrole.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

18 years, 9 months

[gvg] 20133: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Huw Davies <huw(a)codeweavers.com> - msi: Fix MsiProvideQualifiedComponentW spec file entry. Christian Gmeiner <christian.gmeiner(a)students.fh-vorarlberg.ac.at> - msi: Implemented DllCanUnloadNow. Robert Shearman <rob(a)codeweavers.com> - The buffer sizes in the documentation for MsiDecomposeDescriptorW don't include the NULL terminator, so fix this. Mike McCormack <mike(a)codeweavers.com> - If a source directory doesn't exist, use the install root instead. - Make all source directories at the root of the install. - Handle the ^ character in MaskEdit controls. Modified: trunk/reactos/lib/msi/dialog.c Modified: trunk/reactos/lib/msi/helpers.c Modified: trunk/reactos/lib/msi/msi.c Modified: trunk/reactos/lib/msi/msi.spec Modified: trunk/reactos/lib/msi/registry.c _____ Modified: trunk/reactos/lib/msi/dialog.c --- trunk/reactos/lib/msi/dialog.c 2005-12-12 22:57:45 UTC (rev 20132) +++ trunk/reactos/lib/msi/dialog.c 2005-12-12 23:01:12 UTC (rev 20133) @@ -939,6 +939,7 @@ case '&': case '`': case '?': + case '^': return TRUE; } return FALSE; @@ -1156,6 +1157,7 @@ /* * office 2003 uses "73931<````=````=````=````=`````>@@@@@" * delphi 7 uses "<????-??????-??????-????>" and "<???-???>" + * filemaker pro 7 uses "<^^^^=^^^^=^^^^=^^^^=^^^^=^^^^=^^^^^>" */ static UINT msi_dialog_maskedit_control( msi_dialog *dialog, MSIRECORD *rec ) { _____ Modified: trunk/reactos/lib/msi/helpers.c --- trunk/reactos/lib/msi/helpers.c 2005-12-12 22:57:45 UTC (rev 20132) +++ trunk/reactos/lib/msi/helpers.c 2005-12-12 23:01:12 UTC (rev 20133) @@ -210,6 +210,24 @@ return NULL; } +static LPWSTR get_source_root( MSIPACKAGE *package ) +{ + LPWSTR path, p; + + path = msi_dup_property( package, cszSourceDir ); + if (path) + return path; + + path = msi_dup_property( package, cszDatabase ); + if (path) + { + p = strrchrW(path,'\\'); + if (p) + *(p+1) = 0; + } + return path; +} + LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, BOOL set_prop, MSIFOLDER **folder) { @@ -221,42 +239,28 @@ if (!name) return NULL; - /* source directories appear to always be at the root */ - if (source) + /* special resolving for Target and Source root dir */ + if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) { - path = msi_dup_property( package, cszSourceDir ); - if (!path) + if (!source) { - path = msi_dup_property( package, cszDatabase ); - if (path) + LPWSTR check_path; + check_path = msi_dup_property( package, cszTargetDir ); + if (!check_path) { - p = strrchrW(path,'\\'); - if (p) - *(p+1) = 0; + check_path = msi_dup_property( package, cszRootDrive ); + if (set_prop) + MSI_SetPropertyW(package,cszTargetDir,check_path); } - } - if (folder) - *folder = get_loaded_folder( package, name ); - return path; - } - /* special resolving for Target and Source root dir */ - if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) - { - LPWSTR check_path; - check_path = msi_dup_property( package, cszTargetDir ); - if (!check_path) - { - check_path = msi_dup_property( package, cszRootDrive ); - if (set_prop) - MSI_SetPropertyW(package,cszTargetDir,check_path); + /* correct misbuilt target dir */ + path = build_directory_name(2, check_path, NULL); + if (strcmpiW(path,check_path)!=0) + MSI_SetPropertyW(package,cszTargetDir,path); + msi_free(check_path); } - - /* correct misbuilt target dir */ - path = build_directory_name(2, check_path, NULL); - if (strcmpiW(path,check_path)!=0) - MSI_SetPropertyW(package,cszTargetDir,path); - msi_free(check_path); + else + path = get_source_root( package ); if (folder) *folder = get_loaded_folder( package, name ); return path; @@ -269,14 +273,20 @@ if (folder) *folder = f; - if (f->ResolvedTarget) + if (!source && f->ResolvedTarget) { path = strdupW( f->ResolvedTarget ); TRACE(" already resolved to %s\n",debugstr_w(path)); return path; } - else if (f->Property) + else if (source && f->ResolvedSource) { + path = strdupW( f->ResolvedSource ); + TRACE(" (source)already resolved to %s\n",debugstr_w(path)); + return path; + } + else if (!source && f->Property) + { path = build_directory_name( 2, f->Property, NULL ); TRACE(" internally set to %s\n",debugstr_w(path)); @@ -292,13 +302,34 @@ TRACE(" ! Parent is %s\n", debugstr_w(parent)); p = resolve_folder(package, parent, source, set_prop, NULL); - TRACE(" TargetDefault = %s\n", debugstr_w(f->TargetDefault)); + if (!source) + { + TRACE(" TargetDefault = %s\n", debugstr_w(f->TargetDefault)); - path = build_directory_name( 3, p, f->TargetDefault, NULL ); - f->ResolvedTarget = strdupW( path ); - TRACE(" resolved into %s\n",debugstr_w(path)); - if (set_prop) - MSI_SetPropertyW(package,name,path); + path = build_directory_name( 3, p, f->TargetDefault, NULL ); + f->ResolvedTarget = strdupW( path ); + TRACE("target -> %s\n", debugstr_w(path)); + if (set_prop) + MSI_SetPropertyW(package,name,path); + } + else + { + if (f->SourceDefault && f->SourceDefault[0]!='.') + path = build_directory_name( 3, p, f->SourceDefault, NULL ); + else + path = strdupW(p); + TRACE("source -> %s\n", debugstr_w(path)); + + /* if the directory doesn't exist, use the root */ + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free( path ); + path = get_source_root( package ); + TRACE("defaulting to %s\n", debugstr_w(path)); + } + else + f->ResolvedSource = strdupW( path ); + } msi_free(p); } return path; _____ Modified: trunk/reactos/lib/msi/msi.c --- trunk/reactos/lib/msi/msi.c 2005-12-12 22:57:45 UTC (rev 20132) +++ trunk/reactos/lib/msi/msi.c 2005-12-12 23:01:12 UTC (rev 20133) @@ -53,8 +53,24 @@ WCHAR gszLogFile[MAX_PATH]; HINSTANCE msi_hInstance; +static LONG dll_count; + static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; +/********************************************************************** + * Dll lifetime tracking declaration + */ +static void LockModule(void) +{ + InterlockedIncrement(&dll_count); +} + +static void UnlockModule(void) +{ + InterlockedDecrement(&dll_count); +} + + UINT WINAPI MsiOpenProductA(LPCSTR szProduct, MSIHANDLE *phProduct) { UINT r; @@ -1287,11 +1303,13 @@ static ULONG WINAPI MsiCF_AddRef(LPCLASSFACTORY iface) { + LockModule(); return 2; } static ULONG WINAPI MsiCF_Release(LPCLASSFACTORY iface) { + UnlockModule(); return 1; } @@ -1306,9 +1324,13 @@ static HRESULT WINAPI MsiCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + TRACE("(%p)->(%d)\n", iface, dolock); - FIXME("%p %d\n", This, dolock); + if(dolock) + LockModule(); + else + UnlockModule(); + return S_OK; } @@ -1365,7 +1387,7 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_FALSE; + return dll_count == 0 ? S_OK : S_FALSE; } /*********************************************************************** _____ Modified: trunk/reactos/lib/msi/msi.spec --- trunk/reactos/lib/msi/msi.spec 2005-12-12 22:57:45 UTC (rev 20132) +++ trunk/reactos/lib/msi/msi.spec 2005-12-12 23:01:12 UTC (rev 20133) @@ -102,7 +102,7 @@ 106 stdcall MsiProvideComponentFromDescriptorW(wstr ptr ptr ptr) 107 stub MsiProvideComponentW 108 stdcall MsiProvideQualifiedComponentA(str str long ptr ptr) -109 stdcall MsiProvideQualifiedComponentW(str str long ptr ptr) +109 stdcall MsiProvideQualifiedComponentW(wstr wstr long ptr ptr) 110 stdcall MsiQueryFeatureStateA(str str) 111 stdcall MsiQueryFeatureStateW(wstr wstr) 112 stdcall MsiQueryProductStateA(str) _____ Modified: trunk/reactos/lib/msi/registry.c --- trunk/reactos/lib/msi/registry.c 2005-12-12 22:57:45 UTC (rev 20132) +++ trunk/reactos/lib/msi/registry.c 2005-12-12 23:01:12 UTC (rev 20133) @@ -502,9 +502,9 @@ * * PARAMS * szDescriptor [I] the descriptor to decompose - * szProduct [O] buffer of MAX_FEATURE_CHARS for the product guid - * szFeature [O] buffer of MAX_FEATURE_CHARS for the feature code - * szComponent [O] buffer of MAX_FEATURE_CHARS for the component guid + * szProduct [O] buffer of MAX_FEATURE_CHARS+1 for the product guid + * szFeature [O] buffer of MAX_FEATURE_CHARS+1 for the feature code + * szComponent [O] buffer of MAX_FEATURE_CHARS+1 for the component guid * pUsed [O] the length of the descriptor * * RETURNS

18 years, 9 months

[gvg] 20132: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Lionel Ulmer <lionel.ulmer(a)free.fr> - Handle DInput8 interfaces in device QueryInterface. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Modified: trunk/reactos/lib/dinput/device.c _____ Modified: trunk/reactos/lib/dinput/device.c --- trunk/reactos/lib/dinput/device.c 2005-12-12 22:56:08 UTC (rev 20131) +++ trunk/reactos/lib/dinput/device.c 2005-12-12 22:57:45 UTC (rev 20132) @@ -517,6 +517,11 @@ *ppobj = This; return DI_OK; } + if (IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { + IDirectInputDevice8_AddRef(iface); + *ppobj = This; + return DI_OK; + } TRACE("Unsupported interface !\n"); return E_FAIL; } @@ -548,6 +553,11 @@ *ppobj = This; return DI_OK; } + if (IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { + IDirectInputDevice8_AddRef(iface); + *ppobj = This; + return DI_OK; + } TRACE("Unsupported interface !\n"); return E_FAIL; }

18 years, 9 months

[gvg] 20131: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Juan Lang <juan_lang(a)yahoo.com> - Implement more OID support functions. Use the exported OID support functions internally. Move OID support functions and stubs to a separate file. - Fix parameter count on some stubs (thanks to Marcus Meissner for spotting that.) Add a few more stubs. - Fix some memory leaks. Stefan Leichter <Stefan.Leichter(a)camLine.com> - Added stub for CryptVerifyMessageSignature. Modified: trunk/reactos/lib/crypt32/cert.c Modified: trunk/reactos/lib/crypt32/crypt32.spec Modified: trunk/reactos/lib/crypt32/crypt32.xml Modified: trunk/reactos/lib/crypt32/crypt32_private.h Modified: trunk/reactos/lib/crypt32/encode.c Modified: trunk/reactos/lib/crypt32/main.c Added: trunk/reactos/lib/crypt32/oid.c Modified: trunk/reactos/w32api/include/wincrypt.h _____ Modified: trunk/reactos/lib/crypt32/cert.c --- trunk/reactos/lib/crypt32/cert.c 2005-12-12 22:52:16 UTC (rev 20130) +++ trunk/reactos/lib/crypt32/cert.c 2005-12-12 22:56:08 UTC (rev 20131) @@ -3285,15 +3285,12 @@ return ret; } -HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR pszFuncName, DWORD dwFlags) +BOOL WINAPI CryptVerifyMessageSignature(/*PCRYPT_VERIFY_MESSAGE_PARA*/ void* pVerifyPara, + DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, + BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert) { - FIXME("stub: %s %lx\n", debugstr_a(pszFuncName), dwFlags); - return NULL; -} - -BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType, - LPCSTR pszFuncName, LPCWSTR pwszDll) -{ - FIXME("stub: %lx %s %s\n", dwEncodingType, debugstr_a(pszFuncName), debugstr_w(pwszDll)); + FIXME("stub: %p, %ld, %p, %ld, %p, %p, %p\n", + pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, + pbDecoded, pcbDecoded, ppSignerCert); return FALSE; } _____ Modified: trunk/reactos/lib/crypt32/crypt32.spec --- trunk/reactos/lib/crypt32/crypt32.spec 2005-12-12 22:52:16 UTC (rev 20130) +++ trunk/reactos/lib/crypt32/crypt32.spec 2005-12-12 22:56:08 UTC (rev 20131) @@ -105,13 +105,13 @@ @ stdcall CryptExportPublicKeyInfoEx(long long long str long ptr ptr ptr) @ stub CryptFindOIDInfo @ stub CryptFormatObject -@ stub CryptFreeOIDFunctionAddress +@ stdcall CryptFreeOIDFunctionAddress(long long) @ stub CryptGetAsyncParam -@ stub CryptGetDefaultOIDDllList -@ stub CryptGetDefaultOIDFunctionAddress +@ stdcall CryptGetDefaultOIDDllList(long long ptr ptr) +@ stdcall CryptGetDefaultOIDFunctionAddress(long long wstr long ptr ptr) @ stub CryptGetMessageCertificates @ stub CryptGetMessageSignerCount -@ stub CryptGetOIDFunctionAddress +@ stdcall CryptGetOIDFunctionAddress(long long str long ptr ptr) @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) @ stdcall CryptHashCertificate(long long long ptr long ptr ptr) @ stub CryptHashMessage @@ -121,7 +121,7 @@ @ stdcall CryptImportPublicKeyInfo(long long ptr ptr) @ stdcall CryptImportPublicKeyInfoEx(long long ptr long long ptr ptr) @ stdcall CryptInitOIDFunctionSet(str long) -@ stub CryptInstallOIDFunctionAddress +@ stdcall CryptInstallOIDFunctionAddress(ptr long str long ptr long) @ stub CryptLoadSip @ stdcall CryptMemAlloc(long) @ stdcall CryptMemFree(ptr) @@ -165,16 +165,16 @@ @ stub CryptVerifyDetachedMessageHash @ stub CryptVerifyDetachedMessageSignature @ stub CryptVerifyMessageHash -@ stub CryptVerifyMessageSignature +@ stdcall CryptVerifyMessageSignature(ptr long ptr long ptr ptr ptr) @ stub CryptVerifyMessageSignatureWithKey @ stub CryptVerifySignatureU @ stdcall I_CryptAllocTls() -@ stdcall I_CryptCreateLruCache(long long) +@ stdcall I_CryptCreateLruCache(ptr ptr) @ stub I_CryptCreateLruEntry @ stdcall I_CryptDetachTls(long) -@ stdcall I_CryptFindLruEntryData(long) -@ stdcall I_CryptFlushLruCache(long) -@ stdcall I_CryptFreeLruCache(long) +@ stdcall I_CryptFindLruEntryData(long long long) +@ stdcall I_CryptFlushLruCache(ptr long long) +@ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) @ stub I_CryptGetDefaultCryptProv @ stub I_CryptGetDefaultCryptProvForEncrypt _____ Modified: trunk/reactos/lib/crypt32/crypt32.xml --- trunk/reactos/lib/crypt32/crypt32.xml 2005-12-12 22:52:16 UTC (rev 20130) +++ trunk/reactos/lib/crypt32/crypt32.xml 2005-12-12 22:56:08 UTC (rev 20131) @@ -11,6 +11,7 @@ <file>main.c</file> <file>encode.c</file> <file>cert.c</file> + <file>oid.c</file> <file>protectdata.c</file> <file>crypt32.rc</file> <file>crypt32.spec</file> _____ Modified: trunk/reactos/lib/crypt32/crypt32_private.h --- trunk/reactos/lib/crypt32/crypt32_private.h 2005-12-12 22:52:16 UTC (rev 20130) +++ trunk/reactos/lib/crypt32/crypt32_private.h 2005-12-12 22:56:08 UTC (rev 20131) @@ -24,4 +24,7 @@ */ HCRYPTPROV CRYPT_GetDefaultProvider(void); +void CRYPT_InitFunctionSets(void); +void CRYPT_FreeFunctionSets(void); + #endif _____ Modified: trunk/reactos/lib/crypt32/encode.c --- trunk/reactos/lib/crypt32/encode.c 2005-12-12 22:52:16 UTC (rev 20130) +++ trunk/reactos/lib/crypt32/encode.c 2005-12-12 22:56:08 UTC (rev 20131) @@ -1,5 +1,4 @@ /* - * Copyright 2002 Mike McCormack for CodeWeavers * Copyright 2005 Juan Lang * * This library is free software; you can redistribute it and/or @@ -67,8 +66,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); -static const WCHAR szDllName[] = { 'D','l','l',0 }; - typedef BOOL (WINAPI *CryptEncodeObjectFunc)(DWORD, LPCSTR, const void *, BYTE *, DWORD *); typedef BOOL (WINAPI *CryptEncodeObjectExFunc)(DWORD, LPCSTR, const void *, @@ -182,260 +179,12 @@ return EXCEPTION_CONTINUE_SEARCH; } -static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID) -{ - static const char szEncodingTypeFmt[] = - "Software\\Microsoft\\Cryptography\\OID\\EncodingType %ld\\%s\\%s"; - UINT len; - char numericOID[7]; /* enough for "#65535" */ - const char *oid; - LPSTR szKey; - - /* MSDN says the encoding type is a mask, but it isn't treated that way. - * (E.g., if dwEncodingType were 3, the key names "EncodingType 1" and - * "EncodingType 2" would be expected if it were a mask. Instead native - * stores values in "EncodingType 3". - */ - if (!HIWORD(pszOID)) - { - snprintf(numericOID, sizeof(numericOID), "#%d", LOWORD(pszOID)); - oid = numericOID; - } - else - oid = pszOID; - - /* This is enough: the lengths of the two string parameters are explicitly - * counted, and we need up to five additional characters for the encoding - * type. These are covered by the "%d", "%s", and "%s" characters in the - * format specifier that are removed by sprintf. - */ - len = sizeof(szEncodingTypeFmt) + lstrlenA(pszFuncName) + lstrlenA(oid); - szKey = CryptMemAlloc(len); - if (szKey) - sprintf(szKey, szEncodingTypeFmt, dwEncodingType, pszFuncName, oid); - return szKey; -} - -BOOL WINAPI CryptRegisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID, LPCWSTR pwszDll, LPCSTR pszOverrideFuncName) -{ - LONG r; - HKEY hKey; - LPSTR szKey; - - TRACE("%lx %s %s %s %s\n", dwEncodingType, pszFuncName, pszOID, - debugstr_w(pwszDll), pszOverrideFuncName); - - /* This only registers functions for encoding certs, not messages */ - if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) - return TRUE; - - /* Native does nothing pwszDll is NULL */ - if (!pwszDll) - return TRUE; - - /* I'm not matching MS bug for bug here, because I doubt any app depends on - * it: - * - native "succeeds" if pszFuncName is NULL, but the nonsensical entry - * it creates would never be used - * - native returns an HRESULT rather than a Win32 error if pszOID is NULL. - * Instead I disallow both of these with ERROR_INVALID_PARAMETER. - */ - if (!pszFuncName || !pszOID) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - szKey = CRYPT_GetKeyName(dwEncodingType, pszFuncName, pszOID); - TRACE("Key name is %s\n", debugstr_a(szKey)); - - if (!szKey) - return FALSE; - - r = RegCreateKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); - CryptMemFree(szKey); - if(r != ERROR_SUCCESS) - return FALSE; - - /* write the values */ - if (pszOverrideFuncName) - RegSetValueExA(hKey, "FuncName", 0, REG_SZ, (const BYTE*)pszOverrideFuncName, - lstrlenA(pszOverrideFuncName) + 1); - RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*) pwszDll, - (lstrlenW(pwszDll) + 1) * sizeof (WCHAR)); - - RegCloseKey(hKey); - return TRUE; -} - -BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID) -{ - LPSTR szKey; - LONG rc; - - TRACE("%lx %s %s\n", dwEncodingType, pszFuncName, pszOID); - - if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) - return TRUE; - - if (!pszFuncName || !pszOID) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - szKey = CRYPT_GetKeyName(dwEncodingType, pszFuncName, pszOID); - rc = RegDeleteKeyA(HKEY_LOCAL_MACHINE, szKey); - CryptMemFree(szKey); - if (rc) - SetLastError(rc); - return rc ? FALSE : TRUE; -} - -BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID, LPCWSTR pwszValueName, DWORD *pdwValueType, BYTE *pbValueData, - DWORD *pcbValueData) -{ - LPSTR szKey; - LONG rc; - HKEY hKey; - - TRACE("%lx %s %s %s %p %p %p\n", dwEncodingType, debugstr_a(pszFuncName), - debugstr_a(pszOID), debugstr_w(pwszValueName), pdwValueType, pbValueData, - pcbValueData); - - if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) - return TRUE; - - if (!pszFuncName || !pszOID || !pwszValueName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - szKey = CRYPT_GetKeyName(dwEncodingType, pszFuncName, pszOID); - rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); - CryptMemFree(szKey); - if (rc) - SetLastError(rc); - else - { - rc = RegQueryValueExW(hKey, pwszValueName, NULL, pdwValueType, - pbValueData, pcbValueData); - if (rc) - SetLastError(rc); - RegCloseKey(hKey); - } - return rc ? FALSE : TRUE; -} - -BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, - LPCSTR pszOID, LPCWSTR pwszValueName, DWORD dwValueType, - const BYTE *pbValueData, DWORD cbValueData) -{ - LPSTR szKey; - LONG rc; - HKEY hKey; - - TRACE("%lx %s %s %s %ld %p %ld\n", dwEncodingType, debugstr_a(pszFuncName), - debugstr_a(pszOID), debugstr_w(pwszValueName), dwValueType, pbValueData, - cbValueData); - - if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) - return TRUE; - - if (!pszFuncName || !pszOID || !pwszValueName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - szKey = CRYPT_GetKeyName(dwEncodingType, pszFuncName, pszOID); - rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); - CryptMemFree(szKey); - if (rc) - SetLastError(rc); - else - { - rc = RegSetValueExW(hKey, pwszValueName, 0, dwValueType, pbValueData, - cbValueData); - if (rc) - SetLastError(rc); - RegCloseKey(hKey); - } - return rc ? FALSE : TRUE; -} - -/* Gets the registered function named szFuncName for dwCertEncodingType and - * lpszStructType, or NULL if one could not be found. *lib will be set to the - * handle of the module it's in, or NULL if no module was loaded. If the - * return value is NULL, *lib will also be NULL, to simplify error handling. - */ -static void *CRYPT_GetFunc(DWORD dwCertEncodingType, LPCSTR lpszStructType, - LPCSTR szFuncName, HMODULE *lib) -{ - void *ret = NULL; - char *szKey = CRYPT_GetKeyName(dwCertEncodingType, szFuncName, - lpszStructType); - const char *funcName; - long r; - HKEY hKey; - DWORD type, size = 0; - - TRACE("(%08lx %s %s %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), - debugstr_a(szFuncName), lib); - - *lib = NULL; - r = RegOpenKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); - CryptMemFree(szKey); - if(r != ERROR_SUCCESS) - return NULL; - - RegQueryValueExA(hKey, "FuncName", NULL, &type, NULL, &size); - if (GetLastError() == ERROR_MORE_DATA && type == REG_SZ) - { - funcName = CryptMemAlloc(size); - RegQueryValueExA(hKey, "FuncName", NULL, &type, (LPBYTE)funcName, - &size); - } - else - funcName = szFuncName; - RegQueryValueExW(hKey, szDllName, NULL, &type, NULL, &size); - if (GetLastError() == ERROR_MORE_DATA && type == REG_SZ) - { - LPWSTR dllName = CryptMemAlloc(size); - - RegQueryValueExW(hKey, szDllName, NULL, &type, (LPBYTE)dllName, - &size); - *lib = LoadLibraryW(dllName); - if (*lib) - { - ret = GetProcAddress(*lib, funcName); - if (!ret) - { - /* Unload the library, the caller doesn't want to unload it - * when the return value is NULL. - */ - FreeLibrary(*lib); - *lib = NULL; - } - } - CryptMemFree(dllName); - } - if (funcName != szFuncName) - CryptMemFree((char *)funcName); - TRACE("returning %p\n", ret); - return ret; -} - BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret = FALSE; - HMODULE lib; + HCRYPTOIDFUNCADDR hFunc; CryptEncodeObjectFunc pCryptEncodeObject; TRACE("(0x%08lx, %s, %p, %p, %p)\n", dwCertEncodingType, @@ -449,14 +198,15 @@ } /* Try registered DLL first.. */ - pCryptEncodeObject = - (CryptEncodeObjectFunc)CRYPT_GetFunc(dwCertEncodingType, - lpszStructType, CRYPT_OID_ENCODE_OBJECT_FUNC, &lib); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&pCryptEncodeObject, &hFunc); if (pCryptEncodeObject) { ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, pvStructInfo, pbEncoded, pcbEncoded); - FreeLibrary(lib); + CryptFreeOIDFunctionAddress(hFunc, 0); } else { @@ -2272,9 +2022,10 @@ const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, void *pvEncoded, DWORD *pcbEncoded) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret = FALSE; - HMODULE lib = NULL; CryptEncodeObjectExFunc encodeFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; TRACE("(0x%08lx, %s, %p, 0x%08lx, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara, @@ -2384,15 +2135,19 @@ TRACE("OID %s not found or unimplemented, looking for DLL\n", debugstr_a(lpszStructType)); if (!encodeFunc) - encodeFunc = (CryptEncodeObjectExFunc)CRYPT_GetFunc(dwCertEncodingType, - lpszStructType, CRYPT_OID_ENCODE_OBJECT_EX_FUNC, &lib); + { + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_EX_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&encodeFunc, &hFunc); + } if (encodeFunc) ret = encodeFunc(dwCertEncodingType, lpszStructType, pvStructInfo, dwFlags, pEncodePara, pvEncoded, pcbEncoded); else SetLastError(ERROR_FILE_NOT_FOUND); - if (lib) - FreeLibrary(lib); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } @@ -2400,9 +2155,10 @@ const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret = FALSE; - HMODULE lib; CryptDecodeObjectFunc pCryptDecodeObject; + HCRYPTOIDFUNCADDR hFunc; TRACE("(0x%08lx, %s, %p, %ld, 0x%08lx, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, @@ -2415,14 +2171,15 @@ } /* Try registered DLL first.. */ - pCryptDecodeObject = - (CryptDecodeObjectFunc)CRYPT_GetFunc(dwCertEncodingType, - lpszStructType, CRYPT_OID_DECODE_OBJECT_FUNC, &lib); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&pCryptDecodeObject, &hFunc); if (pCryptDecodeObject) { ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); - FreeLibrary(lib); + CryptFreeOIDFunctionAddress(hFunc, 0); } else { @@ -5386,9 +5143,10 @@ const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret = FALSE; - HMODULE lib = NULL; CryptDecodeObjectExFunc decodeFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; TRACE("(0x%08lx, %s, %p, %ld, 0x%08lx, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, @@ -5508,15 +5266,19 @@ TRACE("OID %s not found or unimplemented, looking for DLL\n", debugstr_a(lpszStructType)); if (!decodeFunc) - decodeFunc = (CryptDecodeObjectExFunc)CRYPT_GetFunc(dwCertEncodingType, - lpszStructType, CRYPT_OID_DECODE_OBJECT_EX_FUNC, &lib); + { + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_EX_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&decodeFunc, &hFunc); + } if (decodeFunc) ret = decodeFunc(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); else SetLastError(ERROR_FILE_NOT_FOUND); - if (lib) - FreeLibrary(lib); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } @@ -5609,9 +5371,10 @@ DWORD dwCertEncodingType, LPSTR pszPublicKeyObjId, DWORD dwFlags, void *pvAuxInfo, PCERT_PUBLIC_KEY_INFO pInfo, DWORD *pcbInfo) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret; ExportPublicKeyInfoExFunc exportFunc = NULL; - HMODULE lib = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; TRACE("(%ld, %ld, %08lx, %s, %08lx, %p, %p, %p)\n", hCryptProv, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, pvAuxInfo, @@ -5624,14 +5387,19 @@ } if (pszPublicKeyObjId) - exportFunc = CRYPT_GetFunc(dwCertEncodingType, pszPublicKeyObjId, - CRYPT_OID_EXPORT_PUBLIC_KEY_INFO_FUNC, &lib); + { + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_EXPORT_PUBLIC_KEY_INFO_FUNC, + 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, pszPublicKeyObjId, + 0, (void **)&exportFunc, &hFunc); + } if (!exportFunc) exportFunc = CRYPT_ExportRsaPublicKeyInfoEx; ret = exportFunc(hCryptProv, dwKeySpec, dwCertEncodingType, pszPublicKeyObjId, dwFlags, pvAuxInfo, pInfo, pcbInfo); - if (lib) - FreeLibrary(lib); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } @@ -5682,20 +5450,23 @@ DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey) { + static HCRYPTOIDFUNCSET set = NULL; BOOL ret; ImportPublicKeyInfoExFunc importFunc = NULL; - HMODULE lib = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; TRACE("(%ld, %ld, %p, %d, %08lx, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); - importFunc = CRYPT_GetFunc(dwCertEncodingType, pInfo->Algorithm.pszObjId, - CRYPT_OID_IMPORT_PUBLIC_KEY_INFO_FUNC, &lib); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_IMPORT_PUBLIC_KEY_INFO_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, + pInfo->Algorithm.pszObjId, 0, (void **)&importFunc, &hFunc); if (!importFunc) importFunc = CRYPT_ImportRsaPublicKeyInfoEx; ret = importFunc(hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); - if (lib) - FreeLibrary(lib); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); return ret; } _____ Modified: trunk/reactos/lib/crypt32/main.c --- trunk/reactos/lib/crypt32/main.c 2005-12-12 22:52:16 UTC (rev 20130) +++ trunk/reactos/lib/crypt32/main.c 2005-12-12 22:56:08 UTC (rev 20131) @@ -38,7 +38,11 @@ { switch (fdwReason) { + case DLL_PROCESS_ATTACH: + CRYPT_InitFunctionSets(); + break; case DLL_PROCESS_DETACH: + CRYPT_FreeFunctionSets(); if (hDefProv) CryptReleaseContext(hDefProv, 0); break; } @@ -53,30 +57,37 @@ return hDefProv; } -/* this function is called by Internet Explorer when it is about to verify a downloaded component */ -BOOL WINAPI I_CryptCreateLruCache(DWORD x, DWORD y) +typedef void * HLRUCACHE; + +/* this function is called by Internet Explorer when it is about to verify a + * downloaded component. The first parameter appears to be a pointer to an + * unknown type, native fails unless it points to a buffer of at least 20 bytes. + * The second parameter appears to be an out parameter, whatever it's set to is + * passed (by cryptnet.dll) to I_CryptFlushLruCache. + */ +BOOL WINAPI I_CryptCreateLruCache(void *unknown, HLRUCACHE *out) { - FIXME("stub!\n"); - return FALSE; + FIXME("(%p, %p): stub!\n", unknown, out); + *out = (void *)0xbaadf00d; + return TRUE; } -/* these functions all have an unknown number of args */ -BOOL WINAPI I_CryptFindLruEntryData(DWORD x) +BOOL WINAPI I_CryptFindLruEntryData(DWORD unk0, DWORD unk1, DWORD unk2) { - FIXME("stub!\n"); + FIXME("(%08lx, %08lx, %08lx): stub!\n", unk0, unk1, unk2); return FALSE; } -BOOL WINAPI I_CryptFlushLruCache(DWORD x) +DWORD WINAPI I_CryptFlushLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) { - FIXME("stub!\n"); - return FALSE; + FIXME("(%p, %08lx, %08lx): stub!\n", h, unk0, unk1); + return 0; } -BOOL WINAPI I_CryptFreeLruCache(DWORD x) +HLRUCACHE WINAPI I_CryptFreeLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) { - FIXME("stub!\n"); - return FALSE; + FIXME("(%p, %08lx, %08lx): stub!\n", h, unk0, unk1); + return h; } BOOL WINAPI CryptSIPRemoveProvider(GUID *pgProv) @@ -206,15 +217,6 @@ return FALSE; } -BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD dwEncodingType, - LPCSTR pszFuncName, DWORD dwIndex, - LPCWSTR pwszDll) -{ - FIXME("(%lx,%s,%lx,%s) stub!\n", dwEncodingType, pszFuncName, dwIndex, - debugstr_w(pwszDll)); - return FALSE; -} - struct OIDToAlgID { LPCSTR oid; _____ Copied: trunk/reactos/lib/crypt32/oid.c (from rev 20129, vendor/wine/dlls/crypt32/current/oid.c) Property changes on: trunk/reactos/lib/crypt32/oid.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/w32api/include/wincrypt.h --- trunk/reactos/w32api/include/wincrypt.h 2005-12-12 22:52:16 UTC (rev 20130) +++ trunk/reactos/w32api/include/wincrypt.h 2005-12-12 22:56:08 UTC (rev 20131) @@ -967,6 +967,8 @@ #define CRYPT_UNICODE_NAME_DECODE_DISABLE_IE4_UTF8_FLAG \ CERT_RDN_DISABLE_IE4_UTF8_FLAG +#define CRYPT_GET_INSTALLED_OID_FUNC_FLAG 0x1 + /* types for CertOpenStore dwEncodingType */ #define CERT_ENCODING_TYPE_MASK 0x0000ffff #define CMSG_ENCODING_TYPE_MASK 0xffff0000 @@ -1699,6 +1701,16 @@ typedef BOOL (WINAPI *PFN_CERT_STORE_PROV_CONTROL)(HCERTSTOREPROV hStoreProv, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara); +typedef struct _CRYPT_OID_FUNC_ENTRY { + LPCSTR pszOID; + void *pvFuncAddr; +} CRYPT_OID_FUNC_ENTRY, *PCRYPT_OID_FUNC_ENTRY; + +typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_FUNC)(DWORD dwEncodingType, + LPCSTR pszFuncName, LPCSTR pszOID, DWORD cValue, const DWORD rgdwValueType[], + LPCWSTR const rgpwszValueName[], const BYTE * const rgpbValueData[], + const DWORD rgcbValueData[], void *pvArg); + /* subject types for CryptVerifyCertificateSignatureEx */ #define CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB 1 #define CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT 2 @@ -1817,6 +1829,34 @@ BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded); BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, void *pvEncoded, DWORD *pcbEncoded); +BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD,LPCSTR,DWORD,LPCWSTR); +BOOL WINAPI CryptRegisterOIDFunction(DWORD,LPCSTR,LPCSTR,LPCWSTR,LPCSTR); +BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, + LPCSTR pszOID, LPCWSTR szValueName, DWORD *pdwValueType, + BYTE *pbValueData, DWORD *pcbValueData); +BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, + LPCSTR pszOID, LPCWSTR pwszValueName, DWORD dwValueType, + const BYTE *pbValueData, DWORD cbValueData); +BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD,LPCSTR,LPCWSTR); +BOOL WINAPI CryptUnregisterOIDFunction(DWORD,LPCSTR,LPCSTR); +BOOL WINAPI CryptEnumOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, + LPCSTR pszOID, DWORD dwFlags, void *pvArg, + PFN_CRYPT_ENUM_OID_FUNC pfnEnumOIDFunc); +HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR,DWORD); +BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, + DWORD dwEncodingType, LPWSTR pwszDllList, DWORD *pcchDllList); +BOOL WINAPI CryptGetDefaultOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, + DWORD dwEncodingType, LPCWSTR pwszDll, DWORD dwFlags, void *ppvFuncAddr, + HCRYPTOIDFUNCADDR *phFuncAddr); +BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, + DWORD dwEncodingType, LPCSTR pszOID, DWORD dwFlags, void **ppvFuncAddr, + HCRYPTOIDFUNCADDR *phFuncAddr); +BOOL WINAPI CryptFreeOIDFunctionAddress(HCRYPTOIDFUNCADDR hFuncAddr, + DWORD dwFlags); +BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, + DWORD dwEncodingType, LPCSTR pszFuncName, DWORD cFuncEntry, + const CRYPT_OID_FUNC_ENTRY rgFuncEntry[], DWORD dwFlags); + #ifdef UNICODE #define CertNameToStr CertNameToStrW #define CryptAcquireContext CryptAcquireContextW

18 years, 9 months

[hpoussin] 20130: Minimize differences between UHCI and OHCI

by hpoussin＠svn.reactos.com

Minimize differences between UHCI and OHCI No need to return an empty string in IRP_MN_QUERY_ID / BusQueryInstanceID ; a null string is enough Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci.c Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c _____ Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c --- trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-12-12 22:44:46 UTC (rev 20129) +++ trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-12-12 22:52:16 UTC (rev 20130) @@ -170,8 +170,8 @@ case BusQueryInstanceID: { DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); - RtlInitUnicodeString(&SourceString, L""); - break; + *Information = 0; + return Status; } default: DPRINT1("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci.c --- trunk/reactos/drivers/usb/miniport/usbohci/ohci.c 2005-12-12 22:44:46 UTC (rev 20129) +++ trunk/reactos/drivers/usb/miniport/usbohci/ohci.c 2005-12-12 22:52:16 UTC (rev 20130) @@ -21,16 +21,16 @@ /* Initialize generic linux structure */ dev->irq = DeviceExtension->InterruptVector; dev->dev_ext = (PVOID)DeviceExtension; - dev->dev.dev_ext = (PVOID)DeviceObject; + dev->dev.dev_ext = DeviceObject; dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_OHCI_TAG); // 128 max len for slot name - // Init wrapper + /* Init wrapper */ init_wrapper(dev); strcpy(dev->dev.name, "OpenHCI PCI-USB Controller"); strcpy(dev->slot_name, "OHCD PCI Slot"); - // Init the OHCI HCD. Probe will be called automatically, but will fail because id=NULL + /* Init the OHCI HCD. Probe will be called automatically, but will fail because id=NULL */ Status = ohci_hcd_pci_init(); if (!NT_SUCCESS(Status)) { @@ -40,10 +40,10 @@ return Status; } - // Init core usb + /* Init core usb */ usb_init(); - // Probe device with real id now + /* Probe device with real id now */ ohci_pci_driver.probe(dev, ohci_pci_ids); return STATUS_SUCCESS; _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c --- trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c 2005-12-12 22:44:46 UTC (rev 20129) +++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c 2005-12-12 22:52:16 UTC (rev 20130) @@ -14,8 +14,7 @@ NTSTATUS InitLinuxWrapper(PDEVICE_OBJECT DeviceObject) { - NTSTATUS Status = STATUS_SUCCESS; - + NTSTATUS Status; PUSBMP_DEVICE_EXTENSION DeviceExtension = (PUSBMP_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* Create generic linux structure */ @@ -26,8 +25,10 @@ /* Initialize generic linux structure */ dev->irq = DeviceExtension->InterruptVector; dev->dev_ext = (PVOID)DeviceExtension; - dev->dev.dev_ext = (PVOID)DeviceObject; + dev->dev.dev_ext = DeviceObject; dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_UHCI_TAG); // 128 max len for slot name + + /* Init wrapper */ init_wrapper(dev); strcpy(dev->dev.name, "UnivHCI PCI-USB Controller"); @@ -49,7 +50,7 @@ /* Probe device with real id now */ uhci_pci_driver.probe(dev, uhci_pci_ids); - return Status; + return STATUS_SUCCESS; } VOID STDCALL

18 years, 9 months

[gvg] 20129: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Initialize OLE instead of COM only in order to enable Drag and Drop. Robert Shearman <rob(a)codeweavers.com> - comdlg32: Don't worry if an HGLOBAL passed to printdlg is already locked. YunSong Hwang <hys545(a)dreamwiz.com> - Update Korean translations. Milko Krachounov <milko(a)3mhz.net> - Update the Bulgarian resources for commdlg and regedit. Pavel Roskin <proski(a)gnu.org> - Improve script selection combobox in the font selection dialog - set height to 90 (the old value of 10 could only fit a single line) and remove CBS_OWNERDRAWFIXED flag to trim excessive height from the list items. Alexander N. Sørnes <alex(a)thehandofagony.com> - Update Norwegian Bokmaal resources. Modified: trunk/reactos/lib/comdlg32/cdlg_Bg.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ca.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Cn.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Cs.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Da.rc Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc Modified: trunk/reactos/lib/comdlg32/cdlg_En.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Es.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Fr.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Hu.rc Modified: trunk/reactos/lib/comdlg32/cdlg_It.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ja.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Nl.rc Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Pl.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Pt.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ru.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Si.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Sk.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Sv.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Uk.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Wa.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Zh.rc Modified: trunk/reactos/lib/comdlg32/printdlg.c _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Bg.rc --- trunk/reactos/lib/comdlg32/cdlg_Bg.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Bg.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@ GROUPBOX "¤ÞýÕ",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "&?þß¾ÛÓ:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -406,9 +406,9 @@ PD32_OUT_OF_MEMORY "?Õõ¯±?ÞÒ ÝÓ ´ÓýÕ?." PD32_GENERIC_ERROR "¤¯ ÔÞ ±Õ ÒÕ°ÛÓ." PD32_DRIVER_UNKNOWN "?Õ´¯þÝÓ? õÓÚÔÕ þÓ ´ÞÝ?Õ Ó." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "¤ÕõÞ õÓ ý¯µÕ?Õ õÓ ÞþÔ·° ÔÓ?Õ ¯´ÓÕ÷ÞÞ, \ +±Ô·þÓÝÞ ± ´Õ¸Ó? ÛÓ?¯ ÝÓ±?¯ÚÛÓ ÝÓ ±?ÓÝÞ÷Ó?Ó ÞÙÞ Óþ´Õ¸Ó?ÔÓÝÕ ÝÓ õ¯Û¾ýÕÝ?, \ +±Óý¯ ÓÛ¯ ÞýÓ?Õ ÞÝ±?ÓÙÞÓÝ ´ÞÝ?Õ. ?Ý±?ÓÙÞÓÚ?Õ ´ÞÝ?Õ Þ ¯´Þ?ÓÚ?Õ ¯?Ý¯ Ô¯." PD32_DEFAULT_PRINTER "¤ÞÝ?Õ ´¯ ´¯õÓþßÞÓÝÕ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "?ýÓ %d õ¯Û¾ýÕÝ?Ó Ô ¯´Ó°ÛÓ?Ó" _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Ca.rc --- trunk/reactos/lib/comdlg32/cdlg_Ca.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Ca.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Cn.rc --- trunk/reactos/lib/comdlg32/cdlg_Cn.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Cn.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "?¥?²",grp2,98,72,120,36,WS_GROUP CTEXT "Íð??ÎÍ?ÕAaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Cs.rc --- trunk/reactos/lib/comdlg32/cdlg_Cs.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Cs.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@ GROUPBOX "Ukßzka",grp2,98,72,120,36,WS_GROUP CTEXT "P°Ýli? ¥lu?ouÞk² k¨? ·pýl ´ßbelskÚ ¾dy",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Da.rc --- trunk/reactos/lib/comdlg32/cdlg_Da.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Da.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "Eksempel",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc --- trunk/reactos/lib/comdlg32/cdlg_De.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_De.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -173,7 +173,7 @@ GROUPBOX "Muster",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_En.rc --- trunk/reactos/lib/comdlg32/cdlg_En.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_En.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -507,7 +507,7 @@ GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Es.rc --- trunk/reactos/lib/comdlg32/cdlg_Es.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Es.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@ GROUPBOX "Ejemplo",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZzÐ±",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Codificaci¾n:",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc --- trunk/reactos/lib/comdlg32/cdlg_Fi.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Fi.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@ GROUPBOX "Nõyte",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Fr.rc --- trunk/reactos/lib/comdlg32/cdlg_Fr.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Fr.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -146,7 +146,7 @@ GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Hu.rc --- trunk/reactos/lib/comdlg32/cdlg_Hu.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Hu.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -141,7 +141,7 @@ GROUPBOX "Minta",grp2,98,72,120,36,WS_GROUP CTEXT "Aa?ßi§?¹",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "?&ßsrendszer:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -462,96 +462,3 @@ IDS_SAVE_AS "MentÚ&s mßskÚnt" IDS_OPEN_FILE "Megnyitßs" } - - -/****************************************************************/ -/* Hungarian neutral resources -/****************************************************************/ - -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL - -CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Bet¹tÝpus" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Bet¹tÝpus:",stc1 ,6,3,40,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Bet¹ &stÝlus:",stc2 ,108,3,44,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&MÚret:",stc3,179,3,30,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "MÚgse",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Alkalmaz", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "&S·g¾" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP - GROUPBOX "Hatßsok",grp1,6,72,84,34,WS_GROUP - CHECKBOX "?t&h·zßs", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "A&lßh·z¹s", chx2, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "S&zÝn:", stc4 ,6,110,30,9 - COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Minta",grp2,98,72,120,36,WS_GROUP - CTEXT "Aa?ßi§?¹",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "?&rßsrendszer:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SzÝnbeßllÝtßs" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&AlapszÝnek:", 1088, 4, 4, 140, 10 - LTEXT "&EgyÚni szÝnek:", 1089, 4, 106, 140, 10 - LTEXT "SzÝn | EgyszÝn¹", 1090, 150, 151, 48, 10 - LTEXT "&V÷r÷s:", 726 /*1094*/,249,126,24,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Z÷ld:",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&KÚk:",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&?rnyalat:" ,723 /*1091*/,202,126,22,10 - EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&TelÝtettsÚg:" ,724 /*1092*/,202,140,22,10 - EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&FÚnyessÚg:" ,725 /*1093*/,202,154,22,10 - EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "MÚgse", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&S·g¾", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Hozzßadßs az egyÚni szÝnekhez", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&EgyÚni szÝnek s&zerkesztÚse >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ -} - -STRINGTABLE DISCARDABLE /* Color names */ -{ - IDS_COLOR_BLACK "Fekete" - IDS_COLOR_MAROON "Barna" - IDS_COLOR_GREEN "Z÷ld" - IDS_COLOR_OLIVE "Oliva" - IDS_COLOR_NAVY "S÷tÚtkÚk" - IDS_COLOR_PURPLE "S÷tÚtlila" - IDS_COLOR_TEAL "S÷tÚtcißn" - IDS_COLOR_GRAY "S÷tÚtz³rke" - IDS_COLOR_SILVER "Vilßgossz³rke" - IDS_COLOR_RED "V÷r÷s" - IDS_COLOR_LIME "Neonz÷ld" - IDS_COLOR_YELLOW "Sßrga" - IDS_COLOR_BLUE "KÚk" - IDS_COLOR_FUCHSIA "Ciklßmen" - IDS_COLOR_AQUA "T³rkizkÚk" - IDS_COLOR_WHITE "FehÚr" -} - _____ Modified: trunk/reactos/lib/comdlg32/cdlg_It.rc --- trunk/reactos/lib/comdlg32/cdlg_It.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_It.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@ GROUPBOX "Esempio",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Ja.rc --- trunk/reactos/lib/comdlg32/cdlg_Ja.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Ja.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "âTâôâvâï",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "òÂÄÜâZâbâg(&I):",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Nl.rc --- trunk/reactos/lib/comdlg32/cdlg_Nl.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Nl.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "Voorbeeld",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Schr&ift:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc --- trunk/reactos/lib/comdlg32/cdlg_No.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_No.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "ForhÕndsvisning",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -401,9 +401,9 @@ PD32_OUT_OF_MEMORY "Ikke mer minne." PD32_GENERIC_ERROR "En feil har oppstÕtt." PD32_DRIVER_UNKNOWN "Ukjent skriverdriver." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "Du mÕ installere en skriver f°r du \ + kan gj°re skriver-relaterte oppgaver som Õ endre \ sideoppsettet og skrive ut et dokument. \ + Installer en og pr°v pÕ nytt." PD32_DEFAULT_PRINTER "Standardskriver; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Det er %d dokumenter i k°en" _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Pl.rc --- trunk/reactos/lib/comdlg32/cdlg_Pl.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Pl.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -144,7 +144,7 @@ GROUPBOX "Przyk?ad",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ypt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Pt.rc --- trunk/reactos/lib/comdlg32/cdlg_Pt.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Pt.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@ GROUPBOX "Exemplo",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Ru.rc --- trunk/reactos/lib/comdlg32/cdlg_Ru.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Ru.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "?ßÓþÕ÷",grp2,98,72,120,36,WS_GROUP CTEXT "?Ó?ßAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Si.rc --- trunk/reactos/lib/comdlg32/cdlg_Si.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Si.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "Vzorec",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Sk.rc --- trunk/reactos/lib/comdlg32/cdlg_Sk.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Sk.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -144,7 +144,7 @@ GROUPBOX "Vzorka",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Sv.rc --- trunk/reactos/lib/comdlg32/cdlg_Sv.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Sv.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -140,7 +140,7 @@ GROUPBOX "Test",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Uk.rc --- trunk/reactos/lib/comdlg32/cdlg_Uk.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Uk.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@ GROUPBOX "&ÃÓþ¯Û",grp2,98,72,120,36,WS_GROUP CTEXT "?Ó?ßAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "ÐÛÞ´?:",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Wa.rc --- trunk/reactos/lib/comdlg32/cdlg_Wa.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Wa.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -147,7 +147,7 @@ GROUPBOX "Egzimpe",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz?ÕÃþ?¹",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Zh.rc --- trunk/reactos/lib/comdlg32/cdlg_Zh.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Zh.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -93,7 +93,7 @@ GROUPBOX "?á?²",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/printdlg.c --- trunk/reactos/lib/comdlg32/printdlg.c 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/printdlg.c 2005-12-12 22:44:46 UTC (rev 20129) @@ -2096,14 +2096,6 @@ lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, lpdm->dmSize + lpdm->dmDriverExtra); } else { - WORD locks; - if((locks = (GlobalFlags(lppd->hDevMode) & GMEM_LOCKCOUNT))) { - WARN("hDevMode has %d locks on it. Unlocking it now\n", locks); - while(locks--) { - GlobalUnlock(lppd->hDevMode); - TRACE("Now got %d locks\n", locks); - } - } lppd->hDevMode = GlobalReAlloc(lppd->hDevMode, lpdm->dmSize + lpdm->dmDriverExtra, GMEM_MOVEABLE); @@ -2111,14 +2103,6 @@ lpdmReturn = GlobalLock(lppd->hDevMode); memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra); - if (lppd->hDevNames != 0) { - WORD locks; - if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) { - WARN("hDevNames has %d locks on it. Unlocking it now\n", locks); - while(locks--) - GlobalUnlock(lppd->hDevNames); - } - } PRINTDLG_CreateDevNames(&(lppd->hDevNames), di->pDriverPath, pi->pPrinterName,

18 years, 9 months

[gvg] 20128: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Alexandre Julliard <julliard(a)winehq.org> - Enforce 16-byte stack alignment when returning from 16-bit code and when calling a register function. - Preserve 16-byte stack alignment in 16-bit relays. - Preserve 16-byte stack alignment in the various assembly functions. Needed for MacOSX. Modified: trunk/reactos/tools/winebuild/relay.c Modified: trunk/reactos/tools/winebuild/spec16.c Modified: trunk/reactos/tools/winebuild/utils.c _____ Modified: trunk/reactos/tools/winebuild/relay.c --- trunk/reactos/tools/winebuild/relay.c 2005-12-12 22:01:32 UTC (rev 20127) +++ trunk/reactos/tools/winebuild/relay.c 2005-12-12 22:24:42 UTC (rev 20128) @@ -269,8 +269,17 @@ #endif /* Push address of CONTEXT86 structure -- popped by the relay routine */ - fprintf( outfile, "\tpushl %%esp\n" ); + fprintf( outfile, "\tmovl %%esp,%%eax\n" ); + fprintf( outfile, "\tandl $~15,%%esp\n" ); + fprintf( outfile, "\tsubl $4,%%esp\n" ); + fprintf( outfile, "\tpushl %%eax\n" ); } + else + { + fprintf( outfile, "\tsubl $8,%%esp\n" ); + fprintf( outfile, "\tandl $~15,%%esp\n" ); + fprintf( outfile, "\taddl $8,%%esp\n" ); + } /* Call relay routine (which will call the API entry point) */ fprintf( outfile, "\tleal %d(%%edx), %%eax\n", sizeof(STACK16FRAME) ); @@ -725,7 +734,8 @@ * (ebp+0) saved ebp * (ebp-128) buffer area to allow stack frame manipulation * (ebp-332) CONTEXT86 struct - * (ebp-336) CONTEXT86 *argument + * (ebp-336) padding for stack alignment + * (ebp-336-n) CONTEXT86 *argument * .... other arguments copied from (ebp+12) * * The entry point routine is called with a CONTEXT* extra argument, @@ -746,7 +756,7 @@ fprintf( outfile, "\tpushl %%ebp\n" ); fprintf( outfile, "\tmovl %%esp,%%ebp\n "); - fprintf( outfile, "\tleal -%d(%%esp), %%esp\n", STACK_SPACE ); + fprintf( outfile, "\tleal -%d(%%esp), %%esp\n", STACK_SPACE + 4 /* for context arg */); /* Build the context structure */ @@ -787,17 +797,18 @@ /* Transfer the arguments */ fprintf( outfile, "\tmovl 4(%%ebp),%%ebx\n" ); /* get relay code addr */ - fprintf( outfile, "\tpushl %%esp\n" ); /* push ptr to context struct */ fprintf( outfile, "\tmovzbl 4(%%ebx),%%ecx\n" ); /* fetch number of args to copy */ - fprintf( outfile, "\tjecxz 1f\n" ); fprintf( outfile, "\tsubl %%ecx,%%esp\n" ); + fprintf( outfile, "\tandl $~15,%%esp\n" ); fprintf( outfile, "\tleal 16(%%ebp),%%esi\n" ); /* get %esp at time of call */ fprintf( outfile, "\tmovl %%esp,%%edi\n" ); fprintf( outfile, "\tshrl $2,%%ecx\n" ); + fprintf( outfile, "\tjz 1f\n" ); fprintf( outfile, "\tcld\n" ); fprintf( outfile, "\trep\n\tmovsl\n" ); /* copy args */ - - fprintf( outfile, "1:\tmovzbl 5(%%ebx),%%eax\n" ); /* fetch number of args to remove */ + fprintf( outfile, "1:\tleal %d(%%ebp),%%eax\n", -STACK_SPACE ); /* get addr of context struct */ + fprintf( outfile, "\tmovl %%eax,(%%edi)\n" ); /* and pass it as extra arg */ + fprintf( outfile, "\tmovzbl 5(%%ebx),%%eax\n" ); /* fetch number of args to remove */ fprintf( outfile, "\tleal 16(%%ebp,%%eax),%%eax\n" ); fprintf( outfile, "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Esp) - STACK_SPACE ); _____ Modified: trunk/reactos/tools/winebuild/spec16.c --- trunk/reactos/tools/winebuild/spec16.c 2005-12-12 22:01:32 UTC (rev 20127) +++ trunk/reactos/tools/winebuild/spec16.c 2005-12-12 22:24:42 UTC (rev 20128) @@ -285,7 +285,7 @@ static void output_call16_function( FILE *outfile, ORDDEF *odp ) { char name[256]; - int i, pos; + int i, pos, stack_words; const char *args = odp->u.func.arg_types; int argsize = get_function_argsize( odp ); int needs_ldt = strchr( args, 'p' ) || strchr( args, 't' ); @@ -297,19 +297,25 @@ fprintf( outfile, "%s:\n", name ); fprintf( outfile, "\tpushl %%ebp\n" ); fprintf( outfile, "\tmovl %%esp,%%ebp\n" ); + stack_words = 2; if (needs_ldt) { fprintf( outfile, "\tpushl %%esi\n" ); + stack_words++; if (UsePIC) { - fprintf( outfile, "\tcall 1f\n" ); - fprintf( outfile, "1:\tpopl %%eax\n" ); - fprintf( outfile, "\tmovl wine_ldt_copy_ptr-1b(%%eax),%%esi\n" ); + fprintf( outfile, "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + fprintf( outfile, "1:\tmovl wine_ldt_copy_ptr-1b(%%eax),%%esi\n" ); } else fprintf( outfile, "\tmovl $%s,%%esi\n", asm_name("wine_ldt_copy") ); } + /* preserve 16-byte stack alignment */ + stack_words += strlen(args); + if ((odp->flags & FLAG_REGISTER) || (odp->type == TYPE_VARARGS)) stack_words++; + if (stack_words % 4) fprintf( outfile, "\tsubl $%d,%%esp\n", 16 - 4 * (stack_words % 4) ); + if (args[0] || odp->type == TYPE_VARARGS) fprintf( outfile, "\tmovl 12(%%ebp),%%ecx\n" ); /* args */ @@ -455,6 +461,7 @@ fprintf( outfile, "\t.align 4\n" ); fprintf( outfile, "\t%s\n", func_declaration(name) ); fprintf( outfile, "%s:\n", name ); + fprintf( outfile, "subl $4,%%esp\n" ); if (UsePIC) { fprintf( outfile, "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); @@ -469,7 +476,7 @@ fprintf( outfile, "\tpushl $%s\n", header_name ); } fprintf( outfile, "\tcall %s\n", asm_name("__wine_dll_register_16") ); - fprintf( outfile, "\taddl $8,%%esp\n" ); + fprintf( outfile, "\taddl $12,%%esp\n" ); fprintf( outfile, "\tret\n" ); output_function_size( outfile, name ); @@ -478,6 +485,7 @@ fprintf( outfile, "\t.align 4\n" ); fprintf( outfile, "\t%s\n", func_declaration(name) ); fprintf( outfile, "%s:\n", name ); + fprintf( outfile, "subl $8,%%esp\n" ); if (UsePIC) { fprintf( outfile, "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); @@ -489,7 +497,7 @@ fprintf( outfile, "\tpushl $%s\n", header_name ); } fprintf( outfile, "\tcall %s\n", asm_name("__wine_dll_unregister_16") ); - fprintf( outfile, "\taddl $4,%%esp\n" ); + fprintf( outfile, "\taddl $12,%%esp\n" ); fprintf( outfile, "\tret\n" ); output_function_size( outfile, name ); _____ Modified: trunk/reactos/tools/winebuild/utils.c --- trunk/reactos/tools/winebuild/utils.c 2005-12-12 22:01:32 UTC (rev 20127) +++ trunk/reactos/tools/winebuild/utils.c 2005-12-12 22:24:42 UTC (rev 20128) @@ -420,7 +420,7 @@ * * The reason gas is written this way is that it's trying to mimick * native assemblers for the various architectures it runs on. gas - * provides other directives that work consistantly across + * provides other directives that work consistently across * architectures, but of course we want to work on all arches with or * without gas. Hence this function. *

18 years, 9 months

[arty] 20127: Working work item library.

by arty＠svn.reactos.com

Working work item library. - Slightly changed semantics of ChewCreate: the work may be performed inline if we're in the right irql already. - The user data is copied automatically if the call succeeds and a work item is created. - The address of the work item is returned through an argument if it was allocated. Modified: trunk/reactos/drivers/lib/chew/workqueue.c Modified: trunk/reactos/include/chew/chew.h _____ Modified: trunk/reactos/drivers/lib/chew/workqueue.c --- trunk/reactos/drivers/lib/chew/workqueue.c 2005-12-12 22:00:16 UTC (rev 20126) +++ trunk/reactos/drivers/lib/chew/workqueue.c 2005-12-12 22:01:32 UTC (rev 20127) @@ -1,16 +1,15 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS TCP/IP protocol driver - * FILE: tcpip/main.c - * PURPOSE: Common Highlevel Executive Worker - * PROGRAMMERS: Art Yerkes - * REVISIONS: - * CSH 10/12-2005 Created + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/lib/chew/workqueue.c + * PURPOSE: Common Highlevel Executive Worker + * + * PROGRAMMERS: arty (ayerkes(a)speakeasy.net) */ #include <ntddk.h> #include <chew/chew.h> -//#define NDEBUG +#define NDEBUG #define FOURCC(w,x,y,z) (((w) << 24) | ((x) << 16) | ((y) << 8) | (z)) @@ -51,6 +50,8 @@ VOID STDCALL ChewWorkItem( PDEVICE_OBJECT DeviceObject, PVOID ChewItem ) { PWORK_ITEM WorkItem = ChewItem; + RemoveEntryList( &WorkItem->Entry ); + if( WorkItem->Worker ) WorkItem->Worker( WorkItem->UserSpace ); @@ -61,8 +62,10 @@ BOOLEAN ChewCreate ( PVOID *ItemPtr, UINT Bytes, VOID (*Worker)( PVOID ), PVOID UserSpace ) { PWORK_ITEM Item; + if( KeGetCurrentIrql() == PASSIVE_LEVEL ) { - *ItemPtr = NULL; + if( ItemPtr ) + *ItemPtr = NULL; Worker(UserSpace); return TRUE; } else { @@ -85,12 +88,14 @@ ( &WorkQueue, &Item->Entry, &WorkQueueLock ); IoQueueWorkItem ( Item->WorkItem, ChewWorkItem, CriticalWorkQueue, Item ); + + if( ItemPtr ) + *ItemPtr = Item; - *ItemPtr = Item; - return TRUE; - } else + } else { return FALSE; + } } } _____ Modified: trunk/reactos/include/chew/chew.h --- trunk/reactos/include/chew/chew.h 2005-12-12 22:00:16 UTC (rev 20126) +++ trunk/reactos/include/chew/chew.h 2005-12-12 22:01:32 UTC (rev 20127) @@ -1,10 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: include/chew/chew.h + * PURPOSE: Common Highlevel Executive Worker + * + * PROGRAMMERS: arty (ayerkes(a)speakeasy.net) + */ + #ifndef _REACTOS_CHEW_H #define _REACTOS_CHEW_H +/** + * Initialize CHEW, given a device object (since IoAllocateWorkItem relies on + * it). + */ VOID ChewInit( PDEVICE_OBJECT DeviceObject ); +/** + * Shutdown CHEW, including removing remaining work items. + */ VOID ChewShutdown(); +/** + * Create a work item, or perform the work, based on IRQL. + * At passive level, Worker is called directly on UserSpace. + * At greater than passive level, a work item is created with Bytes + * context area and data copied from UserSpace. + * If a work item is created, Item contains the address and the function + * returns true. + * If the work is performed immediately, Item contains NULL and the + * function returns true. + * Else, the function returns false and Item is undefined. + */ BOOLEAN ChewCreate ( PVOID *Item, UINT Bytes, VOID (*Worker)(PVOID), PVOID UserSpace ); +/** + * Remove a work item, given the pointer returned to Item in ChewCreate. + */ VOID ChewRemove( PVOID Item ); #endif/*_REACTOS_CHEW_H*/

18 years, 9 months

← Newer
1
...
34
35
36
37
38
39
40
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005