May 2005 - Wine-devel - list.winehq.org

Re: tab: Shift selected tab text up instead of down
by Vitaliy Margolen 30 May '05

30 May '05

Sunday, May 29, 2005, 2:17:12, Vitaliy Margolen wrote: > Hi, > Changelog > * Shift selected tab text up instead of down. >- drawRect->>bottom += 3; >+ drawRect->>bottom -= 3; This does not shift tab up. This will shrink tab text area instead of growing it. Also you missed note above about keeping TAB_DrawItem in sync with this part. All these numbers had been verified against native, including custom drawn tabs (see WM_DRAWITEM message). Vitaliy.

3 2

Re: [DSOUND]multiple DIRECTSOUND object support
by Alexandre Julliard 30 May '05

30 May '05

Robert Reif <reif(a)earthlink.net> writes: > Add multiple DIRECTSOUND object support (multiple sound cards can play > at the same time). > Fix CoCreateInstance when no sound card is present. > Fix create bug found by Mike Hearn. This is causing major trouble with make test for me: ../../../tools/runtest -q -P wine -M dsound.dll -T ../../.. -p dsound_test.exe.so ds3d.c && touch ds3d.ok wine: Unhandled exception (thread 003c), starting debugger... WineDbg starting on pid 0x3a Unhandled exception: page fault on read access to 0x88d9a3d0 in 32-bit code (0x779a6b3b). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:779a6b3b ESP:7292809c EBP:729280ac EFLAGS:00010a13( - 00 ROIA1C) EAX:11154d54 EBX:779bfc58 ECX:0063006c EDX:3bad4fe3 ESI:779bfb48 EDI:77c453e0 Stack dump: 0x7292809c: 00000020 779bfc58 00000019 77c453e0 0x729280ac: 729280c8 779a7349 77c453e0 ff9cff99 0x729280bc: 77978600 00008000 779a71d4 729280f0 0x729280cc: 7795c80b 00008000 000003bd 77c453e0 0x729280dc: 77c45500 00000000 72ad5e00 000003bd 0x729280ec: 72ad8b40 72928120 72ab84d8 779a71d4 Backtrace: =>1 0x779a6b3b DSOUND_WaveQueue+0x9b(device=0x77c453e0, mixq=0xff9cff99) [/home/julliard/wine/wine/dlls/dsound/mixer.c:931] in dsound (0x729280ac) 2 0x779a7349 DSOUND_callback+0x175(hwo=0x8000, msg=0x3bd, dwUser=0x77c453e0, dw1=0x77c45500, dw2=0x0) [/home/julliard/wine/wine/dlls/dsound/mixer.c:1168] in dsound (0x729280c8) 3 0x7795c80b DriverCallback+0x1a3(dwCallBack=0x779a71d4, uFlags=0x3, hDev=0x8000, wMsg=0x3bd, dwUser=0x77c453e0, dwParam1=0x77c45500, dwParam2=0x0) [/home/julliard/wine/wine/dlls/winmm/driver.c:521] in winmm (0x729280f0) 4 0x72ab84d8 wodNotifyClient(wwo=0x72ad8b40, wMsg=0x3bd, dwParam1=0x77c45500, dwParam2=0x0) [/home/julliard/wine/wine/dlls/winmm/wineoss/audio.c:1330] in wineoss.drv (0x72928120) 5 0x72ab8a16 wodPlayer_NotifyCompletions+0xea(wwo=0x72ad8b40, force=0x1) [/home/julliard/wine/wine/dlls/winmm/wineoss/audio.c:1561] in wineoss.drv (0x72928144) 6 0x72ab8aa2 wodPlayer_Reset(wwo=0x72ad8b40, reset=0x1) [/home/julliard/wine/wine/dlls/winmm/wineoss/audio.c:1610] in wineoss.drv (0x7292817c) 7 0x72ab8d3e wodPlayer_ProcessMessages(wwo=0x72ad8b40) [/home/julliard/wine/wine/dlls/winmm/wineoss/audio.c:1701] in wineoss.drv (0x729281b0) 8 0x72ab8fe5 wodPlayer(pmt=0x0) [/home/julliard/wine/wine/dlls/winmm/wineoss/audio.c:1795] in wineoss.drv (0x729281dc) 9 0x77bd8867 THREAD_Start(ptr=0x77c45500) [/home/julliard/wine/wine/dlls/kernel/thread.c:107] in kernel32 (0x729282a8) 10 0x77ee09aa start_thread+0x142(info=0x77c45520) [/home/julliard/wine/wine/dlls/ntdll/thread.c:204] in ntdll (0x72928ad8) 11 0xb7fb1b63 start_thread+0x93 in libpthread.so.0 (0x72928b4c) 12 0xb7f5018a __clone+0x5a in libc.so.6 (0x00000000) 0x779a6b3b DSOUND_WaveQueue+0x9b [/home/julliard/wine/wine/dlls/dsound/mixer.c:931] in dsound: pushl 0x29c(%eax,%edi,1) 931 waveOutWrite(device->hwo, device->pwave[device->pwwrite], sizeof(WAVEHDR)); -- Alexandre Julliard julliard(a)winehq.org

