wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

LockDIBSection problem
by Rein Klazes 08 May '05

08 May '05

Hi, Here is another problem in BigJig a jigsaw puzzle game (free download at www.lenagames.com). The program calls BitBlt with destination an in memory DIB. Inside BitBlt, the destination bits are set to PAGE_NOACCESS: | 0009:Call kernel32.VirtualProtect(727f0000,00123324,00000001,77a5f7bc) ret=770032ba | 0009:Call ntdll.NtProtectVirtualMemory(ffffffff,77a5f69c,77a5f6a0,00000001,77a5f7bc) ret=77b6929e | trace:virtual:NtProtectVirtualMemory 0xffffffff 0x727f0000 00123324 00000001 | trace:virtual:VIRTUAL_SetProt 0x727f0000-0x72913fff c---- | View: 0x727f0000 - 0x72913fff (valloc) | 0x727f0000 - 0x72913fff c---- | 0009:Ret ntdll.NtProtectVirtualMemory() retval=00000000 ret=77b6929e This memory segment (727f0000,00123324) does not appear in the log anymore until it is written to disk: | 0009:Call kernel32.WriteFile(00000084,727f0000,00123324,77a5f360,00000000) ret=00408ac1 .. The call fails ( not in the log because I fixed it) with error STATUS_INVALID_USER_BUFFER and the program hangs. I managed to fixed it in two ways: 1. put a X11DRV_CoerceDIBSection( physDevDst, DIB_Status_InSync, FALSE ); at the end of X11DRV_BitBlt. This probably defeats the whole purpose of these protections so: 2. Add a "IsBadReadPtr( buffer, bytesToWrite)" in the top of WriteFile to force an exception and everything works. Would that be an acceptable fix? Rein.

2 2

Re: ignore requested height for non-menubar ownerdraw popups
by Rein Klazes 08 May '05

08 May '05

