July 2007 - Wine-commits - list.winehq.org

Maarten Lankhorst : dsound: Replace buffer critical section with a rw-lock.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 237b2938294dbe258bf03fee01a7394d46f0911d URL: http://source.winehq.org/git/wine.git/?a=commit;h=237b2938294dbe258bf03fee0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 29 21:01:43 2007 +0200 dsound: Replace buffer critical section with a rw-lock. --- dlls/dsound/buffer.c | 49 ++++++++++++++++++----------------------- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 4 +- dlls/dsound/primary.c | 4 +- 4 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index aa6ef50..d0a6fe6 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -216,7 +216,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume( } /* **** */ - EnterCriticalSection(&(This->lock)); + RtlAcquireResourceExclusive(&This->lock, TRUE); if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) { oldVol = This->ds3db_lVolume; @@ -239,7 +239,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume( } } - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); /* **** */ return hres; @@ -288,7 +288,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency( } /* **** */ - EnterCriticalSection(&(This->lock)); + RtlAcquireResourceExclusive(&This->lock, TRUE); oldFreq = This->freq; This->freq = freq; @@ -298,7 +298,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency( DSOUND_RecalcFormat(This); } - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); /* **** */ return DS_OK; @@ -312,7 +312,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play( TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags); /* **** */ - EnterCriticalSection(&(This->lock)); + RtlAcquireResourceExclusive(&This->lock, TRUE); This->playflags = flags; if (This->state == STATE_STOPPED) { @@ -329,7 +329,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play( This->state = STATE_PLAYING; } - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); /* **** */ return hres; @@ -342,7 +342,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface) TRACE("(%p)\n",This); /* **** */ - EnterCriticalSection(&(This->lock)); + RtlAcquireResourceExclusive(&This->lock, TRUE); if (This->state == STATE_PLAYING) This->state = STATE_STOPPING; @@ -357,7 +357,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface) } DSOUND_CheckEvent(This, 0, 0); - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); /* **** */ return hres; @@ -380,8 +380,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) if (!ref) { DirectSoundDevice_RemoveBuffer(This->device, This); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&(This->lock)); + RtlDeleteResource(&This->lock); if (This->hwbuf) { IDsDriverBuffer_Release(This->hwbuf); @@ -568,7 +567,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock( } /* **** */ - EnterCriticalSection(&(This->lock)); + RtlAcquireResourceShared(&This->lock, TRUE); if (!(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) { hres = IDsDriverBuffer_Lock(This->hwbuf, @@ -578,7 +577,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock( 0); if (hres != DS_OK) { WARN("IDsDriverBuffer_Lock failed\n"); - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); return hres; } } else { @@ -603,7 +602,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock( } } - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); /* **** */ return DS_OK; @@ -617,7 +616,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition( TRACE("(%p,%d)\n",This,newpos); /* **** */ - EnterCriticalSection(&(This->lock)); + RtlAcquireResourceExclusive(&This->lock, TRUE); /* start mixing from this new location instead */ newpos %= This->buflen; @@ -634,7 +633,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition( WARN("IDsDriverBuffer_SetPosition failed\n"); } - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); /* **** */ return hres; @@ -661,7 +660,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan( } /* **** */ - EnterCriticalSection(&(This->lock)); + RtlAcquireResourceExclusive(&This->lock, TRUE); if (This->volpan.lPan != pan) { This->volpan.lPan = pan; @@ -674,7 +673,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan( } } - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); /* **** */ return hres; @@ -710,7 +709,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock( TRACE("(%p,%p,%d,%p,%d)\n", This,p1,x1,p2,x2); /* **** */ - EnterCriticalSection(&(This->lock)); + RtlAcquireResourceShared(&This->lock, TRUE); if (!(This->device->drvdesc.dwFlags & DSDDESC_DONTNEEDSECONDARYLOCK) && This->hwbuf) { hres = IDsDriverBuffer_Unlock(This->hwbuf, p1, x1, p2, x2); @@ -718,7 +717,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock( WARN("IDsDriverBuffer_Unlock failed\n"); } - LeaveCriticalSection(&(This->lock)); + RtlReleaseResource(&This->lock); /* **** */ return hres; @@ -1099,8 +1098,7 @@ HRESULT IDirectSoundBufferImpl_Create( } else DSOUND_RecalcVolPan(&(dsb->volpan)); - InitializeCriticalSection(&(dsb->lock)); - dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectSoundBufferImpl.lock"); + RtlInitializeResource(&dsb->lock); /* register buffer if not primary */ if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { @@ -1108,8 +1106,7 @@ HRESULT IDirectSoundBufferImpl_Create( if (err != DS_OK) { HeapFree(GetProcessHeap(),0,dsb->buffer->memory); HeapFree(GetProcessHeap(),0,dsb->buffer); - dsb->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&(dsb->lock)); + RtlDeleteResource(&dsb->lock); HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb); dsb = NULL; @@ -1237,14 +1234,12 @@ HRESULT IDirectSoundBufferImpl_Duplicate( CopyMemory(dsb->pwfx, pdsb->pwfx, size); - InitializeCriticalSection(&(dsb->lock)); - dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectSoundBufferImpl.lock"); + RtlInitializeResource(&dsb->lock); /* register buffer */ hres = DirectSoundDevice_AddBuffer(device, dsb); if (hres != DS_OK) { - dsb->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&(dsb->lock)); + RtlDeleteResource(&dsb->lock); HeapFree(GetProcessHeap(),0,dsb->buffer); HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index fcd4133..3516c18 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -157,7 +157,7 @@ struct IDirectSoundBufferImpl /* IDirectSoundBufferImpl fields */ SecondaryBufferImpl* secondary; DirectSoundDevice* device; - CRITICAL_SECTION lock; + RTL_RWLOCK lock; PIDSDRIVERBUFFER hwbuf; PWAVEFORMATEX pwfx; BufferMemory* buffer; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index b5af5fb..e17525c 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -697,7 +697,7 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD playpos, if (dsb->buflen && dsb->state && !dsb->hwbuf) { TRACE("Checking %p, mixlen=%d\n", dsb, mixlen); - EnterCriticalSection(&(dsb->lock)); + RtlAcquireResourceShared(&dsb->lock, TRUE); /* if buffer is stopping it is stopped now */ if (dsb->state == STATE_STOPPING) { @@ -729,7 +729,7 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD playpos, *all_stopped = FALSE; } - LeaveCriticalSection(&(dsb->lock)); + RtlReleaseResource(&dsb->lock); } } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index a89889c..8edf477 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -460,12 +460,12 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) IDirectSoundBufferImpl** dsb = device->buffers; for (i = 0; i < device->nrofbuffers; i++, dsb++) { /* **** */ - EnterCriticalSection(&((*dsb)->lock)); + RtlAcquireResourceExclusive(&(*dsb)->lock, TRUE); (*dsb)->freqAdjust = ((*dsb)->freq << DSOUND_FREQSHIFT) / wfex->nSamplesPerSec; - LeaveCriticalSection(&((*dsb)->lock)); + RtlReleaseResource(&(*dsb)->lock); /* **** */ } }