1 0

CRYPTPROTECT_LOCAL_MACHINE in CryptProtectData
by Michael Jung 30 May '05

30 May '05

Hi Kees, rsaenh uses your Crypt[Un]ProtectData functions for protecting the user's private keys, which are stored in the registry. For machine key pairs (which are keys that belong to the machine instead of a certain user), rsaenh needs support for the CRYPTPROTECT_LOCAL_MACHINE flag. On possible implementation would be to derive the key from the computer name (GetComputerName) instead of from the user's login name, if the flag is set. Would you mind implementing something like this? Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

Re: Make more of the OLE interface vtables const
by Andreas Mohr 30 May '05

30 May '05

Hi, On Sun, May 29, 2005 at 07:05:49PM +0900, Dmitry Timoshkov wrote: > Hello, > > Changelog: > Dmitry Timoshkov <dmitry(a)codeweavers.com> > Make more of the OLE interface vtables const. You do know that those will *not* end up const? filemoniker.c:static const IClassFactoryVtbl FileMonikerCFVtbl = objdump -x ole32.dll.so: 0008efb0 l O .data 00000014 FileMonikerCFVtbl My suspicion is that this is due to winegcc compile, all other binaries with normal compile (e.g. winedump, ...) have all their const data in .rodata segment... So, does anybody know what seems to be wrong with winegcc or why it chose to do that? BTW, I already completely constified programs/ and tools/, will send a patch soon. Andreas

4 3

Re: rundll32.exe shell32.dll,SHHelpShortcuts_RunDLL
by Dmitry Timoshkov 29 May '05

29 May '05

"Detlef Riekenberg" <wine.dev(a)web.de> wrote: > Changelog: > Partial Implementation of shell32/SHHelpShortcuts_RunDLL > Connect and Disconnect: Forwarded to mpr.dll > AddPrinter: Forwarded to printui.dll > +static int shrundll_compare(const void *p1, const void *p2) > +{ > + struct shrundll_entry *e1 = (struct shrundll_entry *) p1; > + struct shrundll_entry *e2 = (struct shrundll_entry *) p2; > + > +/* > + TRACE("(%p:%p (%ld:%ld) %s:%s)\n",e1, e2, (e1 == NULL) ? 0 : e1->my_id, (e2 == NULL) ? 0 : e2->my_id, debugstr_w((e1 == NULL) ? NULL : e1->name), debugstr_w((e2 == NULL) ? NULL : e2->name)); > +*/ > + > + if((e1 == NULL) | (e2 == NULL)) > + { > + return -1; > + } > + > + return StrCmpW(e1->name, e2->name); I strongly suspect that this comparison should be case insensitive. -- Dmitry.

2 1

Re: question about standalone tests
by Dan Kegel 29 May '05

29 May '05

The STANDALONE stuff is my creation; apologies to anyone offended by it. It does fill a real need, but belongs in wine/test.h, not in each test, I agree. I was being lazy. Now, on to Alexandre's claim: On Tue, May 24, 2005 at 05:24:11PM +0200, Alexandre Julliard wrote: > You should be able to build by simply copying over wine/test.h Tried that. $ wget -O lzexpand_main.c 'http://cvs.winehq.org/cvsweb/~checkout~/wine/dlls/lzexpand/tests/lzexpand_m…' $ mkdir wine $ wget -O wine/test.h 'http://cvs.winehq.org/cvsweb/~checkout~/wine/include/wine/test.h?rev=1.14' $ cl -I. -DWINETEST_WANT_MAIN -D_X86_ lzexpand_main.c Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.10.3077 for 80x86 Copyright (C) Microsoft Corporation 1984-2002. All rights reserved. lzexpand_main.c h:\demo\x\wine\test.h(128) : error C2065: 'stdout' : undeclared identifier ... Adding #include <stdio.h> to wine/test.h fixes that first problem, but leaves h:\demo\x\wine\test.h(264) : error C2065: 'winetest_testlist' : undeclared identifier ... So including wine/test.h isn't enough at the moment. Maybe there needs to be a #ifdef STANDALONE ... #endif section in wine/test.h that defines winetest_testlist, etc. I just looked, and it's probably easy to do, but somewhat beyond what I want to do at 2 in the morning. (Besides, I'm not supposed to be typing, my wrists are sore.) - Dan -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

3 3

Re: UT2003 Regression - Patch at last :-))
by Alexandre Julliard 29 May '05

