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

re: How to make your machine crash when running Wine
by Dan Kegel June 26, 2007

June 26, 2007

There's a similar discussion going on here: http://www.linuxforums.org/forum/wine/96022-wine-hard-system-freeze-new-pos… --- snip --- i had the same problem. I use wine with Ubuntu Daper on Core T7200 Duo Laptop. I moved from the kernel 2.6.15-28-386 to 2.6.15-28-686 and wine starts to freeze. * moving from nvidia to vesa-driver -> no luck * set Hyperthreading-kernelswitch ht=on to ht=off -> no luck After moving back to 2.6.15-28-386 it worked again. The workaround ist to use the 386-kernel. (Linux version 2.6.15-28-386 (buildd(a)terranova) (gcc version 4.0.3 (Ubuntu 4.0.3-1ubuntu5)) #1 PREEMPT Thu May 10 09:45:43 UTC 2007) PS: I used wine_0.9.39~winehq0~ubuntu~6.06-1_i386.deb and wine_0.9.9-0ubuntu2_i386.deb --- snip ---

1 0

Using Rx Controls (Delphi) [resend]
by Anatoly Lyutin June 26, 2007

June 26, 2007

-- Best regards Anatoly Lyutin.

1 0

Re: msi [1/6]: Add support for remote handles
by Alexandre Julliard June 26, 2007

June 26, 2007

