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

Michael Stefaniuc : dmime/tests: Add IDirectMusicObject::ParseDescriptor() tests.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 6d74b1ebed3cba3bbac44cf977ac062f34ffe9c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d74b1ebed3cba3bbac44cf9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 2 01:16:08 2018 +0100 dmime/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 62a977e..b7b8095 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(); }

1 0

Michael Stefaniuc : dmusic/tests: Add IDirectMusicObject::ParseDescriptor( ) tests.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: c4e998d0e3945def3e6e86610218a312bb01519d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e998d0e3945def3e6e8661… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 1 23:57:38 2018 +0100 dmusic/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 200 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 961e2cd..e69de25 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "initguid.h" #include "dmusici.h" +#include "dmusicf.h" #include "dmksctrl.h" static void test_dmusic(void) @@ -570,6 +571,204 @@ static void test_COM_synthport(void) while (IDirectMusicPort_Release(port)); } +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; + } + case mmioFOURCC('I','N','A','M'): + ck->size = 5; + p += CHUNK_HDR_SIZE; + strcpy(p, "INAM"); + 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 WCHAR s_inam[] = {'I','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, FOURCC_DLS, 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, FOURCC_DLS, 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_INFO_LIST, mmioFOURCC('I','N','A','M'), 0, + FOURCC_LIST, DMUS_FOURCC_INFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, FOURCC_DLS, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, FOURCC_DLS, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicCollection 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_DirectMusicCollection), + "Got class guid %s, expected CLSID_DirectMusicCollection\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); + todo_wine 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_DirectMusicCollection), + "Got class guid %s, expected CLSID_DirectMusicCollection\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_NOTADLSCOL, + "ParseDescriptor failed: %08x, expected DMUS_E_NOTADLSCOL\n", hr); + + /* All desc chunks */ + 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_CLASS | DMUS_OBJ_VERSION), + "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_VERSION\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection), + "Got class guid %s, expected CLSID_DirectMusicCollection\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)); + ok(desc.vVersion.dwVersionMS == 5 && desc.vVersion.dwVersionLS == 8, + "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, + desc.vVersion.dwVersionLS); + 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); + 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 | DMUS_OBJ_NAME), + "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + 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_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), + "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", + desc.dwValidData); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -587,6 +786,7 @@ START_TEST(dmusic) test_setdsound(); test_dmbuffer(); test_dmcoll(); + test_parsedescriptor(); CoUninitialize(); }

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 25cf6b7f4dfb448114b166d557440b9c97936938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25cf6b7f4dfb448114b166d5… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Mar 1 22:19:59 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 71b5d0f..9ca618b 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-11 21:00+0100\n" +"PO-Revision-Date: 2018-03-01 23:15+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Poedit 2.0.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -6675,10 +6675,8 @@ msgid "Connection reset by peer.\n" msgstr "Tilkobling nullstilt av likemann.\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "Fant ikke meldingen 0x%1 i filen %2.\n" +msgstr "Fant ingen signatur i filen.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Jacek Caban : jscript: Properly support missing array elements in stringify_array.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 5f9f9a45e9afe84dbcf69b9cb813dc983a70a7cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9f9a45e9afe84dbcf69b9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 1 23:58:17 2018 +0100 jscript: Properly support missing array elements in stringify_array. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 7d69cf5..fc23b54 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -545,15 +545,18 @@ static HRESULT stringify_array(stringify_ctx_t *ctx, jsdisp_t *obj) } hres = jsdisp_get_idx(obj, i, &val); - if(FAILED(hres)) - return hres; - - hres = stringify(ctx, val); - if(FAILED(hres)) + if(SUCCEEDED(hres)) { + hres = stringify(ctx, val); + if(FAILED(hres)) + return hres; + if(hres == S_FALSE && !append_string(ctx, nullW)) + return E_OUTOFMEMORY; + }else if(hres == DISP_E_UNKNOWNNAME) { + if(!append_string(ctx, nullW)) + return E_OUTOFMEMORY; + }else { return hres; - - if(hres == S_FALSE && !append_string(ctx, nullW)) - return E_OUTOFMEMORY; + } } if((length && *ctx->gap && !append_char(ctx, '\n')) || !append_char(ctx, ']'))

1 0