29 May '05

"Ann and Jason Edmeades" <us(a)the-edmeades.demon.co.uk> writes: > Index: painting.c > =================================================================== > RCS file: /home/wine/wine/dlls/user/painting.c,v > retrieving revision 1.29 > diff -u -r1.29 painting.c > --- painting.c 13 May 2005 14:03:06 -0000 1.29 > +++ painting.c 20 May 2005 20:26:24 -0000 > @@ -344,7 +344,7 @@ > if ((hrgn = send_ncpaint( child, NULL, &erase_flags ))) > send_erase( child, erase_flags, hrgn, NULL, NULL ); > > - prev = 0; > + break; The problem is that this will cause children to be skipped too. What you really need is to repaint every window only once, but still recurse for children. Unfortunately that's a bit tricky to do with a stateless interface... -- Alexandre Julliard julliard(a)winehq.org

4 5

dlls/oleaut32/olepicture.c won't compile
by Joris Huizer 29 May '05

29 May '05

Hello, I wanted to try netscape 8 but it's bugging about gif support being unavailable; so I got the gif library - but now wine won't recompile: ... make[2]: Entering directory `/home/jorishuizer/.wine-source/wine/dlls/oleaut32' gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_OLEAUT32_ -DCOM_NO_WINDOWS_H -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o olepicture.o olepicture.c olepicture.c:938: error: `DGifOpen' undeclared here (not in a function) olepicture.c:938: warning: type defaults to `int' in declaration of `pDGifOpen' olepicture.c: In function `_gif_inputfunc': olepicture.c:970: error: structure has no member named `UserData' olepicture.c: In function `OLEPictureImpl_Load': olepicture.c:1080: error: called object is not a function olepicture.c:1110: error: structure has no member named `Function' make[2]: *** [olepicture.o] Error 1 make[2]: Leaving directory `/home/jorishuizer/.wine-source/wine/dlls/oleaut32' make[1]: *** [oleaut32] Error 2 make[1]: Leaving directory `/home/jorishuizer/.wine-source/wine/dlls' make: *** [dlls] Error 2 I think this is related to the configure change... please help, thanks, Joris

3 6

err:dsound:DSOUND_MixOne underrun on sound buffer 0x40407e50
by J. Grant 29 May '05

29 May '05

Hi, I am getting this underrun when running Call of Duty v1.5. fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. fixme:mmtime:timeBeginPeriod Stub; we set our timer resolution at minimum fixme:mmtime:timeEndPeriod Stub; we set our timer resolution at minimum fixme:mmtime:timeBeginPeriod Stub; we set our timer resolution at minimum fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. err:dsound:DSOUND_MixOne underrun on sound buffer 0x40407e50 It turned out there were some processes hanging around, wine server and also /usr/lib/wine/wine-preloader /usr/lib/wine/wine-pthread ./CoDMP.exe Killing them and re-starting allowed it to work. I wonder if that err a WINE problem? as CoDMP.exe has workd flawlessly since. Maybe something to do with the existing wine-preloader left running? (Is that process left running a known problem..?) Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/blog.rss Radio: http://jguk.org/#radio

1 0

Re: [ddraw] Mipmap creation with DDSCAPS_COMPLEX, DDSCAPS_MIPMAP, and no mipmap count
by Lionel Ulmer 29 May '05

29 May '05

As already said by Mike, nice patch (and also nice test script). I think I was the one who added the previous comment (and it's true that I only tested it without the COMPLEX bit set). The only (minor) gripe I would have with this patch is the use of the 'log() / log()' to compute the mipmap count (I usually dislike floating point match - it's maybe my background in embedded programming where FPU are inexistant :-) )... I would have found it simpler to just have a 'while (min > 0) { min >>= 1; count += 1 }'. Lionel -- Lionel Ulmer - http://www.bbrox.org/

2 1