September 2017 - Wine-commits

Vincent Povirk : shell32: Stub SHOpenWithDialog.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: fcd7d4404ac17d5fe002182efe3e67385ac0ed39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd7d4404ac17d5fe002182ef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 11 15:26:53 2017 -0500 shell32: Stub SHOpenWithDialog. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dialogs.c | 6 ++++++ dlls/shell32/shell32.spec | 1 + include/shlobj.h | 24 ++++++++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 28a25fd..5d7e079 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -71,6 +71,12 @@ INT WINAPI PickIconDlg( return 0xffffffff; } +HRESULT WINAPI SHOpenWithDialog(HWND parent, const OPENASINFO *info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + /************************************************************************* * RunFileDlgW [internal] * diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index dd4accb..6974332 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -410,6 +410,7 @@ @ stdcall SHLoadInProc(ptr) @ stdcall SHLoadNonloadedIconOverlayIdentifiers() @ stdcall SHOpenFolderAndSelectItems(ptr long ptr long) +@ stdcall SHOpenWithDialog(long ptr) @ stdcall SHParseDisplayName(wstr ptr ptr long ptr) @ stdcall SHPathPrepareForWriteA(long ptr str long) @ stdcall SHPathPrepareForWriteW(long ptr wstr long) diff --git a/include/shlobj.h b/include/shlobj.h index ccbf008..66596a3 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -152,6 +152,30 @@ BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); int WINAPI PathCleanupSpec(LPCWSTR,LPWSTR); +/* SHOpenWithDialog API */ + +typedef enum +{ + OAIF_ALLOW_REGISTRATION = 0x00000001, + OAIF_REGISTER_EXT = 0x00000002, + OAIF_EXEC = 0x00000004, + OAIF_FORCE_REGISTRATION = 0x00000008, + OAIF_HIDE_REGISTRATION = 0x00000020, + OAIF_URL_PROTOCOL = 0x00000040, + OAIF_FILE_IS_URI = 0x00000080 +} OPEN_AS_INFO_FLAGS; + +#include <pshpack8.h> +typedef struct +{ + LPCWSTR pcszFile; + LPCWSTR pcszClass; + OPEN_AS_INFO_FLAGS oaifInFlags; +} OPENASINFO; +#include <poppack.h> + +HRESULT WINAPI SHOpenWithDialog(HWND,const OPENASINFO*); + /* Shell_MergeMenus flags */ #define MM_ADDSEPARATOR 0x00000001 #define MM_SUBMENUSHAVEIDS 0x00000002

1 0

Alexandre Julliard : ntdll: Fix access rights checks for mapping objects.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 94872cc84fc92a38f9009e4aa36740474781cfae URL: http://source.winehq.org/git/wine.git/?a=commit;h=94872cc84fc92a38f9009e4aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 10:33:33 2017 +0200 ntdll: Fix access rights checks for mapping objects. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 16 +++++----------- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/virtual.c | 10 ++++++---- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 46b019c..1201863 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3710,16 +3710,16 @@ static DWORD map_prot_to_access(DWORD prot) switch (prot) { case PAGE_READWRITE: - return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_QUERY; + return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_QUERY; case PAGE_EXECUTE_READWRITE: - return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT | SECTION_QUERY; + return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_QUERY; case PAGE_READONLY: case PAGE_WRITECOPY: - return SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_QUERY; + return SECTION_MAP_READ | SECTION_QUERY; case PAGE_EXECUTE: case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: - return SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT | SECTION_QUERY; + return SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_QUERY; default: return 0; } @@ -3909,17 +3909,11 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) /* FILE_MAP_EXECUTE | FILE_MAP_COPY broken on XP */ if (base != NULL && view[j].access == (FILE_MAP_EXECUTE | FILE_MAP_COPY)) { - todo_wine ok( broken(base != NULL), "%d: MapViewOfFile(%04x/%04x) should fail\n", j, page_prot[i], view[j].access); UnmapViewOfFile( base ); } - else todo_wine_if ((page_prot[i] == PAGE_READONLY && - is_compatible_access( PAGE_EXECUTE_READ, view[j].access )) || - (page_prot[i] == PAGE_READWRITE && - is_compatible_access( PAGE_EXECUTE_READWRITE, view[j].access )) || - (page_prot[i] == PAGE_WRITECOPY && - is_compatible_access( PAGE_EXECUTE_WRITECOPY, view[j].access ))) + else { ok(!base, "%d: MapViewOfFile(%04x/%04x) should fail\n", j, page_prot[i], view[j].access); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 76edd2a..295b5e8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1842,7 +1842,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, TRACE("Trying native dll %s\n", debugstr_w(name)); size.QuadPart = 0; - status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | + SECTION_MAP_READ | SECTION_MAP_EXECUTE, NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, file ); if (status != STATUS_SUCCESS) return status; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index bcd9680..d2cd076 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2750,18 +2750,20 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p switch(protect) { case PAGE_NOACCESS: + case PAGE_READONLY: + case PAGE_WRITECOPY: access = SECTION_MAP_READ; break; case PAGE_READWRITE: - case PAGE_EXECUTE_READWRITE: access = SECTION_MAP_WRITE; break; - case PAGE_READONLY: - case PAGE_WRITECOPY: case PAGE_EXECUTE: case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: - access = SECTION_MAP_READ; + access = SECTION_MAP_READ | SECTION_MAP_EXECUTE; + break; + case PAGE_EXECUTE_READWRITE: + access = SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; break; default: return STATUS_INVALID_PAGE_PROTECTION;

1 0

Alexandre Julliard : ntdll: Verify page protection against the mapping protections in VirtualAlloc and VirtualProtect.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: f448be618bbb752dd7747086db36465834805186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f448be618bbb752dd7747086d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 10:57:07 2017 +0200 ntdll: Verify page protection against the mapping protections in VirtualAlloc and VirtualProtect. This partially reverts 3a5ee02735d49a808f3f3fc3a3f39d8e14089a52. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 4 -- dlls/kernel32/tests/virtual.c | 11 +--- dlls/ntdll/virtual.c | 134 +++++++++++++++++------------------------- 3 files changed, 55 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f448be618bbb752dd7747…

1 0

Alexandre Julliard : ntdll: Pass the mapping file access instead of the protection bits to the server.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 1c8a36a91c552f5b8cf2142ab925c7bc2a392e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8a36a91c552f5b8cf2142ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 11:42:04 2017 +0200 ntdll: Pass the mapping file access instead of the protection bits to the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 18 ++++++++++++++++-- include/wine/server_protocol.h | 17 +++-------------- server/mapping.c | 26 ++++++++++---------------- server/protocol.def | 14 +------------- server/request.h | 7 +++---- server/trace.c | 3 +-- 6 files changed, 34 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c8a36a91c552f5b8cf21…

1 0

Alexandre Julliard : ntdll: Get rid of the VPROT_VALLOC flag.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: b8d0a59a2e3df408ec18b16c59c24a261586386c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d0a59a2e3df408ec18b16c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 12:59:28 2017 +0200 ntdll: Get rid of the VPROT_VALLOC flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e1fe409..ce24698 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -84,7 +84,6 @@ struct file_view #define VPROT_WRITEWATCH 0x40 /* per-mapping protection flags */ #define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ -#define VPROT_VALLOC 0x0400 /* allocated by VirtualAlloc */ /* Conversion from VPROT_* to Win32 flags */ static const BYTE VIRTUAL_Win32Flags[16] = @@ -169,6 +168,10 @@ static void *preload_reserve_end; static BOOL use_locks; static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */ +static inline int is_view_valloc( const struct file_view *view ) +{ + return !(view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)); +} /*********************************************************************** * get_page_vprot @@ -897,7 +900,7 @@ static NTSTATUS set_protection( struct file_view *view, void *base, SIZE_T size, NTSTATUS status; if ((status = get_vprot_flags( protect, &vprot, view->protect & SEC_IMAGE ))) return status; - if (view->protect & VPROT_VALLOC) + if (is_view_valloc( view )) { if (vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; } @@ -1712,7 +1715,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi server_enter_uninterrupted_section( &csVirtual, &sigset ); if ((status = map_view( &view, NULL, size, 0xffff, 0, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_VALLOC )) != STATUS_SUCCESS) + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER @@ -2172,7 +2175,6 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ { if (!(status = get_vprot_flags( protect, &vprot, FALSE ))) { - vprot |= VPROT_VALLOC; if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED; if (type & MEM_WRITE_WATCH) vprot |= VPROT_WRITEWATCH; if (protect & PAGE_NOCACHE) vprot |= SEC_NOCACHE; @@ -2266,7 +2268,7 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (!(view = VIRTUAL_FindView( base, size )) || !(view->protect & VPROT_VALLOC)) + if (!(view = VIRTUAL_FindView( base, size )) || !is_view_valloc( view )) { status = STATUS_INVALID_PARAMETER; } @@ -2547,8 +2549,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, info->Protect = (vprot & VPROT_COMMITTED) ? VIRTUAL_GetWin32Prot( vprot, view->protect ) : 0; info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect, view->protect ); if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; - else if (view->protect & VPROT_VALLOC) info->Type = MEM_PRIVATE; - else info->Type = MEM_MAPPED; + else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; + else info->Type = MEM_PRIVATE; for (ptr = base; ptr < base + range_size; ptr += page_size) if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; info->RegionSize = ptr - base; @@ -2927,7 +2929,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) } server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( addr, 0 )) && !(view->protect & VPROT_VALLOC)) + if ((view = VIRTUAL_FindView( addr, 0 )) && !is_view_valloc( view )) { delete_view( view ); status = STATUS_SUCCESS; @@ -3210,7 +3212,7 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) if (!view1 || !view2) status = STATUS_INVALID_ADDRESS; - else if ((view1->protect & VPROT_VALLOC) || (view2->protect & VPROT_VALLOC)) + else if (is_view_valloc( view1 ) || is_view_valloc( view2 )) status = STATUS_CONFLICTING_ADDRESSES; else if (view1 == view2) status = STATUS_SUCCESS;

1 0

Daniel Lehman : msvcrt: Protect onexit table with critical section.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 67012e8300d7520ed34ee433dbed48ddfdf25e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67012e8300d7520ed34ee433d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Aug 31 14:59:12 2017 -0700 msvcrt: Protect onexit table with critical section. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9fd373e..4eff073 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -41,6 +41,15 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; +static CRITICAL_SECTION MSVCRT_onexit_cs; +static CRITICAL_SECTION_DEBUG MSVCRT_onexit_cs_debug = +{ + 0, 0, &MSVCRT_onexit_cs, + { &MSVCRT_onexit_cs_debug.ProcessLocksList, &MSVCRT_onexit_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": MSVCRT_onexit_cs") } +}; +static CRITICAL_SECTION MSVCRT_onexit_cs = { &MSVCRT_onexit_cs_debug, -1, 0, 0, 0, 0 }; + extern int MSVCRT_app_type; extern MSVCRT_wchar_t *MSVCRT__wpgmptr; @@ -368,12 +377,14 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT if (!table) return -1; + EnterCriticalSection(&MSVCRT_onexit_cs); if (!table->_first) { table->_first = MSVCRT_calloc(32, sizeof(void *)); if (!table->_first) { WARN("failed to allocate initial table.\n"); + LeaveCriticalSection(&MSVCRT_onexit_cs); return -1; } table->_last = table->_first; @@ -388,6 +399,7 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT if (!tmp) { WARN("failed to grow table.\n"); + LeaveCriticalSection(&MSVCRT_onexit_cs); return -1; } table->_first = tmp; @@ -397,6 +409,7 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT *table->_last = func; table->_last++; + LeaveCriticalSection(&MSVCRT_onexit_cs); return 0; } @@ -406,24 +419,33 @@ int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT int CDECL MSVCRT__execute_onexit_table(MSVCRT__onexit_table_t *table) { MSVCRT__onexit_t *func; + MSVCRT__onexit_table_t copy; TRACE("(%p)\n", table); if (!table) return -1; + EnterCriticalSection(&MSVCRT_onexit_cs); if (!table->_first || table->_first >= table->_last) + { + LeaveCriticalSection(&MSVCRT_onexit_cs); return 0; + } + copy._first = table->_first; + copy._last = table->_last; + copy._end = table->_end; + memset(table, 0, sizeof(*table)); + MSVCRT__initialize_onexit_table(table); + LeaveCriticalSection(&MSVCRT_onexit_cs); - for (func = table->_last - 1; func >= table->_first; func--) + for (func = copy._last - 1; func >= copy._first; func--) { if (*func) (*func)(); } - MSVCRT_free(table->_first); - memset(table, 0, sizeof(*table)); - MSVCRT__initialize_onexit_table(table); + MSVCRT_free(copy._first); return 0; }

