December 2007 - Wine-Commits

Rob Shearman : hlink: Fix memory leak by freeing extension services This-> headers in the release function.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 1f56359261876f0ceabb44d76c7fdc54e0e6a94a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f56359261876f0ceabb44d76… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 26 11:02:48 2007 +0000 hlink: Fix memory leak by freeing extension services This->headers in the release function. --- dlls/hlink/extserv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index d58d1dd..c7a1b77 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -91,6 +91,7 @@ static ULONG WINAPI ExtServUnk_Release(IUnknown *iface) if(!ref) { heap_free(This->username); heap_free(This->password); + heap_free(This->headers); heap_free(This); }

1 0

Rob Shearman : rpcss: Use context handles to automatically free running object table entries if the client process quits without calling IrotRevoke .
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 9804aba758ca5eba5c92a2dabeb965fb170992da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9804aba758ca5eba5c92a2dab… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 25 19:08:25 2007 +0000 rpcss: Use context handles to automatically free running object table entries if the client process quits without calling IrotRevoke. --- dlls/ole32/moniker.c | 9 +++++++-- include/wine/irot.idl | 5 ++++- programs/rpcss/irotp.c | 46 +++++++++++++++++++++++++++++++++------------- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 8511a9f..e77c8c4 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -73,6 +73,7 @@ struct rot_entry MonikerComparisonData* moniker_data; /* moniker comparison data that identifies this object */ DWORD cookie; /* cookie identifying this object */ FILETIME last_modified; + IrotContextHandle ctxt_handle; }; /* define the RunningObjectTableImpl structure */ @@ -183,7 +184,8 @@ static inline void rot_entry_delete(struct rot_entry *rot_entry) InterfaceData *moniker = NULL; __TRY { - IrotRevoke(get_irot_handle(), rot_entry->cookie, &object, &moniker); + IrotRevoke(get_irot_handle(), rot_entry->cookie, + &rot_entry->ctxt_handle, &object, &moniker); } __EXCEPT(rpc_filter) { @@ -554,7 +556,10 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, { __TRY { - hr = IrotRegister(get_irot_handle(), rot_entry->moniker_data, rot_entry->object, moniker, &rot_entry->last_modified, grfFlags, &rot_entry->cookie); + hr = IrotRegister(get_irot_handle(), rot_entry->moniker_data, + rot_entry->object, moniker, + &rot_entry->last_modified, grfFlags, + &rot_entry->cookie, &rot_entry->ctxt_handle); } __EXCEPT(rpc_filter) { diff --git a/include/wine/irot.idl b/include/wine/irot.idl index e480b45..f14af13 100644 --- a/include/wine/irot.idl +++ b/include/wine/irot.idl @@ -51,6 +51,7 @@ interface Irot typedef DWORD IrotCookie; typedef handle_t IrotHandle; + typedef [context_handle] void *IrotContextHandle; HRESULT IrotRegister( [in] IrotHandle h, @@ -59,11 +60,13 @@ interface Irot [in] const InterfaceData *moniker, [in] const FILETIME *time, [in] DWORD grfFlags, - [out] IrotCookie *cookie); + [out] IrotCookie *cookie, + [out] IrotContextHandle *ctxt_handle); HRESULT IrotRevoke( [in] IrotHandle h, [in] IrotCookie cookie, + [in, out] IrotContextHandle *ctxt_handle, [out] PInterfaceData *object, [out] PInterfaceData *moniker); diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c index fd40625..7832ac7 100644 --- a/programs/rpcss/irotp.c +++ b/programs/rpcss/irotp.c @@ -41,6 +41,7 @@ struct rot_entry MonikerComparisonData *moniker_data; /* moniker comparison data that identifies this object */ DWORD cookie; /* cookie identifying this object */ FILETIME last_modified; + LONG refs; }; static struct list RunningObjectTable = LIST_INIT(RunningObjectTable); @@ -56,12 +57,15 @@ static CRITICAL_SECTION csRunningObjectTable = { &critsect_debug, -1, 0, 0, 0, 0 static LONG last_cookie = 1; -static inline void rot_entry_delete(struct rot_entry *rot_entry) +static inline void rot_entry_release(struct rot_entry *rot_entry) { - HeapFree(GetProcessHeap(), 0, rot_entry->object); - HeapFree(GetProcessHeap(), 0, rot_entry->moniker); - HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data); - HeapFree(GetProcessHeap(), 0, rot_entry); + if (!InterlockedDecrement(&rot_entry->refs)) + { + HeapFree(GetProcessHeap(), 0, rot_entry->object); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data); + HeapFree(GetProcessHeap(), 0, rot_entry); + } } HRESULT IrotRegister( @@ -71,10 +75,11 @@ HRESULT IrotRegister( const InterfaceData *mk, const FILETIME *time, DWORD grfFlags, - IrotCookie *cookie) + IrotCookie *cookie, + IrotContextHandle *ctxt_handle) { struct rot_entry *rot_entry; - const struct rot_entry *existing_rot_entry; + struct rot_entry *existing_rot_entry; HRESULT hr; if (grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)) @@ -87,10 +92,11 @@ HRESULT IrotRegister( if (!rot_entry) return E_OUTOFMEMORY; + rot_entry->refs = 1; rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[obj->ulCntData])); if (!rot_entry->object) { - rot_entry_delete(rot_entry); + rot_entry_release(rot_entry); return E_OUTOFMEMORY; } rot_entry->object->ulCntData = obj->ulCntData; @@ -101,7 +107,7 @@ HRESULT IrotRegister( rot_entry->moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[mk->ulCntData])); if (!rot_entry->moniker) { - rot_entry_delete(rot_entry); + rot_entry_release(rot_entry); return E_OUTOFMEMORY; } rot_entry->moniker->ulCntData = mk->ulCntData; @@ -110,7 +116,7 @@ HRESULT IrotRegister( rot_entry->moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[data->ulCntData])); if (!rot_entry->moniker_data) { - rot_entry_delete(rot_entry); + rot_entry_release(rot_entry); return E_OUTOFMEMORY; } rot_entry->moniker_data->ulCntData = data->ulCntData; @@ -120,7 +126,7 @@ HRESULT IrotRegister( hr = S_OK; - LIST_FOR_EACH_ENTRY(existing_rot_entry, &RunningObjectTable, const struct rot_entry, entry) + LIST_FOR_EACH_ENTRY(existing_rot_entry, &RunningObjectTable, struct rot_entry, entry) { if ((existing_rot_entry->moniker_data->ulCntData == data->ulCntData) && !memcmp(&data->abData, &existing_rot_entry->moniker_data->abData, data->ulCntData)) @@ -136,11 +142,14 @@ HRESULT IrotRegister( list_add_tail(&RunningObjectTable, &rot_entry->entry); /* gives a registration identifier to the registered object*/ *cookie = rot_entry->cookie = InterlockedIncrement(&last_cookie); + *ctxt_handle = rot_entry; } else { - rot_entry_delete(rot_entry); + rot_entry_release(rot_entry); *cookie = existing_rot_entry->cookie; + InterlockedIncrement(&existing_rot_entry->refs); + *ctxt_handle = existing_rot_entry; } @@ -152,6 +161,7 @@ HRESULT IrotRegister( HRESULT IrotRevoke( IrotHandle h, IrotCookie cookie, + IrotContextHandle *ctxt_handle, PInterfaceData *obj, PInterfaceData *mk) { @@ -185,7 +195,8 @@ HRESULT IrotRevoke( hr = E_OUTOFMEMORY; } - rot_entry_delete(rot_entry); + rot_entry_release(rot_entry); + *ctxt_handle = NULL; return hr; } } @@ -354,6 +365,15 @@ HRESULT IrotEnumRunning( return hr; } +void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) +{ + struct rot_entry *rot_entry = ctxt_handle; + EnterCriticalSection(&csRunningObjectTable); + list_remove(&rot_entry->entry); + LeaveCriticalSection(&csRunningObjectTable); + rot_entry_release(rot_entry); +} + void * __RPC_USER MIDL_user_allocate(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size);

1 0

Rob Shearman : rpcrt4: Move low-level NDR context handle functions to a separate file.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: cf6d95c1b8c937d2be77f3eb14dcf3c2d0d6932a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6d95c1b8c937d2be77f3eb1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 25 19:07:41 2007 +0000 rpcrt4: Move low-level NDR context handle functions to a separate file. --- dlls/rpcrt4/Makefile.in | 1 + dlls/rpcrt4/ndr_contexthandle.c | 278 +++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/ndr_marshall.c | 249 ----------------------------------- 3 files changed, 279 insertions(+), 249 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf6d95c1b8c937d2be77f…

1 0

Rob Shearman : widl: Add support for generating code for out-only context handles by calling NdrContextHandleInitialize .
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 6e7dcde26e890f81ada7960d6462a178796f28ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7dcde26e890f81ada7960d6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 25 19:08:21 2007 +0000 widl: Add support for generating code for out-only context handles by calling NdrContextHandleInitialize. --- tools/widl/typegen.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 57c432f..dee5ad8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3160,7 +3160,14 @@ void assign_stub_out_args( FILE *file, int indent, const func_t *func ) print_file(file, indent, ""); write_name(file, var); - if (var->type->size_is) + if (is_context_handle(var->type)) + { + fprintf(file, " = NdrContextHandleInitialize(\n"); + print_file(file, indent + 1, "&_StubMsg,\n"); + print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", + var->type->typestring_offset); + } + else if (var->type->size_is) { unsigned int size, align = 0; type_t *type = var->type;

1 0

Rob Shearman : rpcrt4: Implement higher-level NDR server context handle functions.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 698ba6b4d493af1a00857f0a59174936e9ca2664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698ba6b4d493af1a00857f0a5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 25 19:07:49 2007 +0000 rpcrt4: Implement higher-level NDR server context handle functions. Implement NdrServerContextMarshall and NdrServerContextNewMarshall on top of NDRSContextMarshall2. Implement NdrContextHandleInitialize, NdrServerContextUnmarshall and NdrServerContextNewUnmarshall on top of NDSContextUnmarshall2. --- dlls/rpcrt4/ndr_marshall.c | 81 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 73 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 92475e3..38210f3 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6001,13 +6001,44 @@ void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine ) { - FIXME("(%p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine); + TRACE("(%p, %p, %p)\n", pStubMsg, ContextHandle, RundownRoutine); + + ALIGN_POINTER(pStubMsg->Buffer, 4); + + if (pStubMsg->Buffer + cbNDRContext > (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) + { + ERR("buffer overflow - Buffer = %p, BufferEnd = %p\n", + pStubMsg->Buffer, (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, + pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer += cbNDRContext; } NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) { - FIXME("(%p): stub\n", pStubMsg); - return NULL; + NDR_SCONTEXT ContextHandle; + + TRACE("(%p)\n", pStubMsg); + + ALIGN_POINTER(pStubMsg->Buffer, 4); + + if (pStubMsg->Buffer + cbNDRContext > (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) + { + ERR("buffer overflow - Buffer = %p, BufferEnd = %p\n", + pStubMsg->Buffer, (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, + pStubMsg->Buffer, + pStubMsg->RpcMsg->DataRepresentation, + NULL, 0); + pStubMsg->Buffer += cbNDRContext; + + return ContextHandle; } void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, @@ -6020,8 +6051,9 @@ void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - FIXME("(%p, %p): stub\n", pStubMsg, pFormat); - return NULL; + TRACE("(%p, %p)\n", pStubMsg, pFormat); + return NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, NULL, + pStubMsg->RpcMsg->DataRepresentation, NULL, 0); } void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, @@ -6029,12 +6061,45 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat) { - FIXME("(%p, %p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); + TRACE("(%p, %p, %p, %p)\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); + + ALIGN_POINTER(pStubMsg->Buffer, 4); + + if (pStubMsg->Buffer + cbNDRContext > (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) + { + ERR("buffer overflow - Buffer = %p, BufferEnd = %p\n", + pStubMsg->Buffer, (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + /* FIXME: do something with pFormat */ + NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, + pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer += cbNDRContext; } NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - FIXME("(%p, %p): stub\n", pStubMsg, pFormat); - return NULL; + NDR_SCONTEXT ContextHandle; + + TRACE("(%p, %p)\n", pStubMsg, pFormat); + + ALIGN_POINTER(pStubMsg->Buffer, 4); + + if (pStubMsg->Buffer + cbNDRContext > (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) + { + ERR("buffer overflow - Buffer = %p, BufferEnd = %p\n", + pStubMsg->Buffer, (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + /* FIXME: do something with pFormat */ + ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, + pStubMsg->Buffer, + pStubMsg->RpcMsg->DataRepresentation, + NULL, 0); + pStubMsg->Buffer += cbNDRContext; + + return ContextHandle; }

1 0

Rob Shearman : include: Remove semi-colons from the end of cpp_quote statements as MIDL likes them .
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 70eb9e247e6d378a927dd8df4158ac98f456ff24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eb9e247e6d378a927dd8df4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 25 17:07:07 2007 +0000 include: Remove semi-colons from the end of cpp_quote statements as MIDL likes them. --- include/d3d10.idl | 14 +++++++------- include/msinkaut.idl | 4 ++-- include/oleacc.idl | 10 +++++----- include/wine/irot.idl | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 0a3439e..4e5292f 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -20,8 +20,8 @@ import "oaidl.idl"; import "ocidl.idl"; import "dxgi.idl"; -cpp_quote("#ifndef _D3D10_CONSTANTS"); -cpp_quote("#define _D3D10_CONSTANTS"); +cpp_quote("#ifndef _D3D10_CONSTANTS") +cpp_quote("#define _D3D10_CONSTANTS") const float D3D10_DEFAULT_BLEND_FACTOR_ALPHA = 1.0; const float D3D10_DEFAULT_BLEND_FACTOR_BLUE = 1.0; const float D3D10_DEFAULT_BLEND_FACTOR_GREEN = 1.0; @@ -238,7 +238,7 @@ const unsigned int D3D_MINOR_VERSION const unsigned int D3D_SPEC_DATE_DAY = 8; const unsigned int D3D_SPEC_DATE_MONTH = 8; const unsigned int D3D_SPEC_DATE_YEAR = 2006; -cpp_quote("#endif"); +cpp_quote("#endif") const unsigned int D3D10_APPEND_ALIGNED_ELEMENT = 0xffffffff; const unsigned int _FACD3D10 = 0x87; @@ -246,10 +246,10 @@ const unsigned int _FACD3D10DEBUG const unsigned int D3D10_FILTER_TYPE_MASK = 0x3; const unsigned int D3D10_SDK_VERSION = 29; -cpp_quote("#define MAKE_D3D10_HRESULT(code) MAKE_HRESULT( 1, _FACD3D10, code)"); -cpp_quote("#define MAKE_D3D10_STATUS(code) MAKE_HRESULT( 0, _FACD3D10, code)"); -cpp_quote("#define D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS MAKE_D3D10_HRESULT(1)"); -cpp_quote("#define D3D10_ERROR_FILE_NOT_FOUND MAKE_D3D10_HRESULT(2)"); +cpp_quote("#define MAKE_D3D10_HRESULT(code) MAKE_HRESULT( 1, _FACD3D10, code)") +cpp_quote("#define MAKE_D3D10_STATUS(code) MAKE_HRESULT( 0, _FACD3D10, code)") +cpp_quote("#define D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS MAKE_D3D10_HRESULT(1)") +cpp_quote("#define D3D10_ERROR_FILE_NOT_FOUND MAKE_D3D10_HRESULT(2)") typedef enum D3D10_BLEND { D3D10_BLEND_ZERO = 1, diff --git a/include/msinkaut.idl b/include/msinkaut.idl index 75f7686..1f22174 100644 --- a/include/msinkaut.idl +++ b/include/msinkaut.idl @@ -130,7 +130,7 @@ library MSINKAUTLib [out, retval] IInkDrawingAttributes** DrawingAttributes); }; -cpp_quote("#ifndef _WINGDI_"); +cpp_quote("#ifndef _WINGDI_") /* already defined in wingdi.h but needed for WIDL */ typedef struct tagXFORM { single eM11; @@ -140,7 +140,7 @@ cpp_quote("#ifndef _WINGDI_"); single eDx; single eDy; } XFORM; -cpp_quote("#endif /* _WINGDI_ */"); +cpp_quote("#endif /* _WINGDI_ */") [ odl, diff --git a/include/oleacc.idl b/include/oleacc.idl index e92f9fd..5333285 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -172,9 +172,9 @@ cpp_quote("HRESULT WINAPI CreateStdAccessibleProxyA(HWND,LPCSTR,LONG,REFIID,void cpp_quote("HRESULT WINAPI CreateStdAccessibleProxyW(HWND,LPCWSTR,LONG,REFIID,void **);") cpp_quote("#define CreateStdAccessibleProxy WINELIB_NAME_AW(CreateStdAccessibleProxy)") -cpp_quote("UINT WINAPI GetRoleTextA(DWORD,LPSTR,UINT);"); -cpp_quote("UINT WINAPI GetRoleTextW(DWORD,LPWSTR,UINT);"); -cpp_quote("#define GetRoleText WINELIB_NAME_AW(GetRoleText)"); -cpp_quote("UINT WINAPI GetStateTextA(DWORD,LPSTR,UINT);"); -cpp_quote("UINT WINAPI GetStateTextW(DWORD,LPWSTR,UINT);"); +cpp_quote("UINT WINAPI GetRoleTextA(DWORD,LPSTR,UINT);") +cpp_quote("UINT WINAPI GetRoleTextW(DWORD,LPWSTR,UINT);") +cpp_quote("#define GetRoleText WINELIB_NAME_AW(GetRoleText)") +cpp_quote("UINT WINAPI GetStateTextA(DWORD,LPSTR,UINT);") +cpp_quote("UINT WINAPI GetStateTextW(DWORD,LPWSTR,UINT);") cpp_quote("#define GetStateText WINELIB_NAME_AW(GetStateText)") diff --git a/include/wine/irot.idl b/include/wine/irot.idl index 12a2c33..e480b45 100644 --- a/include/wine/irot.idl +++ b/include/wine/irot.idl @@ -18,8 +18,8 @@ import "wtypes.idl"; -cpp_quote("#define IROT_PROTSEQ {'n','c','a','l','r','p','c',0}"); -cpp_quote("#define IROT_ENDPOINT {'i','r','o','t',0}"); +cpp_quote("#define IROT_PROTSEQ {'n','c','a','l','r','p','c',0}") +cpp_quote("#define IROT_ENDPOINT {'i','r','o','t',0}") typedef struct tagMonikerComparisonData { ULONG ulCntData;

1 0

Rob Shearman : rpcrt4: Implement low-level context handle support.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 3d8af5630ba90ed8a631b391fd094adc5c3f2732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8af5630ba90ed8a631b391f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 25 19:08:02 2007 +0000 rpcrt4: Implement low-level context handle support. Server context handles are tracked from associations as their lifetime is determined by the lifetime of the association. --- dlls/rpcrt4/ndr_contexthandle.c | 89 ++++++++++++++++++++---- dlls/rpcrt4/rpc_assoc.c | 146 +++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpc_assoc.h | 14 ++++- 3 files changed, 234 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d8af5630ba90ed8a631b…

1 0

Rob Shearman : rpcrt4: Add tests for low-level context handle functions.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: e24f664b262e8e1238c8c2fab5048171c14fbaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24f664b262e8e1238c8c2fab… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 25 19:08:07 2007 +0000 rpcrt4: Add tests for low-level context handle functions. --- dlls/rpcrt4/tests/server.c | 92 ++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 2 +- 2 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 9ddde43..c8acab9 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -504,6 +504,97 @@ s_get_filename(void) } void +s_context_handle_test(void) +{ + NDR_SCONTEXT h; + RPC_BINDING_HANDLE binding; + RPC_STATUS status; + unsigned char buf[20]; + static RPC_SERVER_INTERFACE server_if = + { + sizeof(RPC_SERVER_INTERFACE), + {{0x00000000,0x4114,0x0704,{0x23,0x01,0x00,0x00,0x00,0x00,0x00,0x00}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + NULL, + 0, + 0, + 0, + 0, + 0, + }; + + binding = I_RpcGetCurrentCallHandle(); + ok(binding != NULL, "I_RpcGetCurrentCallHandle returned NULL\n"); + + h = NDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); + ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); + + /* marshal a context handle with NULL userContext */ + memset(buf, 0xcc, sizeof(buf)); + NDRSContextMarshall2(binding, h, buf, NULL, NULL, 0); + ok(*(ULONG *)buf == 0, "attributes should have been set to 0 instead of 0x%x\n", *(ULONG *)buf); + ok(UuidIsNil((UUID *)&buf[4], &status), "uuid should have been nil\n"); + + h = NDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); + ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); + + /* marshal a context handle with non-NULL userContext */ + memset(buf, 0xcc, sizeof(buf)); + h->userContext = (void *)0xdeadbeef; + NDRSContextMarshall2(binding, h, buf, NULL, NULL, 0); + ok(*(ULONG *)buf == 0, "attributes should have been set to 0 instead of 0x%x\n", *(ULONG *)buf); + ok(!UuidIsNil((UUID *)&buf[4], &status), "uuid should not have been nil\n"); + + h = NDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); + ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); + ok(h->userContext == (void *)0xdeadbeef, "userContext of interface didn't unmarshal properly: %p\n", h->userContext); + + /* marshal a context handle with an interface specified */ + h = NDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); + ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); + + memset(buf, 0xcc, sizeof(buf)); + h->userContext = (void *)0xcafebabe; + NDRSContextMarshall2(binding, h, buf, NULL, &server_if.InterfaceId, 0); + ok(*(ULONG *)buf == 0, "attributes should have been set to 0 instead of 0x%x\n", *(ULONG *)buf); + ok(!UuidIsNil((UUID *)&buf[4], &status), "uuid should not have been nil\n"); + + h = NDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); + ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); + ok(h->userContext == (void *)0xcafebabe, "userContext of interface didn't unmarshal properly: %p\n", h->userContext); + + /* test same interface data, but different pointer */ + /* raises ERROR_INVALID_HANDLE exception */ + if (0) + { + RPC_SERVER_INTERFACE server_if_clone = server_if; + + NDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if_clone.InterfaceId, 0); + } + + /* test different interface data, but different pointer */ + /* raises ERROR_INVALID_HANDLE exception */ + if (0) + { + static RPC_SERVER_INTERFACE server_if2 = + { + sizeof(RPC_SERVER_INTERFACE), + {{0x00000000,0x4114,0x0704,{0x23,0x01,0x00,0x00,0x00,0x00,0x00,0x00}},{1,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + NULL, + 0, + 0, + 0, + 0, + 0, + }; + NDRSContextMarshall2(binding, h, buf, NULL, &server_if.InterfaceId, 0); + + NDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if2.InterfaceId, 0); + } +} + +void s_stop(void) { ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); @@ -1021,6 +1112,7 @@ run_tests(void) union_tests(); pointer_tests(); array_tests(); + context_handle_test(); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 4ce89d2..66b0aff 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -301,6 +301,6 @@ cpp_quote("#endif") int sum_L1_norms(int n, [size_is(n)] vector_t *vs); str_t get_filename(void); - + void context_handle_test(void); void stop(void); }

