February 2006 - Wine-commits

Robert Shearman : msi: Fix bison warnings by providing precedence rules for expressions
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: a911ea0fd76419c70131daca53eaf434d1ed3b26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a911ea0fd76419c70131dac… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 16:24:51 2006 +0100 msi: Fix bison warnings by providing precedence rules for expressions and by removing a redundant expression case. --- dlls/msi/sql.y | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 6669441..b0b4b2b 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -132,6 +132,14 @@ static struct expr * EXPR_wildcard( void %type <column_type> column_type data_type data_type_l data_count %type <integer> number +/* Reference: http://mates.ms.mff.cuni.cz/oracle/doc/ora815nt/server.815/a67779/operator.… */ +%left TK_OR +%left TK_AND +%left TK_NOT +%left TK_EQ TK_NE TK_LT TK_GT TK_LE TK_GE TK_ISNULL TK_LIKE TK_BETWEEN TK_IN +%left TK_PLUS TK_MINUS TK_CONCAT +%right TK_NEGATION + %% query: @@ -430,12 +438,6 @@ expr: if( !$$ ) YYABORT; } - | column_val TK_EQ column_val - { - $$ = EXPR_complex( info, $1, OP_EQ, $3 ); - if( !$$ ) - YYABORT; - } | expr TK_AND expr { $$ = EXPR_complex( info, $1, OP_AND, $3 ); @@ -545,7 +547,7 @@ const_val: if( !$$ ) YYABORT; } - | TK_MINUS number + | TK_MINUS number %prec TK_NEGATION { $$ = EXPR_ival( info, -$2 ); if( !$$ )

1 0

Robert Shearman : rpcrt4: Don' t call IUnknown_AddRef if there is no outer unknown in
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: b7bf68f4d00d8e1c6239ad6ef5ce5244bfe4a29e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7bf68f4d00d8e1c6239ad6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 16:24:33 2006 +0100 rpcrt4: Don't call IUnknown_AddRef if there is no outer unknown in StdProxy_Construct as it will just crash anyway. --- dlls/rpcrt4/cproxy.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 21f23f3..f045e0c 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -188,7 +188,11 @@ HRESULT WINAPI StdProxy_Construct(REFIID This->pChannel = NULL; *ppProxy = (LPRPCPROXYBUFFER)&This->lpVtbl; *ppvObj = &This->PVtbl; - IUnknown_AddRef((IUnknown *)*ppvObj); + /* if there is no outer unknown then the caller will control the lifetime + * of the proxy object through the proxy buffer, so no need to increment the + * ref count of the proxy object */ + if (pUnkOuter) + IUnknown_AddRef((IUnknown *)*ppvObj); IPSFactoryBuffer_AddRef(pPSFactory); return S_OK;

1 0

James Hawkins : setupapi: Add an initial implementation of SetupGetInfInformation.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 21fb7ab6a13fea3b5ff73d92cb1ba779ed985562 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21fb7ab6a13fea3b5ff73d9… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 7 16:24:17 2006 +0100 setupapi: Add an initial implementation of SetupGetInfInformation. --- dlls/setupapi/query.c | 93 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 24 ----------- dlls/setupapi/tests/query.c | 53 ++++++++++--------------- 3 files changed, 115 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=21fb7ab6a13fea3b5ff…

1 0

James Hawkins : setupapi: Implement SetupQueryInfFileInformation.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 647329d2dda7e1684af3ace6e00921231db60604 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=647329d2dda7e1684af3ace… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 7 16:08:33 2006 +0100 setupapi: Implement SetupQueryInfFileInformation. --- dlls/setupapi/Makefile.in | 1 dlls/setupapi/query.c | 118 +++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 24 --------- 3 files changed, 119 insertions(+), 24 deletions(-) create mode 100644 dlls/setupapi/query.c diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index fb36bd1..9ee9a90 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ install.c \ misc.c \ parser.c \ + query.c \ queue.c \ setupcab.c \ stringtable.c \ diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c new file mode 100644 index 0000000..9a48a4b --- /dev/null +++ b/dlls/setupapi/query.c @@ -0,0 +1,118 @@ +/* + * setupapi query functions + * + * Copyright 2006 James Hawkins + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winver.h" +#include "setupapi.h" +#include "advpub.h" +#include "winnls.h" +#include "wine/debug.h" +#include "setupapi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(setupapi); + +/*********************************************************************** + * SetupQueryInfFileInformationA (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION InfInformation, + UINT InfIndex, PSTR ReturnBuffer, + DWORD ReturnBufferSize, PDWORD RequiredSize) +{ + LPWSTR filenameW; + DWORD size; + BOOL ret; + + ret = SetupQueryInfFileInformationW(InfInformation, InfIndex, NULL, 0, &size); + if (!ret) + return FALSE; + + filenameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + + ret = SetupQueryInfFileInformationW(InfInformation, InfIndex, + filenameW, size, &size); + if (!ret) + { + HeapFree(GetProcessHeap(), 0, filenameW); + return FALSE; + } + + if (RequiredSize) + *RequiredSize = size; + + if (!ReturnBuffer) + return TRUE; + + if (size > ReturnBufferSize) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + WideCharToMultiByte(CP_ACP, 0, filenameW, -1, ReturnBuffer, size, NULL, NULL); + HeapFree(GetProcessHeap(), 0, filenameW); + + return ret; +} + +/*********************************************************************** + * SetupQueryInfFileInformationW (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation, + UINT InfIndex, PWSTR ReturnBuffer, + DWORD ReturnBufferSize, PDWORD RequiredSize) +{ + DWORD len; + LPWSTR ptr; + + TRACE("(%p, %u, %p, %ld, %p) Stub!\n", InfInformation, InfIndex, + ReturnBuffer, ReturnBufferSize, RequiredSize); + + if (!InfInformation) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (InfIndex != 0) + FIXME("Appended INF files are not handled\n"); + + ptr = (LPWSTR)&InfInformation->VersionData[0]; + len = lstrlenW(ptr); + + if (RequiredSize) + *RequiredSize = len + 1; + + if (!ReturnBuffer) + return TRUE; + + if (ReturnBufferSize < len) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + lstrcpyW(ReturnBuffer, ptr); + return TRUE; +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 59adb78..1909454 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -175,30 +175,6 @@ BOOL WINAPI SetupGetInfInformationW( LPC } /*********************************************************************** - * SetupQueryInfFileInformationA (SETUPAPI.@) - */ -BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION InfInformation, - UINT InfIndex, PSTR ReturnBuffer, - DWORD ReturnBufferSize, PDWORD RequiredSize) -{ - FIXME("(%p, %u, %p, %ld, %p) Stub!\n", - InfInformation, InfIndex, ReturnBuffer, ReturnBufferSize, RequiredSize ); - return TRUE; -} - -/*********************************************************************** - * SetupQueryInfFileInformationW (SETUPAPI.@) - */ -BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation, - UINT InfIndex, PWSTR ReturnBuffer, - DWORD ReturnBufferSize, PDWORD RequiredSize) -{ - FIXME("(%p, %u, %p, %ld, %p) Stub!\n", - InfInformation, InfIndex, ReturnBuffer, ReturnBufferSize, RequiredSize ); - return TRUE; -} - -/*********************************************************************** * SetupInitializeFileLogW(SETUPAPI.@) */ HANDLE WINAPI SetupInitializeFileLogW(LPWSTR LogFileName, DWORD Flags)

