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

Michael Stefaniuc : dmusic/tests: Add IDirectMusicObject::ParseDescriptor( ) tests.
by Alexandre Julliard March 2, 2018

March 2, 2018

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

Michael Stefaniuc : dmime/tests: Add IDirectMusicObject::ParseDescriptor() tests.
by Alexandre Julliard March 2, 2018

March 2, 2018

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

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in wined3d_texture_allocate_gl_mutable_storage ().
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 6639ce4b0929ddf960da6064dcc010388afa8a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6639ce4b0929ddf960da6064… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 2 12:28:48 2018 +0330 wined3d: Explicitly calculate the sub-resource level in wined3d_texture_allocate_gl_mutable_storage(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ebaa3b9..1ffc2a6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -492,42 +492,42 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * GLenum gl_internal_format, const struct wined3d_format *format, const struct wined3d_gl_info *gl_info) { - unsigned int i, level, sub_call_count; + unsigned int level, level_count, layer, layer_count; + GLsizei width, height; + GLenum target; - sub_call_count = texture->level_count; - if (texture->target != GL_TEXTURE_2D_ARRAY) - sub_call_count *= texture->layer_count; + level_count = texture->level_count; + layer_count = texture->target == GL_TEXTURE_2D_ARRAY ? 1 : texture->layer_count; - for (i = 0; i < sub_call_count; ++i) + for (layer = 0; layer < layer_count; ++layer) { - struct wined3d_surface *surface = texture->sub_resources[i].u.surface; - GLsizei width, height; - GLenum target; + target = wined3d_texture_get_sub_resource_target(texture, layer * level_count); - level = surface->texture_level; - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); - if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + for (level = 0; level < level_count; ++level) { - height *= format->height_scale.numerator; - height /= format->height_scale.denominator; - } - target = wined3d_texture_get_sub_resource_target(texture, i); + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); + if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + height *= format->height_scale.numerator; + height /= format->height_scale.denominator; + } - TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", - surface, target, level, width, height); + TRACE("texture %p, layer %u, level %u, target %#x, width %u, height %u.\n", + texture, layer, level, target, width, height); - if (texture->target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, - texture->layer_count, 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); - } - else - { - gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, - width, height, 0, format->glFormat, format->glType, NULL); - checkGLcall("glTexImage2D"); + if (texture->target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, + texture->layer_count, 0, format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); + } + else + { + gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, + width, height, 0, format->glFormat, format->glType, NULL); + checkGLcall("glTexImage2D"); + } } } }

1 0

Henri Verbeet : wined3d: Explicitly pass the sub-resource level to surface_is_full_rect().
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 365948bf70655c4b810585056be0fbb3e7d2339e URL: https://source.winehq.org/git/wine.git/?a=commit;h=365948bf70655c4b81058505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 2 12:28:47 2018 +0330 wined3d: Explicitly pass the sub-resource level to surface_is_full_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fdf670c..421b01c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -246,14 +246,14 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; } -static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) +static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) { unsigned int t; - t = wined3d_texture_get_level_width(surface->container, surface->texture_level); + t = wined3d_texture_get_level_width(texture, level); if ((r->left && r->right) || abs(r->right - r->left) != t) return FALSE; - t = wined3d_texture_get_level_height(surface->container, surface->texture_level); + t = wined3d_texture_get_level_height(texture, level); if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) return FALSE; return TRUE; @@ -313,7 +313,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); - if (!surface_is_full_rect(dst_surface, dst_rect)) + if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); @@ -419,7 +419,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, old_ctx, src_location); - if (!surface_is_full_rect(dst_surface, &dst_rect)) + if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); @@ -2679,7 +2679,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!location) location = dst_texture->flags & WINED3D_TEXTURE_IS_SRGB ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (surface_is_full_rect(dst_surface, dst_rect)) + if (texture2d_is_full_rect(dst_texture, dst_level, dst_rect)) { if (!wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, location)) ERR("Failed to prepare the destination sub-resource into %s.\n", wined3d_debug_location(location));

1 0

