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

[PATCH] fix tools/c2man.pl perl syntax
by Alexey Tourbin 12 Jan '07

12 Jan '07

Fellas, tools/c2man.pl have buggy pieca code which work only for accident reasons. The patch fixes perl syntax for upcoming perl-5.8.9 who ain't not gonna tolerate the buggy pieca coda. http://www.nntp.perl.org/group/perl.perl5.porters/119879 http://www.nntp.perl.org/group/perl.perl5.porters/119881 http://www.nntp.perl.org/group/perl.perl5.porters/119882 http://www.nntp.perl.org/group/perl.perl5.porters/119883 --- tools/c2man.pl- 2006-12-24 00:17:04 +0000 +++ tools/c2man.pl 2007-01-12 07:13:05 +0000 @@ -627,7 +627,7 @@ sub process_comment($) # When the function is exported twice we have the second name below the first # (you see this a lot in ntdll, but also in some other places). - my $first_line = ${@{$comment->{TEXT}}}[1]; + my $first_line = $comment->{TEXT}[1]; if ( $first_line =~ /^(@|[A-Za-z0-9_]+) +($|\[)([A-Za-z0-9_]+)\.(([0-9]+)|@)($|\])$/ ) { @@ -642,14 +642,14 @@ sub process_comment($) my $alt_export = @{$spec_details->{EXPORTS}}[$alt_index]; @$alt_export[4] |= $FLAG_DOCUMENTED; $spec_details->{NUM_DOCS}++; - ${@{$comment->{TEXT}}}[1] = ""; + $comment->{TEXT}[1] = ""; } } if (@{$spec_details->{CURRENT_EXTRA}}) { # We have an extra comment that might be related to this one - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = $spec_details->{CURRENT_EXTRA}[0]; my $current_name = $current_comment->{COMMENT_NAME}; if ($comment->{COMMENT_NAME} =~ /^$current_name/ && $comment->{COMMENT_NAME} ne $current_name) { @@ -986,7 +986,7 @@ sub process_extra_comment($) if (@{$spec_details->{CURRENT_EXTRA}}) { - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = $spec_details->{CURRENT_EXTRA}[0]; if ($opt_verbose > 0) { @@ -1072,7 +1072,7 @@ sub process_index_files() if (@{$spec_details->{CURRENT_EXTRA}}) { # We have an unwritten extra comment, write it - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = $spec_details->{CURRENT_EXTRA}[0]; process_extra_comment($current_comment); @{$spec_details->{CURRENT_EXTRA}} = (); } @@ -1468,7 +1468,7 @@ sub output_api_synopsis($) my $biggest_length = 0; for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = $comment->{PROTOTYPE}[$i]; if ($line =~ /(.+?)([A-Za-z_][A-Za-z_0-9]*)$/) { my $length = length $1; @@ -1482,19 +1482,19 @@ sub output_api_synopsis($) # Now pad the string with blanks for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = $comment->{PROTOTYPE}[$i]; if ($line =~ /(.+?)([A-Za-z_][A-Za-z_0-9]*)$/) { my $pad_len = $biggest_length - length $1; my $padding = " " x ($pad_len); - ${@{$comment->{PROTOTYPE}}}[$i] = $1.$padding.$2; + $comment->{PROTOTYPE}[$i] = $1.$padding.$2; } } for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { # Format the parameter name - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = $comment->{PROTOTYPE}[$i]; my $comma = ($i == @{$comment->{PROTOTYPE}}-1) ? "" : ","; $line =~ s/(.+?)([A-Za-z_][A-Za-z_0-9]*)$/ $fmt[0]$1$fmt[2]$2$fmt[3]$comma$fmt[1]/; print OUTPUT $line;

1 0

OpenGL in child windows
by Chris Robinson 12 Jan '07

12 Jan '07

Here's something I've been working on for about the past week. It's my attempt to get OpenGL to render into an X11 child window that overlays the Win32 window. These patches are more proof-of-concept than anything I'd attempt to get into Wine.. just to show that it seems to work. If the method is good enough, these would need to be rewritten. The biggest problem facing these patches that I ran into are threading issues. Since each window is basically tied to the thread that it was created in but can be used out of it, and each thread uses its own X11 display connection, there's quite a few hoops to jump through. The problem is that the OpenGL X11 window can be created at basically any time after the window was created, in any thread (it's currently done in the call to SetPixelFormat, the earliest it'll know which visual/pixel format is wanted, and can create a colormap to be able to use it in a child window, regardless of the visual of its parent). If that call is not done in the thread the win32 window was created in, it would have trouble getting some of the data structures it needs. Add on top of that, that the X11 window can be parented to yet another win32 window (the one that has the "whole" X11 window), which can be in yet another thread, it leaves a lot of problem trying to keep syncronization. Most of the placement syncronization is done by adding a couple fields to x11drv_win_data to hold info for the X11 child window's parent, that can be used to properly offset the X11 child in relation to the X11 parent, according to the Win32 window's placement. It also needed a couple driver-specific WM_ messages to be able to get the data it needs in case the creation is done in a seperate thread. Because the X11 window uses a thread-specific display connection, and the child window needs to share the display connection, I needed to add a Display* to the X11DRV_PDEVICE struct, which is used wherever a GLX call needs an explicit display connection. This works well most of the time, but has a problem when a GL context (tied to an HDC in Windows) is in use when the thread that created the Win32 window that the HDC came from is killed. When the thread is killed, it closes the connection which leaves GLX using an invalid Display. I have to ask, is there a reason each thread uses its own display connection (which are all different from gdi_display), and leaves the window data to only be available from the thread the window was created in? Besides the aforementioned problem with the GL context, I'd imagine it would be problematic even in current Wine.. for example, if something creates a window in one thread, passes it to another, then kills the thread it was originally created in while still using the window. I currently made it so each thread shares the same Display connection (which is different from gdi_display). This seems to cause no noticeable problems, and it fixes the GL context display issue. Beyond that, the only problem I can recall off-hand is that the OpenGL window will draw overtop of all Win32 windows that are sharing the same X11 parent window. However, considering that the current method with the scissors hack causes the whole X11 window to clear on a buffer flip, and also draws on top of anything in its window space anyway, this is still a nice step forward. And there are also a couple syslevel potential-deadlock warnings generated from the calls to create the window, however I have yet to see a problem arise from all the programs I've tested (the warnings can't stay obviously, but they can be figured out later). What these patches end up accomplishing is that it allows for the possibility to use alternate visuals, so the X11 driver would not need to force a specific double-buffered visual on initialization, and it allows programs to use program-specified color, stencil, depth, aux, multisampling, and single/double-buffer configurations without relying on the main window to have it too (this isn't done in these patches, but it does allow for it to work). Also, the scissors hack is no longer needed. All calls to the Wine-specific extension for it can be removed (they aren't removed here, instead just piped directly to the appropriate gl* function with no alteration, since that would require changes to opengl32). OpenGL in Win32 child windows is improved by being restrained to the Win32 windows' extents, as seen in the screen-grab here in VLC using the OpenGL output renderer: http://kcat.strangesoft.net/deskshot.jpg It uses proper color ordering (unlike the GDI renderer), is properly centered, can be scaled with no performance impact, and doesn't clear the whole window. Performance is good, and it is actually quite useable. Terragen (which has a real-time 3D window), Terragen 2 (which has two or three OpenGL child windows), Milkshape 3D, and GoogleEarth all work. Terragen 2 has some issues with its right-click menu that comes up from the OpenGL child window (the mouse doesn't interact with it), however I'm not sure if this is an issue with my patches since Milkshape3D also has a right-click menu from an OpenGL child and it works fine. In any case, there's no other input-related issues to speak of. Clicking and dragging the globe in GoogleEarth works, as does the keyboard controls in Terragen, and the other Win32 windows are properly receptive to all input as well. It also behaves properly with composite effects (such as the transparency, stretching, and warping effects from Beryl). All testing and comments on the patches are welcome. If the code is doing something it shouldn't be, I'm more than willing to figure out alternative methods if needed (hopefully with help). With luck, they can be gotten to a point soon where they can be rewritten properly to get into Wine.

4 4

Re: dsound/tests: The tests link with dsound.dll so use GetModuleHandle() instead of LoadLibrary().
by Felix Nawothnig 11 Jan '07

11 Jan '07

Francois Gouget wrote: > This is a NOP, it just seems a bit cleaner to me. > > - hDsound = LoadLibraryA("dsound.dll"); > - if (!hDsound) { > - trace("dsound.dll not found\n"); > - return; > - } > - > + hDsound = GetModuleHandleA("dsound.dll"); > + ok(hDsound != NULL, "dsound.dll not loaded!\n"); No it's not, that causes test failure on native when DirectX is not installed (NT4 out-of-the-box I believe?).

2 1

Looking for sound testers
by Maarten Lankhorst 11 Jan '07

11 Jan '07

Hi all, I've forward ported the old patches of Davin McCall (dsound.patch). With them I have no more sound underruns etc, I'm therefore looking for other people to test them as well. I'm welcoming comments on how it works and possible issues with it. I also attached my patch to alsa, I'm aware of the things I need to fix for that, but I thought it might be good to test dsound with winealsa, to see if other things still need to be fixed. Cheers, Maarten

6 5

Re: Stub fro GetRawInputDeviceList
by Marcelo Duarte 11 Jan '07

11 Jan '07

Michał Majchrowicz escreveu: > Hi. > I hope this time it is correct patch and will be accepted. > Regards Michael. I think the spec file is incorrect. > diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec > index f857105..0517ebc 100644 > --- a/dlls/user32/user32.spec > +++ b/dlls/user32/user32.spec > @@ -345,7 +345,7 @@ > # @ stub GetRawInputData > # @ stub GetRawInputDeviceInfoA > # @ stub GetRawInputDeviceInfoW > -# @ stub GetRawInputDeviceList > +@ stub GetRawInputDeviceList > maybe: @ stdcall GetRawInputDeviceList(ptr ptr long) > # @ stub GetReasonTitleFromReasonCode > # @ stub GetRegisteredRawInputDevices > @ stdcall GetScrollBarInfo(long long ptr) > diff --git a/include/winuser.h b/include/winuser.

1 0

WinZip regression
by martin pilka 11 Jan '07

11 Jan '07

Hello, automated CxTest testing shows WinZip regression: Jan 8 - WinZip ran 9 times (5 Francois + 4 Jozef), all succeeded Jan 9 - WinZip ran 1 time (Francois), failed with http://www.cxtest.org/triage/failures?dl=364121 (Out of resources error, unable to continue) Jan 10 - WinZip ran 2 times (1 Francois + 1 Jozef), both failed with same screenshot So there is a regression between Jan 8 and Jan 9 - unfortunately, I do not know GIT_ID. Should I create bug for this? If you want to join Wine automated testing process, go to http://www.cxtest.org/download and install CxTest. Martin

1 0

Re: WineD3D: Fix my name
by Alexandre Julliard 11 Jan '07

11 Jan '07

Stefan Dösinger <stefan(a)codeweavers.com> writes: > Correct the umlauts for utf8, this seems to be the encoding everyone uses Actually the encoding for source files is Latin-1 at the moment. This should probably be changed once we convert resources to utf-8, to make all files use the same encoding. -- Alexandre Julliard julliard(a)winehq.org

4 5

Re: Electron Microscope III (EMIII)
by Dmitry Timoshkov 11 Jan '07

11 Jan '07

"Seth Shelnutt" <shelnutt2(a)msn.com> wrote: > I am trying to get EMIII to run via wine. I'm perfectly willing to debug > this. I just don't know how. I think my issue is with MSVBVM60.DLL > (MSVBVM60.dbg)? I just sent a patch that should fix the crash. P.S. wineconf mailing list is not an appropriate place for a bug report. -- Dmitry.

1 0

dual displays
by James Hawkins 11 Jan '07

11 Jan '07

Hi, dlls/winex11.drv/opengl.c:820 if(!display || !display) { ERR("Invalid display or visual\n"); } My guess is that second 'display' is supposed to be 'visual'. -- James Hawkins

1 0

Re: D3D9: Implement IDirect3DDevice9::StretchRect
by Ivan Gyurdiev 11 Jan '07

11 Jan '07

Stefan Dösinger wrote: > This call can be handled fully by IWineD3DSurface::Blt. So where did the filter argument go.. there's 3 different filter types to support.

1 0