September 2008 - Wine-commits

Huw Davies : oleaut32: Add support for VT_INT and VT_UINT constants.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: fbcd6422ef7d6c300b6662c9a8e97f980f0ca9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcd6422ef7d6c300b6662c9a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 15 13:45:10 2008 +0100 oleaut32: Add support for VT_INT and VT_UINT constants. --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fb57292..b2e9d30 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3172,6 +3172,8 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign case VT_UI2: case VT_I4: case VT_UI4: + case VT_INT: + case VT_UINT: V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = *(INT*)(pBlk + pItem->byte_offs); break;

1 0

Huw Davies : oleaut32: Use V_INT instead of V_UNION.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: fd3be665310455a2a85ed63df79a409788d41b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3be665310455a2a85ed63df… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 15 14:08:34 2008 +0100 oleaut32: Use V_INT instead of V_UNION. --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b2e9d30..ceb2295 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3146,7 +3146,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign sizeof(VARIANT)); V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_INT; if (pItem->flags & 0x08) - V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = pItem->byte_offs; + V_INT((*ppVarDesc)->vardesc.u.lpvarValue) = pItem->byte_offs; else { switch ((*ppVarDesc)->vardesc.elemdescVar.tdesc.vt) { @@ -3174,7 +3174,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign case VT_UI4: case VT_INT: case VT_UINT: - V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = + V_INT((*ppVarDesc)->vardesc.u.lpvarValue) = *(INT*)(pBlk + pItem->byte_offs); break; default:

1 0

Huw Davies : inetcomm/tests: Tests for IMimeInternational_ConvertBuffer.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 4c7380b113306ccc07511cdfdfe13cd5d2fce549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7380b113306ccc07511cdfd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 15 12:40:22 2008 +0100 inetcomm/tests: Tests for IMimeInternational_ConvertBuffer. --- dlls/inetcomm/tests/mimeintl.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 0fc514f..0de56b2 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -210,11 +210,41 @@ static void test_defaultcharset(void) IMimeInternational_Release(internat); } +static void test_convert(void) +{ + IMimeInternational *internat; + HRESULT hr; + BLOB src, dst; + ULONG read; + static const char test_string[] = "test string"; + + hr = MimeOleGetInternat(&internat); + ok(hr == S_OK, "ret %08x\n", hr); + + src.pBlobData = (BYTE*)test_string; + src.cbSize = sizeof(test_string); + hr = IMimeInternational_ConvertBuffer(internat, 1252, 28591, &src, &dst, &read); + ok(hr == S_OK, "ret %08x\n", hr); + ok(read == sizeof(test_string), "got %d\n", read); + ok(dst.cbSize == sizeof(test_string), "got %d\n", dst.cbSize); + CoTaskMemFree(dst.pBlobData); + + src.cbSize = 2; + hr = IMimeInternational_ConvertBuffer(internat, 1252, 28591, &src, &dst, &read); + ok(hr == S_OK, "ret %08x\n", hr); + ok(read == 2, "got %d\n", read); + ok(dst.cbSize == 2, "got %d\n", dst.cbSize); + CoTaskMemFree(dst.pBlobData); + + IMimeInternational_Release(internat); +} + START_TEST(mimeintl) { OleInitialize(NULL); test_create(); test_charset(); test_defaultcharset(); + test_convert(); OleUninitialize(); }

1 0

Huw Davies : inetcomm: Implement IMimeInternational_ConvertBuffer.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 91599d5088769ef570225ca80bfc5404c49f2752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91599d5088769ef570225ca80… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 15 12:39:37 2008 +0100 inetcomm: Implement IMimeInternational_ConvertBuffer. --- dlls/inetcomm/mimeintl.c | 49 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 626ad62..48deebf 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -346,13 +346,52 @@ static HRESULT WINAPI MimeInternat_EncodeHeader(IMimeInternational *iface, HCHAR } static HRESULT WINAPI MimeInternat_ConvertBuffer(IMimeInternational *iface, CODEPAGEID cpiSource, - CODEPAGEID cpiDest, - LPBLOB pIn, - LPBLOB pOut, + CODEPAGEID cpiDest, LPBLOB pIn, LPBLOB pOut, ULONG *pcbRead) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr; + IMultiLanguage *ml; + + TRACE("(%p)->(%d, %d, %p, %p, %p)\n", iface, cpiSource, cpiDest, pIn, pOut, pcbRead); + + *pcbRead = 0; + pOut->cbSize = 0; + + /* Could call mlang.ConvertINetString() to avoid the COM overhead if need be. */ + + hr = get_mlang(&ml); + if(SUCCEEDED(hr)) + { + DWORD mode = 0; + UINT in_size = pIn->cbSize, out_size; + + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, pIn->pBlobData, &in_size, + NULL, &out_size); + if(hr == S_OK) /* S_FALSE means the conversion could not be performed */ + { + pOut->pBlobData = CoTaskMemAlloc(out_size); + if(!pOut->pBlobData) + hr = E_OUTOFMEMORY; + else + { + mode = 0; + in_size = pIn->cbSize; + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, pIn->pBlobData, &in_size, + pOut->pBlobData, &out_size); + + if(hr == S_OK) + { + *pcbRead = in_size; + pOut->cbSize = out_size; + } + else + CoTaskMemFree(pOut->pBlobData); + } + } + IMultiLanguage_Release(ml); + } + + return hr; } static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODEPAGEID cpiSource,

