Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetColors.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9c6d0f6eeab8eb58a9cfc4ba3c1d3c9145b1d8db
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9c6d0f6eeab8eb58a9cfc4ba3c1d3c9145b1d8db

Author: Jacek Caban <jacek at 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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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);
 }
 
 /******************************************************************