Dmitry Timoshkov : secur32: Add support for NameFullyQualifiedDN to GetComputerObjectName.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 0197f54a8e83c28ae58760f5b849b1ae17be6e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0197f54a8e83c28ae58760f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 2 18:46:13 2018 +0800 secur32: Add support for NameFullyQualifiedDN to GetComputerObjectName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/sysinfo.c | 11 +++++----- dlls/secur32/secur32.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 09f2484..db982aa 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -165,14 +165,15 @@ static void test_sysinfo(void) if (hr != S_OK) { skip("Computer is not part of a domain, skipping the tests\n"); - IADsADSystemInfo_Release(sysinfo); - return; + goto done; } SysFreeString(bstr); hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); - ok(hr == S_OK, "got %#x\n", hr); - if (hr == S_OK) SysFreeString(bstr); +todo_wine + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + if (hr != S_OK) goto done; + SysFreeString(bstr); hr = IADsADSystemInfo_get_SiteName(sysinfo, &bstr); ok(hr == S_OK, "got %#x\n", hr); @@ -201,7 +202,7 @@ static void test_sysinfo(void) hr = IADsADSystemInfo_GetAnyDCName(sysinfo, &bstr); ok(hr == S_OK, "got %#x\n", hr); if (hr == S_OK) SysFreeString(bstr); - +done: IADsADSystemInfo_Release(sysinfo); } diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 889883c..bece2b7 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1021,6 +1021,56 @@ BOOLEAN WINAPI GetComputerObjectNameW( } break; case NameFullyQualifiedDN: + { + static const WCHAR cnW[] = { 'C','N','=',0 }; + static const WCHAR ComputersW[] = { 'C','N','=','C','o','m','p','u','t','e','r','s',0 }; + static const WCHAR dcW[] = { 'D','C','=',0 }; + static const WCHAR commaW[] = { ',',0 }; + WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len, size; + WCHAR *suffix; + + size = sizeof(name) / sizeof(name[0]); + if (!GetComputerNameW(name, &size)) + { + status = FALSE; + break; + } + + len = strlenW(cnW) + size + 1 + strlenW(ComputersW) + 1 + strlenW(dcW); + suffix = strrchrW(domainInfo->DnsDomainName.Buffer, '.'); + if (suffix) + { + *suffix++ = 0; + len += 1 + strlenW(dcW) + strlenW(suffix); + } + len += strlenW(domainInfo->DnsDomainName.Buffer); + + if (lpNameBuffer && *nSize > len) + { + lstrcpyW(lpNameBuffer, cnW); + lstrcatW(lpNameBuffer, name); + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, ComputersW); + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, dcW); + lstrcatW(lpNameBuffer, domainInfo->DnsDomainName.Buffer); + if (suffix) + { + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, dcW); + lstrcatW(lpNameBuffer, suffix); + } + status = TRUE; + } + else /* just requesting length required */ + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + status = FALSE; + } + *nSize = len + 1; + break; + } case NameDisplay: case NameUniqueId: case NameCanonical:

1 0

Hans Leidekker : wbemprox/tests: Add tests for Win32_Printer.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 151f3fc2f2b44999f7fbe171ab227f5da509a30f URL: https://source.winehq.org/git/wine.git/?a=commit;h=151f3fc2f2b44999f7fbe171… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 2 11:55:00 2018 +0100 wbemprox/tests: Add tests for Win32_Printer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 93d07ea..d95fdd9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1641,6 +1641,71 @@ static void test_Win32_VideoController( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_Printer( IWbemServices *services ) +{ + static const WCHAR deviceidW[] = + {'D','e','v','i','c','e','I','d',0}; + static const WCHAR locationW[] = + {'L','o','c','a','t','i','o','n',0}; + static const WCHAR portnameW[] = + {'P','o','r','t','N','a','m','e',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','r','i','n','t','e','r',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_Printer not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, deviceidW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "deviceid %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, locationW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "location %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, portnameW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "portname %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + } + + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1684,6 +1749,7 @@ START_TEST(query) test_Win32_IP4RouteTable( services ); test_Win32_Processor( services ); test_Win32_VideoController( services ); + test_Win32_Printer( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard March 2, 2018

