wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : api-ms-win-core-systemtopology-l1-1-0: New DLL.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 37238a74a5fea133b8dbcf55ca62cd0d80dc49f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37238a74a5fea133b8dbcf55… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 7 10:05:59 2020 -0500 api-ms-win-core-systemtopology-l1-1-0: New DLL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-systemtopology-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 032f4e3d0f..1eafbace7f 100755 --- a/configure +++ b/configure @@ -1030,6 +1030,7 @@ enable_api_ms_win_core_synch_l1_2_1 enable_api_ms_win_core_sysinfo_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_1 +enable_api_ms_win_core_systemtopology_l1_1_0 enable_api_ms_win_core_threadpool_l1_1_0 enable_api_ms_win_core_threadpool_l1_2_0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 @@ -20362,6 +20363,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-synch-l1-2-1 enable_api_ms_win_core wine_fn_config_makefile dlls/api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 +wine_fn_config_makefile dlls/api-ms-win-core-systemtopology-l1-1-0 enable_api_ms_win_core_systemtopology_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-threadpool-l1-1-0 enable_api_ms_win_core_threadpool_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-threadpool-l1-2-0 enable_api_ms_win_core_threadpool_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 diff --git a/configure.ac b/configure.ac index d596422320..4829648c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -2946,6 +2946,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-2-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-2-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-systemtopology-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-legacy-l1-1-0) diff --git a/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in b/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in new file mode 100644 index 0000000000..beed9fb9c2 --- /dev/null +++ b/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-systemtopology-l1-1-0.dll diff --git a/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec b/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec new file mode 100644 index 0000000000..b5365eb930 --- /dev/null +++ b/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetNumaHighestNodeNumber(ptr) kernelbase.GetNumaHighestNodeNumber +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) kernelbase.GetNumaNodeProcessorMaskEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 420d850b73..f60fbbf6d2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -323,6 +323,7 @@ my @dll_groups = "api-ms-win-appmodel-runtime-l1-1-2", "api-ms-win-core-path-l1-1-0", "api-ms-win-core-quirks-l1-1-0", + "api-ms-win-core-systemtopology-l1-1-0", "api-ms-win-security-grouppolicy-l1-1-0", ], [

1 0

Jacek Caban : server: Get rid of no longer needed write_console_input request.
by Alexandre Julliard 07 Jul '20

07 Jul '20

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 */ -@REQ(write_console_input) - obj_handle_t handle; /* handle to the console input */ - VARARG(rec,input_records); /* input records */ -@REPLY - int written; /* number of records written */ -@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

Jacek Caban : kernelbase: Use ioctl for WriteConsoleInputW implementation.
by Alexandre Julliard 07 Jul '20

07 Jul '20

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

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetEditionMode.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: d04baa29e296599f3736ab9bd7c830451eb3335d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d04baa29e296599f3736ab9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 16:07:15 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetEditionMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index b1fc231c77..e919fcf3f1 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1077,15 +1077,9 @@ unsigned CONSOLE_GetNumHistoryEntries(void) */ BOOL CONSOLE_GetEditionMode(HANDLE hConIn, int* mode) { - unsigned ret = 0; - SERVER_START_REQ(get_console_input_info) - { - req->handle = console_handle_unmap(hConIn); - if ((ret = !wine_server_call_err( req ))) - *mode = reply->edition_mode; - } - SERVER_END_REQ; - return ret; + struct condrv_input_info info; + return DeviceIoControl( hConIn, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ) + ? info.edition_mode : 0; } /******************************************************************

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_INPUT_INFO in WINECON_GetServerConfig.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: eff42369e9c59f330083e25a23762df084ce6869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eff42369e9c59f330083e25a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 16:07:02 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_INPUT_INFO in WINECON_GetServerConfig. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 +++ programs/wineconsole/wineconsole.c | 18 ++++++++---------- server/console.c | 5 ++++- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 0107da1f2f..3dc6e9714e 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -31,6 +31,9 @@ /* IOCTL_CONDRV_GET_INPUT_INFO result */ struct condrv_input_info { + unsigned int history_mode; /* whether we duplicate lines in history */ + unsigned int history_size; /* number of lines in history */ + unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ }; diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 38a8c71163..e94af41d2b 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -27,6 +27,7 @@ #include "winecon_private.h" #include "winnls.h" #include "winuser.h" +#include "wine/condrv.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -603,19 +604,16 @@ static void WINECON_Delete(struct inner_data* data) */ static BOOL WINECON_GetServerConfig(struct inner_data* data) { + struct condrv_input_info input_info; BOOL ret; DWORD mode; - SERVER_START_REQ(get_console_input_info) - { - req->handle = wine_server_obj_handle( data->hConIn ); - ret = !wine_server_call_err( req ); - data->curcfg.history_size = reply->history_size; - data->curcfg.history_nodup = reply->history_mode; - data->curcfg.edition_mode = reply->edition_mode; - } - SERVER_END_REQ; - if (!ret) return FALSE; + if (!DeviceIoControl(data->hConIn, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, + &input_info, sizeof(input_info), NULL, NULL)) + return FALSE; + data->curcfg.history_size = input_info.history_size; + data->curcfg.history_nodup = input_info.history_mode; + data->curcfg.edition_mode = input_info.edition_mode; GetConsoleMode(data->hConIn, &mode); data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == diff --git a/server/console.c b/server/console.c index 9e3fa1d673..658ce97311 100644 --- a/server/console.c +++ b/server/console.c @@ -1554,7 +1554,10 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async set_error( STATUS_INVALID_PARAMETER ); return 0; } - info.input_count = console->recnum; + info.history_mode = console->history_mode; + info.history_size = console->history_size; + info.edition_mode = console->edition_mode; + info.input_count = console->recnum; return set_reply_data( &info, sizeof(info) ) != NULL; }

1 0

Piotr Caban : msvcrt: Fix _control87 ambiguous return value.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 33190b694f09a2b4d1ffb4d4a995ada64c7c2a10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33190b694f09a2b4d1ffb4d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 7 16:08:00 2020 +0200 msvcrt: Fix _control87 ambiguous return value. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 1 + dlls/ucrtbase/tests/misc.c | 28 ++++++++++++++++++++++++++++ include/msvcrt/float.h | 3 +++ 3 files changed, 32 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5a4126ad58..2e9154795d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1250,6 +1250,7 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) __control87_2( newval, mask, &flags, &sse2_cw ); if ((flags ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) flags |= MSVCRT__EM_AMBIGUOUS; + flags |= sse2_cw; #elif defined(__x86_64__) unsigned long fpword; unsigned int old_flags; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index eb0c79be2b..cd100cf1a9 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -335,6 +335,33 @@ static void test___fpe_flt_rounds(void) ok((_controlfp(_RC_CHOP, _RC_CHOP) & _RC_CHOP) == _RC_CHOP, "_controlfp(_RC_CHOP, _RC_CHOP) failed\n"); ret = __fpe_flt_rounds(); ok(ret == 0, "__fpe_flt_rounds returned %d\n", ret); + + _controlfp(cfp, _MCW_EM | _MCW_RC | _MCW_PC); +} + +static void test__control87_2(void) +{ +#ifdef __i386__ + unsigned int x86_cw_init, sse2_cw_init, x86_cw, sse2_cw, r; + + r = __control87_2(0, 0, &x86_cw_init, &sse2_cw_init); + ok(r == 1, "__control87_2 returned %d\n", r); + + r = __control87_2(0, _EM_INVALID, &x86_cw, NULL); + ok(r == 1, "__control87_2 returned %d\n", r); + ok(x86_cw == (x86_cw_init & ~_EM_INVALID), "x86_cw = %x, x86_cw_init = %x\n", x86_cw, x86_cw_init); + + r = __control87_2(0, 0, &x86_cw, &sse2_cw); + ok(r == 1, "__control87_2 returned %d\n", r); + ok(x86_cw == (x86_cw_init & ~_EM_INVALID), "x86_cw = %x, x86_cw_init = %x\n", x86_cw, x86_cw_init); + ok(sse2_cw == sse2_cw_init, "sse2_cw = %x, sse2_cw_init = %x\n", sse2_cw, sse2_cw_init); + + r = _control87(0, 0); + ok(r == (x86_cw | sse2_cw | _EM_AMBIGUOUS), "r = %x, expected %x\n", + r, x86_cw | sse2_cw | _EM_AMBIGUOUS); + + _control87(x86_cw_init, ~0); +#endif } static void __cdecl global_invalid_parameter_handler( @@ -1347,6 +1374,7 @@ START_TEST(misc) test__register_onexit_function(); test__execute_onexit_table(); test___fpe_flt_rounds(); + test__control87_2(); test__get_narrow_winmain_command_line(arg_v[0]); test__sopen_dispatch(); test__sopen_s(); diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index 06eadec0ff..0e0ca34219 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -140,6 +140,9 @@ _ACRTIMP int __cdecl __fpe_flt_rounds(void); unsigned int __cdecl _control87(unsigned int, unsigned int); unsigned int __cdecl _controlfp(unsigned int, unsigned int); errno_t __cdecl _controlfp_s(unsigned int *, unsigned int, unsigned int); +#ifdef __i386__ +int __cdecl __control87_2(unsigned int, unsigned int, unsigned int *, unsigned int *); +#endif double __cdecl _copysign (double, double); double __cdecl _chgsign (double);

1 0

Myah Caron : msvcrt: Don't reset MXCSR status in __control87_2 if control information is not changed.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: f2a804b9ea06402f0685ac83374ff7ba0d011bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a804b9ea06402f0685ac83… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Jul 7 16:07:39 2020 +0200 msvcrt: Don't reset MXCSR status in __control87_2 if control information is not changed. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 47 ++++++++++++++++++++++-- dlls/msvcrt/math.c | 86 +++++++++++++++++++++++++------------------- include/msvcrt/float.h | 2 ++ 3 files changed, 95 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2a804b9ea06402f0685…

1 0

Nikolay Sivov : mf/evr: Add events queue support for the sink.
by Alexandre Julliard 07 Jul '20

07 Jul '20

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

Nikolay Sivov : mf/evr: Add IMFVideoRenderer stub.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 8ce49878bcf596c782ee2be3499ecc42699665bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce49878bcf596c782ee2be3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:14 2020 +0300 mf/evr: Add IMFVideoRenderer stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 6 ++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c3ee38c829..92f0ff04fa 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -33,6 +33,7 @@ struct video_renderer { IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; + IMFVideoRenderer IMFVideoRenderer_iface; LONG refcount; IMFTransform *mixer; @@ -51,6 +52,11 @@ static struct video_renderer *impl_from_IMFMediaSinkPreroll(IMFMediaSinkPreroll return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaSinkPreroll_iface); } +static struct video_renderer *impl_from_IMFVideoRenderer(IMFVideoRenderer *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFVideoRenderer_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -66,6 +72,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFMediaSinkPreroll_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoRenderer)) + { + *obj = &renderer->IMFVideoRenderer_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -237,6 +247,40 @@ static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl = video_renderer_preroll_NotifyPreroll, }; +static HRESULT WINAPI video_renderer_QueryInterface(IMFVideoRenderer *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_AddRef(IMFVideoRenderer *iface) +{ + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_Release(IMFVideoRenderer *iface) +{ + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + FIXME("%p, %p, %p.\n", iface, mixer, presenter); + + return E_NOTIMPL; +} + +static const IMFVideoRendererVtbl video_renderer_vtbl = +{ + video_renderer_QueryInterface, + video_renderer_AddRef, + video_renderer_Release, + video_renderer_InitializeRenderer, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -295,6 +339,7 @@ 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->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 691734aa9a..a66bdcf1ee 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -41,6 +41,7 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "initguid.h" #include "mmdeviceapi.h" #include "audioclient.h" +#include "evr.h" #include "wine/test.h" @@ -3226,6 +3227,7 @@ todo_wine static void test_evr(void) { + IMFVideoRenderer *video_renderer; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; IMFActivate *activate; @@ -3261,6 +3263,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaSinkPreroll_Release(preroll); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&video_renderer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoRenderer_Release(video_renderer); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Create presenter object on activation.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 835611ef3e685009e37bb30c576207ad0df96798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=835611ef3e685009e37bb30c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:13 2020 +0300 mf/evr: Create presenter object on activation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4166c1dd3e..c3ee38c829 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -20,6 +20,7 @@ #include "mf_private.h" #include "uuids.h" +#include "evr.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -35,6 +36,7 @@ struct video_renderer LONG refcount; IMFTransform *mixer; + IMFVideoPresenter *presenter; unsigned int flags; CRITICAL_SECTION cs; }; @@ -95,6 +97,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) { if (renderer->mixer) IMFTransform_Release(renderer->mixer); + if (renderer->presenter) + IMFVideoPresenter_Release(renderer->presenter); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -256,6 +260,29 @@ static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransfo return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); } +static HRESULT video_renderer_create_presenter(IMFAttributes *attributes, IMFVideoPresenter **out) +{ + unsigned int flags = 0; + IMFActivate *activate; + CLSID clsid; + HRESULT hr; + + if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, + &IID_IMFActivate, (void **)&activate))) + { + IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, &flags); + hr = IMFActivate_ActivateObject(activate, &IID_IMFVideoPresenter, (void **)out); + IMFActivate_Release(activate); + if (FAILED(hr) && !(flags & MF_ACTIVATE_CUSTOM_PRESENTER_ALLOWFAIL)) + return hr; + } + + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoPresenter9, sizeof(clsid)); + + return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out); +} + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; @@ -271,10 +298,13 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->refcount = 1; InitializeCriticalSection(&object->cs); - /* Create mixer. */ + /* Create mixer and presenter. */ if (FAILED(hr = video_renderer_create_mixer(attributes, &object->mixer))) goto done; + if (FAILED(hr = video_renderer_create_presenter(attributes, &object->presenter))) + goto done; + *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK;

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020