wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Michael Stefaniuc : wintab32: Use wide-char string literals.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 783d71366a28f664370c34191634fdc7500d7d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=783d71366a28f664370c3419… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 12 00:37:57 2020 +0100 wintab32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/wintab32.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 98ce2bc1739..d56706b4223 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32); HWND hwndDefault = NULL; -static const WCHAR - WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; static CRITICAL_SECTION_DEBUG csTablet_debug = { 0, 0, &csTablet, @@ -62,34 +60,26 @@ static VOID TABLET_Register(void) wndClass.cbWndExtra = 0; wndClass.hCursor = NULL; wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); - wndClass.lpszClassName = WC_TABLETCLASSNAME; + wndClass.lpszClassName = L"WineTabletClass"; RegisterClassW(&wndClass); } static VOID TABLET_Unregister(void) { - UnregisterClassW(WC_TABLETCLASSNAME, NULL); + UnregisterClassW(L"WineTabletClass", NULL); } static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; + static const WCHAR displayW[] = L"}\\0000"; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); @@ -97,7 +87,7 @@ static HMODULE load_graphics_driver(void) lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); RegCloseKey( hkey ); TRACE( "%s %p\n", debugstr_w(path), ret ); return ret; @@ -105,8 +95,6 @@ static HMODULE load_graphics_driver(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - static const WCHAR name[] = {'T','a','b','l','e','t',0}; - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { @@ -114,7 +102,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) TRACE("Initialization\n"); DisableThreadLibraryCalls(hInstDLL); TABLET_Register(); - hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + hwndDefault = CreateWindowW(L"WineTabletClass", L"Tablet", WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); if (hwndDefault) {

1 0

Michael Stefaniuc : start: Use wide-char string literals.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 6e8af61f101519624df5528930b58e0784f0614c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8af61f101519624df55289… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 12 00:37:56 2020 +0100 start: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 107 ++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e8af61f101519624df5…

1 0

Vinson Lee : include: Add more D3D12_RESOURCE_STATES enum elements.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: vkd3d Branch: master Commit: 4f5ec93661aaa59302f23b9bf4da4ae6b3ef3010 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4f5ec93661aaa59302f23b9… Author: Vinson Lee <vlee(a)freedesktop.org> Date: Thu Nov 12 01:42:59 2020 +0000 include: Add more D3D12_RESOURCE_STATES enum elements. Signed-off-by: Vinson Lee <vlee(a)freedesktop.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index e1f1133..11e597d 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -510,6 +510,12 @@ typedef enum D3D12_RESOURCE_STATES D3D12_RESOURCE_STATE_GENERIC_READ = 0x1 | 0x2 | 0x40 | 0x80 | 0x200 | 0x800, D3D12_RESOURCE_STATE_PRESENT = 0x0, D3D12_RESOURCE_STATE_PREDICATION = 0x200, + D3D12_RESOURCE_STATE_VIDEO_DECODE_READ = 0x10000, + D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE = 0x20000, + D3D12_RESOURCE_STATE_VIDEO_PROCESS_READ = 0x40000, + D3D12_RESOURCE_STATE_VIDEO_PROCESS_WRITE = 0x80000, + D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ = 0x200000, + D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE = 0x800000, } D3D12_RESOURCE_STATES; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RESOURCE_STATES);")

1 0

