May 2020 - Wine-commits - list.winehq.org

Zhiyi Zhang : shlwapi/tests: Test NULL UrlCanonicalizeA/W() parameters.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: c169263b0bb6c2ebea84ac2b3bac122948a81c71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c169263b0bb6c2ebea84ac2b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 18 09:52:13 2020 +0800 shlwapi/tests: Test NULL UrlCanonicalizeA/W() parameters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index d30737f60a..2e1df63201 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1052,6 +1052,22 @@ static void test_UrlCanonicalizeA(void) urllen = lstrlenA(winehqA); + /* Parameter checks */ + dwSize = ARRAY_SIZE(szReturnUrl); + hr = pUrlCanonicalizeA(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + dwSize = ARRAY_SIZE(szReturnUrl); + hr = pUrlCanonicalizeA(winehqA, NULL, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, NULL, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + dwSize = 0; + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* buffer has no space for the result */ dwSize=urllen-1; memset(szReturnUrl, '#', urllen+4); @@ -1137,6 +1153,22 @@ static void test_UrlCanonicalizeW(void) } urllen = lstrlenW(winehqW); + /* Parameter checks */ + dwSize = ARRAY_SIZE(szReturnUrl); + hr = pUrlCanonicalizeW(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + dwSize = ARRAY_SIZE(szReturnUrl); + hr = pUrlCanonicalizeW(winehqW, NULL, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = pUrlCanonicalizeW(winehqW, szReturnUrl, NULL, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + dwSize = 0; + hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* buffer has no space for the result */ dwSize = (urllen-1); memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR));

1 0

Zebediah Figura : shell32/tests: Add more tests for IShellWindows.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 58e5525adeb901b6f536a1b857f75b977a9d2844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58e5525adeb901b6f536a1b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 23:29:40 2020 -0500 shell32/tests: Add more tests for IShellWindows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index e9948ae630..c1e3fbcdaf 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1018,6 +1018,7 @@ static void test_ShellWindows(void) { IShellWindows *shellwindows; LONG cookie, cookie2, ret; + ITEMIDLIST *pidl; IDispatch *disp; VARIANT v, v2; HRESULT hr; @@ -1061,9 +1062,35 @@ todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(cookie2 != 0 && cookie2 != cookie, "got %d\n", cookie2); } + + pidl = ILCreateFromPathA("C:\\"); + V_VT(&v) = VT_ARRAY | VT_UI1; + V_ARRAY(&v) = SafeArrayCreateVector(VT_UI1, 0, ILGetSize(pidl)); + memcpy(V_ARRAY(&v)->pvData, pidl, ILGetSize(pidl)); + + VariantInit(&v2); + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!ret, "Got window %#x.\n", ret); + ok(!disp, "Got IDispatch %p.\n", &disp); + + hr = IShellWindows_OnNavigate(shellwindows, cookie, &v); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(ret == (LONG)(LONG_PTR)hwnd, "Expected %p, got %#x.\n", hwnd, ret); + ok(!disp, "Got IDispatch %p.\n", &disp); + hr = IShellWindows_Revoke(shellwindows, cookie); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!ret, "Got window %#x.\n", ret); + ok(!disp, "Got IDispatch %p.\n", &disp); + hr = IShellWindows_Revoke(shellwindows, cookie2); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : ntdll: Move the mmap reserved area functions to the Unix library.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 625209433fa82e233a828329e9e109602f9c0ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=625209433fa82e233a828329… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:04:47 2020 +0200 ntdll: Move the mmap reserved area functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 12 +++++++---- dlls/ntdll/unix/unix_private.h | 6 ++++++ dlls/ntdll/unix/virtual.c | 42 ++++++++++++++++++++++++++++++++---- dlls/ntdll/unixlib.h | 10 +++++++-- dlls/ntdll/virtual.c | 48 +++++++++++++++++++++--------------------- 5 files changed, 84 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=625209433fa82e233a82…

1 0

