Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 31864: Switch to the new widl (Wine-20080118)
by cfinck＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cfinck Date: Fri Jan 18 15:41:15 2008 New Revision: 31864 URL: http://svn.reactos.org/svn/reactos?rev=31864&view=rev Log: Switch to the new widl (Wine-20080118) Modified: trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=31… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=31… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev…

1 0

[cfinck] 31863: Vendor drop Wine-20080118's widl and make it the current one
by cfinck＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cfinck Date: Fri Jan 18 15:30:58 2008 New Revision: 31863 URL: http://svn.reactos.org/svn/reactos?rev=31863&view=rev Log: Vendor drop Wine-20080118's widl and make it the current one Added: vendor/wine/tools/widl/Wine-20080118/ vendor/wine/tools/widl/Wine-20080118/Makefile.in (with props) vendor/wine/tools/widl/Wine-20080118/client.c (with props) vendor/wine/tools/widl/Wine-20080118/hash.c (with props) vendor/wine/tools/widl/Wine-20080118/hash.h (with props) vendor/wine/tools/widl/Wine-20080118/header.c (with props) vendor/wine/tools/widl/Wine-20080118/header.h (with props) vendor/wine/tools/widl/Wine-20080118/parser.h (with props) vendor/wine/tools/widl/Wine-20080118/parser.l (with props) vendor/wine/tools/widl/Wine-20080118/parser.y (with props) vendor/wine/tools/widl/Wine-20080118/proxy.c (with props) vendor/wine/tools/widl/Wine-20080118/server.c (with props) vendor/wine/tools/widl/Wine-20080118/typegen.c (with props) vendor/wine/tools/widl/Wine-20080118/typegen.h (with props) vendor/wine/tools/widl/Wine-20080118/typelib.c (with props) vendor/wine/tools/widl/Wine-20080118/typelib.h (with props) vendor/wine/tools/widl/Wine-20080118/typelib_struct.h (with props) vendor/wine/tools/widl/Wine-20080118/utils.c (with props) vendor/wine/tools/widl/Wine-20080118/utils.h (with props) vendor/wine/tools/widl/Wine-20080118/widl.c (with props) vendor/wine/tools/widl/Wine-20080118/widl.h (with props) vendor/wine/tools/widl/Wine-20080118/widl.man.in (with props) vendor/wine/tools/widl/Wine-20080118/widltypes.h (with props) vendor/wine/tools/widl/Wine-20080118/write_msft.c (with props) Modified: vendor/wine/tools/widl/current/parser.l vendor/wine/tools/widl/current/parser.y vendor/wine/tools/widl/current/typegen.c vendor/wine/tools/widl/current/widltypes.h [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/wine/tools/widl/Wine-20080118/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/Mak… Added: vendor/wine/tools/widl/Wine-20080118/client.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/cli… Added: vendor/wine/tools/widl/Wine-20080118/hash.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/has… Added: vendor/wine/tools/widl/Wine-20080118/hash.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/has… Added: vendor/wine/tools/widl/Wine-20080118/header.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/hea… Added: vendor/wine/tools/widl/Wine-20080118/header.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/hea… Added: vendor/wine/tools/widl/Wine-20080118/parser.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/par… Added: vendor/wine/tools/widl/Wine-20080118/parser.l URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/par… Added: vendor/wine/tools/widl/Wine-20080118/parser.y URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/par… Added: vendor/wine/tools/widl/Wine-20080118/proxy.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/pro… Added: vendor/wine/tools/widl/Wine-20080118/server.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/ser… Added: vendor/wine/tools/widl/Wine-20080118/typegen.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/typ… Added: vendor/wine/tools/widl/Wine-20080118/typegen.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/typ… Added: vendor/wine/tools/widl/Wine-20080118/typelib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/typ… Added: vendor/wine/tools/widl/Wine-20080118/typelib.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/typ… Added: vendor/wine/tools/widl/Wine-20080118/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/typ… Added: vendor/wine/tools/widl/Wine-20080118/utils.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/uti… Added: vendor/wine/tools/widl/Wine-20080118/utils.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/uti… Added: vendor/wine/tools/widl/Wine-20080118/widl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/wid… Added: vendor/wine/tools/widl/Wine-20080118/widl.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/wid… Added: vendor/wine/tools/widl/Wine-20080118/widl.man.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/wid… Added: vendor/wine/tools/widl/Wine-20080118/widltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/wid… Added: vendor/wine/tools/widl/Wine-20080118/write_msft.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080118/wri… Modified: vendor/wine/tools/widl/current/parser.l URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/parser.l?… Modified: vendor/wine/tools/widl/current/parser.y URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/parser.y?… Modified: vendor/wine/tools/widl/current/typegen.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/typegen.c… Modified: vendor/wine/tools/widl/current/widltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/widltypes…

