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

Alexandre Julliard : ntdll: Move the plaform-specific thread data to the SystemReserved2 TEB field.
by Alexandre Julliard July 19, 2017

July 19, 2017

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: Move the plaform-independent thread data to the GdiTebBatch TEB field.
by Alexandre Julliard July 19, 2017

July 19, 2017

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

Hugh McMaster : regedit: Append a newline to the end of the export file.
by Alexandre Julliard July 19, 2017

July 19, 2017

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

Sebastian Lackner : winhttp: Rename host_t to hostdata_t.
by Alexandre Julliard July 19, 2017

July 19, 2017

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

Jacek Caban : mshtml: Expose IHTMLDOMNode3 interface to scripts.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: d4be45fc9ab663aaa40be16566da1b68ee1b0ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4be45fc9ab663aaa40be1656… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 20:32:55 2017 +0200 mshtml: Expose IHTMLDOMNode3 interface to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 ++ dlls/mshtml/htmlnode.c | 9 ++++++++- dlls/mshtml/htmltextnode.c | 7 ++++--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/documentmode.js | 2 ++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4f7a383..dd23517 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5176,6 +5176,8 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const DISPID elem2_ie11_blacklist[] = {DISPID_IHTMLELEMENT2_DOSCROLL, DISPID_UNKNOWN}; + HTMLDOMNode_init_dispex_info(info, mode); + dispex_info_add_interface(info, IHTMLElement2_tid, mode >= COMPAT_MODE_IE11 ? elem2_ie11_blacklist : NULL); if(mode >= COMPAT_MODE_IE8) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d3c1473..8202803 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -436,7 +436,8 @@ static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { &HTMLDOMChildrenCollection_dispex_vtbl, DispDOMChildrenCollection_tid, - HTMLDOMChildrenCollection_iface_tids + HTMLDOMChildrenCollection_iface_tids, + HTMLDOMNode_init_dispex_info }; IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) @@ -1401,6 +1402,12 @@ static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMN return create_node(This->doc, nsnode, ret); } +void HTMLDOMNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + if(mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLDOMNode3_tid, NULL); +} + static const cpc_entry_t HTMLDOMNode_cpc[] = {{NULL}}; static const NodeImplVtbl HTMLDOMNodeImplVtbl = { diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index edf8efd..a5587c1 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -361,7 +361,8 @@ static const tid_t HTMLDOMTextNode_iface_tids[] = { static dispex_static_data_t HTMLDOMTextNode_dispex = { NULL, DispHTMLDOMTextNode_tid, - HTMLDOMTextNode_iface_tids + HTMLDOMTextNode_iface_tids, + HTMLDOMNode_init_dispex_info }; HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **node) @@ -377,8 +378,8 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO ret->IHTMLDOMTextNode_iface.lpVtbl = &HTMLDOMTextNodeVtbl; ret->IHTMLDOMTextNode2_iface.lpVtbl = &HTMLDOMTextNode2Vtbl; - init_dispex(&ret->node.event_target.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, - &HTMLDOMTextNode_dispex); + init_dispex_with_compat_mode(&ret->node.event_target.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, + &HTMLDOMTextNode_dispex, doc->document_mode); HTMLDOMNode_Init(doc, &ret->node, nsnode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3c32ffe..9bdb0844 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -151,6 +151,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDOMImplementation) \ XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ + XIID(IHTMLDOMNode3) \ XIID(IHTMLDOMTextNode) \ XIID(IHTMLDOMTextNode2) \ XIID(IHTMLElement) \ @@ -1039,6 +1040,7 @@ void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,disp HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLDOMNode_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; +void HTMLDOMNode_init_dispex_info(dispex_data_t*,compat_mode_t) DECLSPEC_HIDDEN; HRESULT HTMLElement_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLElement_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index a7340e2..84138e7 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -32,6 +32,8 @@ function test_elem_props() { test_exposed("doScroll", v < 11); test_exposed("querySelectorAll", v >= 8); + test_exposed("textContent", v >= 9); + test_exposed("prefix", v >= 9); next_test(); }

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode3 stub implementation.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 821c47688748b6e7a9e6ec7925c45ebf4fde0af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821c47688748b6e7a9e6ec792… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 20:32:40 2017 +0200 mshtml: Added IHTMLDOMNode3 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 205 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 206 insertions(+) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f49889d..ae63e03 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1153,6 +1153,208 @@ static const IHTMLDOMNode2Vtbl HTMLDOMNode2Vtbl = { HTMLDOMNode2_get_ownerDocument }; +static inline HTMLDOMNode *impl_from_IHTMLDOMNode3(IHTMLDOMNode3 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMNode, IHTMLDOMNode3_iface); +} + +static HRESULT WINAPI HTMLDOMNode3_QueryInterface(IHTMLDOMNode3 *iface, REFIID riid, void **ppv) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IHTMLDOMNode_QueryInterface(&This->IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLDOMNode3_AddRef(IHTMLDOMNode3 *iface) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + + return IHTMLDOMNode_AddRef(&This->IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLDOMNode3_Release(IHTMLDOMNode3 *iface) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + + return IHTMLDOMNode_Release(&This->IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLDOMNode3_GetTypeInfoCount(IHTMLDOMNode3 *iface, UINT *pctinfo) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMNode3_GetTypeInfo(IHTMLDOMNode3 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMNode3_GetIDsOfNames(IHTMLDOMNode3 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMNode3_Invoke(IHTMLDOMNode3 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMNode3_put_prefix(IHTMLDOMNode3 *iface, VARIANT v) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_get_prefix(IHTMLDOMNode3 *iface, VARIANT *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_get_localName(IHTMLDOMNode3 *iface, VARIANT *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_get_namespaceURI(IHTMLDOMNode3 *iface, VARIANT *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT v) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_get_textContent(IHTMLDOMNode3 *iface, VARIANT *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_isEqualNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isEqual) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_lookupNamespaceURI(IHTMLDOMNode3 *iface, VARIANT *prefix, VARIANT *namespaceURI) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_variant(prefix), namespaceURI); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_lookupPrefix(IHTMLDOMNode3 *iface, VARIANT *namespaceURI, VARIANT *prefix) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_variant(namespaceURI), prefix); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_isDefaultNamespace(IHTMLDOMNode3 *iface, VARIANT *namespace, VARIANT_BOOL *pfDefaultNamespace) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_appendChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, IHTMLDOMNode **node) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_insertBefore(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, VARIANT refChild, IHTMLDOMNode **node) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_removeChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p %p)\n", This, oldChild, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_replaceChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_isSameNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isSame) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_compareDocumentPosition(IHTMLDOMNode3 *iface, IHTMLDOMNode *otherNode, USHORT *flags) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode3_isSupported(IHTMLDOMNode3 *iface, BSTR feature, VARIANT version, VARIANT_BOOL *pfisSupported) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(feature), debugstr_variant(&version), pfisSupported); + return E_NOTIMPL; +} + +static const IHTMLDOMNode3Vtbl HTMLDOMNode3Vtbl = { + HTMLDOMNode3_QueryInterface, + HTMLDOMNode3_AddRef, + HTMLDOMNode3_Release, + HTMLDOMNode3_GetTypeInfoCount, + HTMLDOMNode3_GetTypeInfo, + HTMLDOMNode3_GetIDsOfNames, + HTMLDOMNode3_Invoke, + HTMLDOMNode3_put_prefix, + HTMLDOMNode3_get_prefix, + HTMLDOMNode3_get_localName, + HTMLDOMNode3_get_namespaceURI, + HTMLDOMNode3_put_textContent, + HTMLDOMNode3_get_textContent, + HTMLDOMNode3_isEqualNode, + HTMLDOMNode3_lookupNamespaceURI, + HTMLDOMNode3_lookupPrefix, + HTMLDOMNode3_isDefaultNamespace, + HTMLDOMNode3_appendChild, + HTMLDOMNode3_insertBefore, + HTMLDOMNode3_removeChild, + HTMLDOMNode3_replaceChild, + HTMLDOMNode3_isSameNode, + HTMLDOMNode3_compareDocumentPosition, + HTMLDOMNode3_isSupported +}; + HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) { TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); @@ -1165,6 +1367,8 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode_iface; }else if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) { *ppv = &This->IHTMLDOMNode2_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMNode3, riid)) { + *ppv = &This->IHTMLDOMNode3_iface; }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &node_ccp; return S_OK; @@ -1213,6 +1417,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; + node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl; ccref_init(&node->ccref, 1); init_event_target(&node->event_target); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a51631c..3c32ffe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -725,6 +725,7 @@ struct HTMLDOMNode { EventTarget event_target; IHTMLDOMNode IHTMLDOMNode_iface; IHTMLDOMNode2 IHTMLDOMNode2_iface; + IHTMLDOMNode3 IHTMLDOMNode3_iface; const NodeImplVtbl *vtbl; nsCycleCollectingAutoRefCnt ccref;

1 0

Piotr Caban : gdiplus: Use write_path_data helper in GdipGetRegionData.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 58eb74c43d7bde2ed41a405a6cd9b4addffb1cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=58eb74c43d7bde2ed41a405a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 18 18:59:55 2017 +0200 gdiplus: Use write_path_data helper in GdipGetRegionData. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 106 +++----------------------------------------------- 1 file changed, 5 insertions(+), 101 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index a905f0d..74c02c2 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -74,7 +74,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); * */ -#define FLAGS_NOFLAGS 0x0 #define FLAGS_INTPATH 0x4000 struct memory_buffer @@ -110,35 +109,6 @@ typedef struct packed_point short Y; } packed_point; -/* Test to see if the path could be stored as an array of shorts */ -static BOOL is_integer_path(const GpPath *path) -{ - int i; - - if (!path->pathdata.Count) return FALSE; - - for (i = 0; i < path->pathdata.Count; i++) - { - short x, y; - x = gdip_round(path->pathdata.Points[i].X); - y = gdip_round(path->pathdata.Points[i].Y); - if (path->pathdata.Points[i].X != (REAL)x || path->pathdata.Points[i].Y != (REAL)y) - return FALSE; - } - return TRUE; -} - -/* Everything is measured in DWORDS; round up if there's a remainder */ -static inline INT get_pathtypes_size(const GpPath* path) -{ - INT needed = path->pathdata.Count / sizeof(DWORD); - - if (path->pathdata.Count % sizeof(DWORD) > 0) - needed++; - - return needed * sizeof(DWORD); -} - static inline INT get_element_size(const region_element* element) { INT needed = sizeof(DWORD); /* DWORD for the type */ @@ -148,17 +118,8 @@ static inline INT get_element_size(const region_element* element) return needed + sizeof(GpRect); case RegionDataPath: { - const GpPath *path = element->elementdata.path; - DWORD flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; - /* 3 for headers, once again size doesn't count itself */ - needed += sizeof(DWORD) * 3; - if (flags & FLAGS_INTPATH) - needed += 2 * sizeof(SHORT) * path->pathdata.Count; - else - needed += 2 * sizeof(FLOAT) * path->pathdata.Count; - - needed += get_pathtypes_size(path); - needed += sizeof(DWORD); /* Extra DWORD for pathheader.size */ + needed += write_path_data(element->elementdata.path, NULL); + needed += sizeof(DWORD); /* Extra DWORD for path size */ return needed; } case RegionDataEmptyRect: @@ -704,29 +665,6 @@ static inline void write_float(DWORD* location, INT* offset, const FLOAT write) (*offset)++; } -static inline void write_packed_point(DWORD* location, INT* offset, - const GpPointF* write) -{ - packed_point *point = (packed_point *)(location + *offset); - point->X = gdip_round(write->X); - point->Y = gdip_round(write->Y); - (*offset)++; -} - -static inline void write_path_types(DWORD* location, INT* offset, - const GpPath* path) -{ - INT rounded_size = get_pathtypes_size(path); - - memcpy(location + *offset, path->pathdata.Types, path->pathdata.Count); - - /* The unwritten parts of the DWORD (if any) must be cleared */ - if (rounded_size - path->pathdata.Count) - ZeroMemory(((BYTE*)location) + (*offset * sizeof(DWORD)) + - path->pathdata.Count, rounded_size - path->pathdata.Count); - *offset += rounded_size / sizeof(DWORD); -} - static void write_element(const region_element* element, DWORD *buffer, INT* filled) { @@ -750,43 +688,9 @@ static void write_element(const region_element* element, DWORD *buffer, break; case RegionDataPath: { - INT i; - const GpPath* path = element->elementdata.path; - struct path_header *pathheader; - - pathheader = (struct path_header *)(buffer + *filled); - - pathheader->flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; - /* 3 for headers, once again size doesn't count itself */ - pathheader->size = sizeof(DWORD) * 3; - if (pathheader->flags & FLAGS_INTPATH) - pathheader->size += 2 * sizeof(SHORT) * path->pathdata.Count; - else - pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count; - pathheader->size += get_pathtypes_size(path); - pathheader->magic = VERSION_MAGIC2; - pathheader->count = path->pathdata.Count; - - *filled += 4; - - switch (pathheader->flags & FLAGS_INTPATH) - { - case FLAGS_NOFLAGS: - for (i = 0; i < path->pathdata.Count; i++) - { - write_float(buffer, filled, path->pathdata.Points[i].X); - write_float(buffer, filled, path->pathdata.Points[i].Y); - } - break; - case FLAGS_INTPATH: - for (i = 0; i < path->pathdata.Count; i++) - { - write_packed_point(buffer, filled, - &path->pathdata.Points[i]); - } - break; - } - write_path_types(buffer, filled, path); + DWORD size = write_path_data(element->elementdata.path, buffer + *filled + 1); + write_dword(buffer, filled, size); + *filled += size / sizeof(DWORD); break; } case RegionDataEmptyRect:

1 0

Piotr Caban : gdiplus: Add write_path_data helper to create EMF+ path object.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: a892b6801667fc3aa213c7c15027e1919308877c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a892b6801667fc3aa213c7c15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 18 18:59:48 2017 +0200 gdiplus: Add write_path_data helper to create EMF+ path object. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphicspath.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/metafile.c | 27 +++------------ 3 files changed, 80 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d6806cc..762aa13 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -124,6 +124,8 @@ extern void free_installed_fonts(void) DECLSPEC_HIDDEN; extern BOOL lengthen_path(GpPath *path, INT len) DECLSPEC_HIDDEN; +extern DWORD write_path_data(GpPath *path, void *data) DECLSPEC_HIDDEN; + extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; typedef struct region_element region_element; diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index e190532..05c7982 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2454,3 +2454,77 @@ GpStatus WINGDIPAPI GdipWindingModeOutline(GpPath *path, GpMatrix *matrix, REAL FIXME("stub: %p, %p, %.2f\n", path, matrix, flatness); return NotImplemented; } + +#define FLAGS_INTPATH 0x4000 + +struct path_header +{ + DWORD version; + DWORD count; + DWORD flags; +}; + +/* Test to see if the path could be stored as an array of shorts */ +static BOOL is_integer_path(const GpPath *path) +{ + int i; + + if (!path->pathdata.Count) return FALSE; + + for (i = 0; i < path->pathdata.Count; i++) + { + short x, y; + x = gdip_round(path->pathdata.Points[i].X); + y = gdip_round(path->pathdata.Points[i].Y); + if (path->pathdata.Points[i].X != (REAL)x || path->pathdata.Points[i].Y != (REAL)y) + return FALSE; + } + return TRUE; +} + +DWORD write_path_data(GpPath *path, void *data) +{ + struct path_header *header = data; + BOOL integer_path = is_integer_path(path); + DWORD i, size; + BYTE *types; + + size = sizeof(struct path_header) + path->pathdata.Count; + if (integer_path) + size += sizeof(short[2]) * path->pathdata.Count; + else + size += sizeof(float[2]) * path->pathdata.Count; + size = (size + 3) & ~3; + + if (!data) return size; + + header->version = VERSION_MAGIC2; + header->count = path->pathdata.Count; + header->flags = integer_path ? FLAGS_INTPATH : 0; + + if (integer_path) + { + short *points = (short*)(header + 1); + for (i = 0; i < path->pathdata.Count; i++) + { + points[2*i] = path->pathdata.Points[i].X; + points[2*i + 1] = path->pathdata.Points[i].Y; + } + types = (BYTE*)(points + 2*i); + } + else + { + float *points = (float*)(header + 1); + for (i = 0; i < path->pathdata.Count; i++) + { + points[2*i] = path->pathdata.Points[i].X; + points[2*i + 1] = path->pathdata.Points[i].Y; + } + types = (BYTE*)(points + 2*i); + } + + for (i=0; i<path->pathdata.Count; i++) + types[i] = path->pathdata.Types[i]; + memset(types + i, 0, ((path->pathdata.Count + 3) & ~3) - path->pathdata.Count); + return size; +} diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d53c85f..c3895ed 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2698,42 +2698,23 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD *id) { EmfPlusObject *object_record; - EmfPlusPointF *points; - BYTE *types; GpStatus stat; - DWORD i, size; + DWORD size; *id = -1; if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) return Ok; - /* TODO: Add support for more point formats */ - size = sizeof(EmfPlusPointF)*path->pathdata.Count + path->pathdata.Count; - size = (size + 3) & ~3; - + size = write_path_data(path, NULL); stat = METAFILE_AllocateRecord(metafile, - FIELD_OFFSET(EmfPlusObject, ObjectData.path.data[size]), + FIELD_OFFSET(EmfPlusObject, ObjectData.path) + size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypePath << 8; - - object_record->ObjectData.path.Version = 0xDBC01002; - object_record->ObjectData.path.PathPointCount = path->pathdata.Count; - object_record->ObjectData.path.PathPointFlags = 0; - - points = (EmfPlusPointF*)object_record->ObjectData.path.data; - for (i=0; i<path->pathdata.Count; i++) - { - points[i].X = path->pathdata.Points[i].X; - points[i].Y = path->pathdata.Points[i].Y; - } - - types = (BYTE*)(points + path->pathdata.Count); - for (i=0; i<path->pathdata.Count; i++) - types[i] = path->pathdata.Types[i]; + write_path_data(path, &object_record->ObjectData.path); return Ok; }

1 0

Sebastian Lackner : configure: Improve check for if_nameindex.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 45284246617cd0bf7555e12abf763be34b923ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45284246617cd0bf7555e12ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 19 17:26:11 2017 +0200 configure: Improve check for if_nameindex. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 58d5929..c099dba 100755 --- a/configure +++ b/configure @@ -16406,6 +16406,9 @@ else #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_NET_IF_H # include <net/if.h> #endif diff --git a/configure.ac b/configure.ac index ab4203c..533f1e4 100644 --- a/configure.ac +++ b/configure.ac @@ -2248,6 +2248,9 @@ AC_CACHE_CHECK([for if_nameindex],wine_cv_have_if_nameindex, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_NET_IF_H # include <net/if.h> #endif]],

1 0

Zebediah Figura : user32: Allow activating the desktop window.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: ae153a5c2c5590d4ea722d38eb4ddf1a7031f34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae153a5c2c5590d4ea722d38e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 7 18:58:12 2017 -0500 user32: Allow activating the desktop window. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 61a1543..3d3736d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1871,7 +1871,6 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR if (is_desktop_window( hwnd )) return 0; return WIN_SetStyle(hwnd, wparam, lparam); case WM_WINE_SETACTIVEWINDOW: - if (is_desktop_window( hwnd )) return 0; if (!wparam && GetForegroundWindow() == hwnd) return 0; return (LRESULT)SetActiveWindow( (HWND)wparam ); case WM_WINE_KEYBOARD_LL_HOOK: @@ -2645,7 +2644,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hwndTop = GetParent( hwndTop ); } - if (hwndTop && hwndTop != GetDesktopWindow()) + if (hwndTop) { LONG ret = SendMessageW( msg->hwnd, WM_MOUSEACTIVATE, (WPARAM)hwndTop, MAKELONG( hittest, msg->message ) );

1 0