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

Jacek Caban : server: Remove no longer needed get_console_mode and set_console_mode requests.
by Alexandre Julliard July 13, 2020

July 13, 2020

Module: wine Branch: master Commit: 0e46dd09e5c71726f0c120362991cd3b2613295b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e46dd09e5c71726f0c12036… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:27:36 2020 +0200 server: Remove no longer needed get_console_mode and set_console_mode requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 35 +------------------------ server/console.c | 58 ------------------------------------------ server/protocol.def | 14 ---------- server/request.h | 11 -------- server/trace.c | 22 ---------------- 5 files changed, 1 insertion(+), 139 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 28714f0014..8a282155eb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1891,33 +1891,6 @@ struct get_console_wait_event_reply }; -struct get_console_mode_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct get_console_mode_reply -{ - struct reply_header __header; - int mode; - char __pad_12[4]; -}; - - - -struct set_console_mode_request -{ - struct request_header __header; - obj_handle_t handle; - int mode; - char __pad_20[4]; -}; -struct set_console_mode_reply -{ - struct reply_header __header; -}; - - struct set_console_input_info_request { @@ -5694,8 +5667,6 @@ enum request REQ_open_console, REQ_attach_console, REQ_get_console_wait_event, - REQ_get_console_mode, - REQ_set_console_mode, REQ_set_console_input_info, REQ_get_console_input_info, REQ_append_console_input_history, @@ -5991,8 +5962,6 @@ union generic_request struct open_console_request open_console_request; struct attach_console_request attach_console_request; struct get_console_wait_event_request get_console_wait_event_request; - struct get_console_mode_request get_console_mode_request; - struct set_console_mode_request set_console_mode_request; struct set_console_input_info_request set_console_input_info_request; struct get_console_input_info_request get_console_input_info_request; struct append_console_input_history_request append_console_input_history_request; @@ -6286,8 +6255,6 @@ union generic_reply struct open_console_reply open_console_reply; struct attach_console_reply attach_console_reply; struct get_console_wait_event_reply get_console_wait_event_reply; - struct get_console_mode_reply get_console_mode_reply; - struct set_console_mode_reply set_console_mode_reply; struct set_console_input_info_reply set_console_input_info_reply; struct get_console_input_info_reply get_console_input_info_reply; struct append_console_input_history_reply append_console_input_history_reply; @@ -6514,7 +6481,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 623 +#define SERVER_PROTOCOL_VERSION 624 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 577d39bdaa..72e98f14a9 100644 --- a/server/console.c +++ b/server/console.c @@ -715,52 +715,6 @@ static void propagate_console_signal( struct console_input *console, enum_processes(propagate_console_signal_cb, &csi); } -static int get_console_mode( obj_handle_t handle ) -{ - struct object *obj; - int ret = 0; - - if ((obj = get_handle_obj( current->process, handle, FILE_READ_PROPERTIES, NULL ))) - { - if (obj->ops == &console_input_ops) - { - ret = ((struct console_input *)obj)->mode; - } - else if (obj->ops == &screen_buffer_ops) - { - ret = ((struct screen_buffer *)obj)->mode; - } - else - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - release_object( obj ); - } - return ret; -} - -/* changes the mode of either a console input or a screen buffer */ -static int set_console_mode( obj_handle_t handle, int mode ) -{ - struct object *obj; - int ret = 0; - - if (!(obj = get_handle_obj( current->process, handle, FILE_WRITE_PROPERTIES, NULL ))) - return 0; - if (obj->ops == &console_input_ops) - { - /* FIXME: if we remove the edit mode bits, we need (???) to clean up the history */ - ((struct console_input *)obj)->mode = mode; - ret = 1; - } - else if (obj->ops == &screen_buffer_ops) - { - ((struct screen_buffer *)obj)->mode = mode; - ret = 1; - } - else set_error( STATUS_OBJECT_TYPE_MISMATCH ); - release_object( obj ); - return ret; -} - /* retrieve a pointer to the console input records */ static int read_console_input( struct console_input *console, struct async *async, int flush ) { @@ -2003,18 +1957,6 @@ DECL_HANDLER(get_console_input_info) release_object( console ); } -/* get a console mode (input or output) */ -DECL_HANDLER(get_console_mode) -{ - reply->mode = get_console_mode( req->handle ); -} - -/* set a console mode (input or output) */ -DECL_HANDLER(set_console_mode) -{ - set_console_mode( req->handle, req->mode ); -} - /* appends a string to console's history */ DECL_HANDLER(append_console_input_history) { diff --git a/server/protocol.def b/server/protocol.def index 19dd9afb24..36e674f086 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1501,20 +1501,6 @@ enum server_fd_type obj_handle_t event; @END -/* Get a console mode (input or output) */ -(a)REQ(get_console_mode) - obj_handle_t handle; /* handle to the console */ -(a)REPLY - int mode; /* console mode */ -(a)END - - -/* Set a console mode (input or output) */ -(a)REQ(set_console_mode) - obj_handle_t handle; /* handle to the console */ - int mode; /* console mode */ -(a)END - /* Set info about a console (input only) */ @REQ(set_console_input_info) diff --git a/server/request.h b/server/request.h index 2609edc59a..deb547267a 100644 --- a/server/request.h +++ b/server/request.h @@ -185,8 +185,6 @@ DECL_HANDLER(free_console); DECL_HANDLER(open_console); DECL_HANDLER(attach_console); DECL_HANDLER(get_console_wait_event); -DECL_HANDLER(get_console_mode); -DECL_HANDLER(set_console_mode); DECL_HANDLER(set_console_input_info); DECL_HANDLER(get_console_input_info); DECL_HANDLER(append_console_input_history); @@ -481,8 +479,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_open_console, (req_handler)req_attach_console, (req_handler)req_get_console_wait_event, - (req_handler)req_get_console_mode, - (req_handler)req_set_console_mode, (req_handler)req_set_console_input_info, (req_handler)req_get_console_input_info, (req_handler)req_append_console_input_history, @@ -1141,13 +1137,6 @@ C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_wait_event_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_reply, event) == 8 ); C_ASSERT( sizeof(struct get_console_wait_event_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_mode_request, handle) == 12 ); -C_ASSERT( sizeof(struct get_console_mode_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, mode) == 8 ); -C_ASSERT( sizeof(struct get_console_mode_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, mode) == 16 ); -C_ASSERT( sizeof(struct set_console_mode_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, active_sb) == 20 ); diff --git a/server/trace.c b/server/trace.c index 54fe84c417..d244589bae 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2063,22 +2063,6 @@ static void dump_get_console_wait_event_reply( const struct get_console_wait_eve fprintf( stderr, " event=%04x", req->event ); } -static void dump_get_console_mode_request( const struct get_console_mode_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - -static void dump_get_console_mode_reply( const struct get_console_mode_reply *req ) -{ - fprintf( stderr, " mode=%d", req->mode ); -} - -static void dump_set_console_mode_request( const struct set_console_mode_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", mode=%d", req->mode ); -} - static void dump_set_console_input_info_request( const struct set_console_input_info_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4590,8 +4574,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_console_request, (dump_func)dump_attach_console_request, (dump_func)dump_get_console_wait_event_request, - (dump_func)dump_get_console_mode_request, - (dump_func)dump_set_console_mode_request, (dump_func)dump_set_console_input_info_request, (dump_func)dump_get_console_input_info_request, (dump_func)dump_append_console_input_history_request, @@ -4883,8 +4865,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_console_reply, (dump_func)dump_attach_console_reply, (dump_func)dump_get_console_wait_event_reply, - (dump_func)dump_get_console_mode_reply, - NULL, NULL, (dump_func)dump_get_console_input_info_reply, NULL, @@ -5176,8 +5156,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "open_console", "attach_console", "get_console_wait_event", - "get_console_mode", - "set_console_mode", "set_console_input_info", "get_console_input_info", "append_console_input_history",

1 0

Zebediah Figura : msdmo: Use a dynamically allocated buffer in IEnumDMO::Next().
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: caa41d4917a84dbbeb4aa14f18cfecfd17efe71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=caa41d4917a84dbbeb4aa14f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:50 2020 -0500 msdmo: Use a dynamically allocated buffer in IEnumDMO::Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 76 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 15 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index ab3fda743c..a23bd95512 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -32,6 +32,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdmo); +BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int count, unsigned int size) +{ + unsigned int max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~0u / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(8, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + { + ERR("Failed to allocate memory.\n"); + return FALSE; + } + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + typedef struct { IEnumDMO IEnumDMO_iface; @@ -51,8 +80,6 @@ static inline IEnumDMOImpl *impl_from_IEnumDMO(IEnumDMO *iface) return CONTAINING_RECORD(iface, IEnumDMOImpl, IEnumDMO_iface); } -static HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types); - static const IEnumDMOVtbl edmovt; static const WCHAR *GUIDToString(WCHAR *string, const GUID *guid) @@ -443,11 +470,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( WCHAR ** Names, DWORD * pcItemsFetched) { + DMO_PARTIAL_MEDIATYPE *types = NULL; + unsigned int types_size = 0; HKEY hkey; WCHAR szNextKey[MAX_PATH]; WCHAR path[MAX_PATH]; WCHAR szValue[MAX_PATH]; - DMO_PARTIAL_MEDIATYPE types[100]; DWORD len; UINT count = 0; HRESULT hres = S_OK; @@ -498,21 +526,29 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pInTypes) { - DWORD cInTypes, i; + DWORD size = types_size, i; - hres = read_types(hkey, L"InputTypes", &cInTypes, ARRAY_SIZE(types), types); - if (FAILED(hres)) + while ((ret = RegQueryValueExW(hkey, L"InputTypes", NULL, NULL, + (BYTE *)types, &size)) == ERROR_MORE_DATA) + { + if (!array_reserve((void **)&types, &types_size, size, 1)) + { + RegCloseKey(hkey); + free(types); + return E_OUTOFMEMORY; + } + } + if (ret) { RegCloseKey(hkey); continue; } - for (i = 0; i < cInTypes; i++) { + for (i = 0; i < size / sizeof(DMO_PARTIAL_MEDIATYPE); ++i) TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), debugstr_guid(&types[i].subtype)); - } - if (!any_types_match(types, cInTypes, This->pInTypes, This->cInTypes)) + if (!any_types_match(types, size / sizeof(DMO_PARTIAL_MEDIATYPE), This->pInTypes, This->cInTypes)) { RegCloseKey(hkey); continue; @@ -521,21 +557,29 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pOutTypes) { - DWORD cOutTypes, i; + DWORD size = types_size, i; - hres = read_types(hkey, L"OutputTypes", &cOutTypes, ARRAY_SIZE(types), types); - if (FAILED(hres)) + while ((ret = RegQueryValueExW(hkey, L"OutputTypes", NULL, NULL, + (BYTE *)types, &size)) == ERROR_MORE_DATA) + { + if (!array_reserve((void **)&types, &types_size, size, 1)) + { + RegCloseKey(hkey); + free(types); + return E_OUTOFMEMORY; + } + } + if (ret) { RegCloseKey(hkey); continue; } - for (i = 0; i < cOutTypes; i++) { + for (i = 0; i < size / sizeof(DMO_PARTIAL_MEDIATYPE); ++i) TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), debugstr_guid(&types[i].subtype)); - } - if (!any_types_match(types, cOutTypes, This->pOutTypes, This->cOutTypes)) + if (!any_types_match(types, size / sizeof(DMO_PARTIAL_MEDIATYPE), This->pOutTypes, This->cOutTypes)) { RegCloseKey(hkey); continue; @@ -561,6 +605,8 @@ static HRESULT WINAPI IEnumDMO_fnNext( count++; } + free(types); + if (pcItemsFetched) *pcItemsFetched = count; if (count < cItemsToFetch) hres = S_FALSE;

1 0

Zebediah Figura : msdmo: Remove dead code associated with an older registry format.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: fb64420673012b4b26d126b3ebf8fcecff719fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb64420673012b4b26d126b3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:46 2020 -0500 msdmo: Remove dead code associated with an older registry format. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 113 +++------------------------------------------------- 1 file changed, 6 insertions(+), 107 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 1a35b41f46..ffe64782d1 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -32,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdmo); -#define MSDMO_MAJOR_VERSION 6 - static const WCHAR szDMORootKey[] = { 'D','i','r','e','c','t','S','h','o','w','\\', @@ -139,40 +137,8 @@ static BOOL IsMediaTypeEqual(const DMO_PARTIAL_MEDIATYPE* mt1, const DMO_PARTIAL static HRESULT write_types(HKEY hkey, LPCWSTR name, const DMO_PARTIAL_MEDIATYPE* types, DWORD count) { - LONG ret; - - if (MSDMO_MAJOR_VERSION > 5) - { - ret = RegSetValueExW(hkey, name, 0, REG_BINARY, (const BYTE*) types, - count* sizeof(DMO_PARTIAL_MEDIATYPE)); - } - else - { - HKEY skey1,skey2,skey3; - DWORD index = 0; - WCHAR szGuidKey[64]; - - ret = RegCreateKeyExW(hkey, name, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &skey1, NULL); - if (ret) - return HRESULT_FROM_WIN32(ret); - - while (index < count) - { - GUIDToString(szGuidKey,&types[index].type); - ret = RegCreateKeyExW(skey1, szGuidKey, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey2, NULL); - GUIDToString(szGuidKey,&types[index].subtype); - ret = RegCreateKeyExW(skey2, szGuidKey, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey3, NULL); - RegCloseKey(skey3); - RegCloseKey(skey2); - index ++; - } - RegCloseKey(skey1); - } - - return HRESULT_FROM_WIN32(ret); + return HRESULT_FROM_WIN32(RegSetValueExW(hkey, name, 0, REG_BINARY, + (const BYTE *)types, count * sizeof(DMO_PARTIAL_MEDIATYPE))); } /*************************************************************** @@ -766,78 +732,11 @@ static const IEnumDMOVtbl edmovt = HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types ) { - HRESULT ret = S_OK; + DWORD len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); + LONG ret = RegQueryValueExW(root, key, NULL, NULL, (BYTE *)types, &len); - if (MSDMO_MAJOR_VERSION > 5) - { - DWORD len; - LONG rc; - - len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); - rc = RegQueryValueExW(root, key, NULL, NULL, (LPBYTE) types, &len); - ret = HRESULT_FROM_WIN32(rc); - - *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); - } - else - { - HKEY hkey; - WCHAR szGuidKey[64]; - - *supplied = 0; - if (ERROR_SUCCESS == RegOpenKeyExW(root, key, 0, KEY_READ, &hkey)) - { - int index = 0; - WCHAR szNextKey[MAX_PATH]; - DWORD len; - LONG rc = ERROR_SUCCESS; - - while (rc == ERROR_SUCCESS) - { - len = MAX_PATH; - rc = RegEnumKeyExW(hkey, index, szNextKey, &len, NULL, NULL, NULL, NULL); - if (rc == ERROR_SUCCESS) - { - HKEY subk; - int sub_index = 0; - LONG rcs = ERROR_SUCCESS; - WCHAR szSubKey[MAX_PATH]; - - RegOpenKeyExW(hkey, szNextKey, 0, KEY_READ, &subk); - while (rcs == ERROR_SUCCESS) - { - len = MAX_PATH; - rcs = RegEnumKeyExW(subk, sub_index, szSubKey, &len, NULL, NULL, NULL, NULL); - if (rcs == ERROR_SUCCESS) - { - if (*supplied >= requested) - { - /* Bailing */ - ret = S_FALSE; - rc = ERROR_MORE_DATA; - rcs = ERROR_MORE_DATA; - break; - } - - wsprintfW(szGuidKey,szToGuidFmt,szNextKey); - CLSIDFromString(szGuidKey, &types[*supplied].type); - wsprintfW(szGuidKey,szToGuidFmt,szSubKey); - CLSIDFromString(szGuidKey, &types[*supplied].subtype); - TRACE("Adding type %s subtype %s at index %i\n", - debugstr_guid(&types[*supplied].type), - debugstr_guid(&types[*supplied].subtype), - *supplied); - (*supplied)++; - } - sub_index++; - } - index++; - } - } - RegCloseKey(hkey); - } - } - return ret; + *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); + return HRESULT_FROM_WIN32(ret); } /***************************************************************

