January 2006 - Wine-commits

Alexandre Julliard : setupapi: Ignore ok file for new query test.
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: ebc65aea8d9e0a0f8152a97d37f04d484b50e7b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ebc65aea8d9e0a0f8152a97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 18:18:24 2006 +0100 setupapi: Ignore ok file for new query test. --- dlls/setupapi/tests/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/.gitignore b/dlls/setupapi/tests/.gitignore index ee8ba56..de7fd7f 100644 --- a/dlls/setupapi/tests/.gitignore +++ b/dlls/setupapi/tests/.gitignore @@ -1,4 +1,5 @@ Makefile parser.ok +query.ok stringtable.ok testlist.c

1 0

Mike McCormack : winefile: Move the license and warranty text into the resources.
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: ee20ca135459124ec617e7851c5cb2697ec20cb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee20ca135459124ec617e78… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 31 18:08:45 2006 +0100 winefile: Move the license and warranty text into the resources. --- programs/winefile/En.rc | 24 ++++++++++++++++++ programs/winefile/Makefile.in | 1 - programs/winefile/license.c | 56 ----------------------------------------- programs/winefile/resource.h | 4 +++ programs/winefile/winefile.c | 16 ++++++++++++ programs/winefile/winefile.h | 4 --- 6 files changed, 44 insertions(+), 61 deletions(-) delete mode 100644 programs/winefile/license.c diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc index 8afa632..7a305d8 100644 --- a/programs/winefile/En.rc +++ b/programs/winefile/En.rc @@ -262,3 +262,27 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s of %s free" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LICENSE" +IDS_LICENSE, +"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.\n\ +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.\n\ +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" + +IDS_WARRANTY_CAPTION, "NO WARRANTY" +IDS_WARRANTY, +"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." +} diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index 8bf2251..29e6e79 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -9,7 +9,6 @@ IMPORTS = shell32 comdlg32 comctl32 ol EXTRALIBS = -luuid C_SRCS = \ - license.c \ splitpath.c \ winefile.c diff --git a/programs/winefile/license.c b/programs/winefile/license.c deleted file mode 100644 index 12193f8..0000000 --- a/programs/winefile/license.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2000 Martin Fuchs - * - * 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 "winefile.h" - -#ifdef __WINE__ - -static const CHAR LicenseCaption[] = "LICENSE"; -static const CHAR License[] = -"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.\n" - -"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.\n" - -"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"; - -static const CHAR NoWarrantyCaption[] = "NO WARRANTY"; -static const CHAR NoWarranty[] = -"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."; - -VOID WineLicense(HWND hwnd) -{ - MessageBoxA(hwnd, License, LicenseCaption, MB_ICONINFORMATION|MB_OK); -} - -VOID WineWarranty(HWND hwnd) -{ - MessageBoxA(hwnd, NoWarranty, NoWarrantyCaption, MB_ICONEXCLAMATION|MB_OK); -} - -#endif diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h index cce4de3..d4d0adc 100644 --- a/programs/winefile/resource.h +++ b/programs/winefile/resource.h @@ -135,6 +135,10 @@ #define IDS_COL_SEC 1218 #define IDS_FREE_SPACE_FMT 1219 +#define IDS_LICENSE_CAPTION 1300 +#define IDS_LICENSE 1301 +#define IDS_WARRANTY_CAPTION 1302 +#define IDS_WARRANTY 1303 /* range for drive bar command ids: 0x9000..0x90FF */ diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 8b250d6..387711d 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -235,6 +235,22 @@ static void display_network_error(HWND h MessageBox(hwnd, msg, RS(b2,IDS_WINEFILE), MB_OK); } +static VOID WineLicense(HWND Wnd) +{ + TCHAR cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_LICENSE, text, 1024); + LoadString(Globals.hInstance, IDS_LICENSE_CAPTION, cap, 20); + MessageBox(Wnd, text, cap, MB_ICONINFORMATION | MB_OK); +} + +static VOID WineWarranty(HWND Wnd) +{ + TCHAR cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_WARRANTY, text, 1024); + LoadString(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, 20); + MessageBox(Wnd, text, cap, MB_ICONEXCLAMATION | MB_OK); +} + #ifdef __WINE__ diff --git a/programs/winefile/winefile.h b/programs/winefile/winefile.h index c969af7..45d800d 100644 --- a/programs/winefile/winefile.h +++ b/programs/winefile/winefile.h @@ -144,10 +144,6 @@ extern WINEFILE_GLOBALS Globals; #ifdef __WINE__ -extern void WineLicense(HWND hwnd); -extern void WineWarranty(HWND hwnd); - - #ifdef UNICODE extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); #define _tsplitpath _wsplitpath

