February 2009 - Wine-Commits

Alexandre Julliard : wrc: Print better error messages for functions that set errno.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: cf63bb880e9502532df55f78959b81a3b4478de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf63bb880e9502532df55f789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 13:08:50 2009 +0100 wrc: Print better error messages for functions that set errno. --- tools/wrc/readres.c | 2 +- tools/wrc/utils.c | 11 +++++++++++ tools/wrc/utils.h | 3 ++- tools/wrc/wrc.c | 4 ++-- tools/wrc/writeres.c | 7 +++---- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/tools/wrc/readres.c b/tools/wrc/readres.c index f7aaba8..9e964a6 100644 --- a/tools/wrc/readres.c +++ b/tools/wrc/readres.c @@ -354,7 +354,7 @@ resource_t *read_resfile(char *inname) fp = fopen(inname, "rb"); if(!fp) - error("Could not open inputfile %s\n", inname); + fatal_perror("Could not open %s", inname); /* Determine 16 or 32 bit .res file */ if(fread(&rh, 1, sizeof(rh), fp) != sizeof(rh)) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index eb079ee..b6688af 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -96,6 +96,17 @@ void internal_error(const char *file, int line, const char *s, ...) exit(3); } +void fatal_perror( const char *msg, ... ) +{ + va_list valist; + va_start( valist, msg ); + fprintf(stderr, "Error: "); + vfprintf( stderr, msg, valist ); + perror( " " ); + va_end( valist ); + exit(2); +} + void error(const char *s, ...) { va_list ap; diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h index 30c6ab2..09144e7 100644 --- a/tools/wrc/utils.h +++ b/tools/wrc/utils.h @@ -36,7 +36,8 @@ char *xstrdup(const char *str); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4), noreturn)); -void error(const char *s, ...) __attribute__((format (printf, 1, 2))); +void fatal_perror( const char *msg, ... ) __attribute__((format (printf, 1, 2), noreturn)); +void error(const char *s, ...) __attribute__((format (printf, 1, 2), noreturn)); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 15f30a3..05bd3f8 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -462,7 +462,7 @@ int main(int argc,char *argv[]) FILE *output; if (!(output = fopen( output_name, "w" ))) - error( "Could not open %s for writing\n", output_name ); + fatal_perror( "Could not open %s for writing", output_name ); ret = wpp_parse( input_name, output ); fclose( output ); } @@ -487,7 +487,7 @@ int main(int argc,char *argv[]) chat("Starting parse\n"); if(!(parser_in = fopen(input_name, "rb"))) - error("Could not open %s for input\n", input_name); + fatal_perror("Could not open %s for input", input_name); ret = parser_parse(); diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c index e26a559..0bcad16 100644 --- a/tools/wrc/writeres.c +++ b/tools/wrc/writeres.c @@ -52,9 +52,7 @@ void write_resfile(char *outname, resource_t *top) fo = fopen(outname, "wb"); if(!fo) - { - error("Could not open %s\n", outname); - } + fatal_perror("Could not open %s", outname); if(win32) { @@ -102,5 +100,6 @@ void write_resfile(char *outname, resource_t *top) } } } - fclose(fo); + if (fclose(fo)) + fatal_perror("Error writing %s", outname); }

1 0

Alexandre Julliard : configure: Don' t set target flags if build and host are the same.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 4d135d9a71477baa9ffca530b2e3046c3e0a7a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d135d9a71477baa9ffca530b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 13:08:44 2009 +0100 configure: Don't set target flags if build and host are the same. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0e2e266..ad96f4b 100755 --- a/configure +++ b/configure @@ -3943,7 +3943,7 @@ fi $as_echo "$wine_cv_toolsdir" >&6; } TOOLSDIR=$wine_cv_toolsdir -if test -n "$host_alias" +if test -n "$host_alias" -a "$host_alias" != "$build_alias" then TARGETFLAGS="-b $host_alias $TARGETFLAGS" diff --git a/configure.ac b/configure.ac index 3dfada3..4453592 100644 --- a/configure.ac +++ b/configure.ac @@ -169,7 +169,7 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.]) fi]) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) -if test -n "$host_alias" +if test -n "$host_alias" -a "$host_alias" != "$build_alias" then AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS") fi

