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

Biswapriyo Nath : include/d3dcommon.idl: Add missing names in D3D_NAME enum.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: cc7d1f2672efab9a82885dfc0608fa0c4919d771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7d1f2672efab9a82885dfc… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 28 00:14:25 2020 +0530 include/d3dcommon.idl: Add missing names in D3D_NAME enum. 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/d3dcommon.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 90243ebc2c..69e4143c40 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -648,6 +648,9 @@ typedef enum D3D_NAME D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR, D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR, D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR, + D3D_NAME_BARYCENTRICS = 23, + D3D_NAME_SHADINGRATE, + D3D_NAME_CULLPRIMITIVE, D3D_NAME_TARGET = 64, D3D_NAME_DEPTH, D3D_NAME_COVERAGE,

1 0

Paul Gofman : ntdll: Clear CONTEXT_XSTATE flag in RtlUnwindEx().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 8aa370e9919f179feeece8dac9782f90f2e2b09c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aa370e9919f179feeece8da… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 31 20:46:41 2020 +0300 ntdll: Clear CONTEXT_XSTATE flag in RtlUnwindEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49749 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ba91cc13df..6fbb612825 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1244,7 +1244,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { ULONG64 frame; - *context = new_context = *dispatch.ContextRecord; + new_context = *dispatch.ContextRecord; + new_context.ContextFlags &= ~0x40; + *context = new_context; dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, @@ -1267,7 +1269,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec teb_frame = __wine_pop_frame( teb_frame ); - *context = new_context = *dispatch.ContextRecord; + new_context = *dispatch.ContextRecord; + new_context.ContextFlags &= ~0x40; + *context = new_context; dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry,

1 0

Carlos Rivera : kernel32/tests: Remove registry entry left out during test.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: c1c61bf2559509b33fc8bdd297032bc57e474229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c61bf2559509b33fc8bdd2… Author: Carlos Rivera <carlos(a)superkaos.org> Date: Mon Aug 31 11:38:16 2020 +0200 kernel32/tests: Remove registry entry left out during test. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index c077f8b35b..5f1f4f0fe7 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1567,6 +1567,8 @@ static void test_registry_mapping(void) ret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\winetest_name2"); ok(!ret, "got error %u\n", ret); + ret = RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_name1"); + ok(!ret, "got error %u\n", ret); ret = RegDeleteKeyA(mapped_key, ""); ok(!ret, "got error %u\n", ret); RegCloseKey(mapped_key);

1 0

