July 2006 - Wine-commits - list.winehq.org

Dan Hipschman : widl: Fix " static declaration follows non-static declaration" in generated code.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: cf4c08dcbc34ee1a9cbc68bcbf9b30da5eb09e69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf4c08dcbc34ee1a9cbc68b… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jul 28 18:08:13 2006 -0700 widl: Fix "static declaration follows non-static declaration" in generated code. --- tools/widl/proxy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 6449bad..1710cdc 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -110,8 +110,8 @@ static void write_formatstringsdecl(void write_formatdesc( "TYPE" ); write_formatdesc( "PROC" ); fprintf(proxy, "\n"); - print_proxy( "extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); - print_proxy( "extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); + print_proxy( "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); + print_proxy( "static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); print_proxy( "\n"); }

1 0

Mike McCormack : msi: Change an ERR to a WARN.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: d39cf962ac4df62267a899216a0674cca98d4cc6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d39cf962ac4df62267a8992… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Jul 29 17:12:58 2006 +0900 msi: Change an ERR to a WARN. --- dlls/msi/files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index ba36a0d..92f4185 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -218,7 +218,7 @@ static INT_PTR cabinet_notify(FDINOTIFIC if (!f) { - ERR("Unknown File in Cabinet (%s)\n",debugstr_a(pfdin->psz1)); + WARN("unknown file in cabinet (%s)\n",debugstr_a(pfdin->psz1)); return 0; }

1 0

Dan Hipschman : widl: Check if a typeinfo is already in a typelib before adding it.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: c650cceae32849ea974328a94753cd2cef94a9c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c650cceae32849ea974328a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jul 28 13:44:21 2006 -0700 widl: Check if a typeinfo is already in a typelib before adding it. --- tools/widl/write_msft.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index d2a49e9..f2800d8 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1901,6 +1901,9 @@ static void add_dispinterface_typeinfo(m var_t *var; msft_typeinfo_t *msft_typeinfo; + if (-1 < dispinterface->typelib_idx) + return; + dispinterface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_DISPATCH, dispinterface->name, dispinterface->attrs, typelib->typelib_header.nrtypeinfos); @@ -1950,6 +1953,9 @@ static void add_interface_typeinfo(msft_ const attr_t *attr; const type_t *derived; + if (-1 < interface->typelib_idx) + return; + for(attr = interface->attrs; attr; attr = NEXT_LINK(attr)) if(attr->type == ATTR_DISPINTERFACE) return add_dispinterface_typeinfo(typelib, interface); @@ -2012,6 +2018,9 @@ static void add_structure_typeinfo(msft_ var_t *cur = structure->fields; msft_typeinfo_t *msft_typeinfo; + if (-1 < structure->typelib_idx) + return; + structure->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_RECORD, structure->name, structure->attrs, typelib->typelib_header.nrtypeinfos); @@ -2050,6 +2059,9 @@ static void add_typedef_typeinfo(msft_ty int alignment; const attr_t *attrs; + if (-1 < tdef->type->typelib_idx) + return; + tdef->type->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->type->attrs, typelib->typelib_header.nrtypeinfos); @@ -2070,6 +2082,9 @@ static void add_coclass_typeinfo(msft_ty int have_default = 0, have_default_source = 0; const attr_t *attr; + if (-1 < cls->typelib_idx) + return; + cls->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_COCLASS, cls->name, cls->attrs, typelib->typelib_header.nrtypeinfos); @@ -2148,6 +2163,9 @@ static void add_module_typeinfo(msft_typ func_t *func; msft_typeinfo_t *msft_typeinfo; + if (-1 < module->typelib_idx) + return; + module->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_MODULE, module->name, module->attrs, typelib->typelib_header.nrtypeinfos);

1 0

Dan Hipschman : widl: Register types for coclasses.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 9265d775849b0181fb3cd7efe244082128ca82a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9265d775849b0181fb3cd7e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jul 28 13:44:59 2006 -0700 widl: Register types for coclasses. --- tools/widl/parser.y | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 2755597..a4efb66 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -242,8 +242,14 @@ input: gbl_statements gbl_statements: { $$ = NULL; } | gbl_statements interfacedec { $$ = $1; } | gbl_statements interfacedef { $$ = make_ifref($2); LINK($$, $1); } - | gbl_statements coclass ';' { $$ = $1; if (!parse_only && do_header) write_coclass_forward($2); } - | gbl_statements coclassdef { $$ = $1; add_coclass($2); } + | gbl_statements coclass ';' { $$ = $1; + reg_type($2, $2->name, 0); + if (!parse_only && do_header) write_coclass_forward($2); + } + | gbl_statements coclassdef { $$ = $1; + add_coclass($2); + reg_type($2, $2->name, 0); + } | gbl_statements moduledef { $$ = $1; add_module($2); } | gbl_statements librarydef { $$ = $1; } | gbl_statements statement { $$ = $1; } @@ -252,8 +258,10 @@ gbl_statements: { $$ = NULL; } imp_statements: {} | imp_statements interfacedec { if (!parse_only) add_interface($2); } | imp_statements interfacedef { if (!parse_only) add_interface($2); } - | imp_statements coclass ';' { reg_type(NULL, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } - | imp_statements coclassdef { if (!parse_only) add_coclass($2); } + | imp_statements coclass ';' { reg_type($2, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } + | imp_statements coclassdef { if (!parse_only) add_coclass($2); + reg_type($2, $2->name, 0); + } | imp_statements moduledef { if (!parse_only) add_module($2); } | imp_statements statement {} | imp_statements importlib {} @@ -628,7 +636,9 @@ int_std: tINT { $$ = make_type(RPC_ ; coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } - | tCOCLASS aKNOWNTYPE { $$ = make_class($2); } + | tCOCLASS aKNOWNTYPE { $$ = find_type($2, 0); + if ($$->defined) yyerror("multiple definition error"); + } ; coclasshdr: attributes coclass { $$ = $2;

1 0

Dan Hipschman : widl: Encode coclass types in typelibs.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 678ce9875f8e13c559caf457bccab6811a1cf082 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=678ce9875f8e13c559caf45… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jul 28 13:45:33 2006 -0700 widl: Encode coclass types in typelibs. --- tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 4 +++- tools/widl/write_msft.c | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a4efb66..b8e1c39 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -638,6 +638,7 @@ int_std: tINT { $$ = make_type(RPC_ coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } | tCOCLASS aKNOWNTYPE { $$ = find_type($2, 0); if ($$->defined) yyerror("multiple definition error"); + if ($$->kind != TKIND_COCLASS) yyerror("%s was not declared a coclass", $2); } ; @@ -1060,6 +1061,7 @@ static type_t *make_type(unsigned char t { type_t *t = xmalloc(sizeof(type_t)); t->name = NULL; + t->kind = TKIND_PRIMITIVE; t->type = type; t->ref = ref; t->attrs = NULL; @@ -1153,6 +1155,7 @@ static type_t *make_class(char *name) { type_t *c = make_type(0, NULL); c->name = name; + c->kind = TKIND_COCLASS; INIT_LINK(c); return c; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 84a2fc2..7bf2229 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -160,7 +160,8 @@ enum expr_type enum type_kind { - TKIND_ENUM = 0, + TKIND_PRIMITIVE = -1, + TKIND_ENUM, TKIND_RECORD, TKIND_MODULE, TKIND_INTERFACE, @@ -199,6 +200,7 @@ struct _expr_t { struct _type_t { const char *name; + enum type_kind kind; unsigned char type; struct _type_t *ref; const attr_t *attrs; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f2800d8..8148a93 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -740,6 +740,7 @@ static importinfo_t *find_importinfo(msf static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure); static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface); static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration); +static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls); /**************************************************************************** @@ -973,7 +974,11 @@ #endif add_enum_typeinfo(typelib, type); break; case 0: - error("encode_type: VT_USERDEFINED - can't yet add typedef's on the fly\n"); + if (type->kind == TKIND_COCLASS) + add_coclass_typeinfo(typelib, type); + else + error("encode_type: VT_USERDEFINED - can't yet add typedef's on the fly\n"); + break; default: error("encode_type: VT_USERDEFINED - unhandled type %d\n", type->type); }

1 0

Thomas Kho : Maketest.rules.in: Fix comment.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 1afed1f8d8aaa46ec74e8f5cfa0b3c281ab92687 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1afed1f8d8aaa46ec74e8f5… Author: Thomas Kho <tkho(a)ucla.edu> Date: Fri Jul 28 13:53:52 2006 -0500 Maketest.rules.in: Fix comment. --- dlls/Maketest.rules.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 0250b66..732ca0a 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -1,7 +1,7 @@ # Global rules for building dll unit tests -*-Makefile-*- # # Each individual makefile should define the following variables: -# DLLTEST : the dll to test +# TESTDLL : the dll to test # CTESTS : list of C test programs # EXTRALIBS : extra libraries to link in (optional) # EXTRADEFS : extra symbol definitions, like -DWINELIB (optional)

1 0

Dan Hipschman : widl: Fold class_t into type_t.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: c67b19b4f4bd463eedfbd4de77b846f9efb8a040 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c67b19b4f4bd463eedfbd4d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jul 28 13:43:00 2006 -0700 widl: Fold class_t into type_t. --- tools/widl/header.c | 6 +++--- tools/widl/header.h | 4 ++-- tools/widl/parser.y | 12 +++++------- tools/widl/typelib.c | 2 +- tools/widl/typelib.h | 2 +- tools/widl/widltypes.h | 17 ++++------------- tools/widl/write_msft.c | 2 +- 7 files changed, 17 insertions(+), 28 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 4cd599b..c807691 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -855,7 +855,7 @@ static void write_dispiface_guid(const t write_guid("DIID", iface->name, uuid); } -static void write_coclass_guid(class_t *cocl) +static void write_coclass_guid(type_t *cocl) { const UUID *uuid = get_attrp(cocl->attrs, ATTR_UUID); write_guid("CLSID", cocl->name, uuid); @@ -1006,7 +1006,7 @@ void write_dispinterface(type_t *iface) fprintf(header,"#endif /* __%s_DISPINTERFACE_DEFINED__ */\n\n", iface->name); } -void write_coclass(class_t *cocl) +void write_coclass(type_t *cocl) { fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s coclass\n", cocl->name); @@ -1015,7 +1015,7 @@ void write_coclass(class_t *cocl) fprintf(header, "\n"); } -void write_coclass_forward(class_t *cocl) +void write_coclass_forward(type_t *cocl) { fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", cocl->name); fprintf(header, "#define __%s_FWD_DEFINED__\n", cocl->name); diff --git a/tools/widl/header.h b/tools/widl/header.h index b0aa82e..5863f3b 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -36,8 +36,8 @@ extern void write_array(FILE *h, const e extern void write_forward(type_t *iface); extern void write_interface(type_t *iface); extern void write_dispinterface(type_t *iface); -extern void write_coclass(class_t *iface); -extern void write_coclass_forward(class_t *iface); +extern void write_coclass(type_t *cocl); +extern void write_coclass_forward(type_t *cocl); extern void write_typedef(type_t *type, const var_t *names); extern void write_expr(FILE *h, const expr_t *e, int brackets); extern void write_constdef(const var_t *v); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1790985..2755597 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -82,7 +82,7 @@ static void set_type(var_t *v, typeref_t static ifref_t *make_ifref(type_t *iface); static var_t *make_var(char *name); static func_t *make_func(var_t *def, var_t *args); -static class_t *make_class(char *name); +static type_t *make_class(char *name); static type_t *make_safearray(void); static type_t *reg_type(type_t *type, const char *name, int t); @@ -114,7 +114,6 @@ static type_t std_uhyper = { "MIDL_uhype var_t *var; func_t *func; ifref_t *ifref; - class_t *clas; char *str; UUID *uuid; unsigned int num; @@ -219,7 +218,7 @@ static type_t std_uhyper = { "MIDL_uhype %type <var> dispint_props %type <func> funcdef int_statements %type <func> dispint_meths -%type <clas> coclass coclasshdr coclassdef +%type <type> coclass coclasshdr coclassdef %type <num> pointer_type version %type <str> libraryhdr @@ -1056,6 +1055,7 @@ static type_t *make_type(unsigned char t t->attrs = NULL; t->funcs = NULL; t->fields = NULL; + t->ifaces = NULL; t->ignore = parse_only; t->is_const = FALSE; t->sign = 0; @@ -1139,12 +1139,10 @@ static func_t *make_func(var_t *def, var return f; } -static class_t *make_class(char *name) +static type_t *make_class(char *name) { - class_t *c = xmalloc(sizeof(class_t)); + type_t *c = make_type(0, NULL); c->name = name; - c->attrs = NULL; - c->ifaces = NULL; INIT_LINK(c); return c; } diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index be0d010..5ff101b 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -221,7 +221,7 @@ void add_interface(type_t *iface) typelib->entry = entry; } -void add_coclass(class_t *cls) +void add_coclass(type_t *cls) { typelib_entry_t *entry; diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h index 094105b..9fb5bdd 100644 --- a/tools/widl/typelib.h +++ b/tools/widl/typelib.h @@ -25,7 +25,7 @@ extern int in_typelib; extern void start_typelib(char *name, attr_t *attrs); extern void end_typelib(void); extern void add_interface(type_t *iface); -extern void add_coclass(class_t *cls); +extern void add_coclass(type_t *cls); extern void add_module(type_t *module); extern void add_struct(type_t *structure); extern void add_enum(type_t *enumeration); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 508284e..84a2fc2 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -40,7 +40,6 @@ typedef struct _typeref_t typeref_t; typedef struct _var_t var_t; typedef struct _func_t func_t; typedef struct _ifref_t ifref_t; -typedef struct _class_t class_t; typedef struct _typelib_entry_t typelib_entry_t; typedef struct _importlib_t importlib_t; typedef struct _importinfo_t importinfo_t; @@ -203,8 +202,9 @@ struct _type_t { unsigned char type; struct _type_t *ref; const attr_t *attrs; - func_t *funcs; - var_t *fields; + func_t *funcs; /* interfaces and modules */ + var_t *fields; /* interfaces, structures and enumerations */ + ifref_t *ifaces; /* coclasses */ int ignore, is_const, sign; int defined, written, user_types_registered; int typelib_idx; @@ -249,19 +249,10 @@ struct _ifref_t { DECL_LINK(ifref_t); }; -struct _class_t { - char *name; - attr_t *attrs; - ifref_t *ifaces; - - /* parser-internal */ - DECL_LINK(class_t); -}; - struct _typelib_entry_t { enum type_kind kind; union { - class_t *class; + type_t *class; type_t *interface; type_t *module; type_t *structure; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index bc28345..f712f4e 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2061,7 +2061,7 @@ static void add_typedef_typeinfo(msft_ty msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); } -static void add_coclass_typeinfo(msft_typelib_t *typelib, class_t *cls) +static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) { msft_typeinfo_t *msft_typeinfo; ifref_t *iref;

1 0

Dan Hipschman : widl: Set typelib_idx for coclasses when they' re added to a typelib.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 90cdff9b3fbe0380cf38effb714376b26041359f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90cdff9b3fbe0380cf38eff… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jul 28 13:43:43 2006 -0700 widl: Set typelib_idx for coclasses when they're added to a typelib. --- tools/widl/write_msft.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f712f4e..d2a49e9 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2070,6 +2070,7 @@ static void add_coclass_typeinfo(msft_ty int have_default = 0, have_default_source = 0; const attr_t *attr; + cls->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_COCLASS, cls->name, cls->attrs, typelib->typelib_header.nrtypeinfos);

1 0

Yuriy Kozlov : regedit: Allow entering - for a value in a . reg file to delete that value.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: 1e1031b41dca244eed79588f144f15da16149111 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e1031b41dca244eed79588… Author: Yuriy Kozlov <yuriy.kozlov(a)gmail.com> Date: Fri Jul 28 13:38:44 2006 -0400 regedit: Allow entering - for a value in a .reg file to delete that value. --- programs/regedit/regproc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0fe689a..ff871d8 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -392,6 +392,9 @@ HRESULT setValue(LPSTR val_name, LPSTR v if ( (val_name == NULL) || (val_data == NULL) ) return ERROR_INVALID_PARAMETER; + if (val_data[0] == '-') + return RegDeleteValue(currentKeyHandle,val_name); + /* Get the data type stored into the value field */ dwDataType = getDataType(&val_data, &dwParseType);

1 0

Robert Reif : advapi32: Move SID members from WELLKNOWNSID to MAX_SID.
by Alexandre Julliard 29 Jul '06

29 Jul '06

Module: wine Branch: refs/heads/master Commit: fd81146cd32d5fb900e7d96525630e42df9ccab3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd81146cd32d5fb900e7d96… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Jul 28 20:21:49 2006 -0400 advapi32: Move SID members from WELLKNOWNSID to MAX_SID. --- dlls/advapi32/security.c | 102 ++++++++++++++++++++++++---------------------- 1 files changed, 53 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=fd81146cd32d5fb900e…

1 0