1 0

[hpoussin] 31862: Update status
by hpoussin＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: hpoussin Date: Fri Jan 18 15:25:40 2008 New Revision: 31862 URL: http://svn.reactos.org/svn/reactos?rev=31862&view=rev Log: Update status Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Fri Jan 18 15:25:40 2008 @@ -54,7 +54,7 @@ reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync reactos/dll/win32/msimg32 # Autosync -reactos/dll/win32/msi # Needs a sync script/rbuild update +reactos/dll/win32/msi # Autosync reactos/dll/win32/msvcrt20 # Autosync reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/msxml3 # Synced to Wine-20071230 @@ -64,7 +64,7 @@ reactos/dll/win32/odbccp32 # Autosync reactos/dll/win32/ole32 # Autosync reactos/dll/win32/oleacc # Autosync -reactos/dll/win32/oleaut32 # Needs a sync script/rbuild update +reactos/dll/win32/oleaut32 # Autosync reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync reactos/dll/win32/powrprof # Autosync

1 0

[cwittich] 31861: Rob Shearman : rpcrt4: Set ReservedForRuntime to NULL in NdrClientInitializeNew. <rob at codeweavers.com>
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 14:57:48 2008 New Revision: 31861 URL: http://svn.reactos.org/svn/reactos?rev=31861&view=rev Log: Rob Shearman : rpcrt4: Set ReservedForRuntime to NULL in NdrClientInitializeNew. <rob at codeweavers.com> Modified: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_clien… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c Fri Jan 18 14:57:48 2008 @@ -54,6 +54,7 @@ pRpcMessage->ProcNum = ProcNum; pRpcMessage->RpcInterfaceInformation = pStubDesc->RpcInterfaceInformation; pRpcMessage->RpcFlags = 0; + pRpcMessage->ReservedForRuntime = NULL; pRpcMessage->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; pStubMsg->RpcMsg = pRpcMessage;

1 0

[hpoussin] 31860: Shuffle functions to look more like in Wine. Add a few stubs
by hpoussin＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: hpoussin Date: Fri Jan 18 14:51:01 2008 New Revision: 31860 URL: http://svn.reactos.org/svn/reactos?rev=31860&view=rev Log: Shuffle functions to look more like in Wine. Add a few stubs Modified: trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/interface.c trunk/reactos/dll/win32/setupapi/res/lang/Cs.rc trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/stringtable.c trunk/reactos/dll/win32/setupapi/stubs.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… Modified: trunk/reactos/dll/win32/setupapi/res/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/lan… Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c…

1 0