Jacek Caban : jscript: Properly support missing array elements in Array.pop.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 89da4559ee72395cab21d48d8595aa7e5f2da33e URL: https://source.winehq.org/git/wine.git/?a=commit;h=89da4559ee72395cab21d48d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 1 23:58:25 2018 +0100 jscript: Properly support missing array elements in Array.pop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 5 +++-- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index b0deca0..90ff313 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -387,9 +387,10 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned hres = jsdisp_get_idx(jsthis, length, &val); if(SUCCEEDED(hres)) hres = jsdisp_delete_idx(jsthis, length); - else if(hres == DISP_E_UNKNOWNNAME) + else if(hres == DISP_E_UNKNOWNNAME) { val = jsval_undefined(); - else + hres = S_OK; + }else return hres; if(SUCCEEDED(hres)) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 084aa84..4207f5a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -909,6 +909,8 @@ arr = [,,,,,]; tmp = arr.pop(); ok(arr.length === 5, "arr.length = " + arr.length); ok(tmp === undefined, "tmp = " + tmp); +tmp = [1,2,,,].pop(); +ok(tmp === undefined, "tmp = " + tmp); function PseudoArray() { this[0] = 0;

1 0

Jacek Caban : jscript: Properly handle elisions in array literals.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: d72acebd6c8176f4e00c79c0f199082221caf4e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72acebd6c8176f4e00c79c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 1 23:58:38 2018 +0100 jscript: Properly handle elisions in array literals. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8691595..6e6be91 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -861,29 +861,29 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expression_t *expr) { - unsigned i, elem_cnt = expr->length; + unsigned length = 0; array_element_t *iter; + unsigned array_instr; HRESULT hres; - for(iter = expr->element_list; iter; iter = iter->next) { - elem_cnt += iter->elision+1; + array_instr = push_instr(ctx, OP_carray); - for(i=0; i < iter->elision; i++) { - if(!push_instr(ctx, OP_undefined)) - return E_OUTOFMEMORY; - } + for(iter = expr->element_list; iter; iter = iter->next) { + length += iter->elision; hres = compile_expression(ctx, iter->expr, TRUE); if(FAILED(hres)) return hres; - } - for(i=0; i < expr->length; i++) { - if(!push_instr(ctx, OP_undefined)) - return E_OUTOFMEMORY; + hres = push_instr_uint(ctx, OP_carray_set, length); + if(FAILED(hres)) + return hres; + + length++; } - return push_instr_uint(ctx, OP_carray, elem_cnt); + instr_ptr(ctx, array_instr)->u.arg[0].uint = length + expr->length; + return S_OK; } static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expression_t *expr) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8092159..6b4aae3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1399,8 +1399,6 @@ static HRESULT interp_carray(script_ctx_t *ctx) { const unsigned arg = get_op_uint(ctx, 0); jsdisp_t *array; - jsval_t val; - unsigned i; HRESULT hres; TRACE("%u\n", arg); @@ -1409,20 +1407,27 @@ static HRESULT interp_carray(script_ctx_t *ctx) if(FAILED(hres)) return hres; - i = arg; - while(i--) { - val = stack_pop(ctx); - hres = jsdisp_propput_idx(array, i, val); - jsval_release(val); - if(FAILED(hres)) { - jsdisp_release(array); - return hres; - } - } - return stack_push(ctx, jsval_obj(array)); } +static HRESULT interp_carray_set(script_ctx_t *ctx) +{ + const unsigned index = get_op_uint(ctx, 0); + jsval_t value, array; + HRESULT hres; + + value = stack_pop(ctx); + + TRACE("[%u] = %s\n", index, debugstr_jsval(value)); + + array = stack_top(ctx); + assert(is_object_instance(array)); + + hres = jsdisp_propput_idx(iface_to_jsdisp(get_object(array)), index, value); + jsval_release(value); + return hres; +} + /* ECMA-262 3rd Edition 11.1.5 */ static HRESULT interp_new_obj(script_ctx_t *ctx) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 121a2c2..31f6b1c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -21,12 +21,13 @@ X(and, 1, 0,0) \ X(array, 1, 0,0) \ X(assign, 1, 0,0) \ - X(assign_call,1, ARG_UINT, 0) \ + X(assign_call,1, ARG_UINT, 0) \ X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ X(call, 1, ARG_UINT, ARG_UINT) \ X(call_member,1, ARG_UINT, ARG_UINT) \ X(carray, 1, ARG_UINT, 0) \ + X(carray_set, 1, ARG_UINT, 0) \ X(case, 0, ARG_ADDR, 0) \ X(cnd_nz, 0, ARG_ADDR, 0) \ X(cnd_z, 0, ARG_ADDR, 0) \ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index aba6dda..ef4c316 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1171,6 +1171,10 @@ ok(tmp["0"] === undefined, "tmp[0] is not undefined"); ok(tmp["3"] === 2, "tmp[3] !== 2"); ok(tmp["6"] === true, "tmp[6] !== true"); ok(tmp[2] === 1, "tmp[2] !== 1"); +ok(!("0" in tmp), "0 found in array"); +ok(!("1" in tmp), "1 found in array"); +ok("2" in tmp, "2 not found in array"); +ok(!("2" in [1,,,,]), "2 found in [1,,,,]"); ok([1,].length === 2, "[1,].length !== 2"); ok([,,].length === 3, "[,,].length !== 3");