Alexandre Julliard : ntdll: Store reserved areas in the Unix library.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: aaa654abd678ce06ce34ca260425d0b79e223b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaa654abd678ce06ce34ca26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:05:02 2020 +0200 ntdll: Store reserved areas in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 8 +++ dlls/ntdll/unix/virtual.c | 160 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 151 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0591c77434..c974f526a1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -528,6 +528,13 @@ void __wine_main( int argc, char *argv[], char *envp[] ) __wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); } + +static int add_area( void *base, size_t size, void *arg ) +{ + mmap_add_reserved_area( base, size ); + return 0; +} + /*********************************************************************** * __wine_init_unix_lib * @@ -540,6 +547,7 @@ NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void map_so_dll( nt, module ); fixup_ntdll_imports( &__wine_spec_nt_header, module ); *(struct unix_funcs **)ptr_out = &unix_funcs; + wine_mmap_enum_reserved_areas( add_area, NULL, 0 ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 972cbfdca8..88cd1eb1cf 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -45,7 +45,7 @@ #include "winnt.h" #include "winternl.h" #include "unix_private.h" -#include "wine/library.h" +#include "wine/list.h" struct preload_info { @@ -53,6 +53,15 @@ struct preload_info size_t size; }; +struct reserved_area +{ + struct list entry; + void *base; + size_t size; +}; + +static struct list reserved_areas = LIST_INIT(reserved_areas); + static const unsigned int granularity_mask = 0xffff; /* reserved areas have 64k granularity */ extern IMAGE_NT_HEADERS __wine_spec_nt_header; @@ -202,36 +211,153 @@ static void mmap_init( const struct preload_info *preload_info ) void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) { - wine_mmap_add_reserved_area( addr, size ); + struct reserved_area *area; + struct list *ptr; + + if (!((char *)addr + size)) size--; /* avoid wrap-around */ + + LIST_FOR_EACH( ptr, &reserved_areas ) + { + area = LIST_ENTRY( ptr, struct reserved_area, entry ); + if (area->base > addr) + { + /* try to merge with the next one */ + if ((char *)addr + size == (char *)area->base) + { + area->base = addr; + area->size += size; + return; + } + break; + } + else if ((char *)area->base + area->size == (char *)addr) + { + /* merge with the previous one */ + area->size += size; + + /* try to merge with the next one too */ + if ((ptr = list_next( &reserved_areas, ptr ))) + { + struct reserved_area *next = LIST_ENTRY( ptr, struct reserved_area, entry ); + if ((char *)addr + size == (char *)next->base) + { + area->size += next->size; + list_remove( &next->entry ); + free( next ); + } + } + return; + } + } + + if ((area = malloc( sizeof(*area) ))) + { + area->base = addr; + area->size = size; + list_add_before( ptr, &area->entry ); + } } void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) { - wine_mmap_remove_reserved_area( addr, size, 0 ); -} + struct reserved_area *area; + struct list *ptr; -int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) -{ - return wine_mmap_is_in_reserved_area( addr, size ); + if (!((char *)addr + size)) size--; /* avoid wrap-around */ + + ptr = list_head( &reserved_areas ); + /* find the first area covering address */ + while (ptr) + { + area = LIST_ENTRY( ptr, struct reserved_area, entry ); + if ((char *)area->base >= (char *)addr + size) break; /* outside the range */ + if ((char *)area->base + area->size > (char *)addr) /* overlaps range */ + { + if (area->base >= addr) + { + if ((char *)area->base + area->size > (char *)addr + size) + { + /* range overlaps beginning of area only -> shrink area */ + area->size -= (char *)addr + size - (char *)area->base; + area->base = (char *)addr + size; + break; + } + else + { + /* range contains the whole area -> remove area completely */ + ptr = list_next( &reserved_areas, ptr ); + list_remove( &area->entry ); + free( area ); + continue; + } + } + else + { + if ((char *)area->base + area->size > (char *)addr + size) + { + /* range is in the middle of area -> split area in two */ + struct reserved_area *new_area = malloc( sizeof(*new_area) ); + if (new_area) + { + new_area->base = (char *)addr + size; + new_area->size = (char *)area->base + area->size - (char *)new_area->base; + list_add_after( ptr, &new_area->entry ); + } + else size = (char *)area->base + area->size - (char *)addr; + area->size = (char *)addr - (char *)area->base; + break; + } + else + { + /* range overlaps end of area only -> shrink area */ + area->size = (char *)addr - (char *)area->base; + } + } + } + ptr = list_next( &reserved_areas, ptr ); + } } -struct enum_data +int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) { - int (CDECL *enum_func)( void *base, SIZE_T size, void *arg ); - void *arg; -}; + struct reserved_area *area; + struct list *ptr; -static int enum_wrapper( void *base, size_t size, void *arg ) -{ - struct enum_data *data = arg; - return data->enum_func( base, size, data->arg ); + LIST_FOR_EACH( ptr, &reserved_areas ) + { + area = LIST_ENTRY( ptr, struct reserved_area, entry ); + if (area->base > addr) break; + if ((char *)area->base + area->size <= (char *)addr) continue; + /* area must contain block completely */ + if ((char *)area->base + area->size < (char *)addr + size) return -1; + return 1; + } + return 0; } int CDECL mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), void *arg, int top_down ) { - struct enum_data data = { enum_func, arg }; - return wine_mmap_enum_reserved_areas( enum_wrapper, &data, top_down ); + int ret = 0; + struct list *ptr; + + if (top_down) + { + for (ptr = reserved_areas.prev; ptr != &reserved_areas; ptr = ptr->prev) + { + struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry ); + if ((ret = enum_func( area->base, area->size, arg ))) break; + } + } + else + { + for (ptr = reserved_areas.next; ptr != &reserved_areas; ptr = ptr->next) + { + struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry ); + if ((ret = enum_func( area->base, area->size, arg ))) break; + } + } + return ret; } void virtual_init(void)