1 0

Robert Shearman : widl: Changes to output for better debugability.
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: c41822609367e5cf39f1f610005be2131a7f1885 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c41822609367e5cf39f1f61… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:08:24 2006 +0100 widl: Changes to output for better debugability. Write the offset and the absolute address for referenced types. Write the current offset out when writing a pointer type. --- tools/widl/typegen.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 438a211..8b6e081 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -842,9 +842,10 @@ static size_t write_struct_tfs(FILE *fil /* total size */ print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; - print_file(file, 2, "NdrShort(0x%x), /* %d */\n", + print_file(file, 2, "NdrShort(0x%x), /* offset = %d (%u) */\n", array_offset - *typestring_offset, - array_offset - *typestring_offset); + array_offset - *typestring_offset, + array_offset); *typestring_offset += 2; print_file(file, 2, "FC_END,\n"); *typestring_offset += 1; @@ -876,9 +877,10 @@ static size_t write_struct_tfs(FILE *fil /* total size */ print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; - print_file(file, 2, "NdrShort(0x%x), /* %d */\n", + print_file(file, 2, "NdrShort(0x%x), /* offset = %d (%u) */\n", + array_offset - *typestring_offset, array_offset - *typestring_offset, - array_offset - *typestring_offset); + array_offset); *typestring_offset += 2; print_file(file, 2, "FC_END,\n"); *typestring_offset += 1; @@ -992,6 +994,8 @@ static size_t write_typeformatstring_var pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); if (!pointer_type) pointer_type = RPC_FC_RP; + if (file) + fprintf(file, "/* %2u */\n", *typeformat_offset); print_file(file, indent, "0x%x, 0x00, /* %s */\n", pointer_type, pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP"));

1 0

Robert Shearman : widl: Improve the current type offset passing.
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: 06ab21b6689eaa1c81dc2e1dff5a9403247f41d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06ab21b6689eaa1c81dc2e1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:07:20 2006 +0100 widl: Improve the current type offset passing. Change the functions to take the current type offset and return the start of the type written. --- tools/widl/typegen.c | 184 +++++++++++++++++++++++++------------------------- 1 files changed, 93 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=06ab21b6689eaa1c81d…

1 0

Robert Shearman : widl: Fix the writing of arrays with size specified in the array
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: 5764d5518da4faa80834035997414a19f1afeb74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5764d5518da4faa80834035… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:07:45 2006 +0100 widl: Fix the writing of arrays with size specified in the array expression instead of the size_is expression. --- tools/widl/typegen.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8649252..d4dc13e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -634,7 +634,7 @@ static size_t write_array_tfs(FILE *file const expr_t *length_is = get_attrp(attrs, ATTR_LENGTHIS); const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS); int has_length = length_is && (length_is->type != EXPR_VOID); - int has_size = size_is && (size_is->type != EXPR_VOID) && !array->is_const; + int has_size = (size_is && (size_is->type != EXPR_VOID)) || !array->is_const; size_t start_offset = *typestring_offset; /* FIXME: need to analyse type for pointers */ @@ -735,7 +735,8 @@ static size_t write_array_tfs(FILE *file *typestring_offset += 4; *typestring_offset += write_conf_or_var_desc(file, current_func, - current_structure, size_is); + current_structure, + size_is ? size_is : array); /* FIXME: write out pointer descriptor if necessary */ @@ -758,7 +759,8 @@ static size_t write_array_tfs(FILE *file *typestring_offset += 4; *typestring_offset += write_conf_or_var_desc(file, current_func, - current_structure, size_is); + current_structure, + size_is ? size_is : array); *typestring_offset += write_conf_or_var_desc(file, current_func, current_structure, length_is); @@ -1159,7 +1161,7 @@ void marshall_arguments(FILE *file, int const expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); const char *array_type; int has_length = length_is && (length_is->type != EXPR_VOID); - int has_size = size_is && (size_is->type != EXPR_VOID) && !var->array->is_const; + int has_size = (size_is && (size_is->type != EXPR_VOID)) || !var->array->is_const; if (NEXT_LINK(var->array)) /* multi-dimensional array */ array_type = "ComplexArray"; @@ -1353,7 +1355,7 @@ void unmarshall_arguments(FILE *file, in const expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); const char *array_type; int has_length = length_is && (length_is->type != EXPR_VOID); - int has_size = size_is && (size_is->type != EXPR_VOID) && !var->array->is_const; + int has_size = (size_is && (size_is->type != EXPR_VOID)) || !var->array->is_const; if (NEXT_LINK(var->array)) /* multi-dimensional array */ array_type = "ComplexArray";

1 0

Robert Shearman : widl: Clean up conformant struct handling.
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: 1478ac85a9238a51b83bbf181ccc194aa4205b59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1478ac85a9238a51b83bbf1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:08:03 2006 +0100 widl: Clean up conformant struct handling. Make the writing of conformant structures take advantage of the new type format string offset handling. --- tools/widl/typegen.c | 49 ++++++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d4dc13e..438a211 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -796,6 +796,7 @@ static size_t write_struct_tfs(FILE *fil size_t total_size; const var_t *array; size_t start_offset; + size_t array_offset; switch (type->type) { @@ -827,6 +828,13 @@ static size_t write_struct_tfs(FILE *fil error("structure size for parameter %s exceeds %d bytes by %d bytes\n", name, USHRT_MAX, total_size - USHRT_MAX); + array = find_array_or_string_in_struct(type); + current_structure = type; + array_offset = write_array_tfs(file, array->attrs, array->type, + array->array, array->name, + typestring_offset); + current_structure = NULL; + start_offset = *typestring_offset; WRITE_FCTYPE(file, FC_CSTRUCT, *typestring_offset); /* alignment */ @@ -834,19 +842,13 @@ static size_t write_struct_tfs(FILE *fil /* total size */ print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; - /* FIXME: a fixed offset won't work when pointer layout is present */ - print_file(file, 2, "NdrShort(0x3), /* 3 */\n"); + print_file(file, 2, "NdrShort(0x%x), /* %d */\n", + array_offset - *typestring_offset, + array_offset - *typestring_offset); *typestring_offset += 2; print_file(file, 2, "FC_END,\n"); *typestring_offset += 1; - array = find_array_or_string_in_struct(type); - current_structure = type; - write_array_tfs(file, array->attrs, array->type, - array->array, array->name, - typestring_offset); - current_structure = NULL; - return start_offset; case RPC_FC_CVSTRUCT: total_size = type_memsize(type, 0, NULL); @@ -855,6 +857,18 @@ static size_t write_struct_tfs(FILE *fil error("structure size for parameter %s exceeds %d bytes by %d bytes\n", name, USHRT_MAX, total_size - USHRT_MAX); + array = find_array_or_string_in_struct(type); + current_structure = type; + if (is_attr(array->attrs, ATTR_STRING)) + array_offset = write_string_tfs(file, array->attrs, array->type, + array->array, array->name, + typestring_offset); + else + array_offset = write_array_tfs(file, array->attrs, array->type, + array->array, array->name, + typestring_offset); + current_structure = NULL; + start_offset = *typestring_offset; WRITE_FCTYPE(file, FC_CVSTRUCT, *typestring_offset); /* alignment */ @@ -862,24 +876,13 @@ static size_t write_struct_tfs(FILE *fil /* total size */ print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; - /* FIXME: a fixed offset won't work when pointer layout is present */ - print_file(file, 2, "NdrShort(0x3), /* 3 */\n"); + print_file(file, 2, "NdrShort(0x%x), /* %d */\n", + array_offset - *typestring_offset, + array_offset - *typestring_offset); *typestring_offset += 2; print_file(file, 2, "FC_END,\n"); *typestring_offset += 1; - array = find_array_or_string_in_struct(type); - current_structure = type; - if (is_attr(array->attrs, ATTR_STRING)) - write_string_tfs(file, array->attrs, array->type, - array->array, array->name, - typestring_offset); - else - write_array_tfs(file, array->attrs, array->type, - array->array, array->name, - typestring_offset); - current_structure = NULL; - return start_offset; default: error("write_struct_tfs: Unimplemented for type 0x%x\n", type->type);

1 0

Robert Shearman : widl: Support client/server generation for explicit_handle interfaces
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: 0a2c5b73fdd64ee701e156b143a847f91ceafe5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a2c5b73fdd64ee701e156b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:06:17 2006 +0100 widl: Support client/server generation for explicit_handle interfaces (based on a patch by Eric Kohl). --- tools/widl/header.c | 2 +- tools/widl/typegen.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a8071b1..ef77308 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -509,7 +509,7 @@ var_t* get_explicit_handle_var(func_t* f while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (var->type->type == RPC_FC_IGNORE) + if (var->type->type == RPC_FC_BIND_PRIMITIVE) return var; var = PREV_LINK(var); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2f7824a..221a06c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -936,6 +936,10 @@ static size_t write_typeformatstring_var case RPC_FC_ENCAPSULATED_UNION: case RPC_FC_NON_ENCAPSULATED_UNION: return write_union_tfs(file, var->attrs, type, var->name, typeformat_offset); + case RPC_FC_IGNORE: + case RPC_FC_BIND_PRIMITIVE: + /* nothing to do */ + return 0; default: error("write_typeformatstring_var: Unsupported type 0x%x for variable %s\n", type->type, var->name); } @@ -1071,6 +1075,10 @@ static unsigned int get_required_buffer_ *alignment = 8; return 8; + case RPC_FC_IGNORE: + case RPC_FC_BIND_PRIMITIVE: + return 0; + case RPC_FC_STRUCT: { size_t size = 0; @@ -1268,6 +1276,10 @@ void marshall_arguments(FILE *file, int case RPC_FC_BOGUS_STRUCT: ndrtype = "ComplexStruct"; break; + case RPC_FC_IGNORE: + case RPC_FC_BIND_PRIMITIVE: + /* no marshalling needed */ + continue; default: error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", var->name, var->type->type, var->ptr_level); @@ -1439,6 +1451,10 @@ void unmarshall_arguments(FILE *file, in case RPC_FC_BOGUS_STRUCT: ndrtype = "ComplexStruct"; break; + case RPC_FC_IGNORE: + case RPC_FC_BIND_PRIMITIVE: + /* no unmarshalling needed */ + continue; default: error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", var->name, var->type->type, var->ptr_level);

1 0

Robert Shearman : widl: Do constant folding for the sizeof operator on simple types.
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: 513996fde4a410df154e042166950a391d87c514 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=513996fde4a410df154e042… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:06:25 2006 +0100 widl: Do constant folding for the sizeof operator on simple types. --- tools/widl/parser.y | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 49532a0..15f1367 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -877,6 +877,35 @@ static expr_t *make_exprt(enum expr_type e->is_const = FALSE; INIT_LINK(e); /* check for cast of constant expression */ + if (type == EXPR_SIZEOF) { + switch (tref->ref->type) { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + e->is_const = TRUE; + e->cval = 1; + break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + e->is_const = TRUE; + e->cval = 2; + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + e->is_const = TRUE; + e->cval = 4; + break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + e->is_const = TRUE; + e->cval = 8; + break; + } + } if (type == EXPR_CAST && expr->is_const) { e->is_const = TRUE; e->cval = expr->cval;

1 0

Robert Shearman : widl: The stack/structure offset in correlation descriptors should be a short.
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: ac5a4393d57daaf84ae0155a4a1efcc0b6e2d2f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac5a4393d57daaf84ae0155… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:06:53 2006 +0100 widl: The stack/structure offset in correlation descriptors should be a short. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 221a06c..2f96080 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -443,7 +443,7 @@ static size_t write_conf_or_var_desc(FIL correlation_type == RPC_FC_TOP_LEVEL_CONFORMANCE ? "parameter, " : "", param_type_string); print_file(file, 2, "0x%x, /* %s */\n", operator_type, operator_string); - print_file(file, 2, "0x%x, /* %soffset = %d */\n", + print_file(file, 2, "NdrShort(0x%x), /* %soffset = %d */\n", offset, correlation_type == RPC_FC_TOP_LEVEL_CONFORMANCE ? "x86 stack size / " : "", offset);

1 0

Robert Shearman : widl: Implement constant conformance.
by Alexandre Julliard 31 Jan '06

31 Jan '06

Module: wine Branch: refs/heads/master Commit: c08e00a9ecbecbe3339e7243ed51e42f96b5024a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c08e00a9ecbecbe3339e724… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 31 18:05:43 2006 +0100 widl: Implement constant conformance. --- tools/widl/typegen.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f03cef3..2f7824a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -296,6 +296,21 @@ static size_t write_conf_or_var_desc(FIL if (!file) return 4; /* optimisation for sizing pass */ + if (expr->is_const) + { + if (expr->cval > UCHAR_MAX * (USHRT_MAX + 1) + USHRT_MAX) + error("write_conf_or_var_desc: constant value %ld is greater than " + "the maximum constant size of %d\n", expr->cval, + UCHAR_MAX * (USHRT_MAX + 1) + USHRT_MAX); + + print_file(file, 2, "0x%x, /* Corr desc: constant, val = %ld */\n", + RPC_FC_CONSTANT_CONFORMANCE, expr->cval); + print_file(file, 2, "0x%x,\n", expr->cval & ~USHRT_MAX); + print_file(file, 2, "NdrShort(0x%x),\n", expr->cval & USHRT_MAX); + + return 4; + } + switch (subexpr->type) { case EXPR_PPTR: @@ -466,7 +481,7 @@ static size_t write_conf_or_var_desc(FIL } else { - error("write_conf_or_var_desc: expression type %d\n", subexpr->type); + error("write_conf_or_var_desc: top-level callback conformance unimplemented\n"); correlation_type = RPC_FC_TOP_LEVEL_CONFORMANCE; }

1 0