1 0

Maarten Lankhorst : dsound: Reset state when stopping device.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: de9cecaaa86802ba105b1735721725fc08f557cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9cecaaa86802ba105b17357… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 29 21:04:09 2007 +0200 dsound: Reset state when stopping device. --- dlls/dsound/primary.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 8edf477..16509d6 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -316,6 +316,13 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) (LPVOID)&(device->hwbuf)); if (err != DS_OK) WARN("IDsDriver_CreateSoundBuffer failed\n"); + else if (device->state == STATE_STOPPING) + device->state = STATE_STOPPED; + else if (device->state == STATE_PLAYING) + device->state = STATE_STARTING; + if (err == DS_OK) + FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); + } else { WARN("waveOutOpen failed\n"); }

1 0

Alexandre Julliard : ntdll: Convert the XML parser to Unicode to support UCS-16 manifests.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: db72af98b556660a699cd6563f9348bd9f86c33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db72af98b556660a699cd6563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 18:20:24 2007 +0200 ntdll: Convert the XML parser to Unicode to support UCS-16 manifests. --- dlls/ntdll/actctx.c | 369 ++++++++++++++++++++++++++++---------------------- 1 files changed, 207 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db72af98b556660a699cd…

1 0

Alexandre Julliard : ntdll: Fixed the null bytes check in RtlIsTextUnicode.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 43519e415d8712850e51672a189d8a687b5e6c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43519e415d8712850e51672a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 20:17:24 2007 +0200 ntdll: Fixed the null bytes check in RtlIsTextUnicode. --- dlls/ntdll/rtlstr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 2a54223..1b13f12 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1636,7 +1636,7 @@ BOOLEAN WINAPI RtlIsTextUnicode( LPCVOID buf, INT len, INT *pf ) { for (i = 0; i < len; i++) { - if (!s[i]) + if (!(s[i] & 0xff) || !(s[i] >> 8)) { out_flags |= IS_TEXT_UNICODE_NULL_BYTES; break;

1 0

Alexandre Julliard : ntdll: Use the exact size of the manifest file.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 53285e2462d2c57e0a590e96ea355983f01751cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=53285e2462d2c57e0a590e96e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 20:25:12 2007 +0200 ntdll: Use the exact size of the manifest file. --- dlls/ntdll/actctx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 15b0c59..e0ebd15 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1652,6 +1652,8 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct assembly_identity* ai, LPCWSTR filename, LPCWSTR directory, HANDLE file ) { + FILE_END_OF_FILE_INFORMATION info; + IO_STATUS_BLOCK io; HANDLE mapping; OBJECT_ATTRIBUTES attr; LARGE_INTEGER size; @@ -1682,7 +1684,9 @@ static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct NtClose( mapping ); if (status != STATUS_SUCCESS) return status; - status = parse_manifest(acl, ai, filename, directory, base, count); + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileEndOfFileInformation ); + if (status == STATUS_SUCCESS) + status = parse_manifest(acl, ai, filename, directory, base, info.EndOfFile.QuadPart); NtUnmapViewOfSection( GetCurrentProcess(), base ); return status;

1 0

Alexandre Julliard : ntdll: Allow optional elements in the comClass element .
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: f9c9f237635c229750bae29caf0af2eb19308c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c9f237635c229750bae29ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 20:25:33 2007 +0200 ntdll: Allow optional elements in the comClass element. --- dlls/ntdll/actctx.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index e0ebd15..eb4cb71 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -885,8 +885,8 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; + xmlstr_t elem, attr_name, attr_value; + BOOL ret, end = FALSE, error; struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) @@ -905,7 +905,21 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, comClassW); + + while ((ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, comClassW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + return ret; } static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll)