1 0

Jacek Caban : server: Remove no longer used set_console_output_info request.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 4d57e8f937fc866d092539ceafb989d740462d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d57e8f937fc866d092539ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:08:23 2020 +0200 server: Remove no longer used set_console_output_info request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 10 +++ include/wine/server_protocol.h | 47 +--------- server/console.c | 191 ----------------------------------------- server/protocol.def | 36 -------- server/request.h | 23 ----- server/trace.c | 29 ------- 6 files changed, 11 insertions(+), 325 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d57e8f937fc866d0925…

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetColors.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 9c6d0f6eeab8eb58a9cfc4ba3c1d3c9145b1d8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c6d0f6eeab8eb58a9cfc4ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:08:15 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetColors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 41710057ea..94ef6c3dec 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -218,20 +218,15 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) */ static void WINECON_SetColors(struct inner_data *data, const struct config_data* cfg) { - size_t color_map_size = sizeof(data->curcfg.color_map); + struct condrv_output_info_params params = + { SET_CONSOLE_OUTPUT_INFO_COLORTABLE | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR }; - memcpy(data->curcfg.color_map, cfg->color_map, color_map_size); + memcpy(data->curcfg.color_map, cfg->color_map, sizeof(data->curcfg.color_map)); data->curcfg.popup_attr = cfg->popup_attr; - SERVER_START_REQ( set_console_output_info ) - { - req->handle = wine_server_obj_handle( data->hConOut ); - req->mask = SET_CONSOLE_OUTPUT_INFO_COLORTABLE | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR; - req->popup_attr = cfg->popup_attr; - wine_server_add_data( req, cfg->color_map, color_map_size ); - wine_server_call( req ); - } - SERVER_END_REQ; + params.info.popup_attr = cfg->popup_attr; + memcpy(params.info.color_map, cfg->color_map, sizeof(cfg->color_map)); + DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /******************************************************************

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetConfig.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 6695ca86a29c4ba3844445480d5591c0dd75a824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6695ca86a29c4ba384444548… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:08:04 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetConfig. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 88c9ca400a..41710057ea 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -454,23 +454,24 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_pitch_family != cfg->font_pitch_family || data->curcfg.font_weight != cfg->font_weight) { + struct condrv_output_info_params *params; + size_t len = lstrlenW(cfg->face_name); RECT r; data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); SystemParametersInfoW(SPI_GETWORKAREA, 0, &r, 0); - SERVER_START_REQ(set_console_output_info) + if ((params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*params) + len * sizeof(WCHAR)))) { - req->handle = wine_server_obj_handle( data->hConOut ); - req->mask = SET_CONSOLE_OUTPUT_INFO_MAX_SIZE | SET_CONSOLE_OUTPUT_INFO_FONT; - req->max_width = (r.right - r.left) / cfg->cell_width; - req->max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height; - req->font_width = cfg->cell_width; - req->font_height = cfg->cell_height; - req->font_weight = cfg->font_weight; - req->font_pitch_family = cfg->font_pitch_family; - wine_server_add_data( req, cfg->face_name, lstrlenW(cfg->face_name) * sizeof(WCHAR) ); - wine_server_call( req ); + params->mask = SET_CONSOLE_OUTPUT_INFO_MAX_SIZE | SET_CONSOLE_OUTPUT_INFO_FONT; + params->info.max_width = (r.right - r.left) / cfg->cell_width; + params->info.max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height; + params->info.font_width = cfg->cell_width; + params->info.font_height = cfg->cell_height; + params->info.font_weight = cfg->font_weight; + params->info.font_pitch_family = cfg->font_pitch_family; + memcpy(params + 1, cfg->face_name, len * sizeof(WCHAR)); + DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, params, sizeof(*params) + len * sizeof(WCHAR), + NULL, 0, NULL, NULL); } - SERVER_END_REQ; } if (data->curcfg.def_attr != cfg->def_attr) {

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleWindowInfo.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 07194e9287eb2e2adbc2d1bdff204b4f8dec3ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07194e9287eb2e2adbc2d1bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:50 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleWindowInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 85854851ce..cc30a11d68 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1406,8 +1406,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTitleW( LPCWSTR title ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute, SMALL_RECT *window ) { + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW }; SMALL_RECT rect = *window; - BOOL ret; TRACE( "(%p,%d,(%d,%d-%d,%d))\n", handle, absolute, rect.Left, rect.Top, rect.Right, rect.Bottom ); @@ -1421,19 +1421,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute rect.Right += info.srWindow.Right; rect.Bottom += info.srWindow.Bottom; } - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->win_left = rect.Left; - req->win_top = rect.Top; - req->win_right = rect.Right; - req->win_bottom = rect.Bottom; - req->mask = SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + params.info.win_left = rect.Left; + params.info.win_top = rect.Top; + params.info.win_right = rect.Right; + params.info.win_bottom = rect.Bottom; + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_OUTPUT_INFO ioctl.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 86acbd0122ddad629f4ac55595782f2c704d54dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=86acbd0122ddad629f4ac555… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:03 2020 +0200 server: Introduce IOCTL_CONDRV_SET_OUTPUT_INFO ioctl. Based on set_console_output_info request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 10 ++- server/console.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 1 deletion(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 4d681f6ea7..49eb3459c0 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -30,7 +30,8 @@ #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) /* console output ioctls */ -#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -68,6 +69,13 @@ struct condrv_output_info unsigned int color_map[16]; /* color table */ }; +/* IOCTL_CONDRV_SET_OUTPUT_INFO params */ +struct condrv_output_info_params +{ + unsigned int mask; /* setting mask */ + struct condrv_output_info info; /* output info */ +}; + /* IOCTL_CONDRV_GET_RENDERER_EVENTS result */ struct condrv_renderer_event { diff --git a/server/console.c b/server/console.c index ba2e4c776d..89f6fae863 100644 --- a/server/console.c +++ b/server/console.c @@ -1196,6 +1196,187 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, return 1; } +static int set_output_info( struct screen_buffer *screen_buffer, + const struct condrv_output_info_params *params, data_size_t extra_size ) +{ + const struct condrv_output_info *info = &params->info; + struct condrv_renderer_event evt; + WCHAR *font_name; + + if (params->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM) + { + if (info->cursor_size < 1 || info->cursor_size > 100) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (screen_buffer->cursor_size != info->cursor_size || + screen_buffer->cursor_visible != info->cursor_visible) + { + screen_buffer->cursor_size = info->cursor_size; + screen_buffer->cursor_visible = info->cursor_visible; + evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.cursor_geom.size = info->cursor_size; + evt.u.cursor_geom.visible = info->cursor_visible; + console_input_events_append( screen_buffer->input, &evt ); + } + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_POS) + { + if (info->cursor_x < 0 || info->cursor_x >= screen_buffer->width || + info->cursor_y < 0 || info->cursor_y >= screen_buffer->height) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (screen_buffer->cursor_x != info->cursor_x || screen_buffer->cursor_y != info->cursor_y) + { + screen_buffer->cursor_x = info->cursor_x; + screen_buffer->cursor_y = info->cursor_y; + evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.cursor_pos.x = info->cursor_x; + evt.u.cursor_pos.y = info->cursor_y; + console_input_events_append( screen_buffer->input, &evt ); + } + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_SIZE) + { + unsigned cc; + + /* new screen-buffer cannot be smaller than actual window */ + if (info->width < screen_buffer->win.right - screen_buffer->win.left + 1 || + info->height < screen_buffer->win.bottom - screen_buffer->win.top + 1) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + /* FIXME: there are also some basic minimum and max size to deal with */ + if (!change_screen_buffer_size( screen_buffer, info->width, info->height )) return 0; + + evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.resize.width = info->width; + evt.u.resize.height = info->height; + console_input_events_append( screen_buffer->input, &evt ); + + evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.update.top = 0; + evt.u.update.bottom = screen_buffer->height - 1; + console_input_events_append( screen_buffer->input, &evt ); + + /* scroll window to display sb */ + if (screen_buffer->win.right >= info->width) + { + screen_buffer->win.right -= screen_buffer->win.left; + screen_buffer->win.left = 0; + } + if (screen_buffer->win.bottom >= info->height) + { + screen_buffer->win.bottom -= screen_buffer->win.top; + screen_buffer->win.top = 0; + } + /* reset cursor if needed (normally, if cursor was outside of new sb, the + * window has been shifted so that the new position of the cursor will be + * visible */ + cc = 0; + if (screen_buffer->cursor_x >= info->width) + { + screen_buffer->cursor_x = info->width - 1; + cc++; + } + if (screen_buffer->cursor_y >= info->height) + { + screen_buffer->cursor_y = info->height - 1; + cc++; + } + if (cc) + { + evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.cursor_pos.x = info->cursor_x; + evt.u.cursor_pos.y = info->cursor_y; + console_input_events_append( screen_buffer->input, &evt ); + } + + if (screen_buffer == screen_buffer->input->active && + screen_buffer->input->mode & ENABLE_WINDOW_INPUT) + { + INPUT_RECORD ir; + ir.EventType = WINDOW_BUFFER_SIZE_EVENT; + ir.Event.WindowBufferSizeEvent.dwSize.X = info->width; + ir.Event.WindowBufferSizeEvent.dwSize.Y = info->height; + write_console_input( screen_buffer->input, 1, &ir ); + } + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_ATTR) + { + screen_buffer->attr = info->attr; + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR) + { + screen_buffer->popup_attr = info->popup_attr; + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW) + { + if (info->win_left < 0 || info->win_left > info->win_right || + info->win_right >= screen_buffer->width || + info->win_top < 0 || info->win_top > info->win_bottom || + info->win_bottom >= screen_buffer->height) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (screen_buffer->win.left != info->win_left || screen_buffer->win.top != info->win_top || + screen_buffer->win.right != info->win_right || screen_buffer->win.bottom != info->win_bottom) + { + screen_buffer->win.left = info->win_left; + screen_buffer->win.top = info->win_top; + screen_buffer->win.right = info->win_right; + screen_buffer->win.bottom = info->win_bottom; + evt.event = CONSOLE_RENDERER_DISPLAY_EVENT; + memset( &evt.u, 0, sizeof(evt.u) ); + evt.u.display.left = info->win_left; + evt.u.display.top = info->win_top; + evt.u.display.width = info->win_right - info->win_left + 1; + evt.u.display.height = info->win_bottom - info->win_top + 1; + console_input_events_append( screen_buffer->input, &evt ); + } + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_MAX_SIZE) + { + screen_buffer->max_width = info->max_width; + screen_buffer->max_height = info->max_height; + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) + { + memcpy( screen_buffer->color_map, info->color_map, sizeof(info->color_map) ); + } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) + { + screen_buffer->font.width = info->font_width; + screen_buffer->font.height = info->font_height; + screen_buffer->font.weight = info->font_weight; + screen_buffer->font.pitch_family = info->font_pitch_family; + if (extra_size) + { + extra_size = extra_size / sizeof(WCHAR) * sizeof(WCHAR); + font_name = mem_alloc( extra_size ); + if (font_name) + { + memcpy( font_name, info + 1, extra_size ); + free( screen_buffer->font.face_name ); + screen_buffer->font.face_name = font_name; + screen_buffer->font.face_len = extra_size; + } + } + } + + return 1; +} + /* appends a new line to history (history is a fixed size array) */ static void console_input_append_hist( struct console_input* console, const WCHAR* buf, data_size_t len ) { @@ -1675,6 +1856,22 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 1; } + case IOCTL_CONDRV_SET_OUTPUT_INFO: + { + const struct condrv_output_info_params *params = get_req_data(); + if (get_req_data_size() < sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (!screen_buffer->input) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return set_output_info( screen_buffer, params, get_req_data_size() - sizeof(*params) ); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Zebediah Figura : msdmo: Avoid a redundant string -> GUID conversion.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 42a8f382ed07595ab093a4da6452814099275e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a8f382ed07595ab093a4da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:47 2020 -0500 msdmo: Avoid a redundant string -> GUID conversion. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index ffe64782d1..3143cfc5e2 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -75,12 +75,6 @@ static const WCHAR szCat2Fmt[] = '%','s','\\','%','s',0 }; -static const WCHAR szToGuidFmt[] = -{ - '{','%','s','}',0 -}; - - typedef struct { IEnumDMO IEnumDMO_iface; @@ -482,7 +476,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( { HKEY hkey; WCHAR szNextKey[MAX_PATH]; - WCHAR szGuidKey[64]; WCHAR szKey[MAX_PATH]; WCHAR szValue[MAX_PATH]; DMO_PARTIAL_MEDIATYPE types[100]; @@ -490,7 +483,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( UINT count = 0; HRESULT hres = S_OK; LONG ret; - GUID guid; IEnumDMOImpl *This = impl_from_IEnumDMO(iface); @@ -514,7 +506,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( break; } - if (string_to_guid(szNextKey, &guid) != S_OK) + if (string_to_guid(szNextKey, &pCLSID[count]) != S_OK) continue; TRACE("found %s\n", debugstr_w(szNextKey)); @@ -622,8 +614,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( lstrcpyW(Names[count], szValue); } } - wsprintfW(szGuidKey,szToGuidFmt,szNextKey); - CLSIDFromString(szGuidKey, &pCLSID[count]); TRACE("found match %s %s\n", debugstr_w(szValue), debugstr_w(szNextKey)); RegCloseKey(hkey);

1 0

Zebediah Figura : kernel32/tests: Avoid testing that WaitCommEvent() doesn't return immediately.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 39f59eb020a5de9d8424cdc6bdb93211a86a0d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f59eb020a5de9d8424cdc6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 9 22:58:09 2020 -0500 kernel32/tests: Avoid testing that WaitCommEvent() doesn't return immediately. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index a43a290947..f82e5e6067 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -852,7 +852,7 @@ static void test_waittxempty(void) before = GetTickCount(); SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); - ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); + ok(res || GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); after = GetTickCount(); ok(after - before < 30, "WaitCommEvent should have returned immediately, took %d ms\n", after - before); res = WaitForSingleObject(ovl_wait.hEvent, 1500);

1 0