1 0

Alexandre Julliard : widl: Remove unnecessary casts in the generated code.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: f2032635282351d6d5bb1708d4ea8c2c3c4bd1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2032635282351d6d5bb1708d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 19:40:51 2008 +0200 widl: Remove unnecessary casts in the generated code. --- tools/widl/client.c | 39 +++++++++++---------------------------- tools/widl/server.c | 15 +++++---------- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 204bf63..4078895 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -128,7 +128,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) if (has_full_pointer) write_full_pointer_free(client, indent, func); - print_client("NdrFreeBuffer((PMIDL_STUB_MESSAGE)&__frame->_StubMsg);\n"); + print_client("NdrFreeBuffer(&__frame->_StubMsg);\n"); if (!implicit_handle && explicit_generic_handle_var) { @@ -196,14 +196,8 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("{\n"); indent++; - print_client("NdrClientInitializeNew(\n"); - indent++; - print_client("(PRPC_MESSAGE)&_RpcMessage,\n"); - print_client("(PMIDL_STUB_MESSAGE)&__frame->_StubMsg,\n"); - print_client("(PMIDL_STUB_DESC)&%s_StubDesc,\n", iface->name); - print_client("%d);\n", method_count); - indent--; - fprintf(client, "\n"); + print_client("NdrClientInitializeNew(&_RpcMessage, &__frame->_StubMsg, &%s_StubDesc, %d);\n", + iface->name, method_count); if (is_attr(def->attrs, ATTR_IDEMPOTENT) || is_attr(def->attrs, ATTR_BROADCAST)) { @@ -256,16 +250,11 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) write_remoting_arguments(client, indent, func, "", PASS_IN, PHASE_BUFFERSIZE); - print_client("NdrGetBuffer(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&__frame->_StubMsg,\n"); - print_client("__frame->_StubMsg.BufferLength,\n"); + print_client("NdrGetBuffer(&__frame->_StubMsg, __frame->_StubMsg.BufferLength, "); if (implicit_handle || explicit_handle_var || explicit_generic_handle_var || context_handle_var) - print_client("__frame->_Handle);\n"); + fprintf(client, "__frame->_Handle);\n\n"); else - print_client("%s__MIDL_AutoBindHandle);\n", iface->name); - indent--; - fprintf(client, "\n"); + fprintf(client,"%s__MIDL_AutoBindHandle);\n\n", iface->name); /* marshal arguments */ write_remoting_arguments(client, indent, func, "", PASS_IN, PHASE_MARSHAL); @@ -274,13 +263,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* print_client("NdrNsSendReceive(\n"); */ /* print_client("(unsigned char *)__frame->_StubMsg.Buffer,\n"); */ /* print_client("(RPC_BINDING_HANDLE *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ - print_client("NdrSendReceive(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&__frame->_StubMsg,\n"); - print_client("(unsigned char *)__frame->_StubMsg.Buffer);\n\n"); - indent--; + print_client("NdrSendReceive(&__frame->_StubMsg, __frame->_StubMsg.Buffer);\n\n"); - print_client("__frame->_StubMsg.BufferStart = (unsigned char *)_RpcMessage.Buffer;\n"); + print_client("__frame->_StubMsg.BufferStart = _RpcMessage.Buffer;\n"); print_client("__frame->_StubMsg.BufferEnd = __frame->_StubMsg.BufferStart + _RpcMessage.BufferLength;\n"); if (has_out_arg_or_return(func)) @@ -289,11 +274,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("if ((_RpcMessage.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION)\n"); indent++; - print_client("NdrConvert(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&__frame->_StubMsg,\n"); - print_client("(PFORMAT_STRING)&__MIDL_ProcFormatString.Format[%u]);\n", *proc_offset); - indent -= 2; + print_client("NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[%u]);\n", + *proc_offset); + indent--; } /* unmarshall arguments */ diff --git a/tools/widl/server.c b/tools/widl/server.c index ab5a458..db2d6c2 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -126,11 +126,9 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { print_server("if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION)\n"); indent++; - print_server("NdrConvert(\n"); - indent++; - print_server("(PMIDL_STUB_MESSAGE)&__frame->_StubMsg,\n"); - print_server("(PFORMAT_STRING)&__MIDL_ProcFormatString.Format[%u]);\n", *proc_offset); - indent -= 2; + print_server("NdrConvert(&__frame->_StubMsg, (PFORMAT_STRING)&__MIDL_ProcFormatString.Format[%u]);\n", + *proc_offset); + indent--; fprintf(server, "\n"); /* unmarshall arguments */ @@ -215,7 +213,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_server("RpcRaiseException(_Status);\n"); indent--; fprintf(server, "\n"); - print_server("__frame->_StubMsg.Buffer = (unsigned char *)_pRpcMessage->Buffer;\n"); + print_server("__frame->_StubMsg.Buffer = _pRpcMessage->Buffer;\n"); fprintf(server, "\n"); } @@ -238,10 +236,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* calculate buffer length */ fprintf(server, "\n"); - print_server("_pRpcMessage->BufferLength =\n"); - indent++; - print_server("(unsigned int)(__frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer);\n"); - indent--; + print_server("_pRpcMessage->BufferLength = __frame->_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer;\n"); indent--; fprintf(server, "}\n"); fprintf(server, "\n");

1 0

Alexandre Julliard : widl: Implemented RpcAbnormalTermination in the generic exception handling code.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: cdfec4da31361bc642420107bf8dea07d3a485d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfec4da31361bc642420107b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 18:18:16 2008 +0200 widl: Implemented RpcAbnormalTermination in the generic exception handling code. --- tools/widl/typegen.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 096216a..5a6e592 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3388,6 +3388,7 @@ void write_exceptions( FILE *file ) fprintf( file, "#undef RpcFinally\n"); fprintf( file, "#undef RpcEndFinally\n"); fprintf( file, "#undef RpcExceptionCode\n"); + fprintf( file, "#undef RpcAbnormalTermination\n"); fprintf( file, "\n"); fprintf( file, "struct __exception_frame;\n"); fprintf( file, "typedef int (*__filter_func)(EXCEPTION_RECORD *, struct __exception_frame *);\n"); @@ -3399,6 +3400,7 @@ void write_exceptions( FILE *file ) fprintf( file, " __finally_func finally; \\\n"); fprintf( file, " sigjmp_buf jmp; \\\n"); fprintf( file, " DWORD code; \\\n"); + fprintf( file, " unsigned char abnormal_termination; \\\n"); fprintf( file, " unsigned char filter_level; \\\n"); fprintf( file, " unsigned char finally_level;\n"); fprintf( file, "\n"); @@ -3416,7 +3418,10 @@ void write_exceptions( FILE *file ) fprintf( file, " if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))\n"); fprintf( file, " {\n" ); fprintf( file, " if (exc_frame->finally_level && (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))\n"); + fprintf( file, " {\n" ); + fprintf( file, " exc_frame->abnormal_termination = 1;\n"); fprintf( file, " exc_frame->finally( exc_frame );\n"); + fprintf( file, " }\n" ); fprintf( file, " return ExceptionContinueSearch;\n"); fprintf( file, " }\n" ); fprintf( file, " exc_frame->code = record->ExceptionCode;\n"); @@ -3425,6 +3430,7 @@ void write_exceptions( FILE *file ) fprintf( file, " __wine_rtl_unwind( frame, record );\n"); fprintf( file, " if (exc_frame->finally_level > exc_frame->filter_level)\n" ); fprintf( file, " {\n"); + fprintf( file, " exc_frame->abnormal_termination = 1;\n"); fprintf( file, " exc_frame->finally( exc_frame );\n"); fprintf( file, " __wine_pop_frame( frame );\n"); fprintf( file, " }\n"); @@ -3464,11 +3470,14 @@ void write_exceptions( FILE *file ) fprintf( file, "\n"); fprintf( file, "#define RpcEndFinally\n"); fprintf( file, "\n"); + fprintf( file, "#define RpcAbnormalTermination() (__frame->abnormal_termination)\n"); + fprintf( file, "\n"); fprintf( file, "#define RpcExceptionInit(filter_func,finally_func) \\\n"); fprintf( file, " do { \\\n"); fprintf( file, " __frame->frame.Handler = __widl_exception_handler; \\\n"); fprintf( file, " __frame->filter = (__filter_func)(filter_func); \\\n" ); fprintf( file, " __frame->finally = (__finally_func)(finally_func); \\\n"); + fprintf( file, " __frame->abnormal_termination = 0; \\\n"); fprintf( file, " __frame->filter_level = 0; \\\n"); fprintf( file, " __frame->finally_level = 0; \\\n"); fprintf( file, " } while (0)\n");

1 0

Alexandre Julliard : widl: Implemented __finally support in stub functions.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 3bab54cf04c9da47dc717cd5c6e2c68922fc94c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bab54cf04c9da47dc717cd5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 18:03:44 2008 +0200 widl: Implemented __finally support in stub functions. --- tools/widl/proxy.c | 69 ++++++++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 32 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 32ff58a..6f1d0ee 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -118,21 +118,11 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( " void *This;\n"); print_proxy( "};\n"); print_proxy( "\n"); - print_proxy( "struct __stub_frame\n"); - print_proxy( "{\n"); - print_proxy( " __DECL_EXCEPTION_FRAME;\n"); - print_proxy( " MIDL_STUB_MESSAGE _StubMsg;\n"); - print_proxy( "};\n"); - print_proxy( "\n"); print_proxy("static int __proxy_filter( struct __proxy_frame *__frame )\n"); print_proxy( "{\n"); print_proxy( " return (__frame->_StubMsg.dwStubPhase != PROXY_SENDRECEIVE);\n"); print_proxy( "}\n"); print_proxy( "\n"); - print_proxy("static void __stub_finally( struct __stub_frame *__frame )\n"); - print_proxy( "{\n"); - print_proxy( "}\n"); - print_proxy( "\n"); write_formatstringsdecl(proxy, indent, stmts, need_proxy); write_stubdescproto(); } @@ -404,6 +394,24 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, int has_full_pointer = is_full_pointer_function(cur); indent = 0; + print_proxy( "struct __frame_%s_%s_Stub\n{\n", iface->name, get_name(def)); + indent++; + print_proxy( "__DECL_EXCEPTION_FRAME\n" ); + print_proxy( "MIDL_STUB_MESSAGE _StubMsg;\n"); + print_proxy( "%s * _This;\n", iface->name ); + declare_stub_args( proxy, indent, cur ); + indent--; + print_proxy( "};\n\n" ); + + print_proxy( "static void __finally_%s_%s_Stub(", iface->name, get_name(def) ); + print_proxy( " struct __frame_%s_%s_Stub *__frame )\n{\n", iface->name, get_name(def) ); + indent++; + write_remoting_arguments(proxy, indent, cur, "__frame->", PASS_OUT, PHASE_FREE); + if (has_full_pointer) + write_full_pointer_free(proxy, indent, cur); + indent--; + print_proxy( "}\n\n" ); + print_proxy( "void __RPC_STUB %s_%s_Stub(\n", iface->name, get_name(def)); indent++; print_proxy( "IRpcStubBuffer* This,\n"); @@ -413,18 +421,18 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, indent--; print_proxy( "{\n"); indent++; - print_proxy( "struct __stub_frame __f, * const __frame = &__f;\n" ); - print_proxy("%s * _This = (%s*)((CStdStubBuffer*)This)->pvServerObject;\n", iface->name, iface->name); - declare_stub_args( proxy, indent, cur ); - fprintf(proxy, "\n"); + print_proxy( "struct __frame_%s_%s_Stub __f, * const __frame = &__f;\n\n", + iface->name, get_name(def) ); + + print_proxy("__frame->_This = (%s*)((CStdStubBuffer*)This)->pvServerObject;\n\n", iface->name); /* FIXME: trace */ print_proxy("NdrStubInitialize(_pRpcMessage, &__frame->_StubMsg, &Object_StubDesc, _pRpcChannelBuffer);\n"); fprintf(proxy, "\n"); - print_proxy( "RpcExceptionInit( 0, __stub_finally );\n" ); + print_proxy( "RpcExceptionInit( 0, __finally_%s_%s_Stub );\n", iface->name, get_name(def) ); - write_parameters_init(proxy, indent, cur, ""); + write_parameters_init(proxy, indent, cur, "__frame->"); print_proxy("RpcTryFinally\n"); print_proxy("{\n"); @@ -437,53 +445,50 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, indent--; fprintf(proxy, "\n"); - write_remoting_arguments(proxy, indent, cur, "", PASS_IN, PHASE_UNMARSHAL); + write_remoting_arguments(proxy, indent, cur, "__frame->", PASS_IN, PHASE_UNMARSHAL); fprintf(proxy, "\n"); - assign_stub_out_args( proxy, indent, cur, "" ); + assign_stub_out_args( proxy, indent, cur, "__frame->" ); print_proxy("*_pdwStubPhase = STUB_CALL_SERVER;\n"); fprintf(proxy, "\n"); print_proxy(""); - if (has_ret) fprintf(proxy, "_RetVal = "); + if (has_ret) fprintf(proxy, "__frame->_RetVal = "); if (cas) fprintf(proxy, "%s_%s_Stub", iface->name, cas); - else fprintf(proxy, "_This->lpVtbl->%s", get_name(def)); - fprintf(proxy, "(_This"); + else fprintf(proxy, "__frame->_This->lpVtbl->%s", get_name(def)); + fprintf(proxy, "(__frame->_This"); if (cur->args) { LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) - fprintf(proxy, ", %s%s", arg->type->declarray ? "*" : "", get_name(arg)); + fprintf(proxy, ", %s__frame->%s", arg->type->declarray ? "*" : "", arg->name); } fprintf(proxy, ");\n"); fprintf(proxy, "\n"); print_proxy("*_pdwStubPhase = STUB_MARSHAL;\n"); fprintf(proxy, "\n"); - write_remoting_arguments(proxy, indent, cur, "", PASS_OUT, PHASE_BUFFERSIZE); + write_remoting_arguments(proxy, indent, cur, "__frame->", PASS_OUT, PHASE_BUFFERSIZE); if (!is_void(get_func_return_type(cur))) - write_remoting_arguments(proxy, indent, cur, "", PASS_RETURN, PHASE_BUFFERSIZE); + write_remoting_arguments(proxy, indent, cur, "__frame->", PASS_RETURN, PHASE_BUFFERSIZE); print_proxy("NdrStubGetBuffer(This, _pRpcChannelBuffer, &__frame->_StubMsg);\n"); - write_remoting_arguments(proxy, indent, cur, "", PASS_OUT, PHASE_MARSHAL); + write_remoting_arguments(proxy, indent, cur, "__frame->", PASS_OUT, PHASE_MARSHAL); fprintf(proxy, "\n"); /* marshall the return value */ if (!is_void(get_func_return_type(cur))) - write_remoting_arguments(proxy, indent, cur, "", PASS_RETURN, PHASE_MARSHAL); + write_remoting_arguments(proxy, indent, cur, "__frame->", PASS_RETURN, PHASE_MARSHAL); indent--; print_proxy("}\n"); print_proxy("RpcFinally\n"); print_proxy("{\n"); - - write_remoting_arguments(proxy, indent+1, cur, "", PASS_OUT, PHASE_FREE); - - if (has_full_pointer) - write_full_pointer_free(proxy, indent, cur); - + indent++; + print_proxy( "__finally_%s_%s_Stub( __frame );\n", iface->name, get_name(def) ); + indent--; print_proxy("}\n"); print_proxy("RpcEndFinally\n");

