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

Rémi Bernon : d3d9/tests: Add more visibility tests.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: b1fe20d100d60a3208ae03e04b06f1ab89875c62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1fe20d100d60a3208ae03e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 8 00:01:11 2020 +0430 d3d9/tests: Add more visibility tests. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 41cfc1519c..a15c04fa45 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4939,12 +4939,14 @@ static void test_window_style(void) static const struct { DWORD device_flags; - LONG style, focus_loss_style, exstyle; + LONG create_style, style, focus_loss_style, exstyle, focus_loss_exstyle; } tests[] = { - {0, WS_VISIBLE, WS_MINIMIZE, WS_EX_TOPMOST}, - {CREATE_DEVICE_NOWINDOWCHANGES, 0, 0, 0}, + {0, 0, WS_VISIBLE, WS_MINIMIZE, WS_EX_TOPMOST, WS_EX_TOPMOST}, + {0, WS_VISIBLE, WS_VISIBLE, WS_MINIMIZE, 0, WS_EX_TOPMOST}, + {CREATE_DEVICE_NOWINDOWCHANGES, 0, 0, 0, 0, 0}, + {CREATE_DEVICE_NOWINDOWCHANGES, WS_VISIBLE, WS_VISIBLE, 0, 0, 0}, }; unsigned int i; @@ -4954,9 +4956,9 @@ static void test_window_style(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | tests[i].create_style, 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); - device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | tests[i].create_style, 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); device_style = GetWindowLongA(device_window, GWL_STYLE); @@ -5018,12 +5020,12 @@ static void test_window_style(void) style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style | tests[i].style; - todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) + todo_wine_if ((tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) && !(tests[i].create_style & WS_VISIBLE)) ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); expected_style = device_exstyle | tests[i].exstyle; - todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) + todo_wine_if ((tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) || (tests[i].create_style & WS_VISIBLE)) ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i); @@ -5045,7 +5047,7 @@ static void test_window_style(void) todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); - expected_style = device_exstyle | tests[i].exstyle; + expected_style = device_exstyle | tests[i].focus_loss_exstyle | tests[i].exstyle; todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i);

1 0