1 0

Alexandre Julliard : ntdll: Move the debug functions to the Unix library.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 2424742d0711914f02864bcfb945605825b199a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2424742d0711914f02864bcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:07:02 2020 +0200 ntdll: Move the debug functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/thread.c | 37 ++++++++++++++++++++++++++++++- dlls/ntdll/{debugtools.c => unix/debug.c} | 8 +++++-- dlls/ntdll/unix/loader.c | 18 ++++++++++----- dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unixlib.h | 12 +++++++++- 6 files changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 699c97a1ce..f1ecb395e3 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -13,7 +13,6 @@ C_SRCS = \ critsection.c \ crypt.c \ debugbuffer.c \ - debugtools.c \ directory.c \ env.c \ error.c \ @@ -51,6 +50,7 @@ C_SRCS = \ thread.c \ threadpool.c \ time.c \ + unix/debug.c \ unix/loader.c \ unix/virtual.c \ version.c \ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0fc8aa9e92..2de2804f8c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -152,6 +152,41 @@ static ULONG_PTR get_image_addr(void) #endif +/*********************************************************************** + * __wine_dbg_get_channel_flags (NTDLL.@) + * + * Get the flags to use for a given channel, possibly setting them too in case of lazy init + */ +unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +{ + return unix_funcs->dbg_get_channel_flags( channel ); +} + +/*********************************************************************** + * __wine_dbg_strdup (NTDLL.@) + */ +const char * __cdecl __wine_dbg_strdup( const char *str ) +{ + return unix_funcs->dbg_strdup( str ); +} + +/*********************************************************************** + * __wine_dbg_header (NTDLL.@) + */ +int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ) +{ + return unix_funcs->dbg_header( cls, channel, function ); +} + +/*********************************************************************** + * __wine_dbg_output (NTDLL.@) + */ +int __cdecl __wine_dbg_output( const char *str ) +{ + return unix_funcs->dbg_output( str ); +} + /*********************************************************************** * set_process_name * @@ -345,7 +380,7 @@ TEB *thread_init(void) thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; - debug_init(); + unix_funcs->dbg_init(); init_paths(); set_process_name( __wine_main_argc, __wine_main_argv ); diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/unix/debug.c similarity index 99% rename from dlls/ntdll/debugtools.c rename to dlls/ntdll/unix/debug.c index 546d527323..7bc7787c9d 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/unix/debug.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include "wine/port.h" @@ -280,9 +284,9 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ } /*********************************************************************** - * debug_init + * dbg_init */ -void debug_init(void) +void CDECL dbg_init(void) { setbuf( stdout, NULL ); setbuf( stderr, NULL ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c974f526a1..fdcca55beb 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -51,6 +51,9 @@ #include "winternl.h" #include "unix_private.h" #include "wine/library.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntdll); extern IMAGE_NT_HEADERS __wine_spec_nt_header; extern void CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ); @@ -319,13 +322,13 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt, HMODULE ntdll_modul { int ordinal = IMAGE_ORDINAL( import_list->u1.Ordinal ) - ntdll_exports->Base; thunk_list->u1.Function = find_ordinal_export( ntdll_module, ntdll_exports, ordinal ); - if (!thunk_list->u1.Function) fprintf( stderr, "ntdll: ordinal %u not found\n", ordinal ); + if (!thunk_list->u1.Function) ERR( "ordinal %u not found\n", ordinal ); } else /* import by name */ { IMAGE_IMPORT_BY_NAME *pe_name = get_rva( nt, import_list->u1.AddressOfData ); thunk_list->u1.Function = find_named_export( ntdll_module, ntdll_exports, pe_name ); - if (!thunk_list->u1.Function) fprintf( stderr, "ntdll: %s not found\n", pe_name->Name ); + if (!thunk_list->u1.Function) ERR( "%s not found\n", pe_name->Name ); } import_list++; thunk_list++; @@ -348,7 +351,7 @@ static HMODULE load_ntdll(void) if (!dladdr( load_ntdll, &info )) { - fprintf( stderr, "cannot get path to ntdll.so\n" ); + ERR( "cannot get path to ntdll.so\n" ); exit(1); } name = malloc( strlen(info.dli_fname) + 5 ); @@ -356,12 +359,12 @@ static HMODULE load_ntdll(void) strcpy( name + strlen(info.dli_fname) - 3, ".dll.so" ); if (!(handle = dlopen( name, RTLD_NOW ))) { - fprintf( stderr, "failed to load %s: %s\n", name, dlerror() ); + ERR( "failed to load %s: %s\n", name, dlerror() ); exit(1); } if (!(nt = dlsym( handle, "__wine_spec_nt_header" ))) { - fprintf( stderr, "NT header not found in %s (too old?)\n", name ); + ERR( "NT header not found in %s (too old?)\n", name ); exit(1); } free( name ); @@ -381,6 +384,11 @@ static struct unix_funcs unix_funcs = mmap_remove_reserved_area, mmap_is_in_reserved_area, mmap_enum_reserved_areas, + dbg_init, + __wine_dbg_get_channel_flags, + __wine_dbg_strdup, + __wine_dbg_output, + __wine_dbg_header, }; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d7f5778902..663036a699 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -31,4 +31,6 @@ int CDECL mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T s extern void virtual_init(void) DECLSPEC_HIDDEN; +extern void CDECL dbg_init(void) DECLSPEC_HIDDEN; + #endif /* __NTDLL_UNIX_PRIVATE_H */ diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 54eedc1a25..753dea6acc 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -21,8 +21,10 @@ #ifndef __NTDLL_UNIXLIB_H #define __NTDLL_UNIXLIB_H +#include "wine/debug.h" + /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 2 +#define NTDLL_UNIXLIB_VERSION 3 struct unix_funcs { @@ -33,6 +35,14 @@ struct unix_funcs int (CDECL *mmap_is_in_reserved_area)( void *addr, SIZE_T size ); int (CDECL *mmap_enum_reserved_areas)( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), void *arg, int top_down ); + + /* debugging functions */ + void (CDECL *dbg_init)(void); + unsigned char (CDECL *dbg_get_channel_flags)( struct __wine_debug_channel *channel ); + const char * (CDECL *dbg_strdup)( const char *str ); + int (CDECL *dbg_output)( const char *str ); + int (CDECL *dbg_header)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ); }; #endif /* __NTDLL_UNIXLIB_H */

