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

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

July 10, 2020

Module: wine Branch: master Commit: b21d2e5f58dc5fa713174616de5042e05e13a1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21d2e5f58dc5fa713174616… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:24 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleScreenBufferInfoEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 107c909d57..cf64eff74a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1323,7 +1323,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - BOOL ret; + struct condrv_output_info_params params = + { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS | SET_CONSOLE_OUTPUT_INFO_SIZE | + SET_CONSOLE_OUTPUT_INFO_ATTR | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR | + SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW | SET_CONSOLE_OUTPUT_INFO_MAX_SIZE }; TRACE("(%p, %p)\n", handle, info); @@ -1333,29 +1336,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, return FALSE; } - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->mask = SET_CONSOLE_OUTPUT_INFO_CURSOR_POS | SET_CONSOLE_OUTPUT_INFO_SIZE | - SET_CONSOLE_OUTPUT_INFO_ATTR | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR | - SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW | SET_CONSOLE_OUTPUT_INFO_MAX_SIZE; - req->width = info->dwSize.X; - req->height = info->dwSize.Y; - req->cursor_x = info->dwCursorPosition.X; - req->cursor_y = info->dwCursorPosition.Y; - req->attr = info->wAttributes; - req->win_left = info->srWindow.Left; - req->win_top = info->srWindow.Top; - req->win_right = info->srWindow.Right; - req->win_bottom = info->srWindow.Bottom; - req->popup_attr = info->wPopupAttributes; - req->max_width = min( info->dwMaximumWindowSize.X, info->dwSize.X ); - req->max_height = min( info->dwMaximumWindowSize.Y, info->dwSize.Y ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - - return ret; + params.info.width = info->dwSize.X; + params.info.height = info->dwSize.Y; + params.info.cursor_x = info->dwCursorPosition.X; + params.info.cursor_y = info->dwCursorPosition.Y; + params.info.attr = info->wAttributes; + params.info.win_left = info->srWindow.Left; + params.info.win_top = info->srWindow.Top; + params.info.win_right = info->srWindow.Right; + params.info.win_bottom = info->srWindow.Bottom; + params.info.popup_attr = info->wPopupAttributes; + params.info.max_width = min( info->dwMaximumWindowSize.X, info->dwSize.X ); + params.info.max_height = min( info->dwMaximumWindowSize.Y, info->dwSize.Y ); + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

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

July 10, 2020

Module: wine Branch: master Commit: f7a7633aa107003238171c12f52d2f57b93bc3f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7a7633aa107003238171c12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:35 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleScreenBufferSize. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index cf64eff74a..e13abcb23f 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1357,19 +1357,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferSize( HANDLE handle, COORD size ) { - BOOL ret; + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_SIZE }; TRACE( "(%p,(%d,%d))\n", handle, size.X, size.Y ); - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->width = size.X; - req->height = size.Y; - req->mask = SET_CONSOLE_OUTPUT_INFO_SIZE; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + params.info.width = size.X; + params.info.height = size.Y; + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Zebediah Figura : msdmo: Factor out any_types_match().
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: aa2406ecea33e511255ee3ae2d43b6cbc7dbd9cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2406ecea33e511255ee3ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:49 2020 -0500 msdmo: Factor out any_types_match(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7e7f0c0fb8..ab3fda743c 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -417,6 +417,21 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) return refCount; } +static BOOL any_types_match(const DMO_PARTIAL_MEDIATYPE *a, unsigned int a_count, + const DMO_PARTIAL_MEDIATYPE *b, unsigned int b_count) +{ + unsigned int i, j; + + for (i = 0; i < a_count; ++i) + { + for (j = 0; j < b_count; ++j) + { + if (IsMediaTypeEqual(&a[i], &b[j])) + return TRUE; + } + } + return FALSE; +} /****************************************************************************** * IEnumDMO_fnNext @@ -483,8 +498,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pInTypes) { - UINT i, j; - DWORD cInTypes; + DWORD cInTypes, i; hres = read_types(hkey, L"InputTypes", &cInTypes, ARRAY_SIZE(types), types); if (FAILED(hres)) @@ -498,19 +512,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( debugstr_guid(&types[i].subtype)); } - for (i = 0; i < This->cInTypes; i++) - { - for (j = 0; j < cInTypes; j++) - { - if (IsMediaTypeEqual(&types[j], &This->pInTypes[i])) - break; - } - - if (j >= cInTypes) - break; - } - - if (i < This->cInTypes) + if (!any_types_match(types, cInTypes, This->pInTypes, This->cInTypes)) { RegCloseKey(hkey); continue; @@ -519,8 +521,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pOutTypes) { - UINT i, j; - DWORD cOutTypes; + DWORD cOutTypes, i; hres = read_types(hkey, L"OutputTypes", &cOutTypes, ARRAY_SIZE(types), types); if (FAILED(hres)) @@ -534,19 +535,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( debugstr_guid(&types[i].subtype)); } - for (i = 0; i < This->cOutTypes; i++) - { - for (j = 0; j < cOutTypes; j++) - { - if (IsMediaTypeEqual(&types[j], &This->pOutTypes[i])) - break; - } - - if (j >= cOutTypes) - break; - } - - if (i < This->cOutTypes) + if (!any_types_match(types, cOutTypes, This->pOutTypes, This->cOutTypes)) { RegCloseKey(hkey); continue;

1 0

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

July 10, 2020

Module: wine Branch: master Commit: 2efb498a7b088a0d1d072754b668fcf752532de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2efb498a7b088a0d1d072754… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:44 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleTextAttribute. 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, 4 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index e13abcb23f..85854851ce 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1372,18 +1372,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferSize( HANDLE handle, COORD s */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTextAttribute( HANDLE handle, WORD attr ) { - BOOL ret; + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_ATTR }; TRACE( "(%p,%d)\n", handle, attr ); - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->attr = attr; - req->mask = SET_CONSOLE_OUTPUT_INFO_ATTR; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + params.info.attr = attr; + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

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

