January 2008 - Wine-commits

Rico Schüller : cabinet: Fix memory leak ( found by Smatch).
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 2dd29b107e9741b6322f26c2005b89435bdcc3b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd29b107e9741b6322f26c20… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 31 00:24:26 2007 +0100 cabinet: Fix memory leak (found by Smatch). --- dlls/cabinet/cabinet_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 9e2c18a..7ebe63c 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -229,7 +229,11 @@ static INT_PTR fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf file_in_list(pDestination->FileList, pfdin->psz1, &node); if (node && !node->DoExtract) + { + HeapFree(GetProcessHeap(), 0, szFullPath); + HeapFree(GetProcessHeap(), 0, szDirectory); return 0; + } /* create the destination directory if it doesn't exist */ if (GetFileAttributesA(szDirectory) == INVALID_FILE_ATTRIBUTES)

1 0

Francois Gouget : msxml3/tests: Add the trailing '\n' to an ok() call.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: ca64f7c75a95cb77a608a12839771bdb223aff43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca64f7c75a95cb77a608a1283… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 7 11:16:33 2008 +0100 msxml3/tests: Add the trailing '\n' to an ok() call. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c4f8882..67897e3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1827,7 +1827,7 @@ static void test_xmlTypes(void) IXMLDOMNode *pNewChild = (IXMLDOMNode *)0x1; hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); ok(hr == E_FAIL, "ret %08x\n", hr ); - ok(pNewChild == NULL, "pNewChild not NULL"); + ok(pNewChild == NULL, "pNewChild not NULL\n"); hr = IXMLDOMElement_get_attributes(pElement, &pAttribs); ok(hr == S_OK, "ret %08x\n", hr );

1 0