Huw Davies : server: Remove unnecessary 'remove' parameter from accept_hardware_message request.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 434871fd1b6d1fef8c68e8d35689caec49367e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=434871fd1b6d1fef8c68e8d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 11:21:50 2020 +0100 server: Remove unnecessary 'remove' parameter from accept_hardware_message request. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 17 ++++++++--------- include/wine/server_protocol.h | 4 +--- server/protocol.def | 3 +-- server/queue.c | 36 +++++++++++++++--------------------- server/request.h | 3 +-- server/trace.c | 1 - 6 files changed, 26 insertions(+), 38 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c5c7db667c..53e0b6495b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2271,12 +2271,11 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) * Tell the server we have passed the message to the app * (even though we may end up dropping it later on) */ -static void accept_hardware_message( UINT hw_id, BOOL remove ) +static void accept_hardware_message( UINT hw_id ) { SERVER_START_REQ( accept_hardware_message ) { - req->hw_id = hw_id; - req->remove = remove; + req->hw_id = hw_id; if (wine_server_call( req )) FIXME("Failed to reply to MSG_HARDWARE message. Message may not be removed from queue.\n"); } @@ -2363,10 +2362,10 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, { /* skip this message */ HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, LOWORD(msg->wParam), msg->lParam, TRUE ); - accept_hardware_message( hw_id, TRUE ); + accept_hardware_message( hw_id ); return FALSE; } - accept_hardware_message( hw_id, remove ); + if (remove) accept_hardware_message( hw_id ); msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); if ( remove && msg->message == WM_KEYDOWN ) @@ -2421,7 +2420,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) { - accept_hardware_message( hw_id, TRUE ); + accept_hardware_message( hw_id ); return FALSE; } @@ -2517,7 +2516,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hook.s.dwExtraInfo = extra_info; hook.mouseData = msg->wParam; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); - accept_hardware_message( hw_id, TRUE ); + accept_hardware_message( hw_id ); return FALSE; } @@ -2525,11 +2524,11 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { SendMessageW( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); - accept_hardware_message( hw_id, TRUE ); + accept_hardware_message( hw_id ); return FALSE; } - accept_hardware_message( hw_id, remove ); + if (remove) accept_hardware_message( hw_id ); if (!remove || info.hwndCapture) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d453f5e661..0f1a0b4477 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3197,8 +3197,6 @@ struct accept_hardware_message_request { struct request_header __header; unsigned int hw_id; - int remove; - char __pad_20[4]; }; struct accept_hardware_message_reply { @@ -6671,7 +6669,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 616 +#define SERVER_PROTOCOL_VERSION 617 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 34c6b5f65d..e55d47bcd2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2352,10 +2352,9 @@ enum message_type @END -/* Accept the current hardware message */ +/* Accept and remove the current hardware message */ @REQ(accept_hardware_message) unsigned int hw_id; /* id of the hardware message */ - int remove; /* should we remove the message? */ @END diff --git a/server/queue.c b/server/queue.c index 432885f9e4..a65eab38bd 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1384,11 +1384,11 @@ static void update_desktop_mouse_state( struct desktop *desktop, unsigned int fl } /* release the hardware message currently being processed by the given thread */ -static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id, - int remove ) +static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id ) { struct thread_input *input = queue->input; - struct message *msg; + struct message *msg, *other; + int clr_bit; LIST_FOR_EACH_ENTRY( msg, &input->msg_list, struct message, entry ) { @@ -1397,26 +1397,20 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (&msg->entry == &input->msg_list) return; /* not found */ /* clear the queue bit for that message */ - if (remove) + clr_bit = get_hardware_msg_bit( msg ); + LIST_FOR_EACH_ENTRY( other, &input->msg_list, struct message, entry ) { - struct message *other; - int clr_bit; - - clr_bit = get_hardware_msg_bit( msg ); - LIST_FOR_EACH_ENTRY( other, &input->msg_list, struct message, entry ) + if (other != msg && get_hardware_msg_bit( other ) == clr_bit) { - if (other != msg && get_hardware_msg_bit( other ) == clr_bit) - { - clr_bit = 0; - break; - } + clr_bit = 0; + break; } - if (clr_bit) clear_queue_bits( queue, clr_bit ); - - update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); - list_remove( &msg->entry ); - free_message( msg ); } + if (clr_bit) clear_queue_bits( queue, clr_bit ); + + update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); + list_remove( &msg->entry ); + free_message( msg ); } static int queue_hotkey_message( struct desktop *desktop, struct message *msg ) @@ -2080,7 +2074,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) - release_hardware_message( current->queue, data->hw_id, 1 ); + release_hardware_message( current->queue, data->hw_id ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2606,7 +2600,7 @@ DECL_HANDLER(reply_message) DECL_HANDLER(accept_hardware_message) { if (current->queue) - release_hardware_message( current->queue, req->hw_id, req->remove ); + release_hardware_message( current->queue, req->hw_id ); else set_error( STATUS_ACCESS_DENIED ); } diff --git a/server/request.h b/server/request.h index d6e2613c0a..a81d64527d 100644 --- a/server/request.h +++ b/server/request.h @@ -1567,8 +1567,7 @@ C_ASSERT( FIELD_OFFSET(struct reply_message_request, remove) == 12 ); C_ASSERT( FIELD_OFFSET(struct reply_message_request, result) == 16 ); C_ASSERT( sizeof(struct reply_message_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct accept_hardware_message_request, hw_id) == 12 ); -C_ASSERT( FIELD_OFFSET(struct accept_hardware_message_request, remove) == 16 ); -C_ASSERT( sizeof(struct accept_hardware_message_request) == 24 ); +C_ASSERT( sizeof(struct accept_hardware_message_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_message_reply_request, cancel) == 12 ); C_ASSERT( sizeof(struct get_message_reply_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_message_reply_reply, result) == 8 ); diff --git a/server/trace.c b/server/trace.c index ad34cef118..16c35b93b5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2887,7 +2887,6 @@ static void dump_reply_message_request( const struct reply_message_request *req static void dump_accept_hardware_message_request( const struct accept_hardware_message_request *req ) { fprintf( stderr, " hw_id=%08x", req->hw_id ); - fprintf( stderr, ", remove=%d", req->remove ); } static void dump_get_message_reply_request( const struct get_message_reply_request *req )

1 0

Brendan Shanks : winex11.drv: Retrieve PCI IDs and device name from Vulkan.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 3a3c7cbd209e23cc6ee88299b3ba877ab20a767f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3c7cbd209e23cc6ee88299… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 6 10:46:18 2020 -0700 winex11.drv: Retrieve PCI IDs and device name from Vulkan. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 14574e198f..141c2ca17f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -687,7 +687,7 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) -static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_info ) +static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRProviderInfo *provider_info ) { static const char *extensions[] = { @@ -706,6 +706,7 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_ VkPhysicalDeviceIDProperties id; VkInstance vk_instance = NULL; VkDisplayKHR vk_display; + BOOL ret = FALSE; VkResult vr; if (!vulkan_funcs) @@ -769,7 +770,15 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_ properties2.pNext = &id; pvkGetPhysicalDeviceProperties2( vk_physical_devices[device_idx], &properties2 ); - memcpy( uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + /* Ignore Khronos vendor IDs */ + if (properties2.properties.vendorID < 0x10000) + { + gpu->vendor_id = properties2.properties.vendorID; + gpu->device_id = properties2.properties.deviceID; + } + MultiByteToWideChar( CP_UTF8, 0, properties2.properties.deviceName, -1, gpu->name, ARRAY_SIZE(gpu->name) ); + ret = TRUE; goto done; } } @@ -778,6 +787,7 @@ done: heap_free( vk_physical_devices ); if (vk_instance) vulkan_funcs->p_vkDestroyInstance( vk_instance, NULL ); + return ret; } static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) @@ -842,10 +852,9 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) } gpus[i].id = provider_resources->providers[i]; - get_vulkan_device_uuid( &gpus[i].vulkan_uuid, provider_info ); - MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); - /* PCI IDs are all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report - * their PCI address in the name but many others don't */ + if (!get_gpu_properties_from_vulkan( &gpus[i], provider_info )) + MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); + /* FIXME: Add an alternate method of getting PCI IDs, for systems that don't support Vulkan */ pXRRFreeProviderInfo( provider_info ); }