1 0

Alexandre Julliard : configure: Try to avoid warnings in checks to support configuring with -Werror.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 95251a78e88f2fb44cc711b10d1243fe6671e470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95251a78e88f2fb44cc711b10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 12:46:58 2009 +0100 configure: Try to avoid warnings in checks to support configuring with -Werror. --- configure | 5 ++++- configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 91e19c8..0e2e266 100755 --- a/configure +++ b/configure @@ -17203,7 +17203,7 @@ static int Array[3]; for(i=0; i<B; i++) Array[i] = i - 3; for(i=0; i<4 - 1; i++) L[i] = L[i + 1]; L[i] = 4; - exit( Array[1] != -2 || L[2] != 3) + return (Array[1] != -2 || L[2] != 3) ; return 0; } @@ -17916,6 +17916,8 @@ MAIN_BINARY="wine-pthread" esac +ac_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $BUILTINFLAG" @@ -18163,6 +18165,7 @@ _ACEOF fi done +CFLAGS="$ac_save_CFLAGS" if test "$ac_cv_func_dlopen" = no then diff --git a/configure.ac b/configure.ac index 57ec39d..3dfada3 100644 --- a/configure.ac +++ b/configure.ac @@ -1316,7 +1316,7 @@ then for(i=0; i<B; i++) Array[[i]] = i - 3; for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]]; L[[i]] = 4; - exit( Array[[1]] != -2 || L[[2]] != 3)]])], + return (Array[[1]] != -2 || L[[2]] != 3)]])], [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) ) if test "$ac_cv_c_gcc_strength_bug" = "yes" then @@ -1426,6 +1426,8 @@ esac dnl **** Check for functions **** +ac_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ _pclose \ _popen \ @@ -1501,6 +1503,7 @@ AC_CHECK_FUNCS(\ wait4 \ waitpid \ ) +CFLAGS="$ac_save_CFLAGS" dnl Check for -ldl if test "$ac_cv_func_dlopen" = no

1 0