1 0

Alexandre Julliard : setupapi: Store the full name to the INF file in the inf_file structure
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 6cb7ca4177725158984cfe8d998df1601047697c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6cb7ca4177725158984cfe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 7 16:08:19 2006 +0100 setupapi: Store the full name to the INF file in the inf_file structure (based on a patch by James Hawkins). --- dlls/setupapi/dirid.c | 3 +- dlls/setupapi/parser.c | 63 ++++++++++++++++++++++++++++---------- dlls/setupapi/queue.c | 7 +--- dlls/setupapi/setupapi_private.h | 5 ++- 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index 639da02..60db095 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -165,7 +165,7 @@ static const WCHAR *get_csidl_dir( DWORD } /* retrieve the string corresponding to a dirid, or NULL if none */ -const WCHAR *DIRID_get_string( HINF hinf, int dirid ) +const WCHAR *DIRID_get_string( int dirid ) { int i; @@ -188,7 +188,6 @@ const WCHAR *DIRID_get_string( HINF hinf else { if (dirid > MAX_SYSTEM_DIRID) return get_unknown_dirid(); - if (dirid == DIRID_SRCPATH) return PARSER_get_src_root( hinf ); if (!system_dirids[dirid]) system_dirids[dirid] = create_system_dirid( dirid ); return system_dirids[dirid]; } diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 28a5936..e6587c7 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -83,7 +83,7 @@ struct inf_file unsigned int alloc_fields; struct field *fields; int strings_section; /* index of [Strings] section or -1 if none */ - WCHAR *src_root; /* source root directory */ + WCHAR *filename; /* filename of the INF */ }; /* parser definitions */ @@ -174,6 +174,15 @@ static void *grow_array( void *array, un } +/* get the directory of the inf file (as counted string, not null-terminated) */ +static const WCHAR *get_inf_dir( struct inf_file *file, unsigned int *len ) +{ + const WCHAR *p = strrchrW( file->filename, '\\' ); + *len = p ? (p + 1 - file->filename) : 0; + return file->filename; +} + + /* find a section by name */ static int find_section( struct inf_file *file, const WCHAR *name ) { @@ -294,10 +303,12 @@ static struct field *add_field( struct i /* retrieve the string substitution for a directory id */ -static const WCHAR *get_dirid_subst( int dirid, unsigned int *len ) +static const WCHAR *get_dirid_subst( struct inf_file *file, int dirid, unsigned int *len ) { - extern const WCHAR *DIRID_get_string( HINF hinf, int dirid ); - const WCHAR *ret = DIRID_get_string( 0, dirid ); + const WCHAR *ret; + + if (dirid == DIRID_SRCPATH) return get_inf_dir( file, len ); + ret = DIRID_get_string( dirid ); if (ret) *len = strlenW(ret); return ret; } @@ -341,7 +352,7 @@ static const WCHAR *get_string_subst( st memcpy( dirid_str, str, *len * sizeof(WCHAR) ); dirid_str[*len] = 0; dirid = strtolW( dirid_str, &end, 10 ); - if (!*end) ret = get_dirid_subst( dirid, len ); + if (!*end) ret = get_dirid_subst( file, dirid, len ); HeapFree( GetProcessHeap(), 0, dirid_str ); return ret; } @@ -989,14 +1000,33 @@ static struct inf_file *parse_file( HAND /*********************************************************************** + * PARSER_get_inf_filename + * + * Retrieve the filename of an inf file. + */ +const WCHAR *PARSER_get_inf_filename( HINF hinf ) +{ + struct inf_file *file = hinf; + return file->filename; +} + + +/*********************************************************************** * PARSER_get_src_root * * Retrieve the source directory of an inf file. */ -const WCHAR *PARSER_get_src_root( HINF hinf ) +WCHAR *PARSER_get_src_root( HINF hinf ) { - struct inf_file *file = hinf; - return file->src_root; + unsigned int len; + const WCHAR *dir = get_inf_dir( hinf, &len ); + WCHAR *ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); + if (ret) + { + memcpy( ret, dir, len * sizeof(WCHAR) ); + ret[len] = 0; + } + return ret; } @@ -1011,15 +1041,15 @@ WCHAR *PARSER_get_dest_dir( INFCONTEXT * const WCHAR *dir; WCHAR *ptr, *ret; INT dirid; - DWORD len1, len2; + unsigned int len1; + DWORD len2; if (!SetupGetIntField( context, 1, &dirid )) return NULL; - if (!(dir = DIRID_get_string( context->Inf, dirid ))) return NULL; - len1 = strlenW(dir) + 1; + if (!(dir = get_dirid_subst( context->Inf, dirid, &len1 ))) return NULL; if (!SetupGetStringFieldW( context, 2, NULL, 0, &len2 )) len2 = 0; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len1+len2) * sizeof(WCHAR) ))) return NULL; - strcpyW( ret, dir ); - ptr = ret + strlenW(ret); + if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len1+len2+1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, dir, len1 * sizeof(WCHAR) ); + ptr = ret + len1; if (len2 && ptr > ret && ptr[-1] != '\\') *ptr++ = '\\'; if (!SetupGetStringFieldW( context, 2, ptr, len2, NULL )) *ptr = 0; return ret; @@ -1106,8 +1136,7 @@ HINF WINAPI SetupOpenInfFileW( PCWSTR na return (HINF)INVALID_HANDLE_VALUE; } TRACE( "%s -> %p\n", debugstr_w(path), file ); - file->src_root = path; - if ((p = strrchrW( path, '\\' ))) p[1] = 0; /* remove file name */ + file->filename = path; SetLastError( 0 ); return (HINF)file; } @@ -1185,7 +1214,7 @@ void WINAPI SetupCloseInfFile( HINF hinf unsigned int i; for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] ); - HeapFree( GetProcessHeap(), 0, file->src_root ); + HeapFree( GetProcessHeap(), 0, file->filename ); HeapFree( GetProcessHeap(), 0, file->sections ); HeapFree( GetProcessHeap(), 0, file->fields ); HeapFree( GetProcessHeap(), 0, file->strings ); diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 390fd04..c06a948 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -296,12 +296,9 @@ static void get_src_file_info( HINF hinf /* find the SourceDisksFiles entry */ if (!SetupFindFirstLineW( hinf, SourceDisksFiles, op->src_file, &file_ctx )) { - const WCHAR *dir; - if ((op->style & (SP_COPY_SOURCE_ABSOLUTE|SP_COPY_SOURCEPATH_ABSOLUTE))) return; /* no specific info, use .inf file source directory */ - if (!op->src_root && (dir = DIRID_get_string( hinf, DIRID_SRCPATH ))) - op->src_root = strdupW( dir ); + if (!op->src_root) op->src_root = PARSER_get_src_root( hinf ); return; } if (!SetupGetIntField( &file_ctx, 1, &diskid )) return; @@ -351,7 +348,7 @@ static void get_src_file_info( HINF hinf if (!SetupGetStringFieldW( &disk_ctx, 4, ptr, len2, NULL )) *ptr = 0; } } - if (!op->src_root) op->src_root = strdupW( PARSER_get_src_root(hinf) ); + if (!op->src_root) op->src_root = PARSER_get_src_root(hinf); } diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 80d1f55..87ee8ab 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -32,12 +32,13 @@ /* string substitutions */ struct inf_file; -extern const WCHAR *DIRID_get_string( HINF hinf, int dirid ); +extern const WCHAR *DIRID_get_string( int dirid ); extern unsigned int PARSER_string_substA( struct inf_file *file, const WCHAR *text, char *buffer, unsigned int size ); extern unsigned int PARSER_string_substW( struct inf_file *file, const WCHAR *text, WCHAR *buffer, unsigned int size ); -extern const WCHAR *PARSER_get_src_root( HINF hinf ); +extern const WCHAR *PARSER_get_inf_filename( HINF hinf ); +extern WCHAR *PARSER_get_src_root( HINF hinf ); extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ); /* support for Ascii queue callback functions */