1 0

Alexandre Julliard : ntdll: Use proper flags instead of characters for printf flags.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 1a43c5de71eea457855f7dcfb7e5811f1c74ebf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a43c5de71eea457855f7dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 16:12:44 2020 +0200 ntdll: Use proper flags instead of characters for printf flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 56 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 16f64002d4..31235537a3 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -50,11 +50,10 @@ typedef struct pf_output_t typedef struct pf_flags_t { - char Sign, LeftAlign, Alternate, PadZero; + enum { LEN_DEFAULT, LEN_SHORT, LEN_LONG } IntegerLength; + BOOLEAN IntegerDouble, IntegerNative, LeftAlign, Alternate, PadZero, WideString; int FieldLength, Precision; - char IntegerLength, IntegerDouble, IntegerNative; - char WideString; - char Format; + char Sign, Format; } pf_flags; /* @@ -268,9 +267,9 @@ static int pf_handle_string_format( pf_output *out, const void* str, int len, return pf_output_format_A( out, "(null)", -1, flags); /* prefixes take priority over %c,%s vs. %C,%S, so we handle them first */ - if(flags->WideString || flags->IntegerLength == 'l') + if (flags->WideString || flags->IntegerLength == LEN_LONG) return pf_output_format_W( out, str, len, flags); - if(flags->IntegerLength == 'h') + if (flags->IntegerLength == LEN_SHORT) return pf_output_format_A( out, str, len, flags); /* %s,%c -> chars in ansi functions & wchars in unicode @@ -310,7 +309,7 @@ static void pf_integer_conv( char *buf, pf_flags *flags, LONGLONG x ) i = 0; if( x == 0 ) { - flags->Alternate = 0; + flags->Alternate = FALSE; if( flags->Precision ) buf[i++] = '0'; } @@ -410,11 +409,11 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis flags.Sign = *p; } else if( *p == '-' ) - flags.LeftAlign = *p; + flags.LeftAlign = TRUE; else if( *p == '0' ) - flags.PadZero = *p; + flags.PadZero = TRUE; else if( *p == '#' ) - flags.Alternate = *p; + flags.Alternate = TRUE; else break; p++; @@ -427,7 +426,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis flags.FieldLength = va_arg( valist, int ); if (flags.FieldLength < 0) { - flags.LeftAlign = '-'; + flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } p++; @@ -461,19 +460,24 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis { if (*p == 'l' && *(p+1) == 'l') { - flags.IntegerDouble++; + flags.IntegerDouble = TRUE; p += 2; } - else if( *p == 'h' || *p == 'l' || *p == 'L' ) + else if( *p == 'l' || *p == 'L' ) { - flags.IntegerLength = *p; + flags.IntegerLength = LEN_LONG; + p++; + } + else if( *p == 'h') + { + flags.IntegerLength = LEN_SHORT; p++; } else if( *p == 'I' ) { if( *(p+1) == '6' && *(p+2) == '4' ) { - flags.IntegerDouble++; + flags.IntegerDouble = TRUE; p += 3; } else if( *(p+1) == '3' && *(p+2) == '2' ) @@ -481,7 +485,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis else if( p[1] && strchr( "diouxX", p[1] ) ) { if( sizeof(void *) == 8 ) - flags.IntegerDouble = *p; + flags.IntegerDouble = TRUE; p++; } else if( isDigit(*(p+1)) || *(p+1) == 0 ) @@ -490,12 +494,18 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis p++; } else if( *p == 'w' ) - flags.WideString = *p++; + { + flags.WideString = TRUE; + p++; + } else if ((*p == 'z' || *p == 't') && p[1] && strchr("diouxX", p[1])) - flags.IntegerNative = *p++; + { + flags.IntegerNative = TRUE; + p++; + } else if (*p == 'j') { - flags.IntegerDouble++; + flags.IntegerDouble = TRUE; p++; } else if( *p == 'F' ) @@ -532,10 +542,10 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis void *ptr = va_arg( valist, void * ); int prec = flags.Precision; flags.Format = 'X'; - flags.PadZero = '0'; + flags.PadZero = TRUE; flags.Precision = 2*sizeof(void*); pf_integer_conv( pointer, &flags, (ULONG_PTR)ptr ); - flags.PadZero = 0; + flags.PadZero = FALSE; flags.Precision = prec; r = pf_output_format_A( out, pointer, -1, &flags ); } @@ -563,10 +573,10 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis if(flags.IntegerDouble || (flags.IntegerNative && sizeof(void*) == 8)) pf_integer_conv( x, &flags, va_arg(valist, LONGLONG) ); else if(flags.Format=='d' || flags.Format=='i') - pf_integer_conv( x, &flags, flags.IntegerLength!='h' ? + pf_integer_conv( x, &flags, flags.IntegerLength != LEN_SHORT ? va_arg(valist, int) : (short)va_arg(valist, int) ); else - pf_integer_conv( x, &flags, flags.IntegerLength!='h' ? + pf_integer_conv( x, &flags, flags.IntegerLength != LEN_SHORT ? (unsigned int)va_arg(valist, int) : (unsigned short)va_arg(valist, int) ); r = pf_output_format_A( out, x, -1, &flags );

1 0

Gijs Vermeulen : qdvd: Add IDvdGraphBuilder stub.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 4cd2ca96c2b65acd977f7c9217e260c024e0ecbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cd2ca96c2b65acd977f7c92… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jul 7 10:14:56 2020 -0500 qdvd: Add IDvdGraphBuilder stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18072 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 2 + dlls/qdvd/graph.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/qdvd/qdvd_main.c | 89 ++++++++++++++++++++++++++++++++++--- dlls/qdvd/qdvd_private.h | 30 +++++++++++++ 4 files changed, 227 insertions(+), 6 deletions(-) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index b3b13486ed..8f5089b3ac 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,8 +1,10 @@ MODULE = qdvd.dll +IMPORTS = strmiids uuid ole32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + graph.c \ qdvd_main.c IDL_SRCS = \ diff --git a/dlls/qdvd/graph.c b/dlls/qdvd/graph.c new file mode 100644 index 0000000000..f33293bfa4 --- /dev/null +++ b/dlls/qdvd/graph.c @@ -0,0 +1,112 @@ +/* + * Graph builder + * + * Copyright 2020 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qdvd_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qdvd); + +struct graph_builder +{ + IDvdGraphBuilder IDvdGraphBuilder_iface; + LONG refcount; +}; + +static struct graph_builder *impl_from_IDvdGraphBuilder(IDvdGraphBuilder *iface) +{ + return CONTAINING_RECORD(iface, struct graph_builder, IDvdGraphBuilder_iface); +} + +static ULONG WINAPI graph_builder_AddRef(IDvdGraphBuilder *iface) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + ULONG refcount = InterlockedIncrement(&builder->refcount); + TRACE("%p increasing refcount to %u.\n", builder, refcount); + return refcount; +} + +static ULONG WINAPI graph_builder_Release(IDvdGraphBuilder *iface) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + ULONG refcount = InterlockedDecrement(&builder->refcount); + TRACE("%p decreasing refcount to %u.\n", builder, refcount); + if (!refcount) + free(builder); + return refcount; +} + +static HRESULT WINAPI graph_builder_QueryInterface(IDvdGraphBuilder *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IDvdGraphBuilder) || IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT WINAPI graph_builder_GetFiltergraph(IDvdGraphBuilder *iface, IGraphBuilder **graph) +{ + FIXME("iface %p, graph %p, stub!\n", iface, graph); + return E_NOTIMPL; +} + +static HRESULT WINAPI graph_builder_GetDvdInterface(IDvdGraphBuilder *iface, REFIID iid, void **out) +{ + FIXME("iface %p, iid %s, out %p, stub!\n", iface, debugstr_guid(iid), out); + return E_NOTIMPL; +} + +static HRESULT WINAPI graph_builder_RenderDvdVideoVolume(IDvdGraphBuilder *iface, const WCHAR *path, DWORD flags, AM_DVD_RENDERSTATUS *status) +{ + FIXME("iface %p, path %s, flags %#x, status %p, stub!\n", iface, debugstr_w(path), flags, status); + return E_NOTIMPL; +} + +static const struct IDvdGraphBuilderVtbl graph_builder_vtbl = +{ + graph_builder_QueryInterface, + graph_builder_AddRef, + graph_builder_Release, + graph_builder_GetFiltergraph, + graph_builder_GetDvdInterface, + graph_builder_RenderDvdVideoVolume, +}; + +HRESULT graph_builder_create(IUnknown **out) +{ + struct graph_builder *builder; + + if (!(builder = calloc(1, sizeof(*builder)))) + return E_OUTOFMEMORY; + + builder->IDvdGraphBuilder_iface.lpVtbl = &graph_builder_vtbl; + builder->refcount = 1; + + TRACE("Created DVD graph builder %p.\n", builder); + *out = (IUnknown *)&builder->IDvdGraphBuilder_iface; + return S_OK; +} diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 72dcda7c91..9377f248ce 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -18,17 +18,89 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "oleidl.h" +#include "qdvd_private.h" #include "rpcproxy.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qdvd); static HINSTANCE qdvd_instance; +struct class_factory +{ + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(IUnknown **out); +}; + +static struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID iid, void **out) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unk; + HRESULT hr; + + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + *out = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (SUCCEEDED(hr = factory->create_instance(&unk))) + { + hr = IUnknown_QueryInterface(unk, iid, out); + IUnknown_Release(unk); + } + return hr; +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("lock %d, stub!\n", lock); + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +static struct class_factory graph_builder_cf = {{&class_factory_vtbl}, graph_builder_create}; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_WINE_PREATTACH) @@ -44,7 +116,12 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) { - FIXME("clsid %s, iid %s, out %p, stub!\n", debugstr_guid(clsid), debugstr_guid(iid), out); + TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + if (IsEqualGUID(clsid, &CLSID_DvdGraphBuilder)) + return IClassFactory_QueryInterface(&graph_builder_cf.IClassFactory_iface, iid, out); + + FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/qdvd/qdvd_private.h b/dlls/qdvd/qdvd_private.h new file mode 100644 index 0000000000..b54dd3ddc1 --- /dev/null +++ b/dlls/qdvd/qdvd_private.h @@ -0,0 +1,30 @@ +/* + * DirectShow DVD filters + * + * Copyright 2020 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef QDVD_PRIVATE_H +#define QDVD_PRIVATE_H + +#define COBJMACROS +#include "dshow.h" +#include "wine/debug.h" + +HRESULT graph_builder_create(IUnknown **out) DECLSPEC_HIDDEN; + +#endif /* QDVD_PRIVATE_H */