Paul Gofman : ntdll: Implement RtlLocateLegacyContext().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 3803997349efdd2860263d08bd9d71bc0702cd2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3803997349efdd2860263d08… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 31 12:31:59 2020 +0300 ntdll: Implement RtlLocateLegacyContext(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- dlls/ntdll/exception.c | 11 +++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/exception.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec index 4d8d580387..b933eca226 100644 --- a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec @@ -4,5 +4,5 @@ @ stub RtlGetExtendedFeaturesMask @ stdcall RtlInitializeExtendedContext(ptr long ptr) ntdll.RtlInitializeExtendedContext @ stdcall RtlLocateExtendedFeature(ptr long ptr) ntdll.RtlLocateExtendedFeature -@ stub RtlLocateLegacyContext +@ stdcall RtlLocateLegacyContext(ptr ptr) ntdll.RtlLocateLegacyContext @ stub RtlSetExtendedFeaturesMask diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index cb9481322b..0e7e3b959e 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -850,3 +850,14 @@ void * WINAPI RtlLocateExtendedFeature( CONTEXT_EX *context_ex, ULONG feature_id { return RtlLocateExtendedFeature2( context_ex, feature_id, &user_shared_data->XState, length ); } + +/********************************************************************** + * RtlLocateLegacyContext (NTDLL.@) + */ +void * WINAPI RtlLocateLegacyContext( CONTEXT_EX *context_ex, ULONG *length ) +{ + if (length) + *length = context_ex->Legacy.Length; + + return (BYTE *)context_ex + context_ex->Legacy.Offset; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0829cc43a9..042ec1f99b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -828,6 +828,7 @@ @ stdcall RtlLocaleNameToLcid(wstr ptr long) @ stdcall RtlLocateExtendedFeature(ptr long ptr) @ stdcall RtlLocateExtendedFeature2(ptr long ptr ptr) +@ stdcall RtlLocateLegacyContext(ptr ptr) # @ stub RtlLockBootStatusData @ stdcall RtlLockHeap(long) # @ stub RtlLockMemoryStreamRegion diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 242ca9c61a..a1600a60c8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -52,6 +52,7 @@ static NTSTATUS (WINAPI *pRtlInitializeExtendedContext)(void *context, ULONG co static NTSTATUS (WINAPI *pRtlInitializeExtendedContext2)(void *context, ULONG context_flags, CONTEXT_EX **context_ex, ULONG64 compaction_mask); static void * (WINAPI *pRtlLocateExtendedFeature)(CONTEXT_EX *context_ex, ULONG feature_id, ULONG *length); +static void * (WINAPI *pRtlLocateLegacyContext)(CONTEXT_EX *context_ex, ULONG *length); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -6307,6 +6308,18 @@ static void test_extended_context(void) ok(!context_ex->XState.Length, "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags); + if (0) + { + /* Crashes on Windows. */ + pRtlLocateLegacyContext(NULL, NULL); + } + p = pRtlLocateLegacyContext(context_ex, NULL); + ok(p == context, "Got unexpected p %p, flags %#x.\n", p, flags); + length2 = 0xdeadbeef; + p = pRtlLocateLegacyContext(context_ex, &length2); + ok(p == context && length2 == context_ex->Legacy.Length, + "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + length2 = expected_length; for (j = 0; j < context_arch[test].flags_offset; ++j) { @@ -6738,6 +6751,7 @@ START_TEST(exception) X(RtlInitializeExtendedContext); X(RtlInitializeExtendedContext2); X(RtlLocateExtendedFeature); + X(RtlLocateLegacyContext); #undef X #define X(f) p##f = (void*)GetProcAddress(hkernel32, #f) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6666031cc6..a900796359 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1176,6 +1176,7 @@ @ stdcall RtlLocalTimeToSystemTime(ptr ptr) @ stdcall RtlLocateExtendedFeature(ptr long ptr) @ stdcall RtlLocateExtendedFeature2(ptr long ptr ptr) +@ stdcall RtlLocateLegacyContext(ptr ptr) @ stub RtlLockBootStatusData @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stub RtlLookupElementGenericTable diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 893db4df20..2115627d3a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1842,6 +1842,7 @@ NTSTATUS WINAPI RtlInitializeExtendedContext2(void*,ULONG,CONTEXT_EX**,ULONG64) ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); NTSTATUS WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); NTSTATUS WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); +void * WINAPI RtlLocateLegacyContext(CONTEXT_EX*,ULONG*); void * WINAPI RtlLocateExtendedFeature(CONTEXT_EX*,ULONG,ULONG*); void * WINAPI RtlLocateExtendedFeature2(CONTEXT_EX*,ULONG,XSTATE_CONFIGURATION*,ULONG*); #endif

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_FILL_OUTPUT.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 2dbf14ee80583e7fa8da74cfaa85700cb82f4f70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dbf14ee80583e7fa8da74cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 15:10:50 2020 +0200 conhost: Implement IOCTL_CONDRV_FILL_OUTPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 4853a6d8b2..80f09e738a 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -623,6 +623,56 @@ static NTSTATUS read_output( struct screen_buffer *screen_buffer, const struct c return STATUS_SUCCESS; } +static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct condrv_fill_output_params *params ) +{ + char_info_t *end, *dest; + DWORD i, count, *result; + + TRACE( "(%u %u) mode %u\n", params->x, params->y, params->mode ); + + dest = screen_buffer->data + params->y * screen_buffer->width + params->x; + + if (params->y >= screen_buffer->height) return STATUS_SUCCESS; + + if (params->wrap) + end = screen_buffer->data + screen_buffer->height * screen_buffer->width; + else + end = screen_buffer->data + (params->y + 1) * screen_buffer->width; + + count = params->count; + if (count > end - dest) count = end - dest; + + switch(params->mode) + { + case CHAR_INFO_MODE_TEXT: + for (i = 0; i < count; i++) dest[i].ch = params->ch; + break; + case CHAR_INFO_MODE_ATTR: + for (i = 0; i < count; i++) dest[i].attr = params->attr; + break; + case CHAR_INFO_MODE_TEXTATTR: + for (i = 0; i < count; i++) + { + dest[i].ch = params->ch; + dest[i].attr = params->attr; + } + break; + case CHAR_INFO_MODE_TEXTSTDATTR: + for (i = 0; i < count; i++) + { + dest[i].ch = params->ch; + dest[i].attr = screen_buffer->attr; + } + break; + default: + return STATUS_INVALID_PARAMETER; + } + + if (!(result = alloc_ioctl_buffer( sizeof(*result) ))) return STATUS_NO_MEMORY; + *result = count; + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -689,6 +739,11 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign if (in_size < sizeof(struct condrv_output_info) || *out_size) return STATUS_INVALID_PARAMETER; return set_output_info( screen_buffer, in_data, in_size ); + case IOCTL_CONDRV_FILL_OUTPUT: + if (in_size != sizeof(struct condrv_fill_output_params) || *out_size != sizeof(DWORD)) + return STATUS_INVALID_PARAMETER; + return fill_output( screen_buffer, in_data ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SCROLL.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: af47236499235349187c00a9be981a713fa5041c URL: https://source.winehq.org/git/wine.git/?a=commit;h=af47236499235349187c00a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 15:11:00 2020 +0200 conhost: Implement IOCTL_CONDRV_SCROLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 80f09e738a..0050f4d1ad 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -673,6 +673,102 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c return STATUS_SUCCESS; } +static NTSTATUS scroll_output( struct screen_buffer *screen_buffer, const struct condrv_scroll_params *params ) +{ + int x, y, xsrc, ysrc, w, h; + char_info_t *psrc, *pdst; + SMALL_RECT src, dst; + SMALL_RECT clip; + + xsrc = params->scroll.Left; + ysrc = params->scroll.Top; + w = params->scroll.Right - params->scroll.Left + 1; + h = params->scroll.Bottom - params->scroll.Top + 1; + + TRACE( "(%d %d) -> (%u %u) w %u h %u\n", xsrc, ysrc, params->origin.X, params->origin.Y, w, h ); + + clip.Left = max( params->clip.Left, 0 ); + clip.Top = max( params->clip.Top, 0 ); + clip.Right = min( params->clip.Right, screen_buffer->width - 1 ); + clip.Bottom = min( params->clip.Bottom, screen_buffer->height - 1 ); + if (clip.Left > clip.Right || clip.Top > clip.Bottom || params->scroll.Left < 0 || params->scroll.Top < 0 || + params->scroll.Right >= screen_buffer->width || params->scroll.Bottom >= screen_buffer->height || + params->scroll.Right < params->scroll.Left || params->scroll.Top > params->scroll.Bottom || + params->origin.X < 0 || params->origin.X >= screen_buffer->width || params->origin.Y < 0 || + params->origin.Y >= screen_buffer->height) + return STATUS_INVALID_PARAMETER; + + src.Left = max( xsrc, clip.Left ); + src.Top = max( ysrc, clip.Top ); + src.Right = min( xsrc + w - 1, clip.Right ); + src.Bottom = min( ysrc + h - 1, clip.Bottom ); + + dst.Left = params->origin.X; + dst.Top = params->origin.Y; + dst.Right = params->origin.X + w - 1; + dst.Bottom = params->origin.Y + h - 1; + + if (dst.Left < clip.Left) + { + xsrc += clip.Left - dst.Left; + w -= clip.Left - dst.Left; + dst.Left = clip.Left; + } + if (dst.Top < clip.Top) + { + ysrc += clip.Top - dst.Top; + h -= clip.Top - dst.Top; + dst.Top = clip.Top; + } + if (dst.Right > clip.Right) w -= dst.Right - clip.Right; + if (dst.Bottom > clip.Bottom) h -= dst.Bottom - clip.Bottom; + + if (w > 0 && h > 0) + { + if (ysrc < dst.Top) + { + psrc = &screen_buffer->data[(ysrc + h - 1) * screen_buffer->width + xsrc]; + pdst = &screen_buffer->data[(dst.Top + h - 1) * screen_buffer->width + dst.Left]; + + for (y = h; y > 0; y--) + { + memcpy( pdst, psrc, w * sizeof(*pdst) ); + pdst -= screen_buffer->width; + psrc -= screen_buffer->width; + } + } + else + { + psrc = &screen_buffer->data[ysrc * screen_buffer->width + xsrc]; + pdst = &screen_buffer->data[dst.Top * screen_buffer->width + dst.Left]; + + for (y = 0; y < h; y++) + { + /* we use memmove here because when psrc and pdst are the same, + * copies are done on the same row, so the dst and src blocks + * can overlap */ + memmove( pdst, psrc, w * sizeof(*pdst) ); + pdst += screen_buffer->width; + psrc += screen_buffer->width; + } + } + } + + for (y = src.Top; y <= src.Bottom; y++) + { + int left = src.Left; + int right = src.Right; + if (dst.Top <= y && y <= dst.Bottom) + { + if (dst.Left <= src.Left) left = max( left, dst.Right + 1 ); + if (dst.Left >= src.Left) right = min( right, dst.Left - 1 ); + } + for (x = left; x <= right; x++) screen_buffer->data[y * screen_buffer->width + x] = params->fill; + } + + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -744,6 +840,11 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return STATUS_INVALID_PARAMETER; return fill_output( screen_buffer, in_data ); + case IOCTL_CONDRV_SCROLL: + if (in_size != sizeof(struct condrv_scroll_params) || *out_size) + return STATUS_INVALID_PARAMETER; + return scroll_output( screen_buffer, in_data ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : kernelbase: Move KERNEL32_CONSOLE_ALLOC handling to kernelbase.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 26e04d52fe466e44eb5ca383c94c2920c5e294ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=26e04d52fe466e44eb5ca383… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 15:11:23 2020 +0200 kernelbase: Move KERNEL32_CONSOLE_ALLOC handling to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 6 +++--- dlls/kernel32/kernel_main.c | 13 ------------- dlls/kernel32/kernel_private.h | 1 - dlls/kernelbase/console.c | 10 ++++++++++ include/wine/condrv.h | 3 +++ 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index afbf9a91da..5b5722847f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1129,7 +1129,7 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) */ if (!params->hStdInput || params->hStdInput == INVALID_HANDLE_VALUE) params->hStdInput = 0; - else if (VerifyConsoleIoHandle(params->hStdInput)) + else if (!is_console_handle(params->hStdInput) && VerifyConsoleIoHandle(params->hStdInput)) { params->hStdInput = console_handle_map(params->hStdInput); save_console_mode(params->hStdInput); @@ -1137,12 +1137,12 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) if (!params->hStdOutput || params->hStdOutput == INVALID_HANDLE_VALUE) params->hStdOutput = 0; - else if (VerifyConsoleIoHandle(params->hStdOutput)) + else if (!is_console_handle(params->hStdOutput) && VerifyConsoleIoHandle(params->hStdOutput)) params->hStdOutput = console_handle_map(params->hStdOutput); if (!params->hStdError || params->hStdError == INVALID_HANDLE_VALUE) params->hStdError = 0; - else if (VerifyConsoleIoHandle(params->hStdError)) + else if (!is_console_handle(params->hStdError) && VerifyConsoleIoHandle(params->hStdError)) params->hStdError = console_handle_map(params->hStdError); return TRUE; diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index e856cc3af4..450a10e93b 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -147,19 +147,6 @@ static BOOL process_attach( HMODULE module ) LoadLibraryA( "krnl386.exe16" ); } - if (params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC) - { - HMODULE mod = GetModuleHandleA(0); - params->ConsoleHandle = NULL; - if (RtlImageNtHeader(mod)->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) - AllocConsole(); - } - /* else TODO for DETACHED_PROCESS: - * 1/ inherit console + handles - * 2/ create std handles, if handles are not inherited - * TBD when not using wineserver handles for console handles - */ - return TRUE; } diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 2a0e524748..ce893d7bc4 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -51,7 +51,6 @@ static inline BOOL set_ntstatus( NTSTATUS status ) } /* Some Wine specific values for Console inheritance (params->ConsoleHandle) */ -#define KERNEL32_CONSOLE_ALLOC ((HANDLE)1) #define KERNEL32_CONSOLE_SHELL ((HANDLE)2) extern HMODULE kernel32_handle DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 42dc971227..7589f305b5 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1729,5 +1729,15 @@ HRESULT WINAPI ResizePseudoConsole( HPCON handle, COORD size ) void init_console( void ) { + RTL_USER_PROCESS_PARAMETERS *params = RtlGetCurrentPeb()->ProcessParameters; + + if (params->ConsoleHandle == CONSOLE_HANDLE_ALLOC) + { + HMODULE mod = GetModuleHandleW( NULL ); + params->ConsoleHandle = NULL; + if (RtlImageNtHeader( mod )->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) + AllocConsole(); + } + RtlAddVectoredExceptionHandler( FALSE, handle_ctrl_c ); } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index eb6439684a..14177a5e19 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -226,4 +226,7 @@ enum condrv_renderer_event_type CONSOLE_RENDERER_EXIT_EVENT, }; +/* Wine specific values for console inheritance (params->ConsoleHandle) */ +#define CONSOLE_HANDLE_ALLOC ((HANDLE)1) + #endif /* _INC_CONDRV */

1 0

Georg Lehmann : winex11.drv: Use vkGetPhysicalDeviceProperties2KHR to get gpu properties.
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 586f68f414924b1e41fec10a72b1aacced068885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586f68f414924b1e41fec10a… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Sat Aug 29 23:57:40 2020 +0200 winex11.drv: Use vkGetPhysicalDeviceProperties2KHR to get gpu properties. vkGetPhysicalDeviceProperties2 is a Vulkan 1.1 function but wine uses a 1.0 instance, so use the extension function instead. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index faeb4d98d9..6c16fb29ec 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -552,7 +552,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); - PFN_vkGetPhysicalDeviceProperties2 pvkGetPhysicalDeviceProperties2; + PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; @@ -587,7 +587,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro } LOAD_VK_FUNC(vkEnumeratePhysicalDevices) - LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2) + LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -624,7 +624,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; properties2.pNext = &id; - pvkGetPhysicalDeviceProperties2( vk_physical_devices[device_idx], &properties2 ); + pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000)

1 0

Paul Gofman : ntdll: Implement RtlGetExtendedContextLength().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: 2de4f12b33724af2f90607a0626d75e8fbf8e4da URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de4f12b33724af2f90607a0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 31 12:31:56 2020 +0300 ntdll: Implement RtlGetExtendedContextLength(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- dlls/ntdll/exception.c | 71 ++++++++++ dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/exception.c | 147 ++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + include/ddk/wdm.h | 7 +- 6 files changed, 227 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2de4f12b33724af2f906…

1 0

Paul Gofman : kernel32: Implement LocateXStateFeature().
by Alexandre Julliard Aug. 31, 2020

Aug. 31, 2020

Module: wine Branch: master Commit: ff88ed8b0652e8fc202893c65258a012e650ebbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff88ed8b0652e8fc202893c6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 31 12:31:58 2020 +0300 kernel32: Implement LocateXStateFeature(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- .../api-ms-win-core-xstate-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 51 +++++++++++ dlls/ntdll/exception.c | 44 +++++++++ dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/exception.c | 102 ++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + include/ddk/wdm.h | 2 + include/winbase.h | 1 + 11 files changed, 206 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff88ed8b0652e8fc2028…

1 0