May 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : taskmgr: Fetch the debug channels from the PEB memory block.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 0913e43bf976b5607665c416e979193a6078bd89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0913e43bf976b5607665c416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 21:32:11 2021 +0200 taskmgr: Fetch the debug channels from the PEB memory block. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/dbgchnl.c | 60 ++++++--------------------------------------- programs/taskmgr/procpage.c | 3 --- programs/taskmgr/taskmgr.h | 2 -- 3 files changed, 7 insertions(+), 58 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 7200eb476c7..2d160bf4b50 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -28,7 +28,6 @@ #include <windows.h> #include <commctrl.h> #include <winnt.h> -#include <dbghelp.h> #include "taskmgr.h" #include "perfdata.h" @@ -49,35 +48,6 @@ * setting for a fixme:s or err:s */ -static DWORD (WINAPI *pSymSetOptions)(DWORD); -static BOOL (WINAPI *pSymInitialize)(HANDLE, PSTR, BOOL); -static DWORD (WINAPI *pSymLoadModule)(HANDLE, HANDLE, PCSTR, PCSTR, DWORD, DWORD); -static BOOL (WINAPI *pSymCleanup)(HANDLE); -static BOOL (WINAPI *pSymFromName)(HANDLE, PCSTR, PSYMBOL_INFO); - -BOOL AreDebugChannelsSupported(void) -{ - static HANDLE hDbgHelp /* = NULL */; - - static const WCHAR wszDbgHelp[] = {'D','B','G','H','E','L','P','.','D','L','L',0}; - - if (hDbgHelp) return TRUE; - - if (!(hDbgHelp = LoadLibraryW(wszDbgHelp))) return FALSE; - pSymSetOptions = (void*)GetProcAddress(hDbgHelp, "SymSetOptions"); - pSymInitialize = (void*)GetProcAddress(hDbgHelp, "SymInitialize"); - pSymLoadModule = (void*)GetProcAddress(hDbgHelp, "SymLoadModule"); - pSymFromName = (void*)GetProcAddress(hDbgHelp, "SymFromName"); - pSymCleanup = (void*)GetProcAddress(hDbgHelp, "SymCleanup"); - if (!pSymSetOptions || !pSymInitialize || !pSymLoadModule || !pSymCleanup || !pSymFromName) - { - FreeLibrary(hDbgHelp); - hDbgHelp = NULL; - return FALSE; - } - return TRUE; -} - static DWORD get_selected_pid(void) { LVITEMW lvitem; @@ -160,27 +130,6 @@ static int change_channel_CB(HANDLE hProcess, void* addr, struct __wine_debug_ch return 1; } -static void* get_symbol(HANDLE hProcess, const char* name) -{ - char buffer[sizeof(IMAGEHLP_SYMBOL) + 256]; - SYMBOL_INFO* si = (SYMBOL_INFO*)buffer; - void* ret = NULL; - - /* also ask for wine extensions (loading symbols from ELF files) */ - pSymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_PUBLICS_ONLY | 0x40000000); - /* FIXME: the TRUE option is due to the fact that dbghelp requires it - * when loading an ELF module - */ - if (pSymInitialize(hProcess, NULL, TRUE)) - { - si->SizeOfStruct = sizeof(*si); - si->MaxNameLen = sizeof(buffer) - sizeof(IMAGEHLP_SYMBOL); - if (pSymFromName(hProcess, name, si)) - ret = (void*)(ULONG_PTR)si->Address; - pSymCleanup(hProcess); - } - return ret; -} typedef int (*EnumChannelCB)(HANDLE, void*, struct __wine_debug_channel*, void*); @@ -193,11 +142,16 @@ typedef int (*EnumChannelCB)(HANDLE, void*, struct __wine_debug_channel*, void*) static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user) { struct __wine_debug_channel channel; + PROCESS_BASIC_INFORMATION info; int ret = 1; void* addr; - if (!(addr = get_symbol(hProcess, "libwine.so.1!debug_options"))) return -1; - + NtQueryInformationProcess( hProcess, ProcessBasicInformation, &info, sizeof(info), NULL ); +#ifdef _WIN64 + addr = (char *)info.PebBaseAddress + 0x2000; +#else + addr = (char *)info.PebBaseAddress + 0x1000; +#endif while (ret && addr && ReadProcessMemory(hProcess, addr, &channel, sizeof(channel), NULL)) { if (!channel.name[0]) break; diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 5ea2e6b044f..baba6c6a06b 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -97,9 +97,6 @@ static void ProcessPageShowContextMenu(DWORD dwProcessId) if (si.dwNumberOfProcessors < 2) RemoveMenu(hSubMenu, ID_PROCESS_PAGE_SETAFFINITY, MF_BYCOMMAND); - - if (!AreDebugChannelsSupported()) - RemoveMenu(hSubMenu, ID_PROCESS_PAGE_DEBUGCHANNELS, MF_BYCOMMAND); switch (dwProcessPriorityClass) { case REALTIME_PRIORITY_CLASS: diff --git a/programs/taskmgr/taskmgr.h b/programs/taskmgr/taskmgr.h index ed220beebd2..b8c383d5f4d 100644 --- a/programs/taskmgr/taskmgr.h +++ b/programs/taskmgr/taskmgr.h @@ -157,8 +157,6 @@ LPWSTR GetLastErrorText( LPWSTR lpwszBuf, DWORD dwSize ); void OnAbout(void); -BOOL AreDebugChannelsSupported(void); - void ProcessPage_OnSetAffinity(void); void ProcessPage_OnDebug(void); void ProcessPage_OnEndProcess(void);