1 0

Nikolay Sivov : mf/evr: Add events queue support for the sink.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 68204a86a228b65b63b21be6ef07e9ae8baba542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68204a86a228b65b63b21be6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:15 2020 +0300 mf/evr: Add events queue support for the sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mf/main.c | 2 -- dlls/mf/mf_private.h | 1 + dlls/mf/samplegrabber.c | 1 - dlls/mf/session.c | 1 - dlls/mf/tests/mf.c | 5 +++ dlls/mf/topology.c | 1 - 7 files changed, 95 insertions(+), 8 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 92f0ff04fa..bb21ccdd25 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -34,8 +34,10 @@ struct video_renderer IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; IMFVideoRenderer IMFVideoRenderer_iface; + IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; + IMFMediaEventQueue *event_queue; IMFTransform *mixer; IMFVideoPresenter *presenter; unsigned int flags; @@ -57,6 +59,11 @@ static struct video_renderer *impl_from_IMFVideoRenderer(IMFVideoRenderer *iface return CONTAINING_RECORD(iface, struct video_renderer, IMFVideoRenderer_iface); } +static struct video_renderer *impl_from_IMFMediaEventGenerator(IMFMediaEventGenerator *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaEventGenerator_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -76,6 +83,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFVideoRenderer_iface; } + else if (IsEqualIID(riid, &IID_IMFMediaEventGenerator)) + { + *obj = &renderer->IMFMediaEventGenerator_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -105,6 +116,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) if (!refcount) { + if (renderer->event_queue) + IMFMediaEventQueue_Release(renderer->event_queue); if (renderer->mixer) IMFTransform_Release(renderer->mixer); if (renderer->presenter) @@ -193,6 +206,7 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) EnterCriticalSection(&renderer->cs); renderer->flags |= EVR_SHUT_DOWN; + IMFMediaEventQueue_Shutdown(renderer->event_queue); LeaveCriticalSection(&renderer->cs); return S_OK; @@ -281,6 +295,74 @@ static const IMFVideoRendererVtbl video_renderer_vtbl = video_renderer_InitializeRenderer, }; +static HRESULT WINAPI video_renderer_events_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_events_AddRef(IMFMediaEventGenerator *iface) +{ + struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_events_Release(IMFMediaEventGenerator *iface) +{ + struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_events_GetEvent(IMFMediaEventGenerator *iface, DWORD flags, IMFMediaEvent **event) +{ + struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(renderer->event_queue, flags, event); +} + +static HRESULT WINAPI video_renderer_events_BeginGetEvent(IMFMediaEventGenerator *iface, IMFAsyncCallback *callback, + IUnknown *state) +{ + struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(renderer->event_queue, callback, state); +} + +static HRESULT WINAPI video_renderer_events_EndGetEvent(IMFMediaEventGenerator *iface, IMFAsyncResult *result, + IMFMediaEvent **event) +{ + struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(renderer->event_queue, result, event); +} + +static HRESULT WINAPI video_renderer_events_QueueEvent(IMFMediaEventGenerator *iface, MediaEventType event_type, + REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) +{ + struct video_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(renderer->event_queue, event_type, ext_type, hr, value); +} + +static const IMFMediaEventGeneratorVtbl video_renderer_events_vtbl = +{ + video_renderer_events_QueryInterface, + video_renderer_events_AddRef, + video_renderer_events_Release, + video_renderer_events_GetEvent, + video_renderer_events_BeginGetEvent, + video_renderer_events_EndGetEvent, + video_renderer_events_QueueEvent, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -340,21 +422,25 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFMediaSink_iface.lpVtbl = &video_renderer_sink_vtbl; object->IMFMediaSinkPreroll_iface.lpVtbl = &video_renderer_preroll_vtbl; object->IMFVideoRenderer_iface.lpVtbl = &video_renderer_vtbl; + object->IMFMediaEventGenerator_iface.lpVtbl = &video_renderer_events_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto failed; + /* Create mixer and presenter. */ if (FAILED(hr = video_renderer_create_mixer(attributes, &object->mixer))) - goto done; + goto failed; if (FAILED(hr = video_renderer_create_presenter(attributes, &object->presenter))) - goto done; + goto failed; *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK; -done: +failed: IMFMediaSink_Release(&object->IMFMediaSink_iface); diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 62dc1813c7..5326425813 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -26,8 +26,6 @@ #include "mfidl.h" #include "rpcproxy.h" -#include "mfapi.h" - #include "mf_private.h" #include "wine/debug.h" diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index f435621973..66d970dfce 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -18,6 +18,7 @@ #include "mferror.h" #include "mfidl.h" +#include "mfapi.h" #include "wine/heap.h" #include "wine/debug.h" diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index cbf7453d04..566ee2f293 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "mfapi.h" #include "mfidl.h" #include "mf_private.h" diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d0365ea856..e2a6b868ca 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -24,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "mfidl.h" -#include "mfapi.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a66bdcf1ee..5d9ccc5408 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3227,6 +3227,7 @@ todo_wine static void test_evr(void) { + IMFMediaEventGenerator *ev_generator; IMFVideoRenderer *video_renderer; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; @@ -3267,6 +3268,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFVideoRenderer_Release(video_renderer); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&ev_generator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaEventGenerator_Release(ev_generator); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index f4cc30a9fc..abe66c45fd 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -26,7 +26,6 @@ #undef INITGUID #include <guiddef.h> -#include "mfapi.h" #include "mfidl.h" #include "wine/debug.h"

1 0

Jacek Caban : server: Get rid of no longer needed write_console_input request.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: a4ab07a653d5bc912e954c1fb970aeabb6daafe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ab07a653d5bc912e954c1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 16:07:50 2020 +0200 server: Get rid of no longer needed write_console_input request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 19 +------------------ server/console.c | 22 ++++------------------ server/protocol.def | 8 -------- server/request.h | 6 ------ server/trace.c | 30 ------------------------------ 5 files changed, 5 insertions(+), 80 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0f1a0b4477..33a0dee4b9 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2148,20 +2148,6 @@ struct get_console_output_info_reply }; -struct write_console_input_request -{ - struct request_header __header; - obj_handle_t handle; - /* VARARG(rec,input_records); */ -}; -struct write_console_input_reply -{ - struct reply_header __header; - int written; - char __pad_12[4]; -}; - - struct write_console_output_request { @@ -5847,7 +5833,6 @@ enum request REQ_create_console_output, REQ_set_console_output_info, REQ_get_console_output_info, - REQ_write_console_input, REQ_write_console_output, REQ_fill_console_output, REQ_read_console_output, @@ -6148,7 +6133,6 @@ union generic_request struct create_console_output_request create_console_output_request; struct set_console_output_info_request set_console_output_info_request; struct get_console_output_info_request get_console_output_info_request; - struct write_console_input_request write_console_input_request; struct write_console_output_request write_console_output_request; struct fill_console_output_request fill_console_output_request; struct read_console_output_request read_console_output_request; @@ -6447,7 +6431,6 @@ union generic_reply struct create_console_output_reply create_console_output_reply; struct set_console_output_info_reply set_console_output_info_reply; struct get_console_output_info_reply get_console_output_info_reply; - struct write_console_input_reply write_console_input_reply; struct write_console_output_reply write_console_output_reply; struct fill_console_output_reply fill_console_output_reply; struct read_console_output_reply read_console_output_reply; @@ -6669,7 +6652,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 617 +#define SERVER_PROTOCOL_VERSION 618 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 57234d3b40..d6673dca1b 100644 --- a/server/console.c +++ b/server/console.c @@ -755,12 +755,12 @@ static int write_console_input( struct console_input* console, int count, INPUT_RECORD *new_rec; struct async *async; - if (!count) return 0; + if (!count) return 1; if (!(new_rec = realloc( console->records, (console->recnum + count) * sizeof(INPUT_RECORD) ))) { set_error( STATUS_NO_MEMORY ); - return -1; + return 0; } console->records = new_rec; memcpy( new_rec + console->recnum, records, count * sizeof(INPUT_RECORD) ); @@ -795,7 +795,7 @@ static int write_console_input( struct console_input* console, int count, release_object( async ); } if (console->recnum) set_event( console->event ); - return count; + return 1; } /* set misc console input information */ @@ -1538,7 +1538,7 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async } case IOCTL_CONDRV_WRITE_INPUT: - return write_console_input( console, get_req_data_size() / sizeof(INPUT_RECORD), get_req_data() ) != -1; + return write_console_input( console, get_req_data_size() / sizeof(INPUT_RECORD), get_req_data() ); case IOCTL_CONDRV_PEEK: if (get_reply_max_size() % sizeof(INPUT_RECORD)) @@ -1845,20 +1845,6 @@ DECL_HANDLER(set_console_mode) set_console_mode( req->handle, req->mode ); } -/* add input records to a console input queue */ -DECL_HANDLER(write_console_input) -{ - struct console_input *console; - - reply->written = 0; - if (!(console = (struct console_input *)get_handle_obj( current->process, req->handle, - FILE_WRITE_PROPERTIES, &console_input_ops ))) - return; - reply->written = write_console_input( console, get_req_data_size() / sizeof(INPUT_RECORD), - get_req_data() ); - release_object( console ); -} - /* appends a string to console's history */ DECL_HANDLER(append_console_input_history) { diff --git a/server/protocol.def b/server/protocol.def index e55d47bcd2..bad8fef790 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1697,14 +1697,6 @@ struct console_renderer_event VARARG(face_name,unicode_str); /* font face name */ @END -/* Add input records to a console input queue */ -(a)REQ(write_console_input) - obj_handle_t handle; /* handle to the console input */ - VARARG(rec,input_records); /* input records */ -(a)REPLY - int written; /* number of records written */ -(a)END - /* write data (chars and/or attributes) in a screen buffer */ @REQ(write_console_output) diff --git a/server/request.h b/server/request.h index a81d64527d..e969173d80 100644 --- a/server/request.h +++ b/server/request.h @@ -195,7 +195,6 @@ DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); DECL_HANDLER(set_console_output_info); DECL_HANDLER(get_console_output_info); -DECL_HANDLER(write_console_input); DECL_HANDLER(write_console_output); DECL_HANDLER(fill_console_output); DECL_HANDLER(read_console_output); @@ -495,7 +494,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_create_console_output, (req_handler)req_set_console_output_info, (req_handler)req_get_console_output_info, - (req_handler)req_write_console_input, (req_handler)req_write_console_output, (req_handler)req_fill_console_output, (req_handler)req_read_console_output, @@ -1236,10 +1234,6 @@ C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_height) == 38 C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_weight) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_pitch_family) == 42 ); C_ASSERT( sizeof(struct get_console_output_info_reply) == 48 ); -C_ASSERT( FIELD_OFFSET(struct write_console_input_request, handle) == 12 ); -C_ASSERT( sizeof(struct write_console_input_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct write_console_input_reply, written) == 8 ); -C_ASSERT( sizeof(struct write_console_input_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct write_console_output_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct write_console_output_request, x) == 16 ); C_ASSERT( FIELD_OFFSET(struct write_console_output_request, y) == 20 ); diff --git a/server/trace.c b/server/trace.c index 16c35b93b5..dfb3930066 100644 --- a/server/trace.c +++ b/server/trace.c @@ -859,22 +859,6 @@ static void dump_varargs_startup_info( const char *prefix, data_size_t size ) remove_data( size ); } -static void dump_varargs_input_records( const char *prefix, data_size_t size ) -{ - const INPUT_RECORD *rec = cur_data; - data_size_t len = size / sizeof(*rec); - - fprintf( stderr,"%s{", prefix ); - while (len > 0) - { - fprintf( stderr, "{%04x,...}", rec->EventType ); - rec++; - if (--len) fputc( ',', stderr ); - } - fputc( '}', stderr ); - remove_data( size ); -} - static void dump_varargs_rectangles( const char *prefix, data_size_t size ) { const rectangle_t *rect = cur_data; @@ -2221,17 +2205,6 @@ static void dump_get_console_output_info_reply( const struct get_console_output_ dump_varargs_unicode_str( ", face_name=", cur_size ); } -static void dump_write_console_input_request( const struct write_console_input_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - dump_varargs_input_records( ", rec=", cur_size ); -} - -static void dump_write_console_input_reply( const struct write_console_input_reply *req ) -{ - fprintf( stderr, " written=%d", req->written ); -} - static void dump_write_console_output_request( const struct write_console_output_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4690,7 +4663,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_console_output_request, (dump_func)dump_set_console_output_info_request, (dump_func)dump_get_console_output_info_request, - (dump_func)dump_write_console_input_request, (dump_func)dump_write_console_output_request, (dump_func)dump_fill_console_output_request, (dump_func)dump_read_console_output_request, @@ -4987,7 +4959,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_console_output_reply, NULL, (dump_func)dump_get_console_output_info_reply, - (dump_func)dump_write_console_input_reply, (dump_func)dump_write_console_output_reply, (dump_func)dump_fill_console_output_reply, (dump_func)dump_read_console_output_reply, @@ -5284,7 +5255,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "create_console_output", "set_console_output_info", "get_console_output_info", - "write_console_input", "write_console_output", "fill_console_output", "read_console_output",

1 0

Alistair Leslie-Hughes : wbemprox: Add more Win32_PhysicalMemory properties.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: fb7cc99f8a8c5a1594cfa780807d5e75f4b9539e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb7cc99f8a8c5a1594cfa780… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 7 17:54:22 2020 +1000 wbemprox: Add more Win32_PhysicalMemory properties. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 11 ++++++++++- dlls/wbemprox/tests/query.c | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2ff3131936..a94d41bfc4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -270,12 +270,15 @@ static const struct column col_physicalmedia[] = }; static const struct column col_physicalmemory[] = { + { L"BankLabel", CIM_STRING }, { L"Capacity", CIM_UINT64 }, + { L"Caption", CIM_STRING }, { L"ConfiguredClockSpeed", CIM_UINT32 }, { L"DeviceLocator", CIM_STRING }, { L"FormFactor", CIM_UINT16 }, { L"MemoryType", CIM_UINT16 }, { L"PartNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING }, }; static const struct column col_pnpentity[] = { @@ -655,12 +658,15 @@ struct record_physicalmedia }; struct record_physicalmemory { + const WCHAR *banklabel; UINT64 capacity; + const WCHAR *caption; UINT32 configuredclockspeed; const WCHAR *devicelocator; UINT16 formfactor; UINT16 memorytype; const WCHAR *partnumber; + const WCHAR *serial; }; struct record_pnpentity { @@ -2905,12 +2911,15 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_physicalmemory *)table->data; + rec->banklabel = L"BANK 0"; rec->capacity = get_total_physical_memory(); - rec->configuredclockspeed = 0; + rec->caption = L"Physical Memory"; + rec->configuredclockspeed = 1600; rec->devicelocator = L"DIMM 0"; rec->formfactor = 8; /* DIMM */ rec->memorytype = 9; /* RAM */ rec->partnumber = NULL; + rec->serial = NULL; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 578e9308df..7dcfd35e93 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1159,10 +1159,14 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) if (count > 0) { + check_property( obj, L"BankLabel", VT_BSTR, CIM_STRING ); check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); + check_property( obj, L"PartNumber", VT_NULL, CIM_STRING ); + check_property( obj, L"SerialNumber", VT_NULL, CIM_STRING ); IWbemClassObject_Release( obj ); } IEnumWbemClassObject_Release( result );

1 0

Nikolay Sivov : mf/evr: Create mixer object on activation.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 502341aa76e2e593e5a151afe5451176971a4832 URL: https://source.winehq.org/git/wine.git/?a=commit;h=502341aa76e2e593e5a151af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:12 2020 +0300 mf/evr: Create mixer object on activation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/evr.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 1d2bfc8a78..b64cdb4a64 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,6 +1,6 @@ MODULE = mf.dll IMPORTLIB = mf -IMPORTS = advapi32 mfplat ole32 uuid mfuuid +IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index e0ab44f8b0..4166c1dd3e 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "mf_private.h" +#include "uuids.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -32,6 +33,8 @@ struct video_renderer IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; LONG refcount; + + IMFTransform *mixer; unsigned int flags; CRITICAL_SECTION cs; }; @@ -90,6 +93,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) if (!refcount) { + if (renderer->mixer) + IMFTransform_Release(renderer->mixer); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -228,9 +233,33 @@ static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl = video_renderer_preroll_NotifyPreroll, }; +static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) +{ + unsigned int flags = 0; + IMFActivate *activate; + CLSID clsid; + HRESULT hr; + + if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, + &IID_IMFActivate, (void **)&activate))) + { + IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, &flags); + hr = IMFActivate_ActivateObject(activate, &IID_IMFTransform, (void **)out); + IMFActivate_Release(activate); + if (FAILED(hr) && !(flags & MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL)) + return hr; + } + + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + + return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); +} + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; + HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj); @@ -242,9 +271,19 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->refcount = 1; InitializeCriticalSection(&object->cs); + /* Create mixer. */ + if (FAILED(hr = video_renderer_create_mixer(attributes, &object->mixer))) + goto done; + *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK; + +done: + + IMFMediaSink_Release(&object->IMFMediaSink_iface); + + return hr; } static void evr_shutdown_object(void *user_context, IUnknown *obj)

1 0

Jacek Caban : kernelbase: Use ioctl for WriteConsoleInputW implementation.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 640773aa9ee64201dd4985254bb259b14f7f640b URL: https://source.winehq.org/git/wine.git/?a=commit;h=640773aa9ee64201dd498525… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 16:07:36 2020 +0200 kernelbase: Use ioctl for WriteConsoleInputW implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 21 +++++++-------------- include/wine/condrv.h | 1 + server/console.c | 3 +++ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 59285f75e1..f5612de407 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1501,9 +1501,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleInputA( HANDLE handle, const INPUT_REC BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleInputW( HANDLE handle, const INPUT_RECORD *buffer, DWORD count, DWORD *written ) { - DWORD events_written = 0; - BOOL ret; - TRACE( "(%p,%p,%d,%p)\n", handle, buffer, count, written ); if (count > 0 && !buffer) @@ -1511,21 +1508,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleInputW( HANDLE handle, const INPUT_REC SetLastError( ERROR_INVALID_ACCESS ); return FALSE; } - SERVER_START_REQ( write_console_input ) - { - req->handle = console_handle_unmap( handle ); - wine_server_add_data( req, buffer, count * sizeof(INPUT_RECORD) ); - if ((ret = !wine_server_call_err( req ))) events_written = reply->written; - } - SERVER_END_REQ; - if (written) *written = events_written; - else + if (!DeviceIoControl( handle, IOCTL_CONDRV_WRITE_INPUT, (void *)buffer, count * sizeof(*buffer), NULL, 0, NULL, NULL )) + return FALSE; + + if (!written) { SetLastError( ERROR_INVALID_ACCESS ); - ret = FALSE; + return FALSE; } - return ret; + *written = count; + return TRUE; } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 3dc6e9714e..f0f6d2ea58 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -25,6 +25,7 @@ /* console input ioctls */ #define IOCTL_CONDRV_READ_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) diff --git a/server/console.c b/server/console.c index 658ce97311..57234d3b40 100644 --- a/server/console.c +++ b/server/console.c @@ -1537,6 +1537,9 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async return read_console_input( console, async, 1 ); } + case IOCTL_CONDRV_WRITE_INPUT: + return write_console_input( console, get_req_data_size() / sizeof(INPUT_RECORD), get_req_data() ) != -1; + case IOCTL_CONDRV_PEEK: if (get_reply_max_size() % sizeof(INPUT_RECORD)) {

1 0