November 2020 - Wine-Commits

Damjan Jovanovic : ntdll: Document a few other filesystem case-sensitivity cases.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 2f90b17ab23988b8f9744a79a43376c6b98b72d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f90b17ab23988b8f9744a79… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:59 2020 +0200 ntdll: Document a few other filesystem case-sensitivity cases. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index f7fa78db2be..cf413f46e5c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1133,6 +1133,9 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * newer versions should be case-insensitive on the server anyway */ !strcmp( stfs.f_fstypename, "smbfs" )) return FALSE; + /* no ntfs-3g: modern fusefs has no way to report the filesystem on FreeBSD + * no cd9660 or udf, they're case-sensitive on FreeBSD + */ #ifdef __APPLE__ if (!strcmp( stfs.f_fstypename, "msdos" ) || !strcmp( stfs.f_fstypename, "cd9660" ) ||

1 0

Damjan Jovanovic : ntdll: Msdosfs was case-insensitive since FreeBSD 8 or even earlier.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 9ba13fbca604d35037d3da60146091e8be92d697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ba13fbca604d35037d3da60… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:52 2020 +0200 ntdll: Msdosfs was case-insensitive since FreeBSD 8 or even earlier. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 3699f8b8891..7a97f2bdd85 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1123,13 +1123,13 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) struct statfs stfs; if (statfs( dir, &stfs ) == -1) return TRUE; - /* Assume these file systems are always case insensitive on Mac OS. - * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS - * is the only UNIX that supports case-insensitive lookup). - */ + /* Assume these file systems are always case insensitive.*/ if (!strcmp( stfs.f_fstypename, "fusefs" ) && !strncmp( stfs.f_mntfromname, "ciopfs", 5 )) return FALSE; + /* msdosfs was case-insensitive since FreeBSD 8, if not earlier */ + if (!strcmp( stfs.f_fstypename, "msdosfs" )) + return FALSE; #ifdef __APPLE__ if (!strcmp( stfs.f_fstypename, "msdos" ) || !strcmp( stfs.f_fstypename, "cd9660" ) ||

1 0

Damjan Jovanovic : ntdll: Fix wrong return values in get_dir_case_sensitivity_stat().
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 4e6621f3a65636d7db53a34c897013445dea79fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e6621f3a65636d7db53a34c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:33 2020 +0200 ntdll: Fix wrong return values in get_dir_case_sensitivity_stat(). It should be returning TRUE (= case sensitive) on failure as case sensitive is the safe assumption, but some returns are FALSE on failure and even TRUE when case insensitive. Fix that. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d6a7b0c1550..c8531bb4f93 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1122,7 +1122,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; - if (statfs( dir, &stfs ) == -1) return FALSE; + if (statfs( dir, &stfs ) == -1) return TRUE; /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -1159,12 +1159,12 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; - if (statvfs( dir, &stfs ) == -1) return FALSE; + if (statvfs( dir, &stfs ) == -1) return TRUE; /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) - return TRUE; - return FALSE; + return FALSE; + return TRUE; #elif defined(__linux__) BOOLEAN sens = TRUE;

1 0