1 0

Alexandre Julliard : widl: Implemented __finally support in server functions.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 0f12f358cd528e82429cbb6cd34c8b6566160a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f12f358cd528e82429cbb6cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 18:03:49 2008 +0200 widl: Implemented __finally support in server functions. --- tools/widl/server.c | 69 ++++++++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 30 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index f7c75fe..ab5a458 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -63,21 +63,38 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); - print_server("void __RPC_STUB %s_%s( PRPC_MESSAGE _pRpcMessage )\n", iface->name, get_name(def)); - - /* write the functions body */ - fprintf(server, "{\n"); + print_server("struct __frame_%s_%s\n{\n", iface->name, get_name(def)); indent++; - print_server( "struct __server_frame __f, * const __frame = &__f;\n" ); + print_server("__DECL_EXCEPTION_FRAME\n"); + print_server("MIDL_STUB_MESSAGE _StubMsg;\n"); /* Declare arguments */ declare_stub_args(server, indent, func); - print_server("RPC_STATUS _Status;\n"); - fprintf(server, "\n"); + indent--; + print_server("};\n\n"); + + print_server("static void __finally_%s_%s(", iface->name, get_name(def)); + fprintf(server," struct __frame_%s_%s *__frame )\n{\n", iface->name, get_name(def)); + + indent++; + write_remoting_arguments(server, indent, func, "__frame->", PASS_OUT, PHASE_FREE); + + if (has_full_pointer) + write_full_pointer_free(server, indent, func); + + indent--; + print_server("}\n\n"); + print_server("void __RPC_STUB %s_%s( PRPC_MESSAGE _pRpcMessage )\n", iface->name, get_name(def)); + + /* write the functions body */ + fprintf(server, "{\n"); + indent++; + print_server("struct __frame_%s_%s __f, * const __frame = &__f;\n", iface->name, get_name(def)); + if (has_out_arg_or_return(func)) print_server("RPC_STATUS _Status;\n"); + fprintf(server, "\n"); - print_server("((void)(_Status));\n"); print_server("NdrServerInitializeNew(\n"); indent++; print_server("_pRpcMessage,\n"); @@ -85,13 +102,13 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_server("&%s_StubDesc);\n", iface->name); indent--; fprintf(server, "\n"); - print_server( "RpcExceptionInit( __server_filter, __server_finally );\n" ); + print_server( "RpcExceptionInit( __server_filter, __finally_%s_%s );\n", iface->name, get_name(def)); - write_parameters_init(server, indent, func, ""); + write_parameters_init(server, indent, func, "__frame->"); if (explicit_handle_var) { - print_server("%s = _pRpcMessage->Handle;\n", explicit_handle_var->name); + print_server("__frame->%s = _pRpcMessage->Handle;\n", explicit_handle_var->name); fprintf(server, "\n"); } @@ -117,7 +134,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(server, "\n"); /* unmarshall arguments */ - write_remoting_arguments(server, indent, func, "", PASS_IN, PHASE_UNMARSHAL); + write_remoting_arguments(server, indent, func, "__frame->", PASS_IN, PHASE_UNMARSHAL); } print_server("if (__frame->_StubMsg.Buffer > __frame->_StubMsg.BufferEnd)\n"); @@ -138,11 +155,11 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(server, "\n"); /* Assign 'out' arguments */ - assign_stub_out_args(server, indent, func, ""); + assign_stub_out_args(server, indent, func, "__frame->"); /* Call the real server function */ if (!is_void(get_func_return_type(func))) - print_server("_RetVal = "); + print_server("__frame->_RetVal = "); else print_server(""); fprintf(server, "%s%s", prefix_server, get_name(def)); @@ -167,11 +184,12 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) int is_ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; print_server("("); write_type_decl_left(server, var->type); - fprintf(server, ")%sNDRSContextValue(%s)", is_ch_ptr ? "" : "*", var->name); + fprintf(server, ")%sNDRSContextValue(__frame->%s)", + is_ch_ptr ? "" : "*", var->name); } else { - print_server("%s%s", var->type->declarray ? "*" : "", get_name(var)); + print_server("%s__frame->%s", var->type->declarray ? "*" : "", var->name); } } fprintf(server, ");\n"); @@ -184,10 +202,10 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) if (has_out_arg_or_return(func)) { - write_remoting_arguments(server, indent, func, "", PASS_OUT, PHASE_BUFFERSIZE); + write_remoting_arguments(server, indent, func, "__frame->", PASS_OUT, PHASE_BUFFERSIZE); if (!is_void(get_func_return_type(func))) - write_remoting_arguments(server, indent, func, "", PASS_RETURN, PHASE_BUFFERSIZE); + write_remoting_arguments(server, indent, func, "__frame->", PASS_RETURN, PHASE_BUFFERSIZE); print_server("_pRpcMessage->BufferLength = __frame->_StubMsg.BufferLength;\n"); fprintf(server, "\n"); @@ -202,23 +220,18 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) } /* marshall arguments */ - write_remoting_arguments(server, indent, func, "", PASS_OUT, PHASE_MARSHAL); + write_remoting_arguments(server, indent, func, "__frame->", PASS_OUT, PHASE_MARSHAL); /* marshall the return value */ if (!is_void(get_func_return_type(func))) - write_remoting_arguments(server, indent, func, "", PASS_RETURN, PHASE_MARSHAL); + write_remoting_arguments(server, indent, func, "__frame->", PASS_RETURN, PHASE_MARSHAL); indent--; print_server("}\n"); print_server("RpcFinally\n"); print_server("{\n"); indent++; - - write_remoting_arguments(server, indent, func, "", PASS_OUT, PHASE_FREE); - - if (has_full_pointer) - write_full_pointer_free(server, indent, func); - + print_server("__finally_%s_%s( __frame );\n", iface->name, get_name(def)); indent--; print_server("}\n"); print_server("RpcEndFinally\n"); @@ -384,10 +397,6 @@ static void init_server(void) print_server( " return RPC_BAD_STUB_DATA_EXCEPTION_FILTER;\n"); print_server( "}\n"); print_server( "\n"); - print_server("static void __server_finally( struct __server_frame *__frame )\n"); - print_server( "{\n"); - print_server( "}\n"); - print_server( "\n"); }