1 0

Jacek Caban : jscript: Renamed equal2_values to jsval_strict_equal.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 3c7ec6af92c608c4e9d69bace9fb0cab8c25557d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c7ec6af92c608c4e9d69bac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 1 23:58:45 2018 +0100 jscript: Renamed equal2_values to jsval_strict_equal. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6b4aae3..bd14a35 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -520,7 +520,7 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) } /* ECMA-262 3rd Edition 11.9.6 */ -static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) +static HRESULT jsval_strict_equal(jsval_t lval, jsval_t rval, BOOL *ret) { jsval_type_t type = jsval_type(lval); @@ -849,7 +849,7 @@ static HRESULT interp_case(script_ctx_t *ctx) TRACE("\n"); v = stack_pop(ctx); - hres = equal2_values(stack_top(ctx), v, &b); + hres = jsval_strict_equal(stack_top(ctx), v, &b); jsval_release(v); if(FAILED(hres)) return hres; @@ -2103,7 +2103,7 @@ static HRESULT interp_preinc(script_ctx_t *ctx) static HRESULT equal_values(script_ctx_t *ctx, jsval_t lval, jsval_t rval, BOOL *ret) { if(jsval_type(lval) == jsval_type(rval) || (is_number(lval) && is_number(rval))) - return equal2_values(lval, rval, ret); + return jsval_strict_equal(lval, rval, ret); /* FIXME: NULL disps should be handled in more general way */ if(is_object_instance(lval) && !get_object(lval)) @@ -2233,7 +2233,7 @@ static HRESULT interp_eq2(script_ctx_t *ctx) TRACE("%s === %s\n", debugstr_jsval(l), debugstr_jsval(r)); - hres = equal2_values(r, l, &b); + hres = jsval_strict_equal(r, l, &b); jsval_release(l); jsval_release(r); if(FAILED(hres)) @@ -2254,7 +2254,7 @@ static HRESULT interp_neq2(script_ctx_t *ctx) r = stack_pop(ctx); l = stack_pop(ctx); - hres = equal2_values(r, l, &b); + hres = jsval_strict_equal(r, l, &b); jsval_release(l); jsval_release(r); if(FAILED(hres))

1 0

Jacek Caban : jscript: Added Array.prototype.indexOf implementation.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 3987d939920ee8b60282200d4f327ccd17c34aa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3987d939920ee8b60282200d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 1 23:58:55 2018 +0100 jscript: Added Array.prototype.indexOf implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 90ff313..9c287c9 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -47,6 +47,7 @@ static const WCHAR spliceW[] = {'s','p','l','i','c','e',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; +static const WCHAR indexOfW[] = {'i','n','d','e','x','O','f',0}; static const WCHAR default_separatorW[] = {',',0}; @@ -946,6 +947,61 @@ static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flag return E_NOTIMPL; } +static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsdisp_t *jsthis; + unsigned length, i, from = 0; + jsval_t search, value; + BOOL eq; + HRESULT hres; + + TRACE("\n"); + + hres = get_length(ctx, vthis, &jsthis, &length); + if(FAILED(hres)) + return hres; + if(!length) { + if(r) *r = jsval_number(-1); + return S_OK; + } + + search = argc ? argv[0] : jsval_undefined(); + + if(argc > 1) { + double from_arg; + + hres = to_integer(ctx, argv[1], &from_arg); + if(FAILED(hres)) + return hres; + + if(from_arg >= 0) + from = min(from_arg, length); + else + from = max(from_arg + length, 0); + } + + for(i = from; i < length; i++) { + hres = jsdisp_get_idx(jsthis, i, &value); + if(hres == DISP_E_UNKNOWNNAME) + continue; + if(FAILED(hres)) + return hres; + + hres = jsval_strict_equal(value, search, &eq); + jsval_release(value); + if(FAILED(hres)) + return hres; + if(eq) { + if(r) *r = jsval_number(i); + return S_OK; + } + } + + if(r) *r = jsval_number(-1); + return S_OK; +} + /* ECMA-262 3rd Edition 15.4.4.13 */ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) @@ -1044,6 +1100,7 @@ static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) static const builtin_prop_t Array_props[] = { {concatW, Array_concat, PROPF_METHOD|1}, + {indexOfW, Array_indexOf, PROPF_ES5|PROPF_METHOD|1}, {joinW, Array_join, PROPF_METHOD|1}, {lengthW, NULL,0, Array_get_length, Array_set_length}, {popW, Array_pop, PROPF_METHOD}, diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bd14a35..d7a5a46 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -520,7 +520,7 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) } /* ECMA-262 3rd Edition 11.9.6 */ -static HRESULT jsval_strict_equal(jsval_t lval, jsval_t rval, BOOL *ret) +HRESULT jsval_strict_equal(jsval_t lval, jsval_t rval, BOOL *ret) { jsval_type_t type = jsval_type(lval); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 119d416..8678619 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -341,6 +341,8 @@ HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) DECLSPEC_HIDDEN; HRESULT to_flat_string(script_ctx_t*,jsval_t,jsstr_t**,const WCHAR**) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; +HRESULT jsval_strict_equal(jsval_t,jsval_t,BOOL*) DECLSPEC_HIDDEN; + HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HIDDEN; HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index a506a16..b9ac40e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -123,6 +123,7 @@ function test_javascript() { test_exposed("JSON", g, v >= 8); test_exposed("now", Date, true); test_exposed("isArray", Array, v >= 9); + test_exposed("indexOf", Array.prototype, v >= 9); next_test(); } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 29af64e..9f87e99 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -27,6 +27,34 @@ function test_date_now() { next_test(); } +function test_indexOf() { + function expect(array, args, exr) { + var r = Array.prototype.indexOf.apply(array, args); + ok(r == exr, "indexOf returned " + r + " expected " + exr); + } + + ok(Array.prototype.indexOf.length == 1, "indexOf.length = " + Array.prototype.indexOf.length); + + expect([1,2,3], [2], 1); + expect([1,undefined,3], [undefined], 1); + expect([1,undefined,3], [], 1); + expect([1,,3], [undefined], -1); + expect([1,2,3,4,5,6], [2, 2], -1); + expect([1,2,3,4,5,6], [5, -1], -1); + expect([1,2,3,4,5,6], [5, -2], 4); + expect([1,2,3,4,5,6], [5, -20], 4); + expect([1,2,3,4,5,6], [5, 20], -1); + expect("abc", ["b"], 1); + expect(true, [true], -1); + expect({"4": 4, length: 5}, [4], 4); + expect({"4": 4, length: 5}, [undefined], -1); + expect({"4": 4, length: 3}, [4], -1); + expect({"test": true}, [true], -1); + expect([1,2,3], [2, 1.9], 1); + + next_test(); +} + function test_isArray() { function expect_array(a, exr) { var r = Array.isArray(a); @@ -47,5 +75,6 @@ function test_isArray() { var tests = [ test_date_now, + test_indexOf, test_isArray ];

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptLayout().
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: d6fb80a1105353cfbcb2a771d22cc0f3a248fc76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fb80a1105353cfbcb2a771… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:55 2018 +0330 usp10: Use heap_calloc() in ScriptLayout(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4daba34..f2264a2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3755,8 +3755,7 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log if (!level || (!vistolog && !logtovis)) return E_INVALIDARG; - indexs = heap_alloc(sizeof(int) * runs); - if (!indexs) + if (!(indexs = heap_calloc(runs, sizeof(*indexs)))) return E_OUTOFMEMORY; if (vistolog)

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptTextOut().
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 8889c86297cc9230f2597172093b242f195c3a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8889c86297cc9230f2597172… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 2 12:28:49 2018 +0330 usp10: Use heap_calloc() in ScriptTextOut(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f2264a2..103b345 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3609,14 +3609,13 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); - if (!lpDx) return E_OUTOFMEMORY; + if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx)))) + return E_OUTOFMEMORY; fuOptions |= ETO_PDY; if (psa->fRTL && psa->fLogicalOrder) { - reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) ); - if (!reordered_glyphs) + if (!(reordered_glyphs = heap_calloc(cGlyphs, sizeof(*reordered_glyphs)))) { heap_free( lpDx ); return E_OUTOFMEMORY;

1 0