On Sun, 8 May 2005 13:30:30 +0200, you wrote: > On 05/08/2005 12:25:18 PM, Rein Klazes wrote: > > That does not seem correct on the Win2k system that I am using for > > testing. > > Right. Windows sets itemHeight before and not after WM_MEASUREITEM. > Sorry for that. > > And it also seems not to be GetSystemMetrics(SM_CYMENU)-1 but a rather > strange magic value of 16. (with my test it looked 100% the same ... > sigh. I'll go to bed soon. ;) > > How about this patch? Much better. About the magic number: I looked at the value on Win2k and WinME with different resolutions ( desktop->properties->settings, click on advanced tab and change what windows calls "font size" but is really changing the DPI, dots-per-inch, which is also reported). DPI Win2k WinME ================== 96 16 13 120 20 16 I assume that you are using a DPI of 96, and XP and 2k behave the same way. The DPI you can retrieve with GetDeviceCaps( hdc, LOGPIXELSY). I would recommend using the Win2k values computed by: DPI/6. Rein.

2 2

wineconsole exits immediately (Wine 20050310 debian sarge/testing)
by J. Grant 08 May '05

08 May '05

Hello, I was trying to run wcmd, it seems to have been renamed wineconsole. However, unfortunately it exits immediately before producing a DOS command prompt in my terminal like wcmd used to. I think this is a bug, (unless I missed something). $ wineconsole Invoking /usr/lib/wine/wine.bin wineconsole.exe ... Wine exited with a successful status $ I thought that maybe there was an argument I needed to pass, but there isn't a man page, or command line --help /? help unfortunately at present. $ wineconsole --help Invoking /usr/lib/wine/wine.bin wineconsole.exe --help ... err:wineconsole:WinMain Wrong command line options Wine exited with a successful status $ wineconsole /? Invoking /usr/lib/wine/wine.bin wineconsole.exe /? ... Wine exited with a successful status $ I am not on this list, please include my email address in any replies. Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/blog.rss Radio: http://jguk.org/#radio

3 7

Wine -> WineHQ -> codeweavers
by Derzu 08 May '05

08 May '05

Hi all, I saw at the www.winehq.org/ the banner (http://www.winehq.org/images/bannerads/cw-ad02.gif) that ponts to the www.codeweavers.com/ page. That banner has a little penguin opening a bottle of wine and after, the penguin appears very drunk, does any one knows who did that banner? I wanna the picture of the drunk penguin to set as mine wallpaper, but I wanna a big one. Any one can help me? Sorry if that mesage is not exatly a devel question. Thanks, Derzu ____________________________________________________Yahoo! Mail, cada vez melhor: agora com 1GB de espaço grátis! http://mail.yahoo.com.br

2 1

Re: [DInput] Fix 'peek' code for mouse (S3 problem)
by Stefan Dösinger 08 May '05

08 May '05

Am Mittwoch, 4. Mai 2005 20:44 schrieb Lionel Ulmer: > This should fix the mouse issue in S3. > > Lionel > > Changelog: > - do not flush the buffer when the application only wants to peek the > number of elements in the queue > - trace the GetDeviceState values before they are reset No, saidly, it doesn't. I have attached a +dinput log again. Stefan

2 10

Re: ignore requested height for non-menubar ownerdraw popups
by Rein Klazes 08 May '05

08 May '05

On Sun, 8 May 2005 11:14:52 +0200, you wrote: > This fixes bug 2764 (the scrolling issue seems to be resolved > already?). Verified this behaviour on WinXP and changed the comment to > reflect that. > > ChangeLog: > Ignore requested height for non-menubar ownerdraw popups too. > > Index: menu.c > =================================================================== > RCS file: /home/wine/wine/dlls/user/menu.c,v > retrieving revision 1.26 > diff -u -r1.26 menu.c > --- menu.c 19 Apr 2005 09:47:02 -0000 1.26 > +++ menu.c 8 May 2005 09:09:06 -0000 > @@ -887,17 +887,14 @@ > SendMessageW( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&mis ); > lpitem->rect.right += mis.itemWidth; > > - if (menuBar) > - { > - lpitem->rect.right += MENU_BAR_ITEMS_SPACE; > + /* under windows you are given a standard height for the > + menu and the height value is ignored. delphi 7 depends > + on this behaviour. */ > > + lpitem->rect.bottom += GetSystemMetrics(SM_CYMENU)-1; > That does not seem correct on the Win2k system that I am using for testing. Attached is the test that I am working on. It creates a non-menubar popup menu, fills it with a couple of items and traces the resulting item rectangles. It is all work in progress of course, not meant for submitting yet. Without your patch the rectangles get the height that is returned by the WM_MEASUREITEM handler both Win2k and Wine. With your patch the Wine behavior is broken. I have a real world application too, that is affected by this brokenness. Can you see if that is different on WinXP. If it is not, can you look what is different with your test and mine? Rein.

1 0

Stable release builds with fixme output (Wine 20050310 debian sarge/testing)
by J. Grant 08 May '05

08 May '05

Hello, I typically launch applications using wine from the terminal, I get pages of these fixme debug messages. I wonder if there is a reason these fixme "harmless" messages are being displayed? IMHO stable releases should only output err messages, thus not displaying fixme or warnings. I wonder if this has been considered already? fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. I am not on this list, please include my email address in any replies. Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/blog.rss Radio: http://jguk.org/#radio

3 3

Re: portability improvements for wineshelllink script
by Dan Kegel 08 May '05

08 May '05

Somebody wrote: > [Let's use bash features in wine shell scripts] Bad idea. Unless you have a *very* good reason, you should stick to Posix interfaces, which here means "get it to run under Bourne shell". Portability -- it's a good thing. By the way, if anyone out there is looking for a concise, illuminating guide to portable shell scripting, I highly recomment "Portable Shell Programming" by Bruce Blinn. - Dan -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

1 0

[patch] fix delete key on certain european keyboards
by zhilla 08 May '05

08 May '05

reposting this here, looking for someone to fix a long standing wine bug. text [edited] again: well, this is just this: http://bugs.winehq.org/show_bug.cgi?id=2400 and should apply to today's cvs. i AM NOT the author! it IS kinda urgent, since a lot of european keyboards are affected... like hungarian, croatian, slovenian... all have "delete" key producing "<delete>," instead of "<delete>". this patch is just a "works here" workaround, see url for more details. i got response from some people, so i fixed comments, but what needs to be tuned, according to mr. Dmitry Timoshkov, is that it should use symbolic key(sym) names instead of hardcoded numbers. seems like a trivial task for a programmer (which i am not) so, anybody up to it? Changelog: * dlls/x11drv/keyboard.c Arpad Biro <biro_arpad(a)yahoo.com> (modified to current cvs by Marin Glibic <zhilla(a)spymac.com>) This fixes the problem is that when NumLock is active, both Del keys perform a "delete" action _and_ insert a comma (the decimal character). --- dlls/x11drv/keyboard.c.orig 2005-05-05 23:33:23.000000000 +0200 +++ dlls/x11drv/keyboard.c 2005-05-05 23:38:44.000000000 +0200 @@ -1067,11 +1067,14 @@ else XLookupString(e, NULL, 0, &keysym, NULL); - if ((keysym >= 0xFFAE) && (keysym <= 0xFFB9) && (keysym != 0xFFAF) - && (e->state & NumLockMask)) - /* Only the Keypad keys 0-9 and . send different keysyms - * depending on the NumLock state */ - return nonchar_key_vkey[keysym & 0xFF]; + if (e->state & NumLockMask) /* NumLock is active */ + { if (keysym == 0xFFAC) /* Numeric Del pressed */ + return keyc2vkey[0x3B]; /* comma */ + if ((keysym >= 0xFFAE) && (keysym <= 0xFFB9) && (keysym != 0xFFAF)) + /* Only the Keypad keys 0-9 and . send different keysyms + * depending on the NumLock state */ + return nonchar_key_vkey[keysym & 0xFF]; + } TRACE_(key)("e->keycode = %x\n", e->keycode);

1 0

Stack size allocations
by Robert Lunnon 07 May '05

07 May '05

I wish to propose two changes that I currently have in my Solaris patchkit. I'll use two separate e-mails here to avoid confusion. Both changes add environment variables controlling the way wine does things. The first patch addresses a problem I have found where Windows applications under wine exceed the allocated stack. By default wine allocates the same 1MB stack that windows does but wine has a different stack consumption that does windows, adding the wine translation layers, possibly OGL then X calls on top of this. The following patch allows an environment variable WINE_STACK to redefine the minimum stack to give applications and to add extra stack to that declared in the executables header to allow for additional stack consumption. Currently it works like this if WINE_STACK is not set the default semantics are used just like wine does today if WINE_STACK is set then wine allocates the maximum of the value given in the WINE_STACK env var or 1MB. 25% of the value specified in WINE_STACK is added to the value declared in the applications executable header to provide more headroom for wine/X calls. Please excuse the primitive debugging included for now, it'll have to be removed for primetime. Comments anyone ? Index: dlls/ntdll/thread.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/thread.c,v retrieving revision 1.26 diff -u -3 -p -r1.26 thread.c --- dlls/ntdll/thread.c 27 Apr 2005 08:18:20 -0000 1.26 +++ dlls/ntdll/thread.c 6 May 2005 21:21:30 -0000 @@ -25,7 +25,7 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif - +#include <stdio.h> #include "ntstatus.h" #include "thread.h" #include "winternl.h" @@ -221,6 +221,9 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN ULONG size; int request_pipe[2]; NTSTATUS status; + unsigned long stack_min=1024*1024; + unsigned long stack_overhead=0; + char stack_mul=0; if( ! is_current_process( process ) ) { @@ -273,23 +276,67 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN MEM_SYSTEM, PAGE_EXECUTE_READWRITE ); info->pthread_info.teb_size = size; info->pthread_info.teb_sel = teb->teb_sel; - + + + /* Allocate the stack: + Allow the user to set an environment variable to specify the stack size + WINE_STACK, allow the user to use multiplier notation + eg K for kilobyts or M for Megabytes or M + example WINE_STCK=2048K or WINE_STACK=2M bithe specify 2 Megabytes + */ + + if(getenv("WINE_STACK")) { + sscanf(getenv("WINE_STACK")," %lu%c ",&stack_min,&stack_mul); + fprintf(stderr,"Got stack spec of %lu %c bytes from environment",stack_min,stack_mul); + } + + switch (stack_mul) { + case 'm': + case 'M': + stack_min=stack_min*1024*1024; + stack_overhead=stack_min/4; + break; + case 'b': + case 'B': + stack_overhead=stack_min/4; + break; + case 'k': + case 'K': + stack_min=stack_min*1024; + stack_overhead=stack_min/4; + break; + + default: + stack_min=1024*1024; + stack_overhead=0; + break; + } + + stack_min=max(stack_min,1024*1024); + fprintf(stderr,"Minimum Stack Set to %lu overhead allowance = %d\n",stack_min,stack_overhead); + /* Get the stack size recommendation from the program prefix (Executible header) + Because this is not "real windows" we have additional stack overheads particularly in xlib + where the user has specified a stack requirement (IE VIA WINE_STACK) add 25% of the minimum + stack over and above the value in the header to allow for this + */ if (!stack_reserve || !stack_commit) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); - if (!stack_reserve) stack_reserve = nt->OptionalHeader.SizeOfStackReserve; + if (!stack_reserve) stack_reserve = nt->OptionalHeader.SizeOfStackReserve+stack_overhead; if (!stack_commit) stack_commit = nt->OptionalHeader.SizeOfStackCommit; } if (stack_reserve < stack_commit) stack_reserve = stack_commit; stack_reserve = (stack_reserve + 0xffff) & ~0xffff; /* round to 64K boundary */ - if (stack_reserve < 1024 * 1024) stack_reserve = 1024 * 1024; /* Xlib needs a large stack */ + if (stack_reserve < stack_min) stack_reserve = stack_min; /* Xlib needs a large stack */ info->pthread_info.stack_base = NULL; info->pthread_info.stack_size = stack_reserve; info->pthread_info.entry = start_thread; info->entry_point = start; info->entry_arg = param; - + + fprintf(stderr,"Allocated thread at %lx Allocated stack of %lu Bytes\n",stack_commit,stack_reserve); + if (wine_pthread_create_thread( &info->pthread_info ) == -1) { status = STATUS_NO_MEMORY;

4 6

Re: Solaris Compatibility -dlls/wineps/driver.c
by Alexandre Julliard 07 May '05

07 May '05

Robert Lunnon <bobl(a)optushome.com.au> writes: > Notes about patch: > PAGESIZE is a risky name for a symbol since it an obvious candidate for use to > define the page size of the OSes VM pages and in fact does Collide under > Solaris We already have a #undef PAGESIZE to work around that problem. If it doesn't work you probably need to tweak the include files order. -- Alexandre Julliard julliard(a)winehq.org

2 1

Bug 2905
by Dustin Navea 07 May '05

07 May '05

Can someone take a look at the attached debug output and let me know what might be the problem? The game crashes under wine, regardless of the winver (could be an old wine version), and also under real Win2k, but not under real Win98.. I doubt there is much hope for getting this working, since it even crashes in Win2k, but since it's reported, I should go ahead and report it to you all anyways.

1 0

Re: Solaris compatibility - libs/wine/loader.c
by Alexandre Julliard 07 May '05

07 May '05

Robert Lunnon <bobl(a)optushome.com.au> writes: > Notes about patch: > Solaris requires RTLD_FIRST flag to dlopen calls to resolve multiple path > expansions properly This doesn't seem to be what RTLD_FIRST does. Could you explain a bit more exactly what the problem is? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: portability improvements for wineshelllink script
by Francois Gouget 07 May '05

07 May '05

On Sat, 7 May 2005, Robert Lunnon wrote: [...] > # diff -u wineshelllink.old wineshelllink > --- wineshelllink.old mer mai 4 11:47:30 2005 > +++ wineshelllink mer mai 4 11:50:03 2005 > @@ -1,4 +1,4 @@ > -#!/bin/sh > +#!/bin/bash This is wrong. Some users may not have bash installed and the script should still work on their systems. So the fix is not to make the script fail to run on any system which does not have bash but to modify it so it works with any standard Bourne shell, including the Solaris one. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Linux: the choice of a GNU generation

3 4

16 bit hwnd in SendmessageA/W
by Rein Klazes 07 May '05

07 May '05

Hi, Another case where I don't think I know enough of the finer details for a correct solution. MS Visual C++ 1.5 IDE - 16 bit win application - communicates its window handle to WINTEE32.EXE - win32 app - to handle the build process: >> E:\\MSVC\\BIN\\WINTEE32.EXE -h2a -vn 5e is the 16 bit window handle. Here it sends data to the IDE: >> 0035:Call user32.SendMessageA(ffff002a,0000004a,0008004a,77a3fe28) ret=77a51649 That does not work, SendMessageA does only expect full 32 bit win handles. Things work with this patch: ========================================================================== --- wine/dlls/user/message.c 2005-05-05 10:26:28.000000000 +0200 +++ mywine/dlls/user/message.c 2005-05-05 20:07:46.000000000 +0200 @@ -2388,6 +2388,13 @@ LRESULT WINAPI SendMessageTimeoutA( HWND return 1; } + /* if it is not a 32bit window handle */ + if( !IsWindow( hwnd)) { + /* try if it is a 16 bit handle */ + hwnd = WIN_Handle32( (HWND16) hwnd ); + info.hwnd = hwnd; + } + if (!(dest_tid = GetWindowThreadProcessId( hwnd, &dest_pid ))) return 0; if (USER_IsExitingThread( dest_tid )) return 0; ========================================================================== Is anything else needed, I wonder? Rein.

3 4

Re: Enummedia memleak fix
by Alexandre Julliard 07 May '05

07 May '05

Maarten Lankhorst <m.b.lankhorst(a)gmail.com> writes: > Fixed 2 small memory leaks in enummedia (my fault, not used to while > loops..) > > Note that there are 2 ways to fix it: > while (--i) .. -> while (i--) .. > while (--i) .. -> while (--i >= 0) .. > > I chose the second, but I don't think it matters ;) In that case it matters a lot, since i is unsigned... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winecfg: Match the new way to use unixfs
by Mike Hearn 07 May '05

07 May '05

On Sat, 2005-05-07 at 09:46 +0200, Michael Jung wrote: > P.S.: What's the reason for disabling the i18n resources in > winecfg.rc? They're out of date and don't reflect the current English GUI. thanks -mike

1 0

Support for multiple threading models
by Robert Lunnon 07 May '05

07 May '05

Some time ago, I wrote code to support native threads instead of lwp for SYSV operating systems, the way I wrote the code all available threading models were compiled into wine and the actual one to be used was selected by setting an environment variable. (Currently WINE_THREADMODE). On OSes that support multiple threading methods, IE Solaris and probably the BSDs this allows for easy development and testing of thread support. It also allows the simulation of no thread support (Not that that seems to be very useful). Originally when I wrote this Solaris 9 was having some problems with crashing in mutexes if native threads were used, but LWPs weren't perfect either, in particular lwps aren't necessarily safe to use with some libraries (There is a warning about this in the Man pages for the _lwp calls, For example. this caused problems with alarm/usleep calls used at the time in winmm). These days however in Solaris 10 the native thread code works quite well. Anyway the fallout was that non winmm code worked best using native threads on certain Solaris MUs and winmm dependent programs worked best using LWPs and having the Threading model selectable made sense. This is still the case for Solaris 8/9 users. I can still see situations where it would be advantageous to be able to select the threading model at runtime and I'd like to leave this support in (Solaris 9 for example). This possibility has received a luke warm reception before but I thought I'd re-raise the possibility now while I'm doing the putback from my latest patch kit. Just as a final point Solaris no longer supports _lwp_create calls, without this patch wine is unable to run on Solaris versions > Solaris 9 Bob Threading patch attached

1 0

Re: [resend] [patch] fix delete key on certain european keyboards
by Dmitry Timoshkov 07 May '05

07 May '05

"zhilla" <zhilla(a)spymac.com> wrote: > ok, this is 3rd time, damn :) this time against wine cvs root, and with, > i hope, fixed comments. > - if ((keysym >= 0xFFAE) && (keysym <= 0xFFB9) && (keysym != 0xFFAF) > - && (e->state & NumLockMask)) > - /* Only the Keypad keys 0-9 and . send different keysyms > - * depending on the NumLock state */ > - return nonchar_key_vkey[keysym & 0xFF]; > + if (e->state & NumLockMask) /* NumLock is active */ > + { if (keysym == 0xFFAC) /* Numeric Del pressed */ > + return keyc2vkey[0x3B]; /* comma */ > + if ((keysym >= 0xFFAE) && (keysym <= 0xFFB9) && (keysym != 0xFFAF)) > + /* Only the Keypad keys 0-9 and . send different keysyms > + * depending on the NumLock state */ > + return nonchar_key_vkey[keysym & 0xFF]; > + } > > TRACE_(key)("e->keycode = %x\n", e->keycode); If you could also use symbolic key(sym) names instead of hardcoded numbers the patch would have better chances to be accepted. -- Dmitry.

1 0

re: Winelib's role in converting Windows applications
by Daniel Kegel 07 May '05

07 May '05

Ira Krakow (ikrakow_1999(a)yahoo.com) wrote: > At Wineconf, I had a number of conversations about > Winelib's role in converting Windows apps. The > consensus seems to be that the most efficient > conversion path is for much of the Windows app to stay > in Visual C++ (or whatever) and that only the modules > that specifically require native Linux calls should be > recompiled, via MinGW/Dev-C++ on the Windows side, and > Winemaker on the Linux side, into Winelib objects. > > For example, if the application requires PAM > authentication, or a Linux-based help system, these > modules would be separated out and encapsulated as > Winelib objects. I was thinking of using PAM > authentication as a good example, since it works for > any authentication scheme that the application > requires. There are two other reasons to use winelib: 1) if your code uses SEH (structured exception handling), you have a problem. This technique is patented by Borland, see http://www.google.com/search?q=patent+5628016 or maybe by Sun, see http://www.google.com/search?q=patent+6247169 so the official gnu gcc can't support it. You can apply an unoffical patch (see http://reactos.csh-consult.dk/index.php?page=gccseh, or you may be able to use winelib plus some clever macros (see http://www.winehq.org/hypermail/wine-devel/2005/05/0186.html) 2) if you want to reach non-x86 platforms (e.g. MacOSX/PPC, Solaris/Sparc) winelib is the only way to go until projects like Darwine integrate a CPU emulator. - Dan

1 0

Wine Wiki Status
by Dimitrie O. Paun 06 May '05

06 May '05

A few things: 1. We've been attacked Wed by one or two idiots from Slashdot. They kept replacing the content of the front page with some silly Balmer images :) Not a big deal, since MoinMoin makes it a snap to revert to an older version. However, this episode forced me to at least require that you sign up before you can edit a page. This is probably a good idea anyway, I hope people agree. 2. I've placed the modifications to the code on the Wine CVS repository at SourceForge in the 'wiki' module. Please feel free to check it out and send in patches (sending them to wine-patches(a)winehq.org with a subject prefix of 'Wiki:' is fine, or directly to me if you prefer). 3. Mike is right, the namespacing stuff if not a good idea. I'll try to get rid of it, I'm going to try to rename the page, but first I have to enable the feature. If not, I'll just simply recreate them. As always, you comments, suggestions and complaints are most welcome. -- Dimi.

6 6

Readers' choices: 2004 Desktop Linux survey results in!
by Tom Wickline 06 May '05

06 May '05

Hello All, Here is the results: http://www.desktoplinux.com/articles/AT2127420238.html Wine 34 % Crossover 16.3 % VMWare 13.7 % Win4Lin 6.9 % Other (please email us) 1 % None -- I don't run Windows apps under Linux 27.9 % http://www.desktoplinux.com/cgi-bin/survey/survey.cgi?view=archive&id=02152… What I find interesting is this part. Last year's poll results revealed that about 60 percent of the 3,946 readers polled had both currently used Windows applications under Linux and expected to do so in the future. Tom

2 1

test.winehq.org broken
by Stefan Leichter 06 May '05

06 May '05

Hello, looks like adding the dll name to the output of the tests broke the script that creates the pages on test.winehq.org. Now all test are listed as failed output from winetest-200504301000-paul-mingw.exe crypt: 37 tests executed, 0 marked as todo, 0 failures. output from winetest-200505051000-paul-mingw.exe advapi32/crypt: 37 tests executed, 0 marked as todo, 0 failures. Can someone please fix the script building the summary page. Thanks Stefan

3 3

Incorrect locale used in wine 20050310 (Debian testing)
by J. Grant 06 May '05

06 May '05

Hello, I think I have found a bug in the locale system used by wine. I get (incorrectly) English dialog text, with Japanese on the buttons. For example: =========== Set Optimal Settings? --------------------- Your computer has changed since the last time you ran. Re-configure for new hardware? [はい(Y)] [いいえ(N)] =========== I use English locale, with only Japanese input supported as an option. This is the only program which appears with Japanese text. Everything else is in English. The buttons should not be in Japanese. I am not on this list, so please include my email address in any replies. $ locale LANG=en_GB.UTF-8 LC_CTYPE=ja_JP.UTF-8 LC_NUMERIC=en_GB.UTF-8 LC_TIME=en_GB.UTF-8 LC_COLLATE=en_GB.UTF-8 LC_MONETARY=en_GB.UTF-8 LC_MESSAGES=en_GB.UTF-8 LC_PAPER="en_GB.UTF-8" LC_NAME="en_GB.UTF-8" LC_ADDRESS="en_GB.UTF-8" LC_TELEPHONE="en_GB.UTF-8" LC_MEASUREMENT="en_GB.UTF-8" LC_IDENTIFICATION="en_GB.UTF-8" LC_ALL= Kind regards JG -- Homepage: http://jguk.org/ Blog: http://jguk.org/blog.rss Radio: http://jguk.org/#radio

1 0

Re: [DSOUND] move initialization (revised patch)
by Robert Reif 06 May '05

06 May '05

Robert Reif wrote: > Move initialization to IDirectSound_Initialize. > Fix error paths to handle a failed IDirectSound_Initialize. > Add tests for IDirectSound_Initialize. > > This patch fixes wine to fail the same way windows does > when run with a defective device driver. This revised patch fixes a problem when trying to initialize an initialized object when creating the object more than once. Index: dlls/dsound/dsound.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/dsound.c,v retrieving revision 1.31 diff -u -p -r1.31 dsound.c --- dlls/dsound/dsound.c 15 Mar 2005 15:40:36 -0000 1.31 +++ dlls/dsound/dsound.c 6 May 2005 16:02:54 -0000 @@ -684,11 +684,107 @@ static HRESULT WINAPI IDirectSoundImpl_I LPCGUID lpcGuid) { IDirectSoundImpl *This = (IDirectSoundImpl *)iface; + HRESULT hr = DS_OK; TRACE("(%p,%s)\n",This,debugstr_guid(lpcGuid)); - This->initialized = TRUE; + if (This->initialized == TRUE) { + WARN("already initialized\n"); + return DSERR_ALREADYINITIALIZED; + } - return DS_OK; + /* If the driver requests being opened through MMSYSTEM + * (which is recommended by the DDK), it is supposed to happen + * before the DirectSound interface is opened */ + if (This->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMOPEN) + { + DWORD flags = CALLBACK_FUNCTION; + + /* disable direct sound if requested */ + if (ds_hw_accel != DS_HW_ACCEL_EMULATION) + flags |= WAVE_DIRECTSOUND; + + hr = mmErr(waveOutOpen(&(This->hwo), + This->drvdesc.dnDevNode, This->pwfx, + (DWORD)DSOUND_callback, (DWORD)This, + flags)); + if (hr != DS_OK) { + WARN("waveOutOpen failed\n"); + return hr; + } + } + + if (This->driver) { + hr = IDsDriver_Open(This->driver); + if (hr != DS_OK) { + WARN("IDsDriver_Open failed\n"); + return hr; + } + + /* the driver is now open, so it's now allowed to call GetCaps */ + hr = IDsDriver_GetCaps(This->driver,&(This->drvcaps)); + if (hr != DS_OK) { + WARN("IDsDriver_GetCaps failed\n"); + return hr; + } + } else { + WAVEOUTCAPSA woc; + hr = mmErr(waveOutGetDevCapsA(This->drvdesc.dnDevNode, &woc, sizeof(woc))); + if (hr != DS_OK) { + WARN("waveOutGetDevCaps failed\n"); + return hr; + } + ZeroMemory(&This->drvcaps, sizeof(This->drvcaps)); + if ((woc.dwFormats & WAVE_FORMAT_1M08) || + (woc.dwFormats & WAVE_FORMAT_2M08) || + (woc.dwFormats & WAVE_FORMAT_4M08) || + (woc.dwFormats & WAVE_FORMAT_48M08) || + (woc.dwFormats & WAVE_FORMAT_96M08)) { + This->drvcaps.dwFlags |= DSCAPS_PRIMARY8BIT; + This->drvcaps.dwFlags |= DSCAPS_PRIMARYMONO; + } + if ((woc.dwFormats & WAVE_FORMAT_1M16) || + (woc.dwFormats & WAVE_FORMAT_2M16) || + (woc.dwFormats & WAVE_FORMAT_4M16) || + (woc.dwFormats & WAVE_FORMAT_48M16) || + (woc.dwFormats & WAVE_FORMAT_96M16)) { + This->drvcaps.dwFlags |= DSCAPS_PRIMARY16BIT; + This->drvcaps.dwFlags |= DSCAPS_PRIMARYMONO; + } + if ((woc.dwFormats & WAVE_FORMAT_1S08) || + (woc.dwFormats & WAVE_FORMAT_2S08) || + (woc.dwFormats & WAVE_FORMAT_4S08) || + (woc.dwFormats & WAVE_FORMAT_48S08) || + (woc.dwFormats & WAVE_FORMAT_96S08)) { + This->drvcaps.dwFlags |= DSCAPS_PRIMARY8BIT; + This->drvcaps.dwFlags |= DSCAPS_PRIMARYSTEREO; + } + if ((woc.dwFormats & WAVE_FORMAT_1S16) || + (woc.dwFormats & WAVE_FORMAT_2S16) || + (woc.dwFormats & WAVE_FORMAT_4S16) || + (woc.dwFormats & WAVE_FORMAT_48S16) || + (woc.dwFormats & WAVE_FORMAT_96S16)) { + This->drvcaps.dwFlags |= DSCAPS_PRIMARY16BIT; + This->drvcaps.dwFlags |= DSCAPS_PRIMARYSTEREO; + } + if (ds_emuldriver) + This->drvcaps.dwFlags |= DSCAPS_EMULDRIVER; + This->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; + This->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; + This->drvcaps.dwPrimaryBuffers = 1; + } + + hr = DSOUND_PrimaryCreate((IDirectSoundImpl*)This); + if (hr == DS_OK) { + This->initialized = TRUE; + DSOUND_renderer = (IDirectSoundImpl*)This; + timeBeginPeriod(DS_TIME_RES); + DSOUND_renderer->timerID = timeSetEvent(DS_TIME_DEL, DS_TIME_RES, DSOUND_timer, + (DWORD)DSOUND_renderer, TIME_PERIODIC | TIME_CALLBACK_FUNCTION); + } else { + WARN("DSOUND_PrimaryCreate failed\n"); + } + + return hr; } static HRESULT WINAPI IDirectSoundImpl_VerifyCertification( @@ -841,11 +937,11 @@ HRESULT WINAPI IDirectSoundImpl_Create( return DSERR_OUTOFMEMORY; } - pDS->pwfx->wFormatTag = WAVE_FORMAT_PCM; /* We rely on the sound driver to return the actual sound format of * the device if it does not support 22050x8x2 and is given the * WAVE_DIRECTSOUND flag. */ + pDS->pwfx->wFormatTag = WAVE_FORMAT_PCM; pDS->pwfx->nSamplesPerSec = 22050; pDS->pwfx->wBitsPerSample = 8; pDS->pwfx->nChannels = 2; @@ -853,95 +949,6 @@ HRESULT WINAPI IDirectSoundImpl_Create( pDS->pwfx->nAvgBytesPerSec = pDS->pwfx->nSamplesPerSec * pDS->pwfx->nBlockAlign; pDS->pwfx->cbSize = 0; - /* If the driver requests being opened through MMSYSTEM - * (which is recommended by the DDK), it is supposed to happen - * before the DirectSound interface is opened */ - if (pDS->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMOPEN) - { - DWORD flags = CALLBACK_FUNCTION; - - /* disable direct sound if requested */ - if (ds_hw_accel != DS_HW_ACCEL_EMULATION) - flags |= WAVE_DIRECTSOUND; - - err = mmErr(waveOutOpen(&(pDS->hwo), - pDS->drvdesc.dnDevNode, pDS->pwfx, - (DWORD)DSOUND_callback, (DWORD)pDS, - flags)); - if (err != DS_OK) { - WARN("waveOutOpen failed\n"); - HeapFree(GetProcessHeap(),0,pDS); - *ppDS = NULL; - return err; - } - } - - if (drv) { - err = IDsDriver_Open(drv); - if (err != DS_OK) { - WARN("IDsDriver_Open failed\n"); - HeapFree(GetProcessHeap(),0,pDS); - *ppDS = NULL; - return err; - } - - /* the driver is now open, so it's now allowed to call GetCaps */ - err = IDsDriver_GetCaps(drv,&(pDS->drvcaps)); - if (err != DS_OK) { - WARN("IDsDriver_GetCaps failed\n"); - HeapFree(GetProcessHeap(),0,pDS); - *ppDS = NULL; - return err; - } - } else { - WAVEOUTCAPSA woc; - err = mmErr(waveOutGetDevCapsA(pDS->drvdesc.dnDevNode, &woc, sizeof(woc))); - if (err != DS_OK) { - WARN("waveOutGetDevCaps failed\n"); - HeapFree(GetProcessHeap(),0,pDS); - *ppDS = NULL; - return err; - } - ZeroMemory(&pDS->drvcaps, sizeof(pDS->drvcaps)); - if ((woc.dwFormats & WAVE_FORMAT_1M08) || - (woc.dwFormats & WAVE_FORMAT_2M08) || - (woc.dwFormats & WAVE_FORMAT_4M08) || - (woc.dwFormats & WAVE_FORMAT_48M08) || - (woc.dwFormats & WAVE_FORMAT_96M08)) { - pDS->drvcaps.dwFlags |= DSCAPS_PRIMARY8BIT; - pDS->drvcaps.dwFlags |= DSCAPS_PRIMARYMONO; - } - if ((woc.dwFormats & WAVE_FORMAT_1M16) || - (woc.dwFormats & WAVE_FORMAT_2M16) || - (woc.dwFormats & WAVE_FORMAT_4M16) || - (woc.dwFormats & WAVE_FORMAT_48M16) || - (woc.dwFormats & WAVE_FORMAT_96M16)) { - pDS->drvcaps.dwFlags |= DSCAPS_PRIMARY16BIT; - pDS->drvcaps.dwFlags |= DSCAPS_PRIMARYMONO; - } - if ((woc.dwFormats & WAVE_FORMAT_1S08) || - (woc.dwFormats & WAVE_FORMAT_2S08) || - (woc.dwFormats & WAVE_FORMAT_4S08) || - (woc.dwFormats & WAVE_FORMAT_48S08) || - (woc.dwFormats & WAVE_FORMAT_96S08)) { - pDS->drvcaps.dwFlags |= DSCAPS_PRIMARY8BIT; - pDS->drvcaps.dwFlags |= DSCAPS_PRIMARYSTEREO; - } - if ((woc.dwFormats & WAVE_FORMAT_1S16) || - (woc.dwFormats & WAVE_FORMAT_2S16) || - (woc.dwFormats & WAVE_FORMAT_4S16) || - (woc.dwFormats & WAVE_FORMAT_48S16) || - (woc.dwFormats & WAVE_FORMAT_96S16)) { - pDS->drvcaps.dwFlags |= DSCAPS_PRIMARY16BIT; - pDS->drvcaps.dwFlags |= DSCAPS_PRIMARYSTEREO; - } - if (ds_emuldriver) - pDS->drvcaps.dwFlags |= DSCAPS_EMULDRIVER; - pDS->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; - pDS->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; - pDS->drvcaps.dwPrimaryBuffers = 1; - } - InitializeCriticalSection(&(pDS->mixlock)); pDS->mixlock.DebugInfo->Spare[1] = (DWORD)"DSOUND_mixlock"; @@ -1610,16 +1617,6 @@ HRESULT WINAPI DSOUND_Create( TRACE("(%s,%p,%p)\n",debugstr_guid(lpcGUID),ppDS,pUnkOuter); - if (pUnkOuter != NULL) { - WARN("invalid parameter: pUnkOuter != NULL\n"); - return DSERR_INVALIDPARAM; - } - - if (ppDS == NULL) { - WARN("invalid parameter: ppDS == NULL\n"); - return DSERR_INVALIDPARAM; - } - /* Get dsound configuration */ setup_dsound_options(); @@ -1649,22 +1646,11 @@ HRESULT WINAPI DSOUND_Create( LPDIRECTSOUND8 pDS; hr = IDirectSoundImpl_Create(&devGuid, &pDS); if (hr == DS_OK) { - hr = DSOUND_PrimaryCreate((IDirectSoundImpl*)pDS); - if (hr == DS_OK) { - hr = IDirectSound_IDirectSound_Create(pDS, ppDS); - if (*ppDS) { - IDirectSound_IDirectSound_AddRef(*ppDS); - - DSOUND_renderer = (IDirectSoundImpl*)pDS; - timeBeginPeriod(DS_TIME_RES); - DSOUND_renderer->timerID = timeSetEvent(DS_TIME_DEL, DS_TIME_RES, DSOUND_timer, - (DWORD)DSOUND_renderer, TIME_PERIODIC | TIME_CALLBACK_FUNCTION); - } else { - WARN("IDirectSound_IDirectSound_Create failed\n"); - IDirectSound8_Release(pDS); - } - } else { - WARN("DSOUND_PrimaryCreate failed\n"); + hr = IDirectSound_IDirectSound_Create(pDS, ppDS); + if (*ppDS) + IDirectSound_IDirectSound_AddRef(*ppDS); + else { + WARN("IDirectSound_IDirectSound_Create failed\n"); IDirectSound8_Release(pDS); } } else @@ -1695,12 +1681,33 @@ HRESULT WINAPI DirectSoundCreate( IUnknown *pUnkOuter) { HRESULT hr; + LPDIRECTSOUND pDS; TRACE("(%s,%p,%p)\n",debugstr_guid(lpcGUID),ppDS,pUnkOuter); - hr = DSOUND_Create(lpcGUID, ppDS, pUnkOuter); - if (hr == DS_OK) - IDirectSound_Initialize(*ppDS, lpcGUID); + if (ppDS == NULL) { + WARN("invalid parameter: ppDS == NULL\n"); + return DSERR_INVALIDPARAM; + } + + if (pUnkOuter != NULL) { + WARN("invalid parameter: pUnkOuter != NULL\n"); + *ppDS = 0; + return DSERR_INVALIDPARAM; + } + + hr = DSOUND_Create(lpcGUID, &pDS, pUnkOuter); + if (hr == DS_OK) { + IDirectSound_IDirectSound * pp = (IDirectSound_IDirectSound *)pDS; + IDirectSoundImpl * p = (IDirectSoundImpl *)(pp->pds); + if (!(p->initialized)) { + hr = IDirectSound_Initialize(pDS, lpcGUID); + if (hr != DS_OK) + IDirectSound_Release(pDS); + } + } + + *ppDS = pDS; return hr; } @@ -1715,16 +1722,6 @@ HRESULT WINAPI DSOUND_Create8( TRACE("(%s,%p,%p)\n",debugstr_guid(lpcGUID),ppDS,pUnkOuter); - if (pUnkOuter != NULL) { - WARN("invalid parameter: pUnkOuter != NULL\n"); - return DSERR_INVALIDPARAM; - } - - if (ppDS == NULL) { - WARN("invalid parameter: ppDS == NULL\n"); - return DSERR_INVALIDPARAM; - } - /* Get dsound configuration */ setup_dsound_options(); @@ -1754,22 +1751,11 @@ HRESULT WINAPI DSOUND_Create8( LPDIRECTSOUND8 pDS; hr = IDirectSoundImpl_Create(&devGuid, &pDS); if (hr == DS_OK) { - hr = DSOUND_PrimaryCreate((IDirectSoundImpl*)pDS); - if (hr == DS_OK) { - hr = IDirectSound8_IDirectSound8_Create(pDS, ppDS); - if (*ppDS) { - IDirectSound8_IDirectSound8_AddRef(*ppDS); - - DSOUND_renderer = (IDirectSoundImpl*)pDS; - timeBeginPeriod(DS_TIME_RES); - DSOUND_renderer->timerID = timeSetEvent(DS_TIME_DEL, DS_TIME_RES, DSOUND_timer, - (DWORD)DSOUND_renderer, TIME_PERIODIC | TIME_CALLBACK_FUNCTION); - } else { - WARN("IDirectSound8_IDirectSound8_Create failed\n"); - IDirectSound8_Release(pDS); - } - } else { - WARN("DSOUND_PrimaryCreate failed\n"); + hr = IDirectSound8_IDirectSound8_Create(pDS, ppDS); + if (*ppDS) + IDirectSound8_IDirectSound8_AddRef(*ppDS); + else { + WARN("IDirectSound8_IDirectSound8_Create failed\n"); IDirectSound8_Release(pDS); } } else @@ -1800,12 +1786,33 @@ HRESULT WINAPI DirectSoundCreate8( IUnknown *pUnkOuter) { HRESULT hr; + LPDIRECTSOUND8 pDS; TRACE("(%s,%p,%p)\n",debugstr_guid(lpcGUID),ppDS,pUnkOuter); - hr = DSOUND_Create8(lpcGUID, ppDS, pUnkOuter); - if (hr == DS_OK) - IDirectSound8_Initialize(*ppDS, lpcGUID); + if (ppDS == NULL) { + WARN("invalid parameter: ppDS == NULL\n"); + return DSERR_INVALIDPARAM; + } + + if (pUnkOuter != NULL) { + WARN("invalid parameter: pUnkOuter != NULL\n"); + *ppDS = 0; + return DSERR_INVALIDPARAM; + } + + hr = DSOUND_Create8(lpcGUID, &pDS, pUnkOuter); + if (hr == DS_OK) { + IDirectSound8_IDirectSound8 * pp = (IDirectSound8_IDirectSound8 *)pDS; + IDirectSoundImpl * p = (IDirectSoundImpl *)(pp->pds); + if (!(p->initialized)) { + hr = IDirectSound8_Initialize(pDS, lpcGUID); + if (hr != DS_OK) + IDirectSound8_Release(pDS); + } + } + + *ppDS = pDS; return hr; } Index: dlls/dsound/tests/dsound.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/tests/dsound.c,v retrieving revision 1.52 diff -u -p -r1.52 dsound.c --- dlls/dsound/tests/dsound.c 30 Mar 2005 10:21:44 -0000 1.52 +++ dlls/dsound/tests/dsound.c 6 May 2005 16:02:55 -0000 @@ -93,16 +93,21 @@ static void IDirectSound_test(LPDIRECTSO "IDirectSound_Initialize() failed: %s\n",DXGetErrorString8(rc)); if (rc==DSERR_NODRIVER) { trace(" No Driver\n"); - return; + goto EXIT; } else if (rc==E_FAIL) { trace(" No Device\n"); - return; + goto EXIT; } else if (rc==DSERR_ALLOCATED) { trace(" Already In Use\n"); - return; + goto EXIT; } } + rc=IDirectSound_Initialize(dso,lpGuid); + ok(rc==DSERR_ALREADYINITIALIZED, "IDirectSound_Initialize() " + "should have returned DSERR_ALREADYINITIALIZED: %s\n", + DXGetErrorString8(rc)); + /* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound_GetCaps(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_GetCaps(NULL) " @@ -158,6 +163,7 @@ static void IDirectSound_test(LPDIRECTSO speaker_config,new_speaker_config); } +EXIT: ref=IDirectSound_Release(dso); ok(ref==0,"IDirectSound_Release() has %d references, should have 0\n",ref); } @@ -238,6 +244,8 @@ static void IDirectSound_tests() rc=DirectSoundCreate(&DSDEVID_DefaultVoiceCapture,&dso,NULL); ok(rc==DSERR_NODRIVER,"DirectSoundCreate(DSDEVID_DefaultVoiceCapture) " "should have failed: %s\n",DXGetErrorString8(rc)); + if (rc==DS_OK && dso) + IDirectSound_Release(dso); } static HRESULT test_dsound(LPGUID lpGuid) Index: dlls/dsound/tests/dsound8.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/tests/dsound8.c,v retrieving revision 1.21 diff -u -p -r1.21 dsound8.c --- dlls/dsound/tests/dsound8.c 11 Apr 2005 12:52:00 -0000 1.21 +++ dlls/dsound/tests/dsound8.c 6 May 2005 16:02:56 -0000 @@ -108,16 +108,21 @@ static void IDirectSound8_test(LPDIRECTS "IDirectSound8_Initialize() failed: %s\n",DXGetErrorString8(rc)); if (rc==DSERR_NODRIVER) { trace(" No Driver\n"); - return; + goto EXIT; } else if (rc==E_FAIL) { trace(" No Device\n"); - return; + goto EXIT; } else if (rc==DSERR_ALLOCATED) { trace(" Already In Use\n"); - return; + goto EXIT; } } + rc=IDirectSound8_Initialize(dso,lpGuid); + ok(rc==DSERR_ALREADYINITIALIZED, "IDirectSound8_Initialize() " + "should have returned DSERR_ALREADYINITIALIZED: %s\n", + DXGetErrorString8(rc)); + /* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound8_GetCaps(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_GetCaps() " @@ -177,6 +182,7 @@ static void IDirectSound8_test(LPDIRECTS ok(rc==DS_OK||rc==E_NOTIMPL,"IDirectSound8_VerifyCertification() failed: %s\n", DXGetErrorString8(rc)); +EXIT: ref=IDirectSound8_Release(dso); ok(ref==0,"IDirectSound8_Release() has %d references, should have 0\n",ref); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel