October 2011 - Wine-devel - list.winehq.org

Re: winex11.drv/keyboard: MAPVK_VK_TO_CHAR correction (Bug 28168)
by Frédéric Delanoy 10 Oct '11

10 Oct '11

On Mon, Oct 10, 2011 at 22:46, <sebastian.riemer(a)gmx.de> wrote: > --- > dlls/winex11.drv/keyboard.c | 563 ++++++++++++++++++++++++++++++++++++++----- > 1 files changed, 499 insertions(+), 64 deletions(-) Please follow patch submission rules from http://wiki.winehq.org/SubmittingPatches

1 0

winex11.drv/keyboard: MAPVK_VK_TO_CHAR direct mapping
by Sebastian Riemer 10 Oct '11

10 Oct '11

Hi developers, I've just sent my first patch I would like to see in mainline. I did quite some efforts to verify that my patch is correct by doing extensive compares with Windows, the wine before and the patched wine as well as a special testing version of wine. I want to fix this bug http://bugs.winehq.org/show_bug.cgi?id=28168 and I've attached my verification data there, because this is difficult to integrate into the test suite. Could someone please look at my files and help me with some tips and advice or want to become my mentor? I'm really tired of just writing test data into the AppDB and only little changes over the time for the applications I maintain. So, I want to improve wine for the applications I like. Cheers, Sebastian

1 0

Re: mscoree: Implement ICorDebug SetManagedHandler (try 3)
by Vincent Povirk 10 Oct '11

10 Oct '11

Should SetManagedHandler really fail if the given object doesn't support ICorDebugManagedCallback2 ? You've got a stray whitespace change in RuntimeHost_Destroy. Otherwise, this looks good to me. On Mon, Oct 10, 2011 at 5:12 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > Only Release the interfaces after we have a valid callback. > Allow multiple Interfaces per runtime. > > > Changelog: > mscoree: Implement ICorDebug SetManagedHandler > > > Best Regards > Alistair Leslie-Hughes > > > > > >

2 2

DEVELOPMENTAL: use uniscribe in the edit control
by Aric Stewart 10 Oct '11

10 Oct '11

This patch is experimental but people had some interest in testing it and I would love some more testing. What is currently known not to be working: * Tabs * Font Fallback * Complex composed glyphs are not breaking or highlighting properly. Testing is appreceated. Send me crashes or incorrect behavior. It should work with both native and builtin usp10. The patch will be cleaned and broken up before being send it this is just for testing. thanks! -aric --- dlls/user32/edit.c | 495 +++++++++++++++++++++++++++------------------------- 1 files changed, 256 insertions(+), 239 deletions(-)

1 0

Re: [1/5] d3d8: Never announce support for palettized textures
by Henri Verbeet 10 Oct '11

10 Oct '11

On 9 October 2011 15:21, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This is the first set of my P8 patches, they remove dead code that is left over > from d3d8/9 style palettized texture support. See > http://www.winehq.org/pipermail/wine-devel/2011-October/092744.html for the > entire patchset. > I thought you asked me not to look at these patches yet because you still had some issues to fix. Regardless, I gave this a cursory look: - I can't say I find e.g. sprinkling d3dformat_is_palettized() over the code particularly elegant. - Do you have tests for the D3DERR_INVALIDCALL returns? - In patch 5 you remove wined3d_device_get_current_texture_palette() from the spec but not from the public header.

2 3

Re: [ 3/3] ddraw: Keep track of interface attached by AddAttachedSurface and detach correct interface when parent is released.
by Henri Verbeet 10 Oct '11

10 Oct '11

On 10 October 2011 08:07, Octavian Voicu <octavian.voicu(a)gmail.com> wrote: > +static HRESULT delete_attached_surface_helper(IDirectDrawSurfaceImpl *root, IDirectDrawSurfaceImpl *detach) > +{ > + if (detach->attached_iface == &detach->IDirectDrawSurface4_iface) > + return IDirectDrawSurface4_DeleteAttachedSurface(&root->IDirectDrawSurface4_iface, 0, > + &detach->IDirectDrawSurface4_iface); > + else if (detach->attached_iface == &detach->IDirectDrawSurface3_iface) > + return IDirectDrawSurface3_DeleteAttachedSurface(&root->IDirectDrawSurface3_iface, 0, > + &detach->IDirectDrawSurface3_iface); > + else if (detach->attached_iface == &detach->IDirectDrawSurface2_iface) > + return IDirectDrawSurface2_DeleteAttachedSurface(&root->IDirectDrawSurface2_iface, 0, > + &detach->IDirectDrawSurface2_iface); > + else if (detach->attached_iface == &detach->IDirectDrawSurface_iface) > + return IDirectDrawSurface_DeleteAttachedSurface(&root->IDirectDrawSurface_iface, 0, > + &detach->IDirectDrawSurface_iface); > + else if (detach->attached_iface != &detach->IDirectDrawSurface7_iface) > + FIXME("attached_iface %p is invalid for surface %p\n", detach->attached_iface, detach); > + > + return IDirectDrawSurface7_DeleteAttachedSurface(&root->IDirectDrawSurface7_iface, 0, > + &detach->IDirectDrawSurface7_iface); > +} > + Can't you just handle this in ddraw_surface_delete_attached_surface()? I.e., replace the Release calls in ddraw_surface?_DeleteAttachedSurface() with a IUnknown_Release(Surf->attached_iface) in ddraw_surface_delete_attached_surface(), and then just call ddraw_surface_delete_attached_surface() where you're using delete_attached_surface_helper() now.

2 1

Re: [PATCH] ntdll: deal with images which override the section table during mapping
by Marcus Meissner 10 Oct '11

10 Oct '11

On Mon, Oct 10, 2011 at 11:36:33AM +0200, Bernhard Loos wrote: > --- > dlls/ntdll/virtual.c | 38 ++++++++++++++++++++++++++++++++++---- > 1 files changed, 34 insertions(+), 4 deletions(-) I think this needs tests, the algorithms are very fragile. Ciao, Marcus > diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c > index 5e69eb9..7841d9c 100644 > --- a/dlls/ntdll/virtual.c > +++ b/dlls/ntdll/virtual.c > @@ -1114,6 +1114,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > IMAGE_DOS_HEADER *dos; > IMAGE_NT_HEADERS *nt; > IMAGE_SECTION_HEADER *sec; > + IMAGE_SECTION_HEADER *section_table = NULL; > IMAGE_DATA_DIRECTORY *imports; > NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; > int i; > @@ -1123,6 +1124,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > struct file_view *view = NULL; > char *ptr, *header_end; > INT_PTR delta = 0; > + DWORD SizeOfHeaders; > > /* zero-map the whole range */ > > @@ -1158,8 +1160,11 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > header_end = ptr + ROUND_SIZE( 0, header_size ); > memset( ptr + header_size, 0, header_end - (ptr + header_size) ); > if ((char *)(nt + 1) > header_end) goto error; > - sec = (IMAGE_SECTION_HEADER*)((char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); > - if ((char *)(sec + nt->FileHeader.NumberOfSections) > header_end) goto error; > + section_table = (IMAGE_SECTION_HEADER*)((char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); > + /* make sure we mapped enough memory */ > + if ((char *)(section_table + nt->FileHeader.NumberOfSections) > header_end) goto error; > + /* windows is only interested in the size as given by OptionalHeader.SizeOfHeaders */ > + SizeOfHeaders = ROUND_SIZE( 0, nt->OptionalHeader.SizeOfHeaders ); > > imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; > if (!imports->Size || !imports->VirtualAddress) imports = NULL; > @@ -1180,7 +1185,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; > for (i = 0; i < nt->FileHeader.NumberOfSections; i++) > { > - if (sec[i].VirtualAddress != sec[i].PointerToRawData) > + if (section_table[i].VirtualAddress != section_table[i].PointerToRawData) > goto error; /* Windows refuses to load in that case too */ > } > > @@ -1192,6 +1197,24 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > goto done; > } > > + if ((char *)(section_table + nt->FileHeader.NumberOfSections) > ptr + SizeOfHeaders) > + { > + /* part of the section table is outside of SizeOfHeaders > + * at this point, it's likely that a section will get mapped over > + * the section table (Borderlands does this) > + * Not sure how it works on Windows, but we make a copy of the > + * table at this point */ > + sec = RtlAllocateHeap( virtual_heap, 0, sizeof(*sec) * nt->FileHeader.NumberOfSections); > + if (!sec) > + { > + status = STATUS_NO_MEMORY; > + goto error; > + } > + memcpy( sec, section_table, sizeof(*sec) * nt->FileHeader.NumberOfSections); > + section_table = sec; > + } > + else > + sec = section_table; > > /* map all the sections */ > > @@ -1200,6 +1223,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > static const SIZE_T sector_align = 0x1ff; > SIZE_T map_size, file_start, file_size, end; > > + if (sec->VirtualAddress < SizeOfHeaders) > + goto error; > + > if (!sec->Misc.VirtualSize) > map_size = ROUND_SIZE( 0, sec->SizeOfRawData ); > else > @@ -1329,7 +1355,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > > VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ ); > > - sec = (IMAGE_SECTION_HEADER*)((char *)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); > + sec = section_table; > for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) > { > SIZE_T size; > @@ -1361,6 +1387,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > } > > done: > + if (section_table && (char *)section_table != (char *)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader) > + RtlFreeHeap( virtual_heap, 0, section_table ); > view->mapping = dup_mapping; > server_leave_uninterrupted_section( &csVirtual, &sigset ); > > @@ -1373,6 +1401,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > > error: > if (view) delete_view( view ); > + if (section_table && (char *)section_table != (char *)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader) > + RtlFreeHeap( virtual_heap, 0, section_table ); > server_leave_uninterrupted_section( &csVirtual, &sigset ); > if (dup_mapping) NtClose( dup_mapping ); > return status; >

