November 2018 - Wine-commits

Jacek Caban : widl: Write serialize function declarations in header.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: dc03ca5e155e7b0daabcdd5cc2b18ae698047fda URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc03ca5e155e7b0daabcdd5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:51:16 2018 +0100 widl: Write serialize function declarations in header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 23 +++++++++++++++++++++++ tools/widl/header.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/header.h | 2 ++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 8b3b139..b05c3c9 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -287,6 +287,29 @@ static void write_function_stub( const type_t *iface, const var_t *func, fprintf(client, "\n"); } +static void write_serialize_function(FILE *file, const type_t *type, const type_t *iface, + const char *func_name, const char *ret_type) +{ + /* FIXME: Assuming explicit handle */ + + fprintf(file, "%s __cdecl %s_%s(handle_t IDL_handle, %s *IDL_type)%s\n", + ret_type ? ret_type : "void", type->name, func_name, type->name, iface ? "" : ";"); +} + +void write_serialize_functions(FILE *file, const type_t *type, const type_t *iface) +{ + if (is_attr(type->attrs, ATTR_ENCODE)) + { + write_serialize_function(file, type, iface, "AlignSize", "SIZE_T"); + write_serialize_function(file, type, iface, "Encode", NULL); + } + if (is_attr(type->attrs, ATTR_DECODE)) + { + write_serialize_function(file, type, iface, "Decode", NULL); + write_serialize_function(file, type, iface, "Free", NULL); + } +} + static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const statement_t *stmt; diff --git a/tools/widl/header.c b/tools/widl/header.c index c4b26d3..defc7f8 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -716,6 +716,47 @@ void check_for_additional_prototype_types(const var_list_t *list) } } +static int write_serialize_function_decl(FILE *header, const type_t *type) +{ + write_serialize_functions(header, type, NULL); + return 1; +} + +static int serializable_exists(FILE *header, const type_t *type) +{ + return 0; +} + +static int for_each_serializable(const statement_list_t *stmts, FILE *header, + int (*proc)(FILE*, const type_t*)) +{ + statement_t *stmt, *iface_stmt; + statement_list_t *iface_stmts; + const type_list_t *type_entry; + + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, statement_t, entry ) + { + if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) + continue; + + iface_stmts = type_iface_get_stmts(stmt->u.type); + if (iface_stmts) LIST_FOR_EACH_ENTRY( iface_stmt, iface_stmts, statement_t, entry ) + { + if (iface_stmt->type != STMT_TYPEDEF) continue; + for (type_entry = iface_stmt->u.type_list; type_entry; type_entry = type_entry->next) + { + if (!is_attr(type_entry->type->attrs, ATTR_ENCODE) + && !is_attr(type_entry->type->attrs, ATTR_DECODE)) + continue; + if (!proc(header, type_entry->type)) + return 0; + } + } + } + + return 1; +} + static void write_user_types(FILE *header) { user_type_t *ut; @@ -1748,7 +1789,10 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#endif\n\n"); fprintf(header, "#include <rpc.h>\n" ); - fprintf(header, "#include <rpcndr.h>\n\n" ); + fprintf(header, "#include <rpcndr.h>\n" ); + if (!for_each_serializable(stmts, NULL, serializable_exists)) + fprintf(header, "#include <midles.h>\n" ); + fprintf(header, "\n" ); fprintf(header, "#ifndef COM_NO_WINDOWS_H\n"); fprintf(header, "#include <windows.h>\n"); @@ -1770,6 +1814,7 @@ void write_header(const statement_list_t *stmts) fprintf(header, "/* Begin additional prototypes for all interfaces */\n"); fprintf(header, "\n"); + for_each_serializable(stmts, header, write_serialize_function_decl); write_user_types(header); write_generic_handle_routines(header); write_context_handle_rundowns(header); diff --git a/tools/widl/header.h b/tools/widl/header.h index 6222a48..0d44b40 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -54,6 +54,8 @@ extern const var_t *get_func_handle_var( const type_t *iface, const var_t *func, extern int has_out_arg_or_return(const var_t *func); extern int is_const_decl(const var_t *var); +extern void write_serialize_functions(FILE *file, const type_t *type, const type_t *iface); + static inline int is_ptr(const type_t *t) { return type_get_type(t) == TYPE_POINTER;

1 0

Jacek Caban : widl: Add support for serialization functions.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: fb5d6c672f7b697fc5464a2bc303825183005858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5d6c672f7b697fc5464a2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:51:23 2018 +0100 widl: Add support for serialization functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 86 insertions(+), 10 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index b05c3c9..a3b2bbb 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -290,10 +290,49 @@ static void write_function_stub( const type_t *iface, const var_t *func, static void write_serialize_function(FILE *file, const type_t *type, const type_t *iface, const char *func_name, const char *ret_type) { + enum stub_mode mode = get_stub_mode(); + static int emited_pickling_info; + + if (iface && !type->typestring_offset) + { + /* FIXME: Those are mostly basic types. They should be implemented + * using NdrMesSimpleType* functions */ + if (ret_type) warning("Serialization of type %s is not supported\n", type->name); + return; + } + + if (!emited_pickling_info && iface && mode != MODE_Os) + { + fprintf(file, "static const MIDL_TYPE_PICKLING_INFO __MIDL_TypePicklingInfo =\n"); + fprintf(file, "{\n"); + fprintf(file, " 0x33205054,\n"); + fprintf(file, " 0x3,\n"); + fprintf(file, " 0,\n"); + fprintf(file, " 0,\n"); + fprintf(file, " 0\n"); + fprintf(file, "};\n"); + fprintf(file, "\n"); + emited_pickling_info = 1; + } + /* FIXME: Assuming explicit handle */ fprintf(file, "%s __cdecl %s_%s(handle_t IDL_handle, %s *IDL_type)%s\n", ret_type ? ret_type : "void", type->name, func_name, type->name, iface ? "" : ";"); + if (!iface) return; /* declaration only */ + + fprintf(file, "{\n"); + fprintf(file, " %sNdrMesType%s%s(\n", ret_type ? "return " : "", func_name, + mode != MODE_Os ? "2" : ""); + fprintf(file, " IDL_handle,\n"); + if (mode != MODE_Os) + fprintf(file, " (MIDL_TYPE_PICKLING_INFO*)&__MIDL_TypePicklingInfo,\n"); + fprintf(file, " &%s_StubDesc,\n", iface->name); + fprintf(file, " (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + type->typestring_offset); + fprintf(file, " IDL_type);\n"); + fprintf(file, "}\n"); + fprintf(file, "\n"); } void write_serialize_functions(FILE *file, const type_t *type, const type_t *iface) @@ -319,11 +358,30 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) if (!implicit_handle) print_client("static RPC_BINDING_HANDLE %s__MIDL_AutoBindHandle;\n\n", iface->name); - STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) + LIST_FOR_EACH_ENTRY( stmt, type_iface_get_stmts(iface), const statement_t, entry ) { - const var_t *func = stmt->u.var; - write_function_stub( iface, func, method_count++, *proc_offset ); - *proc_offset += get_size_procformatstring_func( iface, func ); + switch (stmt->type) + { + case STMT_DECLARATION: + { + const var_t *func = stmt->u.var; + if (stmt->u.var->stgclass != STG_NONE + || type_get_type_detect_alias(stmt->u.var->type) != TYPE_FUNCTION) + continue; + write_function_stub( iface, func, method_count++, *proc_offset ); + *proc_offset += get_size_procformatstring_func( iface, func ); + break; + } + case STMT_TYPEDEF: + { + const type_list_t *type_entry; + for (type_entry = stmt->u.type_list; type_entry; type_entry = type_entry->next) + write_serialize_functions(client, type_entry->type, iface); + break; + } + default: + break; + } } } @@ -461,7 +519,7 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou { if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { - int has_func = 0; + int needs_stub = 0; const statement_t *stmt2; type_t *iface = stmt->u.type; if (!need_stub(iface)) @@ -472,13 +530,31 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou fprintf(client, " */\n"); fprintf(client, "\n"); - STATEMENTS_FOR_EACH_FUNC(stmt2, type_iface_get_stmts(iface)) + LIST_FOR_EACH_ENTRY(stmt2, type_iface_get_stmts(iface), const statement_t, entry) { - has_func = 1; - break; + if (stmt2->type == STMT_DECLARATION && stmt2->u.var->stgclass == STG_NONE && + type_get_type_detect_alias(stmt2->u.var->type) == TYPE_FUNCTION) + { + needs_stub = 1; + break; + } + if (stmt2->type == STMT_TYPEDEF) + { + const type_list_t *type_entry; + for (type_entry = stmt2->u.type_list; type_entry; type_entry = type_entry->next) + { + if (is_attr(type_entry->type->attrs, ATTR_ENCODE) + || is_attr(type_entry->type->attrs, ATTR_DECODE)) + { + needs_stub = 1; + break; + } + } + if (needs_stub) + break; + } } - - if (has_func) + if (needs_stub) { write_implicithandledecl(iface);

1 0

Jacek Caban : widl: Add basic acf parser implementation.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 90748c581be41ecadcc6a0b38687900d0f7d1bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=90748c581be41ecadcc6a0b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:51:04 2018 +0100 widl: Add basic acf parser implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 542ee43..d979394 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -266,8 +266,9 @@ static typelib_t *current_typelib; %token tWCHAR tWIREMARSHAL %token tAPARTMENT tNEUTRAL tSINGLE tFREE tBOTH -%type <attr> attribute type_qualifier function_specifier +%type <attr> attribute type_qualifier function_specifier acf_attribute %type <attr_list> m_attributes attributes attrib_list m_type_qual_list +%type <attr_list> acf_attributes acf_attribute_list %type <str_list> str_list %type <expr> m_expr expr expr_const expr_int_const array m_bitfield %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const @@ -1154,6 +1155,37 @@ version: acf_statements : /* empty */ + | acf_interface acf_statements + +acf_int_statements + : /* empty */ + | acf_int_statement acf_int_statements + +acf_int_statement + : tTYPEDEF acf_attributes aKNOWNTYPE ';' + { type_t *type = find_type_or_error($3, 0); + type->attrs = append_attr_list(type->attrs, $2); + } +acf_interface + : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' + { type_t *iface = find_type_or_error2($3, 0); + if (type_get_type(iface) != TYPE_INTERFACE) + error_loc("%s is not an interface\n", iface->name); + iface->attrs = append_attr_list(iface->attrs, $1); + } + +acf_attributes + : /* empty */ { $$ = NULL; }; + | '[' acf_attribute_list ']' { $$ = $2; }; + +acf_attribute_list + : acf_attribute { $$ = append_attr(NULL, $1); } + | acf_attribute_list ',' acf_attribute { $$ = append_attr($1, $3); } + +acf_attribute + : tENCODE { $$ = make_attr(ATTR_ENCODE); } + | tDECODE { $$ = make_attr(ATTR_DECODE); } + | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } %%

1 0

Henri Verbeet : d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d9_device_CreateDepthStencilSurface ().
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 719f0d7a3580f3cc34ae2708dacc27c103f3ef15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=719f0d7a3580f3cc34ae2708… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 9 16:13:09 2018 +0330 d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d9_device_CreateDepthStencilSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0cf2049..8bfe012 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1489,7 +1489,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex * BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - DWORD flags = WINED3D_TEXTURE_CREATE_MAPPABLE; + DWORD flags = 0; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" "discard %#x, surface %p, shared_handle %p.\n",

1 0

Dmitry Timoshkov : server: Track separately implicit and explicit file disposition.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: ee020079671fa88b4aceb9277448b2d79ce65798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee020079671fa88b4aceb927… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 9 14:01:12 2018 +0300 server: Track separately implicit and explicit file disposition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/fd.c b/server/fd.c index 246b758..f2d83b4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -166,7 +166,7 @@ struct closed_fd { struct list entry; /* entry in inode closed list */ int unix_fd; /* the unix file descriptor */ - int unlink; /* whether to unlink on close */ + int unlink; /* whether to unlink on close: -1 - implicit FILE_DELETE_ON_CLOSE, 1 - explicit disposition */ char *unix_name; /* name to unlink on close, points to parent fd unix_name */ }; @@ -1869,7 +1869,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, goto error; } - fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; + fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) ? -1 : 0; if (flags & O_TRUNC) { if (S_ISDIR(st.st_mode)) @@ -2314,7 +2314,9 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - fd->closed->unlink = unlink || (fd->options & FILE_DELETE_ON_CLOSE); + fd->closed->unlink = unlink ? 1 : 0; + if (fd->options & FILE_DELETE_ON_CLOSE) + fd->closed->unlink = -1; } /* set new name for the fd */