1 0

Jacek Caban : mshtml: Added IHTMLDocument7:: get_characterSet implementation and use it in get_charset.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 2fc598ddb0f16852db5ed65d793df3afbb61000a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc598ddb0f16852db5ed65d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:14:19 2017 +0200 mshtml: Added IHTMLDocument7::get_characterSet implementation and use it in get_charset. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 418e152..f9775f8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -918,19 +918,10 @@ static HRESULT WINAPI HTMLDocument_put_charset(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_charset(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - nsAString charset_str; - nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->doc_node->nsdoc) { - FIXME("NULL nsdoc\n"); - return E_FAIL; - } - - nsAString_Init(&charset_str, NULL); - nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str); - return return_nsstr(nsres, &charset_str, p); + return IHTMLDocument7_get_characterSet(&This->IHTMLDocument7_iface, p); } static HRESULT WINAPI HTMLDocument_put_defaultCharset(IHTMLDocument2 *iface, BSTR v) @@ -3321,8 +3312,19 @@ static HRESULT WINAPI HTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString charset_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_FAIL; + } + + nsAString_Init(&charset_str, NULL); + nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str); + return return_nsstr(nsres, &charset_str, p); } static HRESULT WINAPI HTMLDocument7_createElement(IHTMLDocument7 *iface, BSTR bstrTag, IHTMLElement **newElem)