Nikolay Sivov : gdiplus: Implemented GdipIsVisiblePathPoint with tests.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 5c316434524c8bd618f37dc14b6f26e461a97ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c316434524c8bd618f37dc14… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Feb 14 16:38:34 2009 +0300 gdiplus: Implemented GdipIsVisiblePathPoint with tests. --- dlls/gdiplus/graphicspath.c | 27 +++++++++++++++--- dlls/gdiplus/tests/graphicspath.c | 53 +++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4703ace..ca33082 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1384,16 +1384,33 @@ GpStatus WINGDIPAPI GdipIsVisiblePathPointI(GpPath* path, INT x, INT y, GpGraphi return GdipIsVisiblePathPoint(path, x, y, graphics, result); } +/***************************************************************************** + * GdipIsVisiblePathPoint [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipIsVisiblePathPoint(GpPath* path, REAL x, REAL y, GpGraphics *graphics, BOOL *result) { - static int calls; + GpRegion *region; + HRGN hrgn; + GpStatus status; - if(!path) return InvalidParameter; + if(!path || !result) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + status = GdipCreateRegionPath(path, &region); + if(status != Ok) + return status; - return NotImplemented; + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if(status != Ok){ + GdipDeleteRegion(region); + return status; + } + + *result = PtInRegion(hrgn, roundr(x), roundr(y)); + + DeleteObject(hrgn); + GdipDeleteRegion(region); + + return Ok; } GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index d256cac..6e257eb 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1057,6 +1057,58 @@ static void test_flatten(void) GdipDeletePath(path); } +static void test_isvisible(void) +{ + GpPath *path; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + BOOL result; + GpStatus status; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + + /* NULL */ + status = GdipIsVisiblePathPoint(NULL, 0.0, 0.0, NULL, NULL); + expect(InvalidParameter, status); + status = GdipIsVisiblePathPoint(path, 0.0, 0.0, NULL, NULL); + expect(InvalidParameter, status); + status = GdipIsVisiblePathPoint(path, 0.0, 0.0, NULL, NULL); + expect(InvalidParameter, status); + status = GdipIsVisiblePathPoint(path, 0.0, 0.0, graphics, NULL); + expect(InvalidParameter, status); + + /* empty path */ + result = TRUE; + status = GdipIsVisiblePathPoint(path, 0.0, 0.0, NULL, &result); + expect(Ok, status); + expect(FALSE, result); + /* rect */ + status = GdipAddPathRectangle(path, 0.0, 0.0, 10.0, 10.0); + expect(Ok, status); + result = FALSE; + status = GdipIsVisiblePathPoint(path, 0.0, 0.0, NULL, &result); + expect(Ok, status); + expect(TRUE, result); + result = TRUE; + status = GdipIsVisiblePathPoint(path, 11.0, 11.0, NULL, &result); + expect(Ok, status); + expect(FALSE, result); + /* not affected by clipping */ + status = GdipSetClipRect(graphics, 5.0, 5.0, 5.0, 5.0, CombineModeReplace); + expect(Ok, status); + result = FALSE; + status = GdipIsVisiblePathPoint(path, 0.0, 0.0, graphics, &result); + expect(Ok, status); + expect(TRUE, result); + + GdipDeletePath(path); + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1085,6 +1137,7 @@ START_TEST(graphicspath) test_reverse(); test_addpie(); test_flatten(); + test_isvisible(); GdiplusShutdown(gdiplusToken); }

1 0