1 0

Alexandre Julliard : widl: Remove '\n' from yyerror calls.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 91da64c9ca12175678be42f24a048c6fb2cef697 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91da64c9ca12175678be42f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 7 12:36:20 2006 +0100 widl: Remove '\n' from yyerror calls. --- tools/widl/parser.y | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5b24eef..d6f0f6b 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -503,7 +503,7 @@ expr_list_const: expr_const expr_const: expr { $$ = $1; if (!$$->is_const) - yyerror("expression is not constant\n"); + yyerror("expression is not constant"); } ; @@ -533,7 +533,7 @@ funcdef: $4->attrs = $1; $$ = make_func($4, $6); if (is_attr($4->attrs, ATTR_IN)) { - yyerror("Inapplicable attribute"); + yyerror("inapplicable attribute [in] for function '%s'",$$->def->name); } } ; @@ -625,12 +625,12 @@ dispinterface: tDISPINTERFACE aIDENTIFIE dispinterfacehdr: attributes dispinterface { attr_t *attrs; $$ = $2; - if ($$->defined) yyerror("multiple definition error\n"); + if ($$->defined) yyerror("multiple definition error"); attrs = make_attr(ATTR_DISPINTERFACE); LINK(attrs, $1); $$->attrs = attrs; $$->ref = find_type("IDispatch", 0); - if (!$$->ref) yyerror("IDispatch is undefined\n"); + if (!$$->ref) yyerror("IDispatch is undefined"); $$->defined = TRUE; if (!parse_only && do_header) write_forward($$); } @@ -668,7 +668,7 @@ interface: tINTERFACE aIDENTIFIER { $$ ; interfacehdr: attributes interface { $$ = $2; - if ($$->defined) yyerror("multiple definition error\n"); + if ($$->defined) yyerror("multiple definition error"); $$->attrs = $1; $$->defined = TRUE; if (!parse_only && do_header) write_forward($$); @@ -686,7 +686,7 @@ interfacedef: interfacehdr inherit | interfacehdr ':' aIDENTIFIER '{' import int_statements '}' { $$ = $1; $$->ref = find_type2($3, 0); - if (!$$->ref) yyerror("base class %s not found in import\n", $3); + if (!$$->ref) yyerror("base class '%s' not found in import", $3); $$->funcs = $6; if (!parse_only && do_header) write_interface($$); } @@ -1144,7 +1144,7 @@ static type_t *reg_type(type_t *type, co struct rtype *nt; int hash; if (!name) { - yyerror("registering named type without name\n"); + yyerror("registering named type without name"); return type; } hash = hash_ident(name); @@ -1215,7 +1215,7 @@ static type_t *find_type(const char *nam while (cur && (cur->t != t || strcmp(cur->name, name))) cur = cur->next; if (!cur) { - yyerror("type %s not found\n", name); + yyerror("type '%s' not found", name); return NULL; } return cur->type; @@ -1299,7 +1299,7 @@ static int get_struct_type(var_t *field) { has_conformance = 1; if (PREV_LINK(field)) - yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + yyerror("field '%s' deriving from a conformant array must be the last field in the structure", field->name); } if (is_attr(field->attrs, ATTR_LENGTHIS)) @@ -1341,7 +1341,7 @@ static int get_struct_type(var_t *field) case RPC_FC_CARRAY: has_conformance = 1; if (PREV_LINK(field)) - yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + yyerror("field '%s' deriving from a conformant array must be the last field in the structure", field->name); break; case RPC_FC_C_CSTRING: @@ -1363,7 +1363,7 @@ static int get_struct_type(var_t *field) case RPC_FC_CPSTRUCT: has_conformance = 1; if (PREV_LINK(field)) - yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + yyerror("field '%s' deriving from a conformant array must be the last field in the structure", field->name); has_pointer = 1; break; @@ -1371,7 +1371,7 @@ static int get_struct_type(var_t *field) case RPC_FC_CSTRUCT: has_conformance = 1; if (PREV_LINK(field)) - yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + yyerror("field '%s' deriving from a conformant array must be the last field in the structure", field->name); break; @@ -1423,7 +1423,7 @@ static var_t *reg_const(var_t *var) struct rconst *nc; int hash; if (!var->name) { - yyerror("registering constant without name\n"); + yyerror("registering constant without name"); return var; } hash = hash_ident(var->name); @@ -1441,7 +1441,7 @@ static var_t *find_const(char *name, int while (cur && strcmp(cur->name, name)) cur = cur->next; if (!cur) { - if (f) yyerror("constant %s not found\n", name); + if (f) yyerror("constant '%s' not found", name); return NULL; } return cur->var;

1 0

Robert Shearman : widl: Make 'attrs' field of type_t const.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 4e406750329242c6bdce86a2c2e431aa2a5a6b88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e406750329242c6bdce86a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:32:57 2006 +0100 widl: Make 'attrs' field of type_t const. --- tools/widl/header.c | 8 ++++---- tools/widl/header.h | 8 ++++---- tools/widl/parser.y | 9 +++++---- tools/widl/widltypes.h | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 925301d..7f26233 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -490,7 +490,7 @@ void write_externdef(const var_t *v) fprintf(header, ";\n\n"); } -void write_library(const char *name, attr_t *attr) { +void write_library(const char *name, const attr_t *attr) { const UUID *uuid = get_attrp(attr, ATTR_UUID); fprintf(header, "\n"); write_guid("LIBID", name, uuid); @@ -521,7 +521,7 @@ const var_t* get_explicit_handle_var(con /********** INTERFACES **********/ -int is_object(attr_t *a) +int is_object(const attr_t *a) { while (a) { if (a->type == ATTR_OBJECT || a->type == ATTR_ODL) return 1; @@ -530,12 +530,12 @@ int is_object(attr_t *a) return 0; } -int is_local(attr_t *a) +int is_local(const attr_t *a) { return is_attr(a, ATTR_LOCAL); } -const var_t *is_callas(attr_t *a) +const var_t *is_callas(const attr_t *a) { return get_attrp(a, ATTR_CALLAS); } diff --git a/tools/widl/header.h b/tools/widl/header.h index 63c732f..e905ae4 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -28,9 +28,9 @@ extern int is_void(const type_t *t, cons extern void write_name(FILE *h, const var_t *v); extern const char* get_name(const var_t *v); extern void write_type(FILE *h, type_t *t, const var_t *v, const char *n); -extern int is_object(attr_t *a); -extern int is_local(attr_t *a); -extern const var_t *is_callas(attr_t *a); +extern int is_object(const attr_t *a); +extern int is_local(const attr_t *a); +extern const var_t *is_callas(const attr_t *a); extern void write_args(FILE *h, var_t *arg, const char *name, int obj, int do_indent); extern void write_array(FILE *h, const expr_t *v, int field); extern void write_forward(type_t *iface); @@ -41,7 +41,7 @@ extern void write_typedef(type_t *type, extern void write_expr(FILE *h, const expr_t *e, int brackets); extern void write_constdef(const var_t *v); extern void write_externdef(const var_t *v); -extern void write_library(const char *name, attr_t *attr); +extern void write_library(const char *name, const attr_t *attr); extern void write_user_types(void); extern const var_t* get_explicit_handle_var(const func_t* func); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ca890f4..5b24eef 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -623,11 +623,12 @@ dispinterface: tDISPINTERFACE aIDENTIFIE | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(0, $2, 0); } ; -dispinterfacehdr: attributes dispinterface { $$ = $2; +dispinterfacehdr: attributes dispinterface { attr_t *attrs; + $$ = $2; if ($$->defined) yyerror("multiple definition error\n"); - $$->attrs = $1; - $$->attrs = make_attr(ATTR_DISPINTERFACE); - LINK($$->attrs, $1); + attrs = make_attr(ATTR_DISPINTERFACE); + LINK(attrs, $1); + $$->attrs = attrs; $$->ref = find_type("IDispatch", 0); if (!$$->ref) yyerror("IDispatch is undefined\n"); $$->defined = TRUE; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index c578da7..6af89ad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -183,7 +183,7 @@ struct _type_t { char *name; unsigned char type; struct _type_t *ref; - attr_t *attrs; + const attr_t *attrs; func_t *funcs; var_t *fields; int ignore, is_const, sign;

1 0

Robert Shearman : widl: Remove unused 'rname' field of type_t.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: e9ec85a01ac23267c1463a74997ff64c47fb96ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9ec85a01ac23267c1463a7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:32:42 2006 +0100 widl: Remove unused 'rname' field of type_t. --- tools/widl/parser.y | 1 - tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 2 +- 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 499f0f4..ca890f4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1016,7 +1016,6 @@ static type_t *make_type(unsigned char t t->name = NULL; t->type = type; t->ref = ref; - t->rname = NULL; t->attrs = NULL; t->funcs = NULL; t->fields = NULL; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 36d4aad..c578da7 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -183,7 +183,6 @@ struct _type_t { char *name; unsigned char type; struct _type_t *ref; - char *rname; attr_t *attrs; func_t *funcs; var_t *fields; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a9b9f34..219e9c2 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -947,7 +947,7 @@ static int encode_type( static void dump_type(type_t *t) { - chat("dump_type: %p name %s type %d ref %p rname %s attrs %p\n", t, t->name, t->type, t->ref, t->rname, t->attrs); + chat("dump_type: %p name %s type %d ref %p attrs %p\n", t, t->name, t->type, t->ref, t->attrs); if(t->ref) dump_type(t->ref); }

1 0

Robert Shearman : widl: Merge marshall_arguments and unmarshall_arguments into one
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: 55df46ab856a8b08596303615a89c497d6dd4d5f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55df46ab856a8b085963036… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:32:24 2006 +0100 widl: Merge marshall_arguments and unmarshall_arguments into one function to remove the large amount of duplicated code. --- tools/widl/client.c | 5 + tools/widl/server.c | 6 + tools/widl/typegen.c | 277 +++++++++++++------------------------------------- tools/widl/typegen.h | 11 ++ 4 files changed, 88 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=55df46ab856a8b08596…

1 0

Robert Shearman : widl: Yet more const attributes.
by Alexandre Julliard 07 Feb '06

07 Feb '06

Module: wine Branch: refs/heads/master Commit: f1bb0a474b4664f4dbba46574bbf248b50ed650b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1bb0a474b4664f4dbba465… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:31:43 2006 +0100 widl: Yet more const attributes. --- tools/widl/client.c | 18 +++++++++--------- tools/widl/header.c | 10 +++++----- tools/widl/header.h | 4 ++-- tools/widl/proxy.c | 6 +++--- tools/widl/server.c | 14 +++++++------- tools/widl/typegen.c | 4 ++-- tools/widl/typegen.h | 4 ++-- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 91b4b39..136e131 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -66,13 +66,13 @@ static int print_client( const char *for } -static void print_message_buffer_size(func_t *func) +static void print_message_buffer_size(const func_t *func) { unsigned int total_size = 0; if (func->args) { - var_t *var = func->args; + const var_t *var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { @@ -90,8 +90,8 @@ static void print_message_buffer_size(fu static void write_function_stubs(type_t *iface) { - func_t *func = iface->funcs; - char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const func_t *func = iface->funcs; + const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); var_t *var; int method_count = 0; @@ -101,8 +101,8 @@ static void write_function_stubs(type_t while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) { - var_t *def = func->def; - var_t* explicit_handle_var; + const var_t *def = func->def; + const var_t* explicit_handle_var; unsigned int type_offset_func; /* check for a defined binding handle */ @@ -301,7 +301,7 @@ static void write_stubdescdecl(type_t *i static void write_stubdescriptor(type_t *iface, int expr_eval_routines) { - char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); @@ -341,7 +341,7 @@ static void write_stubdescriptor(type_t static void write_clientinterfacedecl(type_t *iface) { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); - UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); print_client("static const RPC_CLIENT_INTERFACE %s___RpcClientInterface =\n", iface->name ); print_client("{\n"); @@ -423,7 +423,7 @@ static void write_formatstringsdecl(type static void write_implicithandledecl(type_t *iface) { - char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); if (implicit_handle) { diff --git a/tools/widl/header.c b/tools/widl/header.c index c618406..925301d 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -491,16 +491,16 @@ void write_externdef(const var_t *v) } void write_library(const char *name, attr_t *attr) { - UUID *uuid = get_attrp(attr, ATTR_UUID); + const UUID *uuid = get_attrp(attr, ATTR_UUID); fprintf(header, "\n"); write_guid("LIBID", name, uuid); fprintf(header, "\n"); } -var_t* get_explicit_handle_var(func_t* func) +const var_t* get_explicit_handle_var(const func_t* func) { - var_t* var; + const var_t* var; if (!func->args) return NULL; @@ -535,7 +535,7 @@ int is_local(attr_t *a) return is_attr(a, ATTR_LOCAL); } -var_t *is_callas(attr_t *a) +const var_t *is_callas(attr_t *a) { return get_attrp(a, ATTR_CALLAS); } @@ -893,7 +893,7 @@ static void write_com_interface(type_t * static void write_rpc_interface(const type_t *iface) { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); - char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); if (!iface->funcs) return; diff --git a/tools/widl/header.h b/tools/widl/header.h index a29502d..63c732f 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -30,7 +30,7 @@ extern const char* get_name(const var_t extern void write_type(FILE *h, type_t *t, const var_t *v, const char *n); extern int is_object(attr_t *a); extern int is_local(attr_t *a); -extern var_t *is_callas(attr_t *a); +extern const var_t *is_callas(attr_t *a); extern void write_args(FILE *h, var_t *arg, const char *name, int obj, int do_indent); extern void write_array(FILE *h, const expr_t *v, int field); extern void write_forward(type_t *iface); @@ -43,7 +43,7 @@ extern void write_constdef(const var_t * extern void write_externdef(const var_t *v); extern void write_library(const char *name, attr_t *attr); extern void write_user_types(void); -extern var_t* get_explicit_handle_var(func_t* func); +extern const var_t* get_explicit_handle_var(const func_t* func); static inline int is_string_type(const attr_t *attrs, int ptr_level, const expr_t *array) { diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 97b471d..79b2ce7 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -889,13 +889,13 @@ static void write_proxy(type_t *iface) fprintf(proxy, " * %s interface\n", iface->name); fprintf(proxy, " */\n"); while (cur) { - var_t *def = cur->def; + const var_t *def = cur->def; if (!is_local(def->attrs)) { - var_t *cas = is_callas(def->attrs); + const var_t *cas = is_callas(def->attrs); const char *cname = cas ? cas->name : NULL; int idx = cur->idx; if (cname) { - func_t *m = iface->funcs; + const func_t *m = iface->funcs; while (m && strcmp(get_name(m->def), cname)) m = NEXT_LINK(m); idx = m->idx; diff --git a/tools/widl/server.c b/tools/widl/server.c index 23b303e..7a96abc 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -68,9 +68,9 @@ static int print_server(const char *form } -static void write_parameters_init(func_t *func) +static void write_parameters_init(const func_t *func) { - var_t *var; + const var_t *var; if (!func->args) return; @@ -91,16 +91,16 @@ static void write_function_stubs(type_t { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); - func_t *func = iface->funcs; - var_t *var; - var_t* explicit_handle_var; + const func_t *func = iface->funcs; + const var_t *var; + const var_t* explicit_handle_var; unsigned int proc_offset = 0; unsigned int type_offset = 2; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) { - var_t *def = func->def; + const var_t *def = func->def; unsigned long buffer_size = 0; unsigned int type_offset_func; @@ -260,7 +260,7 @@ static void write_function_stubs(type_t if (func->args) { - var_t *var = func->args; + const var_t *var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index df58428..a518c0c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1338,7 +1338,7 @@ unsigned int get_required_buffer_size(co return get_required_buffer_size_type(var->type, var->ptr_level, var->array, var->name, alignment); } -void marshall_arguments(FILE *file, int indent, func_t *func, +void marshall_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass) { unsigned int last_size = 0; @@ -1533,7 +1533,7 @@ void marshall_arguments(FILE *file, int } } -void unmarshall_arguments(FILE *file, int indent, func_t *func, +void unmarshall_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass) { unsigned int last_size = 0; diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 2225129..82a6cb5 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -30,8 +30,8 @@ enum pass void write_procformatstring(FILE *file, type_t *iface); void write_typeformatstring(FILE *file, type_t *iface); unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment); -void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); -void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); +void marshall_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass); +void unmarshall_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass); size_t get_size_procformatstring_var(const var_t *var); size_t get_size_typeformatstring_var(const var_t *var); int write_expr_eval_routines(FILE *file, const char *iface);

1 0