1 0

lostwages/templates/en status.template status_ ...
by Jeremy Newman 30 Jul '07

30 Jul '07

ChangeSet ID: 31290 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/07/30 10:44:07 Modified files: templates/en : status.template status_changelog.template status_directx.template status_multimedia.template status_options.template status_todo.template status_ui.template Log message: Tom Wickline <twickline(a)gmail.com> Status Update Patch: http://cvs.winehq.org/patch.py?id=31290 Old revision New revision Changes Path 1.48 1.49 +1 -1 lostwages/templates/en/status.template 1.53 1.54 +31 -283 lostwages/templates/en/status_changelog.template 1.23 1.24 +68 -44 lostwages/templates/en/status_directx.template 1.21 1.22 +16 -22 lostwages/templates/en/status_multimedia.template 1.6 1.7 +1 -1 lostwages/templates/en/status_options.template 1.20 1.21 +4 -6 lostwages/templates/en/status_todo.template 1.25 1.26 +16 -15 lostwages/templates/en/status_ui.template

1 0

Tim Schwartz : lmuse.h: Add structures needed by NetUseAdd().
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 2908dab7840d045efb0e959cdc393f3a808fa6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2908dab7840d045efb0e959cd… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Fri Jul 27 17:43:16 2007 -0500 lmuse.h: Add structures needed by NetUseAdd(). --- include/Makefile.in | 1 + include/lm.h | 1 + include/lmuse.h | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 44ef893..a79ae12 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -200,6 +200,7 @@ SRCDIR_INCLUDES = \ lmserver.h \ lmshare.h \ lmstats.h \ + lmuse.h \ lmwksta.h \ lzexpand.h \ mapi.h \ diff --git a/include/lm.h b/include/lm.h index 6151fd5..429ca9f 100644 --- a/include/lm.h +++ b/include/lm.h @@ -32,5 +32,6 @@ #include <lmstats.h> #include <lmjoin.h> #include <lmmsg.h> +#include <lmuse.h> #endif diff --git a/include/lmuse.h b/include/lmuse.h new file mode 100644 index 0000000..786fb01 --- /dev/null +++ b/include/lmuse.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2007 Tim Schwartz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _LMUSE_H +#define _LMUSE_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _USE_INFO_1 { + LMSTR ui1_local, ui1_remote, ui1_password; + DWORD ui1_status, ui1_asg_type, ui1_refcount, ui1_usecount; +} USE_INFO_1, *PUSE_INFO_1, *LPUSE_INFO_1; + +typedef struct _USE_INFO_2 { + LMSTR ui2_local, ui2_remote, ui2_password; + DWORD ui2_status, ui2_asg_type, ui2_refcount, ui2_usecount; + LPWSTR ui2_username; + LMSTR ui2_domainname; +} USE_INFO_2, *PUSE_INFO_2, *LPUSE_INFO_2; + +#ifdef __cplusplus +} +#endif + +#endif /* ndef _LMUSE_H */

