July 2017 - Wine-commits - list.winehq.org

Sebastian Lackner : winhttp: Rename host_t to hostdata_t.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 5a61913e90e3725d08c0e1fd06ccfe936434cbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a61913e90e3725d08c0e1fd0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 19 17:22:13 2017 +0200 winhttp: Rename host_t to hostdata_t. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 10 +++++----- dlls/winhttp/winhttp_private.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 8c60329..c9aa6d4 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -299,7 +299,7 @@ void netconn_unload( void ) #endif } -netconn_t *netconn_create( host_t *host, const struct sockaddr_storage *sockaddr, int timeout ) +netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sockaddr, int timeout ) { netconn_t *conn; unsigned int addr_len; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 47cc906..f71b17e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1004,7 +1004,7 @@ static CRITICAL_SECTION connection_pool_cs = { &connection_pool_debug, -1, 0, 0, static struct list connection_pool = LIST_INIT( connection_pool ); -void release_host( host_t *host ) +void release_host( hostdata_t *host ) { LONG ref; @@ -1024,7 +1024,7 @@ static DWORD WINAPI connection_collector(void *arg) { unsigned int remaining_connections; netconn_t *netconn, *next_netconn; - host_t *host, *next_host; + hostdata_t *host, *next_host; ULONGLONG now; do @@ -1036,7 +1036,7 @@ static DWORD WINAPI connection_collector(void *arg) EnterCriticalSection(&connection_pool_cs); - LIST_FOR_EACH_ENTRY_SAFE(host, next_host, &connection_pool, host_t, entry) + LIST_FOR_EACH_ENTRY_SAFE(host, next_host, &connection_pool, hostdata_t, entry) { LIST_FOR_EACH_ENTRY_SAFE(netconn, next_netconn, &host->connections, netconn_t, entry) { @@ -1095,7 +1095,7 @@ static void cache_connection( netconn_t *netconn ) static BOOL open_connection( request_t *request ) { BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; - host_t *host = NULL, *iter; + hostdata_t *host = NULL, *iter; netconn_t *netconn = NULL; connect_t *connect; WCHAR *addressW = NULL; @@ -1109,7 +1109,7 @@ static BOOL open_connection( request_t *request ) EnterCriticalSection( &connection_pool_cs ); - LIST_FOR_EACH_ENTRY( iter, &connection_pool, host_t, entry ) + LIST_FOR_EACH_ENTRY( iter, &connection_pool, hostdata_t, entry ) { if (iter->port == port && !strcmpW( connect->servername, iter->hostname ) && !is_secure == !iter->secure) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index dd8c4ef..a5cea89 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -103,7 +103,7 @@ typedef struct { INTERNET_PORT port; BOOL secure; struct list connections; -} host_t; +} hostdata_t; typedef struct { @@ -142,7 +142,7 @@ typedef struct int socket; struct sockaddr_storage sockaddr; BOOL secure; /* SSL active on connection? */ - host_t *host; + hostdata_t *host; ULONGLONG keep_until; CtxtHandle ssl_ctx; SecPkgContext_StreamSizes ssl_sizes; @@ -295,7 +295,7 @@ void send_callback( object_header_t *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( request_t * ) DECLSPEC_HIDDEN; BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; -netconn_t *netconn_create( host_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; +netconn_t *netconn_create( hostdata_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; @@ -314,7 +314,7 @@ void delete_domain( domain_t * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -void release_host( host_t *host ) DECLSPEC_HIDDEN; +void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN;

1 0

Hugh McMaster : regedit: Export REG_SZ data via the export_data() function.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 37b5607ff6fbb8818f439a10b9370805e16b8fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b5607ff6fbb8818f439a10b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:29:05 2017 +0000 regedit: Export REG_SZ data via the export_data() function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 239 ++++++--------------------------------------- 1 file changed, 29 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37b5607ff6fbb8818f439…

1 0

