February 2020 - Wine-commits

Jacek Caban : include: Move NULL define to corecrt.h.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: d840af4b872cf3ed10b122902a68ba1756be8e25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d840af4b872cf3ed10b12290… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 15:40:50 2020 +0100 include: Move NULL define to corecrt.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 8 ++++++++ include/msvcrt/stddef.h | 8 -------- include/msvcrt/stdio.h | 8 -------- include/msvcrt/stdlib.h | 8 -------- include/msvcrt/string.h | 8 -------- include/msvcrt/time.h | 8 -------- include/msvcrt/wchar.h | 8 -------- 7 files changed, 8 insertions(+), 48 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 38acf8512e..cff4549d37 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -41,6 +41,14 @@ # endif #endif +#ifndef NULL +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((void *)0) +#endif +#endif + #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index 052132ed71..12025d53dc 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -20,14 +20,6 @@ #include <corecrt.h> -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifdef __GNUC__ #define offsetof(s,m) __builtin_offsetof(s,m) #elif defined(_WIN64) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index ecaa7fe611..8a31835bea 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -19,14 +19,6 @@ #define _IOSTRG 0x0040 #define _IORW 0x0080 -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 91fcc2a672..78fc5fba75 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -12,14 +12,6 @@ #include <pshpack8.h> -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void*)0) -#endif -#endif - typedef struct { float f; diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 96421cb491..f8bc40fb2a 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -15,14 +15,6 @@ #define _NLSCMP_DEFINED #endif -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index d55e8bbf81..9ed27f5f9e 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -29,14 +29,6 @@ typedef __msvcrt_long clock_t; #define _CLOCK_T_DEFINED #endif -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifndef CLOCKS_PER_SEC #define CLOCKS_PER_SEC 1000 #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 1fcbaa9399..119f8a2a41 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -17,14 +17,6 @@ extern "C" { #endif -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - #ifndef WCHAR_MIN /* also in stdint.h */ #define WCHAR_MIN 0U #define WCHAR_MAX 0xffffU

1 0

Jacek Caban : ucrtbase: Use public headers for _vsnprintf implementation.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 18545725b1156745a98a9af31a1a485452211ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18545725b1156745a98a9af3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 15:40:59 2020 +0100 ucrtbase: Use public headers for _vsnprintf implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/printf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ucrtbase/printf.c b/dlls/ucrtbase/printf.c index 099026950f..6a1e5fdea7 100644 --- a/dlls/ucrtbase/printf.c +++ b/dlls/ucrtbase/printf.c @@ -21,15 +21,14 @@ #pragma makedep implib #endif -#define _CRTIMP #include <stdarg.h> -#include "msvcrt.h" +#include <corecrt_stdio_config.h> -int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, MSVCRT_size_t len, - const char *format, MSVCRT__locale_t locale, __ms_va_list valist); +int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, + const char *format, _locale_t locale, __ms_va_list valist); -int __cdecl _vsnprintf( char *buf, MSVCRT_size_t size, const char *fmt, __ms_va_list args ) +int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) { - return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + return __stdio_common_vsprintf( _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buf, size, fmt, NULL, args ); }

1 0

Matteo Bruni : d3dcompiler: Free variable definitions data on allocation errors.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 4e8ec8a6e0ffc55bf636840f5a37b0717b014d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e8ec8a6e0ffc55bf636840f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 19:31:03 2020 +0100 d3dcompiler: Free variable definitions data on allocation errors. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 52b2b6310b..b6478bf3fe 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -530,6 +530,15 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, d3dcompiler_free(initializer->args); } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + d3dcompiler_free(v->name); + d3dcompiler_free((void *)v->semantic); + d3dcompiler_free(v->reg_reservation); + d3dcompiler_free(v); +} + static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { struct hlsl_type *type; @@ -543,7 +552,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, { ERR("Out of memory.\n"); LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) - d3dcompiler_free(v); + free_parse_variable_def(v); d3dcompiler_free(var_list); return NULL; } @@ -558,7 +567,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, if (!var) { ERR("Out of memory.\n"); - d3dcompiler_free(v); + free_parse_variable_def(v); continue; } if (v->array_size)

1 0

Matteo Bruni : d3dcompiler/tests: Make test_reflection_constant_buffer() work on d3d10.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: d4682017d60d2ca13282cc5aae33f54ed224781a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4682017d60d2ca13282cc5a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 19:31:04 2020 +0100 d3dcompiler/tests: Make test_reflection_constant_buffer() work on d3d10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 147 +++++++++++++++++++++++++++++---- 1 file changed, 131 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4682017d60d2ca13282…

1 0

