January 2020 - Wine-Commits

Rémi Bernon : ntdll: Don't change RtlWaitOnAddress size after user invoke_apc.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: d03420da127569f331347d8ea0b1fb8d691df740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d03420da127569f331347d8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 29 10:27:27 2020 +0100 ntdll: Don't change RtlWaitOnAddress size after user invoke_apc. This makes the next iteration to immediately return STATUS_SUCCESS because of compare_addr returning FALSE with size == 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0dc6fc3390..c4885973b6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2504,7 +2504,6 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size * but we don't want to wait */ abs_timeout = 0; user_apc = TRUE; - size = 0; } }

1 0

Henri Verbeet : d2d1: Rename d2d_ellipse_geometry_GetRoundedRect() to d2d_ellipse_geometry_GetEllipse().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 763da3f7cc782eced124e981acbdb680012ea760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=763da3f7cc782eced124e981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 14:15:32 2020 +0330 d2d1: Rename d2d_ellipse_geometry_GetRoundedRect() to d2d_ellipse_geometry_GetEllipse(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a61ce692b9..2a1fbf5f7c 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3707,7 +3707,7 @@ static HRESULT STDMETHODCALLTYPE d2d_ellipse_geometry_Widen(ID2D1EllipseGeometry return E_NOTIMPL; } -static void STDMETHODCALLTYPE d2d_ellipse_geometry_GetRoundedRect(ID2D1EllipseGeometry *iface, D2D1_ELLIPSE *ellipse) +static void STDMETHODCALLTYPE d2d_ellipse_geometry_GetEllipse(ID2D1EllipseGeometry *iface, D2D1_ELLIPSE *ellipse) { struct d2d_geometry *geometry = impl_from_ID2D1EllipseGeometry(iface); @@ -3735,7 +3735,7 @@ static const struct ID2D1EllipseGeometryVtbl d2d_ellipse_geometry_vtbl = d2d_ellipse_geometry_ComputeLength, d2d_ellipse_geometry_ComputePointAtLength, d2d_ellipse_geometry_Widen, - d2d_ellipse_geometry_GetRoundedRect, + d2d_ellipse_geometry_GetEllipse, }; HRESULT d2d_ellipse_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_ELLIPSE *ellipse)

1 0

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

Jan. 29, 2020

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

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

Jan. 29, 2020

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

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

Jan. 29, 2020

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

