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

[PATCH] dmime/tests: Add IDirectMusicObject::ParseDescriptor() tests
by Michael Stefaniuc 02 Mar '18

02 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 62a977eeb7..73118bf090 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -21,7 +21,9 @@ #include <stdarg.h> #include <windef.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> #include <audioclient.h> #include <guiddef.h> @@ -617,6 +619,224 @@ static void test_track(void) } } +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) +{ + static const LARGE_INTEGER zero; + 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; + + 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; + HRESULT hr; + DWORD valid; + unsigned int i; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const WCHAR s_inam[] = {'I','\0'}; + /* fourcc ~0 will be replaced later on */ + FOURCC alldesc[] = + { + FOURCC_RIFF, ~0, 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 + }; + FOURCC dupes[] = + { + FOURCC_RIFF, ~0, 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, ~0, 0}; + FOURCC inam[] = {FOURCC_RIFF, ~0, FOURCC_LIST, ~0, mmioFOURCC('I','N','A','M'), 0, 0}; +#define X(form) form, #form + const struct { + FOURCC form; + const char *name; + } forms[] = { + { X(DMUS_FOURCC_SEGMENT_FORM) }, + { X(mmioFOURCC('W','A','V','E')) }, + }; +#undef X + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + if (hr != S_OK) { + win_skip("Could not create DirectMusicSegment object: %08x\n", hr); + return; + } + for (i = 0; i < ARRAY_SIZE(forms); i++) { + trace("Testing %s\n", forms[i].name); + + /* 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_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicSegment), + "Got class guid %s, expected CLSID_DirectMusicSegment\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + empty[1] = forms[i].form; + 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_DirectMusicSegment), + "Got class guid %s, expected CLSID_DirectMusicSegment\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + + /* All desc chunks */ + alldesc[1] = forms[i].form; + 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); + valid = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS | DMUS_OBJ_VERSION; + if (forms[i].form == DMUS_FOURCC_SEGMENT_FORM) + valid |= DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY; + todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, + valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicSegment), + "Got class guid %s, expected %s\n", wine_dbgstr_guid(&desc.guidClass), + wine_dbgstr_guid(&CLSID_DirectMusicSegment)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + if (forms[i].form == DMUS_FOURCC_SEGMENT_FORM) + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* Duplicated chunks */ + dupes[1] = forms[i].form; + 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_if(forms[i].form == mmioFOURCC('W','A','V','E')) + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, + valid); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[1] = forms[i].form; + 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_if(forms[i].form == DMUS_FOURCC_SEGMENT_FORM) + 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); + valid = DMUS_OBJ_CLASS; + if (forms[i].form == mmioFOURCC('W','A','V','E')) + valid |= DMUS_OBJ_NAME; + todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, + valid); + if (forms[i].form == mmioFOURCC('W','A','V','E')) + todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), + "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + } + IDirectMusicObject_Release(dmo); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -637,6 +857,7 @@ START_TEST(dmime) test_graph(); test_segment(); test_track(); + test_parsedescriptor(); CoUninitialize(); } -- 2.14.3

2 1

[PATCH 5/5] jscript: Added Array.prototype.indexOf implementation.
by Jacek Caban 02 Mar '18

02 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 57 +++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.h | 2 ++ dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 29 ++++++++++++++++++++ 5 files changed, 90 insertions(+), 1 deletion(-)

2 1

[PATCH] testbot: Remove unneeded WineTestBot::RecordGroups imports.
by Francois Gouget 02 Mar '18

02 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e4295c8ec..90c261b08 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -45,7 +45,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4eefa171f..77994a3a3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,7 +45,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 46b11f396..88c3b5884 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -44,7 +44,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; -- 2.16.1

1 0

[PATCH] testbot/web: Reuse $self->{Job} instead of reloading the Job everywhere.
by Francois Gouget 02 Mar '18

02 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7ca78895c..923ef97ae 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -91,8 +91,7 @@ sub CanCancel($) { my ($self) = @_; - my $Job = CreateJobs()->GetItem($self->{JobId}); - my $Status = $Job->Status; + my $Status = $self->{Job}->Status; if ($Status ne "queued" && $Status ne "running") { return "Job already $Status"; @@ -105,7 +104,7 @@ sub CanCancel($) } my $CurrentUser = $Session->User; if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) + $self->{Job}->User->GetKey() ne $CurrentUser->GetKey()) { return "You are not authorized to cancel this job"; } @@ -117,8 +116,7 @@ sub CanRestart($) { my ($self) = @_; - my $Job = CreateJobs()->GetItem($self->{JobId}); - my $Status = $Job->Status; + my $Status = $self->{Job}->Status; if ($Status ne "boterror" && $Status ne "canceled") { return "Not a failed / canceled Job"; @@ -131,7 +129,7 @@ sub CanRestart($) } my $CurrentUser = $Session->User; if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? + $self->{Job}->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? { return "You are not authorized to restart this job"; } -- 2.16.1

1 0

[PATCH] testbot: Standardize on push to append to an array.
by Francois Gouget 02 Mar '18

02 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/ObjectModel/Item.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 62024d97e..ec9a587b5 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -297,7 +297,7 @@ EOF } else { - $FailureKeys[scalar @FailureKeys] = $Key; + push @FailureKeys, $Key; } } elsif (open ERRFILE, "<$TaskDir/err") @@ -317,7 +317,7 @@ EOF } else { - $FailureKeys[scalar @FailureKeys] = $Key; + push @FailureKeys, $Key; } } } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 629613081..e1385b8c7 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -320,8 +320,8 @@ sub GetMasterKey($) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - @MasterColNames[scalar @MasterColNames] = $ColNamePrefix . $ColName; - @MasterColValues[scalar @MasterColValues] = $self->GetColValue($ColName); + push @MasterColNames, $ColNamePrefix . $ColName; + push @MasterColValues, $self->GetColValue($ColName); } } } -- 2.16.1