Nikolay Sivov : evr/presenter: Create sample allocator on object creation.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 603b00fe55139115c6ba4c302bae0d0c6f3150e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=603b00fe55139115c6ba4c30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:18 2020 +0300 evr/presenter: Create sample allocator on object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 335e5df2459..2102882e084 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -70,6 +70,7 @@ struct video_presenter IMediaEventSink *event_sink; IDirect3DDeviceManager9 *device_manager; + IMFVideoSampleAllocator *allocator; struct streaming_thread thread; IMFMediaType *media_type; UINT reset_token; @@ -175,12 +176,13 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) IMFMediaType_Release(presenter->media_type); presenter->media_type = NULL; - /* FIXME: release samples pool */ + IMFVideoSampleAllocator_UninitializeSampleAllocator(presenter->allocator); } static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) { unsigned int flags; + HRESULT hr; if (!media_type) { @@ -193,12 +195,15 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, video_presenter_reset_media_type(presenter); - /* FIXME: allocate samples pool */ - - presenter->media_type = media_type; - IMFMediaType_AddRef(presenter->media_type); + if (SUCCEEDED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(presenter->allocator, 3, media_type))) + { + presenter->media_type = media_type; + IMFMediaType_AddRef(presenter->media_type); + } + else + WARN("Failed to initialize sample allocator, hr %#x.\n", hr); - return S_OK; + return hr; } static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) @@ -220,7 +225,9 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = video_presenter_set_media_type(presenter, media_type); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + IMFMediaType_Release(media_type); if (SUCCEEDED(hr)) @@ -388,9 +395,12 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) { video_presenter_end_streaming(presenter); video_presenter_clear_container(presenter); + video_presenter_reset_media_type(presenter); DeleteCriticalSection(&presenter->cs); if (presenter->device_manager) IDirect3DDeviceManager9_Release(presenter->device_manager); + if (presenter->allocator) + IMFVideoSampleAllocator_Release(presenter->allocator); heap_free(presenter); } @@ -1179,6 +1189,11 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) if (FAILED(hr)) WARN("Failed to set new device for the manager, hr %#x.\n", hr); + if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) + { + hr = IMFVideoSampleAllocator_SetDirectXManager(presenter->allocator, (IUnknown *)presenter->device_manager); + } + return hr; }

1 0