Biswapriyo Nath : include: Add DEFINE_ENUM_FLAG_OPERATORS macro for enumerations.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: vkd3d Branch: master Commit: f84c09cc66c834b7ed238e5f3511dedec1ec9486 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f84c09cc66c834b7ed238e5… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Nov 6 23:28:12 2020 +0530 include: Add DEFINE_ENUM_FLAG_OPERATORS macro for enumerations. This prevents g++ error: invalid conversion from 'int' to 'XYZ' [-fpermissive] Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 88ecba5..e1f1133 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -89,6 +89,7 @@ typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT D3D12_SHADER_MIN_PRECISION_SUPPORT_10_BIT = 0x1, D3D12_SHADER_MIN_PRECISION_SUPPORT_16_BIT = 0x2, } D3D12_SHADER_MIN_PRECISION_SUPPORT; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_SHADER_MIN_PRECISION_SUPPORT);") typedef enum D3D12_TILED_RESOURCES_TIER { @@ -160,6 +161,7 @@ typedef enum D3D12_FORMAT_SUPPORT1 D3D12_FORMAT_SUPPORT1_VIDEO_PROCESSOR_INPUT = 0x20000000, D3D12_FORMAT_SUPPORT1_VIDEO_ENCODER = 0x40000000, } D3D12_FORMAT_SUPPORT1; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FORMAT_SUPPORT1);") typedef enum D3D12_FORMAT_SUPPORT2 { @@ -176,6 +178,7 @@ typedef enum D3D12_FORMAT_SUPPORT2 D3D12_FORMAT_SUPPORT2_TILED = 0x00000200, D3D12_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x00004000, } D3D12_FORMAT_SUPPORT2; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FORMAT_SUPPORT2);") typedef enum D3D12_WRITEBUFFERIMMEDIATE_MODE { @@ -199,6 +202,7 @@ typedef enum D3D12_SHADER_CACHE_SUPPORT_FLAGS D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_INPROC_CACHE = 0x4, D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_DISK_CACHE = 0x8, } D3D12_SHADER_CACHE_SUPPORT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_SHADER_CACHE_SUPPORT_FLAGS);") typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS { @@ -211,6 +215,7 @@ typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_PROCESS = 0x20, D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_ENCODE = 0x40, } D3D12_COMMAND_LIST_SUPPORT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_COMMAND_LIST_SUPPORT_FLAGS);") typedef enum D3D12_VIEW_INSTANCING_TIER { @@ -413,6 +418,7 @@ typedef enum D3D12_HEAP_FLAGS D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES = 0x44, D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES = 0x84, } D3D12_HEAP_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_HEAP_FLAGS);") typedef struct D3D12_HEAP_DESC { @@ -520,6 +526,7 @@ typedef enum D3D12_RESOURCE_BARRIER_FLAGS D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY = 0x1, D3D12_RESOURCE_BARRIER_FLAG_END_ONLY = 0x2, } D3D12_RESOURCE_BARRIER_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RESOURCE_BARRIER_FLAGS);") typedef struct D3D12_RESOURCE_TRANSITION_BARRIER { @@ -666,6 +673,7 @@ typedef enum D3D12_DESCRIPTOR_RANGE_FLAGS D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, } D3D12_DESCRIPTOR_RANGE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DESCRIPTOR_RANGE_FLAGS);") typedef struct D3D12_DESCRIPTOR_RANGE1 { @@ -709,6 +717,7 @@ typedef enum D3D12_ROOT_DESCRIPTOR_FLAGS D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, } D3D12_ROOT_DESCRIPTOR_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_DESCRIPTOR_FLAGS);") typedef struct D3D12_ROOT_DESCRIPTOR1 { @@ -902,6 +911,7 @@ typedef enum D3D12_ROOT_SIGNATURE_FLAGS D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20, D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40, } D3D12_ROOT_SIGNATURE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_SIGNATURE_FLAGS);") typedef struct D3D12_ROOT_SIGNATURE_DESC { @@ -952,6 +962,7 @@ typedef enum D3D12_DESCRIPTOR_HEAP_FLAGS D3D12_DESCRIPTOR_HEAP_FLAG_NONE = 0x0, D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE = 0x1, } D3D12_DESCRIPTOR_HEAP_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DESCRIPTOR_HEAP_FLAGS);") typedef struct D3D12_DESCRIPTOR_HEAP_DESC { @@ -989,6 +1000,7 @@ typedef enum D3D12_BUFFER_SRV_FLAGS D3D12_BUFFER_SRV_FLAG_NONE = 0x0, D3D12_BUFFER_SRV_FLAG_RAW = 0x1, } D3D12_BUFFER_SRV_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_BUFFER_SRV_FLAGS);") typedef enum D3D12_SHADER_COMPONENT_MAPPING { @@ -1124,6 +1136,7 @@ typedef enum D3D12_BUFFER_UAV_FLAGS D3D12_BUFFER_UAV_FLAG_NONE = 0x0, D3D12_BUFFER_UAV_FLAG_RAW = 0x1, } D3D12_BUFFER_UAV_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_BUFFER_UAV_FLAGS);") typedef struct D3D12_BUFFER_UAV { @@ -1570,6 +1583,7 @@ typedef enum D3D12_PIPELINE_STATE_FLAGS D3D12_PIPELINE_STATE_FLAG_NONE = 0x0, D3D12_PIPELINE_STATE_FLAG_DEBUG = 0x1, } D3D12_PIPELINE_STATE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_PIPELINE_STATE_FLAGS);") typedef struct D3D12_GRAPHICS_PIPELINE_STATE_DESC { @@ -1625,6 +1639,7 @@ typedef enum D3D12_COMMAND_QUEUE_FLAGS D3D12_COMMAND_QUEUE_FLAG_NONE = 0x0, D3D12_COMMAND_QUEUE_FLAG_DISABLE_GPU_TIMEOUT = 0x1, } D3D12_COMMAND_QUEUE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_COMMAND_QUEUE_FLAGS);") typedef struct D3D12_COMMAND_QUEUE_DESC { @@ -1908,6 +1923,7 @@ typedef enum D3D12_TILE_COPY_FLAGS D3D12_TILE_COPY_FLAG_LINEAR_BUFFER_TO_SWIZZLED_TILED_RESOURCE = 0x2, D3D12_TILE_COPY_FLAG_SWIZZLED_TILED_RESOURCE_TO_LINEAR_BUFFER = 0x4, } D3D12_TILE_COPY_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_TILE_COPY_FLAGS);") typedef struct D3D12_INDEX_BUFFER_VIEW { @@ -2194,6 +2210,7 @@ typedef enum D3D12_TILE_MAPPING_FLAGS D3D12_TILE_MAPPING_FLAG_NONE = 0x0, D3D12_TILE_MAPPING_FLAG_NO_HAZARD = 0x1, } D3D12_TILE_MAPPING_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_TILE_MAPPING_FLAGS);") [ uuid(0ec870a6-5d7e-4c22-8cfc-5baae07616ed), @@ -2241,6 +2258,7 @@ typedef enum D3D12_FENCE_FLAGS D3D12_FENCE_FLAG_SHARED = 0x1, D3D12_FENCE_FLAG_SHARED_CROSS_ADAPTER = 0x2, } D3D12_FENCE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FENCE_FLAGS);") typedef enum D3D12_QUERY_HEAP_TYPE {

1 0

Jacek Caban : conhost: Use console debug channel.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 1f15ddce9c7d0ee71521d7b98c698488b76d3f01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f15ddce9c7d0ee71521d7b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:07:13 2020 +0100 conhost: Use console debug channel. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- programs/conhost/window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 6985a9ca0b0..c7562974222 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -26,7 +26,7 @@ #include "wine/server.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(conhost); +WINE_DEFAULT_DEBUG_CHANNEL(console); static const char_info_t empty_char_info = { ' ', 0x0007 }; /* white on black space */ diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 5ec435a33ed..3d83632fabf 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -27,7 +27,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(conhost); +WINE_DEFAULT_DEBUG_CHANNEL(console); #define WM_UPDATE_CONFIG (WM_USER + 1)

1 0

Jacek Caban : conhost/tests: Initialize whole OVERLAPPED struct in fetch_console_output.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 817ff31811dda0b4cadc9cc4f0c36b5cd5776917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=817ff31811dda0b4cadc9cc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:07:06 2020 +0100 conhost/tests: Initialize whole OVERLAPPED struct in fetch_console_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 1e2f9550727..4eb85a17a01 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -37,6 +37,7 @@ static void fetch_console_output_(unsigned int line) if (console_output_count == sizeof(console_output)) return; + memset(&o, 0, sizeof(o)); o.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ret = ReadFile(console_pipe, console_output + console_output_count, sizeof(console_output) - console_output_count, NULL, &o);

1 0

Jacek Caban : kernel32: Allow non-console handles in CloseConsoleHandle.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 5386b7e4c83f6e3a45409c21261622ace8451c62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5386b7e4c83f6e3a45409c21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:06:48 2020 +0100 kernel32: Allow non-console handles in CloseConsoleHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +------ dlls/kernel32/kernel_private.h | 8 -------- dlls/kernel32/tests/console.c | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 8d5f8181ffe..d55c589eaf7 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -125,12 +125,7 @@ HANDLE WINAPI DuplicateConsoleHandle(HANDLE handle, DWORD access, BOOL inherit, */ BOOL WINAPI CloseConsoleHandle(HANDLE handle) { - if (!is_console_handle(handle)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return CloseHandle(wine_server_ptr_handle(console_handle_unmap(handle))); + return CloseHandle(handle); } /****************************************************************** diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index fe19e2ed5cb..fa1dd79d0c0 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -21,8 +21,6 @@ #ifndef __WINE_KERNEL_PRIVATE_H #define __WINE_KERNEL_PRIVATE_H -#include "wine/server.h" - NTSTATUS WINAPI BaseGetNamedObjectDirectory( HANDLE *dir ); BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) DECLSPEC_HIDDEN; @@ -37,12 +35,6 @@ static inline HANDLE console_handle_map(HANDLE h) return h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE; } -/* map a kernel32 console handle onto a real wineserver handle */ -static inline obj_handle_t console_handle_unmap(HANDLE h) -{ - return wine_server_obj_handle( h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE ); -} - static inline BOOL set_ntstatus( NTSTATUS status ) { if (status) SetLastError( RtlNtStatusToDosError( status )); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 69005bab5f1..13e17e14e4c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1523,10 +1523,8 @@ static void test_DuplicateConsoleHandle(void) ok(ret, "SetEvent failed: %u\n", GetLastError()); ret = CloseConsoleHandle(handle); - todo_wine ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); ret = CloseConsoleHandle(event); - todo_wine ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); handle = DuplicateConsoleHandle((HANDLE)0xdeadbeef, 0, FALSE, DUPLICATE_SAME_ACCESS);

1 0

Jacek Caban : kernel32: Allow non-console handles in DuplicateConsoleHandle.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 1335768f0a0e2e520c786edfddd2895a57bc4dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1335768f0a0e2e520c786edf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:06:39 2020 +0100 kernel32: Allow non-console handles in DuplicateConsoleHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 10 +++------- dlls/kernel32/tests/console.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4b74c1183ca..8d5f8181ffe 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -113,13 +113,9 @@ BOOL WINAPI VerifyConsoleIoHandle(HANDLE handle) HANDLE WINAPI DuplicateConsoleHandle(HANDLE handle, DWORD access, BOOL inherit, DWORD options) { - HANDLE ret; - - if (!is_console_handle(handle) || - !DuplicateHandle(GetCurrentProcess(), wine_server_ptr_handle(console_handle_unmap(handle)), - GetCurrentProcess(), &ret, access, inherit, options)) - return INVALID_HANDLE_VALUE; - return console_handle_map(ret); + HANDLE ret; + return DuplicateHandle(GetCurrentProcess(), handle, GetCurrentProcess(), &ret, + access, inherit, options) ? ret : INVALID_HANDLE_VALUE; } /****************************************************************** diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 4a06a2b396e..69005bab5f1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1506,6 +1506,34 @@ static void test_GetSetStdHandle(void) ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); } +static void test_DuplicateConsoleHandle(void) +{ + HANDLE handle, event; + BOOL ret; + + if (skip_nt) return; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + + /* duplicate an event handle with DuplicateConsoleHandle */ + handle = DuplicateConsoleHandle(event, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(handle != NULL, "DuplicateConsoleHandle failed: %u\n", GetLastError()); + + ret = SetEvent(handle); + ok(ret, "SetEvent failed: %u\n", GetLastError()); + + ret = CloseConsoleHandle(handle); + todo_wine + ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); + ret = CloseConsoleHandle(event); + todo_wine + ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); + + handle = DuplicateConsoleHandle((HANDLE)0xdeadbeef, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(handle == INVALID_HANDLE_VALUE, "DuplicateConsoleHandle failed: %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error = %u\n", GetLastError()); +} + static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle) { DWORD count; @@ -4387,6 +4415,7 @@ START_TEST(console) test_OpenCON(); test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); + test_DuplicateConsoleHandle(); test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn);