1 0

Nikolay Sivov : mf/samplegrabber: Test shutdown state under the lock for methods that modify item queue.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 710cc2bcfb9d9e5a39de3612edcf4ef7ca4739b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=710cc2bcfb9d9e5a39de3612… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 18:32:55 2020 +0300 mf/samplegrabber: Test shutdown state under the lock for methods that modify item queue. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 24d9163d19..92330abc9f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -407,12 +407,11 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, if (!sample) return S_OK; - if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&grabber->cs); - if (grabber->state == SINK_STATE_RUNNING) + if (grabber->is_shut_down) + hr = MF_E_STREAMSINK_REMOVED; + else if (grabber->state == SINK_STATE_RUNNING) { hr = IMFSample_GetSampleTime(sample, &sampletime); @@ -479,12 +478,11 @@ static HRESULT WINAPI sample_grabber_stream_PlaceMarker(IMFStreamSink *iface, MF TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value); - if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&grabber->cs); - if (grabber->state == SINK_STATE_RUNNING) + if (grabber->is_shut_down) + hr = MF_E_STREAMSINK_REMOVED; + else if (grabber->state == SINK_STATE_RUNNING) hr = stream_place_marker(grabber, marker_type, context_value); LeaveCriticalSection(&grabber->cs);

1 0