[cwittich] 31859: Rob Shearman : rpcrt4: Handle complex arrays in calc_arg_size. <rob at codeweavers.com>
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 14:38:47 2008 New Revision: 31859 URL: http://svn.reactos.org/svn/reactos?rev=31859&view=rev Log: Rob Shearman : rpcrt4: Handle complex arrays in calc_arg_size. <rob at codeweavers.com> Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_misc.h trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Fri Jan 18 14:38:47 2008 @@ -2655,8 +2655,8 @@ return size; } -static unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) +unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) { PFORMAT_STRING desc; unsigned long size = 0; Modified: trunk/reactos/dll/win32/rpcrt4/ndr_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_misc.… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_misc.h (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_misc.h Fri Jan 18 14:38:47 2008 @@ -62,4 +62,6 @@ extern const NDR_MEMORYSIZE NdrMemorySizer[]; extern const NDR_FREE NdrFreer[]; +unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat); + #endif /* __WINE_NDR_MISC_H */ Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c Fri Jan 18 14:38:47 2008 @@ -849,6 +849,12 @@ case RPC_FC_LGFARRAY: size = *(const DWORD*)(pFormat + 2); break; + case RPC_FC_BOGUS_ARRAY: + pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); + TRACE("conformance = %ld\n", pStubMsg->MaxCount); + pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); + size = ComplexStructSize(pStubMsg, pFormat); + size *= pStubMsg->MaxCount; default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */

1 0

[cwittich] 31858: rpcrt4: Fix the calculation of element sizes for complex arrays by using a new function ComplexStructSize that doesn 't touch the buffer to calculate the size. <rob at codeweavers.com>
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 14:35:06 2008 New Revision: 31858 URL: http://svn.reactos.org/svn/reactos?rev=31858&view=rev Log: rpcrt4: Fix the calculation of element sizes for complex arrays by using a new function ComplexStructSize that doesn 't touch the buffer to calculate the size. <rob at codeweavers.com> Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Fri Jan 18 14:35:06 2008 @@ -2655,6 +2655,69 @@ return size; } +static unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + PFORMAT_STRING desc; + unsigned long size = 0; + + while (*pFormat != RPC_FC_END) { + switch (*pFormat) { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + size += 1; + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + size += 2; + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ENUM32: + size += 4; + break; + case RPC_FC_HYPER: + size += 8; + break; + case RPC_FC_POINTER: + size += sizeof(void *); + break; + case RPC_FC_ALIGNM4: + ALIGN_LENGTH(size, 4); + break; + case RPC_FC_ALIGNM8: + ALIGN_LENGTH(size, 8); + break; + case RPC_FC_STRUCTPAD1: + case RPC_FC_STRUCTPAD2: + case RPC_FC_STRUCTPAD3: + case RPC_FC_STRUCTPAD4: + case RPC_FC_STRUCTPAD5: + case RPC_FC_STRUCTPAD6: + case RPC_FC_STRUCTPAD7: + size += *pFormat - RPC_FC_STRUCTPAD1 + 1; + break; + case RPC_FC_EMBEDDED_COMPLEX: + size += pFormat[1]; + pFormat += 2; + desc = pFormat + *(const SHORT*)pFormat; + size += EmbeddedComplexSize(pStubMsg, desc); + pFormat += 2; + continue; + case RPC_FC_PAD: + break; + default: + FIXME("unhandled format 0x%02x\n", *pFormat); + } + pFormat++; + } + + return size; +} + /*********************************************************************** * NdrComplexStructMarshall [RPCRT4.@] */ @@ -3453,7 +3516,6 @@ { ULONG i, count, esize, SavedMemorySize, MemorySize; unsigned char alignment; - unsigned char *Buffer; TRACE("(%p,%p)\n", pStubMsg, pFormat); @@ -3475,11 +3537,7 @@ SavedMemorySize = pStubMsg->MemorySize; - Buffer = pStubMsg->Buffer; - pStubMsg->MemorySize = 0; - esize = ComplexStructMemorySize(pStubMsg, pFormat); - pStubMsg->Buffer = Buffer; - + esize = ComplexStructSize(pStubMsg, pFormat); MemorySize = safe_multiply(pStubMsg->MaxCount, esize); count = pStubMsg->ActualCount;

1 0