1 0

Alexandre Julliard : ntdll: Fetch the debug channels from the PEB memory block on the PE side.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 1e5eee0fc318459d7ef071998e8ed05f2530d2c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e5eee0fc318459d7ef07199… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 21:35:12 2021 +0200 ntdll: Fetch the debug channels from the PEB memory block on the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unixlib.h | 3 +-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index a95880ca4bd..bcf010724c4 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -37,6 +37,16 @@ WINE_DECLARE_DEBUG_CHANNEL(thread); struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +static int nb_debug_options; +static struct __wine_debug_channel *debug_options; + +static void init_options(void) +{ + unsigned int offset = page_size * (sizeof(void *) / 4); + + debug_options = (struct __wine_debug_channel *)((char *)NtCurrentTeb()->Peb + offset); + while (debug_options[nb_debug_options].name[0]) nb_debug_options++; +} /*********************************************************************** * __wine_dbg_get_channel_flags (NTDLL.@) @@ -45,7 +55,25 @@ struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; */ unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) { - return unix_funcs->dbg_get_channel_flags( channel ); + int min, max, pos, res; + unsigned char default_flags; + + if (!debug_options) init_options(); + + min = 0; + max = nb_debug_options - 1; + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( channel->name, debug_options[pos].name ); + if (!res) return debug_options[pos].flags; + if (res < 0) max = pos - 1; + else min = pos + 1; + } + /* no option for this channel */ + default_flags = debug_options[nb_debug_options].flags; + if (channel->flags & (1 << __WINE_DBCL_INIT)) channel->flags = default_flags; + return default_flags; } /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1b79b71b252..ff49cd5f26b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1840,7 +1840,6 @@ static struct unix_funcs unix_funcs = init_builtin_dll, init_unix_lib, unwind_builtin_dll, - __wine_dbg_get_channel_flags, __wine_dbg_strdup, __wine_dbg_output, __wine_dbg_header, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 04ae8230b1a..d0f2f4ed508 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 120 +#define NTDLL_UNIXLIB_VERSION 121 struct unix_funcs { @@ -80,7 +80,6 @@ struct unix_funcs CONTEXT *context ); /* debugging functions */ - unsigned char (CDECL *dbg_get_channel_flags)( struct __wine_debug_channel *channel ); const char * (CDECL *dbg_strdup)( const char *str ); int (CDECL *dbg_output)( const char *str ); int (CDECL *dbg_header)( enum __wine_debug_class cls, struct __wine_debug_channel *channel,

1 0

Daniel Lehman : ntdll/tests: Clean up temp file.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: cb6a6bb6cf0d01c9e9a157869a303f72426cded4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb6a6bb6cf0d01c9e9a15786… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun May 23 13:20:39 2021 -0700 ntdll/tests: Clean up temp file. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index fb7d48e7fe1..a7f8eaa84e1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1500,9 +1500,9 @@ static void test_query_object(void) GetTempFileNameA(tmp_path, "foo", 0, file1); handle = CreateFileA(file1, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); test_object_type(handle, L"File"); - DeleteFileA( file1 ); test_file_info( handle ); pNtClose( handle ); + DeleteFileA( file1 ); status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %x\n", status);

1 0

Alexandre Julliard : ntdll: Replace __wine_make_process_system by a Wine-specific NtSetInformationProcess() class.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 4e8fcc41ca42f7e047e4a5cb708a75447a753143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e8fcc41ca42f7e047e4a5cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 15:56:26 2021 +0200 ntdll: Replace __wine_make_process_system by a Wine-specific NtSetInformationProcess() class. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/unix/process.c | 30 +++++++++++------------------- dlls/sechost/service.c | 5 ++--- include/wine/server_protocol.h | 4 ++-- include/winternl.h | 5 ++++- programs/services/rpc.c | 5 ++--- server/process.c | 8 +++++++- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 10 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f05e9c39a88..4eb7aec1aa5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1610,7 +1610,6 @@ @ cdecl -syscall -norelay wine_server_call(ptr) @ cdecl -syscall wine_server_fd_to_handle(long long long ptr) @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) -@ cdecl -syscall __wine_make_process_system() # Unix interface @ cdecl __wine_set_unix_funcs(long ptr) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 340fe9cc304..c1ff0289cf2 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1485,6 +1485,17 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, break; } + case ProcessWineMakeProcessSystem: + if (size != sizeof(HANDLE *)) return STATUS_INFO_LENGTH_MISMATCH; + SERVER_START_REQ( make_process_system ) + { + req->handle = wine_server_obj_handle( handle ); + if (!(ret = wine_server_call( req ))) + *(HANDLE *)info = wine_server_ptr_handle( reply->event ); + } + SERVER_END_REQ; + return ret; + default: FIXME( "(%p,0x%08x,%p,0x%08x) stub\n", handle, class, info, size ); ret = STATUS_NOT_IMPLEMENTED; @@ -1605,22 +1616,3 @@ NTSTATUS WINAPI NtDebugContinue( HANDLE handle, CLIENT_ID *client, NTSTATUS stat SERVER_END_REQ; return ret; } - - -/*********************************************************************** - * __wine_make_process_system (NTDLL.@) - * - * Mark the current process as a system process. - * Returns the event that is signaled when all non-system processes have exited. - */ -HANDLE CDECL __wine_make_process_system(void) -{ - HANDLE ret = 0; - - SERVER_START_REQ( make_process_system ) - { - if (!wine_server_call( req )) ret = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - return ret; -} diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 305c1169bd4..e4e152b0824 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -90,8 +90,6 @@ static unsigned int nb_services; static HANDLE service_event; static BOOL stop_service; -extern HANDLE CDECL __wine_make_process_system(void); - static WCHAR *heap_strdupAtoW( const char *src ) { WCHAR *dst = NULL; @@ -1845,7 +1843,8 @@ static BOOL service_run_main_thread(void) stop_service = FALSE; /* FIXME: service_control_dispatcher should be merged into the main thread */ - wait_handles[0] = __wine_make_process_system(); + NtSetInformationProcess( GetCurrentProcess(), ProcessWineMakeProcessSystem, + &wait_handles[0], sizeof(HANDLE *) ); wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, disp, 0, NULL ); wait_handles[2] = service_event; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e6775959a22..b9d29c1d560 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4917,7 +4917,7 @@ struct get_kernel_object_handle_reply struct make_process_system_request { struct request_header __header; - char __pad_12[4]; + obj_handle_t handle; }; struct make_process_system_reply { @@ -6267,7 +6267,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 703 +#define SERVER_PROTOCOL_VERSION 704 /* ### protocol_version end ### */ diff --git a/include/winternl.h b/include/winternl.h index 691638f359c..aa8c76a536a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1455,7 +1455,10 @@ typedef enum _PROCESSINFOCLASS { ProcessThreadStackAllocation = 41, ProcessWorkingSetWatchEx = 42, ProcessImageFileNameWin32 = 43, - MaxProcessInfoClass + MaxProcessInfoClass, +#ifdef __WINESRC__ + ProcessWineMakeProcessSystem = 1000, +#endif } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; #define MEM_EXECUTE_OPTION_DISABLE 0x01 diff --git a/programs/services/rpc.c b/programs/services/rpc.c index df69a741b51..8d688c2f904 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -35,8 +35,6 @@ #include "services.h" #include "svcctl.h" -extern HANDLE CDECL __wine_make_process_system(void); - WINE_DEFAULT_DEBUG_CHANNEL(service); static const GENERIC_MAPPING g_scm_generic = @@ -2135,7 +2133,8 @@ DWORD RPC_Init(void) return err; } - exit_event = __wine_make_process_system(); + NtSetInformationProcess( GetCurrentProcess(), ProcessWineMakeProcessSystem, + &exit_event, sizeof(HANDLE *) ); return ERROR_SUCCESS; } diff --git a/server/process.c b/server/process.c index e91a63bed08..87ff3186bb5 100644 --- a/server/process.c +++ b/server/process.c @@ -1635,7 +1635,7 @@ DECL_HANDLER(get_process_idle_event) /* make the current process a system process */ DECL_HANDLER(make_process_system) { - struct process *process = current->process; + struct process *process; struct thread *thread; if (!shutdown_event) @@ -1644,8 +1644,13 @@ DECL_HANDLER(make_process_system) release_object( shutdown_event ); } + if (!(process = get_process_from_handle( req->handle, PROCESS_SET_INFORMATION ))) return; + if (!(reply->event = alloc_handle( current->process, shutdown_event, SYNCHRONIZE, 0 ))) + { + release_object( process ); return; + } if (!process->is_system) { @@ -1655,6 +1660,7 @@ DECL_HANDLER(make_process_system) if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); } + release_object( process ); } /* create a new job object */ diff --git a/server/protocol.def b/server/protocol.def index 1407a7b4a54..62a584e4cc9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3430,6 +3430,7 @@ struct handle_info /* Make the current process a system process */ @REQ(make_process_system) + obj_handle_t handle; /* handle to the process */ @REPLY obj_handle_t event; /* event signaled when all user processes have exited */ @END diff --git a/server/request.h b/server/request.h index 3261308265f..ce1edb548b7 100644 --- a/server/request.h +++ b/server/request.h @@ -2091,6 +2091,7 @@ C_ASSERT( FIELD_OFFSET(struct get_kernel_object_handle_request, access) == 24 ); C_ASSERT( sizeof(struct get_kernel_object_handle_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_kernel_object_handle_reply, handle) == 8 ); C_ASSERT( sizeof(struct get_kernel_object_handle_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct make_process_system_request, handle) == 12 ); C_ASSERT( sizeof(struct make_process_system_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct make_process_system_reply, event) == 8 ); C_ASSERT( sizeof(struct make_process_system_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 6084f876875..ab805a05234 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4181,6 +4181,7 @@ static void dump_get_kernel_object_handle_reply( const struct get_kernel_object_ static void dump_make_process_system_request( const struct make_process_system_request *req ) { + fprintf( stderr, " handle=%04x", req->handle ); } static void dump_make_process_system_reply( const struct make_process_system_reply *req )

