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

Jacek Caban : wine/exception.h: Don't override __attribute__ keyword on clang MSVC target.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 59336f2ff2a36003e2b4bdc3dfe7e35ca012e7a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59336f2ff2a36003e2b4bdc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 01:18:50 2020 +0200 wine/exception.h: Don't override __attribute__ keyword on clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/exception.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 4bf4c7e6d9..a6ada7af21 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -70,7 +70,7 @@ extern "C" { * -- AJ */ -#ifndef __GNUC__ +#if !defined(__GNUC__) && !defined(__clang__) #define __attribute__(x) /* nothing */ #endif

1 0

Alexandre Julliard : ntdll: Avoid using wine_get_config_dir() from libwine.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: e5030a4ac0a303d6788ae79ffdcd88e66cf78bd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5030a4ac0a303d6788ae79f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:34:07 2020 +0200 ntdll: Avoid using wine_get_config_dir() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 7 +--- dlls/ntdll/env.c | 2 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/server.c | 101 +++++++++++++++++++++++++++++++++--------------- 4 files changed, 72 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b8cfe507ed..1adc0c9b0d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -106,7 +106,6 @@ #include "ntdll_misc.h" #include "wine/server.h" #include "wine/list.h" -#include "wine/library.h" #include "wine/debug.h" #include "wine/exception.h" @@ -564,7 +563,6 @@ unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ) RtlEnterCriticalSection( &dir_section ); if (now != last_update) { - const char *config_dir = wine_get_config_dir(); char *buffer, *p; struct stat st; unsigned int i; @@ -1261,7 +1259,7 @@ static DWORD WINAPI init_options( RTL_RUN_ONCE *once, void *param, void **contex NtClose( root ); /* a couple of directories that we don't want to return in directory searches */ - ignore_file( wine_get_config_dir() ); + ignore_file( config_dir ); ignore_file( "/dev" ); ignore_file( "/proc" ); #ifdef linux @@ -2219,7 +2217,6 @@ static unsigned int nb_redirects; static void init_redirects(void) { static const char windows_dir[] = "/dosdevices/c:/windows"; - const char *config_dir = wine_get_config_dir(); char *dir; struct stat st; @@ -2322,7 +2319,6 @@ void init_directories(void) */ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, ANSI_STRING *unix_name_ret ) { - const char *config_dir = wine_get_config_dir(); struct stat st; char *unix_name, *new_name, *dev; unsigned int i; @@ -2747,7 +2743,6 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 }; NTSTATUS status = STATUS_SUCCESS; - const char *config_dir = wine_get_config_dir(); const WCHAR *name, *p; struct stat st; char *unix_name; diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 6670786def..efb5270a2c 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -396,7 +396,7 @@ static void set_wow64_environment( WCHAR **env ) set_wine_path_variable( env, winedatadirW, wine_get_data_dir() ); set_wine_path_variable( env, winehomedirW, getenv("HOME") ); set_wine_path_variable( env, winebuilddirW, wine_get_build_dir() ); - set_wine_path_variable( env, wineconfigdirW, wine_get_config_dir() ); + set_wine_path_variable( env, wineconfigdirW, config_dir ); for (i = 0; (p = wine_dll_enum_load_path( i )); i++) { NTDLL_swprintf( buf, winedlldirW, i ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 7dca506aad..11ff0d7bb3 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -104,6 +104,7 @@ extern char **__wine_main_argv; extern WCHAR **__wine_main_wargv; /* server support */ +extern const char *config_dir DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c0dd0f35fc..4beee9e6e1 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -34,6 +34,9 @@ #ifdef HAVE_PTHREAD_NP_H # include <pthread_np.h> #endif +#ifdef HAVE_PWD_H +# include <pwd.h> +#endif #include <signal.h> #include <stdarg.h> #include <stdio.h> @@ -110,6 +113,8 @@ static const enum cpu_type client_cpu = CPU_ARM64; #error Unsupported CPU #endif +const char *config_dir = NULL; + unsigned int server_cpus = 0; BOOL is_wow64 = FALSE; @@ -171,6 +176,17 @@ static void fatal_perror( const char *err, ... ) exit(1); } +/* build a path from the specified dir and name */ +static char *build_path( const char *dir, const char *name ) +{ + size_t len = strlen( dir ); + char *ret = malloc( len + strlen( name ) + 2 ); + + memcpy( ret, dir, len ); + if (len && ret[len - 1] != '/') ret[len++] = '/'; + strcpy( ret + len, name ); + return ret; +} /*********************************************************************** * server_protocol_error @@ -1199,6 +1215,37 @@ static void start_server(void) } +/*********************************************************************** + * init_config_dir + */ +static const char *init_config_dir(void) +{ + char *p, *dir; + const char *prefix = getenv( "WINEPREFIX" ); + + if (prefix) + { + if (prefix[0] != '/') + fatal_error( "invalid directory %s in WINEPREFIX: not an absolute path\n", prefix ); + dir = strdup( prefix ); + for (p = dir + strlen(dir) - 1; p > dir && *p == '/'; p--) *p = 0; + } + else + { + const char *home = getenv( "HOME" ); + if (!home) + { + struct passwd *pwd = getpwuid( getuid() ); + if (pwd) home = pwd->pw_dir; + } + if (!home) fatal_error( "could not determine your home directory\n" ); + if (home[0] != '/') fatal_error( "your home directory %s is not an absolute path\n", home ); + dir = build_path( home, ".wine" ); + } + return dir; +} + + /*********************************************************************** * setup_config_dir * @@ -1206,46 +1253,38 @@ static void start_server(void) */ static int setup_config_dir(void) { - const char *p, *config_dir = wine_get_config_dir(); + char *p; + struct stat st; int fd_cwd = open( ".", O_RDONLY ); if (chdir( config_dir ) == -1) { - if (errno != ENOENT) fatal_perror( "chdir to %s", config_dir ); - + if (errno != ENOENT) fatal_perror( "cannot use directory %s", config_dir ); if ((p = strrchr( config_dir, '/' )) && p != config_dir) { - struct stat st; - char *tmp_dir; - - if (!(tmp_dir = malloc( p + 1 - config_dir ))) fatal_error( "out of memory\n" ); - memcpy( tmp_dir, config_dir, p - config_dir ); - tmp_dir[p - config_dir] = 0; - if (!stat( tmp_dir, &st ) && st.st_uid != getuid()) + while (p > config_dir + 1 && p[-1] == '/') p--; + *p = 0; + if (!stat( config_dir, &st ) && st.st_uid != getuid()) fatal_error( "'%s' is not owned by you, refusing to create a configuration directory there\n", - tmp_dir ); - free( tmp_dir ); + config_dir ); + *p = '/'; } - mkdir( config_dir, 0777 ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); - MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } - if (mkdir( "dosdevices", 0777 ) == -1) + if (stat( ".", &st ) == -1) fatal_perror( "stat %s", config_dir ); + if (st.st_uid != getuid()) fatal_error( "'%s' is not owned by you\n", config_dir ); + + if (!mkdir( "dosdevices", 0777 )) { - if (errno == EEXIST) goto done; - fatal_perror( "cannot create %s/dosdevices", config_dir ); + mkdir( "drive_c", 0777 ); + symlink( "../drive_c", "dosdevices/c:" ); + symlink( "/", "dosdevices/z:" ); } + else if (errno != EEXIST) fatal_perror( "cannot create %s/dosdevices", config_dir ); - /* create the drive symlinks */ - - mkdir( "drive_c", 0777 ); - symlink( "../drive_c", "dosdevices/c:" ); - symlink( "/", "dosdevices/z:" ); - -done: if (fd_cwd == -1) fd_cwd = open( "dosdevices/c:", O_RDONLY ); fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); return fd_cwd; @@ -1452,6 +1491,8 @@ void server_init_process(void) obj_handle_t version; const char *env_socket = getenv( "WINESERVERSOCKET" ); + config_dir = init_config_dir(); + server_pid = -1; if (env_socket) { @@ -1610,19 +1651,15 @@ size_t server_init_thread( void *entry_point, BOOL *suspend ) if (arch) { if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64)) - fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", - wine_get_config_dir() ); + fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", config_dir ); if (!strcmp( arch, "win64" ) && !is_win64 && !is_wow64) - fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", - wine_get_config_dir() ); + fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", config_dir ); } return info_size; case STATUS_INVALID_IMAGE_WIN_64: - fatal_error( "'%s' is a 32-bit installation, it cannot support 64-bit applications.\n", - wine_get_config_dir() ); + fatal_error( "'%s' is a 32-bit installation, it cannot support 64-bit applications.\n", config_dir ); case STATUS_NOT_SUPPORTED: - fatal_error( "'%s' is a 64-bit installation, it cannot be used with a 32-bit wineserver.\n", - wine_get_config_dir() ); + fatal_error( "'%s' is a 64-bit installation, it cannot be used with a 32-bit wineserver.\n", config_dir ); case STATUS_INVALID_IMAGE_FORMAT: fatal_error( "wineserver doesn't support the %s architecture\n", cpu_names[client_cpu] ); default:

1 0

Zebediah Figura : qasf/tests: Remove some no longer necessary callbacks.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 9ec02ddeb435553c653d751474ee975fd21f7275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec02ddeb435553c653d7514… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:17 2020 -0500 qasf/tests: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index a456891a38..72c05ee49c 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1153,11 +1153,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *input, IMemAllocator **allocator) { @@ -1166,8 +1161,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, };