July 10, 2020

Module: wine Branch: master Commit: 5ff23d2218b6166c78cd587b1f633a2a3540a541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff23d2218b6166c78cd587b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:14 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleCursorPosition. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 1740f84b59..107c909d57 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1195,23 +1195,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos ) { + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS }; CONSOLE_SCREEN_BUFFER_INFO info; int w, h, do_move = 0; - BOOL ret; TRACE( "%p %d %d\n", handle, pos.X, pos.Y ); - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->cursor_x = pos.X; - req->cursor_y = pos.Y; - req->mask = SET_CONSOLE_OUTPUT_INFO_CURSOR_POS; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; + params.info.cursor_x = pos.X; + params.info.cursor_y = pos.Y; + if (!console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL )) + return FALSE; - if (!ret || !GetConsoleScreenBufferInfo( handle, &info )) return FALSE; + if (!GetConsoleScreenBufferInfo( handle, &info )) return FALSE; /* if cursor is no longer visible, scroll the visible window... */ w = info.srWindow.Right - info.srWindow.Left + 1; @@ -1240,8 +1235,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos } info.srWindow.Bottom = info.srWindow.Top + h - 1; - if (do_move) ret = SetConsoleWindowInfo( handle, TRUE, &info.srWindow ); - return ret; + return !do_move || SetConsoleWindowInfo( handle, TRUE, &info.srWindow ); }

1 0

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

July 10, 2020