Andrew Talbot : twain_32: Replace realloc() and strdup().
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 820981b39d095ed8a5f5ec055cccef4855d31352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=820981b39d095ed8a5f5ec055… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 14 17:47:28 2009 +0000 twain_32: Replace realloc() and strdup(). --- dlls/twain_32/dsm_ctrl.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 325b49d..e0d0983 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -84,10 +84,11 @@ twain_add_onedriver(const char *dsname) { if (i < nrdevices) break; if (nrdevices) - devices = realloc(devices, sizeof(devices[0])*(nrdevices+1)); + devices = HeapReAlloc(GetProcessHeap(), 0, devices, sizeof(devices[0])*(nrdevices+1)); else - devices = malloc(sizeof(devices[0])); - devices[nrdevices].modname = strdup(dsname); + devices = HeapAlloc(GetProcessHeap(), 0, sizeof(devices[0])); + if ((devices[nrdevices].modname = HeapAlloc(GetProcessHeap(), 0, strlen(dsname) + 1))) + lstrcpyA(devices[nrdevices].modname, dsname); devices[nrdevices].identity = sourceId; nrdevices++; DSM_sourceId++;

1 0

Andrew Talbot : rsaenh: Replace malloc/realloc with HeapAlloc/HeapReAlloc.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 250b699354283d35ab80201e44095f222f5deaf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250b699354283d35ab80201e4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 14 16:10:19 2009 +0000 rsaenh: Replace malloc/realloc with HeapAlloc/HeapReAlloc. --- dlls/rsaenh/mpi.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 0eb91f3..0c58e39 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -29,6 +29,9 @@ */ #include <stdarg.h> + +#include "windef.h" +#include "winbase.h" #include "tomcrypt.h" /* Known optimal configurations @@ -69,7 +72,7 @@ static int mp_grow (mp_int * a, int size) * in case the operation failed we don't want * to overwrite the dp member of a. */ - tmp = realloc (a->dp, sizeof (mp_digit) * size); + tmp = HeapReAlloc(GetProcessHeap(), 0, a->dp, sizeof (mp_digit) * size); if (tmp == NULL) { /* reallocation failed but "a" is still valid [can be freed] */ return MP_MEM; @@ -154,7 +157,7 @@ static int mp_init (mp_int * a) int i; /* allocate memory required and clear it */ - a->dp = malloc (sizeof (mp_digit) * MP_PREC); + a->dp = HeapAlloc(GetProcessHeap(), 0, sizeof (mp_digit) * MP_PREC); if (a->dp == NULL) { return MP_MEM; } @@ -182,7 +185,7 @@ static int mp_init_size (mp_int * a, int size) size += (MP_PREC * 2) - (size % MP_PREC); /* alloc mem */ - a->dp = malloc (sizeof (mp_digit) * size); + a->dp = HeapAlloc(GetProcessHeap(), 0, sizeof (mp_digit) * size); if (a->dp == NULL) { return MP_MEM; } @@ -214,7 +217,7 @@ mp_clear (mp_int * a) } /* free ram */ - free(a->dp); + HeapFree(GetProcessHeap(), 0, a->dp); /* reset members to make debugging easier */ a->dp = NULL; @@ -3378,7 +3381,7 @@ int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback bsize = (size>>3)+((size&7)?1:0); /* we need a buffer of bsize bytes */ - tmp = malloc(bsize); + tmp = HeapAlloc(GetProcessHeap(), 0, bsize); if (tmp == NULL) { return MP_MEM; } @@ -3443,7 +3446,7 @@ int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback err = MP_OKAY; error: - free(tmp); + HeapFree(GetProcessHeap(), 0, tmp); return err; } @@ -3665,7 +3668,7 @@ int mp_shrink (mp_int * a) { mp_digit *tmp; if (a->alloc != a->used && a->used > 0) { - if ((tmp = realloc (a->dp, sizeof (mp_digit) * a->used)) == NULL) { + if ((tmp = HeapReAlloc(GetProcessHeap(), 0, a->dp, sizeof (mp_digit) * a->used)) == NULL) { return MP_MEM; } a->dp = tmp;

1 0

Rob Shearman : widl: Call Pointer function for freeing non-conformant strings and for all phases for returned non-conformant strings , as is done for conformant strings.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 04484a4013b87574a9f5ac577f57cab28d2fa84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04484a4013b87574a9f5ac577… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Feb 14 18:11:35 2009 +0000 widl: Call Pointer function for freeing non-conformant strings and for all phases for returned non-conformant strings, as is done for conformant strings. Also call Pointer functions for any string that isn't a reference pointer. --- tools/widl/typegen.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5dd2cbe..f1a00e6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3146,14 +3146,19 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const } else if (is_string_type(var->attrs, var->type)) { - if (is_array(type) && !is_conformant_array(type)) - print_phase_function(file, indent, "NonConformantString", local_var_prefix, - phase, var, start_offset); + if (phase == PHASE_FREE || pass == PASS_RETURN || + pointer_type != RPC_FC_RP) + { + unsigned int ptr_start_offset = (start_offset - (is_conformant_array(type) ? 4 : 2)); + print_phase_function(file, indent, "Pointer", local_var_prefix, + phase, var, ptr_start_offset); + } else { - if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type == RPC_FC_UP) - print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, - start_offset - (is_conformant_array(type) ? 4 : 2)); + if (is_array(type) && !is_conformant_array(type)) + print_phase_function(file, indent, "NonConformantString", + local_var_prefix, phase, var, + start_offset); else print_phase_function(file, indent, "ConformantString", local_var_prefix, phase, var, start_offset);

1 0

Rob Shearman : widl: Only duplicate a type if absolutely necessary.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 8f87eddd399127192bed252c182c5fda02ce8328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f87eddd399127192bed252c1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Feb 14 18:11:26 2009 +0000 widl: Only duplicate a type if absolutely necessary. Document how much of hack duplicating a type in order to change its pointer type is. --- tools/widl/parser.y | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d5260c1..168f555 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1446,9 +1446,19 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, } if (ptr && is_ptr(ptr) && (ptr_attr || top)) { - /* duplicate type to avoid changing original type */ - *pt = duptype(*pt, 1); - (*pt)->type = ptr_attr ? ptr_attr : RPC_FC_RP; + if (!ptr_attr) + ptr_attr = RPC_FC_RP; + if (ptr_attr != (*pt)->type) + { + /* create new type to avoid changing original type */ + /* FIXME: this is a horrible hack - we might be changing the pointer + * type of an alias here, so we also need corresponding hacks in + * get_pointer_fc to handle this. The type of pointer that the type + * ends up having is context sensitive and so we shouldn't be + * setting it here, but rather determining it when it is used. */ + *pt = duptype(*pt, 1); + (*pt)->type = ptr_attr; + } } else if (ptr_attr) error_loc("%s: pointer attribute applied to non-pointer type\n", v->name);

