February 2018 - Wine-devel - list.winehq.org

[PATCH 3/4] testbot: Replace poweroff with checkoff in the Engine's Cleanup().
by Francois Gouget 27 Feb '18

27 Feb '18

checkoff verifies that the hypervisor domain state matches that of the current VM instance before powering it off. If the state does not match then the VM is just marked off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 8 ++++---- testbot/bin/LibvirtTool.pl | 28 ++++++++++++++++++++++++++-- testbot/lib/WineTestBot/VMs.pm | 20 ++++++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 2e62c660c..a03fa06b9 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -206,8 +206,8 @@ sub Cleanup($;$$) { # The VM should not have a process. $VM->KillChild(); - $VM->RunPowerOff(); - $VM->RecordStatus($Records, "dirty poweroff (unexpected process)"); + $VM->RunCheckOff(); + $VM->RecordStatus($Records, "dirty off check (unexpected process)"); } elsif ($Starting) { @@ -228,8 +228,8 @@ sub Cleanup($;$$) # Power off the VM, even if its status is already off. # This is the simplest way to resync the VM status field. # Also powering off a powered off VM will detect offline VMs. - $VM->RunPowerOff(); - $VM->RecordStatus($Records, "dirty poweroff"); + $VM->RunCheckOff(); + $VM->RecordStatus($Records, "dirty off check"); } } # $KillVMs is normally used on shutdown so don't start a process that diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 0293baeb7..76ea70713 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -104,7 +104,7 @@ while (@ARGV) { $LogOnly = 1; } - elsif ($Arg =~ /^(?:checkidle|monitor|poweroff|revert)$/) + elsif ($Arg =~ /^(?:checkidle|checkoff|monitor|poweroff|revert)$/) { $Action = $Arg; } @@ -163,7 +163,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|monitor|poweroff|revert) VMName\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|checkoff|monitor|poweroff|revert) VMName\n"; exit $Usage; } @@ -344,6 +344,26 @@ sub CheckIdle() return ChangeStatus("dirty", $NewStatus, "done"); } +sub CheckOff() +{ + $CurrentStatus = "dirty"; + my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + return ChangeStatus("dirty", "offline", "done") if (!defined $IsPoweredOn); + + if ($IsPoweredOn) + { + my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); + FatalError("$ErrMessage\n") if (defined $ErrMessage); + if ($SnapshotName eq $VM->IdleSnapshot) + { + my $ErrMessage = $VM->GetDomain()->PowerOff(); + FatalError("$ErrMessage\n") if (defined $ErrMessage); + } + } + + return ChangeStatus("dirty", "off", "done"); +} + sub Revert() { my $VM = CreateVMs()->GetItem($VMKey); @@ -405,6 +425,10 @@ if ($Action eq "checkidle") { $Rc = CheckIdle(); } +elsif ($Action eq "checkoff") +{ + $Rc = CheckOff(); +} elsif ($Action eq "monitor") { $Rc = Monitor(); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f09863996..afc7af985 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -451,6 +451,26 @@ sub RunCheckIdle($) =pod =over 12 +=item C<RunCheckOff()> + +If the hypervisor domain state matches that of this VM instance, power if off. +If not the VM is simply marked as off. While this is happening the VM status +is set to dirty so the job scheduler does not try to use it. + +This operation can take a long time so it is performed in a separate process. + +=back +=cut + +sub RunCheckOff($) +{ + my ($self) = @_; + return $self->_RunVMTool("dirty", ["--log-only", "checkoff", $self->GetKey()]); +} + +=pod +=over 12 + =item C<RunMonitor()> Monitors an offline VM to detect when it becomes accessible again. -- 2.16.1

1 0

[PATCH 2/4] testbot: Check the current snapshot in LibvirtTool monitor.
by Francois Gouget 27 Feb '18

27 Feb '18

If the snapshot does not match when the hypervisor domain becomes accessible again, then don't try to power if off and just mark the VM instance as off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 12eaa669f..0293baeb7 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -277,23 +277,39 @@ sub Monitor() return 0; } - my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); - if ($IsPoweredOn) + my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); + if (defined $ErrMessage) { - my $ErrMessage = $VM->GetDomain()->PowerOff(); - if (defined $ErrMessage) - { - Error "$ErrMessage\n"; - $IsPoweredOn = undef; - } + Error "$ErrMessage\n"; } - if (defined $IsPoweredOn) + else { - return 1 if (ChangeStatus("offline", "off", "done")); - NotifyAdministrator("The $VMKey VM is working again", - "The $VMKey VM started working again after ". - Elapsed($Start) ." seconds."); - return 0; + my $IsPoweredOn; + if (!defined $SnapshotName or $SnapshotName ne $VM->IdleSnapshot) + { + $IsPoweredOn = 0; + } + else + { + $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + if ($IsPoweredOn) + { + $ErrMessage = $VM->GetDomain()->PowerOff(); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $IsPoweredOn = undef; + } + } + } + if (defined $IsPoweredOn) + { + return 1 if (ChangeStatus("offline", "off", "done")); + NotifyAdministrator("The $VMKey VM is working again", + "The $VMKey VM started working again after ". + Elapsed($Start) ." seconds."); + return 0; + } } Debug(Elapsed($Start), " $VMKey is still unreachable\n"); -- 2.16.1

1 0

[PATCH 1/4] testbot: Check the current snapshot in LibvirtTool checkidle.
by Francois Gouget 27 Feb '18

27 Feb '18

If the snapshot does not match then the current VM instance is not actually using the hypervisor domain so mark it off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This set of patches paves the way for allowing the TestBot to use more than one snapshot per VM (i.e. more than one test configuration per VM). But they can make sense even without it. For instance here if the snapshot does not match then one can consider that maybe the administrator decided to do something with the VM so it makes sense for the TestBot to leave it alone for now. But it's definitely the administrator's fault for not setting the VM status to 'maintenance' if the TestBot later reverts the VM from under his feet. testbot/bin/LibvirtTool.pl | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 670c55359..12eaa669f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -320,9 +320,12 @@ sub CheckIdle() my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); FatalError("$ErrMessage\n") if (defined $ErrMessage); - return PowerOff() if ($SnapshotName ne $VM->IdleSnapshot); - return ChangeStatus("dirty", "idle", "done"); + # If the snapshot does not match then the virtual machine may be used by + # another VM instance. So don't touch it. All that counts is that this + # VM instance is not running. + my $NewStatus = ($SnapshotName eq $VM->IdleSnapshot) ? "idle" : "off"; + return ChangeStatus("dirty", $NewStatus, "done"); } sub Revert() diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d893e4966..f09863996 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -433,9 +433,9 @@ sub _RunVMTool($$$) =item C<RunCheckIdle()> -If the virtual machine state matches that of this VM instance, sets its status -to idle. If not the VM is simply marked as off. While this is happening the -VM status is set to dirty so the job scheduler does not try to use it. +If the hypervisor domain state matches that of this VM instance, sets its +status to idle. If not the VM is simply marked as off. While this is happening +the VM status is set to dirty so the job scheduler does not try to use it. This operation can take a long time so it is performed in a separate process. -- 2.16.1