Piotr Caban : msvcrt: Don't duplicate _searchenv_s code in _searchenv.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 98c554ac0617c642bc4481e6f56e0d66adec660a URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c554ac0617c642bc4481e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:15 2020 +0100 msvcrt: Don't duplicate _searchenv_s code in _searchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 90 +++++-------------------------------------------------- 1 file changed, 8 insertions(+), 82 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 806a2b0c85..83aff8bcb5 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1640,88 +1640,6 @@ range: return MSVCRT_ERANGE; } -/********************************************************************* - * _searchenv (MSVCRT.@) - * - * Search for a file in a list of paths from an environment variable. - * - * PARAMS - * file [I] Name of the file to search for. - * env [I] Name of the environment variable containing a list of paths. - * buf [O] Destination for the found file path. - * - * RETURNS - * Nothing. If the file is not found, buf will contain an empty string - * and errno is set. - */ -void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) -{ - char*envVal, *penv, *end; - char path[MAX_PATH]; - MSVCRT_size_t path_len, fname_len = strlen(file); - - *buf = '\0'; - - /* Try CWD first */ - if (GetFileAttributesA( file ) != INVALID_FILE_ATTRIBUTES) - { - GetFullPathNameA( file, MAX_PATH, buf, NULL ); - return; - } - - /* Search given environment variable */ - envVal = MSVCRT_getenv(env); - if (!envVal) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - - penv = envVal; - TRACE(":searching for %s in paths %s\n", file, envVal); - - for(; *penv; penv = (*end ? end + 1 : end)) - { - end = penv; - path_len = 0; - while(*end && *end != ';' && path_len < MAX_PATH) - { - if (*end == '"') - { - end++; - while(*end && *end != '"' && path_len < MAX_PATH) - { - path[path_len++] = *end; - end++; - } - if (*end == '"') end++; - continue; - } - - path[path_len++] = *end; - end++; - } - if (!path_len || path_len >= MAX_PATH) - continue; - - if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') - path[path_len++] = '\\'; - if (path_len + fname_len >= MAX_PATH) - continue; - - memcpy(path + path_len, file, fname_len + 1); - TRACE("Checking for file %s\n", path); - if (GetFileAttributesA( path ) != INVALID_FILE_ATTRIBUTES) - { - memcpy(buf, path, path_len + fname_len + 1); - return; - } - } - - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; -} - /********************************************************************* * _searchenv_s (MSVCRT.@) */ @@ -1807,6 +1725,14 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC return MSVCRT_ENOENT; } +/********************************************************************* + * _searchenv (MSVCRT.@) + */ +void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) +{ + MSVCRT__searchenv_s(file, env, buf, MAX_PATH); +} + /********************************************************************* * _wsearchenv (MSVCRT.@) *

1 0

Jacek Caban : msvcrt/tests: Avoid using msvcrt.h header.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 3dcedeef2d4f1aedfc6b30ebcfa5546cc986b1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcedeef2d4f1aedfc6b30eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 13:39:12 2020 +0100 msvcrt/tests: Avoid using msvcrt.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 7e2a7e4069..afc3a9de21 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -22,7 +22,6 @@ #include <errno.h> #include <stdio.h> #include <math.h> -#include "msvcrt.h" #include <process.h> static inline BOOL almost_equal(double d1, double d2) { @@ -33,14 +32,14 @@ static inline BOOL almost_equal(double d1, double d2) { static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); -static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); +static int (__cdecl *pstrerror_s)(char *, size_t, int); static int (__cdecl *p_get_doserrno)(int *); static int (__cdecl *p_get_errno)(int *); static int (__cdecl *p_set_doserrno)(int); static int (__cdecl *p_set_errno)(int); static void (__cdecl *p__invalid_parameter)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); -static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, +static void (__cdecl *p_qsort_s)(void*, size_t, size_t, int (__cdecl*)(void*, const void*, const void*), void*); static double (__cdecl *p_atan)(double); static double (__cdecl *p_exp)(double);

1 0

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

Jan. 29, 2020

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

Piotr Caban : msvcrt: Respect allocation mode in malloc.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

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: Add support for quoted paths in _searchenv_s.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 2e7ad72a8dae21aa5a16396c408007d48e43f5ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e7ad72a8dae21aa5a16396c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:11 2020 +0100 msvcrt: Add support for quoted paths in _searchenv_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index d07fcd6c7d..806a2b0c85 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1763,12 +1763,27 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH)

1 0

Nikolay Sivov : mfplat: Add support for local MFT registration.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 97f646edabea52e136713830612eb737df3689dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=97f646edabea52e136713830… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 15:36:21 2020 +0300 mfplat: Add support for local MFT registration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 214 ++++++++++++++++++++++++++++++++++++++------- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 104 ++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 288 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97f646edabea52e13671…

1 0

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

Jan. 29, 2020

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

Piotr Caban : msvcrt: Reimplement _set_new_mode function.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

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

Piotr Caban : msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 1b5a551324e113afefd247e703cc59c03ad80a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5a551324e113afefd247e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:23 2020 +0100 msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 66 +++++++------------------------------------------------ 1 file changed, 8 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5bd8fb1b15..5e84e38a00 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1733,64 +1733,6 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) MSVCRT__searchenv_s(file, env, buf, MAX_PATH); } -/********************************************************************* - * _wsearchenv (MSVCRT.@) - * - * Unicode version of _searchenv - */ -void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) -{ - MSVCRT_wchar_t *envVal, *penv, *end; - MSVCRT_wchar_t path[MAX_PATH]; - MSVCRT_size_t path_len, fname_len = strlenW(file); - - *buf = '\0'; - - /* Try CWD first */ - if (GetFileAttributesW( file ) != INVALID_FILE_ATTRIBUTES) - { - GetFullPathNameW( file, MAX_PATH, buf, NULL ); - return; - } - - /* Search given environment variable */ - envVal = MSVCRT__wgetenv(env); - if (!envVal) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - - penv = envVal; - TRACE(":searching for %s in paths %s\n", debugstr_w(file), debugstr_w(envVal)); - - for(; *penv; penv = (*end ? end + 1 : end)) - { - end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; - if (!path_len || path_len >= MAX_PATH) - continue; - - memcpy(path, penv, path_len * sizeof(MSVCRT_wchar_t)); - if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') - path[path_len++] = '\\'; - if (path_len + fname_len >= MAX_PATH) - continue; - - memcpy(path + path_len, file, (fname_len + 1) * sizeof(MSVCRT_wchar_t)); - TRACE("Checking for file %s\n", debugstr_w(path)); - if (GetFileAttributesW( path ) != INVALID_FILE_ATTRIBUTES) - { - memcpy(buf, path, (path_len + fname_len + 1) * sizeof(MSVCRT_wchar_t)); - return; - } - } - - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; -} - /********************************************************************* * _wsearchenv_s (MSVCRT.@) */ @@ -1876,3 +1818,11 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* *MSVCRT__errno() = MSVCRT_ENOENT; return MSVCRT_ENOENT; } + +/********************************************************************* + * _wsearchenv (MSVCRT.@) + */ +void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) +{ + MSVCRT__wsearchenv_s(file, env, buf, MAX_PATH); +}

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _wsearchenv_s.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: f05549b7f71740362ae5ef6dc8d5e846f8c41f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f05549b7f71740362ae5ef6d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:19 2020 +0100 msvcrt: Add support for quoted paths in _wsearchenv_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 83aff8bcb5..5bd8fb1b15 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1833,12 +1833,27 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len * sizeof(MSVCRT_wchar_t)); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH)