1 0

Piotr Caban : ucrtbase: Add support for utf8 codepage in setlocale.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: e460b37a25226f36b973a66b613e2542b1f9cc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e460b37a25226f36b973a66b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 11 18:49:08 2020 +0100 ucrtbase: Add support for utf8 codepage in setlocale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c49439951a9..fda3d11b86d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -351,6 +351,11 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s } else if (!MSVCRT__strnicmp(cp, ".OCP", 4)) { GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&locale_cp, sizeof(DWORD)/sizeof(WCHAR)); +#if _MSVCR_VER >= 140 + } else if (!MSVCRT__strnicmp(cp, ".UTF-8", 6) + || !MSVCRT__strnicmp(cp, ".UTF8", 5)) { + locale_cp = CP_UTF8; +#endif } else { locale_cp = atoi(cp + 1); }

1 0

Paul Gofman : mshtml: Check for EVENTID_LAST in ensure_doc_nsevent_handler().
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 8ea89841964c6df98aa6230cc66ef1fd07c543eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea89841964c6df98aa6230c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 11 20:27:55 2020 +0300 mshtml: Check for EVENTID_LAST in ensure_doc_nsevent_handler(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50110 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0f041cbae6c..0bf3de54a96 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2832,6 +2832,8 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, nsIDOMNode *nsnode, ev doc->event_vector[eid] = TRUE; eid = EVENTID_BLUR; break; + case EVENTID_LAST: + return S_OK; default: break; }

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020