Francois Gouget : gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: dd51cd8d00b3b2cebca1353a85a3c7d3f332ade9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd51cd8d00b3b2cebca1353a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 9 17:59:45 2020 +0100 gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 8276c1c4bee..2110765835f 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -105,18 +105,23 @@ static void test_D3DKMTOpenAdapterFromHdc(void) HDC hdc; DWORD i; - if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTOpenAdapterFromHdc) { - win_skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromHdc() is missing.\n"); return; } /* Invalid parameters */ - status = pD3DKMTOpenAdapterFromHdc(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + /* Passing a NULL pointer crashes on Windows 10 >= 2004 */ + if (0) status = pD3DKMTOpenAdapterFromHdc(NULL); memset(&open_adapter_hdc_desc, 0, sizeof(open_adapter_hdc_desc)); status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + if (status == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("D3DKMTOpenAdapterFromHdc() is not supported.\n"); + return; + } todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); /* Open adapter */

1 0

Jacek Caban : kernelbase: Wait directly on console handles.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: cc5afe41edafbbfb68abfbb0346c113a09128645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5afe41edafbbfb68abfbb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:32:01 2020 +0100 kernelbase: Wait directly on console handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +------------------------ dlls/kernelbase/kernelbase.h | 1 - dlls/kernelbase/sync.c | 13 +++++-------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 71c594b3c18..f812b2b9a55 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -37,8 +37,8 @@ #include "winnls.h" #include "winerror.h" #include "wincon.h" +#include "winternl.h" #include "wine/condrv.h" -#include "wine/server.h" #include "wine/exception.h" #include "wine/debug.h" #include "kernelbase.h" @@ -56,7 +56,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION console_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HANDLE console_connection; -static HANDLE console_wait_event; static unsigned int console_flags; #define CONSOLE_INPUT_HANDLE 0x01 @@ -559,32 +558,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR written, sizeof(*written), NULL ); } -HANDLE get_console_wait_handle( HANDLE handle ) -{ - HANDLE event = 0; - - SERVER_START_REQ( get_console_wait_event ) - { - req->handle = wine_server_obj_handle( console_handle_map( handle )); - if (!wine_server_call( req )) event = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - if (event) - { - if (InterlockedCompareExchangePointer( &console_wait_event, event, 0 )) NtClose( event ); - handle = console_wait_event; - } - return handle; -} - /*********************************************************************** * FreeConsole (kernelbase.@) */ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) { - HANDLE event; - RtlEnterCriticalSection( &console_section ); NtClose( console_connection ); @@ -598,8 +577,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE )); console_flags = 0; - if ((event = InterlockedExchangePointer( &console_wait_event, NULL ))) NtClose( event ); - RtlLeaveCriticalSection( &console_section ); return TRUE; } diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 551542e5725..836d636b47b 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -36,7 +36,6 @@ extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN; extern void init_locale(void) DECLSPEC_HIDDEN; extern void init_console(void) DECLSPEC_HIDDEN; -extern HANDLE get_console_wait_handle( HANDLE handle ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 13a9938e7c6..e8e51b1c573 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -211,17 +211,14 @@ ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) ***********************************************************************/ -static HANDLE normalize_handle_if_console( HANDLE handle ) +static HANDLE normalize_std_handle( HANDLE handle ) { if ((handle == (HANDLE)STD_INPUT_HANDLE) || (handle == (HANDLE)STD_OUTPUT_HANDLE) || (handle == (HANDLE)STD_ERROR_HANDLE)) - handle = GetStdHandle( HandleToULong(handle) ); + return GetStdHandle( HandleToULong(handle) ); - /* even screen buffer console handles are waitable, and are - * handled as a handle to the console itself - */ - return is_console_handle( handle ) ? get_console_wait_handle( handle ) : handle; + return handle; } @@ -235,7 +232,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH RegisterWaitForSingleObjectEx( HANDLE handle, WA TRACE( "%p %p %p %d %d\n", handle, callback, context, timeout, flags ); - handle = normalize_handle_if_console( handle ); + handle = normalize_std_handle( handle ); if (!set_ntstatus( RtlRegisterWait( &ret, handle, callback, context, timeout, flags ))) return NULL; return ret; } @@ -340,7 +337,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH WaitForMultipleObjectsEx( DWORD count, const HAND SetLastError(ERROR_INVALID_PARAMETER); return WAIT_FAILED; } - for (i = 0; i < count; i++) hloc[i] = normalize_handle_if_console( handles[i] ); + for (i = 0; i < count; i++) hloc[i] = normalize_std_handle( handles[i] ); status = NtWaitForMultipleObjects( count, hloc, !wait_all, alertable, get_nt_timeout( &time, timeout ) );

1 0

Jacek Caban : kernel32/tests: Add more console waiting tests.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 2b205a6d8c2226c13b3fbec5aa63fc6d5342398b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b205a6d8c2226c13b3fbec5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:34 2020 +0100 kernel32/tests: Add more console waiting tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 72 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 495fa1b9e57..5064cfe5c6d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -19,11 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windows.h> #include <winternl.h> #include <stdio.h> +#include "wine/test.h" + static void (WINAPI *pClosePseudoConsole)(HPCON); static HRESULT (WINAPI *pCreatePseudoConsole)(COORD,HANDLE,HANDLE,DWORD,HPCON*); static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); @@ -988,6 +991,72 @@ static void testWaitForConsoleInput(HANDLE input_handle) CloseHandle(complete_event); } +static void test_wait(HANDLE input, HANDLE orig_output) +{ + LARGE_INTEGER zero; + INPUT_RECORD ir; + HANDLE output; + DWORD res, count; + NTSTATUS status; + BOOL ret; + + if (skip_nt) return; + + memset(&ir, 0, sizeof(ir)); + ir.EventType = MOUSE_EVENT; + ir.Event.MouseEvent.dwEventFlags = MOUSE_MOVED; + zero.QuadPart = 0; + + output = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(output != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: %u\n", GetLastError()); + + ret = SetConsoleActiveScreenBuffer(output); + ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + FlushConsoleInputBuffer(input); + + res = WaitForSingleObject(input, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(output, 0); + todo_wine + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(orig_output, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + status = NtWaitForSingleObject(input, FALSE, &zero); + todo_wine + ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + status = NtWaitForSingleObject(output, FALSE, &zero); + todo_wine + ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + + ret = WriteConsoleInputW(input, &ir, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + res = WaitForSingleObject(input, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(output, 0); + todo_wine + ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(orig_output, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); + status = NtWaitForSingleObject(input, FALSE, &zero); + todo_wine + ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + status = NtWaitForSingleObject(output, FALSE, &zero); + todo_wine + ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + + ret = SetConsoleActiveScreenBuffer(orig_output); + ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + + CloseHandle(output); +} + static void test_GetSetConsoleInputExeName(void) { BOOL ret; @@ -4295,6 +4364,7 @@ START_TEST(console) if (!test_current) testScreenBuffer(hConOut); /* Test waiting for a console handle */ testWaitForConsoleInput(hConIn); + test_wait(hConIn, hConOut); if (!test_current) {

1 0

Jacek Caban : server: Support waiting on console input handles.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 459d37643ef72d284eec0dc50573eff59935ae69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=459d37643ef72d284eec0dc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:43 2020 +0100 server: Support waiting on console input handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 -- server/console.c | 22 +++++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5064cfe5c6d..6d15abd8c5f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1024,7 +1024,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(orig_output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); - todo_wine ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); @@ -1043,7 +1042,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(orig_output, 0); ok(!res, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); - todo_wine ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); diff --git a/server/console.c b/server/console.c index d1e3cae8919..4e51ed48a31 100644 --- a/server/console.c +++ b/server/console.c @@ -54,6 +54,7 @@ struct history_line struct console_input { struct object obj; /* object header */ + int signaled; /* is console signaled */ int num_proc; /* number of processes attached to this console */ struct thread *renderer; /* console renderer thread */ struct screen_buffer *active; /* active screen buffer */ @@ -67,6 +68,7 @@ struct console_input static void console_input_dump( struct object *obj, int verbose ); static void console_input_destroy( struct object *obj ); +static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_get_fd( struct object *obj ); static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_input_open_file( struct object *obj, unsigned int access, @@ -77,9 +79,9 @@ static const struct object_ops console_input_ops = sizeof(struct console_input), /* size */ console_input_dump, /* dump */ no_get_type, /* get_type */ - no_add_queue, /* add_queue */ - NULL, /* remove_queue */ - NULL, /* signaled */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + console_input_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ console_input_get_fd, /* get_fd */ @@ -338,6 +340,12 @@ static const struct fd_ops console_connection_fd_ops = static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); +static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ) +{ + struct console_input *console = (struct console_input*)obj; + return console->signaled; +} + static struct fd *console_input_get_fd( struct object* obj ) { struct console_input *console_input = (struct console_input*)obj; @@ -358,6 +366,7 @@ static struct object *create_console_input(void) return NULL; console_input->renderer = NULL; + console_input->signaled = 0; console_input->num_proc = 0; console_input->active = NULL; console_input->server = NULL; @@ -1195,6 +1204,13 @@ DECL_HANDLER(get_next_console_request) if (req->signal) set_event( server->console->event); else reset_event( server->console->event ); + if (!req->signal) server->console->signaled = 0; + else if (!server->console->signaled) + { + server->console->signaled = 1; + wake_up( &server->console->obj, 0 ); + } + if (req->read) { /* set result of current pending ioctl */

1 0

Nikolay Sivov : evr/presenter: Add sample allocator notification callback.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 03a10db21494906b88997b980457a970b56f83c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a10db21494906b88997b98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:21 2020 +0300 evr/presenter: Add sample allocator notification callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 5bffa9af228..9bf4cda3725 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -66,6 +66,7 @@ struct video_presenter IMFRateSupport IMFRateSupport_iface; IMFGetService IMFGetService_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; + IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -131,6 +132,11 @@ static struct video_presenter *impl_from_IMFVideoPositionMapper(IMFVideoPosition return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPositionMapper_iface); } +static struct video_presenter *impl_from_IMFVideoSampleAllocatorNotify(IMFVideoSampleAllocatorNotify *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, allocator_cb); +} + static void video_presenter_notify_renderer(struct video_presenter *presenter, LONG event, LONG_PTR param1, LONG_PTR param2) { @@ -183,6 +189,18 @@ static void video_presenter_get_native_video_size(struct video_presenter *presen IMFMediaType_Release(media_type); } +/* It is important this is called to reset callback too to break circular referencing, + when allocator keeps a reference of its container, that created it. */ +static void video_presenter_set_allocator_callback(struct video_presenter *presenter, + IMFVideoSampleAllocatorNotify *notify_cb) +{ + IMFVideoSampleAllocatorCallback *cb; + + IMFVideoSampleAllocator_QueryInterface(presenter->allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&cb); + IMFVideoSampleAllocatorCallback_SetCallback(cb, notify_cb); + IMFVideoSampleAllocatorCallback_Release(cb); +} + static void video_presenter_reset_media_type(struct video_presenter *presenter) { if (presenter->media_type) @@ -190,6 +208,7 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) presenter->media_type = NULL; IMFVideoSampleAllocator_UninitializeSampleAllocator(presenter->allocator); + video_presenter_set_allocator_callback(presenter, NULL); } static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) @@ -298,6 +317,8 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter return E_FAIL; } + video_presenter_set_allocator_callback(presenter, &presenter->allocator_cb); + WaitForSingleObject(presenter->thread.ready_event, INFINITE); CloseHandle(presenter->thread.ready_event); presenter->thread.ready_event = NULL; @@ -320,6 +341,7 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) TRACE("Terminated streaming thread tid %#x.\n", presenter->thread.tid); memset(&presenter->thread, 0, sizeof(presenter->thread)); + video_presenter_set_allocator_callback(presenter, NULL); return S_OK; } @@ -1222,6 +1244,47 @@ static const IMFVideoPositionMapperVtbl video_presenter_position_mapper_vtbl = video_presenter_position_mapper_MapOutputCoordinateToInputStream, }; +static HRESULT WINAPI video_presenter_allocator_cb_QueryInterface(IMFVideoSampleAllocatorNotify *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFVideoSampleAllocatorNotify_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI video_presenter_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoSampleAllocatorNotify(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoSampleAllocatorNotify(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) +{ + return E_NOTIMPL; +} + +static const IMFVideoSampleAllocatorNotifyVtbl video_presenter_allocator_cb_vtbl = +{ + video_presenter_allocator_cb_QueryInterface, + video_presenter_allocator_cb_AddRef, + video_presenter_allocator_cb_Release, + video_presenter_allocator_cb_NotifyRelease, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1290,6 +1353,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; + object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1;

1 0

Alexandre Julliard : mscms: Build with msvcrt.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 11fb2a59181c42478075a9576cf37450c277c625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fb2a59181c42478075a957… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:47:53 2020 +0100 mscms: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/Makefile.in | 2 ++ dlls/mscms/handle.c | 4 +--- dlls/mscms/icc.c | 2 -- dlls/mscms/mscms_main.c | 6 +----- dlls/mscms/profile.c | 39 +++++++++++++-------------------------- dlls/mscms/stub.c | 4 +--- dlls/mscms/transform.c | 4 +--- 7 files changed, 19 insertions(+), 42 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index 495f9af98d5..4c976247ebf 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -4,6 +4,8 @@ IMPORTS = shlwapi advapi32 EXTRAINCL = $(LCMS2_CFLAGS) EXTRALIBS = $(LCMS2_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ handle.c \ icc.c \ diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index ee59ad3b5bd..4e532a6fca3 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -28,6 +25,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 2033374d30c..2765888709c 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 2ea0255c4a1..516dd82540c 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include "wine/port.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -31,6 +26,7 @@ #include "winuser.h" #include "winternl.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 0e5af035d87..bc7f200006b 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" -#include "wine/unicode.h" - #include <stdarg.h> #include "windef.h" @@ -32,6 +28,7 @@ #include "winreg.h" #include "shlwapi.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" @@ -104,12 +101,6 @@ BOOL WINAPI AssociateColorProfileWithDeviceA( PCSTR machine, PCSTR profile, PCST static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size ) { - static const WCHAR fmtW[] = {'%','c','%','c','%','c','%','c',0}; - static const WCHAR icmW[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','C','M',0}; PROFILEHEADER header; PROFILE profile; HPROFILE handle; @@ -132,11 +123,13 @@ static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size ) SetLastError( ERROR_INVALID_PROFILE ); return FALSE; } - RegCreateKeyExW( HKEY_LOCAL_MACHINE, icmW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ICM", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL ); basename( file, basenameW ); - sprintfW( classW, fmtW, (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff, - (header.phClass >> 8) & 0xff, header.phClass & 0xff ); + swprintf( classW, ARRAY_SIZE(classW), L"%c%c%c%c", + (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff, + (header.phClass >> 8) & 0xff, header.phClass & 0xff ); RegCreateKeyExW( icm_key, classW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &class_key, NULL ); if (value) RegSetValueExW( class_key, basenameW, 0, REG_BINARY, value, size ); @@ -287,8 +280,6 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) { WCHAR colordir[MAX_PATH]; - static const WCHAR colorsubdir[] = - {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r',0}; DWORD len; TRACE( "( %p, %p )\n", buffer, size ); @@ -296,7 +287,7 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) if (machine || !size) return FALSE; GetSystemDirectoryW( colordir, ARRAY_SIZE( colordir )); - lstrcatW( colordir, colorsubdir ); + lstrcatW( colordir, L"\\spool\\drivers\\color" ); len = lstrlenW( colordir ) * sizeof(WCHAR); @@ -573,9 +564,6 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile */ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile, PDWORD size ) { - static const WCHAR rgbprofilefile[] = - { '\\','s','r','g','b',' ','c','o','l','o','r',' ', - 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; WCHAR rgbprofile[MAX_PATH]; DWORD len = sizeof(rgbprofile); @@ -605,7 +593,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi { case LCS_sRGB: case LCS_WINDOWS_COLOR_SPACE: /* FIXME */ - lstrcatW( rgbprofile, rgbprofilefile ); + lstrcatW( rgbprofile, L"\\srgb color space profile.icm" ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); if (*size < len) @@ -917,7 +905,6 @@ exit: BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, PDWORD size, PDWORD number ) { - static const WCHAR spec[] = {'\\','*','i','c','m',0}; BOOL match, ret = FALSE; WCHAR colordir[MAX_PATH], glob[MAX_PATH], **profiles = NULL; DWORD i, len = sizeof(colordir), count = 0, totalsize = 0; @@ -932,14 +919,14 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, record->dwVersion != ENUM_TYPE_VERSION) return FALSE; ret = GetColorDirectoryW( machine, colordir, &len ); - if (!ret || len + sizeof(spec) > MAX_PATH) + if (!ret || len + ARRAY_SIZE(L"\\*icm") > MAX_PATH) { WARN( "Can't retrieve color directory\n" ); return FALSE; } lstrcpyW( glob, colordir ); - lstrcatW( glob, spec ); + lstrcatW( glob, L"\\*icm" ); find = FindFirstFileW( glob, &data ); if (find == INVALID_HANDLE_VALUE) return FALSE; @@ -1085,7 +1072,7 @@ BOOL WINAPI InstallColorProfileW( PCWSTR machine, PCWSTR profile ) lstrcatW( dest, base ); /* Is source equal to destination? */ - if (!lstrcmpW( profile, dest )) return TRUE; + if (!wcscmp( profile, dest )) return TRUE; return CopyFileW( profile, dest, TRUE ); } @@ -1385,11 +1372,11 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA) { - size += (strlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); + size += (lstrlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); if (!(path = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; GetColorDirectoryW( NULL, path, &size ); PathAddBackslashW( path ); - strcatW( path, profile->pProfileData ); + lstrcatW( path, profile->pProfileData ); } else return NULL; handle = CreateFileW( path, flags, sharing, NULL, creation, 0, NULL ); diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 4cd6863f219..28c08e20868 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -28,6 +25,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 29d977e58f6..fc005062e38 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -29,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h"

1 0