1 0

[PATCH] testbot/Janitor: Remove a spurious leading 0 in a log message.
by Francois Gouget 27 Feb '18

27 Feb '18

The leading 0 is a convention only used to communicate with the Engine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 382408d15..d8a9650f1 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -258,7 +258,7 @@ if (opendir(my $dh, "$DataDir/staging")) } else { - LogMsg "0Unable to open '$DataDir/staging': $!"; + LogMsg "Unable to open '$DataDir/staging': $!"; } # Delete obsolete record groups -- 2.16.1

1 0

[PATCH] hal: Implement KeQueryPerformanceCounter.
by Zebediah Figura 27 Feb '18

27 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=39500 dlls/hal/hal.c | 10 ++++++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index ddd8710..51bf55d 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -177,3 +177,13 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); } + +ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency) +{ + LARGE_INTEGER counter; + + TRACE("(%p)\n", frequency); + + NtQueryPerformanceCounter(&counter, frequency); + return counter.QuadPart; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index ae706e0..5dc3fa8 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -72,7 +72,7 @@ @ stub KeFlushWriteBuffer @ stdcall KeGetCurrentIrql() @ stub KeLowerIrql -@ stub KeQueryPerformanceCounter +@ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -- 2.7.4

1 0

[PATCH] comctl32: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 27 Feb '18

27 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/commctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index afa6b843d6..9356624a13 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1430,7 +1430,7 @@ void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark {lCentre + 1, l2 - 3}, }; hOldPen = SelectObject(hDC, hPen); - PolyPolyline(hDC, aptInsertMark, adwPolyPoints, sizeof(adwPolyPoints)/sizeof(adwPolyPoints[0])); + PolyPolyline(hDC, aptInsertMark, adwPolyPoints, ARRAY_SIZE(adwPolyPoints)); SelectObject(hDC, hOldPen); DeleteObject(hPen); } -- 2.14.3

