November 2020 - Wine-Commits

Michael Stefaniuc : winmm: Use wide-char string literals.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 283c1be7310cdbba45952e5abe9c20a0aa4027c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=283c1be7310cdbba45952e5a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:38 2020 +0100 winmm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/driver.c | 12 +++----- dlls/winmm/lolvldrv.c | 5 +--- dlls/winmm/mci.c | 75 ++++++++++++++++++------------------------------- dlls/winmm/playsound.c | 52 +++++++++++----------------------- dlls/winmm/tests/wave.c | 7 ++--- dlls/winmm/waveform.c | 3 +- 6 files changed, 52 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=283c1be7310cdbba4595…

1 0

Zebediah Figura : quartz/tests: Enable no longer failing tests for IBasicVideo::GetCurrentImage().
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: c00c6000bc221ffa43f14987807dfa4548044177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00c6000bc221ffa43f14987… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 16:30:58 2020 -0600 quartz/tests: Enable no longer failing tests for IBasicVideo::GetCurrentImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 1101a98ab7d..0a72cbb9b74 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1300,11 +1300,8 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(size == sizeof(buffer), "Got size %d.\n", size); ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); - if (0) /* FIXME: Rendering is currently broken on Wine. */ - { - for (i = 0; i < 32 * 16; ++i) - ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); - } + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1316,11 +1313,8 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(size == sizeof(buffer), "Got size %d.\n", size); ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); - if (0) /* FIXME: Rendering is currently broken on Wine. */ - { - for (i = 0; i < 32 * 16; ++i) - ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); - } + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Derive stream attributes from mixer input attributes.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 15346b36ccbb30788894a344684f2cc6ea0d9a81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15346b36ccbb30788894a344… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:48:30 2020 +0300 mf/evr: Derive stream attributes from mixer input attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 42 +++++++++++++++++++++++++++++++----------- dlls/mf/tests/mf.c | 3 +-- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4be59331b6b..47a506a94c6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -942,10 +942,26 @@ static const IMFAttributesVtbl video_stream_attributes_vtbl = video_stream_attributes_CopyAllItems, }; +static BOOL video_renderer_is_mixer_d3d_aware(const struct video_renderer *renderer) +{ + IMFAttributes *attributes; + unsigned int value = 0; + BOOL ret; + + if (FAILED(IMFTransform_QueryInterface(renderer->mixer, &IID_IMFAttributes, (void **)&attributes))) + return FALSE; + + ret = SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value)) && value; + IMFAttributes_Release(attributes); + return ret; +} + static HRESULT video_renderer_stream_create(struct video_renderer *renderer, unsigned int id, struct video_stream **ret) { struct video_stream *stream; + IMFAttributes *attributes; + unsigned int value; HRESULT hr; if (!(stream = heap_alloc_zero(sizeof(*stream)))) @@ -968,6 +984,16 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns IMFMediaSink_AddRef(&stream->parent->IMFMediaSink_iface); stream->id = id; + if (video_renderer_is_mixer_d3d_aware(renderer)) + IMFAttributes_SetUINT32(stream->attributes, &MF_SA_D3D_AWARE, 1); + + if (SUCCEEDED(IMFTransform_GetInputStreamAttributes(renderer->mixer, id, &attributes))) + { + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, &value))) + IMFAttributes_SetUINT32(stream->attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, value); + IMFAttributes_Release(attributes); + } + *ret = stream; return S_OK; @@ -1491,7 +1517,6 @@ static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; - IMFAttributes *attributes; HRESULT hr; if (SUCCEEDED(hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFTopologyServiceLookupClient, @@ -1537,21 +1562,16 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) } /* Set device manager that presenter should have created. */ - if (SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, &IID_IMFAttributes, (void **)&attributes))) + if (video_renderer_is_mixer_d3d_aware(renderer)) { IDirect3DDeviceManager9 *device_manager; - unsigned int value; - if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value)) && value) + if (SUCCEEDED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, + &IID_IDirect3DDeviceManager9, (void **)&device_manager))) { - if (SUCCEEDED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, - &IID_IDirect3DDeviceManager9, (void **)&device_manager))) - { - IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); - IDirect3DDeviceManager9_Release(device_manager); - } + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); + IDirect3DDeviceManager9_Release(device_manager); } - IMFAttributes_Release(attributes); } return hr; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index aabdc51e577..78a3d75e0a7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3341,7 +3341,6 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine { ok(count == 2, "Unexpected count %u.\n", count); value = 0; hr = IMFAttributes_GetUINT32(attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, &value); @@ -3351,7 +3350,7 @@ todo_wine { hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(value == 1, "Unexpected attribute value %u.\n", value); -} + hr = IMFAttributes_QueryInterface(attributes, &IID_IMFStreamSink, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk);

1 0

Alexandre Julliard : msvcrt: Use the msvcrt allocation functions internally.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 871d9863bc2d1c9406b47aa644974768d5c6d2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=871d9863bc2d1c9406b47aa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:02:06 2020 +0100 msvcrt: Use the msvcrt allocation functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fda3d11b86d..37c4afcf786 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -708,7 +708,7 @@ int CDECL __crtLCMapStringA( if (!in_len) return 0; if (in_len > ARRAY_SIZE(buf_in)) { - in = malloc(in_len * sizeof(WCHAR)); + in = MSVCRT_malloc(in_len * sizeof(WCHAR)); if (!in) return 0; } @@ -726,7 +726,7 @@ int CDECL __crtLCMapStringA( out_len = r; if (r > ARRAY_SIZE(buf_out)) { - out = malloc(r * sizeof(WCHAR)); + out = MSVCRT_malloc(r * sizeof(WCHAR)); if (!out) { r = 0; @@ -740,8 +740,8 @@ int CDECL __crtLCMapStringA( r = WideCharToMultiByte(codepage, 0, out, out_len, dst, dstlen, NULL, NULL); done: - if (in != buf_in) free(in); - if (out != buf_out) free(out); + if (in != buf_in) MSVCRT_free(in); + if (out != buf_out) MSVCRT_free(out); return r; }

1 0

Michael Stefaniuc : winmm/tests: Use a string literal instead of a char array.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: da0b1336550978a9ba5e0999ed5723e75380acd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0b1336550978a9ba5e0999… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:39 2020 +0100 winmm/tests: Use a string literal instead of a char array. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mcicda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index f6e126d29d1..73668c21031 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -553,7 +553,7 @@ static void test_openclose(HWND hwnd) MCIDEVICEID wDeviceID; MCI_PARMS_UNION parm; MCIERROR err; - char drive[] = {'a',':','\\','X','\0'}; + char drive[] = "a:\\X"; if (ok_open == MCIERR_CANNOT_LOAD_DRIVER) { /* todo_wine Every open below should yield this same error. */ skip("CD-ROM device likely not installed or disabled.\n");

1 0

Sven Baars : d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 84cbf6a49dfe75b9fd497b2c3ef7e922857bb618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cbf6a49dfe75b9fd497b2c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 15:33:31 2020 +0100 d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49546 Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 235ae11072b..f5775384da3 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -583,7 +583,6 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count, } else if (format & DT_SINGLELINE) { - *dest_len = num_fit; *count = 0; } } @@ -768,6 +767,21 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, pos.y = cell_inc.y + y; pos.z = 0; + if (!(format & DT_NOCLIP)) + { + if (pos.x > rect->right) + { + IDirect3DTexture9_Release(texture); + continue; + } + + if (pos.x + black_box.right - black_box.left > rect->right) + black_box.right = black_box.left + rect->right - pos.x; + + if (pos.y + black_box.bottom - black_box.top > rect->bottom) + black_box.bottom = black_box.top + rect->bottom - pos.y; + } + ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture); }

1 0

Sven Baars : d3dx9: Fully initialize the glyph position.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 2481e617bbd529a297266ad53b1afe1d96e9af89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2481e617bbd529a297266ad5… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 15:33:30 2020 +0100 d3dx9: Fully initialize the glyph position. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49376 Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 4b909406df1..235ae11072b 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -726,7 +726,6 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, { unsigned int line_len, i; GCP_RESULTSW results; - D3DXVECTOR3 pos; string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size); @@ -756,6 +755,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, for (i = 0; i < results.nGlyphs; ++i) { IDirect3DTexture9 *texture; + D3DXVECTOR3 pos; POINT cell_inc; RECT black_box; @@ -766,6 +766,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, pos.x = cell_inc.x + x + results.lpCaretPos[i]; pos.y = cell_inc.y + y; + pos.z = 0; ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture);

1 0

Nikolay Sivov : mf/evr: Add support for per-stream attributes.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: a76a90e7d2b2aafd3cbff2d64a7e1c90b8f5ec60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a76a90e7d2b2aafd3cbff2d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:48:28 2020 +0300 mf/evr: Add support for per-stream attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 369 +++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mf/tests/mf.c | 32 ++++- 2 files changed, 386 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a76a90e7d2b2aafd3cbf…

1 0

Michael Stefaniuc : dpnet: Use wide-char string literals.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: ffa8f64889be4c84be2ea85e68703b2bc0af0aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa8f64889be4c84be2ea85e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:40 2020 +0100 dpnet: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 9 +++------ dlls/dpnet/tests/address.c | 21 ++++++++++----------- dlls/dpnet/tests/client.c | 16 ++++++++-------- dlls/dpnet/tests/server.c | 22 +++++++--------------- dlls/dpnet/tests/thread.c | 5 ++--- 5 files changed, 30 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ffa8f64889be4c84be2e…

1 0

Nikolay Sivov : evr/tests: Relax allocator initialization test.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 1deea8e1fe4e5e4b6073298d394b24e2bbfd6dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=1deea8e1fe4e5e4b6073298d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:48:29 2020 +0300 evr/tests: Relax allocator initialization test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 18822e1e4fa..bebffada509 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1384,10 +1384,10 @@ static void test_MFCreateVideoSampleAllocator(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* It expects IMFVideoMediaType. */ + /* It expects IMFVideoMediaType aka video major type. Exact return code is E_NOINTERFACE, + likely coming from querying for IMFVideoMediaType. Does not seem valuable to match it. */ hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); -todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); video_type = create_video_type(&MFVideoFormat_RGB32);

1 0