1 0

Alexandre Julliard : widl: Implemented __finally support in client functions.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 654e78aa38cd335385a26505da3ba7e1c8045d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=654e78aa38cd335385a26505d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 18:03:56 2008 +0200 widl: Implemented __finally support in client functions. --- tools/widl/client.c | 103 ++++++++++++++++++++++++++++++-------------------- tools/widl/typegen.c | 2 +- 2 files changed, 63 insertions(+), 42 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 7e7bb16..204bf63 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -99,6 +99,50 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) context_handle_var = get_context_handle_var(func); } + print_client( "struct __frame_%s%s\n{\n", prefix_client, get_name(def) ); + indent++; + print_client( "__DECL_EXCEPTION_FRAME\n" ); + print_client("MIDL_STUB_MESSAGE _StubMsg;\n"); + if (implicit_handle || explicit_handle_var || explicit_generic_handle_var || context_handle_var) + { + if (!implicit_handle && explicit_generic_handle_var) + print_client("%s %s;\n", + get_explicit_generic_handle_type(explicit_generic_handle_var)->name, + explicit_generic_handle_var->name ); + print_client("RPC_BINDING_HANDLE _Handle;\n"); + } + + if (!is_void(get_func_return_type(func)) && decl_indirect(get_func_return_type(func))) + { + print_client("void *_p_%s;\n", "_RetVal" ); + } + indent--; + print_client( "};\n\n" ); + + print_client( "static void __finally_%s%s(", prefix_client, get_name(def) ); + print_client( " struct __frame_%s%s *__frame )\n{\n", prefix_client, get_name(def) ); + indent++; + + /* FIXME: emit client finally code */ + + if (has_full_pointer) + write_full_pointer_free(client, indent, func); + + print_client("NdrFreeBuffer((PMIDL_STUB_MESSAGE)&__frame->_StubMsg);\n"); + + if (!implicit_handle && explicit_generic_handle_var) + { + fprintf(client, "\n"); + print_client("if (__frame->_Handle)\n"); + indent++; + print_client("%s_unbind(__frame->%s, __frame->_Handle);\n", + get_explicit_generic_handle_type(explicit_generic_handle_var)->name, + explicit_generic_handle_var->name); + indent--; + } + indent--; + print_client( "}\n\n" ); + write_type_decl_left(client, get_func_return_type(func)); if (needs_space_after(get_func_return_type(func))) fprintf(client, " "); @@ -115,7 +159,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* write the functions body */ fprintf(client, "{\n"); indent++; - print_client( "struct __client_frame __f, * const __frame = &__f;\n" ); + print_client( "struct __frame_%s%s __f, * const __frame = &__f;\n", prefix_client, get_name(def) ); /* declare return value '_RetVal' */ if (!is_void(get_func_return_type(func))) @@ -124,18 +168,23 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) write_type_decl_left(client, get_func_return_type(func)); fprintf(client, " _RetVal;\n"); } + print_client("RPC_MESSAGE _RpcMessage;\n"); if (implicit_handle || explicit_handle_var || explicit_generic_handle_var || context_handle_var) - print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); - - print_client("RPC_MESSAGE _RpcMessage;\n"); + { + print_client( "__frame->_Handle = 0;\n" ); + if (!implicit_handle && explicit_generic_handle_var) + print_client("__frame->%s = %s;\n", + explicit_generic_handle_var->name, explicit_generic_handle_var->name ); + } if (!is_void(get_func_return_type(func)) && decl_indirect(get_func_return_type(func))) { - print_client("void *_p_%s = &%s;\n", + print_client("__frame->_p_%s = &%s;\n", "_RetVal", "_RetVal"); } fprintf(client, "\n"); - print_client( "RpcExceptionInit( 0, __client_finally );\n" ); + + print_client( "RpcExceptionInit( 0, __finally_%s%s );\n", prefix_client, get_name(def) ); if (has_full_pointer) write_full_pointer_init(client, indent, func, FALSE); @@ -168,12 +217,12 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) if (explicit_handle_var) { - print_client("_Handle = %s;\n", explicit_handle_var->name); + print_client("__frame->_Handle = %s;\n", explicit_handle_var->name); fprintf(client, "\n"); } else if (explicit_generic_handle_var) { - print_client("_Handle = %s_bind(%s);\n", + print_client("__frame->_Handle = %s_bind(%s);\n", get_explicit_generic_handle_type(explicit_generic_handle_var)->name, explicit_generic_handle_var->name); fprintf(client, "\n"); @@ -186,7 +235,8 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) int is_ch_ptr = is_aliaschain_attr(context_handle_var->type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; print_client("if (%s%s != 0)\n", is_ch_ptr ? "*" : "", context_handle_var->name); indent++; - print_client("_Handle = NDRCContextBinding(%s%s);\n", is_ch_ptr ? "*" : "", context_handle_var->name); + print_client("__frame->_Handle = NDRCContextBinding(%s%s);\n", + is_ch_ptr ? "*" : "", context_handle_var->name); indent--; if (is_attr(context_handle_var->attrs, ATTR_IN) && !is_attr(context_handle_var->attrs, ATTR_OUT)) @@ -200,7 +250,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) } else if (implicit_handle) { - print_client("_Handle = %s;\n", implicit_handle); + print_client("__frame->_Handle = %s;\n", implicit_handle); fprintf(client, "\n"); } @@ -211,7 +261,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("(PMIDL_STUB_MESSAGE)&__frame->_StubMsg,\n"); print_client("__frame->_StubMsg.BufferLength,\n"); if (implicit_handle || explicit_handle_var || explicit_generic_handle_var || context_handle_var) - print_client("_Handle);\n"); + print_client("__frame->_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); indent--; @@ -276,26 +326,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("RpcFinally\n"); print_client("{\n"); indent++; - - - /* FIXME: emit client finally code */ - - if (has_full_pointer) - write_full_pointer_free(client, indent, func); - - print_client("NdrFreeBuffer((PMIDL_STUB_MESSAGE)&__frame->_StubMsg);\n"); - - if (!implicit_handle && explicit_generic_handle_var) - { - fprintf(client, "\n"); - print_client("if (_Handle)\n"); - indent++; - print_client("%s_unbind(%s, _Handle);\n", - get_explicit_generic_handle_type(explicit_generic_handle_var)->name, - explicit_generic_handle_var->name); - indent--; - } - + print_client( "__finally_%s%s( __frame );\n", prefix_client, get_name(def) ); indent--; print_client("}\n"); print_client("RpcEndFinally\n"); @@ -438,16 +469,6 @@ static void init_client(void) print_client( "\n"); write_exceptions( client ); print_client( "\n"); - print_client( "struct __client_frame\n"); - print_client( "{\n"); - print_client(" __DECL_EXCEPTION_FRAME;\n"); - print_client( " MIDL_STUB_MESSAGE _StubMsg;\n"); - print_client( "};\n"); - print_client( "\n"); - print_client("static void __client_finally( struct __client_frame *__frame )\n"); - print_client( "{\n"); - print_client( "}\n"); - print_client( "\n"); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 61aaf2a..096216a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2925,7 +2925,7 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, const print_file(file, indent, "NdrClientContextUnmarshall(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); print_file(file, indent + 1, "(NDR_CCONTEXT *)%s%s,\n", local_var_prefix, var->name); - print_file(file, indent + 1, "_Handle);\n"); + print_file(file, indent + 1, "__frame->_Handle);\n"); } else {

1 0

Alexandre Julliard : widl: Create an explicit structure for the function frame of all generated functions .
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 1218aff94dd867394004695e65f74be505cd492a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1218aff94dd867394004695e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 14:02:26 2008 +0200 widl: Create an explicit structure for the function frame of all generated functions. Store _StubMsg in the frame structure since it's needed for exception handling. --- tools/widl/client.c | 29 ++++++++++------- tools/widl/proxy.c | 82 ++++++++++++++++++++++++++----------------------- tools/widl/server.c | 41 +++++++++++++------------ tools/widl/typegen.c | 50 +++++++++++++++--------------- 4 files changed, 106 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1218aff94dd8673940046…

1 0