Francois Gouget : wintab32: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 327534f6ef320e943259ccf70a0fa8eed52d8a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327534f6ef320e943259ccf70… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 7 11:16:27 2008 +0100 wintab32: Add a trailing '\n' to a Wine trace. --- dlls/wintab32/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 4b382ec..609ec22 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -114,7 +114,7 @@ static inline void DUMPPACKET(WTPACKET packet) static inline void DUMPCONTEXT(LOGCONTEXTW lc) { - TRACE("context: %s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i", + TRACE("context: %s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i\n", wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice, lc.lcPktRate, lc.lcPktData, DUMPBITS(lc.lcPktData), lc.lcPktMode, DUMPBITS(lc.lcPktMode), lc.lcMoveMask,

1 0

Rob Shearman : widl: Fix the conditions under which array freeing code is output.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: e998892a23d8923feb3adc1523ec21a8d2c13540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e998892a23d8923feb3adc152… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 10:17:32 2008 +0000 widl: Fix the conditions under which array freeing code is output. It doesn't matter whether or not the array is declared as a pointer or is declared using array subscripts - the array is still allocated by the unmarshalling function and so needs to be freed. Fix a typo that caused varying arrays never to be freed. Fix another typo with the check for conformant arrays being performed twice, redundantly. --- tools/widl/typegen.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3953b96..bed46aa 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2819,14 +2819,13 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, if (pointer_type != RPC_FC_RP) array_type = "Pointer"; print_phase_function(file, indent, array_type, phase, var, start_offset); - if (phase == PHASE_FREE && type->declarray && pointer_type == RPC_FC_RP) + if (phase == PHASE_FREE && pointer_type == RPC_FC_RP) { - /* these are all unmarshalled by pointing into the buffer on the - * server side */ + /* these are all unmarshalled by allocating memory */ if (type->type == RPC_FC_BOGUS_ARRAY || type->type == RPC_FC_CVARRAY || - (type->type == RPC_FC_SMVARRAY && type->type == RPC_FC_LGVARRAY && in_attr) || - (type->type == RPC_FC_CARRAY && type->type == RPC_FC_CARRAY && !in_attr)) + ((type->type == RPC_FC_SMVARRAY || type->type == RPC_FC_LGVARRAY) && in_attr) || + (type->type == RPC_FC_CARRAY && !in_attr)) { print_file(file, indent, "if (%s)\n", var->name); indent++;

1 0

Rob Shearman : include: I_RpcBindingInqTransportType and I_RpcMapWin32Status should be always defined .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 1255eaf8b4a73dfd06506987a63a86b1c8314b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1255eaf8b4a73dfd06506987a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 10:17:45 2008 +0000 include: I_RpcBindingInqTransportType and I_RpcMapWin32Status should be always defined. --- include/rpcdcep.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/rpcdcep.h b/include/rpcdcep.h index 5514790..b93c9a6 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -183,11 +183,6 @@ RPCRTAPI UINT RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcSetWMsgEndpoint( WCHAR* Endpoint ); -RPCRTAPI RPC_STATUS RPC_ENTRY - I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); - -RPCRTAPI LONG RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS); - #endif #else @@ -212,6 +207,11 @@ RPCRTAPI UINT RPC_ENTRY #endif +RPCRTAPI RPC_STATUS RPC_ENTRY + I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); + +RPCRTAPI LONG RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS); + #ifdef __cplusplus } #endif

1 0

Aric Stewart : imm32: ImmNotifyIMM with CPS_CANCEL fully clears the composition string. Also enable respective tests.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 6bc088b28cef4ebc0362f217eef0c4a891054d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc088b28cef4ebc0362f217e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 4 12:22:03 2008 -0600 imm32: ImmNotifyIMM with CPS_CANCEL fully clears the composition string. Also enable respective tests. --- dlls/imm32/imm.c | 11 +++++++---- dlls/imm32/tests/imm32.c | 4 ---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index da39261..4acbde3 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1406,15 +1406,18 @@ BOOL WINAPI ImmNotifyIME( case CPS_CANCEL: TRACE("%s - %s\n","NI_COMPOSITIONSTR","CPS_CANCEL"); { - HIMCC newCompStr; + BOOL send; + if (pX11DRV_ForceXIMReset) pX11DRV_ForceXIMReset(root_context->IMC.hWnd); - newCompStr = updateCompStr(root_context->IMC.hCompStr, NULL, 0); + send = (root_context->IMC.hCompStr!=NULL); + ImmDestroyIMCC(root_context->IMC.hCompStr); - root_context->IMC.hCompStr = newCompStr; + root_context->IMC.hCompStr = NULL; - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, + if (send) + ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, GCS_COMPSTR); rc = TRUE; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 895c801..d948f54 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -183,11 +183,9 @@ static int test_ImmNotifyIME(void) { ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " "empty composition string succeeds.\n"); - todo_wine { ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); - } msg_spy_flush_msgs(); @@ -203,11 +201,9 @@ static int test_ImmNotifyIME(void) { ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " "empty composition string succeeds.\n"); - todo_wine { ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); - } msg_spy_flush_msgs(); ImmReleaseContext(hwnd, imc);

1 0

Rob Shearman : include: Add defines for context handle flags to rpcfc.h.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 53e8734049d9e241af572dca733017ac18f21de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e8734049d9e241af572dca7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:20:47 2008 +0000 include: Add defines for context handle flags to rpcfc.h. --- include/wine/rpcfc.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index 4242c94..34878e2 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -194,4 +194,10 @@ #define USER_MARSHAL_POINTER 0xc0 #define USER_MARSHAL_IID 0x20 +/* context handle flags */ +#define NDR_CONTEXT_HANDLE_CANNOT_BE_NULL 0x01 +#define NDR_CONTEXT_HANDLE_SERIALIZE 0x02 +#define NDR_CONTEXT_HANDLE_NO_SERIALIZE 0x04 +#define NDR_STRICT_CONTEXT_HANDLE 0x08 + #endif /* __WINE_RPCFC_H */

1 0

Rob Shearman : widl: Output calls for the new versions of the marshalling and unmarshalling routines for server context handles .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 807001441ddee17ad12c0eaf4a28c8a6df4f2bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807001441ddee17ad12c0eaf4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:21:03 2008 +0000 widl: Output calls for the new versions of the marshalling and unmarshalling routines for server context handles. This needs to be done to match the call to NdrContextHandleInitialize and because we default to using strict context handles. --- tools/widl/typegen.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 55fb3fa..b9d3306 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2707,10 +2707,11 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, } else { - print_file(file, indent, "NdrServerContextMarshall(\n"); + print_file(file, indent, "NdrServerContextNewMarshall(\n"); print_file(file, indent + 1, "&_StubMsg,\n"); print_file(file, indent + 1, "(NDR_SCONTEXT)%s,\n", var->name); - print_file(file, indent + 1, "(NDR_RUNDOWN)%s_rundown);\n", get_context_handle_type_name(var->type)); + print_file(file, indent + 1, "(NDR_RUNDOWN)%s_rundown,\n", get_context_handle_type_name(var->type)); + print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", start_offset); } } else if (phase == PHASE_UNMARSHAL) @@ -2723,7 +2724,11 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, print_file(file, indent + 1, "_Handle);\n"); } else - print_file(file, indent, "%s = NdrServerContextUnmarshall(&_StubMsg);\n", var->name); + { + print_file(file, indent, "%s = NdrServerContextNewUnmarshall(\n", var->name); + print_file(file, indent + 1, "&_StubMsg,\n"); + print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", start_offset); + } } } else if (is_user_type(var->type))

1 0