Alexandre Julliard : Release 5.2.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 85bd94f8705115ac0c35eac6ff7e2f3e59be924e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85bd94f8705115ac0c35eac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 16 22:21:52 2020 +0100 Release 5.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 1007 ++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 5 files changed, 550 insertions(+), 480 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85bd94f8705115ac0c35…

1 0

Tag wine-5.2 : Alexandre Julliard : Release 5.2
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: refs/tags/wine-5.2 Tag: 77e6a3fd8aeda295b44bc3b86a6ec493bdd36a11 URL: https://source.winehq.org/git/wine.git/?a=tag;h=77e6a3fd8aeda295b44bc3b86a6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 16 22:21:52 2020 +0100 Release 5.2

1 0

Nikolay Sivov : rtworkq: Initialize MTA on startup.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 4c4c893c3025f8760a0a69ff4beea8c7d41ecec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4c893c3025f8760a0a69ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 13:01:09 2020 +0300 rtworkq: Initialize MTA on startup. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/rtworkq/Makefile.in | 1 + dlls/rtworkq/queue.c | 9 ++++ dlls/rtworkq/tests/Makefile.in | 5 ++ dlls/rtworkq/tests/rtworkq.c | 107 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 124 insertions(+) diff --git a/configure b/configure index cb85fb8b8f..1d20d141c1 100755 --- a/configure +++ b/configure @@ -20864,6 +20864,7 @@ wine_fn_config_makefile dlls/rsaenh/tests enable_tests wine_fn_config_makefile dlls/rstrtmgr enable_rstrtmgr wine_fn_config_makefile dlls/rtutils enable_rtutils wine_fn_config_makefile dlls/rtworkq enable_rtworkq +wine_fn_config_makefile dlls/rtworkq/tests enable_tests wine_fn_config_makefile dlls/samlib enable_samlib wine_fn_config_makefile dlls/sane.ds enable_sane_ds wine_fn_config_makefile dlls/sapi enable_sapi diff --git a/configure.ac b/configure.ac index b3389b796b..2e102990b5 100644 --- a/configure.ac +++ b/configure.ac @@ -3609,6 +3609,7 @@ WINE_CONFIG_MAKEFILE(dlls/rsaenh/tests) WINE_CONFIG_MAKEFILE(dlls/rstrtmgr) WINE_CONFIG_MAKEFILE(dlls/rtutils) WINE_CONFIG_MAKEFILE(dlls/rtworkq) +WINE_CONFIG_MAKEFILE(dlls/rtworkq/tests) WINE_CONFIG_MAKEFILE(dlls/samlib) WINE_CONFIG_MAKEFILE(dlls/sane.ds) WINE_CONFIG_MAKEFILE(dlls/sapi) diff --git a/dlls/rtworkq/Makefile.in b/dlls/rtworkq/Makefile.in index a224198986..345fad1c1e 100644 --- a/dlls/rtworkq/Makefile.in +++ b/dlls/rtworkq/Makefile.in @@ -1,5 +1,6 @@ MODULE = rtworkq.dll IMPORTLIB = rtworkq +IMPORTS = ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 65007602c7..70af6a7658 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -69,6 +69,7 @@ static CRITICAL_SECTION_DEBUG queues_critsect_debug = static CRITICAL_SECTION queues_section = { &queues_critsect_debug, -1, 0, 0, 0, 0 }; static LONG platform_lock; +static CO_MTA_USAGE_COOKIE mta_cookie; static struct queue_handle *get_queue_obj(DWORD handle) { @@ -1117,6 +1118,7 @@ HRESULT WINAPI RtwqUnlockPlatform(void) static void init_system_queues(void) { struct queue_desc desc; + HRESULT hr; /* Always initialize standard queue, keep the rest lazy. */ @@ -1128,6 +1130,9 @@ static void init_system_queues(void) return; } + if (FAILED(hr = CoIncrementMTAUsage(&mta_cookie))) + WARN("Failed to initialize MTA, hr %#x.\n", hr); + desc.queue_type = RTWQ_STANDARD_WORKQUEUE; desc.ops = &pool_queue_ops; desc.target_queue = 0; @@ -1149,6 +1154,7 @@ HRESULT WINAPI RtwqStartup(void) static void shutdown_system_queues(void) { unsigned int i; + HRESULT hr; EnterCriticalSection(&queues_section); @@ -1157,6 +1163,9 @@ static void shutdown_system_queues(void) shutdown_queue(&system_queues[i]); } + if (FAILED(hr = CoDecrementMTAUsage(mta_cookie))) + WARN("Failed to uninitialize MTA, hr %#x.\n", hr); + LeaveCriticalSection(&queues_section); } diff --git a/dlls/rtworkq/tests/Makefile.in b/dlls/rtworkq/tests/Makefile.in new file mode 100644 index 0000000000..8354cd810d --- /dev/null +++ b/dlls/rtworkq/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = rtworkq.dll +IMPORTS = rtworkq ole32 + +C_SRCS = \ + rtworkq.c diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c new file mode 100644 index 0000000000..627e024d76 --- /dev/null +++ b/dlls/rtworkq/tests/rtworkq.c @@ -0,0 +1,107 @@ +/* + * Copyright 2020 Nikolay Sivov 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 + */ + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "rtworkq.h" + +#include "wine/test.h" + +static void test_platform_init(void) +{ + APTTYPEQUALIFIER qualifier; + APTTYPE apttype; + HRESULT hr; + + /* Startup initializes MTA. */ + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = RtwqStartup(); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = RtwqShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + /* Try with STA initialized before startup. */ + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = RtwqStartup(); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = RtwqShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + CoUninitialize(); + + /* Startup -> init main STA -> uninitialize -> shutdown */ + hr = RtwqStartup(); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + CoUninitialize(); + + hr = CoGetApartmentType(&apttype, &qualifier); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); + + hr = RtwqShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + +START_TEST(rtworkq) +{ + test_platform_init(); +}