"James Hawkins" <truiken(a)gmail.com> writes: > @@ -215,18 +282,28 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE han > > EnterCriticalSection( &MSI_handle_cs ); > > - info = msihandle2msiinfo(handle, 0); > - if( !info ) > - goto out; > - > - if( info->magic != MSIHANDLE_MAGIC ) > + unk = msi_get_remote( handle ); > + if (unk) > + IUnknown_Release( unk ); > + else > { It seems to me you are leaking the object here, the handle entry holds a ref to it too. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: About stdlib.h system()
by Kirill K. Smirnov June 26, 2007

June 26, 2007

I've tried MSVC 6.0 and MSVC 2003. All the same - it works. Please, check your sources. I have no idea where the bug can be. > Yes, the mingw-gcc case works. > But I use the Visual C++ 7.0 to compile. It still fails. > > On 6/26/07, Kirill K. Smirnov <lich(a)math.spbu.ru> wrote: > > Hi, > > > > I've tried to reproduce, but failed: > > > > a.c: > > #include <stdio.h> > > #include <stdlib.h> > > > > int main(void) > > { > > system("qqq.exe"); > > return 0; > > } > > > > > > $ mingw-gcc -mconsole -mno-cygwin a.c > > $ wine a.exe > > > > It works. > > > > $ mingw-gcc a.c > > $ wine a.exe > > > > It works too. > > > > Executable qqq.exe exists in ~/.wine/drive_c/windows directory. > > > > -- > > Kirill

1 0

About stdlib.h system()
by Kirill K. Smirnov June 26, 2007

June 26, 2007

Hi, I've tried to reproduce, but failed: a.c: #include <stdio.h> #include <stdlib.h> int main(void) { system("qqq.exe"); return 0; } $ mingw-gcc -mconsole -mno-cygwin a.c $ wine a.exe It works. $ mingw-gcc a.c $ wine a.exe It works too. Executable qqq.exe exists in ~/.wine/drive_c/windows directory. -- Kirill

2 1

please help me with filling a bug concerning WM_ERASEBKGND
by RusH June 26, 2007

June 26, 2007

searching bugzilla for WM_ERASEBKGND returns lots of bugs, but I have no idea if mine is there http://bugs.winehq.org/buglist.cgi?query_format=&short_desc_type=allwordssu… The bug is weird. Running uTorrent (latest beta ) http://download.utorrent.com/beta/utorrent-1.7-beta-2899.uncompressed.exe with wine set to emulate XP is fine, but when you set it to Windows 98 or lower wine stops sending WM_ERASEBKGND (or/and breaks WM_PAINT). background surfaces are not repainted and remain black. is this http://bugs.winehq.org/show_bug.cgi?id=6006 ? Il try to compile latest git with patches from that bug before filling new one. -- Who logs in to gdm? Not I, said the duck.

1 0

user32 patch unaccepted
by Clinton Stimpson June 26, 2007

June 26, 2007

Was there anything wrong with this patch, that it didn't get accepted? <http://www.winehq.org/pipermail/wine-patches/2007-March/037272.html> It limits update regions to the nearest clipping parent window. Thanks Clinton Stimpson

1 0

Re: gdi32: Multi-character character constants aren't portable as their behaviour is compiler dependent according to the C standard. Found by sparse.
by James Hawkins June 25, 2007

June 25, 2007

On 6/25/07, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > I have no way to test this patch as i don't have a Mac. > > bye > michael > --- > dlls/gdi32/freetype.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c > index 424fb3d..bcf16ae 100644 > --- a/dlls/gdi32/freetype.c > +++ b/dlls/gdi32/freetype.c > @@ -590,6 +590,7 @@ static char **expand_mac_font(const char *path) > unsigned short *num_faces_ptr, num_faces, face; > AsscEntry *assoc; > Handle fond; > + ResType fond_res = 0x464f4e44 /* 'FOND' */; > > fond = Get1IndResource('FOND', idx); > if(!fond) break; Did you mean to replace 'FOND' in the Get1IndResource call with fond_res? > @@ -605,6 +606,7 @@ static char **expand_mac_font(const char *path) > for(face = 0; face < num_faces; face++, assoc++) > { > Handle sfnt; > + ResType sfnt_res = 0x73666e74 /* 'sfnt' */ > unsigned short size, font_id; > char *output; > > @@ -617,7 +619,7 @@ static char **expand_mac_font(const char *path) > } > > TRACE("trying to load sfnt id %04x\n", font_id); > - sfnt = GetResource('sfnt', font_id); > + sfnt = GetResource(sfnt_res, font_id); > if(!sfnt) > { > TRACE("can't get sfnt resource %04x\n", font_id); > -- > 1.5.0.6 > -- James Hawkins

1 0

re: WIDL: Implement support for explicit user handles
by Dan Kegel June 25, 2007

June 25, 2007

Eric wrote: > This patch implements support for explicit user handles. Say, could you add a test for that? I think Dan H. usually adds tests to rpcrt4 whenever he adds a feature to widl. cf. http://source.winehq.org/git/?p=wine.git&a=search&st=author&s=dsh - Dan

1 0

Re: [5/5] WineD3D: Implement mipmap auto generation
by Stefan Dösinger June 25, 2007

June 25, 2007

Am Montag, 25. Juni 2007 14:42 schrieb Stefan Dösinger: > I have no application that needs this, so this is an untested per-msdn > implementation. Do not apply this patch yet. It's missing some check in LoadTexture to not upload sublevels manually if autogen is on

1 0

Re: [3/5] WineD3D: rsq and rcp use the .w component if no swizzle is given
by H. Verbeet June 25, 2007

June 25, 2007

On 25/06/07, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > + 0x0009fffe, 0x58443344, 0x68532038, /* No idea about that stuff, */ > + 0x72656461, 0x73734120, 0x6c626d65, /* vsa.exe generated it */ > + 0x56207265, 0x69737265, 0x30206e6f, /* And without it windows complains*/ > + 0x0031392e, That looks pretty bad, imo.

2 1

Re: mshtml #14: Added more QueryInterface tests.
by Detlef Riekenberg June 25, 2007

June 25, 2007

On So, 2007-06-24 at 21:10 +0200, Jacek Caban wrote: > + ok(qi == NULL, "runnable=%p, ezpected NULL\n", qi) The Patch is in the Tree, but I suggest to change: "ezpected" to "expected" in several Places. Thanks, with greetings from Copy and Paste -- By by ... Detlef

2 1

Making the wiki FAQ live
by Scott Ritchie June 25, 2007

June 25, 2007

So, about a month ago we discussed the idea of replacing the documentation FAQ with one based in the wiki. Nothing was done, but the general consensus seemed to be to wait and see if the wiki approach worked out better. Since that time, the Wiki FAQ has been updated by 7 people other than myself. We've removed most of the cruft, and taken the FAQ from an unhelpful mess to something a user actually should read. Meanwhile, the original FAQ has been unchanged. It's not done, but I think it's time to take it live and make the wiki FAQ our official FAQ, and then remove the old one from the documentation build. Based on the past month alone, I think it's fairly safe to say that it's easier to maintain, update, and keep relevant this way. I've already sent a patch for lostwages to wine-devel. Thanks, Scott Ritchie

3 3

re: VST wrapper
by Dan Kegel June 25, 2007

June 25, 2007

Hi N8, > [How can I write a shared library that uses Wine and > can be called from a non-winelib app?] This is a somewhat frequently asked question. As Stephan explained, wine's code requires that the process have been set up somewhat specially. This is taken care of by the sources in the loader subdirectory. In a perfect world, some of that code would move into the operating system's process loader... then one could mix and match win32 and unix calls more easily. Anyway, knowing about the code in that directory is key to understanding why what you ask is hard, and in finding a workaround. - Dan

2 1

Re: [3/5] WineD3D: rsq and rcp use the .w component if no swizzle is given
by Frank Richter June 25, 2007

June 25, 2007

On 25.06.2007 16:03, H. Verbeet wrote: > On 25/06/07, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: >> + 0x0009fffe, 0x58443344, 0x68532038, /* No >> idea about that stuff, */ >> + 0x72656461, 0x73734120, 0x6c626d65, /* >> vsa.exe generated it */ >> + 0x56207265, 0x69737265, 0x30206e6f, /* And >> without it windows complains*/ >> + 0x0031392e, > That looks pretty bad, imo. FWIW, that comment reads "D3DX8 Shader Assembler Version 0.91". -f.r.

1 0

configure:2479: error: C compiler cannot create executables
by jens＠jens June 25, 2007

June 25, 2007

This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Wine configure 0.9.39, which was generated by GNU Autoconf 2.61. Invocation command line was $ ./configure --prefix=/opt/wine --with-x ## --------- ## ## Platform. ## ## --------- ## hostname = jens uname -m = x86_64 uname -r = 2.6.20-15-generic uname -s = Linux uname -v = #2 SMP Sun Apr 15 06:17:24 UTC 2007 /usr/bin/uname -p = unknown /bin/uname -X = unknown /bin/arch = x86_64 /usr/bin/arch -k = unknown /usr/convex/getsysinfo = unknown /usr/bin/hostinfo = unknown /bin/machine = unknown /usr/bin/oslevel = unknown /bin/universe = unknown PATH: /usr/local/sbin PATH: /usr/local/bin PATH: /usr/sbin PATH: /usr/bin PATH: /sbin PATH: /bin PATH: /usr/games ## ----------- ## ## Core tests. ## ## ----------- ## configure:1888: checking build system type configure:1906: result: x86_64-unknown-linux-gnu configure:1928: checking host system type configure:1943: result: x86_64-unknown-linux-gnu configure:2008: checking whether make sets $(MAKE) configure:2029: result: yes configure:2086: checking for gcc configure:2113: result: gcc -m32 configure:2351: checking for C compiler version configure:2358: gcc -m32 --version >&5 gcc (GCC) 4.1.2 (Ubuntu 4.1.2-0ubuntu4) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. configure:2361: $? = 0 configure:2368: gcc -m32 -v >&5 Using built-in specs. Target: x86_64-linux-gnu Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release x86_64-linux-gnu Thread model: posix gcc version 4.1.2 (Ubuntu 4.1.2-0ubuntu4) configure:2371: $? = 0 configure:2378: gcc -m32 -V >&5 gcc: '-V' must come at the start of the command line configure:2381: $? = 1 configure:2404: checking for C compiler default output file name configure:2431: gcc -m32 /usr/lib32 conftest.c >&5 /usr/bin/ld: /usr/lib32: No such file: File format not recognized collect2: ld returned 1 exit status configure:2434: $? = 1 configure:2472: result: configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "Wine" | #define PACKAGE_TARNAME "wine" | #define PACKAGE_VERSION "0.9.39" | #define PACKAGE_STRING "Wine 0.9.39" | #define PACKAGE_BUGREPORT "wine-devel(a)winehq.org" | /* end confdefs.h. */ | | int | main () | { | | ; | return 0; | } configure:2479: error: C compiler cannot create executables See `config.log' for more details. ## ---------------- ## ## Cache variables. ## ## ---------------- ## ac_cv_build=x86_64-unknown-linux-gnu ac_cv_env_CCC_set= ac_cv_env_CCC_value= ac_cv_env_CC_set= ac_cv_env_CC_value= ac_cv_env_CFLAGS_set= ac_cv_env_CFLAGS_value= ac_cv_env_CPPFLAGS_set= ac_cv_env_CPPFLAGS_value= ac_cv_env_CPP_set= ac_cv_env_CPP_value= ac_cv_env_CXXFLAGS_set= ac_cv_env_CXXFLAGS_value= ac_cv_env_CXX_set= ac_cv_env_CXX_value= ac_cv_env_LDFLAGS_set=set ac_cv_env_LDFLAGS_value=/usr/lib32 ac_cv_env_LIBS_set= ac_cv_env_LIBS_value= ac_cv_env_XMKMF_set= ac_cv_env_XMKMF_value= ac_cv_env_build_alias_set= ac_cv_env_build_alias_value= ac_cv_env_host_alias_set= ac_cv_env_host_alias_value= ac_cv_env_target_alias_set= ac_cv_env_target_alias_value= ac_cv_host=x86_64-unknown-linux-gnu ac_cv_prog_ac_ct_CC='gcc -m32' ac_cv_prog_make_make_set=yes ## ----------------- ## ## Output variables. ## ## ----------------- ## ALSALIBS='' AR='' AS='as --32' AUDIOIOLIBS='' BISON='' BUILTINFLAG='' CARBONLIB='' CC='gcc -m32' CFLAGS='' COREAUDIO='' COREFOUNDATIONLIB='' CPP='' CPPBIN='' CPPFLAGS='' CROSSCC='' CROSSTEST='' CROSSWINDRES='' CRTLIBS='' CXX='' CXXFLAGS='' DEFS='' DEPENDENCIES='' DISKARBITRATIONLIB='' DLLEXT='' DLLFLAGS='' DLLTOOL='' DLLWRAP='' ECHO_C='' ECHO_N='-n' ECHO_T='' EGREP='' ESDCONFIG='' ESDINCL='' ESDLIBS='' EXEEXT='' EXTRACFLAGS='' EXTRA_BINARIES='' FLEX='' FONTFORGE='' FONTSSUBDIRS='' FREETYPEINCL='' FREETYPELIBS='' GLU32FILES='' GPHOTO2INCL='' GPHOTO2LIBS='' GREP='' HALINCL='' ICULIBS='' IMPLIBEXT='' INSTALL_DATA='' INSTALL_PROGRAM='' INSTALL_SCRIPT='' IOKITLIB='' LCMSLIBS='' LD='ld -m elf_i386' LDAPLIBS='' LDCONFIG='' LDD='' LDDLLFLAGS='' LDEXECFLAGS='' LDFLAGS='/usr/lib32' LDPATH='' LDSHARED='' LIBDL='' LIBEXT='' LIBOBJS='' LIBPOLL='' LIBPTHREAD='' LIBS='' LIBWINE_LDFLAGS='' LINT='' LINTFLAGS='' LN='' LN_S='' LTLIBOBJS='' MAIN_BINARY='' MINGWAR='' NASLIBS='' OBJEXT='' OPENGLFILES='' OPENGL_LIBS='' PACKAGE_BUGREPORT='wine-devel(a)winehq.org' PACKAGE_NAME='Wine' PACKAGE_STRING='Wine 0.9.39' PACKAGE_TARNAME='wine' PACKAGE_VERSION='0.9.39' PATH_SEPARATOR=':' PKG_CONFIG='' PRELINK='' QUARTZFILES='' RANLIB='' RESOLVLIBS='' SANEINCL='' SET_MAKE='' SHELL='/bin/bash' SOCKETLIBS='' STRIP='' TOOLSDIR='' WIN16_FILES='$(WIN16_FILES)' WIN16_INSTALL='$(WIN16_INSTALL)' WINDRES='' XFILES='' XLIB='' XMKMF='' XML2INCL='' XML2LIBS='' XSLTINCL='' XSLTLIBS='' X_CFLAGS='' X_EXTRA_LIBS='' X_LIBS='' X_PRE_LIBS='' ac_ct_AS='' ac_ct_CC='gcc -m32' ac_ct_CXX='' bindir='${exec_prefix}/bin' build='x86_64-unknown-linux-gnu' build_alias='' build_cpu='x86_64' build_os='linux-gnu' build_vendor='unknown' datadir='${datarootdir}' datarootdir='${prefix}/share' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' dvidir='${docdir}' exec_prefix='NONE' ft_devel2='' ft_devel='' gphoto2_devel='' gphoto2port_devel='' host='x86_64-unknown-linux-gnu' host_alias='' host_cpu='i386' host_os='linux-gnu' host_vendor='unknown' htmldir='${docdir}' includedir='${prefix}/include' infodir='${datarootdir}/info' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' localedir='${datarootdir}/locale' localstatedir='${prefix}/var' mandir='${datarootdir}/man' oldincludedir='/usr/include' pdfdir='${docdir}' prefix='/opt/wine' program_transform_name='s,x,x,' psdir='${docdir}' sane_devel='' sbindir='${exec_prefix}/sbin' sharedstatedir='${prefix}/com' sysconfdir='${prefix}/etc' target_alias='' ## ------------------- ## ## File substitutions. ## ## ------------------- ## MAKE_DLL_RULES='' MAKE_IMPLIB_RULES='' MAKE_PROG_RULES='' MAKE_RULES='' MAKE_TEST_RULES='' ## ----------- ## ## confdefs.h. ## ## ----------- ## #define PACKAGE_NAME "Wine" #define PACKAGE_TARNAME "wine" #define PACKAGE_VERSION "0.9.39" #define PACKAGE_STRING "Wine 0.9.39" #define PACKAGE_BUGREPORT "wine-devel(a)winehq.org" configure: exit 77

3 2

Re: [Bug 8787] Manhunt: Video goes all black and haywire after intro movies.
by James Hawkins June 25, 2007

June 25, 2007

On 6/24/07, joe b <goce_jeb(a)yahoo.com> wrote: > Game will not install under wine though. That's why I had to install under > the windows partition. > > You can't file a bug report for a game you run from a Windows partition. It's not supported by Wine, mostly because we can't reproduce any bugs this way. If you can't install the game in Wine, then please open a bug report for that. -- James Hawkins

1 0

Re: user32,wined3d: move refresh rate fallback to catch all cases
by H. Verbeet June 25, 2007

June 25, 2007

On 24/06/07, Erik Inge Bolsø <knan-wine(a)anduin.net> wrote: > --- > dlls/user32/sysparams.c | 13 ++++++++++++- > dlls/wined3d/device.c | 10 +--------- > 2 files changed, 13 insertions(+), 10 deletions(-) > What was the reason for writing this?

1 0

Re: mshtml: Implement HTMLElement_get_children.
by Jacek Caban June 25, 2007

June 25, 2007

Hi, > + elem_vector buf = {NULL, 0, 8}; > + > + TRACE("(%p)->(%p)\n", This, p); > + > + buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement**)); elem_vector is a self-resizable table, but in this case you know the size while creating it from nsIDOMNodeList::GetLength. I'd suggest to use it here during creation of buf to avoid useless memory reallocations. Thanks, Jacek

2 1

Re: WIDL: Implement support for explicit user handles
by Robert Shearman June 25, 2007

June 25, 2007

Eric Kohl wrote: > This patch implements support for explicit user handles. Looks good, but one small nit-pick: Microsoft calls these "generic" handles instead of user handles. It would be good if you could rename the relevant bits to match this. Thanks, -- Rob Shearman

1 0

VST wrapper
by Nathaniel Gray June 25, 2007

June 25, 2007

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 June 25, 2007

June 25, 2007

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 June 25, 2007

June 25, 2007

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 June 24, 2007

June 24, 2007

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 June 24, 2007

June 24, 2007

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