June 2007 - Wine-devel - list.winehq.org

VST wrapper
by Nathaniel Gray 25 Jun '07

25 Jun '07

Hi, I'm interested in the goal of using Windows VST/VSTi audio plugins on my Intel Mac in OS X. I found the fst project, did some porting, and managed to get a few VSTs to work, which had me pretty stoked. Thanks to the FST folks and the Wine team for making this possible! On the other hand, I'd rather have the option of running the plugins in-process with my DAW software instead of as separate processes connected by JACK. I can imagine a super-thin layer of code that just translates calls between the plugin and the host and allows the plugin to access the Win32 API. In case I'm being unclear, here's how it breaks down. There's a host application that's native OS X and knows nothing about Wine. I'd like to write a plugin that, when it's loaded, will load a windows dll. The host will call into the plugin, which will call into the dll. The dll will make upcalls to the plugin, which will in turn call up to the host. The dll will probably be running a windows gui as well and making calls to various windows APIs. So is this possible? I'm pretty new to Wine and Windows programming so forgive me if the answer to this question is obvious. I've seen plenty of examples of how to build and run .exes that are windows programs from the ground up, but I've never seen wine used as part of a plugin. If it's possible, can you point me to any examples? What are the relevant parts of Wine I should look at? Thanks, -n8 -- >>>-- Nathaniel Gray -- Caltech Computer Science ------> >>>-- Mojave Project -- http://mojave.cs.caltech.edu -->

2 1

Re: VST wrapper
by Nathaniel Gray 25 Jun '07

25 Jun '07

By the way, please CC me with replies. I'm not set up to receive mail from the list. Thanks, -n8 -- >>>-- Nathaniel Gray -- Caltech Computer Science ------> >>>-- Mojave Project -- http://mojave.cs.caltech.edu -->

2 1

fix for wine < 0.9.24 segfault on startup
by Damjan Jovanovic 25 Jun '07

25 Jun '07

Hi On Ubuntu 7.04, versions of wine before around 0.9.24 die on startup with an undebuggable segmentation fault. After this bug stopped me from doing 2 regression tests, I decided to reverse regression test for the fix to the bug, and I found that the patch at http://www.winehq.org/pipermail/wine-cvs/2006-November/027508.html allows earlier versions of wine to run successfully. Thought this might be helpful to others Damjan

1 0

WIDL: Implement support for explicit user handles
by Eric Kohl 24 Jun '07

24 Jun '07

