April 2010 - Wine-devel - list.winehq.org

Re: [PATCH] msiexec: Use resource in msi for a Help Dialog to allow translation
by Hans Leidekker 21 Apr '10

21 Apr '10

On Wed, 2010-04-21 at 16:18 +0200, Detlef Riekenberg wrote: > static void ShowUsage(int ExitCode) > { > - printf(UsageStr); > + WCHAR msiexec_version[40]; > + WCHAR msiexec_help[4096]; > + WCHAR msi_res[4050]; You should use dynamically sized heap buffers here.

1 0

Re: [1/2] include: Add asptlb.idl (try 2)
by Michael Stefaniuc 21 Apr '10

21 Apr '10

Hello Alistair, Alistair Leslie-Hughes wrote: > Change long -> LONG thanks but that isn't really necessary. "long" is always 32bits in IDL files. widl will replace that with LONG in the generated files. > Changelog: > include: Add asptlb.idl bye michael

1 0

Re: (resend) imm32: rework storage of thread default contexts
by Alexandre Julliard 21 Apr '10

21 Apr '10

Aric Stewart <aric(a)codeweavers.com> writes: > any thread needs to be able to access the default context for any > other thread in the process for ImmGetContext. This looks very suspicious, and not at all thread-safe. There has to be a better way. -- Alexandre Julliard julliard(a)winehq.org

1 0

Intercept relay_call causes seh:raise_exception code=c0000005
by Jui-Hao Chiang 21 Apr '10

21 Apr '10

Hi, All, I am currently using the WINEDEBUG=relay feature to intercept function calls as the following 1. in dlls/ntdll/relay.c, insert code snippet in static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ) { ..... my_own_function(entry_point->name, nb_args stack); /* added by myself */ ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1 ); /* original Wine code*/ .... } LONGLONG my_own_function(const char *funcname, int nb_args, const INT_PTR *stack) { /* CreateBitmap has 5 parameters, the 5th one is pointing to an array while others are native type as the following HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, UINT bpp, LPCVOID bits ) */ if (strcmp(funcname, "CreateBitmap") == 0) Rpc_CreateBitmap(*(stack+1), *(stack+2), *(stack+3), *(stack+4), *(stack+5)); // this function just try to forward all parameters to remote RPC server for record } 2. Run program with WINEDEBUG=trace+all,relay wine notepad > dump 2>&1 3. If I only pass the parameter 1 to 4 to Rpc_CreateBitmap, then there is no problem, but if I add the 5th one (which points to some array), then the notepad aborts with he following debug message 0009:Call gdi32.CreateBitmap(00000008,00000008,00000001,00000001,7e95d822) ret=7e8da083 0009:trace:seh:raise_exception code=c0000005 flags=0 addr=0xb754a21d ip=b754a21d tid=0009 0009:trace:seh:raise_exception info[0]=00000001 0009:trace:seh:raise_exception info[1]=7e95d822 0009:trace:seh:raise_exception eax=00000055 ebx=b7593ff4 ecx=0033fa4c edx=00000001 esi=7e95d822 edi=00000001 0009:trace:seh:raise_exception ebp=0033fa54 esp=0033fa44 cs=0073 ds=007b es=007b fs=0033 gs=003b flags=00010202 0009:trace:seh:call_vectored_handlers calling handler at 0x7b83fd50 code=c0000005 flags=0 0009:trace:seh:call_vectored_handlers handler at 0x7b83fd50 returned 0 0009:trace:seh:call_stack_handlers calling handler at 0x7bc4a480 code=c0000005 flags=0 0009:trace:seh:__regs_RtlUnwind code=c0000005 flags=2 0009:trace:seh:__regs_RtlUnwind calling handler at 0x7bc6bc50 code=c0000005 flags=2 0009:trace:seh:__regs_RtlUnwind handler at 0x7bc6bc50 returned 1 0009:exception in PE entry point (proc=0x7e95a890,module=0x7e8c0000,reason=PROCESS_ATTACH,res=0x1) 4. But if I use malloc to copy the content of the array pointed by 5th parameter, then there is no problem LONGLONG my_own_function(const char *funcname, int nb_args, const INT_PTR *stack) { char *buffer = NULL; if (strcmp(funcname, "CreateBitmap") == 0) { buffer = (char*)malloc(.....); memcpy(buffer, *(stack+5), ....); Rpc_CreateBitmap(*(stack+1), *(stack+2), *(stack+3), *(stack+4), buffer); /* No exception if I do this */ } Can anyone gives me a hint that what's happening here? or I am doing some illegal operations? Appreciate any comments, Jui-Hao

1 0

Re: Minor dlls/mshtml/htmlbody.c simplification
by Jacek Caban 21 Apr '10

21 Apr '10

Hi Gerald, On 4/21/10 1:45 PM, Gerald Pfeifer wrote: > ChangeLog: > Remove variable hres which is not really used from HTMLBodyElement_get_text. > > diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c > index 5c66e65..c6b202b 100644 > --- a/dlls/mshtml/htmlbody.c > +++ b/dlls/mshtml/htmlbody.c > @@ -443,7 +443,6 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT > HTMLBodyElement *This = HTMLBODY_THIS(iface); > nsAString text; > nsresult nsres; > - HRESULT hres; > > TRACE("(%p)->(%p)\n", This, p); > > @@ -454,10 +453,8 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT > > nsAString_GetData(&text,&color); > V_VT(p) = VT_BSTR; > - hres = nscolor_to_str(color,&V_BSTR(p)); > }else { > ERR("GetText failed: %08x\n", nsres); > - hres = E_FAIL; > } > > nsAString_Finish(&text); > hres should be returned in this case, not removed. Jacek

