January 2020 - Wine-commits

Piotr Caban : msvcrt: Respect allocation mode in malloc.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 70ac780e6ed26380fd2fcdfbb96352ca8548bc79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ac780e6ed26380fd2fcdfb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 14:27:25 2020 +0100 msvcrt: Respect allocation mode in malloc. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 0d6aee07f3..512adc1e74 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -441,10 +441,18 @@ void CDECL _free_base(void* ptr) */ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) { - void *ret = msvcrt_heap_alloc(0, size); - if (!ret) - *MSVCRT__errno() = MSVCRT_ENOMEM; - return ret; + void *ret; + + do + { + ret = msvcrt_heap_alloc(0, size); + if (ret || !MSVCRT_new_mode) + break; + } while(_callnewh(size)); + + if (!ret) + *MSVCRT__errno() = MSVCRT_ENOMEM; + return ret; } #if _MSVCR_VER>=140

1 0

Piotr Caban : msvcrt: Use _callnewh in operator new implementation.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 7e9cba139d30d3b48567baaf6a8b901143c738e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e9cba139d30d3b48567baaf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 14:27:29 2020 +0100 msvcrt: Use _callnewh in operator new implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 512adc1e74..52f800e824 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -125,14 +125,24 @@ static MSVCRT_size_t msvcrt_heap_size(void *ptr) return HeapSize(heap, 0, ptr); } +/********************************************************************* + * _callnewh (MSVCRT.@) + */ +int CDECL _callnewh(MSVCRT_size_t size) +{ + int ret = 0; + MSVCRT_new_handler_func handler = MSVCRT_new_handler; + if(handler) + ret = (*handler)(size) ? 1 : 0; + return ret; +} + /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) */ void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; - int freed; - MSVCRT_new_handler_func handler; do { @@ -142,13 +152,7 @@ void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) TRACE("(%ld) returning %p\n", size, retval); return retval; } - - handler = MSVCRT_new_handler; - if(handler) - freed = (*handler)(size); - else - freed = 0; - } while(freed); + } while(_callnewh(size)); TRACE("(%ld) out of memory\n", size); #if _MSVCR_VER >= 80 @@ -230,18 +234,6 @@ int CDECL MSVCRT__set_new_mode(int mode) return old_mode; } -/********************************************************************* - * _callnewh (MSVCRT.@) - */ -int CDECL _callnewh(MSVCRT_size_t size) -{ - int ret = 0; - MSVCRT_new_handler_func handler = MSVCRT_new_handler; - if(handler) - ret = (*handler)(size) ? 1 : 0; - return ret; -} - /********************************************************************* * _expand (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Reimplement _set_new_mode function.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 6113a251ef3955f2ac3436d90a523faf4c03bc0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6113a251ef3955f2ac3436d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 14:27:35 2020 +0100 msvcrt: Reimplement _set_new_mode function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 52f800e824..31153fa5b1 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -226,12 +226,8 @@ MSVCRT_new_handler_func CDECL MSVCRT_set_new_handler(void *func) */ int CDECL MSVCRT__set_new_mode(int mode) { - int old_mode; - LOCK_HEAP; - old_mode = MSVCRT_new_mode; - MSVCRT_new_mode = mode; - UNLOCK_HEAP; - return old_mode; + if(!MSVCRT_CHECK_PMT(mode == 0 || mode == 1)) return -1; + return InterlockedExchange(&MSVCRT_new_mode, mode); } /*********************************************************************

1 0

