January 2009 - Wine-Devel - list.winehq.org

[7/8] widl: move is_user_type from typegen to header
by Michael Karcher Jan. 10, 2009

Jan. 10, 2009

--- tools/widl/header.c | 24 ++++++++++++++++++++++++ tools/widl/header.h | 2 ++ tools/widl/typegen.c | 24 ------------------------ tools/widl/typegen.h | 1 - 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a3d2250..da42e95 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -119,6 +119,30 @@ int is_conformant_array(const type_t *t) return is_array(t) && type_array_has_conformance(t); } +type_t *get_user_type(const type_t *t, const char **pname) +{ + for (;;) + { + type_t *ut = get_attrp(t->attrs, ATTR_WIREMARSHAL); + if (ut) + { + if (pname) + *pname = t->name; + return ut; + } + + if (type_is_alias(t)) + t = t->orig; + else + return 0; + } +} + +int is_user_type(const type_t *t) +{ + return get_user_type(t, NULL) != NULL; +} + void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) { if (!uuid) return; diff --git a/tools/widl/header.h b/tools/widl/header.h index 89583e1..3f0eec1 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -32,6 +32,8 @@ extern int is_void(const type_t *t); extern int is_conformant_array(const type_t *t); extern int is_declptr(const type_t *t); extern type_t * get_deref_type(const type_t * t); +extern int is_user_type(const type_t *t); +extern type_t *get_user_type(const type_t *t, const char **pname); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9256bba..a7b7d0f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -502,30 +502,6 @@ static void guard_rec(type_t *type) type->typestring_offset = 1; } -static type_t *get_user_type(const type_t *t, const char **pname) -{ - for (;;) - { - type_t *ut = get_attrp(t->attrs, ATTR_WIREMARSHAL); - if (ut) - { - if (pname) - *pname = t->name; - return ut; - } - - if (type_is_alias(t)) - t = t->orig; - else - return 0; - } -} - -int is_user_type(const type_t *t) -{ - return get_user_type(t, NULL) != NULL; -} - static int is_embedded_complex(const type_t *type) { unsigned char tc = type->type; diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index b2c48df..f790d49 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -61,7 +61,6 @@ int decl_indirect(const type_t *t); void write_parameters_init(FILE *file, int indent, const var_t *func, const char *local_var_prefix); void print(FILE *file, int indent, const char *format, va_list ap); int get_padding(const var_list_t *fields); -int is_user_type(const type_t *t); expr_t *get_size_is_expr(const type_t *t, const char *name); int is_full_pointer_function(const var_t *func); void write_full_pointer_init(FILE *file, int indent, const var_t *func, int is_server); -- 1.5.6.5

2 1

[4/8] widl: add helper function get_deref_type
by Michael Karcher Jan. 10, 2009

Jan. 10, 2009

get_deref_type yields the type of array elements for arrays or the pointed-to type of pointers. Most important, it works on anything is_declptr returns true for. --- tools/widl/header.h | 1 + tools/widl/typegen.c | 15 +++++++++++---- tools/widl/write_msft.c | 3 +-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 6ac7cb0..89583e1 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -31,6 +31,7 @@ extern unsigned long get_attrv(const attr_list_t *list, enum attr_type t); extern int is_void(const type_t *t); extern int is_conformant_array(const type_t *t); extern int is_declptr(const type_t *t); +extern type_t * get_deref_type(const type_t * t); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7dfa0b2..9256bba 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1784,6 +1784,16 @@ int is_declptr(const type_t *t) return is_ptr(t) || (is_conformant_array(t) && !t->declarray); } +type_t * get_deref_type(const type_t * t) +{ + if (is_ptr(t)) + return type_pointer_get_ref(t); + else if (is_array(t)) + return type_array_get_element(t); + else + return NULL; +} + static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, unsigned int *typestring_offset) @@ -1812,10 +1822,7 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, start_offset = *typestring_offset; update_tfsoff(type, start_offset, file); - if (is_array(type)) - rtype = type_array_get_element(type)->type; - else - rtype = type_pointer_get_ref(type)->type; + rtype = get_deref_type(type)->type; if ((rtype != RPC_FC_BYTE) && (rtype != RPC_FC_CHAR) && (rtype != RPC_FC_WCHAR)) { diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 04195ff..a4eba3c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1116,8 +1116,7 @@ static int encode_var( vt = get_type_vt(type); if (vt == VT_PTR) { - type_t *ref = is_ptr(type) ? - type_pointer_get_ref(type) : type_array_get_element(type); + type_t *ref = get_deref_type(type); int skip_ptr = encode_var(typelib, ref, var, &target_type, NULL, NULL, &child_size); -- 1.5.6.5

2 2

[8/8] widl: consider ptrs to user-marshalled types as pointers-to-nonpointers
by Michael Karcher Jan. 10, 2009

Jan. 10, 2009

typdef [wire_marshal(wirefoo)] foo * pfoo; made widl incorrectly set the RPC_FC_P_DEREF bit for pfoo. But this declares a user-marshalled pointer, so the RPC runtime must not dereference it before passing it on to the UserFoo functions. --- tools/widl/header.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 3f0eec1..f572440 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -61,7 +61,8 @@ extern int is_const_decl(const var_t *var); static inline int last_ptr(const type_t *type) { - return is_ptr(type) && !is_declptr(type_pointer_get_ref(type)); + const type_t * ref = type_pointer_get_ref(type); + return is_ptr(type) && (is_user_type(ref) || !is_declptr(ref)); } static inline int last_array(const type_t *type) -- 1.5.6.5

2 1

[1/8] widl: fix handling of [local] functions without [call_as] (try 3)
by Michael Karcher Jan. 10, 2009

Jan. 10, 2009

Output NULL pointers into proxy table and STUB_FORWARDING_FUNCTION into stub tables if a local function has no call_as function associated, just as MIDL does. try 2: Fix various mistakes (one of them found by Rob Shearman) try 3: Rebased to current git --- tools/widl/proxy.c | 51 ++++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 878e820..4e69190 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -543,6 +543,17 @@ static int count_methods(type_t *iface) return count; } +static const statement_t * get_callas_source(const type_t * iface, const var_t * def) +{ + const statement_t * source; + STATEMENTS_FOR_EACH_FUNC( source, type_iface_get_stmts(iface)) { + const var_t * cas = is_callas(source->u.var->attrs ); + if (cas && !strcmp(def->name, cas->name)) + return source; + } + return NULL; +} + static int write_proxy_methods(type_t *iface, int skip) { const statement_t *stmt; @@ -554,8 +565,11 @@ static int write_proxy_methods(type_t *iface, int skip) STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { + if (i != func->type->details.function->idx ) + error("widl internal error: method index mismatch"); if (i) fprintf(proxy, ",\n"); - if (skip) print_proxy( "0 /* %s_%s_Proxy */", iface->name, get_name(func)); + if (skip || (is_local(func->attrs) && !get_callas_source(iface, func))) + print_proxy( "0 /* %s_%s_Proxy */", iface->name, get_name(func)); else print_proxy( "%s_%s_Proxy", iface->name, get_name(func)); i++; } @@ -575,10 +589,19 @@ static int write_stub_methods(type_t *iface, int skip) STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { const var_t *func = stmt->u.var; - if (!is_local(func->attrs)) { + if (!is_callas(func->attrs)) { + int missing = 0; + const char * fname = get_name(func); + if(is_local(func->attrs)) { + const statement_t * callas_source = get_callas_source(iface, func); + if(!callas_source) + missing = 1; + else + fname = get_name(callas_source->u.var); + } if (i) fprintf(proxy,",\n"); - if (skip) print_proxy("STUB_FORWARDING_FUNCTION"); - else print_proxy( "%s_%s_Stub", iface->name, get_name(func)); + if (skip || missing) print_proxy("STUB_FORWARDING_FUNCTION"); + else print_proxy( "%s_%s_Stub", iface->name, fname); i++; } } @@ -587,7 +610,7 @@ static int write_stub_methods(type_t *iface, int skip) static void write_proxy(type_t *iface, unsigned int *proc_offset) { - int midx = -1, count; + int count; const statement_t *stmt; int first_func = 1; @@ -619,28 +642,10 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) gen_proxy(iface, func, idx, *proc_offset); gen_stub(iface, func, cname, *proc_offset); *proc_offset += get_size_procformatstring_func( func ); - if (midx == -1) midx = idx; - else if (midx != idx) error("method index mismatch in write_proxy\n"); - midx++; - } - } - - /* interface didn't have any methods - search in inherited interfaces */ - if (midx == -1) { - const type_t *inherit_iface; - for (inherit_iface = type_iface_get_inherit(iface); - inherit_iface; - inherit_iface = type_iface_get_inherit(inherit_iface)) { - STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(inherit_iface)) { - const var_t *func = stmt->u.var; - int idx = func->type->details.function->idx; - if (idx + 1 > midx) midx = idx + 1; - } } } count = count_methods(iface); - if (midx != -1 && midx != count) error("invalid count %u/%u\n", count, midx); /* proxy vtable */ print_proxy( "static const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", count, iface->name); -- 1.5.6.5

3 3

[3/8] widl: use base pointer type instead of default if not overwritten. (resend)
by Michael Karcher Jan. 10, 2009

Jan. 10, 2009

--- tools/widl/proxy.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 4e69190..bb16b72 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -182,6 +182,11 @@ int cant_be_null(const var_t *v) if (is_ptr(type)) { + if (type->type == RPC_FC_FP || + type->type == RPC_FC_OP || + type->type == RPC_FC_UP) + return 0; + attrs = type->attrs; type = type_pointer_get_ref(type); } -- 1.5.6.5

2 1

[2/8] widl: Don't forget conformance info on [iid_is] void pointers. (resend)
by Michael Karcher Jan. 10, 2009

Jan. 10, 2009

--- 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 2b0e414..7dfa0b2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3046,7 +3046,7 @@ static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char } break; } - else if (type->type == RPC_FC_IP) + else if (type->type == RPC_FC_IP || type->type == 0) { expr_t *iid; -- 1.5.6.5

2 1

Re: advapi32: fix failing tests for Windows 2007
by Alexandre Julliard Jan. 10, 2009

Jan. 10, 2009

"Jeff Zaroyko" <jeffzaroyko(a)gmail.com> writes: > From 5f8813a25338ce88a150dac09e5811dd1246383f Mon Sep 17 00:00:00 2001 > From: Jeff Zaroyko <jeffz(a)jeffz.name> > Date: Sat, 10 Jan 2009 20:16:44 +1100 > Subject: advapi32: fix failing tests for Windows 2007 I don't think it makes sense to fix the tests for a beta version. We need to wait until the final release to find out which behavior changes are for real and which are just bugs in the beta. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: #ifdef out some code that is not needed on non-i386
by Alexandre Julliard Jan. 10, 2009

Jan. 10, 2009

"Austin English" <austinenglish(a)gmail.com> writes: > Alexandre fixed most of it in > 13df062d3686a9b1961f0877aa8aaccd1fdc7332, but missed these. Tested on > Linux with PPC/i386. Please don't add extra ifdefs to work around missing implementations. FormatMessage needs to be implemented on other platforms, and the warning only shows that the code is incomplete. The proper fix is to implement it, not silence the warning. This applies to most of your other patches as well. -- Alexandre Julliard julliard(a)winehq.org

1 0

running msys under wine
by Luke Kenneth Casson Leighton Jan. 10, 2009

Jan. 10, 2009

http://bugs.winehq.org/show_bug.cgi?id=13606 folks, hi, am running a configure script under wine, and it's _literally_ one to two seconds per sh.exe instance. i started running ./configure over two hours ago and there are about 100 lines of output so far, with a further 200 to go i am better off leaving this running overnight. as this is development work i am doing, not "building something that's already known to work" i have to call a halt to the development, because it is crazy to expect to have to wait four to six hours if i make a single change to configure.in or Makefile.pre.in - god help me if i have to run autoconf (fortunately i can do that from linux). ... so i did some investigation: strace -o log.txt -ff wine cmd followed by running c:\msys\msys.bat ignoring the fact that sh.exe crashed on me (which it doesn't do when you don't use strace) i was able to obtain some system call usage when firing up sh.exe, and it's _horrendous_. X11 keyboard files, X11 locale files, iconv, windows fonts, unix fonts - all to fire up c:/msys/bin/sh.exe ? further up the strace files, i'm looking at the biggest offender and it looks like it's reading files one byte at a time. reconstructing some of the sentences i can make out "remember that we get here even under command.com\r\n". ohhh i remember where i've seen that - that's in msys.bat. .... why is it being read one byte at a time?? there are _thousands_ of lines like this: rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 rt_sigprocmask(SIG_BLOCK, [HUP INT USR1 USR2 ALRM CHLD IO], [], 8) = 0 rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 read(13, "t", 1) = 1 rt_sigprocmask(SIG_BLOCK, [HUP INT USR1 USR2 ALRM CHLD IO], [], 8) = 0 write(3, "7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 64) = 64 read(6, "\r\0\0\300\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 64) = 64 rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 rt_sigprocmask(SIG_BLOCK, [HUP INT USR1 USR2 ALRM CHLD IO], [], 8) = 0 write(3, "4\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 64) = 64 read(6, "$\0\0\300\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 64) = 64 rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 rt_sigprocmask(SIG_BLOCK, [HUP INT USR1 USR2 ALRM CHLD IO], [], 8) = 0 rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 checking earlier in the same strace log file (the one that loaded msys.bat one byte at a time) _again_ i see font-loading (every single one on my system). there are _forty_ instances of libraries being loaded - per process! open("/usr/lib/locale/locale-archive", O_RDONLY) = 3 open("/usr/lib/gconv/gconv-modules.cache", O_RDONLY) = 3 open("/usr/lib/libwine.so.1", O_RDONLY) = 3 open("/usr/lib/wine/wine-pthread", O_RDONLY) = 3 open("/usr/lib/libwine.so.1", O_RDONLY) = 3 open("/usr/lib/wine/ntdll.dll.so", O_RDONLY) = 3 open("/usr/lib/wine/kernel32.dll.so", O_RDONLY) = 7 open("/usr/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE) = 7 open("/usr/lib/wine/cmd.exe.so", O_RDONLY) = 10 open("/usr/lib/wine/shell32.dll.so", O_RDONLY) = 10 open("/usr/lib/wine/shlwapi.dll.so", O_RDONLY) = 10 open("/usr/lib/wine/user32.dll.so", O_RDONLY) = 10 open("/usr/lib/wine/gdi32.dll.so", O_RDONLY) = 10 open("/usr/lib/wine/advapi32.dll.so", O_RDONLY) = 10 open("/usr/lib/wine/comctl32.dll.so", O_RDONLY) = 10 open("/usr/lib/wine/krnl386.exe16", O_RDONLY|O_LARGEFILE) = 10 open("/usr/lib/wine/system.drv16", O_RDONLY|O_LARGEFILE) = 10 open("/usr/lib/wine/gdi.exe16", O_RDONLY|O_LARGEFILE) = 10 open("/usr/lib32/libfreetype.so.6", O_RDONLY) = 10 open("/usr/lib32/libz.so.1", O_RDONLY) = 10 open("/usr/lib32/libexpat.so.1", O_RDONLY) = 10 open("/usr/lib/wine/user.exe16", O_RDONLY|O_LARGEFILE) = 10 open("/usr/lib/wine/winex11.drv.so", O_RDONLY) = 10 open("/usr/lib32/libSM.so.6", O_RDONLY) = 10 open("/usr/lib32/libICE.so.6", O_RDONLY) = 10 open("/usr/lib32/libXxf86vm.so.1", O_RDONLY) = 10 open("/usr/lib32/libXext.so.6", O_RDONLY) = 10 open("/usr/lib32/libX11.so.6", O_RDONLY) = 10 open("/usr/lib32/libXau.so.6", O_RDONLY) = 10 open("/usr/lib32/libxcb-xlib.so.0", O_RDONLY) = 10 open("/usr/lib32/libxcb.so.1", O_RDONLY) = 10 open("/usr/lib32/libXdmcp.so.6", O_RDONLY) = 10 open("/usr/lib/wine/imm32.dll.so", O_RDONLY) = 10 open("/usr/lib32/libXinerama.so.1", O_RDONLY) = 11 open("/usr/lib32/libXrender.so.1", O_RDONLY) = 11 open("/usr/lib32/libXrandr.so.2", O_RDONLY) = 11 open("/usr/lib32/libXcomposite.so.1", O_RDONLY) = 11 open("/usr/lib32/libXfixes.so.3", O_RDONLY) = 11 open("/usr/lib32/libXcursor.so.1", O_RDONLY) = 11 open("/usr/lib/wine/uxtheme.dll.so", O_RDONLY) = 11 open("/usr/lib/wine/ole32.dll.so", O_RDONLY) = 11 open("/usr/lib/wine/rpcrt4.dll.so", O_RDONLY) = 11 open("/usr/lib/wine/iphlpapi.dll.so", O_RDONLY) = 11 open("/usr/lib/wine/start.exe.so", O_RDONLY|O_LARGEFILE) = 7 surely, on a console-based command shell, all of the fonts and the X11 libraries can be skipped? l.

4 6

Re: [PATCH 1/2] Add definitions used by reparse points
by Paul TBBle Hampson Jan. 10, 2009

Jan. 10, 2009

On Wed, Jan 07, 2009 at 07:24:07PM +1100, Paul TBBle Hampson wrote: > Resend, removing C++-style comments > -- > Paul "TBBle" Hampson, Paul.Hampson(a)Pobox.com > Shorter .sig for a more eco-friendly paperless office. Any comments on this patch series? The only thing I've had for this resend of the two patches is that it's kinda long. I'm thinking if I need to split the second patch up further, I'd break it up into a patch that creates the test without doing any actual reparse point work (ie create directory, create files, count files, delete files, count files, clean up) and then one that does the junction point creation and tests that it matches the directory being linked to... I'm not sure that's a particularly useful change, but I can do it. Otherwise, is there anything else I'm dong wrong? -- ----------------------------------------------------------- Paul "TBBle" Hampson, B.Sc, LPI, MCSE Very-later-year Asian Studies student, ANU The Boss, Bubblesworth Pty Ltd (ABN: 51 095 284 361) Paul.Hampson(a)Pobox.com Of course Pacman didn't influence us as kids. If it did, we'd be running around in darkened rooms, popping pills and listening to repetitive music. -- Kristian Wilson, Nintendo, Inc, 1989 License: http://creativecommons.org/licenses/by/2.5/au/ -----------------------------------------------------------

1 0