1 0

Jiangyi Chen : gdi32: Delete the external font reg key when face's name matches but the file path does not.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: d7b9b306cb94a43ac2cd44feac8adbf639f5ec78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b9b306cb94a43ac2cd44fe… Author: Jiangyi Chen <cjy520lcy(a)163.com> Date: Mon May 24 11:30:46 2021 +0100 gdi32: Delete the external font reg key when face's name matches but the file path does not. Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2d2831ec725..49775b7a806 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7881,9 +7881,9 @@ static void update_external_font_keys(void) { if (type != REG_SZ) goto next; if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; - if ((face = find_face_from_full_name( value ))) + if ((face = find_face_from_full_name( value )) && !wcsicmp( face->file, path )) { - if (!wcsicmp( face->file, path )) face->flags |= ADDFONT_EXTERNAL_FOUND; + face->flags |= ADDFONT_EXTERNAL_FOUND; goto next; } if (tmp && !*tmp) *tmp = ' ';

1 0

Jactry Zeng : riched20/tests: Test IRichEditOle_InsertObject() with specified character position.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: db7964bb2cffe04a483ac913158379544a573e7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=db7964bb2cffe04a483ac913… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 20 15:56:11 2021 +0800 riched20/tests: Test IRichEditOle_InsertObject() with specified character position. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 180 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 9f463fd69e0..c2457ae5146 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3252,9 +3252,22 @@ static void test_InsertObject(void) REOBJECT reo1, reo2, reo3, received_reo; HRESULT hr; HWND hwnd; - LONG count; + const WCHAR *expected_string; + const CHAR *expected_stringA; + ITextSelection *selection; + IDataObject *dataobject; + TEXTRANGEA textrange; + FORMATETC formatetc; + CHARRANGE charrange; + GETTEXTEX gettextex; + STGMEDIUM stgmedium; + WCHAR buffer[1024]; + CHAR bufferA[1024]; + LONG count, result; + ITextRange *range; + BSTR bstr; - create_interfaces(&hwnd, &reole, &doc, NULL); + create_interfaces(&hwnd, &reole, &doc, &selection); SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -3352,7 +3365,168 @@ static void test_InsertObject(void) hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo, REO_GETOBJ_ALL_INTERFACES); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); - release_interfaces(&hwnd, &reole, &doc, NULL); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + + /* "abc|d|efg" */ + INSERT_REOBJECT(reole, &reo1, 3, 1); + INSERT_REOBJECT(reole, &reo2, 5, 2); + + SendMessageW(hwnd, EM_SETSEL, 2, 3); + result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == SEL_TEXT, "Got selection type: %x.\n", result); + + SendMessageW(hwnd, EM_SETSEL, 3, 4); + result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); + todo_wine ok(result == SEL_OBJECT, "Got selection type: %x.\n", result); + todo_wine CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo1.polesite, 1); + + SendMessageW(hwnd, EM_SETSEL, 2, 4); + result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); + todo_wine ok(result == (SEL_TEXT | SEL_OBJECT), "Got selection type: %x.\n", result); + + SendMessageW(hwnd, EM_SETSEL, 5, 6); + todo_wine CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo2.polesite, 2); + + expected_string = L"abc\xfffc""d\xfffc""efg"; + gettextex.cb = sizeof(buffer); + gettextex.flags = GT_DEFAULT; + gettextex.codepage = 1200; + gettextex.lpDefaultChar = NULL; + gettextex.lpUsedDefChar = NULL; + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + gettextex.flags = GT_RAWTEXT; + memset(buffer, 0, sizeof(buffer)); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + expected_stringA = "abc d efg"; + memset(bufferA, 0, sizeof(bufferA)); + SendMessageA(hwnd, EM_SETSEL, 0, -1); + result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); + ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); + todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + + memset(bufferA, 0, sizeof(bufferA)); + textrange.lpstrText = bufferA; + textrange.chrg.cpMin = 0; + textrange.chrg.cpMax = 11; + result = SendMessageA(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)&textrange); + ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); + todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + + expected_string = L"abc\xfffc""d\xfffc""efg\r"; + hr = ITextDocument_Range(doc, 0, 11, &range); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITextRange_GetText(range, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(lstrlenW(bstr) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(bstr)); + todo_wine ok(!lstrcmpW(bstr, expected_string), "Got text: %s.\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITextRange_SetRange(range, 3, 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITextRange_GetChar(range, &result); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(result == 0xfffc, "Got char: %c\n", result); + ITextRange_Release(range); + + SendMessageW(hwnd, EM_SETSEL, 0, -1); + hr = ITextSelection_GetText(selection, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(lstrlenW(bstr) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(bstr)); + todo_wine ok(!lstrcmpW(bstr, expected_string), "Got text: %s.\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + SendMessageW(hwnd, EM_SETSEL, 3, 4); + result = 0; + hr = ITextSelection_GetChar(selection, &result); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(result == 0xfffc, "Got char: %c\n", result); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + result = SendMessageW(hwnd, EM_SETTEXTMODE, (WPARAM)TM_PLAINTEXT, 0); + ok(!result, "Got result %x.\n", result); + /* "abc|d|efg" */ + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + INSERT_REOBJECT(reole, &reo1, 3, 1); + INSERT_REOBJECT(reole, &reo2, 5, 2); + + expected_string = L"abc d efg"; + charrange.cpMin = 0; + charrange.cpMax = 11; + hr = IRichEditOle_GetClipboardData(reole, &charrange, 1, &dataobject); + ok(hr == S_OK, "Got hr %#x.\n", hr); + formatetc.cfFormat = CF_UNICODETEXT; + formatetc.dwAspect = DVASPECT_CONTENT; + formatetc.ptd = NULL; + formatetc.tymed = TYMED_HGLOBAL; + formatetc.lindex = -1; + hr = IDataObject_GetData(dataobject, &formatetc, &stgmedium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(lstrlenW(stgmedium.hGlobal) == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(stgmedium.hGlobal, expected_string), "Got wrong content: %s.\n", debugstr_w(stgmedium.hGlobal)); + + expected_string = L"abc\xfffc""d\xfffc""efg"; + gettextex.cb = sizeof(buffer); + gettextex.flags = GT_DEFAULT; + gettextex.codepage = 1200; + gettextex.lpDefaultChar = NULL; + gettextex.lpUsedDefChar = NULL; + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + gettextex.flags = GT_RAWTEXT; + memset(buffer, 0, sizeof(buffer)); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + expected_stringA = "abc d efg"; + memset(bufferA, 0, sizeof(bufferA)); + SendMessageA(hwnd, EM_SETSEL, 0, -1); + result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); + ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); + todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + + memset(bufferA, 0, sizeof(bufferA)); + textrange.lpstrText = bufferA; + textrange.chrg.cpMin = 0; + textrange.chrg.cpMax = 11; + result = SendMessageA(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)&textrange); + ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); + todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + + expected_string = L"abc\xfffc""d\xfffc""efg"; + hr = ITextDocument_Range(doc, 0, 11, &range); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITextRange_GetText(range, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(lstrlenW(bstr) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(bstr)); + todo_wine ok(!lstrcmpW(bstr, expected_string), "Got text: %s.\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITextRange_SetRange(range, 3, 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITextRange_GetChar(range, &result); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(result == 0xfffc, "Got char: %c\n", result); + ITextRange_Release(range); + + SendMessageW(hwnd, EM_SETSEL, 0, -1); + hr = ITextSelection_GetText(selection, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(lstrlenW(bstr) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(bstr)); + todo_wine ok(!lstrcmpW(bstr, expected_string), "Got text: %s.\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + SendMessageW(hwnd, EM_SETSEL, 3, 4); + result = 0; + hr = ITextSelection_GetChar(selection, &result); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(result == 0xfffc, "Got char: %c\n", result); + + release_interfaces(&hwnd, &reole, &doc, &selection); } static void test_GetStoryLength(void)

1 0

Jactry Zeng : riched20/tests: Simplify tests of IRichEditOle_InsertObject() by improving CHECK_REOBJECT_STRUCT().
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 99753d0c646cef31eebeec56bd17a26a9895af13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99753d0c646cef31eebeec56… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 20 15:56:09 2021 +0800 riched20/tests: Simplify tests of IRichEditOle_InsertObject() by improving CHECK_REOBJECT_STRUCT(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 144 ++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99753d0c646cef31eebe…

1 0

Piotr Caban : msvcrt: Import tanf implementation from musl.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 5e34d175307a5732e37e9281fc257bdaf4b10d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e34d175307a5732e37e9281… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 23 16:38:05 2021 +0200 msvcrt: Import tanf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 ------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d26aa06e9e7..811fce1531d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1285,14 +1285,80 @@ float CDECL sqrtf( float x ) #endif } +/* Copied from musl: src/math/__tandf.c */ +static float __tandf(double x, int odd) +{ + static const double T[] = { + 0x15554d3418c99f.0p-54, + 0x1112fd38999f72.0p-55, + 0x1b54c91d865afe.0p-57, + 0x191df3908c33ce.0p-58, + 0x185dadfcecf44e.0p-61, + 0x1362b9bf971bcd.0p-59, + }; + + double z, r, w, s, t, u; + + z = x * x; + r = T[4] + z * T[5]; + t = T[2] + z * T[3]; + w = z * z; + s = z * x; + u = T[0] + z * T[1]; + r = (x + s * u) + (s * w) * (t + w * r); + return odd ? -1.0 / r : r; +} + /********************************************************************* * tanf (MSVCRT.@) + * + * Copied from musl: src/math/tanf.c */ float CDECL tanf( float x ) { - float ret = unix_funcs->tanf(x); - if (!isfinite(x)) return math_error(_DOMAIN, "tanf", x, 0, ret); - return ret; + static const double t1pio2 = 1*M_PI_2, + t2pio2 = 2*M_PI_2, + t3pio2 = 3*M_PI_2, + t4pio2 = 4*M_PI_2; + + double y; + UINT32 ix; + unsigned n, sign; + + ix = *(UINT32*)&x; + sign = ix >> 31; + ix &= 0x7fffffff; + + if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */ + if (ix < 0x39800000) { /* |x| < 2**-12 */ + /* raise inexact if x!=0 and underflow if subnormal */ + fp_barrierf(ix < 0x00800000 ? x / 0x1p120f : x + 0x1p120f); + return x; + } + return __tandf(x, 0); + } + if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */ + if (ix <= 0x4016cbe3) /* |x| ~<= 3pi/4 */ + return __tandf((sign ? x + t1pio2 : x - t1pio2), 1); + else + return __tandf((sign ? x + t2pio2 : x - t2pio2), 0); + } + if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */ + if (ix <= 0x40afeddf) /* |x| ~<= 7*pi/4 */ + return __tandf((sign ? x + t3pio2 : x - t3pio2), 1); + else + return __tandf((sign ? x + t4pio2 : x - t4pio2), 0); + } + + /* tan(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "tanf", x, 0, x - x); + if (ix >= 0x7f800000) + return x - x; + + /* argument reduction */ + n = __rem_pio2f(x, &y); + return __tandf(y, n & 1); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 1fb16f48fcd..c69ca440504 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -403,14 +403,6 @@ static float CDECL unix_sinhf( float x ) return sinhf( x ); } -/********************************************************************* - * tanf - */ -static float CDECL unix_tanf( float x ) -{ - return tanf( x ); -} - /********************************************************************* * tanh */ @@ -490,7 +482,6 @@ static const struct unix_funcs funcs = unix_powf, unix_sinh, unix_sinhf, - unix_tanf, unix_tanh, unix_tanhf, unix_tgamma, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 4c2cf5852ea..6fbafe064c1 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -58,7 +58,6 @@ struct unix_funcs float (CDECL *powf)(float x, float y); double (CDECL *sinh)(double x); float (CDECL *sinhf)(float x); - float (CDECL *tanf)(float x); double (CDECL *tanh)(double x); float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x);

1 0

Piotr Caban : msvcrt: Import sinf implementation from musl.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 14a8e16a44ad9b1e9ef7ca0fde45a1c89ab77da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a8e16a44ad9b1e9ef7ca0f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 23 16:37:33 2021 +0200 msvcrt: Import sinf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 -------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e943076c1c7..d26aa06e9e7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1121,12 +1121,65 @@ float CDECL powf( float x, float y ) /********************************************************************* * sinf (MSVCRT.@) + * + * Copied from musl: src/math/sinf.c */ float CDECL sinf( float x ) { - float ret = unix_funcs->sinf( x ); - if (!isfinite(x)) return math_error(_DOMAIN, "sinf", x, 0, ret); - return ret; + static const double s1pio2 = 1*M_PI_2, + s2pio2 = 2*M_PI_2, + s3pio2 = 3*M_PI_2, + s4pio2 = 4*M_PI_2; + + double y; + UINT32 ix; + int n, sign; + + ix = *(UINT32*)&x; + sign = ix >> 31; + ix &= 0x7fffffff; + + if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */ + if (ix < 0x39800000) { /* |x| < 2**-12 */ + /* raise inexact if x!=0 and underflow if subnormal */ + fp_barrierf(ix < 0x00800000 ? x / 0x1p120f : x + 0x1p120f); + return x; + } + return __sindf(x); + } + if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */ + if (ix <= 0x4016cbe3) { /* |x| ~<= 3pi/4 */ + if (sign) + return -__cosdf(x + s1pio2); + else + return __cosdf(x - s1pio2); + } + return __sindf(sign ? -(x + s2pio2) : -(x - s2pio2)); + } + if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */ + if (ix <= 0x40afeddf) { /* |x| ~<= 7*pi/4 */ + if (sign) + return __cosdf(x + s3pio2); + else + return -__cosdf(x - s3pio2); + } + return __sindf(sign ? x + s4pio2 : x - s4pio2); + } + + /* sin(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "sinf", x, 0, x - x); + if (ix >= 0x7f800000) + return x - x; + + /* general argument reduction needed */ + n = __rem_pio2f(x, &y); + switch (n&3) { + case 0: return __sindf(y); + case 1: return __cosdf(y); + case 2: return __sindf(-y); + default: return -__cosdf(y); + } } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 1cec98ae3d4..1fb16f48fcd 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -387,14 +387,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * sinf - */ -static float CDECL unix_sinf( float x ) -{ - return sinf( x ); -} - /********************************************************************* * sinh */ @@ -496,7 +488,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_sinf, unix_sinh, unix_sinhf, unix_tanf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index d34117eeb32..4c2cf5852ea 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -56,7 +56,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - float (CDECL *sinf)(float x); double (CDECL *sinh)(double x); float (CDECL *sinhf)(float x); float (CDECL *tanf)(float x);

1 0

Piotr Caban : msvcrt: Import cosf implementation from musl.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 8321ce14ad2e34b4e849094f1cdd3f3196dcd79b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8321ce14ad2e34b4e849094f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 23 16:37:16 2021 +0200 msvcrt: Import cosf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 631 ++++++++++++++++++++++++++++++-------------------- dlls/msvcrt/unixlib.c | 9 - dlls/msvcrt/unixlib.h | 1 - 3 files changed, 384 insertions(+), 257 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8321ce14ad2e34b4e849…

1 0