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

Zebediah Figura : msdmo: Return S_OK from DMOGetTypes() even if the buffer is too short.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 03a2191449ab9bbcc118e46e5bac3a7483d509dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a2191449ab9bbcc118e46e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 09:38:02 2020 -0500 msdmo: Return S_OK from DMOGetTypes() even if the buffer is too short. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 92 ++++++++++++++++++++---------------------------- dlls/msdmo/tests/msdmo.c | 2 +- 2 files changed, 39 insertions(+), 55 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index a23bd95512..cd253c3e9a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -706,62 +706,46 @@ static const IEnumDMOVtbl edmovt = IEnumDMO_fnClone, }; - -HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types ) -{ - DWORD len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); - LONG ret = RegQueryValueExW(root, key, NULL, NULL, (BYTE *)types, &len); - - *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); - return HRESULT_FROM_WIN32(ret); -} - /*************************************************************** * DMOGetTypes (MSDMO.@) */ -HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO, - ULONG ulInputTypesRequested, - ULONG* pulInputTypesSupplied, - DMO_PARTIAL_MEDIATYPE* pInputTypes, - ULONG ulOutputTypesRequested, - ULONG* pulOutputTypesSupplied, - DMO_PARTIAL_MEDIATYPE* pOutputTypes) +HRESULT WINAPI DMOGetTypes(REFCLSID clsid, ULONG input_count, ULONG *ret_input_count, DMO_PARTIAL_MEDIATYPE *input, + ULONG output_count, ULONG *ret_output_count, DMO_PARTIAL_MEDIATYPE *output) { - HKEY root,hkey; - HRESULT ret = S_OK; - WCHAR szguid[64]; - - TRACE ("(%s,%u,%p,%p,%u,%p,%p)\n", debugstr_guid(clsidDMO), ulInputTypesRequested, - pulInputTypesSupplied, pInputTypes, ulOutputTypesRequested, pulOutputTypesSupplied, - pOutputTypes); - - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"DirectShow\\MediaObjects", 0, KEY_READ, &root)) - return E_FAIL; - - if (ERROR_SUCCESS != RegOpenKeyExW(root,GUIDToString(szguid,clsidDMO) , 0, - KEY_READ, &hkey)) - { - RegCloseKey(root); - return E_FAIL; - } - - if (ulInputTypesRequested > 0) - { - ret = read_types(hkey, L"InputTypes", pulInputTypesSupplied, ulInputTypesRequested, pInputTypes ); - } - else - *pulInputTypesSupplied = 0; - - if (ulOutputTypesRequested > 0) - { - HRESULT ret2; - ret2 = read_types(hkey, L"OutputTypes", pulOutputTypesSupplied, ulOutputTypesRequested, pOutputTypes ); - - if (ret == S_OK) - ret = ret2; - } - else - *pulOutputTypesSupplied = 0; - - return ret; + WCHAR guidstr[64]; + HKEY root, key; + LSTATUS ret; + DWORD size; + + TRACE("clsid %s, input_count %u, ret_input_count %p, input %p, output_count %u, ret_output_count %p, output %p.\n", + debugstr_guid(clsid), input_count, ret_input_count, input, output_count, ret_output_count, output); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"DirectShow\\MediaObjects", 0, KEY_READ, &root)) + return E_FAIL; + + if (RegOpenKeyExW(root, GUIDToString(guidstr, clsid), 0, KEY_READ, &key)) + { + RegCloseKey(root); + return E_FAIL; + } + + *ret_input_count = 0; + if (input_count > 0) + { + size = input_count * sizeof(DMO_PARTIAL_MEDIATYPE); + ret = RegQueryValueExW(key, L"InputTypes", NULL, NULL, (BYTE *)input, &size); + if (!ret || ret == ERROR_MORE_DATA) + *ret_input_count = size / sizeof(DMO_PARTIAL_MEDIATYPE); + } + + *ret_output_count = 0; + if (output_count > 0) + { + size = output_count * sizeof(DMO_PARTIAL_MEDIATYPE); + ret = RegQueryValueExW(key, L"OutputTypes", NULL, NULL, (BYTE *)output, &size); + if (!ret || ret == ERROR_MORE_DATA) + *ret_output_count = size / sizeof(DMO_PARTIAL_MEDIATYPE); + } + + return S_OK; } diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 14653ea8d7..2afa56e5a6 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -143,7 +143,7 @@ static void test_DMOGetTypes(void) memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 1, &input_count, types, 0, &output_count, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(input_count == 1, "Got input count %u.\n", input_count); ok(!output_count, "Got output count %u.\n", output_count); todo_wine ok(!memcmp(types, input_types, sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n");

1 0

Zebediah Figura : msdmo: Return the number of media types retrieved from DMOGetTypes().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 37b926b8fe57e3242b0729598f33f0ad69a2c55f URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b926b8fe57e3242b072959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 09:38:03 2020 -0500 msdmo: Return the number of media types retrieved from DMOGetTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 22 ++++++++-------------- dlls/msdmo/tests/msdmo.c | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index cd253c3e9a..8c32a8f59f 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -730,22 +730,16 @@ HRESULT WINAPI DMOGetTypes(REFCLSID clsid, ULONG input_count, ULONG *ret_input_c } *ret_input_count = 0; - if (input_count > 0) - { - size = input_count * sizeof(DMO_PARTIAL_MEDIATYPE); - ret = RegQueryValueExW(key, L"InputTypes", NULL, NULL, (BYTE *)input, &size); - if (!ret || ret == ERROR_MORE_DATA) - *ret_input_count = size / sizeof(DMO_PARTIAL_MEDIATYPE); - } + size = input_count * sizeof(DMO_PARTIAL_MEDIATYPE); + ret = RegQueryValueExW(key, L"InputTypes", NULL, NULL, (BYTE *)input, &size); + if (!ret || ret == ERROR_MORE_DATA) + *ret_input_count = min(input_count, size / sizeof(DMO_PARTIAL_MEDIATYPE)); *ret_output_count = 0; - if (output_count > 0) - { - size = output_count * sizeof(DMO_PARTIAL_MEDIATYPE); - ret = RegQueryValueExW(key, L"OutputTypes", NULL, NULL, (BYTE *)output, &size); - if (!ret || ret == ERROR_MORE_DATA) - *ret_output_count = size / sizeof(DMO_PARTIAL_MEDIATYPE); - } + size = output_count * sizeof(DMO_PARTIAL_MEDIATYPE); + ret = RegQueryValueExW(key, L"OutputTypes", NULL, NULL, (BYTE *)output, &size); + if (!ret || ret == ERROR_MORE_DATA) + *ret_output_count = min(output_count, size / sizeof(DMO_PARTIAL_MEDIATYPE)); return S_OK; } diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 2afa56e5a6..a1ab8ee00d 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -144,7 +144,7 @@ static void test_DMOGetTypes(void) memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 1, &input_count, types, 0, &output_count, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(input_count == 1, "Got input count %u.\n", input_count); + ok(input_count == 1, "Got input count %u.\n", input_count); ok(!output_count, "Got output count %u.\n", output_count); todo_wine ok(!memcmp(types, input_types, sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n");

1 0

Zebediah Figura : msdmo: Avoid leaking key handles in DMOGetTypes().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 78d2a0919ebf7936e424effb5f54c3ff04469330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d2a0919ebf7936e424effb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 09:38:04 2020 -0500 msdmo: Avoid leaking key handles in DMOGetTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 8c32a8f59f..8e0680931f 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -741,5 +741,7 @@ HRESULT WINAPI DMOGetTypes(REFCLSID clsid, ULONG input_count, ULONG *ret_input_c if (!ret || ret == ERROR_MORE_DATA) *ret_output_count = min(output_count, size / sizeof(DMO_PARTIAL_MEDIATYPE)); + RegCloseKey(key); + RegCloseKey(root); return S_OK; }

1 0

Zebediah Figura : devenum: Call DMOGetTypes() until less types are returned than were allocated.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 58c3b5c100046395670ee986b99d5be849c29048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58c3b5c100046395670ee986… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 09:38:05 2020 -0500 devenum: Call DMOGetTypes() until less types are returned than were allocated. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 16b729ab1f..ab675b5656 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -147,28 +147,27 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, }; unsigned int count = 1, input_count, output_count, i; - DMO_PARTIAL_MEDIATYPE *types = NULL; + DMO_PARTIAL_MEDIATYPE *types = NULL, *new_array; REGPINTYPES *reg_types; HRESULT hr; - if (!(types = malloc(2 * count * sizeof(*types)))) - return E_OUTOFMEMORY; - - while ((hr = DMOGetTypes(&moniker->clsid, count, &input_count, types, - count, &output_count, types + count)) == S_FALSE) + do { count *= 2; - if (!(types = realloc(types, count * sizeof(*types)))) + if (!(new_array = realloc(types, 2 * count * sizeof(*types)))) { free(types); return E_OUTOFMEMORY; } - } - if (hr != S_OK) - { - free(types); - return hr; - } + types = new_array; + + if (FAILED(hr = DMOGetTypes(&moniker->clsid, count, &input_count, types, + count, &output_count, types + count))) + { + free(types); + return hr; + } + } while (input_count == count || output_count == count); if (!(reg_types = malloc(2 * count * sizeof(*reg_types)))) {

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_MODE ioctl.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 409160bb596e44bcceee24d9ecd4d2629cbd6cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409160bb596e44bcceee24d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:26:29 2020 +0200 server: Introduce IOCTL_CONDRV_GET_MODE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 +++ server/console.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 5992834069..c30802be66 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -23,6 +23,9 @@ #include "winioctl.h" +/* common console input and output ioctls */ +#define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) + /* 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) diff --git a/server/console.c b/server/console.c index a91d963a41..4c161fccb0 100644 --- a/server/console.c +++ b/server/console.c @@ -1576,6 +1576,14 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { + case IOCTL_CONDRV_GET_MODE: + if (get_reply_max_size() != sizeof(console->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + return set_reply_data( &console->mode, sizeof(console->mode) ) != NULL; + case IOCTL_CONDRV_READ_INPUT: { int blocking = 0; @@ -1641,6 +1649,14 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { + case IOCTL_CONDRV_GET_MODE: + if (get_reply_max_size() != sizeof(screen_buffer->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + return set_reply_data( &screen_buffer->mode, sizeof(screen_buffer->mode) ) != NULL; + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info;

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 48a23dbd432d8dbeaa884fe656105d902729f8de URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a23dbd432d8dbeaa884fe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:26:40 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 +- dlls/kernelbase/console.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b923348015..49869948e9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -822,7 +822,7 @@ static void testScreenBuffer(HANDLE hConOut) ret = WriteConsoleA(hFileOutWT, test_str1, lstrlenA(test_str1), &len, NULL); error = GetLastError(); ok(!ret, "Shouldn't succeed\n"); - todo_wine ok(error == ERROR_INVALID_HANDLE || error == ERROR_INVALID_FUNCTION, + ok(error == ERROR_INVALID_HANDLE || error == ERROR_INVALID_FUNCTION, "GetLastError: got %u\n", error); CloseHandle(hFileOutRW); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index cc30a11d68..52fd5bb39c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -610,18 +610,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleInputExeNameW( DWORD len, LPWSTR buffer */ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) { - BOOL ret; - - SERVER_START_REQ( get_console_mode ) - { - req->handle = console_handle_unmap( handle ); - if ((ret = !wine_server_call_err( req ))) - { - if (mode) *mode = reply->mode; - } - } - SERVER_END_REQ; - return ret; + return console_ioctl( handle, IOCTL_CONDRV_GET_MODE, NULL, 0, mode, sizeof(*mode), NULL ); }

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_MODE in VerifyConsoleIoHandle.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: f5badeac28dc245c4804d4d0a72ddfcea66846ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5badeac28dc245c4804d4d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:26:53 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_MODE in VerifyConsoleIoHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e21c8a890e..f294b15635 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -249,16 +249,10 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creat */ BOOL WINAPI VerifyConsoleIoHandle(HANDLE handle) { - BOOL ret; - - if (!is_console_handle(handle)) return FALSE; - SERVER_START_REQ(get_console_mode) - { - req->handle = console_handle_unmap(handle); - ret = !wine_server_call( req ); - } - SERVER_END_REQ; - return ret; + IO_STATUS_BLOCK io; + DWORD mode; + return !NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_CONDRV_GET_MODE, + NULL, 0, &mode, sizeof(mode) ); } /****************************************************************** @@ -1181,7 +1175,7 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) */ if (!params->hStdInput || params->hStdInput == INVALID_HANDLE_VALUE) params->hStdInput = 0; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) + else if (VerifyConsoleIoHandle(params->hStdInput)) { params->hStdInput = console_handle_map(params->hStdInput); save_console_mode(params->hStdInput); @@ -1189,12 +1183,12 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) if (!params->hStdOutput || params->hStdOutput == INVALID_HANDLE_VALUE) params->hStdOutput = 0; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdOutput))) + else if (VerifyConsoleIoHandle(params->hStdOutput)) params->hStdOutput = console_handle_map(params->hStdOutput); if (!params->hStdError || params->hStdError == INVALID_HANDLE_VALUE) params->hStdError = 0; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdError))) + else if (VerifyConsoleIoHandle(params->hStdError)) params->hStdError = console_handle_map(params->hStdError); return TRUE;

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_MODE ioctl.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 22f53e6d9dd23a88d75ec8b6e4b3a73a186344d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22f53e6d9dd23a88d75ec8b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:27:05 2020 +0200 server: Introduce IOCTL_CONDRV_SET_MODE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 + server/console.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index c30802be66..25e5820046 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -25,6 +25,7 @@ /* common console input and output ioctls */ #define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console input ioctls */ #define IOCTL_CONDRV_READ_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) diff --git a/server/console.c b/server/console.c index 4c161fccb0..577d39bdaa 100644 --- a/server/console.c +++ b/server/console.c @@ -190,7 +190,7 @@ struct screen_buffer struct object obj; /* object header */ struct list entry; /* entry in list of all screen buffers */ struct console_input *input; /* associated console input */ - int mode; /* output mode */ + unsigned int mode; /* output mode */ int cursor_size; /* size of cursor (percentage filled) */ int cursor_visible;/* cursor visibility flag */ int cursor_x; /* position of cursor */ @@ -1584,6 +1584,15 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } return set_reply_data( &console->mode, sizeof(console->mode) ) != NULL; + case IOCTL_CONDRV_SET_MODE: + if (get_req_data_size() != sizeof(console->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + console->mode = *(unsigned int *)get_req_data(); + return 1; + case IOCTL_CONDRV_READ_INPUT: { int blocking = 0; @@ -1657,6 +1666,15 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } return set_reply_data( &screen_buffer->mode, sizeof(screen_buffer->mode) ) != NULL; + case IOCTL_CONDRV_SET_MODE: + if (get_req_data_size() != sizeof(screen_buffer->mode)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + screen_buffer->mode = *(unsigned int *)get_req_data(); + return 1; + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info;

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_MODE in SetConsoleMode.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 7aadafbd505ab61c15bccb7d995cc9f4afc54e3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aadafbd505ab61c15bccb7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 13:27:24 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_MODE in SetConsoleMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 52fd5bb39c..1df084fab9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1267,18 +1267,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleInputExeNameW( LPCWSTR name ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleMode( HANDLE handle, DWORD mode ) { - BOOL ret; - - SERVER_START_REQ(set_console_mode) - { - req->handle = console_handle_unmap( handle ); - req->mode = mode; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - - TRACE( "(%p,%x) retval == %d\n", handle, mode, ret ); - return ret; + TRACE( "(%p,%x)\n", handle, mode ); + return console_ioctl( handle, IOCTL_CONDRV_SET_MODE, &mode, sizeof(mode), NULL, 0, NULL ); }

1 0

Jacek Caban : server: Remove no longer needed get_console_mode and set_console_mode requests.
by Alexandre Julliard 13 Jul '20

13 Jul '20

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