Rob Shearman : rpcrt4: Pass the interface identifier to the lower-level context handle routines for context handles with the strict flag set .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: f9fc52f602ec9af5610ba14c6b2c5bbcc9ae6958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fc52f602ec9af5610ba14c6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:21:21 2008 +0000 rpcrt4: Pass the interface identifier to the lower-level context handle routines for context handles with the strict flag set. --- dlls/rpcrt4/ndr_marshall.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b3c7df8..dcbb4fd 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6279,9 +6279,18 @@ void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + TRACE("(%p, %p)\n", pStubMsg, pFormat); + + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + return NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, NULL, - pStubMsg->RpcMsg->DataRepresentation, NULL, 0); + pStubMsg->RpcMsg->DataRepresentation, if_id, 0); } void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, @@ -6289,6 +6298,8 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat) { + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + TRACE("(%p, %p, %p, %p)\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); ALIGN_POINTER(pStubMsg->Buffer, 4); @@ -6300,9 +6311,14 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_X_BAD_STUB_DATA); } - /* FIXME: do something with pFormat */ + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer, RundownRoutine, if_id, 0); pStubMsg->Buffer += cbNDRContext; } @@ -6310,6 +6326,7 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { NDR_SCONTEXT ContextHandle; + RPC_SYNTAX_IDENTIFIER *if_id = NULL; TRACE("(%p, %p)\n", pStubMsg, pFormat); @@ -6322,11 +6339,16 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_X_BAD_STUB_DATA); } - /* FIXME: do something with pFormat */ + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - NULL, 0); + if_id, 0); pStubMsg->Buffer += cbNDRContext; return ContextHandle;

1 0

Rob Shearman : widl: Add support for strict context handles.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 15af19c6ecf63cca7c1326d53cc637f2ecbf7067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15af19c6ecf63cca7c1326d53… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:25:50 2008 +0000 widl: Add support for strict context handles. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ tools/widl/typegen.c | 7 ++++++- tools/widl/widltypes.h | 1 + 4 files changed, 10 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d2fd3c1..98f17af 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -299,6 +299,7 @@ static const struct keyword attr_keywords[] = {"single", tSINGLE}, {"size_is", tSIZEIS}, {"source", tSOURCE}, + {"strict_context_handle", tSTRICTCONTEXTHANDLE}, {"string", tSTRING}, {"switch_is", tSWITCHIS}, {"switch_type", tSWITCHTYPE}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6c8337e..499ae15 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -225,6 +225,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %token tSMALL %token tSOURCE %token tSTDCALL +%token tSTRICTCONTEXTHANDLE %token tSTRING tSTRUCT %token tSWITCH tSWITCHIS tSWITCHTYPE %token tTRANSMITAS @@ -497,6 +498,7 @@ attribute: { $$ = NULL; } | tRETVAL { $$ = make_attr(ATTR_RETVAL); } | tSIZEIS '(' m_exprs ')' { $$ = make_attrp(ATTR_SIZEIS, $3); } | tSOURCE { $$ = make_attr(ATTR_SOURCE); } + | tSTRICTCONTEXTHANDLE { $$ = make_attr(ATTR_STRICTCONTEXTHANDLE); } | tSTRING { $$ = make_attr(ATTR_STRING); } | tSWITCHIS '(' expr ')' { $$ = make_attrp(ATTR_SWITCHIS, $3); } | tSWITCHTYPE '(' type ')' { $$ = make_attrp(ATTR_SWITCHTYPE, $3); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b9d3306..3953b96 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -43,6 +43,7 @@ static const func_t *current_func; static const type_t *current_structure; +static const ifref_t *current_iface; static struct list expr_eval_routines = LIST_INIT(expr_eval_routines); struct expr_eval_routine @@ -2057,7 +2058,10 @@ static size_t write_contexthandle_tfs(FILE *file, const type_t *type, unsigned int *typeformat_offset) { size_t start_offset = *typeformat_offset; - unsigned char flags = 0x08 /* strict */; + unsigned char flags = 0; + + if (is_attr(current_iface->attrs, ATTR_STRICTCONTEXTHANDLE)) + flags |= 0x08 /* strict */; if (is_ptr(type)) { @@ -2280,6 +2284,7 @@ static size_t process_tfs(FILE *file, const ifref_list_t *ifaces, type_pred_t pr if (iface->iface->funcs) { const func_t *func; + current_iface = iface; LIST_FOR_EACH_ENTRY( func, iface->iface->funcs, const func_t, entry ) { if (is_local(func->def->attrs)) continue; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 6930f71..acdc3f1 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -121,6 +121,7 @@ enum attr_type ATTR_RETVAL, ATTR_SIZEIS, ATTR_SOURCE, + ATTR_STRICTCONTEXTHANDLE, ATTR_STRING, ATTR_SWITCHIS, ATTR_SWITCHTYPE,

1 0