Module: wine Branch: master Commit: 3b81ea316198e1b128e0e41534da48218f5b641a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b81ea316198e1b128e0e415… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:09 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleCursorInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 606589339e..1740f84b59 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1179,20 +1179,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCtrlHandler( PHANDLER_ROUTINE func, BOOL */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSOR_INFO *info ) { - BOOL ret; + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM }; TRACE( "(%p,%d,%d)\n", handle, info->dwSize, info->bVisible); - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->cursor_size = info->dwSize; - req->cursor_visible = info->bVisible; - req->mask = SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + params.info.cursor_size = info->dwSize; + params.info.cursor_visible = info->bVisible; + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), + NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Introduce console_ioctl helper.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 674ec0c7f6754c47a5a513ceff80663bb8f5a3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=674ec0c7f6754c47a5a513ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:06:01 2020 +0200 kernelbase: Introduce console_ioctl helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 50 ++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 37ca8b599b..606589339e 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -80,6 +80,28 @@ static inline obj_handle_t console_handle_unmap( HANDLE h ) return wine_server_obj_handle( console_handle_map( h ) ); } +static BOOL console_ioctl( HANDLE handle, DWORD code, void *in_buff, DWORD in_count, + void *out_buff, DWORD out_count, DWORD *read ) +{ + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, code, in_buff, in_count, + out_buff, out_count ); + switch( status ) + { + case STATUS_SUCCESS: + if (read) *read = io.Information; + return TRUE; + case STATUS_INVALID_PARAMETER: + break; + default: + status = STATUS_INVALID_HANDLE; + break; + } + return set_ntstatus( status ); +} + /* map input records to ASCII */ static void input_records_WtoA( INPUT_RECORD *buffer, int count ) { @@ -162,11 +184,8 @@ static COORD get_largest_console_window_size( HANDLE handle ) struct condrv_output_info info; COORD c = { 0, 0 }; - if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) - { - SetLastError( ERROR_INVALID_HANDLE ); + if (!console_ioctl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return c; - } c.X = info.max_width; c.Y = info.max_height; @@ -543,11 +562,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO { struct condrv_output_info condrv_info; - if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, sizeof(condrv_info), NULL, NULL )) - { - SetLastError( ERROR_INVALID_HANDLE ); + if (!console_ioctl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, sizeof(condrv_info), NULL )) return FALSE; - } if (!info) { @@ -636,12 +652,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfo( HANDLE handle, CONSOLE { struct condrv_output_info condrv_info; - if (!DeviceIoControl( handle , IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, - &condrv_info, sizeof(condrv_info), NULL, NULL )) - { - SetLastError( ERROR_INVALID_HANDLE ); + if (!console_ioctl( handle , IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + &condrv_info, sizeof(condrv_info), NULL )) return FALSE; - } info->dwSize.X = condrv_info.width; info->dwSize.Y = condrv_info.height; @@ -677,12 +690,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, return FALSE; } - if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, - sizeof(condrv_info), NULL, NULL )) - { - SetLastError( ERROR_INVALID_HANDLE ); + if (!console_ioctl( handle, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &condrv_info, + sizeof(condrv_info), NULL )) return FALSE; - } info->dwSize.X = condrv_info.width; info->dwSize.Y = condrv_info.height; @@ -755,7 +765,7 @@ COORD WINAPI DECLSPEC_HOTPATCH GetLargestConsoleWindowSize( HANDLE handle ) BOOL WINAPI DECLSPEC_HOTPATCH GetNumberOfConsoleInputEvents( HANDLE handle, DWORD *count ) { struct condrv_input_info info; - if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) + if (!console_ioctl( handle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return FALSE; *count = info.input_count; return TRUE; @@ -784,7 +794,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekConsoleInputW( HANDLE handle, INPUT_RECORD *bu DWORD length, DWORD *count ) { DWORD read; - if (!DeviceIoControl( handle, IOCTL_CONDRV_PEEK, NULL, 0, buffer, length * sizeof(*buffer), &read, NULL )) + if (!console_ioctl( handle, IOCTL_CONDRV_PEEK, NULL, 0, buffer, length * sizeof(*buffer), &read )) return FALSE; if (count) *count = read / sizeof(*buffer); return TRUE;

1 0

Zebediah Figura : ntdll: Don't translate Unix virtual disks to FILE_DEVICE_VIRTUAL_DISK.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: fb8a44f3ee50badd85af4b50fdbc1db28ce76ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb8a44f3ee50badd85af4b50… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 9 22:39:00 2020 -0500 ntdll: Don't translate Unix virtual disks to FILE_DEVICE_VIRTUAL_DISK. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36546 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index af7c214984..3368d2105c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6029,12 +6029,15 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; info->Characteristics |= FILE_REMOTE_DEVICE; break; - case 0x01021994: /* tmpfs */ - case 0x28cd3d45: /* cramfs */ case 0x1373: /* devfs */ case 0x9fa0: /* procfs */ info->DeviceType = FILE_DEVICE_VIRTUAL_DISK; break; + case 0x01021994: /* tmpfs */ + case 0x28cd3d45: /* cramfs */ + /* Don't map these to FILE_DEVICE_VIRTUAL_DISK by default. Virtual + * filesystems are rare on Windows, and some programs refuse to + * recognize them as valid. */ default: info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; break; @@ -6078,8 +6081,9 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->Characteristics |= FILE_REMOVABLE_MEDIA; break; case DKC_MD: - info->DeviceType = FILE_DEVICE_VIRTUAL_DISK; - break; + /* Don't map these to FILE_DEVICE_VIRTUAL_DISK by default. Virtual + * filesystems are rare on Windows, and some programs refuse to + * recognize them as valid. */ default: info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; }

1 0

Zebediah Figura : msdmo: Use wide character string literals.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 3a708d4722eba242758a43b83bc4ff6a7ca391ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a708d4722eba242758a43b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:48 2020 -0500 msdmo: Use wide character string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 115 +++++++++++++++------------------------------------- 1 file changed, 33 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a708d4722eba242758a…

1 0

Alexandre Julliard : ntdll: Avoid using RtlQueueWorkItem() in the Unix library.
by Alexandre Julliard July 10, 2020

July 10, 2020

Module: wine Branch: master Commit: 63b66c9955b243e20b280dac236dea4fdf21c92c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b66c9955b243e20b280dac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 10:10:16 2020 +0200 ntdll: Avoid using RtlQueueWorkItem() in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/serial.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 1c61a5e02f..9454185e17 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -950,7 +950,7 @@ static DWORD check_events(int fd, DWORD mask, * TIOCMIWAIT only checks modem status line and may not be aborted by a changing mask * */ -static DWORD CALLBACK wait_for_event(LPVOID arg) +static void CALLBACK wait_for_event(LPVOID arg) { async_commio *commio = arg; int fd, needs_close; @@ -1008,13 +1008,14 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) stop_waiting(commio->hDevice); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); free( commio ); - return 0; + NtTerminateThread( GetCurrentThread(), 0 ); } static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK piosb, DWORD* events) { async_commio* commio; NTSTATUS status; + HANDLE handle; if ((status = NtResetEvent(hEvent, NULL))) return status; @@ -1086,9 +1087,12 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK goto out_now; } - /* create the worker for the task */ - status = RtlQueueWorkItem(wait_for_event, commio, 0 /* FIXME */); + /* create the worker thread for the task */ + /* FIXME: should use async I/O instead */ + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), + wait_for_event, commio, 0, 0, 0, 0, NULL ); if (status != STATUS_SUCCESS) goto out_now; + NtClose( handle ); return STATUS_PENDING; #if !defined(TIOCINQ) || (!(defined(TIOCSERGETLSR) && defined(TIOCSER_TEMT)) || !defined(TIOCINQ)) || !defined(TIOCMGET) || !defined(TIOCM_CTS) ||!defined(TIOCM_DSR) || !defined(TIOCM_RNG) || !defined(TIOCM_CAR)

1 0