Hugh McMaster : regedit: Append a newline to the end of the export file.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 97383a14f7a914709b9e33201fc28961dc243625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97383a14f7a914709b9e33201… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:29:16 2017 +0000 regedit: Append a newline to the end of the export file. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 54cd982..d3a1f6d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1304,10 +1304,16 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, } } +static void export_newline(FILE *fp, BOOL unicode) +{ + static const WCHAR newline[] = {'\r','\n',0}; + + REGPROC_write_line(fp, newline, unicode); +} + static void export_data(FILE *fp, DWORD type, size_t line_len, void *data, size_t size, BOOL unicode) { WCHAR *buf = NULL; - static const WCHAR newline[] = {'\r','\n',0}; switch (type) { @@ -1328,7 +1334,7 @@ static void export_data(FILE *fp, DWORD type, size_t line_len, void *data, size_ REGPROC_write_line(fp, buf, unicode); HeapFree(GetProcessHeap(), 0, buf); - REGPROC_write_line(fp, newline, unicode); + export_newline(fp, unicode); } static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) @@ -1498,6 +1504,7 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) fp = REGPROC_open_export_file(file_name, unicode); ret = export_registry_data(fp, key, path, unicode); + export_newline(fp, unicode); fclose(fp); RegCloseKey(key); @@ -1530,7 +1537,9 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) RegCloseKey(key); } + export_newline(fp, unicode); fclose(fp); + return TRUE; }

1 0