1 0

Nikolay Sivov : mfplat/tests: Add some tests for COM initialization in work queues threads.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: dcae1afa0529285e9a3768cbb4d4874923d122af URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcae1afa0529285e9a3768cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 13:01:10 2020 +0300 mfplat/tests: Add some tests for COM initialization in work queues threads. Based on patch by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 158 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 66524f1b48..ec84c6c261 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -63,6 +63,8 @@ static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TY const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); +static HRESULT (WINAPI *pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); + static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); @@ -86,6 +88,7 @@ static HRESULT (WINAPI *pMFTRegisterLocalByCLSID)(REFCLSID clsid, REFGUID catego const MFT_REGISTER_TYPE_INFO *output_types); static HRESULT (WINAPI *pMFTUnregisterLocal)(IClassFactory *factory); static HRESULT (WINAPI *pMFTUnregisterLocalByCLSID)(CLSID clsid); +static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; static const WCHAR fileschemeW[] = {'f','i','l','e',':','/','/',0}; @@ -122,6 +125,7 @@ struct test_callback { IMFAsyncCallback IMFAsyncCallback_iface; HANDLE event; + DWORD param; }; static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -651,6 +655,7 @@ static void init_functions(void) #define X(f) p##f = (void*)GetProcAddress(mod, #f) X(MFAddPeriodicCallback); X(MFAllocateSerialWorkQueue); + X(MFAllocateWorkQueueEx); X(MFCopyImage); X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); @@ -666,13 +671,17 @@ static void init_functions(void) X(MFTRegisterLocalByCLSID); X(MFTUnregisterLocal); X(MFTUnregisterLocalByCLSID); -#undef X if ((mod = LoadLibraryA("d3d11.dll"))) { - pD3D11CreateDevice = (void *)GetProcAddress(mod, "D3D11CreateDevice"); + X(D3D11CreateDevice); } + mod = GetModuleHandleA("ole32.dll"); + + X(CoGetApartmentType); +#undef X + is_win8_plus = pMFPutWaitingWorkItem != NULL; } @@ -4079,12 +4088,154 @@ static void test_MFTRegisterLocal(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); } +static void test_queue_com(void) +{ + static int system_queues[] = + { + MFASYNC_CALLBACK_QUEUE_STANDARD, + MFASYNC_CALLBACK_QUEUE_RT, + MFASYNC_CALLBACK_QUEUE_IO, + MFASYNC_CALLBACK_QUEUE_TIMER, + MFASYNC_CALLBACK_QUEUE_MULTITHREADED, + MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION, + }; + + static int user_queues[] = + { + MF_STANDARD_WORKQUEUE, + MF_WINDOW_WORKQUEUE, + MF_MULTITHREADED_WORKQUEUE, + }; + + char path_name[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char **argv; + int i; + + if (!pCoGetApartmentType) + { + win_skip("CoGetApartmentType() is not available.\n"); + return; + } + + winetest_get_mainargs(&argv); + + for (i = 0; i < ARRAY_SIZE(system_queues); ++i) + { + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s mfplat s%d", argv[0], system_queues[i]); + ok(CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n" ); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } + + for (i = 0; i < ARRAY_SIZE(user_queues); ++i) + { + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s mfplat u%d", argv[0], user_queues[i]); + ok(CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n" ); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } +} + +static HRESULT WINAPI test_queue_com_state_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + APTTYPEQUALIFIER qualifier; + APTTYPE com_type; + HRESULT hr; + + hr = pCoGetApartmentType(&com_type, &qualifier); + ok(SUCCEEDED(hr), "Failed to get apartment type, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + todo_wine { + if (callback->param == MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION) + ok(com_type == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, + "%#x: unexpected type %u, qualifier %u.\n", callback->param, com_type, qualifier); + else + ok(com_type == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_NONE, + "%#x: unexpected type %u, qualifier %u.\n", callback->param, com_type, qualifier); + } + } + + SetEvent(callback->event); + return S_OK; +} + +static const IMFAsyncCallbackVtbl test_queue_com_state_callback_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + test_queue_com_state_callback_Invoke, +}; + +static void test_queue_com_state(const char *name) +{ + struct test_callback callback = { { &test_queue_com_state_callback_vtbl } }; + DWORD queue, queue_type; + HRESULT hr; + + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + if (name[0] == 's') + { + callback.param = name[1] - '0'; + hr = MFPutWorkItem(callback.param, &callback.IMFAsyncCallback_iface, NULL); + ok(SUCCEEDED(hr), "Failed to queue work item, hr %#x.\n", hr); + WaitForSingleObject(callback.event, INFINITE); + } + else if (name[0] == 'u') + { + queue_type = name[1] - '0'; + + hr = pMFAllocateWorkQueueEx(queue_type, &queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + + callback.param = queue; + hr = MFPutWorkItem(queue, &callback.IMFAsyncCallback_iface, NULL); + ok(SUCCEEDED(hr), "Failed to queue work item, hr %#x.\n", hr); + WaitForSingleObject(callback.event, INFINITE); + + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + } + + CloseHandle(callback.event); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { - CoInitialize(NULL); + char **argv; + int argc; init_functions(); + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + test_queue_com_state(argv[2]); + return; + } + + CoInitialize(NULL); + test_startup(); test_register(); test_media_type(); @@ -4119,6 +4270,7 @@ START_TEST(mfplat) test_dxgi_device_manager(); test_MFCreateTransformActivate(); test_MFTRegisterLocal(); + test_queue_com(); CoUninitialize(); }