March 2, 2018

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

Dmitry Timoshkov : advapi32: Return correct short domain name.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: eb077e9faccb736bb5aac2b13bf49f1f434e8fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb077e9faccb736bb5aac2b1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 2 18:45:00 2018 +0800 advapi32: Return correct short domain name. Also remove suffix and uppercase the returned name as Windows does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index f2fcc07..ca35768 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -786,11 +786,16 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( if (!xdi) return STATUS_NO_MEMORY; dwSize = MAX_COMPUTERNAME_LENGTH + 1; - if (GetComputerNameW(xdi->domain_name, &dwSize)) + if (GetComputerNameExW(ComputerNamePhysicalDnsDomain, xdi->domain_name, &dwSize)) { + WCHAR *dot; + + dot = strrchrW(xdi->domain_name, '.'); + if (dot) *dot = 0; + struprW(xdi->domain_name); xdi->info.Name.Buffer = xdi->domain_name; - xdi->info.Name.Length = dwSize * sizeof(WCHAR); - xdi->info.Name.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + xdi->info.Name.Length = strlenW(xdi->domain_name) * sizeof(WCHAR); + xdi->info.Name.MaximumLength = xdi->info.Name.Length + sizeof(WCHAR); TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); }

1 0

Dmitry Timoshkov : advapi32: Use GetWindowsAccountDomainSid() to retrieve the domain SID.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: a3bcaca48dd694a2c9d610730df0326780ca27df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3bcaca48dd694a2c9d61073… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 2 18:44:17 2018 +0800 advapi32: Use GetWindowsAccountDomainSid() to retrieve the domain SID. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 23 ++++++++++++++++------- include/winbase.h | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 6f51f9d..f2fcc07 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -763,16 +763,24 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( break; case PolicyDnsDomainInformation: /* 12 (0xc) */ { - struct di + struct { POLICY_DNS_DOMAIN_INFO info; - SID sid; + struct + { + SID sid; + DWORD sid_subauthority[3]; + } domain_sid; WCHAR domain_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR dns_domain_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR dns_forest_name[MAX_COMPUTERNAME_LENGTH + 1]; - }; + } *xdi; + struct + { + SID sid; + DWORD sid_subauthority[3]; + } computer_sid; DWORD dwSize; - struct di *xdi; xdi = heap_alloc_zero(sizeof(*xdi)); if (!xdi) return STATUS_NO_MEMORY; @@ -788,10 +796,11 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( /* FIXME: also set DnsDomainName and DnsForestName */ - if (ADVAPI_GetComputerSid(&xdi->sid)) + dwSize = sizeof(xdi->domain_sid); + if (ADVAPI_GetComputerSid(&computer_sid.sid) && GetWindowsAccountDomainSid(&computer_sid.sid, &xdi->domain_sid.sid, &dwSize)) { - xdi->info.Sid = &xdi->sid; - TRACE("setting SID to %s\n", debugstr_sid(&xdi->sid)); + xdi->info.Sid = &xdi->domain_sid.sid; + TRACE("setting SID to %s\n", debugstr_sid(&xdi->domain_sid.sid)); } *Buffer = xdi; diff --git a/include/winbase.h b/include/winbase.h index e47c87a..9c7908a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2245,6 +2245,7 @@ WINBASEAPI BOOL WINAPI GetVolumePathNameW(LPCWSTR,LPWSTR,DWORD); WINBASEAPI BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR,LPSTR,DWORD,PDWORD); WINBASEAPI BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR,LPWSTR,DWORD,PDWORD); #define GetVolumePathNamesForVolumeName WINELIB_NAME_AW(GetVolumePathNamesForVolumeName) +WINADVAPI BOOL WINAPI GetWindowsAccountDomainSid(PSID,PSID,DWORD*); WINBASEAPI UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT); #define GetWindowsDirectory WINELIB_NAME_AW(GetWindowsDirectory)

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptTextOut().
by Alexandre Julliard March 2, 2018

March 2, 2018

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