1 0

Nikolay Sivov : mfplat: Add MFCreateTransformActivate().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: be45be2de750c4a97c8180490fba8a8832e50b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be45be2de750c4a97c818049… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 15:36:20 2020 +0300 mfplat: Add MFCreateTransformActivate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 416 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 25 +++ include/mftransform.idl | 2 + 4 files changed, 444 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be45be2de750c4a97c81…

1 0

Jacek Caban : include: Use dllimport attribute for string.h functions.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 3a67291af47bf5b3727d7d1a6cd3f3ddc81c8282 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a67291af47bf5b3727d7d1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 13:40:04 2020 +0100 include: Use dllimport attribute for string.h functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 12 ++++ include/msvcrt/string.h | 180 +++++++++++++++++++++++------------------------ 2 files changed, 102 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a67291af47bf5b3727d…

1 0

Chip Davis : gdi32: Add D3DKMTSetQueuedLimit() stub.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 012d996b83251e005cc70be809dc5ac60e459cd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=012d996b83251e005cc70be8… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jan 29 01:34:01 2020 -0600 gdi32: Add D3DKMTSetQueuedLimit() stub. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- .../ext-ms-win-gdi-font-l1-1-1.spec | 6 +++--- dlls/gdi32/driver.c | 9 ++++++++ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 24 +++++++++++++++++++++- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index d2fcc8fe45..609f24fcfd 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -80,7 +80,7 @@ @ stub D3DKMTSetDisplayPrivateDriverFormat @ stub D3DKMTSetGammaRamp @ stub D3DKMTSetProcessSchedulingPriorityClass -@ stub D3DKMTSetQueuedLimit +@ stdcall D3DKMTSetQueuedLimit(ptr) gdi32.D3DKMTSetQueuedLimit @ stub D3DKMTSetStereoEnabled @ stdcall D3DKMTSetVidPnSourceOwner(ptr) gdi32.D3DKMTSetVidPnSourceOwner @ stub D3DKMTShareObjects diff --git a/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec index c1b0679883..3d67056c84 100644 --- a/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec +++ b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec @@ -6,9 +6,9 @@ @ stdcall ExtTextOutA(long long long long ptr str long ptr) gdi32.ExtTextOutA @ stdcall ExtTextOutW(long long long long ptr wstr long ptr) gdi32.ExtTextOutW @ stdcall GetCharABCWidthsW(long long long ptr) gdi32.GetCharABCWidthsW -@ stdcall GetCharWidth32A(long long long long) gdi32.GetCharWidth32A -@ stdcall GetCharWidthA(long long long long) gdi32.GetCharWidthA -@ stdcall GetCharWidthW(long long long long) gdi32.GetCharWidthW +@ stdcall GetCharWidth32A(long long long ptr) gdi32.GetCharWidth32A +@ stdcall GetCharWidthA(long long long ptr) gdi32.GetCharWidthA +@ stdcall GetCharWidthW(long long long ptr) gdi32.GetCharWidthW @ stdcall GetFontData(long long long ptr long) gdi32.GetFontData @ stdcall GetFontFileData(long long int64 ptr long) gdi32.GetFontFileData @ stdcall GetFontFileInfo(long long ptr long ptr) gdi32.GetFontFileInfo diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d84584da86..90977383a5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1470,6 +1470,15 @@ NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) return STATUS_SUCCESS; } +/****************************************************************************** + * D3DKMTSetQueuedLimit [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTSetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) +{ + FIXME( "(%p): stub\n", desc ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************************** * D3DKMTSetVidPnSourceOwner [GDI32.@] */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8faa2978f4..725afebb8e 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -90,6 +90,7 @@ @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall D3DKMTQueryStatistics(ptr) +@ stdcall D3DKMTSetQueuedLimit(ptr) @ stdcall D3DKMTSetVidPnSourceOwner(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 6d6a1d68cd..dc53ea343c 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -594,9 +594,30 @@ typedef struct _D3DKMT_QUERYSTATISTICS D3DKMT_QUERYSTATISTICS_QUERY_NODE QueryProcessNode; D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE QueryVidPnSource; D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE QueryProcessVidPnSource; - }; + } DUMMYUNIONNAME; } D3DKMT_QUERYSTATISTICS; +typedef enum _D3DKMT_QUEUEDLIMIT_TYPE +{ + D3DKMT_SET_QUEUEDLIMIT_PRESENT = 1, + D3DKMT_GET_QUEUEDLIMIT_PRESENT +} D3DKMT_QUEUEDLIMIT_TYPE; + +typedef struct _D3DKMT_SETQUEUEDLIMIT +{ + D3DKMT_HANDLE hDevice; + D3DKMT_QUEUEDLIMIT_TYPE Type; + union + { + UINT QueuedPresentLimit; + struct + { + D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; + UINT QueuedPendingFlipLimit; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +} D3DKMT_SETQUEUEDLIMIT; + #ifdef __cplusplus extern "C" { @@ -610,6 +631,7 @@ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); +NTSTATUS WINAPI D3DKMTSetQueuedLimit(D3DKMT_SETQUEUEDLIMIT *desc); NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner(const D3DKMT_SETVIDPNSOURCEOWNER *desc); #ifdef __cplusplus

1 0

Zebediah Figura : d3d8: Handle multisample depth resolve in d3d8_device_SetRenderState().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 18c863e0ae4279403f14757e257936f6114f65b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c863e0ae4279403f14757e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:11 2020 -0600 d3d8: Handle multisample depth resolve in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/device.c | 30 ++++++++++++++++++++++++++++++ dlls/d3d8/directx.c | 13 +++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f262d12fc7..26451255c0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -42,6 +42,9 @@ #define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D8_MAX_STREAMS 16 +#define D3DFMT_RESZ MAKEFOURCC('R','E','S','Z') +#define D3D8_RESZ_CODE 0x7fa05000 + /* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000 diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0721d2a501..4c2c350ec2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1846,6 +1846,34 @@ static HRESULT WINAPI d3d8_device_GetClipPlane(IDirect3DDevice8 *iface, DWORD in return hr; } +static void resolve_depth_buffer(struct d3d8_device *device) +{ + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + struct wined3d_rendertarget_view *wined3d_dsv; + struct wined3d_resource *dst_resource; + struct wined3d_texture *dst_texture; + struct wined3d_resource_desc desc; + struct d3d8_surface *d3d8_dsv; + + if (!(dst_texture = state->textures[0])) + return; + dst_resource = wined3d_texture_get_resource(dst_texture); + wined3d_resource_get_desc(dst_resource, &desc); + if (desc.format != WINED3DFMT_D24_UNORM_S8_UINT + && desc.format != WINED3DFMT_X8D24_UNORM + && desc.format != WINED3DFMT_DF16 + && desc.format != WINED3DFMT_DF24 + && desc.format != WINED3DFMT_INTZ) + return; + + if (!(wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + return; + d3d8_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); + + wined3d_device_resolve_sub_resource(device->wined3d_device, dst_resource, 0, + wined3d_rendertarget_view_get_resource(wined3d_dsv), d3d8_dsv->sub_resource_idx, desc.format); +} + static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD value) { @@ -1859,6 +1887,8 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, wined3d_stateblock_set_render_state(device->update_state, state, value); if (!device->recording) wined3d_device_set_render_state(device->wined3d_device, state, value); + if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) + resolve_depth_buffer(device); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 9a9abeccca..d1f8872d12 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -266,8 +266,17 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 } wined3d_mutex_lock(); - hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); + if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) + { + DWORD levels; + hr = wined3d_check_device_multisample_type(d3d8->wined3d, adapter, device_type, + WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); + if (SUCCEEDED(hr) && !levels) + hr = D3DERR_NOTAVAILABLE; + } + else + hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), + usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetRenderState().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 5e9c139c5fd1a8eb7fdda12db86113241ee854c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e9c139c5fd1a8eb7fdda12d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:12 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4c2c350ec2..b0a0491890 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1885,8 +1885,6 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, if (state == D3DRS_ZBIAS) state = WINED3D_RS_DEPTHBIAS; wined3d_stateblock_set_render_state(device->update_state, state, value); - if (!device->recording) - wined3d_device_set_render_state(device->wined3d_device, state, value); if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock();

1 0

Alexandre Julliard : libwine: Make some functions obsolete.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 39138478fdd93cc0dfc1e83b85784bc468e8d237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39138478fdd93cc0dfc1e83b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:48:39 2020 +0100 libwine: Make some functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_powerpc.c | 16 +++++++- include/wine/asm.h | 6 +++ include/wine/library.h | 5 --- libs/wine/port.c | 70 +++++++++++++++------------------- libs/wine/wine.map | 91 +++++++++++++++++++++++---------------------- 5 files changed, 96 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39138478fdd93cc0dfc1…

1 0

Zebediah Figura : strmbase: Remove some no longer used callbacks.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 38291846f306dd5c6bd8bc5ed6a1634022d1dd2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=38291846f306dd5c6bd8bc5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:52 2020 -0600 strmbase: Remove some no longer used callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 28 ++++++---------------------- include/wine/strmbase.h | 4 ---- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 74be6b107e..2c75156c1b 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -38,14 +38,6 @@ static inline TransformFilter *impl_from_sink_IPin(IPin *iface) static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) { - TransformFilter *pTransform = impl_from_sink_IPin(&iface->IPin_iface); - - TRACE("%p\n", iface); - - if (pTransform->pFuncsTable->pfnCheckInputType) - return pTransform->pFuncsTable->pfnCheckInputType(pTransform, pmt); - /* Assume OK if there's no query method (the connection will fail if - needed) */ return S_OK; } @@ -239,13 +231,9 @@ static HRESULT sink_eos(struct strmbase_sink *iface) static HRESULT sink_begin_flush(struct strmbase_sink *iface) { TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; - - if (filter->pFuncsTable->pfnBeginFlush) - hr = filter->pFuncsTable->pfnBeginFlush(filter); - if (SUCCEEDED(hr) && filter->source.pin.peer) - hr = IPin_BeginFlush(filter->source.pin.peer); - return hr; + if (filter->source.pin.peer) + return IPin_BeginFlush(filter->source.pin.peer); + return S_OK; } static HRESULT sink_end_flush(struct strmbase_sink *iface) @@ -264,13 +252,9 @@ static HRESULT sink_new_segment(struct strmbase_sink *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; - - if (filter->pFuncsTable->pfnNewSegment) - hr = filter->pFuncsTable->pfnNewSegment(filter, start, stop, rate); - if (SUCCEEDED(hr) && filter->source.pin.peer) - hr = IPin_NewSegment(filter->source.pin.peer, start, stop, rate); - return hr; + if (filter->source.pin.peer) + return IPin_NewSegment(filter->source.pin.peer, start, stop, rate); + return S_OK; } static const struct strmbase_sink_ops sink_ops = diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 48d7638ae1..abb04a8384 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -195,13 +195,9 @@ typedef struct TransformFilterFuncTable { TransformFilter_StartStreaming pfnStartStreaming; TransformFilter_Receive pfnReceive; TransformFilter_StopStreaming pfnStopStreaming; - TransformFilter_CheckInputType pfnCheckInputType; HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt); TransformFilter_BreakConnect pfnBreakConnect; - TransformFilter_EndOfStream pfnEndOfStream; - TransformFilter_BeginFlush pfnBeginFlush; TransformFilter_EndFlush pfnEndFlush; - TransformFilter_NewSegment pfnNewSegment; TransformFilter_Notify pfnNotify; } TransformFilterFuncTable;

1 0

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

Jan. 29, 2020

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 Jan. 29, 2020

Jan. 29, 2020

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 Jan. 29, 2020

Jan. 29, 2020

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