Sven Baars : d3dx9/tests: Use Tahoma in all font tests.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 2465220a0c93f8e55948061772c2a39fb5753bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2465220a0c93f8e559480617… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jan 29 14:38:45 2020 +0100 d3dx9/tests: Use Tahoma in all font tests. 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/tests/core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index fa874a5ef5..75146575be 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -330,13 +330,13 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* D3DXCreateFont */ ref = get_ref((IUnknown*)device); - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); check_ref((IUnknown*)device, ref + 1); check_release((IUnknown*)font, 0); check_ref((IUnknown*)device, ref); - hr = D3DXCreateFontA(device, 0, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 0, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); @@ -348,13 +348,13 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); - hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", NULL); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", NULL); + hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -368,7 +368,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) desc.OutputPrecision = OUT_DEFAULT_PRECIS; desc.Quality = DEFAULT_QUALITY; desc.PitchAndFamily = DEFAULT_PITCH; - strcpy(desc.FaceName, "Arial"); + strcpy(desc.FaceName, "Tahoma"); hr = D3DXCreateFontIndirectA(device, &desc, &font); ok(hr == D3D_OK, "D3DXCreateFontIndirect returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); @@ -384,7 +384,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetDevice */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { IDirect3DDevice9 *bufdev; @@ -401,7 +401,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetDesc */ - hr = D3DXCreateFontA(device, 12, 8, FW_BOLD, 2, TRUE, ANSI_CHARSET, OUT_RASTER_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 8, FW_BOLD, 2, TRUE, ANSI_CHARSET, OUT_RASTER_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { hr = ID3DXFont_GetDescA(font, NULL); ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_GetDevice returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -418,14 +418,14 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(desc.OutputPrecision == OUT_RASTER_PRECIS, "ID3DXFont_GetDesc returned an output precision of %d, expected %d\n", desc.OutputPrecision, OUT_RASTER_PRECIS); ok(desc.Quality == ANTIALIASED_QUALITY, "ID3DXFont_GetDesc returned font quality %d, expected %d\n", desc.Quality, ANTIALIASED_QUALITY); ok(desc.PitchAndFamily == VARIABLE_PITCH, "ID3DXFont_GetDesc returned pitch and family %d, expected %d\n", desc.PitchAndFamily, VARIABLE_PITCH); - ok(strcmp(desc.FaceName, "Arial") == 0, "ID3DXFont_GetDesc returned facename \"%s\", expected \"%s\"\n", desc.FaceName, "Arial"); + ok(strcmp(desc.FaceName, "Tahoma") == 0, "ID3DXFont_GetDesc returned facename \"%s\", expected \"%s\"\n", desc.FaceName, "Tahoma"); ID3DXFont_Release(font); } else skip("Failed to create a ID3DXFont object\n"); /* ID3DXFont_GetDC + ID3DXFont_GetTextMetrics */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { HDC hdc; @@ -466,7 +466,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_PreloadText */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); @@ -493,7 +493,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetGlyphData, ID3DXFont_PreloadGlyphs, ID3DXFont_PreloadCharacters */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { char c; HDC hdc; @@ -565,7 +565,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) IDirect3DTexture9 *texture; hr = D3DXCreateFontA(device, tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(FAILED(hr)) { skip("Failed to create a ID3DXFont object\n"); continue;

1 0

Sven Baars : d3dx9/tests: Get rid of redundant handling for D3DXCreateFontA() failures.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: da62db437aca4a434ab88297ac78cbcd83f6152e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da62db437aca4a434ab88297… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jan 29 14:38:46 2020 +0100 d3dx9/tests: Get rid of redundant handling for D3DXCreateFontA() failures. 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/tests/core.c | 337 +++++++++++++++++++++++---------------------- 1 file changed, 173 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da62db437aca4a434ab8…

1 0

Alistair Leslie-Hughes : d3dx9/tests: Add some tests for ID3DXFont_DrawText().
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: db7539f9f3ead16cb94ff03c2b8f9ca11b44a253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db7539f9f3ead16cb94ff03c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 29 14:38:47 2020 +0100 d3dx9/tests: Add some tests for ID3DXFont_DrawText(). 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/tests/core.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 79b69ccc5f..bc80b2e397 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -646,6 +646,63 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ID3DXFont_Release(font); } + + + /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */ + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, + DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + todo_wine { + SetRect(&rect, 10, 10, 200, 200); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -2, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 0, &rect, 0, 0xFF00FF); + ok(height == 0, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 1, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 2, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF); + ok(height == 0, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "Got unexpected height %d.\n", height); + } + + ID3DXFont_Release(font); } static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)

1 0

Sven Baars : d3dx9/tests: Add some more ID3DXFont tests.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: ef889fe654e8bef81c009b93501b6c0411cd8354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef889fe654e8bef81c009b93… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jan 29 14:38:48 2020 +0100 d3dx9/tests: Add some more ID3DXFont tests. 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/tests/core.c | 146 +++++++++++++++++++++++++++++++++------------ 1 file changed, 108 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef889fe654e8bef81c00…

1 0

Zebediah Figura : strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 0820b125e29b5bfde9a6615e96cbd93efa56932f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0820b125e29b5bfde9a6615e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:54 2020 -0600 strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 1 - dlls/quartz/tests/filesource.c | 1 - dlls/quartz/tests/mpegsplit.c | 1 - dlls/quartz/tests/waveparser.c | 1 - dlls/strmbase/filter.c | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 31cb767b60..4af101767d 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -353,7 +353,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 3e571fa0e3..918605da6d 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -526,7 +526,6 @@ static void test_enum_pins(void) load_file(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c45f982a02..67dd6d312d 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -347,7 +347,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index 61ba2018e4..e9540bc0f5 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -351,7 +351,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index a7e5fcd3f0..43da4b3fb9 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -122,7 +122,7 @@ static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, *ret_count = 0; if (enum_pins->version != enum_pins->filter->pin_version) - return VFW_E_ENUM_OUT_OF_SYNC; + return S_FALSE; for (i = 0; i < count; ++i) {

1 0

Zebediah Figura : strmbase: Move the IEnumMediaTypes implementation to pin.c.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 85d411aa24a58647341a6c14a75bd2a61dd6a877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d411aa24a58647341a6c14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:55 2020 -0600 strmbase: Move the IEnumMediaTypes implementation to pin.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 170 ------------------------------------- dlls/strmbase/pin.c | 176 +++++++++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 2 - 3 files changed, 176 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85d411aa24a58647341a…

1 0

Zebediah Figura : winegstreamer: Get rid of the mp3 decoder.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: d263c4a366fbdb9bc05ef5ae77cd0677d76f5624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d263c4a366fbdb9bc05ef5ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:51 2020 -0600 winegstreamer: Get rid of the mp3 decoder. In the unlikely event that we are hotplugging not from an IAsyncReader, we already have the ACM wrapper and l3codeca.acm available to do the same thing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 4 +- dlls/winegstreamer/gst_cbs.c | 24 -- dlls/winegstreamer/gst_cbs.h | 13 - dlls/winegstreamer/gst_guids.h | 1 - dlls/winegstreamer/gst_private.h | 7 - dlls/winegstreamer/gstdemux.c | 14 +- dlls/winegstreamer/gsttffilter.c | 628 --------------------------------------- dlls/winegstreamer/main.c | 35 --- 8 files changed, 2 insertions(+), 724 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d263c4a366fbdb9bc05e…

1 0