Nikolay Sivov : quartz/dsoundrenderer: Remove dead method call.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 033713b0ae634ac0d68c3f17a27dd5e080901507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=033713b0ae634ac0d68c3f17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 20:05:41 2020 +0300 quartz/dsoundrenderer: Remove dead method call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index badaffb99a..8e6379da8c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -351,8 +351,6 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(struct strmbase_renderer *ifac tStart = tStop = -1; } - IMediaSample_IsDiscontinuity(pSample); - if (IMediaSample_IsPreroll(pSample) == S_OK) { TRACE("Preroll!\n");

1 0

Jacek Caban : configure: Check if --disable-stdcall-fixup is supported before using it.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: cecd09ceb9f29cac39a2adb53220f3ed90e43cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cecd09ceb9f29cac39a2adb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 15 19:22:55 2020 +0200 configure: Check if --disable-stdcall-fixup is supported before using it. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 +++++++++++++++++++++++++- configure.ac | 3 ++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f85e18b77f..7e4a153c20 100755 --- a/configure +++ b/configure @@ -8237,7 +8237,31 @@ fi LIBEXT="dll" DLLEXT="" case $host_cpu in - *i[3456]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;; + *i[3456]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--disable-stdcall-fixup" >&5 +$as_echo_n "checking whether the compiler supports -Wl,--disable-stdcall-fixup... " >&6; } +if ${ac_cv_cflags__Wl___disable_stdcall_fixup+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,--disable-stdcall-fixup" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl___disable_stdcall_fixup=yes +else + ac_cv_cflags__Wl___disable_stdcall_fixup=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___disable_stdcall_fixup" >&5 +$as_echo "$ac_cv_cflags__Wl___disable_stdcall_fixup" >&6; } +if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes; then : + LDDLLFLAGS="-Wl,--disable-stdcall-fixup" +fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} diff --git a/configure.ac b/configure.ac index 0dbcb3d095..b7916fcca7 100644 --- a/configure.ac +++ b/configure.ac @@ -727,7 +727,8 @@ case $host_os in DLLEXT="" dnl Disable stdcall fixups to catch prototype mismatches case $host_cpu in - *i[[3456]]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;; + *i[[3456]]86*) WINE_TRY_CFLAGS([-Wl,--disable-stdcall-fixup], + [LDDLLFLAGS="-Wl,--disable-stdcall-fixup"]) ;; esac dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no}

1 0

Zebediah Figura : quartz/tests: Test filter mapper interfaces.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: e1c57c27cd8d91d8ee4ca733056a813a6e91cd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1c57c27cd8d91d8ee4ca733… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 15 16:09:16 2020 -0500 quartz/tests: Test filter mapper interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 923257bed1..cdfe964b98 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -27,6 +27,15 @@ #include "initguid.h" #include "wine/fil_data.h" +static IFilterMapper3 *create_mapper(void) +{ + IFilterMapper3 *ret; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper3, (void **)&ret); + ok(hr == S_OK, "Failed to create filter mapper, hr %#x.\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -34,6 +43,36 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IFilterMapper3 *mapper = create_mapper(); + + check_interface(mapper, &IID_IAMFilterData, TRUE); + check_interface(mapper, &IID_IFilterMapper, TRUE); + check_interface(mapper, &IID_IFilterMapper2, TRUE); + check_interface(mapper, &IID_IFilterMapper3, TRUE); + check_interface(mapper, &IID_IUnknown, TRUE); + + check_interface(mapper, &IID_IFilterGraph, FALSE); + + IFilterMapper3_Release(mapper); +} + /* Helper function, checks if filter with given name was enumerated. */ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) { @@ -624,6 +663,7 @@ START_TEST(filtermapper) { CoInitialize(NULL); + test_interfaces(); test_fm2_enummatchingfilters(); test_legacy_filter_registration(); test_ifiltermapper_from_filtergraph();

1 0

Zebediah Figura : quartz/tests: Fix a leak in test_fm2_enummatchingfilters().
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 87e1df02afa3382fd1150fd4bd536d63fb6dcab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e1df02afa3382fd1150fd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 15 16:09:17 2020 -0500 quartz/tests: Fix a leak in test_fm2_enummatchingfilters(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index cdfe964b98..62a632f580 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -119,7 +119,7 @@ static void test_fm2_enummatchingfilters(void) IEnumMoniker *pEnum = NULL; BOOL found, registered = TRUE; REGFILTER *regfilter; - ULONG count; + ULONG count, ref; ZeroMemory(&rgf2, sizeof(rgf2)); @@ -227,6 +227,8 @@ static void test_fm2_enummatchingfilters(void) } IEnumRegFilters_Release(enum_reg); ok(found, "IFilterMapper didn't find filter\n"); + + IFilterMapper_Release(mapper); } if (pEnum) IEnumMoniker_Release(pEnum); @@ -256,7 +258,8 @@ static void test_fm2_enummatchingfilters(void) out: if (pEnum) IEnumMoniker_Release(pEnum); - if (pMapper) IFilterMapper2_Release(pMapper); + ref = IFilterMapper2_Release(pMapper); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_legacy_filter_registration(void)

1 0