[cwittich] 31857: rpcrt4: Add support for calculating the memory size of complex types with embedded non-conformant strings. <rob at codeweavers.com>
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 14:28:18 2008 New Revision: 31857 URL: http://svn.reactos.org/svn/reactos?rev=31857&view=rev Log: rpcrt4: Add support for calculating the memory size of complex types with embedded non-conformant strings. <rob at codeweavers.com> Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Fri Jan 18 14:28:18 2008 @@ -2127,6 +2127,7 @@ case RPC_FC_BOGUS_STRUCT: case RPC_FC_SMFARRAY: case RPC_FC_SMVARRAY: + case RPC_FC_CSTRING: return *(const WORD*)&pFormat[2]; case RPC_FC_USER_MARSHAL: return *(const WORD*)&pFormat[4]; @@ -2141,6 +2142,8 @@ return *(const SHORT*)pFormat; case RPC_FC_IP: return sizeof(void *); + case RPC_FC_WSTRING: + return *(const WORD*)&pFormat[2] * 2; default: FIXME("unhandled embedded type %02x\n", *pFormat); }

1 0

[cwittich] 31856: rpcrt4: Allocate a context handle if a NULL GUID is being unmarshalled. <rob at codeweavers.com>
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 14:25:21 2008 New Revision: 31856 URL: http://svn.reactos.org/svn/reactos?rev=31856&view=rev Log: rpcrt4: Allocate a context handle if a NULL GUID is being unmarshalled. <rob at codeweavers.com> Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c Fri Jan 18 14:25:21 2008 @@ -312,6 +312,7 @@ RpcBinding *binding = hBinding; NDR_SCONTEXT SContext; RPC_STATUS status; + const ndr_context_handle *context_ndr = pBuff; TRACE("(%p %p %08x %p %u)\n", hBinding, pBuff, DataRepresentation, CtxGuard, Flags); @@ -319,12 +320,12 @@ if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); - if (!pBuff) + if (!pBuff || (!context_ndr->attributes && + UuidIsNil((UUID *)&context_ndr->uuid, &status))) status = RpcServerAssoc_AllocateContextHandle(binding->Assoc, CtxGuard, &SContext); else { - const ndr_context_handle *context_ndr = pBuff; if (context_ndr->attributes) { ERR("non-null attributes 0x%x\n", context_ndr->attributes);

1 0

[cwittich] 31855: rpcrt4: Don't print fixmes for NDR types without a freeing function. rpcrt4: Add traces to the start of TowerConstruct and TowerExplode. <rob at codeweavers.com>
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 14:22:16 2008 New Revision: 31855 URL: http://svn.reactos.org/svn/reactos?rev=31855&view=rev Log: rpcrt4: Don't print fixmes for NDR types without a freeing function. rpcrt4: Add traces to the start of TowerConstruct and TowerExplode. <rob at codeweavers.com> Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Fri Jan 18 14:22:16 2008 @@ -2566,7 +2566,6 @@ else m(pStubMsg, pMemory, desc); } - else FIXME("no freer for embedded type %02x\n", *desc); pMemory += size; pFormat += 2; continue; @@ -5243,7 +5242,6 @@ m(pStubMsg, pMemory, desc); } } - else FIXME("no freer for embedded type %02x\n", *desc); } } Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c Fri Jan 18 14:22:16 2008 @@ -267,6 +267,9 @@ const twr_uuid_floor_t *object_floor; const twr_uuid_floor_t *syntax_floor; + TRACE("(%p, %p, %p, %p, %p, %p)\n", tower, object, syntax, protseq, + endpoint, address); + if (protseq) *protseq = NULL; if (endpoint) @@ -336,6 +339,9 @@ twr_uuid_floor_t *object_floor; twr_uuid_floor_t *syntax_floor; + TRACE("(%p, %p, %s, %s, %s, %p)\n", object, syntax, debugstr_a(protseq), + debugstr_a(endpoint), debugstr_a(address), tower); + *tower = NULL; status = RpcTransport_GetTopOfTower(NULL, &tower_size, protseq, address, endpoint);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs