March 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Don't change the reported machine for COM+ images.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: cc9446f87486865f91a71d0a456711633bcb1397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9446f87486865f91a71d0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 22:01:42 2021 +0100 server: Don't change the reported machine for COM+ images. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50826 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 12 +++++++++--- dlls/ntdll/unix/process.c | 15 +++++++++------ server/mapping.c | 4 ---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 87a81343737..9e43358a26d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -452,14 +452,20 @@ static NTSTATUS loader_exec( const char *loader, char **argv, WORD machine ) */ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) { - int is_child_64bit = (pe_info->machine == IMAGE_FILE_MACHINE_AMD64 || - pe_info->machine == IMAGE_FILE_MACHINE_ARM64); + WORD machine = pe_info->machine; + int is_child_64bit = (machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64); ULONGLONG res_start = pe_info->base; ULONGLONG res_end = pe_info->base + pe_info->map_size; const char *loader = argv0; const char *loader_env = getenv( "WINELOADER" ); char preloader_reserve[64], socket_env[64]; + if (!is_child_64bit && (is_win64 || is_wow64) && (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) + { + is_child_64bit = TRUE; + machine = IMAGE_FILE_MACHINE_AMD64; + } + if (!is_win64 ^ !is_child_64bit) { /* remap WINELOADER to the alternate 32/64-bit version if necessary */ @@ -495,7 +501,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i putenv( preloader_reserve ); putenv( socket_env ); - return loader_exec( loader, argv, pe_info->machine ); + return loader_exec( loader, argv, machine ); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index d6dc893fba5..f1804009782 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -80,11 +80,14 @@ static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "AR static UINT process_error_mode; -static client_cpu_t get_machine_cpu( WORD machine ) +static client_cpu_t get_machine_cpu( pe_image_info_t *pe_info ) { - switch (machine) + switch (pe_info->machine) { - case IMAGE_FILE_MACHINE_I386: return CPU_x86; + case IMAGE_FILE_MACHINE_I386: + if ((is_win64 || is_wow64) && (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) + return CPU_x86_64; + return CPU_x86; case IMAGE_FILE_MACHINE_AMD64: return CPU_x86_64; case IMAGE_FILE_MACHINE_ARMNT: return CPU_ARM; case IMAGE_FILE_MACHINE_ARM64: return CPU_ARM64; @@ -679,7 +682,7 @@ void DECLSPEC_NORETURN exec_process( NTSTATUS status ) SERVER_START_REQ( exec_process ) { req->socket_fd = socketfd[1]; - req->cpu = get_machine_cpu( pe_info.machine ); + req->cpu = get_machine_cpu( &pe_info ); status = wine_server_call( req ); } SERVER_END_REQ; @@ -963,7 +966,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ req->create_flags = params->DebugFlags; /* hack: creation flags stored in DebugFlags for now */ req->socket_fd = socketfd[1]; req->access = process_access; - req->cpu = get_machine_cpu( pe_info.machine ); + req->cpu = get_machine_cpu( &pe_info ); req->info_size = startup_info_size; req->handles_size = handles_size; wine_server_add_data( req, objattr, attr_len ); @@ -990,7 +993,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ break; case STATUS_INVALID_IMAGE_FORMAT: ERR( "%s not supported on this installation (%s binary)\n", - debugstr_us(&path), cpu_names[get_machine_cpu(pe_info.machine)] ); + debugstr_us(&path), cpu_names[get_machine_cpu(&pe_info)] ); break; } goto done; diff --git a/server/mapping.c b/server/mapping.c index 3a162eae76b..13a0948a8ab 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -788,11 +788,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (nt.opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { if (!(clr.Flags & COMIMAGE_FLAGS_32BITREQUIRED)) - { mapping->image.image_flags |= IMAGE_FLAGS_ComPlusNativeReady; - if (cpu_mask & CPU_FLAG(CPU_x86_64)) mapping->image.machine = IMAGE_FILE_MACHINE_AMD64; - else if (cpu_mask & CPU_FLAG(CPU_ARM64)) mapping->image.machine = IMAGE_FILE_MACHINE_ARM64; - } if (clr.Flags & COMIMAGE_FLAGS_32BITPREFERRED) mapping->image.image_flags |= IMAGE_FLAGS_ComPlusPrefer32bit; }

1 0

Jacek Caban : include: Add missing typedefs to windows.foundation.idl.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 41df83c50e1c3cfdd6e8ffb65de7838f8503632c URL: https://source.winehq.org/git/wine.git/?a=commit;h=41df83c50e1c3cfdd6e8ffb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 19 19:54:58 2021 +0100 include: Add missing typedefs to windows.foundation.idl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index b06b9eadaf4..c4dc454974f 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -29,6 +29,13 @@ import "windows.foundation.collections.idl"; namespace Windows { namespace Foundation { + typedef enum PropertyType PropertyType; + typedef struct Point Point; + typedef struct Size Size; + typedef struct Rect Rect; + typedef struct DateTime DateTime; + typedef struct TimeSpan TimeSpan; + [contract(Windows.Foundation.FoundationContract, 1.0)] enum PropertyType { Empty = 0,

1 0

Zebediah Figura : opencl: Don't bother generating a Unix function table entry for clGetExtensionFunctionAddress().
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: ceb72abde28a5dbe61381278b01cf9faaa522464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceb72abde28a5dbe61381278… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:06:31 2021 -0500 opencl: Don't bother generating a Unix function table entry for clGetExtensionFunctionAddress(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 15 +++++++++++++++ dlls/opencl/unix_thunks.c | 6 ------ dlls/opencl/unixlib.h | 1 - 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 4859a45b292..72b7386d1e2 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -238,6 +238,18 @@ sub needs_unix_wrapper($) return defined $funcs{$name}; } +# don't bother putting unused functions in the interface +sub needs_unix_function($) +{ + my %funcs = + ( + "clGetExtensionFunctionAddress" => 1, + ); + my $name = shift; + + return not defined $funcs{$name}; +} + sub generate_struct($) { my $type = shift; @@ -382,6 +394,7 @@ EOF foreach (sort keys %core_functions) { + next unless needs_unix_function( $_ ); next if needs_unix_wrapper( $_ ); print UNIX "\n", generate_unix_thunk( $_, $core_functions{$_} ); } @@ -389,6 +402,7 @@ foreach (sort keys %core_functions) print UNIX "\nconst struct opencl_funcs funcs =\n{\n"; foreach (sort keys %core_functions) { + next unless needs_unix_function( $_ ); print UNIX " wrap_" . $_ . ",\n"; } print UNIX "};\n"; @@ -403,6 +417,7 @@ print UNIXHEADER "/* Automatically generated from OpenCL registry files; DO NOT print UNIXHEADER "struct opencl_funcs\n{\n"; foreach (sort keys %core_functions) { + next unless needs_unix_function( $_ ); print UNIXHEADER get_func_proto( " %s (WINAPI *p%s)(%s);\n", $_, $core_functions{$_} ); } print UNIXHEADER "};\n\n"; diff --git a/dlls/opencl/unix_thunks.c b/dlls/opencl/unix_thunks.c index 084131468d6..0fe3a081e0b 100644 --- a/dlls/opencl/unix_thunks.c +++ b/dlls/opencl/unix_thunks.c @@ -172,11 +172,6 @@ static cl_int WINAPI wrap_clGetEventProfilingInfo( cl_event event, cl_profiling_ return clGetEventProfilingInfo( event, param_name, param_value_size, param_value, param_value_size_ret ); } -static void* WINAPI wrap_clGetExtensionFunctionAddress( const char* func_name ) -{ - return clGetExtensionFunctionAddress( func_name ); -} - static cl_int WINAPI wrap_clGetImageInfo( cl_mem image, cl_image_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ) { return clGetImageInfo( image, param_name, param_value_size, param_value, param_value_size_ret ); @@ -356,7 +351,6 @@ const struct opencl_funcs funcs = wrap_clGetDeviceInfo, wrap_clGetEventInfo, wrap_clGetEventProfilingInfo, - wrap_clGetExtensionFunctionAddress, wrap_clGetImageInfo, wrap_clGetKernelInfo, wrap_clGetKernelWorkGroupInfo, diff --git a/dlls/opencl/unixlib.h b/dlls/opencl/unixlib.h index b6e53c30330..e0d01317db7 100644 --- a/dlls/opencl/unixlib.h +++ b/dlls/opencl/unixlib.h @@ -39,7 +39,6 @@ struct opencl_funcs cl_int (WINAPI *pclGetDeviceInfo)( cl_device_id device, cl_device_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ); cl_int (WINAPI *pclGetEventInfo)( cl_event event, cl_event_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ); cl_int (WINAPI *pclGetEventProfilingInfo)( cl_event event, cl_profiling_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ); - void* (WINAPI *pclGetExtensionFunctionAddress)( const char* func_name ); cl_int (WINAPI *pclGetImageInfo)( cl_mem image, cl_image_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ); cl_int (WINAPI *pclGetKernelInfo)( cl_kernel kernel, cl_kernel_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret ); cl_int (WINAPI *pclGetKernelWorkGroupInfo)( cl_kernel kernel, cl_device_id device, cl_kernel_work_group_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );

1 0

Zebediah Figura : opencl: Avoid calling clSetCommandQueueProperty().
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: ed44832c7d586ab52dab08b0a40d36c9a08ff2b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed44832c7d586ab52dab08b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:06:32 2021 -0500 opencl: Avoid calling clSetCommandQueueProperty(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 4 ++++ dlls/opencl/pe_thunks.c | 6 ------ dlls/opencl/pe_wrappers.c | 9 +++++++++ dlls/opencl/unix_thunks.c | 6 ------ dlls/opencl/unixlib.h | 1 - 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 72b7386d1e2..f30967ff384 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -216,6 +216,9 @@ sub needs_pe_wrapper($) # needs function pointer conversion "clGetExtensionFunctionAddress" => 1, + + # deprecated and absent from headers + "clSetCommandQueueProperty" => 1, ); my $name = shift; @@ -244,6 +247,7 @@ sub needs_unix_function($) my %funcs = ( "clGetExtensionFunctionAddress" => 1, + "clSetCommandQueueProperty" => 1, ); my $name = shift; diff --git a/dlls/opencl/pe_thunks.c b/dlls/opencl/pe_thunks.c index b3b08688d16..eb0466b6286 100644 --- a/dlls/opencl/pe_thunks.c +++ b/dlls/opencl/pe_thunks.c @@ -360,12 +360,6 @@ cl_int WINAPI clRetainSampler( cl_sampler sampler ) return opencl_funcs->pclRetainSampler( sampler ); } -cl_int WINAPI clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties ) -{ - TRACE( "(%p, %s, %u, %p)\n", command_queue, wine_dbgstr_longlong(properties), enable, old_properties ); - return opencl_funcs->pclSetCommandQueueProperty( command_queue, properties, enable, old_properties ); -} - cl_int WINAPI clSetKernelArg( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value ) { TRACE( "(%p, %u, %Iu, %p)\n", kernel, arg_index, arg_size, arg_value ); diff --git a/dlls/opencl/pe_wrappers.c b/dlls/opencl/pe_wrappers.c index 37be38c728f..35c78181580 100644 --- a/dlls/opencl/pe_wrappers.c +++ b/dlls/opencl/pe_wrappers.c @@ -118,6 +118,15 @@ void * WINAPI clGetExtensionFunctionAddress( const char *func_name ) return ret; } + +cl_int WINAPI clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, + cl_bool enable, cl_command_queue_properties *old_properties ) +{ + FIXME( "(%p, %s, %u, %p) deprecated\n", command_queue, wine_dbgstr_longlong(properties), enable, old_properties ); + return CL_INVALID_QUEUE_PROPERTIES; +} + + BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { if (reason == DLL_PROCESS_ATTACH) diff --git a/dlls/opencl/unix_thunks.c b/dlls/opencl/unix_thunks.c index 0fe3a081e0b..579c12eed79 100644 --- a/dlls/opencl/unix_thunks.c +++ b/dlls/opencl/unix_thunks.c @@ -292,11 +292,6 @@ static cl_int WINAPI wrap_clRetainSampler( cl_sampler sampler ) return clRetainSampler( sampler ); } -static cl_int WINAPI wrap_clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties ) -{ - return clSetCommandQueueProperty( command_queue, properties, enable, old_properties ); -} - static cl_int WINAPI wrap_clSetKernelArg( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value ) { return clSetKernelArg( kernel, arg_index, arg_size, arg_value ); @@ -375,7 +370,6 @@ const struct opencl_funcs funcs = wrap_clRetainMemObject, wrap_clRetainProgram, wrap_clRetainSampler, - wrap_clSetCommandQueueProperty, wrap_clSetKernelArg, wrap_clUnloadCompiler, wrap_clWaitForEvents, diff --git a/dlls/opencl/unixlib.h b/dlls/opencl/unixlib.h index e0d01317db7..d5b1da1b99e 100644 --- a/dlls/opencl/unixlib.h +++ b/dlls/opencl/unixlib.h @@ -63,7 +63,6 @@ struct opencl_funcs cl_int (WINAPI *pclRetainMemObject)( cl_mem memobj ); cl_int (WINAPI *pclRetainProgram)( cl_program program ); cl_int (WINAPI *pclRetainSampler)( cl_sampler sampler ); - cl_int (WINAPI *pclSetCommandQueueProperty)( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties ); cl_int (WINAPI *pclSetKernelArg)( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value ); cl_int (WINAPI *pclUnloadCompiler)( void ); cl_int (WINAPI *pclWaitForEvents)( cl_uint num_events, const cl_event* event_list );

1 0

Huw Davies : riched20: Remove always false conditions.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 5b3816c0b213c19d5e57f2f1a88a38a203f5cbf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b3816c0b213c19d5e57f2f1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 09:14:13 2021 +0000 riched20: Remove always false conditions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 607ced52089..b9173196aa2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1198,11 +1198,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if (editor->scrollbars & WS_HSCROLL) { - if (si.fMask & SIF_DISABLENOSCROLL) { - bScrollBarWillBeVisible = TRUE; - } else if (!(editor->scrollbars & WS_HSCROLL)) { - bScrollBarWillBeVisible = FALSE; - } + if (si.fMask & SIF_DISABLENOSCROLL) bScrollBarWillBeVisible = TRUE; if (bScrollBarWasVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); @@ -1253,11 +1249,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if (editor->scrollbars & WS_VSCROLL) { - if (si.fMask & SIF_DISABLENOSCROLL) { - bScrollBarWillBeVisible = TRUE; - } else if (!(editor->scrollbars & WS_VSCROLL)) { - bScrollBarWillBeVisible = FALSE; - } + if (si.fMask & SIF_DISABLENOSCROLL) bScrollBarWillBeVisible = TRUE; if (bScrollBarWasVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT,

1 0

Victor Hermann Chiletto : winevulkan: Adequate vkEnumerateInstanceLayerProperties to the Vulkan spec.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: dff2f63210a33e25a78897fb1d276b75705740ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=dff2f63210a33e25a78897fb… Author: Victor Hermann Chiletto <v(a)hnn.net.br> Date: Sat Mar 6 17:46:29 2021 -0300 winevulkan: Adequate vkEnumerateInstanceLayerProperties to the Vulkan spec. The section for vkEnumerateInstanceLayerProperties states [1]: On success, this command returns * VK_SUCCESS * VK_INCOMPLETE On failure, this command returns * VK_ERROR_OUT_OF_HOST_MEMORY * VK_ERROR_OUT_OF_DEVICE_MEMORY Always setting the layer count to zero and returning VK_SUCCESS is valid, as even if the function is given an array in pProperties, it's filled with zero layers [1]: https://www.khronos.org/registry/vulkan/specs/1.2-extensions/man/html/vkEnu… Signed-off-by: Victor Hermann Chiletto <v(a)hnn.net.br> Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index d24fcb2f64b..971394eb9dd 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1065,13 +1065,8 @@ VkResult WINAPI wine_vkEnumerateInstanceLayerProperties(uint32_t *count, VkLayer { TRACE("%p, %p\n", count, properties); - if (!properties) - { - *count = 0; - return VK_SUCCESS; - } - - return VK_ERROR_LAYER_NOT_PRESENT; + *count = 0; + return VK_SUCCESS; } VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version)

1 0

Huw Davies : riched20: Simplify the scrollbar visibility checks.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 39f5c438c571738e9727309b3ab62538f472dfd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f5c438c571738e9727309b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 09:14:14 2021 +0000 riched20: Simplify the scrollbar visibility checks. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b9173196aa2..1d498efb4c5 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1035,7 +1035,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) { - BOOL bScrollBarIsVisible, bScrollBarWillBeVisible; + BOOL old_vis, new_vis; int scrollX = 0, scrollY = 0; if (editor->horz_si.nPos != x) { @@ -1072,25 +1072,17 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) LONG winStyle = GetWindowLongW(editor->hWnd, GWL_STYLE); if (editor->scrollbars & WS_HSCROLL) { - bScrollBarIsVisible = (winStyle & WS_HSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nTotalWidth > editor->sizeWindow.cx - && (editor->scrollbars & WS_HSCROLL)) - || (editor->scrollbars & ES_DISABLENOSCROLL); - if (bScrollBarIsVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, - bScrollBarWillBeVisible); + old_vis = winStyle & WS_HSCROLL; + new_vis = editor->nTotalWidth > editor->sizeWindow.cx || editor->scrollbars & ES_DISABLENOSCROLL; + if (!old_vis ^ !new_vis) ITextHost_TxShowScrollBar( editor->texthost, SB_HORZ, new_vis ); } if (editor->scrollbars & WS_VSCROLL) { - bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy - && (editor->scrollbars & WS_VSCROLL) - && (editor->props & TXTBIT_MULTILINE)) - || (editor->scrollbars & ES_DISABLENOSCROLL); - if (bScrollBarIsVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, - bScrollBarWillBeVisible); + old_vis = winStyle & WS_VSCROLL; + new_vis = (editor->nTotalLength > editor->sizeWindow.cy && editor->props & TXTBIT_MULTILINE) || + editor->scrollbars & ES_DISABLENOSCROLL; + if (!old_vis ^ !new_vis) ITextHost_TxShowScrollBar( editor->texthost, SB_VERT, new_vis ); } } ME_UpdateScrollBar(editor);

1 0

Huw Davies : riched20: Keep track of the current scrollbar state.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 9685d5d62ca7b9b075ced8647897c0cdec2b13c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9685d5d62ca7b9b075ced864… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 09:14:15 2021 +0000 riched20: Keep track of the current scrollbar state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 ++ dlls/riched20/editstr.h | 2 ++ dlls/riched20/paint.c | 69 +++++++++++++++++-------------------------------- 3 files changed, 27 insertions(+), 46 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2ae97e1818b..7027b148188 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3012,12 +3012,14 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->vert_si.nMax = 0; ed->vert_si.nPage = 0; ed->vert_si.nPos = 0; + ed->vert_sb_enabled = 0; ed->horz_si.cbSize = sizeof(SCROLLINFO); ed->horz_si.nMin = 0; ed->horz_si.nMax = 0; ed->horz_si.nPage = 0; ed->horz_si.nPos = 0; + ed->horz_sb_enabled = 0; if (ed->scrollbars & ES_DISABLENOSCROLL) { diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index df07923548d..2d2816340bc 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -428,6 +428,8 @@ typedef struct tagME_TextEditor /* Cache previously set scrollbar info */ SCROLLINFO vert_si, horz_si; + unsigned int vert_sb_enabled : 1; + unsigned int horz_sb_enabled : 1; int caret_height; BOOL caret_hidden; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1d498efb4c5..90283d0c82f 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1073,15 +1073,14 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) if (editor->scrollbars & WS_HSCROLL) { old_vis = winStyle & WS_HSCROLL; - new_vis = editor->nTotalWidth > editor->sizeWindow.cx || editor->scrollbars & ES_DISABLENOSCROLL; + new_vis = editor->horz_sb_enabled || editor->scrollbars & ES_DISABLENOSCROLL; if (!old_vis ^ !new_vis) ITextHost_TxShowScrollBar( editor->texthost, SB_HORZ, new_vis ); } if (editor->scrollbars & WS_VSCROLL) { old_vis = winStyle & WS_VSCROLL; - new_vis = (editor->nTotalLength > editor->sizeWindow.cy && editor->props & TXTBIT_MULTILINE) || - editor->scrollbars & ES_DISABLENOSCROLL; + new_vis = editor->vert_sb_enabled || editor->scrollbars & ES_DISABLENOSCROLL; if (!old_vis ^ !new_vis) ITextHost_TxShowScrollBar( editor->texthost, SB_VERT, new_vis ); } } @@ -1118,25 +1117,13 @@ void ME_ScrollRight(ME_TextEditor *editor, int cx) ME_HScrollAbs(editor, editor->horz_si.nPos + cx); } -/* Calculates the visibility after a call to SetScrollRange or - * SetScrollInfo with SIF_RANGE. */ -static BOOL ME_PostSetScrollRangeVisibility(SCROLLINFO *si) -{ - if (si->fMask & SIF_DISABLENOSCROLL) - return TRUE; - - /* This must match the check in SetScrollInfo to determine whether - * to show or hide the scrollbars. */ - return si->nMin < si->nMax - max(si->nPage - 1, 0); -} - void ME_UpdateScrollBar(ME_TextEditor *editor) { /* Note that this is the only function that should ever call * SetScrollInfo with SIF_PAGE or SIF_RANGE. */ SCROLLINFO si; - BOOL bScrollBarWasVisible, bScrollBarWillBeVisible; + BOOL enable; if (ME_WrapMarkedParagraphs(editor)) FIXME("ME_UpdateScrollBar had to call ME_WrapMarkedParagraphs\n"); @@ -1148,13 +1135,11 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) si.fMask |= SIF_DISABLENOSCROLL; /* Update horizontal scrollbar */ - bScrollBarWasVisible = editor->horz_si.nMax > editor->horz_si.nPage; - bScrollBarWillBeVisible = editor->nTotalWidth > editor->sizeWindow.cx; - if (editor->horz_si.nPos && !bScrollBarWillBeVisible) + enable = editor->nTotalWidth > editor->sizeWindow.cx; + if (editor->horz_si.nPos && !enable) { ME_HScrollAbs(editor, 0); - /* ME_HScrollAbs will call this function, - * so nothing else needs to be done here. */ + /* ME_HScrollAbs will call this function, so nothing else needs to be done here. */ return; } @@ -1168,8 +1153,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); editor->horz_si.nMax = si.nMax; editor->horz_si.nPage = si.nPage; - if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && - editor->scrollbars & WS_HSCROLL) + if ((enable || editor->horz_sb_enabled) && editor->scrollbars & WS_HSCROLL) { if (si.nMax > 0xFFFF) { @@ -1183,29 +1167,25 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, si.nMin, si.nMax, FALSE); ITextHost_TxSetScrollPos(editor->texthost, SB_HORZ, si.nPos, TRUE); } - /* SetScrollInfo or SetScrollRange change scrollbar visibility. */ - bScrollBarWasVisible = ME_PostSetScrollRangeVisibility(&si); } } - if (editor->scrollbars & WS_HSCROLL) + if (editor->scrollbars & WS_HSCROLL && !enable ^ !editor->horz_sb_enabled) { - if (si.fMask & SIF_DISABLENOSCROLL) bScrollBarWillBeVisible = TRUE; - - if (bScrollBarWasVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); + if (enable || editor->scrollbars & ES_DISABLENOSCROLL) + ITextHost_TxEnableScrollBar( editor->texthost, SB_HORZ, enable ? 0 : ESB_DISABLE_BOTH ); + if (!(editor->scrollbars & ES_DISABLENOSCROLL)) + ITextHost_TxShowScrollBar( editor->texthost, SB_HORZ, enable ); + editor->horz_sb_enabled = enable; } /* Update vertical scrollbar */ - bScrollBarWasVisible = editor->vert_si.nMax > editor->vert_si.nPage; - bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy && - (editor->props & TXTBIT_MULTILINE); + enable = editor->nTotalLength > editor->sizeWindow.cy && (editor->props & TXTBIT_MULTILINE); - if (editor->vert_si.nPos && !bScrollBarWillBeVisible) + if (editor->vert_si.nPos && !enable) { ME_VScrollAbs(editor, 0); - /* ME_VScrollAbs will call this function, - * so nothing else needs to be done here. */ + /* ME_VScrollAbs will call this function, so nothing else needs to be done here. */ return; } @@ -1219,8 +1199,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); editor->vert_si.nMax = si.nMax; editor->vert_si.nPage = si.nPage; - if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && - editor->scrollbars & WS_VSCROLL) + if ((enable || editor->vert_sb_enabled) && editor->scrollbars & WS_VSCROLL) { if (si.nMax > 0xFFFF) { @@ -1234,18 +1213,16 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, si.nMin, si.nMax, FALSE); ITextHost_TxSetScrollPos(editor->texthost, SB_VERT, si.nPos, TRUE); } - /* SetScrollInfo or SetScrollRange change scrollbar visibility. */ - bScrollBarWasVisible = ME_PostSetScrollRangeVisibility(&si); } } - if (editor->scrollbars & WS_VSCROLL) + if (editor->scrollbars & WS_VSCROLL && !enable ^ !editor->vert_sb_enabled) { - if (si.fMask & SIF_DISABLENOSCROLL) bScrollBarWillBeVisible = TRUE; - - if (bScrollBarWasVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, - bScrollBarWillBeVisible); + if (enable || editor->scrollbars & ES_DISABLENOSCROLL) + ITextHost_TxEnableScrollBar( editor->texthost, SB_VERT, enable ? 0 : ESB_DISABLE_BOTH ); + if (!(editor->scrollbars & ES_DISABLENOSCROLL)) + ITextHost_TxShowScrollBar( editor->texthost, SB_VERT, enable ); + editor->vert_sb_enabled = enable; } }

1 0

Huw Davies : riched20: Update editor's wordwrap state.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 68c5f747db3757e637f4e37b630ff0757b6dd360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68c5f747db3757e637f4e37b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 09:14:16 2021 +0000 riched20: Update editor's wordwrap state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txtsrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eee55462ef2..5a8929e6c67 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -358,6 +358,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic TRACE( "%p, mask %08x, bits %08x\n", services, mask, bits ); services->editor->props = (services->editor->props & ~mask) | (bits & mask); + if (mask & (TXTBIT_WORDWRAP | TXTBIT_MULTILINE)) + services->editor->bWordWrap = (services->editor->props & TXTBIT_WORDWRAP) && (services->editor->props & TXTBIT_MULTILINE); if (mask & TXTBIT_SCROLLBARCHANGE) {

1 0

Huw Davies : include: Fix spelling of the InPlace methods.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 61ce905bc459725b3e1ee2cf6d54f9947db003d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ce905bc459725b3e1ee2cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 09:14:17 2021 +0000 include: Fix spelling of the InPlace methods. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 4 ++-- dlls/riched20/tests/txtsrv.c | 4 ++-- dlls/riched20/txtsrv.c | 20 ++++++++++---------- include/textserv.h | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e7d392c71c6..bad48ba54da 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -394,8 +394,8 @@ extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) #define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) -#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) -#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxInPlaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInPlaceActivate(This,a) +#define ITextServices_OnTxInPlaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInPlaceDeactivate(This) #define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) #define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) #define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index f41375d871a..de6d8a8df24 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -61,8 +61,8 @@ static ITextServicesVtbl itextServicesStdcallVtbl; #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) #define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) -#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) -#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxInPlaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInPlaceActivate(This,a) +#define ITextServices_OnTxInPlaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInPlaceDeactivate(This) #define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) #define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) #define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 5a8929e6c67..d637d52ea3b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -232,8 +232,8 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c return hr; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceActivate(ITextServices *iface, LPCRECT prcClient) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceActivate,8) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate(ITextServices *iface, LPCRECT prcClient) { struct text_services *services = impl_from_ITextServices( iface ); @@ -241,8 +241,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceActivate(ITextServices * return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceDeactivate(ITextServices *iface) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceDeactivate,4) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface ); @@ -450,8 +450,8 @@ DEFINE_STDCALL_WRAPPER(5, ITextServices_TxGetHScroll) DEFINE_STDCALL_WRAPPER(6, ITextServices_TxGetVScroll) DEFINE_STDCALL_WRAPPER(7, ITextServices_OnTxSetCursor) DEFINE_STDCALL_WRAPPER(8, ITextServices_TxQueryHitPoint) -DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInplaceActivate) -DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInplaceDeactivate) +DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInPlaceActivate) +DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInPlaceDeactivate) DEFINE_STDCALL_WRAPPER(11, ITextServices_OnTxUIActivate) DEFINE_STDCALL_WRAPPER(12, ITextServices_OnTxUIDeactivate) DEFINE_STDCALL_WRAPPER(13, ITextServices_TxGetText) @@ -474,8 +474,8 @@ const ITextServicesVtbl text_services_stdcall_vtbl = STDCALL(ITextServices_TxGetVScroll), STDCALL(ITextServices_OnTxSetCursor), STDCALL(ITextServices_TxQueryHitPoint), - STDCALL(ITextServices_OnTxInplaceActivate), - STDCALL(ITextServices_OnTxInplaceDeactivate), + STDCALL(ITextServices_OnTxInPlaceActivate), + STDCALL(ITextServices_OnTxInPlaceDeactivate), STDCALL(ITextServices_OnTxUIActivate), STDCALL(ITextServices_OnTxUIDeactivate), STDCALL(ITextServices_TxGetText), @@ -501,8 +501,8 @@ static const ITextServicesVtbl textservices_vtbl = THISCALL(fnTextSrv_TxGetVScroll), THISCALL(fnTextSrv_OnTxSetCursor), THISCALL(fnTextSrv_TxQueryHitPoint), - THISCALL(fnTextSrv_OnTxInplaceActivate), - THISCALL(fnTextSrv_OnTxInplaceDeactivate), + THISCALL(fnTextSrv_OnTxInPlaceActivate), + THISCALL(fnTextSrv_OnTxInPlaceDeactivate), THISCALL(fnTextSrv_OnTxUIActivate), THISCALL(fnTextSrv_OnTxUIDeactivate), THISCALL(fnTextSrv_TxGetText), diff --git a/include/textserv.h b/include/textserv.h index 1272a6bba00..3abdcee6a30 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -103,10 +103,10 @@ DECLARE_INTERFACE_(ITextServices,IUnknown) INT y, DWORD* pHitResult) PURE; - THISCALLMETHOD_(HRESULT,OnTxInplaceActivate)( THIS_ + THISCALLMETHOD_(HRESULT,OnTxInPlaceActivate)( THIS_ LPCRECT prcClient) PURE; - THISCALLMETHOD_(HRESULT,OnTxInplaceDeactivate)( THIS ) PURE; + THISCALLMETHOD_(HRESULT,OnTxInPlaceDeactivate)( THIS ) PURE; THISCALLMETHOD_(HRESULT,OnTxUIActivate)( THIS ) PURE;

1 0