This patch implements support for explicit user handles. Regards Eric Kohl ChangeLog: Implement support for explicit user handles. diff --git a/tools/widl/client.c b/tools/widl/client.c index 86ead20..6a84e94 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -89,12 +89,14 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const var_t *def = func->def; const var_t* explicit_handle_var; + const var_t* explicit_user_handle_var; /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); + explicit_user_handle_var = get_explicit_user_handle_var(func); if (explicit_handle) { - if (!explicit_handle_var) + if (!explicit_handle_var && !explicit_user_handle_var) { error("%s() does not define an explicit binding handle!\n", def->name); return; @@ -102,7 +104,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) } else if (implicit_handle) { - if (explicit_handle_var) + if (explicit_handle_var || explicit_user_handle_var) { error("%s() must not define a binding handle!\n", def->name); return; @@ -167,6 +169,19 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("_Handle = %s;\n", explicit_handle_var->name); fprintf(client, "\n"); } + else if (explicit_user_handle_var) + { + print_client("_Handle = %s_bind(%s);\n", + explicit_user_handle_var->type->name, + explicit_user_handle_var->name); + print_client("if (_Handle == 0)\n"); + print_client("{\n"); + indent++; + print_client("RpcRaiseException(RPC_S_INVALID_BINDING);\n"); + indent--; + print_client("}\n"); + fprintf(client, "\n"); + } write_remoting_arguments(client, indent, func, PASS_IN, PHASE_BUFFERSIZE); @@ -240,6 +255,19 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("NdrFreeBuffer((PMIDL_STUB_MESSAGE)&_StubMsg);\n"); + if (explicit_user_handle_var) + { + fprintf(client, "\n"); + print_client("if (_Handle)\n"); + print_client("{\n"); + indent++; + print_client("%s_unbind(%s, _Handle);\n", + explicit_user_handle_var->type->name, + explicit_user_handle_var->name); + indent--; + print_client("}\n"); + } + indent--; print_client("}\n"); print_client("RpcEndFinally\n"); diff --git a/tools/widl/header.c b/tools/widl/header.c index 6f2da32..1119542 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -463,6 +463,21 @@ const var_t* get_explicit_handle_var(const func_t* func) return NULL; } +const var_t* get_explicit_user_handle_var(const func_t* func) +{ + const var_t* var; + + if (!func->args) + return NULL; + + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if ((var->type->type != RPC_FC_BIND_PRIMITIVE) && + is_attr(var->type->attrs, ATTR_HANDLE)) + return var; + + return NULL; +} + int has_out_arg_or_return(const func_t *func) { const var_t *var; @@ -480,6 +495,40 @@ int has_out_arg_or_return(const func_t *func) return 0; } +static struct list user_handle_list = LIST_INIT(user_handle_list); + +struct user_handle +{ + struct list entry; + char name[1]; +}; + +void add_user_handle(type_t *type) +{ + struct user_handle *uh; + + if (is_attr(type->attrs, ATTR_HANDLE)) + { + uh = (struct user_handle *)xmalloc(sizeof(struct user_handle) + strlen(type->name)); + if (uh) + { + strcpy(uh->name, type->name); + list_add_tail(&user_handle_list, &uh->entry); + } + } +} + +void write_user_handles(void) +{ + const struct user_handle *uh; + + LIST_FOR_EACH_ENTRY(uh, &user_handle_list, struct user_handle, entry) + { + fprintf(header, "handle_t __RPC_USER %s_bind(%s);\n", uh->name, uh->name); + fprintf(header, "void __RPC_USER %s_unbind(%s, handle_t);\n", uh->name, uh->name); + } +} + /********** INTERFACES **********/ @@ -710,6 +759,7 @@ static void write_function_protos(const type_t *iface) const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); const var_t* explicit_handle_var; + const var_t* explicit_user_handle_var; const func_t *cur; int prefixes_differ = strcmp(prefix_client, prefix_server); @@ -720,13 +770,19 @@ static void write_function_protos(const type_t *iface) /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(cur); - if (explicit_handle) { - if (!explicit_handle_var) { + explicit_user_handle_var = get_explicit_user_handle_var(cur); + if (explicit_handle) + { + if (!explicit_handle_var && !explicit_user_handle_var) + { error("%s() does not define an explicit binding handle!\n", def->name); return; } - } else if (implicit_handle) { - if (explicit_handle_var) { + } + else if (implicit_handle) + { + if (explicit_handle_var || explicit_user_handle_var) + { error("%s() must not define a binding handle!\n", def->name); return; } diff --git a/tools/widl/header.h b/tools/widl/header.h index 54655a2..7a6508b 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -53,9 +53,12 @@ extern void write_externdef(const var_t *v); extern void write_library(const char *name, const attr_list_t *attr); extern void write_user_types(void); extern const var_t* get_explicit_handle_var(const func_t* func); +extern const var_t* get_explicit_user_handle_var(const func_t* func); extern int has_out_arg_or_return(const func_t *func); extern void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid); +extern void add_user_handle(type_t *type); +extern void write_user_handles(void); static inline int last_ptr(const type_t *type) { diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4933c43..a6df42d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1932,7 +1932,10 @@ static void process_typedefs(pident_list_t *pidents) type_t *type = find_type(var->name, 0); if (! parse_only && do_header) + { write_typedef(type); + add_user_handle(type); + } if (in_typelib && type->attrs) add_typelib_entry(type); diff --git a/tools/widl/server.c b/tools/widl/server.c index fd94c9a..2e261e5 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -61,6 +61,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) const func_t *func; const var_t *var; const var_t* explicit_handle_var; + const var_t* explicit_user_handle_var; if (!iface->funcs) return; LIST_FOR_EACH_ENTRY( func, iface->funcs, const func_t, entry ) @@ -69,9 +70,10 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); + explicit_user_handle_var = get_explicit_user_handle_var(func); if (explicit_handle) { - if (!explicit_handle_var) + if (!explicit_handle_var && !explicit_user_handle_var) { error("%s() does not define an explicit binding handle!\n", def->name); return; @@ -79,7 +81,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) } else if (implicit_handle) { - if (explicit_handle_var) + if (explicit_handle_var || explicit_user_handle_var) { error("%s() must not define a binding handle!\n", def->name); return; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 21657b6..0af449d 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -409,6 +409,7 @@ int main(int argc,char *argv[]) if(do_header) { fprintf(header, "/* Begin additional prototypes for all interfaces */\n"); fprintf(header, "\n"); + write_user_handles(); write_user_types(); fprintf(header, "\n"); fprintf(header, "/* End additional prototypes */\n");

1 0

wine menus
by Damjan Jovanovic 24 Jun '07

24 Jun '07

Hi At the moment, wine builds fd.o menus by calling winemenubuilder and wineshelllink when shell32's IPersistFile_fnSave is invoked. This both misses menus copied directly into the menu directory without calling IPersistFile_fnSave, and provides no way to remove the menus when the app is uninstalled. Wine also keeps .lnk files in ~/.wine/drive_c/windows/profiles/<user>/Start Menu/ just like Windows does, and those .lnk files seem like a much better representation of the menus that should appear on the system, because they are also deleted when an app is uninstalled. Is it possible to add a new utility, or patch an existing utility like wineboot, to synchronize between wine's .lnk files in the windows directory and the fd.o menus, instead of using winemenubuilder/wineshelllink? Would a patch that does that be okay? Thank you Damjan

7 9

Re: msi: Fix use of uninitialized variable (Coverity) (Try 3)
by James Hawkins 24 Jun '07

24 Jun '07

On 6/23/07, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > [Reverting to "Plan A":] > This patch should fix Coverity bug CID-562. Additionally, I have pinpointed > another suspected use-before-initialization bug, for future consideration. > > -- Andy. > --- > Changelog: > msi: Fix use of uninitialized variable (Coverity). > > diff -urN a/dlls/msi/action.c b/dlls/msi/action.c > --- a/dlls/msi/action.c 2007-06-18 17:52:27.000000000 +0100 > +++ b/dlls/msi/action.c 2007-06-23 22:19:03.000000000 +0100 > @@ -4668,7 +4668,7 @@ > > res = env_set_flags(&name, &deformatted, &flags); > if (res != ERROR_SUCCESS) > - goto done; > + goto done2; > > value = deformatted; > > @@ -4676,8 +4676,14 @@ > root = HKEY_LOCAL_MACHINE; > > res = RegOpenKeyExW(root, environment, 0, KEY_ALL_ACCESS, &env); > + /* > + * FIXME: RegCloseKey() should not be called with an invalid handle. > + * So should we simply "goto done2" here, if res != EXIT_SUCCESS, > + * or does RegOpenKeyEx() have any failure modes in which "env" does > + * get initialized? > + */ > if (res != ERROR_SUCCESS) > - goto done; > + goto done1; > > if (flags & ENV_ACT_REMOVE) > FIXME("Not removing environment variable on uninstall!\n"); > @@ -4686,14 +4692,14 @@ > res = RegQueryValueExW(env, name, NULL, &type, NULL, &size); > if ((res != ERROR_SUCCESS && res != ERROR_FILE_NOT_FOUND) || > (res == ERROR_SUCCESS && type != REG_SZ)) > - goto done; > + goto done1; > > if (res != ERROR_FILE_NOT_FOUND) > { > if (flags & ENV_ACT_SETABSENT) > { > res = ERROR_SUCCESS; > - goto done; > + goto done1; > } > > data = msi_alloc(size); > @@ -4705,12 +4711,12 @@ > > res = RegQueryValueExW(env, name, NULL, &type, (LPVOID)data, &size); > if (res != ERROR_SUCCESS) > - goto done; > + goto done1; > > if (flags & ENV_ACT_REMOVEMATCH && (!value || !lstrcmpW(data, value))) > { > res = RegDeleteKeyW(env, name); > - goto done; > + goto done1; > } > > size = (lstrlenW(value) + 1 + size) * sizeof(WCHAR); > @@ -4719,7 +4725,7 @@ > if (!newval) > { > res = ERROR_OUTOFMEMORY; > - goto done; > + goto done1; > } > > if (!(flags & ENV_MOD_MASK)) > @@ -4749,7 +4755,7 @@ > if (!newval) > { > res = ERROR_OUTOFMEMORY; > - goto done; > + goto done1; > } > > lstrcpyW(newval, value); > @@ -4758,8 +4764,9 @@ > TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(newval)); > res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); > > -done: > +done1: > RegCloseKey(env); > +done2: > msi_free(deformatted); > msi_free(data); > msi_free(newval); > This is uglier than the other patch. The only change needed in this entire function is to set env to NULL initially. There's nothing wrong with calling RegCloseKey(NULL-var) and it's done everywhere in the code base. -- James Hawkins

1 0

Re: msi: Fix use of uninitialized variable (Coverity) (Try 2)
by James Hawkins 24 Jun '07

24 Jun '07

On 6/23/07, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > This patch should fix Coverity bug CID-562. > > -- Andy. > --- > Changelog: > msi: Fix use of uninitialized variable (Coverity). > > diff -urN a/dlls/msi/action.c b/dlls/msi/action.c > --- a/dlls/msi/action.c 2007-06-18 17:52:27.000000000 +0100 > +++ b/dlls/msi/action.c 2007-06-23 17:08:55.000000000 +0100 > @@ -4648,7 +4648,7 @@ > LPWSTR deformatted, ptr; > DWORD flags, type, size; > LONG res; > - HKEY env, root = HKEY_CURRENT_USER; > + HKEY env = NULL, root = HKEY_CURRENT_USER; > > static const WCHAR environment[] = > {'S','y','s','t','e','m','\\', > @@ -4759,7 +4759,7 @@ > res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); > > done: > - RegCloseKey(env); > + if (env) RegCloseKey(env); > msi_free(deformatted); > msi_free(data); > msi_free(newval); > Please don't check env for NULL; RegCloseKey will just fail harmlessly if env is NULL. We spent a lot of time removing such checks. -- James Hawkins

4 3

Bugzilla mails and people replying to wine-bugs@winehq.com
by Tom Spear 23 Jun '07

23 Jun '07

Just curious how trivial it would be to add a note to the bugzilla mail template saying to post replies to comments in the bug? Something like the following: A bug you are watching, Bug #(bug number), has a new comment. To reply to this comment, click (bug link). Then the rest of the email as it currently appears. I'm asking because I have received several replies to the list recently, and once wine reaches 1.0, I'm sure many more people will join the list and do the same. I don't want comments to be lost due to them not being posted in the proper place, as everyone's input on a bug is important. -- Thanks Tom

3 3

Wine on SkyOS
by Tom Wickline 23 Jun '07

23 Jun '07

Hello All, Looks as if SkyOS will soon support Wine! Internals - Many kernel updates like LDT support (required by Wine), updated signal handling, pthread support, and overall additional POSIX compatibility enhancements. http://www.skyos.org/?q=node/605 Tom

3 2

Re: msi: Fix use of uninitialized variable (Coverity)
by Paul Vriens 23 Jun '07

23 Jun '07

Andrew Talbot wrote: > This patch should fix Coverity bug CID-562. Additionally, I have pinpointed > another suspected use-before-initialization bug, for future consideration. > > -- Andy. > --- > Changelog: > msi: Fix use of uninitialized variable (Coverity). > Wouldn't it be easier to set env to NULL when declaring it and do a: if (env) RegCloseKey(env); Cheers, Paul.

2 1