1 0

Jacek Caban : user32: Initialize module handle to NULL for null driver.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: be6e6fb23c2ca48def5e0c6916f4eeae097916e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6e6fb23c2ca48def5e0c69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 12:04:26 2020 +0100 user32: Initialize module handle to NULL for null driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 07be6a9a4a..8f3e1b3597 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -77,7 +77,8 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) { - ret = !strcmpW( path, nullW ) || (*module = LoadLibraryW( path )); + if ((ret = !strcmpW( path, nullW ))) *module = NULL; + else ret = (*module = LoadLibraryW( path )) != NULL; if (!ret) ERR( "failed to load %s\n", debugstr_w(path) ); TRACE( "%s %p\n", debugstr_w(path), *module ); }

1 0

Nikolay Sivov : wincodecs: Return WINCODEC_ERR_PALETTEUNAVAILABLE for jpeg decoder frame.
by Alexandre Julliard 16 Feb '20

16 Feb '20

Module: wine Branch: master Commit: 5f6851fb291d08471a8473fd3efe813b8ee11ebf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f6851fb291d08471a8473fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 16:20:47 2020 +0300 wincodecs: Return WINCODEC_ERR_PALETTEUNAVAILABLE for jpeg decoder frame. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 5 +++-- dlls/windowscodecs/tests/jpegformat.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 1df898f28c..0ecbbf48fc 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -635,8 +635,9 @@ static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifa static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pIPalette); + + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c index c1e46c4869..341e42c28c 100644 --- a/dlls/windowscodecs/tests/jpegformat.c +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -47,6 +47,8 @@ static void test_decode_adobe_cmyk(void) { IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *framedecode; + IWICImagingFactory *factory; + IWICPalette *palette; HRESULT hr; HGLOBAL hjpegdata; char *jpegdata; @@ -77,6 +79,10 @@ static void test_decode_adobe_cmyk(void) ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); if (FAILED(hr)) return; + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); ok(hjpegdata != 0, "GlobalAlloc failed\n"); if (hjpegdata) @@ -125,13 +131,27 @@ static void test_decode_adobe_cmyk(void) broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ "unexpected image data\n"); } + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(framedecode); } IStream_Release(jpegstream); } GlobalFree(hjpegdata); } + IWICBitmapDecoder_Release(decoder); + IWICImagingFactory_Release(factory); }

1 0