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

Zebediah Figura : quartz/tests: Add a test for aggregation on the seeking passthrough object.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 00d558428005ff93873aa7484044d87ea6393891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00d558428005ff93873aa748… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 21:34:06 2020 -0500 quartz/tests: Add a test for aggregation on the seeking passthrough object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/passthrough.c | 133 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index fe1a45e8ec..46b3728ab8 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ filtermapper.c \ memallocator.c \ mpegsplit.c \ + passthrough.c \ systemclock.c \ videorenderer.c \ vmr7.c \ diff --git a/dlls/quartz/tests/passthrough.c b/dlls/quartz/tests/passthrough.c new file mode 100644 index 0000000000..6042bc7f5a --- /dev/null +++ b/dlls/quartz/tests/passthrough.c @@ -0,0 +1,133 @@ +/* + * Seeking passthrough unit tests + * + * Copyright 2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_ISeekingPassThru) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + ISeekingPassThru *passthrough, *passthrough2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + passthrough = (ISeekingPassThru *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_SeekingPassThru, &test_outer, CLSCTX_INPROC_SERVER, + &IID_ISeekingPassThru, (void **)&passthrough); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!passthrough, "Got interface %p.\n", passthrough); + + hr = CoCreateInstance(&CLSID_SeekingPassThru, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_ISeekingPassThru, (void **)&passthrough); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ISeekingPassThru_QueryInterface(passthrough, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = ISeekingPassThru_QueryInterface(passthrough, &IID_ISeekingPassThru, (void **)&passthrough2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(passthrough2 == (ISeekingPassThru *)0xdeadbeef, "Got unexpected ISeekingPassThru %p.\n", passthrough2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = ISeekingPassThru_QueryInterface(passthrough, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + ISeekingPassThru_Release(passthrough); + ref = IUnknown_Release(unk); + todo_wine ok(!ref, "Got unexpected refcount %d.\n", ref); + todo_wine ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + +START_TEST(passthrough) +{ + CoInitialize(NULL); + + test_aggregation(); + + CoUninitialize(); +}

1 0

Jacek Caban : ucrtbase/tests: Directly use ucrtbase functions in scanf.c.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: c3165b4c96a021a96dc6dd8a0b8e1030682dd6e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3165b4c96a021a96dc6dd8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:22:02 2020 +0100 ucrtbase/tests: Directly use ucrtbase functions in scanf.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/scanf.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c index 794309e5c6..2d469d2b04 100644 --- a/dlls/ucrtbase/tests/scanf.c +++ b/dlls/ucrtbase/tests/scanf.c @@ -27,38 +27,16 @@ #include "wine/test.h" -static int (__cdecl *p_vsscanf)(unsigned __int64 options, const char *str, size_t len, const char *format, - void *locale, __ms_va_list valist); - -static BOOL init(void) -{ - HMODULE hmod = LoadLibraryA("ucrtbase.dll"); - - if (!hmod) - { - win_skip("ucrtbase.dll not installed\n"); - return FALSE; - } - - p_vsscanf = (void *)GetProcAddress(hmod, "__stdio_common_vsscanf"); - - return TRUE; -} - static int WINAPIV vsscanf_wrapper(unsigned __int64 options, const char *str, size_t len, const char *format, ...) { int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsscanf(options, str, len, format, NULL, valist); + ret = __stdio_common_vsscanf(options, str, len, format, NULL, valist); __ms_va_end(valist); return ret; } -#define UCRTBASE_SCANF_SECURECRT (0x0001) -#define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) -#define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - static void test_sscanf(void) { static const float float1 = -82.6267f, float2 = 27.76f; @@ -74,8 +52,8 @@ static void test_sscanf(void) static const unsigned int tests[] = { 0, - UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS, - UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY, + _CRT_INTERNAL_SCANF_LEGACY_WIDE_SPECIFIERS, + _CRT_INTERNAL_SCANF_LEGACY_MSVCRT_COMPATIBILITY, }; for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -316,7 +294,5 @@ static void test_sscanf(void) START_TEST(scanf) { - if (!init()) return; - test_sscanf(); }

1 0

Connor McAdams : d3d10: Implement vector effect variable set methods.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 177a0701fbed5190ab7c3c4ddf2c3c7e7ff3b1a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=177a0701fbed5190ab7c3c4d… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Mar 12 14:04:58 2020 +0100 d3d10: Implement vector effect variable set methods. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7b911616a9..c6d4d8600e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4740,6 +4740,11 @@ static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_ /* ID3D10EffectVariable methods */ +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVectorVariable(ID3D10EffectVectorVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_vector_variable_IsValid(ID3D10EffectVectorVariable *iface) { TRACE("iface %p\n", iface); @@ -4896,25 +4901,34 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_SetBoolVector(ID3D10EffectVectorVariable *iface, BOOL *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectVectorVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %p.\n", iface, value); + write_variable_to_buffer(effect_var, value, D3D10_SVT_BOOL); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_SetIntVector(ID3D10EffectVectorVariable *iface, int *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectVectorVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %p.\n", iface, value); + write_variable_to_buffer(effect_var, value, D3D10_SVT_INT); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_SetFloatVector(ID3D10EffectVectorVariable *iface, float *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectVectorVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %p.\n", iface, value); + write_variable_to_buffer(effect_var, value, D3D10_SVT_FLOAT); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_GetBoolVector(ID3D10EffectVectorVariable *iface, @@ -4944,25 +4958,34 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_GetFloatVector(ID3 static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_SetBoolVectorArray(ID3D10EffectVectorVariable *iface, BOOL *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectVectorVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_BOOL, offset, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_SetIntVectorArray(ID3D10EffectVectorVariable *iface, int *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectVectorVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_INT, offset, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_SetFloatVectorArray(ID3D10EffectVectorVariable *iface, float *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectVectorVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_FLOAT, offset, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_vector_variable_GetBoolVectorArray(ID3D10EffectVectorVariable *iface,

1 0

Nikolay Sivov : mf/tests: Use wide string literals.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 36543adbe72bbc1c46af7299e603b6557ef30348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36543adbe72bbc1c46af7299… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 18:39:11 2020 +0300 mf/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8ebfd0ddee..d799446676 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1230,8 +1230,6 @@ static const IMFSampleGrabberSinkCallbackVtbl test_grabber_callback_vtbl = static void test_topology_loader(void) { IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; - static const WCHAR wavW[] = {'a','u','d','i','o','/','w','a','v',0}; - static const WCHAR nameW[] = {'t','e','s','t','.','w','a','v',0}; IMFTopology *topology, *topology2, *full_topology; IMFTopologyNode *src_node, *sink_node; IMFPresentationDescriptor *pd; @@ -1271,13 +1269,13 @@ todo_wine hr = MFCreateSourceResolver(&resolver); ok(hr == S_OK, "Failed to create source resolver, hr %#x.\n", hr); - filename = load_resource(nameW); + filename = load_resource(L"test.wav"); hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attr); - IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, wavW); + IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, L"audio/wav"); IMFAttributes_Release(attr); hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL,

1 0

Jacek Caban : ucrtbase/tests: Directly use __stdio_common_* functions.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: cd030f752f34c8ff21ae183114ee11268cf1ad22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd030f752f34c8ff21ae1831… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:41 2020 +0100 ucrtbase/tests: Directly use __stdio_common_* functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index e743397331..3e0a9a7b4d 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -69,21 +69,6 @@ static inline float __port_ind(void) } #define IND __port_ind() -static int (__cdecl *p_vfprintf)(unsigned __int64 options, FILE *file, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vfwprintf)(unsigned __int64 options, FILE *file, const wchar_t *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsprintf)(unsigned __int64 options, char *str, size_t len, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsnprintf_s)(unsigned __int64 options, char *str, size_t sizeOfBuffer, size_t count, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsprintf_s)(unsigned __int64 options, char *str, size_t count, const char *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vswprintf)(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, - void *locale, __ms_va_list valist); -static int (__cdecl *p_vsnwprintf_s)(unsigned __int64 options, WCHAR *str, size_t sizeOfBuffer, size_t count, const WCHAR *format, - void *locale, __ms_va_list valist); - static FILE *(__cdecl *p_fopen)(const char *name, const char *mode); static int (__cdecl *p_fclose)(FILE *file); static long (__cdecl *p_ftell)(FILE *file); @@ -115,14 +100,6 @@ static BOOL init( void ) return FALSE; } - p_vfprintf = (void *)GetProcAddress(hmod, "__stdio_common_vfprintf"); - p_vfwprintf = (void *)GetProcAddress(hmod, "__stdio_common_vfwprintf"); - p_vsprintf = (void *)GetProcAddress(hmod, "__stdio_common_vsprintf"); - p_vsnprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsnprintf_s"); - p_vsnwprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsnwprintf_s"); - p_vsprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsprintf_s"); - p_vswprintf = (void *)GetProcAddress(hmod, "__stdio_common_vswprintf"); - p_fopen = (void *)GetProcAddress(hmod, "fopen"); p_fclose = (void *)GetProcAddress(hmod, "fclose"); p_ftell = (void *)GetProcAddress(hmod, "ftell"); @@ -140,7 +117,7 @@ static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsprintf(options, str, len, format, NULL, valist); + ret = __stdio_common_vsprintf(options, str, len, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -209,7 +186,7 @@ static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vswprintf(options, str, len, format, NULL, valist); + ret = __stdio_common_vswprintf(options, str, len, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -290,7 +267,7 @@ static int WINAPIV vfprintf_wrapper(FILE *file, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vfprintf(0, file, format, NULL, valist); + ret = __stdio_common_vfprintf(0, file, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -363,7 +340,7 @@ static int WINAPIV vfwprintf_wrapper(FILE *file, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vfwprintf(0, file, format, NULL, valist); + ret = __stdio_common_vfwprintf(0, file, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -454,7 +431,7 @@ static void test_fwprintf(void) /* format using % with NULL arglist*/ /* crashes on Windows */ - /* ret = p_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ + /* ret = __stdio_common_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); @@ -466,7 +443,7 @@ static int WINAPIV _vsnprintf_s_wrapper(char *str, size_t sizeOfBuffer, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsnprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); + ret = __stdio_common_vsnprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); __ms_va_end(valist); return ret; } @@ -518,7 +495,7 @@ static int WINAPIV _vsnwprintf_s_wrapper(WCHAR *str, size_t sizeOfBuffer, int ret; __ms_va_list valist; __ms_va_start(valist, format); - ret = p_vsnwprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); + ret = __stdio_common_vsnwprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); __ms_va_end(valist); return ret; }