Hugh McMaster : regedit: Export value names from the export_data() function.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 6effc48365b97e058175ded31e260423182bb80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6effc48365b97e058175ded31… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:29:22 2017 +0000 regedit: Export value names from the export_data() function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d3a1f6d..57be5da 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1311,9 +1311,11 @@ static void export_newline(FILE *fp, BOOL unicode) REGPROC_write_line(fp, newline, unicode); } -static void export_data(FILE *fp, DWORD type, size_t line_len, void *data, size_t size, BOOL unicode) +static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type, + void *data, size_t size, BOOL unicode) { WCHAR *buf = NULL; + size_t line_len = export_value_name(fp, value_name, value_len, unicode); switch (type) { @@ -1385,8 +1387,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) { - size_t line_len = export_value_name(fp, value_name, value_len, unicode); - export_data(fp, type, line_len, data, data_size, unicode); + export_data(fp, value_name, value_len, type, data, data_size, unicode); i++; } else if (rc == ERROR_MORE_DATA)

1 0

Alexandre Julliard : ntdll: Add platform-specific versions of the thread data structure.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: f1ef8a4d9d08377c1b04908e413d0fc1c549c7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ef8a4d9d08377c1b04908e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 15:14:24 2017 +0200 ntdll: Add platform-specific versions of the thread data structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 127 ++++++++++++++++++++++++++------------------- dlls/ntdll/signal_x86_64.c | 22 ++++++-- 2 files changed, 91 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1ef8a4d9d08377c1b049…

1 0

Alexandre Julliard : ntdll: Move the plaform-independent thread data to the GdiTebBatch TEB field.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: b87c66dd656f37b0ad6d78da552c8ce8a0114d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87c66dd656f37b0ad6d78da5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 15:18:29 2017 +0200 ntdll: Move the plaform-independent thread data to the GdiTebBatch TEB field. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 35 +++++++++++++---------------------- dlls/ntdll/thread.c | 10 +++++----- include/winternl.h | 2 +- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1e71fae..ba296d2 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -212,37 +212,28 @@ struct debug_info char output[1024]; /* current output line */ }; -/* thread private data, stored in NtCurrentTeb()->SpareBytes1 */ +/* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ struct ntdll_thread_data { #ifdef __i386__ - DWORD dr0; /* 1bc Debug registers */ - DWORD dr1; /* 1c0 */ - DWORD dr2; /* 1c4 */ - DWORD dr3; /* 1c8 */ - DWORD dr6; /* 1cc */ - DWORD dr7; /* 1d0 */ - DWORD fs; /* 1d4 TEB selector */ - DWORD gs; /* 1d8 libc selector; update winebuild if you move this! */ - void *vm86_ptr; /* 1dc data for vm86 mode */ -#else - void *exit_frame; /* /2e8 exit frame pointer */ + WINE_VM86_TEB_INFO __vm86; /* FIXME: placeholder for vm86 data from struct x86_thread_data */ #endif - struct debug_info *debug_info; /* 1e0/2f0 info for debugstr functions */ - int request_fd; /* 1e4/2f8 fd for sending server requests */ - int reply_fd; /* 1e8/2fc fd for receiving server replies */ - int wait_fd[2]; /* 1ec/300 fd for sleeping server requests */ - BOOL wow64_redir; /* 1f4/308 Wow64 filesystem redirection flag */ - pthread_t pthread_id; /* 1f8/310 pthread thread id */ + struct debug_info *debug_info; /* info for debugstr functions */ + int request_fd; /* fd for sending server requests */ + int reply_fd; /* fd for receiving server replies */ + int wait_fd[2]; /* fd for sleeping server requests */ + BOOL wow64_redir; /* Wow64 filesystem redirection flag */ + pthread_t pthread_id; /* pthread thread id */ +}; + +C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) ); #ifdef __i386__ - WINE_VM86_TEB_INFO vm86; /* 1fc vm86 private data */ - void *exit_frame; /* 204 exit frame pointer */ +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct ntdll_thread_data, __vm86 ) == 0x1fc ); #endif -}; static inline struct ntdll_thread_data *ntdll_get_thread_data(void) { - return (struct ntdll_thread_data *)NtCurrentTeb()->SpareBytes1; + return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch; } extern mode_t FILE_umask DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 5089f39..ba1be0f 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -332,7 +332,7 @@ HANDLE thread_init(void) teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); - thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = -1; thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; @@ -440,7 +440,7 @@ void exit_thread( int status ) if ((teb = interlocked_xchg_ptr( &prev_teb, NtCurrentTeb() ))) { - struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; if (thread_data->pthread_id) { @@ -465,7 +465,7 @@ void exit_thread( int status ) static void start_thread( struct startup_info *info ) { TEB *teb = info->teb; - struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; PRTL_THREAD_START_ROUTINE func = info->entry_point; void *arg = info->entry_arg; struct debug_info debug_info; @@ -585,7 +585,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * info->entry_point = start; info->entry_arg = param; - thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = request_pipe[1]; thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; @@ -1027,7 +1027,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { if (sel == (wine_get_cs() & ~3)) tdi->Entry.HighWord.Bits.Type |= 8; /* code segment */ - else if (sel == (ntdll_get_thread_data()->fs & ~3)) + else if (sel == (wine_get_fs() & ~3)) { ULONG_PTR fs_base = (ULONG_PTR)NtCurrentTeb(); tdi->Entry.BaseLow = fs_base & 0xffff; diff --git a/include/winternl.h b/include/winternl.h index 5cd1664..9dd9fb1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -330,7 +330,7 @@ typedef struct _TEB ACTIVATION_CONTEXT_STACK ActivationContextStack; /* 1a8/02c8 */ BYTE SpareBytes1[24]; /* 1bc/02e8 used for ntdll private data in Wine */ PVOID SystemReserved2[10]; /* 1d4/0300 used for ntdll private data in Wine */ - GDI_TEB_BATCH GdiTebBatch; /* 1fc/0350 used for vm86 private data in Wine */ + GDI_TEB_BATCH GdiTebBatch; /* 1fc/0350 used for ntdll private data in Wine */ HANDLE gdiRgn; /* 6dc/0838 */ HANDLE gdiPen; /* 6e0/0840 */ HANDLE gdiBrush; /* 6e4/0848 */

1 0