1 0

Rob Shearman : widl: Call Struct and Union phase functions for reference pointers to structures and unions .
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: e054c52cd1d295508dee0ce3b91258eb804fb3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e054c52cd1d295508dee0ce3b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Feb 14 18:11:00 2009 +0000 widl: Call Struct and Union phase functions for reference pointers to structures and unions. It's slightly quicker than calling pointer phase functions and does the same job. --- tools/widl/typegen.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 72 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fd51dc5..5dd2cbe 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3227,6 +3227,9 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const switch (get_struct_type(type)) { case RPC_FC_STRUCT: + if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) + print_phase_function(file, indent, "SimpleStruct", local_var_prefix, phase, var, start_offset); + break; case RPC_FC_PSTRUCT: print_phase_function(file, indent, "SimpleStruct", local_var_prefix, phase, var, start_offset); break; @@ -3244,6 +3247,19 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const error("write_remoting_arguments: Unsupported type: %s (0x%02x)\n", var->name, get_struct_type(type)); } } + else if (is_union(type->type)) + { + unsigned char tc = type->type; + const char *union_type = NULL; + + if (tc == RPC_FC_NON_ENCAPSULATED_UNION) + union_type = "NonEncapsulatedUnion"; + else if (tc == RPC_FC_ENCAPSULATED_UNION) + union_type = "EncapsulatedUnion"; + + print_phase_function(file, indent, union_type, local_var_prefix, + phase, var, start_offset); + } else { const type_t *ref = type_pointer_get_ref(type); @@ -3260,13 +3276,64 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_basetype(file, indent, local_var_prefix, phase, pass, var, var->name); } } - else if (type->type == RPC_FC_RP && get_struct_type(ref) == RPC_FC_STRUCT && + else if (type->type == RPC_FC_RP && is_struct(ref->type) && !is_user_type(ref)) { - if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) - print_phase_function(file, indent, "SimpleStruct", - local_var_prefix, phase, var, - ref->typestring_offset); + const char *struct_type = NULL; + switch (get_struct_type(ref)) + { + case RPC_FC_STRUCT: + /* simple structs have known sizes, so don't need a sizing + * pass and don't have any memory to free and so don't + * need a freeing pass */ + if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) + struct_type = "SimpleStruct"; + break; + case RPC_FC_PSTRUCT: + struct_type = "SimpleStruct"; + break; + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + struct_type = "ConformantStruct"; + break; + case RPC_FC_CVSTRUCT: + struct_type = "ConformantVaryingStruct"; + break; + case RPC_FC_BOGUS_STRUCT: + struct_type = "ComplexStruct"; + break; + default: + error("write_remoting_arguments: Unsupported type: %s (0x%02x)\n", var->name, get_struct_type(ref)); + } + + if (struct_type) + { + if (phase == PHASE_FREE) + struct_type = "Pointer"; + else + start_offset = ref->typestring_offset; + print_phase_function(file, indent, struct_type, local_var_prefix, phase, var, start_offset); + } + } + else if (type->type == RPC_FC_RP && is_union(type->type)) + { + const char *union_type = NULL; + if (phase == PHASE_FREE) + union_type = "Pointer"; + else + { + unsigned char tc = type->type; + + if (tc == RPC_FC_NON_ENCAPSULATED_UNION) + union_type = "NonEncapsulatedUnion"; + else if (tc == RPC_FC_ENCAPSULATED_UNION) + union_type = "EncapsulatedUnion"; + + start_offset = ref->typestring_offset; + } + + print_phase_function(file, indent, union_type, local_var_prefix, + phase, var, start_offset); } else {

1 0

Rob Shearman : widl: Fix marshalling/unmarshalling of enum arguments.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 47c82ac472546cb75808c0f10482b920e8afdd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c82ac472546cb75808c0f10… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Feb 14 18:10:53 2009 +0000 widl: Fix marshalling/unmarshalling of enum arguments. The generated code should use NdrSimpleType{Marshall,Unmarshall} instead of direct buffer access, since the memory size isn't always equal to the size on the wire and extra checks. --- tools/widl/typegen.c | 43 ++++++++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 89b7ccf..fd51dc5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3071,7 +3071,6 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { int in_attr, out_attr, pointer_type; const type_t *type = var->type; - unsigned char rtype; unsigned int start_offset = type->typestring_offset; pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); @@ -3097,7 +3096,6 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const } write_parameter_conf_or_var_exprs(file, indent, local_var_prefix, phase, var); - rtype = get_struct_type(type); if (is_context_handle(type)) { @@ -3204,14 +3202,29 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const } } } - else if (!is_ptr(var->type) && is_base_type(rtype)) + else if (is_base_type(type->type)) { - if (phase != PHASE_FREE) - print_phase_basetype(file, indent, local_var_prefix, phase, pass, var, var->name); + if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) + { + if (type->type == RPC_FC_ENUM16 || type->type == RPC_FC_ENUM32) + { + if (phase == PHASE_MARSHAL) + print_file(file, indent, "NdrSimpleTypeMarshall(\n"); + else + print_file(file, indent, "NdrSimpleTypeUnmarshall(\n"); + print_file(file, indent+1, "&__frame->_StubMsg,\n"); + print_file(file, indent+1, "(unsigned char *)&%s%s,\n", + local_var_prefix, + var->name); + print_file(file, indent+1, "0x%02x /* %s */);\n", type->type, string_of_type(type->type)); + } + else + print_phase_basetype(file, indent, local_var_prefix, phase, pass, var, var->name); + } } - else if (!is_ptr(var->type)) + else if (is_struct(type->type)) { - switch (rtype) + switch (get_struct_type(type)) { case RPC_FC_STRUCT: case RPC_FC_PSTRUCT: @@ -3228,7 +3241,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_function(file, indent, "ComplexStruct", local_var_prefix, phase, var, start_offset); break; default: - error("write_remoting_arguments: Unsupported type: %s (0x%02x)\n", var->name, rtype); + error("write_remoting_arguments: Unsupported type: %s (0x%02x)\n", var->name, get_struct_type(type)); } } else @@ -3236,13 +3249,21 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const const type_t *ref = type_pointer_get_ref(type); if (type->type == RPC_FC_RP && is_base_type(ref->type)) { - if (phase != PHASE_FREE) - print_phase_basetype(file, indent, local_var_prefix, phase, pass, var, var->name); + /* base types have known sizes, so don't need a sizing pass + * and don't have any memory to free and so don't need a + * freeing pass */ + if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) + { + if (ref->type == RPC_FC_ENUM16 || ref->type == RPC_FC_ENUM32) + print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, start_offset); + else + print_phase_basetype(file, indent, local_var_prefix, phase, pass, var, var->name); + } } else if (type->type == RPC_FC_RP && get_struct_type(ref) == RPC_FC_STRUCT && !is_user_type(ref)) { - if (phase != PHASE_BUFFERSIZE && phase != PHASE_FREE) + if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) print_phase_function(file, indent, "SimpleStruct", local_var_prefix, phase, var, ref->typestring_offset);

1 0