1 0

Jacek Caban : mshtml: Added IHTMLDocument7:: get_defaultView implementation and use it for get_parentWindow implementation.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 697f1cb60fc182cc65a8dec2ce278182923fafa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697f1cb60fc182cc65a8dec2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:14:32 2017 +0200 mshtml: Added IHTMLDocument7::get_defaultView implementation and use it for get_parentWindow implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f9775f8..ea6bb20 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1632,9 +1632,7 @@ static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTML TRACE("(%p)->(%p)\n", This, p); - *p = &This->window->base.IHTMLWindow2_iface; - IHTMLWindow2_AddRef(*p); - return S_OK; + return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p); } static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, @@ -3254,8 +3252,12 @@ static HRESULT WINAPI HTMLDocument7_Invoke(IHTMLDocument7 *iface, DISPID dispIdM static HRESULT WINAPI HTMLDocument7_get_defaultView(IHTMLDocument7 *iface, IHTMLWindow2 **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = &This->window->base.IHTMLWindow2_iface; + IHTMLWindow2_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLDocument7_createCDATASection(IHTMLDocument7 *iface, BSTR text, IHTMLDOMNode **newCDATASectionNode) @@ -3977,8 +3979,10 @@ static HRESULT WINAPI HTMLDocument7_importNode(IHTMLDocument7 *iface, IHTMLDOMNo static HRESULT WINAPI HTMLDocument7_get_parentWindow(IHTMLDocument7 *iface, IHTMLWindow2 **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p); } static HRESULT WINAPI HTMLDocument7_put_body(IHTMLDocument7 *iface, IHTMLElement *v)

1 0

Jacek Caban : mshtml: Forward common function from IHTMLDocument7 to IHTMLDocument2.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 3c92286b5460eadafe382f50648569884bd1b9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c92286b5460eadafe382f506… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:14:43 2017 +0200 mshtml: Forward common function from IHTMLDocument7 to IHTMLDocument2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ea6bb20..d3cc06f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3332,15 +3332,19 @@ static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR static HRESULT WINAPI HTMLDocument7_createElement(IHTMLDocument7 *iface, BSTR bstrTag, IHTMLElement **newElem) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrTag), newElem); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrTag), newElem); + + return IHTMLDocument2_createElement(&This->IHTMLDocument2_iface, bstrTag, newElem); } static HRESULT WINAPI HTMLDocument7_createAttribute(IHTMLDocument7 *iface, BSTR bstrAttrName, IHTMLDOMAttribute **ppAttribute) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrAttrName), ppAttribute); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrAttrName), ppAttribute); + + return IHTMLDocument5_createAttribute(&This->IHTMLDocument5_iface, bstrAttrName, ppAttribute); } static HRESULT WINAPI HTMLDocument7_getElementByClassName(IHTMLDocument7 *iface, BSTR v, IHTMLElementCollection **pel) @@ -3382,8 +3386,10 @@ static HRESULT WINAPI HTMLDocument7_get_onmssitemodejumplistitemremoved(IHTMLDoc static HRESULT WINAPI HTMLDocument7_get_all(IHTMLDocument7 *iface, IHTMLElementCollection **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDocument2_get_all(&This->IHTMLDocument2_iface, p); } static HRESULT WINAPI HTMLDocument7_get_inputEncoding(IHTMLDocument7 *iface, BSTR *p) @@ -3995,8 +4001,10 @@ static HRESULT WINAPI HTMLDocument7_put_body(IHTMLDocument7 *iface, IHTMLElement static HRESULT WINAPI HTMLDocument7_get_body(IHTMLDocument7 *iface, IHTMLElement **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDocument2_get_body(&This->IHTMLDocument2_iface, p); } static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement **p)

1 0

Jacek Caban : mshtml: Added implementation of IHTMLDocument7 event handler properties for supported events.
by Alexandre Julliard 12 Sep '17

12 Sep '17

Module: wine Branch: master Commit: 8546c6a55b4cb7bf288f00749f4da19c07c5e0fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8546c6a55b4cb7bf288f00749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:14:57 2017 +0200 mshtml: Added implementation of IHTMLDocument7 event handler properties for supported events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 84 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d3cc06f..357dbcf 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3444,29 +3444,37 @@ static HRESULT WINAPI HTMLDocument7_hasAttributes(IHTMLDocument7 *iface, VARIANT static HRESULT WINAPI HTMLDocument7_put_onabort(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_ABORT, &v); } static HRESULT WINAPI HTMLDocument7_get_onabort(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_ABORT, p); } static HRESULT WINAPI HTMLDocument7_put_onblur(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_BLUR, &v); } static HRESULT WINAPI HTMLDocument7_get_onblur(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_BLUR, p); } static HRESULT WINAPI HTMLDocument7_put_oncanplay(IHTMLDocument7 *iface, VARIANT v) @@ -3500,15 +3508,19 @@ static HRESULT WINAPI HTMLDocument7_get_oncanplaythrough(IHTMLDocument7 *iface, static HRESULT WINAPI HTMLDocument7_put_onchange(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_CHANGE, &v); } static HRESULT WINAPI HTMLDocument7_get_onchange(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_CHANGE, p); } static HRESULT WINAPI HTMLDocument7_put_ondrag(IHTMLDocument7 *iface, VARIANT v) @@ -3644,29 +3656,37 @@ static HRESULT WINAPI HTMLDocument7_get_onended(IHTMLDocument7 *iface, VARIANT * static HRESULT WINAPI HTMLDocument7_put_onerror(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_ERROR, &v); } static HRESULT WINAPI HTMLDocument7_get_onerror(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_ERROR, p); } static HRESULT WINAPI HTMLDocument7_put_onfocus(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_FOCUS, &v); } static HRESULT WINAPI HTMLDocument7_get_onfocus(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_FOCUS, p); } static HRESULT WINAPI HTMLDocument7_put_oninput(IHTMLDocument7 *iface, VARIANT v) @@ -3686,15 +3706,19 @@ static HRESULT WINAPI HTMLDocument7_get_oninput(IHTMLDocument7 *iface, VARIANT * static HRESULT WINAPI HTMLDocument7_put_onload(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLDocument7_get_onload(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLDocument7_put_onloadeddata(IHTMLDocument7 *iface, VARIANT v) @@ -3900,15 +3924,19 @@ static HRESULT WINAPI HTMLDocument7_get_onstalled(IHTMLDocument7 *iface, VARIANT static HRESULT WINAPI HTMLDocument7_put_onsubmit(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_SUBMIT, &v); } static HRESULT WINAPI HTMLDocument7_get_onsubmit(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_SUBMIT, p); } static HRESULT WINAPI HTMLDocument7_put_onsuspend(IHTMLDocument7 *iface, VARIANT v)

1 0