Alexandre Julliard : ntdll: Move the plaform-specific thread data to the SystemReserved2 TEB field.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: 9e59362ae3d6b52418a7f3519688faea78c280ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e59362ae3d6b52418a7f3519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 15:20:42 2017 +0200 ntdll: Move the plaform-specific thread data to the SystemReserved2 TEB field. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 28 +++++++++++++++++----------- dlls/ntdll/signal_x86_64.c | 4 ++-- include/winternl.h | 4 ++-- tools/winebuild/relay.c | 4 ++-- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 96d7d26..2301ba4 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -531,25 +531,31 @@ enum i386_trap_code struct x86_thread_data { - DWORD dr0; /* 1bc Debug registers */ - DWORD dr1; /* 1c0 */ - DWORD dr2; /* 1c4 */ - DWORD dr3; /* 1c8 */ - DWORD dr6; /* 1cc */ - DWORD dr7; /* 1d0 */ DWORD fs; /* 1d4 TEB selector */ DWORD gs; /* 1d8 libc selector; update winebuild if you move this! */ - void *vm86_ptr; /* 1dc data for vm86 mode */ - int __pad[7]; /* 1e0 space for ntdll_thread_data (FIXME) */ + DWORD dr0; /* 1dc debug registers */ + DWORD dr1; /* 1e0 */ + DWORD dr2; /* 1e4 */ + DWORD dr3; /* 1e8 */ + DWORD dr6; /* 1ec */ + DWORD dr7; /* 1f0 */ + void *exit_frame; /* 1f4 exit frame pointer */ +#ifdef __HAVE_VM86 + void *vm86_ptr; /* 1f8 data for vm86 mode */ WINE_VM86_TEB_INFO vm86; /* 1fc vm86 private data */ - void *exit_frame; /* 204 exit frame pointer */ +#endif + /* the ntdll_thread_data structure follows here */ }; -C_ASSERT( offsetof( TEB, SpareBytes1 ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 ); +C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 ); +#ifdef __HAVE_VM86 +C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, vm86 ) == + offsetof( TEB, GdiTebBatch ) + offsetof( struct ntdll_thread_data, __vm86 )); +#endif static inline struct x86_thread_data *x86_thread_data(void) { - return (struct x86_thread_data *)NtCurrentTeb()->SpareBytes1; + return (struct x86_thread_data *)NtCurrentTeb()->SystemReserved2; } /* Exception record for handling exceptions happening inside exception handlers */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 4f0df97..f0127f7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -313,11 +313,11 @@ struct amd64_thread_data void *exit_frame; /* exit frame pointer */ }; -C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((TEB *)0)->SpareBytes1) ); +C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((TEB *)0)->SystemReserved2) ); static inline struct amd64_thread_data *amd64_thread_data(void) { - return (struct amd64_thread_data *)NtCurrentTeb()->SpareBytes1; + return (struct amd64_thread_data *)NtCurrentTeb()->SystemReserved2; } /*********************************************************************** diff --git a/include/winternl.h b/include/winternl.h index 9dd9fb1..df20da5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -328,8 +328,8 @@ typedef struct _TEB PVOID SystemReserved1[54]; /* 0cc/0110 used for kernel32 private data in Wine */ LONG ExceptionCode; /* 1a4/02c0 */ ACTIVATION_CONTEXT_STACK ActivationContextStack; /* 1a8/02c8 */ - BYTE SpareBytes1[24]; /* 1bc/02e8 used for ntdll private data in Wine */ - PVOID SystemReserved2[10]; /* 1d4/0300 used for ntdll private data in Wine */ + BYTE SpareBytes1[24]; /* 1bc/02e8 */ + PVOID SystemReserved2[10]; /* 1d4/0300 used for ntdll platform-specific private data in Wine */ GDI_TEB_BATCH GdiTebBatch; /* 1fc/0350 used for ntdll private data in Wine */ HANDLE gdiRgn; /* 6dc/0838 */ HANDLE gdiPen; /* 6e0/0840 */ diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index e9228a0..1cc6465 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -33,8 +33,8 @@ /* offset of the stack pointer relative to %fs:(0) */ #define STACKOFFSET 0xc0 /* FIELD_OFFSET(TEB,WOW32Reserved) */ -/* fix this if the ntdll_thread_regs structure is changed */ -#define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SpareBytes1) + FIELD_OFFSET(ntdll_thread_data,gs) */ +/* fix this if the x86_thread_data structure is changed */ +#define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(struct x86_thread_data,gs) */ #define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ #define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */

1 0

Alexandre Julliard : ntdll: Add support for debug registers in exceptions on x86-64.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: a1b563f41c2246f94467b17d67a369cfbe144a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b563f41c2246f94467b17d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 17:11:38 2017 +0200 ntdll: Add support for debug registers in exceptions on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 114 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 96 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f0127f7..08881e7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -310,6 +310,12 @@ static wine_signal_handler handlers[256]; struct amd64_thread_data { + DWORD_PTR dr0; /* debug registers */ + DWORD_PTR dr1; + DWORD_PTR dr2; + DWORD_PTR dr3; + DWORD_PTR dr6; + DWORD_PTR dr7; void *exit_frame; /* exit frame pointer */ }; @@ -1661,7 +1667,7 @@ static inline BOOL is_inside_signal_stack( void *ptr ) */ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) { - context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS; + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_DEBUG_REGISTERS; context->Rax = RAX_sig(sigcontext); context->Rcx = RCX_sig(sigcontext); context->Rdx = RDX_sig(sigcontext); @@ -1698,6 +1704,12 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) #else __asm__("movw %%ss,%0" : "=m" (context->SegSs)); #endif + context->Dr0 = amd64_thread_data()->dr0; + context->Dr1 = amd64_thread_data()->dr1; + context->Dr2 = amd64_thread_data()->dr2; + context->Dr3 = amd64_thread_data()->dr3; + context->Dr6 = amd64_thread_data()->dr6; + context->Dr7 = amd64_thread_data()->dr7; if (FPU_sig(sigcontext)) { context->ContextFlags |= CONTEXT_FLOATING_POINT; @@ -1714,6 +1726,12 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) */ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; RAX_sig(sigcontext) = context->Rax; RCX_sig(sigcontext) = context->Rcx; RDX_sig(sigcontext) = context->Rdx; @@ -1873,6 +1891,16 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, static void set_cpu_context( const CONTEXT *context ) { DWORD flags = context->ContextFlags & ~CONTEXT_AMD64; + + if (flags & CONTEXT_DEBUG_REGISTERS) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } if (flags & CONTEXT_FULL) { if (!(flags & CONTEXT_CONTROL)) @@ -2081,10 +2109,20 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) */ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { - NTSTATUS ret; - BOOL self; + NTSTATUS ret = STATUS_SUCCESS; + BOOL self = (handle == GetCurrentThread()); + + /* debug registers require a server call */ + if (self && (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64))) + self = (amd64_thread_data()->dr0 == context->Dr0 && + amd64_thread_data()->dr1 == context->Dr1 && + amd64_thread_data()->dr2 == context->Dr2 && + amd64_thread_data()->dr3 == context->Dr3 && + amd64_thread_data()->dr6 == context->Dr6 && + amd64_thread_data()->dr7 == context->Dr7); + + if (!self) ret = set_thread_context( handle, context, &self ); - ret = set_thread_context( handle, context, &self ); if (self && ret == STATUS_SUCCESS) set_cpu_context( context ); return ret; } @@ -2109,12 +2147,25 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) needed_flags &= ~context->ContextFlags; } - if (self && needed_flags) + if (self) { - CONTEXT ctx; - RtlCaptureContext( &ctx ); - copy_context( context, &ctx, ctx.ContextFlags & needed_flags ); - context->ContextFlags |= ctx.ContextFlags & needed_flags; + if (needed_flags) + { + CONTEXT ctx; + RtlCaptureContext( &ctx ); + copy_context( context, &ctx, ctx.ContextFlags & needed_flags ); + context->ContextFlags |= ctx.ContextFlags & needed_flags; + } + /* update the cached version of the debug registers */ + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } } return STATUS_SUCCESS; } @@ -2618,14 +2669,42 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) case 3: /* BREAKPOINT_LOAD_SYMBOLS */ case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ - goto done; + set_cpu_context( context ); } break; } - status = raise_exception( rec, context, TRUE ); - if (status) raise_status( status, rec ); -done: - set_cpu_context( context ); + status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); +} + + +/********************************************************************** + * raise_trap_exception + */ +static void raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status; + + if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP) + { + /* when single stepping can't tell whether this is a hw bp or a + * single step interrupt. try to avoid as much overhead as possible + * and only do a server call if there is any hw bp enabled. */ + + if( !(context->EFlags & 0x100) || (amd64_thread_data()->dr7 & 0xff) ) + { + /* (possible) hardware breakpoint, fetch the debug registers */ + DWORD saved_flags = context->ContextFlags; + context->ContextFlags = CONTEXT_DEBUG_REGISTERS; + NtGetContextThread(GetCurrentThread(), context); + context->ContextFlags |= saved_flags; /* restore flags */ + } + + context->EFlags &= ~0x100; /* clear single-step flag */ + } + + status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); } @@ -2636,9 +2715,8 @@ done: */ static void raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { - NTSTATUS status = raise_exception( rec, context, TRUE ); - if (status) raise_status( status, rec ); - set_cpu_context( context ); + NTSTATUS status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); } @@ -2747,7 +2825,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_trap_exception ); switch (siginfo->si_code) {