1 0

Re: [2/2] msxml3: Rewrite IXMLDOMDocument2 save to behave more like msxml3
by Nikolay Sivov 21 Apr '10

21 Apr '10

On 4/21/2010 13:14, Alistair Leslie-Hughes wrote: > + ret = IUnknown_QueryInterface(pUnk,&IID_IUnknown, (void**)&pUnkRemote); > There's no point to do it. You already have IUnknown pointer. It's better to remove test for that case I think.

1 0

Re: [2/2] msxml3: Rewrite IXMLDOMDocument2 save to behave more like msxml3
by Nikolay Sivov 21 Apr '10

21 Apr '10

On 4/21/2010 07:13, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > msxml3: Rewrite IXMLDOMDocument2 save to behave more like msxml3 > > Best Regards > Alistair Leslie-Hughes > > > Hi, you forgot a patch.

1 0

Re: [PATCH 4/6] [WineGcc]: when specifying -m32, force i386 cpu when compiling on x86_64 boxes
by André Hentschel 21 Apr '10

21 Apr '10

Hi Eric, That will not be enough as it will still just find the 64-bit libs. Maybe we should implement a check in utils.c if it is a ELF32 or ELF64 lib which we try to import. -- Best Regards, André Hentschel

3 2

Re: winex11: use XkbKeycodeToKeysym instead of (deprecated) XKeycodeToKeysym (see http://bugs.freedesktop.org/show_bug.cgi?id=5349)
by Dmitry Timoshkov 21 Apr '10

21 Apr '10

Alexandre Goujon <ale.goujon(a)gmail.com> wrote: > - if (!(keysym = XKeycodeToKeysym (display, keyc, i))) continue; > + if (!(keysym = XkbKeycodeToKeysym (display, keyc, 0, i))) continue; Not every X11 implementation has the XKB extenstion. You may want to take into account 'use_xkb' and 'HAVE_XKB'. -- Dmitry.

1 0

Adding translation for wineprefixcreate manpage
by Frédéric Delanoy 20 Apr '10

20 Apr '10

Hi folks, A couple of days ago, I submitted a patch to add French manpage of wineprefixcreate, which was discarded (see attachment). I modeled it after German winemaker addition (SHA d53e75af1474d0bd9c8b8660827baaf8fe708f4c) by adding - entries in tools/Makefile.in - a .gitignore entry for the generated manpage - actual translated manpage I guess the patch was refused because of problems in tools/Makefile.in. Basically what I added was - entry in MANPAGES - french dir in INSTALLDIRS - entries in "install install-lib" and "install install-dev" - uninstall entry In the process, I also added the wineprefixcreate En manpage in the "install install-dev". Is that problematic? Could so please tell me what I did wrong so I can fix and resubmit the patch? Thanks in advance. Frédéric

2 1