1 0

Re: [PATCH] server: if a debugger is attached to a process, child processes shouldn't get debugged (resend)
by Dmitry Timoshkov 09 Oct '11

09 Oct '11

Bernhard Loos <bernhardloos(a)googlemail.com> wrote: > + int debug_childs:1; /* also debug all child processes */ 'debug_children' would be a better name. -- Dmitry.

4 3

The major mmdevapi and winmm audio bugs
by Joerg-Cyril.Hoehle＠t-systems.com 09 Oct '11

09 Oct '11

Hi, Bugzilla admins, please set the 1.4 milestone on all bugs mentioned here. I'm not yet looking at dsound issues since I first want a correct foundation upon which to build to upper layers. o #28039 IAudioClock_GetPosition must ignore underruns (MacOS) Here I've no idea how to solve this. My initial query remained unanswered: http://lists.apple.com/archives/coreaudio-api//2011/Sep/msg00024.html Ken? Andrew's yesterday patch (using GetCurrentPadding) is an interim work-around. GetPosition (speaker) is unrelated to padding which is solely about buffering. o #28093 GetCurrentPadding must slowly decrease (MacOS) may cause an app to play audio using a single buffer, causing underruns and audio drop outs. o #28056 Problems with sound under FreeBSD which became "blocking calls with OSS" recently addressed by Andrew. o snd_pcm_drop causes incorrect GetPosition after mmdevapi Stop which I believe to be the cause of: #27901 winmm tests timing out waiting for hevent after waveOutRestart May get solved by Andrew's work in: #28517 Pikachu Volleyball stops playing sound effects Every snd_pcm_drop and reset must be inspected with care w.r.t. its effect on GetPosition. Wine must ensure that after playing ends, GetPosition == sum of written samples for both mmdevapi and winmm. o #27937 winmm kept busy playing silence after play finishes IIRC because winmm writes silence. Once mmdevapi handles underruns correctly, my patch "winmm: Never write silence, mmdevapi must handle underruns." will become applicable: http://www.winehq.org/pipermail/wine-patches/2011-September/107108.html Playing silence causes: #28027 μ-law rendering with pauses and repetitions (MacOS) as well as presumably: #28413 Sound play in games and programs causes brief "pauses" at the time dsound used winmm prior to 1.3.29. o #28047 IAudioClock_GetPosition must not depend on buffering (ALSA/Pulse) ALSA must derive GetPosition from snd_pcm_delay, not snd_pcm_avail_update There are other issues not associated with a bug entry. I'm off for vacation, but here's a snippet from my TODO list: - OSS GetPosition from DSP_GETODELAY - ALSA+OSS: ReleaseBuffer: check method ordering and max size - GetStreamLatency = Xms + SHAREDMODE:period Stream latency is a static property of the audio graph's components. - wineoss GetStreamLatency must be constant, and SNDCTL_DSP_GETODELAY is only usable once running - Check WHDR_BEGIN/ENDLOOP code and write tests - WINMM_GetPosition is simply written_frames, not even minus padding (as the old alsa driver did), later use mmdevapi:GetPosition. - winmm PushData without IAC_Reset or last_clock_pos=0 in case of underrun - Investigate OSS4 underrun behaviour - Align wineOSS on newest ALSA code improvements - Submit CoreAudio memory leak fix to #28023; Write error handling patch - Check ALSA laptop suspend w.r.t. GetPosition - Add run-time consistency checks in renderer and abort audio stream (GetData) upon trouble instead of hanging. and finally: - Test compatibility with native DSound and file bug if unusable. There are several reports in bugzilla mentioning that this work-around ceased to work since 1.3.25. Loss of interoperability is not acceptable. Regards, Jörg Höhle

3 2

Re: [PATCH] server: Use syscall(2) instead of inline assembly on Mac OS, too.
by Alexandre Julliard 09 Oct '11

09 Oct '11

Charles Davis <cdavis(a)mymail.mines.edu> writes: > @@ -268,9 +256,9 @@ int send_thread_signal( struct thread *thread, int sig ) > if (!mach_port_extract_right( process_port, thread->unix_tid, > MACH_MSG_TYPE_COPY_SEND, &port, &type )) > { > - if ((ret = pthread_kill_syscall( port, sig )) < 0) > + if ((ret = syscall( SYS___pthread_kill, port, sig )) != 0) > { > - errno = -ret; > + errno = ret; syscall is supposed to take care of errno. -- Alexandre Julliard julliard(a)winehq.org

3 2