1 0

Lei Zhang : ntdll: Add Bolivian time zone info.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 9ee4d8509bcc5a8b675c8e0712bf320180b9c757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee4d8509bcc5a8b675c8e071… Author: Lei Zhang <thestig(a)google.com> Date: Sun Jul 29 22:01:56 2007 -0700 ntdll: Add Bolivian time zone info. --- dlls/ntdll/time.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 497087c..9f1cef2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -417,6 +417,8 @@ static const struct tagTZ_INFO TZ_INFO[] = {"NOVST", {'N','o','v','o','s','i','b','i','r','s','k',' ','S','u','m','m','e','r', ' ','T','i','m','e','\0'}, -420, 1}, + {"BOT", + {'B','o','l','i','v','i','a','n',' ','T','i','m','e','\0'}, 240, 0}, {"UZT", {'U','z','b','e','k','i','s','t','h','a','n',' ','T','i','m','e','\0'}, -300, 0} };

1 0

Clinton Stimpson : user32: Also test parent messages when hiding child window.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: f4af6455a8a446bb56c33d269e23c6f6b9133dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4af6455a8a446bb56c33d269… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Thu Jul 26 19:27:53 2007 -0600 user32: Also test parent messages when hiding child window. --- dlls/user32/tests/msg.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 799c891..04dca3f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -727,6 +727,15 @@ static const struct message WmHideChildSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; +/* ShowWindow(SW_HIDE) for a visible child window checking all parent events*/ +static const struct message WmHideChildSeq2[] = { + { WM_SHOWWINDOW, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_ERASEBKGND, sent|parent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { 0 } +}; /* SetWindowPos(SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE) * for a not visible child window */ @@ -3982,6 +3991,15 @@ static void test_messages(void) ShowWindow(hchild, SW_SHOW); ok_sequence(WmShowChildSeq, "ShowWindow(SW_SHOW):child", FALSE); + /* check parent messages too */ + log_all_parent_messages++; + ShowWindow(hchild, SW_HIDE); + ok_sequence(WmHideChildSeq2, "ShowWindow(SW_HIDE):child", TRUE); + log_all_parent_messages--; + + ShowWindow(hchild, SW_SHOW); + ok_sequence(WmShowChildSeq, "ShowWindow(SW_SHOW):child", FALSE); + ShowWindow(hchild, SW_HIDE); ok_sequence(WmHideChildSeq, "ShowWindow(SW_HIDE):child", FALSE);

1 0