1 0

Nikolay Sivov : mfplat/tests: Use file scheme handler CLSID from mfuuid.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: a1fca9272004276f25d8c2e3dcaba7097999693f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1fca9272004276f25d8c2e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 10:44:39 2020 +0300 mfplat/tests: Use file scheme handler CLSID from mfuuid. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 007db891c1..e623b4c0ed 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -49,7 +49,8 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); -DEFINE_GUID(CLSID_FileSchemeHandler, 0x477ec299, 0x1421, 0x4bdd, 0x97, 0x1f, 0x7c, 0xcb, 0x93, 0x3f, 0x21, 0xad); + +extern const CLSID CLSID_FileSchemePlugin; DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC1, MAKEFOURCC('I','M','C','1')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC2, MAKEFOURCC('I','M','C','2')); @@ -634,7 +635,7 @@ skip_source_tests: ok(SUCCEEDED(hr), "Failed to initialize, hr %#x.\n", hr); do_uninit = hr == S_OK; - hr = CoCreateInstance(&CLSID_FileSchemeHandler, NULL, CLSCTX_INPROC_SERVER, &IID_IMFSchemeHandler, + hr = CoCreateInstance(&CLSID_FileSchemePlugin, NULL, CLSCTX_INPROC_SERVER, &IID_IMFSchemeHandler, (void **)&scheme_handler); ok(hr == S_OK, "Failed to create handler object, hr %#x.\n", hr);

1 0

Zebediah Figura : amstream/tests: Remove some no longer necessary callbacks.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: dab1b7e7589ceb0726932c80acabad86ab9938b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dab1b7e7589ceb0726932c80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:15 2020 -0500 amstream/tests: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 4b7320500c..073e372c94 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2394,11 +2394,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_cleanup_stream = testfilter_cleanup_stream, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *requested) { @@ -2418,8 +2413,6 @@ static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = testsource_DecideBufferSize, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator,

1 0

Zebediah Figura : winegstreamer: Remove some no longer necessary callbacks.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 1a4e9a84c252f754f3577e6f56f6831fb03d5aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4e9a84c252f754f3577e6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:18 2020 -0500 winegstreamer: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2186192b59..7038cef9b3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1568,7 +1568,6 @@ static void gstdemux_sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2298,7 +2297,6 @@ static HRESULT wave_parser_sink_query_accept(struct strmbase_pin *iface, const A static const struct strmbase_sink_ops wave_parser_sink_ops = { .base.pin_query_accept = wave_parser_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2415,7 +2413,6 @@ static HRESULT avi_splitter_sink_query_accept(struct strmbase_pin *iface, const static const struct strmbase_sink_ops avi_splitter_sink_ops = { .base.pin_query_accept = avi_splitter_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2536,7 +2533,6 @@ static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const static const struct strmbase_sink_ops mpeg_splitter_sink_ops = { .base.pin_query_accept = mpeg_splitter_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, };

1 0

Zebediah Figura : quartz/tests: Remove some no longer necessary callbacks.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 7de86140f1888cc87459c1b48e911671051ab46f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de86140f1888cc87459c1b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:19 2020 -0500 quartz/tests: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 7 ------- dlls/quartz/tests/avisplit.c | 7 ------- dlls/quartz/tests/filesource.c | 6 ------ dlls/quartz/tests/mpegsplit.c | 7 ------- dlls/quartz/tests/videorenderer.c | 7 ------- dlls/quartz/tests/vmr7.c | 7 ------- dlls/quartz/tests/vmr9.c | 7 ------- 7 files changed, 48 deletions(-) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 7b38561c01..0e1e92a950 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -769,11 +769,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -782,8 +777,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 319c7a5ccd..a277256255 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -836,11 +836,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { struct testfilter *filter = impl_from_strmbase_filter(iface->filter); @@ -877,8 +872,6 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface static const struct strmbase_source_ops testsource_ops = { .base.pin_query_interface = testsource_query_interface, - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = testsource_AttemptConnection, }; diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 2040910516..b50b06dc10 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -1240,11 +1240,6 @@ static const struct strmbase_filter_ops testsink_ops = .filter_destroy = testsink_destroy, }; -static HRESULT testsink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { struct testsink *filter = impl_sink_from_strmbase_filter(iface->filter); @@ -1274,7 +1269,6 @@ static void testsink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops testsink_pin_ops = { - .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, .sink_connect = testsink_connect, .sink_disconnect = testsink_disconnect, diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c8b368e4b6..9bfd7e3bb1 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1126,11 +1126,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { struct testfilter *filter = impl_from_strmbase_filter(iface->filter); @@ -1167,8 +1162,6 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface static const struct strmbase_source_ops testsource_ops = { .base.pin_query_interface = testsource_query_interface, - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = testsource_AttemptConnection, }; diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 356cfe96e4..3722a6f9dd 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -517,11 +517,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -530,8 +525,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 19a89de573..f4b26db554 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -867,11 +867,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -880,8 +875,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3e9fccedf1..35776e85ff 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -876,11 +876,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -889,8 +884,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, };

1 0

Jacek Caban : math.h: Use builtin nan and inf on clang MSVC target.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 8941d8e0363167b0eb555b215d8b96e4a1add98f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8941d8e0363167b0eb555b21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 01:19:28 2020 +0200 math.h: Use builtin nan and inf on clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 76601de853..01c4a4b61b 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -205,7 +205,7 @@ static const union { # endif #endif -#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) +#if (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))) || defined(__clang__) # define INFINITY __builtin_inff() # define NAN __builtin_nanf("") #else

1 0

Zebediah Figura : sechost: New stub DLL.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: dedd5ccc88547529ffb1101045602aed59fa0170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dedd5ccc88547529ffb11010… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 25 15:40:23 2020 -0500 sechost: New stub DLL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/sechost/Makefile.in | 3 + dlls/sechost/sechost.spec | 208 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 215 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dedd5ccc88547529ffb1…

1 0

Jacek Caban : include: Improve _CrtDbgBreak macro.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: b00a6e6e304f9535f4c88cd23b627d2108cd7cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00a6e6e304f9535f4c88cd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 04:25:22 2020 +0200 include: Improve _CrtDbgBreak macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdbg.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/crtdbg.h b/include/msvcrt/crtdbg.h index 2a75dfd57e..6a7dab0185 100644 --- a/include/msvcrt/crtdbg.h +++ b/include/msvcrt/crtdbg.h @@ -70,7 +70,9 @@ typedef struct _CrtMemState #include <assert.h> #define _ASSERT(expr) assert(expr) #define _ASSERTE(expr) assert(expr) -#if defined(__GNUC__) && defined(__i386__) +#if defined(_MSC_VER) +#define _CrtDbgBreak() __debugbreak() +#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) #define _CrtDbgBreak() __asm__ ("\tint $0x3\n") #else #define _CrtDbgBreak() ((void)0)

1 0