1 0

Nikolay Sivov : dwrite: Added ability to specify multiple families per fallback range.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: f4b7e4b5ed13ea17280702ecd4418559d24c3acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b7e4b5ed13ea17280702ecd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 19 14:42:31 2017 +0300 dwrite: Added ability to specify multiple families per fallback range. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3a820e7..3d187d4 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -189,7 +189,8 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last const char *debugstr_sa_script(UINT16 script) { - return script < Script_LastId ? debugstr_an((char*)&dwritescripts_properties[script].props.isoScriptCode, 4): "not defined"; + return script < Script_LastId ? debugstr_an((char*)&dwritescripts_properties[script].props.isoScriptCode, 4): + "undefined"; } /* system font falback configuration */ @@ -197,13 +198,13 @@ static const WCHAR meiryoW[] = {'M','e','i','r','y','o',0}; struct fallback_mapping { DWRITE_UNICODE_RANGE range; - const WCHAR *family; + const WCHAR *families[5]; }; static const struct fallback_mapping fontfallback_neutral_data[] = { - { { 0x3000, 0x30ff }, meiryoW }, /* CJK Symbols and Punctuation, Hiragana, Katakana */ - { { 0x31f0, 0x31ff }, meiryoW }, /* Katakana Phonetic Extensions */ - { { 0x4e00, 0x9fff }, meiryoW }, /* CJK Unified Ideographs */ + { { 0x3000, 0x30ff }, { meiryoW } }, /* CJK Symbols and Punctuation, Hiragana, Katakana */ + { { 0x31f0, 0x31ff }, { meiryoW } }, /* Katakana Phonetic Extensions */ + { { 0x4e00, 0x9fff }, { meiryoW } }, /* CJK Unified Ideographs */ }; struct dwrite_fontfallback { @@ -2026,28 +2027,41 @@ static HRESULT fallback_map_characters(IDWriteFont *font, const WCHAR *text, UIN } static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback, const WCHAR *text, UINT32 length, - DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, UINT32 *mapped_length, IDWriteFont **mapped_font) + DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, UINT32 *mapped_length, + IDWriteFont **mapped_font) { const struct fallback_mapping *mapping; + UINT32 i = 0; HRESULT hr; + *mapped_font = NULL; + mapping = find_fallback_mapping(fallback, text[0]); if (!mapping) { - WARN("no mapping for 0x%x\n", text[0]); + WARN("No mapping range for %#x.\n", text[0]); return E_FAIL; } - /* now let's see what fallback can handle */ - hr = create_matching_font((IDWriteFontCollection*)fallback->systemcollection, mapping->family, weight, style, stretch, mapped_font); - if (FAILED(hr)) { - WARN("failed to create fallback font %s for range [0x%x,0x%x], 0x%08x\n", debugstr_w(mapping->family), - mapping->range.first, mapping->range.last, hr); - return hr; + /* Now let's see what fallback can handle. Pick first font that could be created. */ + while (mapping->families[i]) { + hr = create_matching_font((IDWriteFontCollection *)fallback->systemcollection, mapping->families[i], + weight, style, stretch, mapped_font); + if (hr == S_OK) { + TRACE("Created fallback font for range [%#x, %#x], using family %s.\n", mapping->range.first, + mapping->range.last, debugstr_w(mapping->families[i])); + break; + } + i++; + } + + if (!*mapped_font) { + WARN("Failed to create fallback font for range [%#x, %#x].\n", mapping->range.first, mapping->range.last); + return E_FAIL; } hr = fallback_map_characters(*mapped_font, text, length, mapped_length); if (FAILED(hr)) - WARN("mapping with fallback font %s failed, 0x%08x\n", debugstr_w(mapping->family), hr); + WARN("Mapping with fallback family %s failed, hr %#x.\n", debugstr_w(mapping->families[i]), hr); if (!*mapped_length) { IDWriteFont_Release(*mapped_font);

1 0

Nikolay Sivov : dwrite/tests: Use empty text in line metrics test.
by Alexandre Julliard 19 Jul '17

19 Jul '17

Module: wine Branch: master Commit: ddb78d73abd590ab62c69e491767e647afc7c2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb78d73abd590ab62c69e491… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 19 14:42:32 2017 +0300 dwrite/tests: Use empty text in line metrics test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 843ab0d..1d9d38a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -511,6 +511,7 @@ struct renderer_context { FLOAT originX; FLOAT originY; IDWriteTextFormat *format; + const WCHAR *familyW; }; static HRESULT WINAPI testrenderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, @@ -634,8 +635,8 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, ok(emsize == metrics.designUnitsPerEm, "Unexpected font size %f\n", emsize); /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */ - ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f\n", - metrics.capHeight, underline->runHeight); + ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", + metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW)); IDWriteFontFace_Release(fontface); } @@ -3406,6 +3407,7 @@ static void test_GetLineMetrics(void) static const WCHAR strW[] = {'a','b','c','d',' ',0}; static const WCHAR str2W[] = {'a','b','\r','c','d',0}; static const WCHAR str4W[] = {'a','\r',0}; + static const WCHAR emptyW[] = {0}; IDWriteFontCollection *syscollection; DWRITE_FONT_METRICS fontmetrics; DWRITE_LINE_METRICS metrics[6]; @@ -3450,7 +3452,6 @@ static void test_GetLineMetrics(void) familycount = IDWriteFontCollection_GetFontFamilyCount(syscollection); for (i = 0; i < familycount; i++) { - static const WCHAR mvboliW[] = {'M','V',' ','B','o','l','i',0}; IDWriteLocalizedStrings *names; IDWriteFontFamily *family; IDWriteFont *font; @@ -3509,23 +3510,17 @@ static void test_GetLineMetrics(void) if (!exists) goto cleanup; - /* This will effectively skip on Vista/2008 only, newer systems work just fine with this font. */ - if (!lstrcmpW(nameW, mvboliW)) { - skip("Skipping line metrics test for %s, gives inconsistent results\n", wine_dbgstr_w(nameW)); - goto cleanup; - } - IDWriteFontFace_GetMetrics(fontface, &fontmetrics); hr = IDWriteFactory_CreateTextFormat(factory, nameW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 5, format, 30000.0f, 100.0f, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, emptyW, 1, format, 30000.0f, 100.0f, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); memset(metrics, 0, sizeof(metrics)); count = 0; - hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 2, &count); + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 1, "got %u\n", count); @@ -5101,6 +5096,7 @@ todo_wine memset(&ctxt, 0, sizeof(ctxt)); ctxt.format = format; + ctxt.familyW = nameW; hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0