1 0

Jacek Caban : ucrtbase/tests: Directly use ucrtbase functions in printf.c.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: d6f5afdd3d66f61df86d52ef23afe0345cc02e3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6f5afdd3d66f61df86d52ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:52 2020 +0100 ucrtbase/tests: Directly use ucrtbase functions in printf.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 120 +++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 78 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 3e0a9a7b4d..d6a1aa048e 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -58,10 +58,6 @@ DEFINE_EXPECT(invalid_parameter_handler); -/* make sure we use the correct errno */ -#undef errno -#define errno (*p_errno()) - static inline float __port_ind(void) { static const unsigned __ind_bytes = 0xffc00000; @@ -69,15 +65,6 @@ static inline float __port_ind(void) } #define IND __port_ind() -static FILE *(__cdecl *p_fopen)(const char *name, const char *mode); -static int (__cdecl *p_fclose)(FILE *file); -static long (__cdecl *p_ftell)(FILE *file); -static char *(__cdecl *p_fgets)(char *str, int size, FILE *file); -static wchar_t *(__cdecl *p_fgetws)(wchar_t *str, int size, FILE *file); - -static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); -static int* (__cdecl *p_errno)(void); - static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, unsigned line, uintptr_t arg) @@ -90,27 +77,6 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); } -static BOOL init( void ) -{ - HMODULE hmod = LoadLibraryA("ucrtbase.dll"); - - if (!hmod) - { - win_skip("ucrtbase.dll not installed\n"); - return FALSE; - } - - p_fopen = (void *)GetProcAddress(hmod, "fopen"); - p_fclose = (void *)GetProcAddress(hmod, "fclose"); - p_ftell = (void *)GetProcAddress(hmod, "ftell"); - p_fgets = (void *)GetProcAddress(hmod, "fgets"); - p_fgetws = (void *)GetProcAddress(hmod, "fgetws"); - - p_set_invalid_parameter_handler = (void *)GetProcAddress(hmod, "_set_invalid_parameter_handler"); - p_errno = (void *)GetProcAddress(hmod, "_errno"); - return TRUE; -} - static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str, size_t len, const char *format, ...) { @@ -276,61 +242,61 @@ static void test_fprintf(void) { static const char file_name[] = "fprintf.tst"; - FILE *fp = p_fopen(file_name, "wb"); + FILE *fp = fopen(file_name, "wb"); char buf[1024]; int ret; ret = vfprintf_wrapper(fp, "simple test\n"); ok(ret == 12, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 12, "ftell returned %d\n", ret); ret = vfprintf_wrapper(fp, "contains%cnull\n", '\0'); ok(ret == 14, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 26, "ftell returned %d\n", ret); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "rb"); - p_fgets(buf, sizeof(buf), fp); - ret = p_ftell(fp); + fp = fopen(file_name, "rb"); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); ok(ret == 12, "ftell returned %d\n", ret); ok(!strcmp(buf, "simple test\n"), "buf = %s\n", buf); - p_fgets(buf, sizeof(buf), fp); - ret = p_ftell(fp); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); ok(ret == 26, "ret = %d\n", ret); ok(!memcmp(buf, "contains\0null\n", 14), "buf = %s\n", buf); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "wt"); + fp = fopen(file_name, "wt"); ret = vfprintf_wrapper(fp, "simple test\n"); ok(ret == 12, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 13, "ftell returned %d\n", ret); ret = vfprintf_wrapper(fp, "contains%cnull\n", '\0'); ok(ret == 14, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 28, "ftell returned %d\n", ret); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "rb"); - p_fgets(buf, sizeof(buf), fp); - ret = p_ftell(fp); + fp = fopen(file_name, "rb"); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); ok(ret == 13, "ftell returned %d\n", ret); ok(!strcmp(buf, "simple test\r\n"), "buf = %s\n", buf); - p_fgets(buf, sizeof(buf), fp); - ret = p_ftell(fp); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); ok(ret == 28, "ret = %d\n", ret); ok(!memcmp(buf, "contains\0null\r\n", 15), "buf = %s\n", buf); - p_fclose(fp); + fclose(fp); unlink(file_name); } @@ -352,65 +318,65 @@ static void test_fwprintf(void) static const WCHAR cont_fmt[] = {'c','o','n','t','a','i','n','s','%','c','n','u','l','l','\n',0}; static const WCHAR cont[] = {'c','o','n','t','a','i','n','s','\0','n','u','l','l','\n',0}; - FILE *fp = p_fopen(file_name, "wb"); + FILE *fp = fopen(file_name, "wb"); wchar_t bufw[1024]; char bufa[1024]; int ret; ret = vfwprintf_wrapper(fp, simple); ok(ret == 12, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 24, "ftell returned %d\n", ret); ret = vfwprintf_wrapper(fp, cont_fmt, '\0'); ok(ret == 14, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 52, "ftell returned %d\n", ret); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "rb"); - p_fgetws(bufw, ARRAY_SIZE(bufw), fp); - ret = p_ftell(fp); + fp = fopen(file_name, "rb"); + fgetws(bufw, ARRAY_SIZE(bufw), fp); + ret = ftell(fp); ok(ret == 24, "ftell returned %d\n", ret); ok(!wcscmp(bufw, simple), "buf = %s\n", wine_dbgstr_w(bufw)); - p_fgetws(bufw, ARRAY_SIZE(bufw), fp); - ret = p_ftell(fp); + fgetws(bufw, ARRAY_SIZE(bufw), fp); + ret = ftell(fp); ok(ret == 52, "ret = %d\n", ret); ok(!memcmp(bufw, cont, 28), "buf = %s\n", wine_dbgstr_w(bufw)); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "wt"); + fp = fopen(file_name, "wt"); ret = vfwprintf_wrapper(fp, simple); ok(ret == 12, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 13, "ftell returned %d\n", ret); ret = vfwprintf_wrapper(fp, cont_fmt, '\0'); ok(ret == 14, "ret = %d\n", ret); - ret = p_ftell(fp); + ret = ftell(fp); ok(ret == 28, "ftell returned %d\n", ret); - p_fclose(fp); + fclose(fp); - fp = p_fopen(file_name, "rb"); - p_fgets(bufa, sizeof(bufa), fp); - ret = p_ftell(fp); + fp = fopen(file_name, "rb"); + fgets(bufa, sizeof(bufa), fp); + ret = ftell(fp); ok(ret == 13, "ftell returned %d\n", ret); ok(!strcmp(bufa, "simple test\r\n"), "buf = %s\n", bufa); - p_fgets(bufa, sizeof(bufa), fp); - ret = p_ftell(fp); + fgets(bufa, sizeof(bufa), fp); + ret = ftell(fp); ok(ret == 28, "ret = %d\n", ret); ok(!memcmp(bufa, "contains\0null\r\n", 15), "buf = %s\n", bufa); - p_fclose(fp); + fclose(fp); unlink(file_name); - ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, "Invalid parameter handler was already set\n"); /* NULL format */ @@ -433,7 +399,7 @@ static void test_fwprintf(void) /* crashes on Windows */ /* ret = __stdio_common_vfwprintf(0, fp, cont_fmt, NULL, NULL); */ - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + ok(_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } @@ -662,8 +628,6 @@ static void test_printf_natural_string(void) START_TEST(printf) { - if (!init()) return; - test_snprintf(); test_swprintf(); test_fprintf();