1 0

[PATCH v2] dmime/tests: Add IDirectMusicObject::ParseDescriptor() tests
by Michael Stefaniuc 02 Mar '18

02 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Clear desc before calling GetDescriptor() dlls/dmime/tests/dmime.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 62a977eeb7..b7b8095725 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -21,7 +21,9 @@ #include <stdarg.h> #include <windef.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> #include <audioclient.h> #include <guiddef.h> @@ -617,6 +619,225 @@ static void test_track(void) } } +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) +{ + static const LARGE_INTEGER zero; + 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; + + 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; + HRESULT hr; + DWORD valid; + unsigned int i; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const WCHAR s_inam[] = {'I','\0'}; + /* fourcc ~0 will be replaced later on */ + FOURCC alldesc[] = + { + FOURCC_RIFF, ~0, 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 + }; + FOURCC dupes[] = + { + FOURCC_RIFF, ~0, 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, ~0, 0}; + FOURCC inam[] = {FOURCC_RIFF, ~0, FOURCC_LIST, ~0, mmioFOURCC('I','N','A','M'), 0, 0}; +#define X(form) form, #form + const struct { + FOURCC form; + const char *name; + } forms[] = { + { X(DMUS_FOURCC_SEGMENT_FORM) }, + { X(mmioFOURCC('W','A','V','E')) }, + }; +#undef X + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + if (hr != S_OK) { + win_skip("Could not create DirectMusicSegment object: %08x\n", hr); + return; + } + for (i = 0; i < ARRAY_SIZE(forms); i++) { + trace("Testing %s\n", forms[i].name); + + /* Nothing loaded */ + memset(&desc, 0, sizeof(desc)); + 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_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicSegment), + "Got class guid %s, expected CLSID_DirectMusicSegment\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + empty[1] = forms[i].form; + 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_DirectMusicSegment), + "Got class guid %s, expected CLSID_DirectMusicSegment\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + + /* All desc chunks */ + alldesc[1] = forms[i].form; + 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); + valid = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS | DMUS_OBJ_VERSION; + if (forms[i].form == DMUS_FOURCC_SEGMENT_FORM) + valid |= DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY; + todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, + valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicSegment), + "Got class guid %s, expected %s\n", wine_dbgstr_guid(&desc.guidClass), + wine_dbgstr_guid(&CLSID_DirectMusicSegment)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + if (forms[i].form == DMUS_FOURCC_SEGMENT_FORM) + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* Duplicated chunks */ + dupes[1] = forms[i].form; + 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_if(forms[i].form == mmioFOURCC('W','A','V','E')) + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, + valid); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[1] = forms[i].form; + 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_if(forms[i].form == DMUS_FOURCC_SEGMENT_FORM) + 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); + valid = DMUS_OBJ_CLASS; + if (forms[i].form == mmioFOURCC('W','A','V','E')) + valid |= DMUS_OBJ_NAME; + todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, + valid); + if (forms[i].form == mmioFOURCC('W','A','V','E')) + todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), + "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + } + IDirectMusicObject_Release(dmo); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -637,6 +858,7 @@ START_TEST(dmime) test_graph(); test_segment(); test_track(); + test_parsedescriptor(); CoUninitialize(); } -- 2.14.3

1 0

[PATCH 1/3] ntdll: Implement ProcessImageFileNameWin32 in NtQueryInformationProcess.
by Zebediah Figura 01 Mar '18

01 Mar '18

From: Michael Müller <michael(a)fds-team.de> This patch allows Process Hacker to show the filename, icon and description of an executable. Since ProcessImageFileName incorrectly returns a Win32 path, we can simply reuse the existing implementation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/process.c | 1 + include/winternl.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 835d7e6..fc75f3e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -517,6 +517,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessImageFileName: /* FIXME: this will return a DOS path. Windows returns an NT path. Changing this would require also changing kernel32.QueryFullProcessImageName. * The latter may be harder because of the lack of RtlNtPathNameToDosPathName. */ + case ProcessImageFileNameWin32: SERVER_START_REQ(get_dll_info) { UNICODE_STRING *image_file_name_str = ProcessInformation; diff --git a/include/winternl.h b/include/winternl.h index c3cca80..f72a071 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -853,6 +853,7 @@ typedef enum _PROCESSINFOCLASS { ProcessDebugFlags = 31, ProcessHandleTracing = 32, ProcessExecuteFlags = 34, + ProcessImageFileNameWin32 = 43, MaxProcessInfoClass } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; -- 2.7.4

3 6

[PATCH 4/5] jscript: Renamed equal2_values to jsval_strict_equal.
by Jacek Caban 01 Mar '18

01 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 3/5] jscript: Properly handle elisions in array literals.
by Jacek Caban 01 Mar '18

01 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 24 ++++++++++++------------ dlls/jscript/engine.c | 31 ++++++++++++++++++------------- dlls/jscript/engine.h | 3 ++- dlls/jscript/tests/lang.js | 4 ++++ 4 files changed, 36 insertions(+), 26 deletions(-)

1 0

[PATCH 2/5] jscript: Properly support missing array elements in Array.pop.
by Jacek Caban 01 Mar '18

01 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 5 +++-- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-)

1 0