1 0

Henri Verbeet : d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in cubetexture_init().
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 4ef181df6de4e07f935eeff3acc040680651d3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef181df6de4e07f935eeff3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 9 16:13:08 2018 +0330 d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in cubetexture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 2c4287f..4855985 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1405,9 +1405,6 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.depth = 1; desc.size = 0; - if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) - flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; - if (is_gdi_compat_wined3dformat(desc.format)) flags |= WINED3D_TEXTURE_CREATE_GET_DC;

1 0

Henri Verbeet : d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in texture_init().
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: ee4c5bb3e3438ad6df5c33527b3bc6943a38d3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee4c5bb3e3438ad6df5c3352… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 9 16:13:07 2018 +0330 d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 5cb0b39..2c4287f 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1321,9 +1321,6 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.depth = 1; desc.size = 0; - if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) - flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; - if (is_gdi_compat_wined3dformat(desc.format)) flags |= WINED3D_TEXTURE_CREATE_GET_DC;

1 0

Dmitry Timoshkov : server: Allow setting delete disposition on a read-only directory.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 1affd75fcb20d6dac90add4d44c431441e139a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1affd75fcb20d6dac90add4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 9 14:01:00 2018 +0300 server: Allow setting delete disposition on a read-only directory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index fa174f5..246b758 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2307,8 +2307,8 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - /* can't unlink files we don't have permission to access */ - if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + /* can't unlink files we don't have permission to write */ + if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && !S_ISDIR(st.st_mode)) { set_error( STATUS_CANNOT_DELETE ); return;

1 0

Henri Verbeet : d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d9_device_CreateDepthStencilSurfaceEx ().
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: d7bb33becd9412ed9db618dc2fa313e3275a31ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7bb33becd9412ed9db618dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 9 16:13:10 2018 +0330 d3d9: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d9_device_CreateDepthStencilSurfaceEx(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8bfe012..dd40dda 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3878,7 +3878,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - DWORD flags = WINED3D_TEXTURE_CREATE_MAPPABLE; + DWORD flags = 0; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " "discard %#x, surface %p, shared_handle %p, usage %#x.\n",

1 0

Jacek Caban : widl: Make MIDL_DEFINE_GUID more compatible with midl.
by Alexandre Julliard 09 Nov '18

09 Nov '18

Module: wine Branch: master Commit: 2ffd106b9b7feaeedde56e8859fe925b7f43f63a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ffd106b9b7feaeedde56e88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 13:55:30 2018 +0100 widl: Make MIDL_DEFINE_GUID more compatible with midl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 96fb240..3baebd0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -523,10 +523,15 @@ void write_id_data(const statement_list_t *stmts) fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); fprintf(idfile, " DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)\n\n"); + fprintf(idfile, "#elif defined(__cplusplus)\n\n"); + + fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); + fprintf(idfile, " EXTERN_C const type DECLSPEC_SELECTANY name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n"); + fprintf(idfile, "#else\n\n"); fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); - fprintf(idfile, " const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n"); + fprintf(idfile, " const type DECLSPEC_SELECTANY name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n"); fprintf(idfile, "#endif\n\n"); start_cplusplus_guard(idfile);

1 0