1 0

Jacek Caban : ucrtbase/tests: Link to ucrtbase.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 6b52c24d2f4b67038352afa9ab3035fea1cf7863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b52c24d2f4b67038352afa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 17:21:24 2020 +0100 ucrtbase/tests: Link to ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/string.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 116bdcc7b6..126cafd66d 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = ucrtbase.dll +IMPORTS = ucrtbase C_SRCS = \ cpp.c \ diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index c0b2336322..aff37efc6f 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -215,21 +215,21 @@ static void test__memicmp(void) errno = 0xdeadbeef; ret = p__memicmp(NULL, NULL, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp(s1, NULL, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp(NULL, s2, 1); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); ret = p__memicmp(s1, s2, 2); @@ -258,21 +258,21 @@ static void test__memicmp_l(void) errno = 0xdeadbeef; ret = p__memicmp_l(NULL, NULL, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp_l(s1, NULL, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); SET_EXPECT(invalid_parameter_handler); errno = 0xdeadbeef; ret = p__memicmp_l(NULL, s2, 1, NULL); ok(ret == _NLSCMPERROR, "got %d\n", ret); - ok(errno == 0xdeadbeef, "Unexpected errno = %d\n", errno); + ok(errno == EINVAL, "Unexpected errno = %d\n", errno); CHECK_CALLED(invalid_parameter_handler); ret = p__memicmp_l(s1, s2, 2, NULL);

1 0

Nikolay Sivov : mfplat: Add a stub for 2D system memory buffer object.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 1fb20f67d8670a661c8a2904669dc233827eff9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb20f67d8670a661c8a2904… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 12 18:39:12 2020 +0300 mfplat: Add a stub for 2D system memory buffer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 233 ++++++++++++++++++++++++++++++++++++++++--- dlls/mfplat/mediatype.c | 6 ++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/mfplat_private.h | 2 + dlls/mfplat/tests/mfplat.c | 49 +++++++++ include/mfapi.h | 1 + include/mfobjects.idl | 26 +++++ 7 files changed, 306 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1fb20f67d8670a661c8a…

1 0

Jacek Caban : dbghelp: Use Windows API to map ELF files.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: a60b3985bf37827fd0b0f7583c31dcf52069b4a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60b3985bf37827fd0b0f758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 16:18:39 2020 +0100 dbghelp: Use Windows API to map ELF files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 168 ++++++++++++++++++++++++------------------- dlls/dbghelp/image_private.h | 2 +- 2 files changed, 94 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a60b3985bf37827fd0b0…

1 0

Zebediah Figura : d3dcompiler: Separate out an hlsl_deref structure and store it in hlsl_ir_assignment directly.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 54387427b0aec5012aa0dae12a7c72f189d3c3a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54387427b0aec5012aa0dae1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 17:17:34 2020 -0600 d3dcompiler: Separate out an hlsl_deref structure and store it in hlsl_ir_assignment directly. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 25 +++++++++++++++---------- dlls/d3dcompiler_43/hlsl.y | 6 +++--- dlls/d3dcompiler_43/utils.c | 25 +++++++++++++++---------- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 04878c7046..830434c9ff 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -796,14 +796,6 @@ struct hlsl_ir_loop struct list *body; }; -struct hlsl_ir_assignment -{ - struct hlsl_ir_node node; - struct hlsl_ir_node *lhs; - struct hlsl_ir_node *rhs; - unsigned char writemask; -}; - enum hlsl_ir_expr_op { HLSL_IR_UNOP_BIT_NOT = 0, HLSL_IR_UNOP_LOGIC_NOT, @@ -907,9 +899,8 @@ enum hlsl_ir_deref_type HLSL_IR_DEREF_RECORD, }; -struct hlsl_ir_deref +struct hlsl_deref { - struct hlsl_ir_node node; enum hlsl_ir_deref_type type; union { @@ -927,6 +918,20 @@ struct hlsl_ir_deref } v; }; +struct hlsl_ir_deref +{ + struct hlsl_ir_node node; + struct hlsl_deref src; +}; + +struct hlsl_ir_assignment +{ + struct hlsl_ir_node node; + struct hlsl_deref lhs; + struct hlsl_ir_node *rhs; + unsigned char writemask; +}; + struct hlsl_ir_constant { struct hlsl_ir_node node; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 591f755a7b..a24d29e5df 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -2123,9 +2123,9 @@ postfix_expr: primary_expr free_instr_list($3); YYABORT; } - deref->type = HLSL_IR_DEREF_ARRAY; - deref->v.array.array = node_from_list($1); - deref->v.array.index = node_from_list($3); + deref->src.type = HLSL_IR_DEREF_ARRAY; + deref->src.v.array.array = node_from_list($1); + deref->src.v.array.index = node_from_list($3); $$ = append_binop($1, $3, &deref->node); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 9c38800808..29b35c3d7e 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1380,8 +1380,8 @@ struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) } deref->node.type = HLSL_IR_DEREF; deref->node.data_type = var->data_type; - deref->type = HLSL_IR_DEREF_VAR; - deref->v.var = var; + deref->src.type = HLSL_IR_DEREF_VAR; + deref->src.v.var = var; return deref; } @@ -1396,9 +1396,9 @@ struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_ } deref->node.type = HLSL_IR_DEREF; deref->node.data_type = field->type; - deref->type = HLSL_IR_DEREF_RECORD; - deref->v.record.record = record; - deref->v.record.field = field; + deref->src.type = HLSL_IR_DEREF_RECORD; + deref->src.v.record.record = record; + deref->src.v.record.field = field; return deref; } @@ -1547,13 +1547,13 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign rhs = implicit_conversion(rhs, type, &rhs->loc); - assign->lhs = lhs; + assign->lhs = deref_from_node(lhs)->src; if (assign_op != ASSIGN_OP_ASSIGN) { enum hlsl_ir_expr_op op = op_from_assignment(assign_op); struct hlsl_ir_node *expr; - if (deref_from_node(lhs)->type != HLSL_IR_DEREF_VAR) + if (assign->lhs.type != HLSL_IR_DEREF_VAR) { FIXME("LHS expression not supported in compound assignments yet.\n"); assign->rhs = rhs; @@ -1567,7 +1567,12 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign } } else + { + list_remove(&lhs->entry); + /* Don't recursively free the deref; we just copied its members. */ + d3dcompiler_free(lhs); assign->rhs = rhs; + } return &assign->node; } @@ -1860,7 +1865,7 @@ static void debug_dump_ir_var(const struct hlsl_ir_var *var) wine_dbg_printf(" : %s", debugstr_a(var->semantic)); } -static void debug_dump_ir_deref(const struct hlsl_ir_deref *deref) +static void debug_dump_deref(const struct hlsl_deref *deref) { switch (deref->type) { @@ -2048,7 +2053,7 @@ static const char *debug_writemask(DWORD writemask) static void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) { wine_dbg_printf("= ("); - debug_dump_src(assign->lhs); + debug_dump_deref(&assign->lhs); if (assign->writemask != BWRITERSP_WRITEMASK_ALL) wine_dbg_printf("%s", debug_writemask(assign->writemask)); wine_dbg_printf(" "); @@ -2129,7 +2134,7 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) debug_dump_ir_expr(expr_from_node(instr)); break; case HLSL_IR_DEREF: - debug_dump_ir_deref(deref_from_node(instr)); + debug_dump_deref(&deref_from_node(instr)->src); break; case HLSL_IR_CONSTANT: debug_dump_ir_constant(constant_from_node(instr));

1 0