1 0

[PATCH] scrrun: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 27 Feb '18

27 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0527531948..aa1660085e 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1001,7 +1001,7 @@ static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) return E_POINTER; *name = NULL; - ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + ret = GetVolumeInformationW(This->root, nameW, ARRAY_SIZE(nameW), NULL, NULL, NULL, NULL, 0); if (ret) *name = SysAllocString(nameW); return ret ? S_OK : E_FAIL; @@ -1026,7 +1026,7 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) return E_POINTER; *fs = NULL; - ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, ARRAY_SIZE(nameW)); if (ret) *fs = SysAllocString(nameW); return ret ? S_OK : E_FAIL; -- 2.14.3

1 0

[PATCH] ntdll: Fix error code when querying too large memory address.
by Zebediah Figura 27 Feb '18

27 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Process Hacker calls this function in a loop to determine the working set limit, and expects it to return STATUS_INVALID_PARAMETER if the given address is too high. This patch allows Process Hacker to enumerate a process's virtual mappings. Test simplified from staging version. dlls/ntdll/tests/info.c | 4 ++++ dlls/ntdll/virtual.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b62e035..1f1c675 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1868,6 +1868,10 @@ static void test_queryvirtualmemory(void) "mbi.Protect is 0x%x\n", mbi.Protect); } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ + + /* check error code when addr is higher than working set limit */ + status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 106dab2..befb59c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2845,7 +2845,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, base = ROUND_ADDR( addr, page_mask ); - if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_INVALID_PARAMETER; /* Find the view containing the address */ -- 2.7.4

1 0

[PATCH] dmcompos/tests: Add IDirectMusicObject::ParseDescriptor() tests
by Michael Stefaniuc 27 Feb '18

27 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 188 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 26c6e1f9a3..d8e4650e44 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -22,10 +22,14 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static BOOL missing_dmcompos(void) { IDirectMusicComposer *dmc; @@ -398,6 +402,189 @@ static void test_signposttrack(void) while (IDirectMusicTrack8_Release(dmt8)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + LARGE_INTEGER zero = {0}; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_GUID_CHUNK, + DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, 0, + FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + + /* All desc chunks, only DMUS_OBJ_OBJECT and DMUS_OBJ_CLASS supported */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == DMUS_OBJ_CLASS, + "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -415,6 +602,7 @@ START_TEST(dmcompos) test_chordmap(); test_chordmaptrack(); test_signposttrack(); + test_parsedescriptor(); CoUninitialize(); } -- 2.14.3

1 0

[PATCH v2 1/2] comctl32: Preserve tooltip size and position after TTN_SHOW correctly.
by Roman Pišl 27 Feb '18

27 Feb '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=14336 https://bugs.winehq.org/show_bug.cgi?id=29864 https://bugs.winehq.org/show_bug.cgi?id=38298 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/tooltips.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 12f2d4b81c..f84b203f2b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -589,6 +589,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) int ptfx = 0; DWORD style = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); INT nTool, current; + LRESULT res; if (track_activate) { @@ -627,11 +628,6 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) TRACE("Show tooltip %d\n", nTool); - hdr.hwndFrom = infoPtr->hwndSelf; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); TOOLTIPS_CalcTipSize (infoPtr, &size); @@ -824,9 +820,30 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) * it is no longer needed */ } - SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - SWP_SHOWWINDOW | SWP_NOACTIVATE); + /* set calculated windows size and position */ + SetWindowPos (infoPtr->hwndSelf, NULL, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + SWP_NOZORDER | SWP_NOACTIVATE); + + /* call TTN_SHOW, an application may adjust size and/or position */ + hdr.hwndFrom = infoPtr->hwndSelf; + hdr.idFrom = toolPtr->uId; + hdr.code = TTN_SHOW; + res = SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); + + if (res) + { + /* TRUE returned if position was changed */ + SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, -1, -1, -1, -1, + SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW | SWP_NOACTIVATE); + } + else + { + /* FALSE returned, still the size could have been modified and we have + * to preserve it */ + SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, rect.left, rect.top, -1, -1, + SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOACTIVATE); + } /* repaint the tooltip */ InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); -- 2.16.1

3 5