1 0

Rob Shearman : widl: Fix pointer detection in structures and arrays.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 3e5f7457f644d964d8104aa7157cd156023fbfd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5f7457f644d964d8104aa71… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 25 17:06:28 2007 +0000 widl: Fix pointer detection in structures and arrays. write_embedded_types doesn't descend into all types contained by the array or structure, so create a new function, type_has_pointers, for the purpose of descending into all types and returning whether or not pointers are present. --- tools/widl/typegen.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ea7e317..57c432f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -154,6 +154,44 @@ int is_union(unsigned char type) } } +static int type_has_pointers(const type_t *type) +{ + if (is_user_type(type)) + return FALSE; + else if (is_ptr(type)) + return TRUE; + else if (is_array(type)) + return type_has_pointers(type->ref); + else if (is_struct(type->type)) + { + const var_t *field; + if (type->fields) LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) + { + if (type_has_pointers(field->type)) + return TRUE; + } + } + else if (is_union(type->type)) + { + var_list_t *fields; + const var_t *field; + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(type->fields), const var_t, entry); + fields = uv->type->fields; + } + else + fields = type->fields; + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) + { + if (field->type && type_has_pointers(field->type)) + return TRUE; + } + } + + return FALSE; +} + static unsigned short user_type_offset(const char *name) { user_type_t *ut; @@ -1534,9 +1572,10 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type if (!pointer_type) pointer_type = RPC_FC_RP; - has_pointer = FALSE; if (write_embedded_types(file, attrs, type->ref, name, FALSE, typestring_offset)) has_pointer = TRUE; + else + has_pointer = type_has_pointers(type->ref); align = 0; size = type_memsize((is_conformant_array(type) ? type->ref : type), &align); @@ -1716,6 +1755,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, if (type->fields) LIST_FOR_EACH_ENTRY(f, type->fields, var_t, entry) has_pointers |= write_embedded_types(file, f->attrs, f->type, f->name, FALSE, tfsoff); + if (!has_pointers) has_pointers = type_has_pointers(type); array = find_array_or_string_in_struct(type); if (array && !processed(array->type))

1 0

Jeremy White : wintab32: Fix the W-> A translation for CSR_NAME and CSR_BTNNAMES.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 51ea5cb4e8e314ff2712ac13fbac0e820de3ca51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ea5cb4e8e314ff2712ac13f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 24 13:35:32 2007 -0600 wintab32: Fix the W->A translation for CSR_NAME and CSR_BTNNAMES. Has the lovely side effect of making Photoshop pressure + tilt work. --- dlls/wintab32/context.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index cb85e08..21163c1 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -73,7 +73,8 @@ static BOOL is_string_field(UINT wCategory, UINT nIndex) return TRUE; if (is_logcontext_category(wCategory) && nIndex == CTX_NAME) return TRUE; - if (wCategory >= WTI_CURSORS && wCategory <= WTI_CURSORS + 9) + if ((wCategory >= WTI_CURSORS && wCategory <= WTI_CURSORS + 9) && + (nIndex == CSR_NAME || nIndex == CSR_BTNNAMES)) return TRUE; if (wCategory == WTI_DEVICES && (nIndex == DVC_NAME || nIndex == DVC_PNPID)) return TRUE;

1 0