- Wine-Commits - list.winehq.org

Fabian Maurer : coml2: Move StgIsStorageFile from ole32.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 7478f15f98a98eac5f6e5b099b917cf5682b72a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7478f15f98a98eac5f6e5b099b917c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:18:45 2023 +0100 coml2: Move StgIsStorageFile from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/storage32.c | 49 ------------------------------------------------- 3 files changed, 43 insertions(+), 50 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index d6b24669f22..364413dbf4d 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -22,7 +22,7 @@ @ stub StgCreatePropSetStg @ stub StgCreatePropStg @ stub StgCreateStorageEx -@ stub StgIsStorageFile +@ stdcall StgIsStorageFile(wstr) @ stdcall StgIsStorageILockBytes(ptr) @ stub StgOpenPropStg @ stub StgOpenStorage diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index 873e9fea0e1..dd803c817c9 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -184,3 +184,45 @@ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) return S_FALSE; } + +/****************************************************************************** + * StgIsStorageFile [coml2.@] + */ +HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn) +{ + HANDLE hf; + BYTE magic[8]; + DWORD bytes_read; + + TRACE("%s\n", debugstr_w(fn)); + hf = CreateFileW(fn, GENERIC_READ, + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + + if (hf == INVALID_HANDLE_VALUE) + return STG_E_FILENOTFOUND; + + if (!ReadFile(hf, magic, 8, &bytes_read, NULL)) + { + WARN(" unable to read file\n"); + CloseHandle(hf); + return S_FALSE; + } + + CloseHandle(hf); + + if (bytes_read != 8) + { + TRACE(" too short\n"); + return S_FALSE; + } + + if (!memcmp(magic, STORAGE_magic, 8)) + { + TRACE(" -> YES\n"); + return S_OK; + } + + TRACE(" -> Invalid header.\n"); + return S_FALSE; +} diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 496159773a3..f0ec0b5e954 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9339,55 +9339,6 @@ end: return r; } -/****************************************************************************** - * StgIsStorageFile [OLE32.@] - * Verify if the file contains a storage object - * - * PARAMS - * fn [ I] Filename - * - * RETURNS - * S_OK if file has magic bytes as a storage object - * S_FALSE if file is not storage - */ -HRESULT WINAPI -StgIsStorageFile(LPCOLESTR fn) -{ - HANDLE hf; - BYTE magic[8]; - DWORD bytes_read; - - TRACE("%s\n", debugstr_w(fn)); - hf = CreateFileW(fn, GENERIC_READ, - FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - - if (hf == INVALID_HANDLE_VALUE) - return STG_E_FILENOTFOUND; - - if (!ReadFile(hf, magic, 8, &bytes_read, NULL)) - { - WARN(" unable to read file\n"); - CloseHandle(hf); - return S_FALSE; - } - - CloseHandle(hf); - - if (bytes_read != 8) { - TRACE(" too short\n"); - return S_FALSE; - } - - if (!memcmp(magic,STORAGE_magic,8)) { - TRACE(" -> YES\n"); - return S_OK; - } - - TRACE(" -> Invalid header.\n"); - return S_FALSE; -} - /************************************************************************ * OleConvert Functions ***********************************************************************/

1 0

Fabian Maurer : coml2: Move StgIsStorageILockBytes from ole32.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: eab7899eb56e5d93a7a73f5f9c3f6ee5ed1b63e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/eab7899eb56e5d93a7a73f5f9c3f6e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:15:08 2023 +0100 coml2: Move StgIsStorageILockBytes from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 22 ++++++++++++++++++++++ dlls/ole32/storage32.c | 22 ---------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index 9f20fdd525b..d6b24669f22 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -23,7 +23,7 @@ @ stub StgCreatePropStg @ stub StgCreateStorageEx @ stub StgIsStorageFile -@ stub StgIsStorageILockBytes +@ stdcall StgIsStorageILockBytes(ptr) @ stub StgOpenPropStg @ stub StgOpenStorage @ stub StgOpenStorageEx diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index 8ce9f68524f..873e9fea0e1 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -50,6 +50,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); +static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1}; + /*********************************************************************** * WriteClassStg [coml2.@] */ @@ -162,3 +164,23 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) return header[1] & OleStream_Convert ? S_OK : S_FALSE; } + +/****************************************************************************** + * StgIsStorageILockBytes [coml2.@] + */ +HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) +{ + BYTE sig[sizeof(STORAGE_magic)]; + ULARGE_INTEGER offset; + ULONG read = 0; + + offset.HighPart = 0; + offset.LowPart = 0; + + ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), &read); + + if (read == sizeof(sig) && memcmp(sig, STORAGE_magic, sizeof(sig)) == 0) + return S_OK; + + return S_FALSE; +} diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3335186ff90..496159773a3 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9004,28 +9004,6 @@ HRESULT WINAPI StgSetTimes(OLECHAR const *str, FILETIME const *pctime, return r; } -/****************************************************************************** - * StgIsStorageILockBytes [OLE32.@] - * - * Determines if the ILockBytes contains a storage object. - */ -HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) -{ - BYTE sig[sizeof(STORAGE_magic)]; - ULARGE_INTEGER offset; - ULONG read = 0; - - offset.HighPart = 0; - offset.LowPart = 0; - - ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), &read); - - if (read == sizeof(sig) && memcmp(sig, STORAGE_magic, sizeof(sig)) == 0) - return S_OK; - - return S_FALSE; -} - /*********************************************************************** * OleLoadFromStream (OLE32.@) *

1 0

Bernhard Übelacker : mlang: Allow encoding name "ISO8859-1".
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 5a0321ac8cb956cddbad760c5fb803bdb3c04913 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a0321ac8cb956cddbad760c5fb803… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Dec 6 13:40:06 2023 +0100 mlang: Allow encoding name "ISO8859-1". This fixes eFilmLt.exe when running with native msxml6. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=13340 --- dlls/mlang/mlang.c | 2 +- dlls/mlang/tests/mlang.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9846e3ad0e4..f424c87b860 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -447,7 +447,7 @@ static const MIME_CP_INFO western_cp[] = MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, - L"iso-8859-1", L"iso-8859-1", L"iso-8859-1" }, + L"iso-8859-1", L"iso-8859-1", L"iso-8859-1", L"iso8859-1" }, { L"Latin 9 (ISO)", 28605, MIMECONTF_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 704576005d2..ee5ef5af738 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1021,19 +1021,18 @@ static void test_GetCharsetInfo_other(IMultiLanguage *ml) WCHAR iso88591_6W[] = {'-','I','S','O','8','8','5','9','1',0}; WCHAR iso88591_7W[] = {' ','I','S','O','-','8','8','5','9','-','1',0}; struct other { - int todo; HRESULT hr; WCHAR* charset; WCHAR* ret_charset; } other[] = { - { 0, S_OK, asciiW, asciiW }, - { 0, S_OK, iso88591_1W, iso88591_1retW }, - { 1, S_OK, iso88591_2W, iso88591_2retW }, - { 0, E_FAIL, iso88591_3W, 0 }, - { 0, E_FAIL, iso88591_4W, 0 }, - { 0, E_FAIL, iso88591_5W, 0 }, - { 0, E_FAIL, iso88591_6W, 0 }, - { 0, E_FAIL, iso88591_7W, 0 }, + { S_OK, asciiW, asciiW }, + { S_OK, iso88591_1W, iso88591_1retW }, + { S_OK, iso88591_2W, iso88591_2retW }, + { E_FAIL, iso88591_3W, 0 }, + { E_FAIL, iso88591_4W, 0 }, + { E_FAIL, iso88591_5W, 0 }, + { E_FAIL, iso88591_6W, 0 }, + { E_FAIL, iso88591_7W, 0 }, }; MIMECSETINFO info; HRESULT hr; @@ -1043,11 +1042,9 @@ static void test_GetCharsetInfo_other(IMultiLanguage *ml) { hr = IMultiLanguage_GetCharsetInfo(ml, other[i].charset, &info); - todo_wine_if(other[i].todo) ok(hr == other[i].hr, "#%d: got %08lx, expected %08lx\n", i, hr, other[i].hr); if (hr == S_OK) - todo_wine_if(other[i].todo) ok(!lstrcmpW(info.wszCharset, other[i].ret_charset), "#%d: got %s, expected %s\n", i, wine_dbgstr_w(info.wszCharset), wine_dbgstr_w(other[i].ret_charset)); }

1 0

Alexandre Julliard : ntdll: Export KeAddSystemServiceTable() instead of the KeServiceDescriptorTable variable.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 0fea0db866d843c14070a45b3f5e5fb26d4c5cb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fea0db866d843c14070a45b3f5e5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 12:42:34 2023 +0100 ntdll: Export KeAddSystemServiceTable() instead of the KeServiceDescriptorTable variable. --- dlls/ntdll/unix/loader.c | 15 +++++++++++++++ dlls/win32u/syscall.c | 15 +++------------ include/wine/unixlib.h | 3 ++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ee71584b953..803d8079213 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -625,6 +625,21 @@ void start_server( BOOL debug ) } +/*********************************************************************** + * KeAddSystemServiceTable + */ +BOOLEAN KeAddSystemServiceTable( ULONG_PTR *funcs, ULONG_PTR *counters, ULONG limit, + BYTE *arguments, ULONG index ) +{ + if (index >= ARRAY_SIZE(KeServiceDescriptorTable)) return FALSE; + KeServiceDescriptorTable[index].ServiceTable = funcs; + KeServiceDescriptorTable[index].CounterTable = counters; + KeServiceDescriptorTable[index].ServiceLimit = limit; + KeServiceDescriptorTable[index].ArgumentTable = arguments; + return TRUE; +} + + /************************************************************************* * map_so_dll * diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 2320ac18744..c03118821d9 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -36,9 +36,9 @@ ULONG_PTR zero_bits = 0; -static void * const syscalls[] = +static ULONG_PTR syscalls[] = { -#define SYSCALL_ENTRY(id,name,args) name, +#define SYSCALL_ENTRY(id,name,args) (ULONG_PTR)name, #ifdef _WIN64 ALL_SYSCALLS64 #else @@ -58,14 +58,6 @@ static BYTE arguments[ARRAY_SIZE(syscalls)] = #undef SYSCALL_ENTRY }; -static const SYSTEM_SERVICE_TABLE syscall_table = -{ - (ULONG_PTR *)syscalls, - 0, - ARRAY_SIZE(syscalls), - arguments -}; - static NTSTATUS init( void *args ) { #ifdef _WIN64 @@ -77,8 +69,7 @@ static NTSTATUS init( void *args ) zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; } #endif - - KeServiceDescriptorTable[1] = syscall_table; + KeAddSystemServiceTable( syscalls, NULL, ARRAY_SIZE(syscalls), arguments, 1 ); return STATUS_SUCCESS; } diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 2a615179e64..04978dcd680 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -31,7 +31,6 @@ typedef NTSTATUS (*unixlib_entry_t)( void *args ); extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_funcs[]; extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_wow64_funcs[]; -extern DECLSPEC_EXPORT SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; /* some useful helpers from ntdll */ NTSYSAPI const char *ntdll_get_build_dir(void); @@ -84,6 +83,8 @@ NTSYSAPI void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); } \ } while (0); +NTSYSAPI BOOLEAN KeAddSystemServiceTable( ULONG_PTR *funcs, ULONG_PTR *counters, ULONG limit, + BYTE *arguments, ULONG index ); NTSYSAPI NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); /* wide char string functions */

1 0

Alexandre Julliard : ntdll: Add a helper to build a path and exec it.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 7c777af498cbc93a95292577f5e613fd0d8b34ce URL: https://gitlab.winehq.org/wine/wine/-/commit/7c777af498cbc93a95292577f5e613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 10:48:06 2023 +0100 ntdll: Add a helper to build a path and exec it. --- dlls/ntdll/unix/loader.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 090f9906e9f..7b7005d282d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -297,14 +297,26 @@ static char *build_path( const char *dir, const char *name ) size_t len = strlen( dir ); char *ret = malloc( len + strlen( name ) + 2 ); - memcpy( ret, dir, len ); - if (len && ret[len - 1] != '/') ret[len++] = '/'; - if (name[0] == '/') name++; + if (len) + { + memcpy( ret, dir, len ); + if (ret[len - 1] != '/') ret[len++] = '/'; + if (name[0] == '/') name++; + } strcpy( ret + len, name ); return ret; } +/* build a path to a binary and exec it */ +static void build_path_and_exec( const char *dir, const char *name, char **argv ) +{ + argv[0] = build_path( dir, name ); + execv( argv[0], argv ); + free( argv[0] ); +} + + static const char *get_pe_dir( WORD machine ) { if (!machine) machine = current_machine; @@ -564,34 +576,22 @@ static void exec_wineserver( char **argv ) if (!is_win64) /* look for 64-bit server */ { char *loader = realpath_dirname( build_path( build_dir, "loader/wine64" )); - if (loader) - { - argv[0] = build_path( loader, "../server/wineserver" ); - execv( argv[0], argv ); - } + if (loader) build_path_and_exec( loader, "../server/wineserver", argv ); } - argv[0] = build_path( build_dir, "server/wineserver" ); - execv( argv[0], argv ); + build_path_and_exec( build_dir, "server/wineserver", argv ); return; } - argv[0] = build_path( bin_dir, "wineserver" ); - execv( argv[0], argv ); + build_path_and_exec( bin_dir, "wineserver", argv ); - argv[0] = getenv( "WINESERVER" ); - if (argv[0]) execv( argv[0], argv ); + if ((path = getenv( "WINESERVER" ))) build_path_and_exec( "", path, argv ); if ((path = getenv( "PATH" ))) { for (path = strtok( strdup( path ), ":" ); path; path = strtok( NULL, ":" )) - { - argv[0] = build_path( path, "wineserver" ); - execvp( argv[0], argv ); - } + build_path_and_exec( path, "wineserver", argv ); } - - argv[0] = build_path( BINDIR, "wineserver" ); - execv( argv[0], argv ); + build_path_and_exec( BINDIR, "wineserver", argv ); }

1 0

Brendan Shanks : winemac: Use RTL_CONSTANT_STRING.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: e4ec6f87e0be4c4ea9908bc22b59c829a2e4ad67 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ec6f87e0be4c4ea9908bc22b59c8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Dec 5 14:32:24 2023 -0800 winemac: Use RTL_CONSTANT_STRING. --- dlls/winemac.drv/clipboard.c | 3 +-- dlls/winemac.drv/display.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ef0c3ae9c25..5a1065cf7c4 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1665,8 +1665,7 @@ void macdrv_UpdateClipboard(void) if (!NtUserIsWindow(clipboard_manager)) { - UNICODE_STRING str; - RtlInitUnicodeString(&str, clipboard_classname); + UNICODE_STRING str = RTL_CONSTANT_STRING(clipboard_classname); clipboard_manager = NtUserFindWindowEx(NULL, NULL, &str, NULL, 0); if (!clipboard_manager) { diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 14c09649211..9bc8c79896f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -149,7 +149,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID char display_key_name[19]; HKEY display_hkey; CGDisplayModeRef display_mode; - UNICODE_STRING str; + UNICODE_STRING str = RTL_CONSTANT_STRING(pixelencodingW); DWORD val; CFStringRef pixel_encoding; size_t len; @@ -189,7 +189,6 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID CFStringGetCharacters(pixel_encoding, CFRangeMake(0, len), (UniChar*)buf); buf[len] = 0; CFRelease(pixel_encoding); - RtlInitUnicodeString(&str, pixelencodingW); if (NtSetValueKey(display_hkey, &str, 0, REG_SZ, (const BYTE*)buf, (len + 1) * sizeof(WCHAR))) goto fail;

1 0

Nikolay Sivov : ntdll: Use public type for SystemSupportedProcessorArchitectures returned data.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 26f11bdfe5365d8fa9354b530638b42de6aa2c42 URL: https://gitlab.winehq.org/wine/wine/-/commit/26f11bdfe5365d8fa9354b530638b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 17:41:33 2023 +0100 ntdll: Use public type for SystemSupportedProcessorArchitectures returned data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/process.c | 20 +++++++++--------- dlls/ntdll/tests/wow64.c | 48 +++++++++++++++++++++----------------------- dlls/ntdll/unix/system.c | 23 +++++++++++++++------ dlls/wow64/system.c | 2 +- include/winnt.h | 11 ++++++++++ programs/regsvr32/regsvr32.c | 9 +++++---- programs/wineboot/wineboot.c | 17 ++++++++-------- 7 files changed, 76 insertions(+), 54 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Get rid of outer_window member in HTMLDocumentNode.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: e5c4acc459f135bd6c59d8d7a5de8c601e1227cf URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c4acc459f135bd6c59d8d7a5de8c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Get rid of outer_window member in HTMLDocumentNode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 3 +-- dlls/mshtml/htmlframe.c | 6 +++--- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/mutation.c | 2 +- dlls/mshtml/nsevents.c | 11 ++++++----- dlls/mshtml/olecmd.c | 4 ++-- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/secmgr.c | 8 ++++---- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bc3782d54cc..a20472d22b8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4895,7 +4895,7 @@ static void HTMLDocumentNode_on_advise(IUnknown *iface, cp_static_data_t *cp) { HTMLDocumentNode *This = CONTAINING_RECORD((IHTMLDocument2*)iface, HTMLDocumentNode, IHTMLDocument2_iface); - if(This->outer_window) + if(This->window && This->window->base.outer_window) update_doc_cp_events(This, cp); } @@ -6208,7 +6208,6 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo doc->IDocumentRange_iface.lpVtbl = &DocumentRangeVtbl; doc->doc_obj = doc_obj; - doc->outer_window = window ? window->base.outer_window : NULL; doc->window = window; if(window) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 1a78dc3cc07..28bf42e2569 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -50,7 +50,7 @@ static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) window = mozwindow_to_window(mozwindow); if(!window && frame->element.node.doc->browser) { hres = create_outer_window(frame->element.node.doc->browser, mozwindow, - frame->element.node.doc->outer_window, &window); + frame->element.node.doc->window->base.outer_window, &window); /* Don't hold ref to the created window; the parent keeps ref to it */ if(SUCCEEDED(hres)) @@ -132,7 +132,7 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->content_window || !This->element.node.doc || !This->element.node.doc->outer_window) { + if(!This->content_window || !This->element.node.doc || !This->element.node.doc->window || !This->element.node.doc->window->base.outer_window) { nsAString nsstr; nsresult nsres; @@ -150,7 +150,7 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) return S_OK; } - return navigate_url(This->content_window, v, This->element.node.doc->outer_window->uri, BINDING_NAVIGATED); + return navigate_url(This->content_window, v, This->element.node.doc->window->base.outer_window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 40dcb0ebfab..db37375c089 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -940,7 +940,6 @@ struct HTMLDocumentNode { nsIDocumentObserver nsIDocumentObserver_iface; ConnectionPointContainer cp_container; - HTMLOuterWindow *outer_window; HTMLInnerWindow *window; HTMLDocumentObj *doc_obj; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index a1438debd6f..845c189f98b 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -314,7 +314,7 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo if(This->window == window) { window->dom_interactive_time = get_time_stamp(); - set_ready_state(This->outer_window, READYSTATE_INTERACTIVE); + set_ready_state(This->window->base.outer_window, READYSTATE_INTERACTIVE); } IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); return NS_OK; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 8c6631626d1..482d3196770 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -336,7 +336,7 @@ static nsresult handle_load(HTMLDocumentNode *doc, nsIDOMEvent *event) TRACE("(%p)\n", doc); - if(!doc->outer_window) + if(!doc->window || !doc->window->base.outer_window) return NS_ERROR_FAILURE; if(doc->doc_obj && doc->doc_obj->doc_node == doc) { doc_obj = doc->doc_obj; @@ -348,7 +348,8 @@ static nsresult handle_load(HTMLDocumentNode *doc, nsIDOMEvent *event) handle_docobj_load(doc_obj); doc->window->dom_complete_time = get_time_stamp(); - set_ready_state(doc->outer_window, READYSTATE_COMPLETE); + if(doc->window->base.outer_window) + set_ready_state(doc->window->base.outer_window, READYSTATE_COMPLETE); if(doc_obj) { if(doc_obj->view_sink) @@ -358,9 +359,9 @@ static nsresult handle_load(HTMLDocumentNode *doc, nsIDOMEvent *event) update_title(doc_obj); - if(doc_obj->doc_object_service && !(doc->outer_window->load_flags & BINDING_REFRESH)) + if(doc_obj->doc_object_service && doc->window->base.outer_window && !(doc->window->base.outer_window->load_flags & BINDING_REFRESH)) IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, - &doc->outer_window->base.IHTMLWindow2_iface, 0); + &doc->window->base.outer_window->base.IHTMLWindow2_iface, 0); IUnknown_Release(doc_obj->outer_unk); } @@ -516,7 +517,7 @@ static nsIDOMEventTarget *get_default_document_target(HTMLDocumentNode *doc) nsISupports *target_iface; nsresult nsres; - target_iface = doc->window ? (nsISupports*)doc->outer_window->nswindow : (nsISupports*)doc->dom_document; + target_iface = doc->window && doc->window->base.outer_window ? (nsISupports*)doc->window->base.outer_window->nswindow : (nsISupports*)doc->dom_document; nsres = nsISupports_QueryInterface(target_iface, &IID_nsIDOMEventTarget, (void**)&target); return NS_SUCCEEDED(nsres) ? target : NULL; } diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 76ed84341cf..650c44c9d2b 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -490,10 +490,10 @@ static HRESULT exec_refresh(HTMLDocumentNode *doc, DWORD nCmdexecopt, VARIANT *p } } - if(!doc->outer_window) + if(!doc->window || !doc->window->base.outer_window) return E_UNEXPECTED; - return reload_page(doc->outer_window); + return reload_page(doc->window->base.outer_window); } static HRESULT exec_stop(HTMLDocumentNode *doc, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index f910600de18..5f9e3588239 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -2227,12 +2227,12 @@ static HRESULT WINAPI PHServiceProvider_QueryService(IServiceProvider *iface, RE TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); - if(!This->doc || !This->doc->outer_window) { + if(!This->doc || !This->doc->window || !This->doc->window->base.outer_window) { *ppv = NULL; return E_NOINTERFACE; } - return IServiceProvider_QueryService(&This->doc->outer_window->base.IServiceProvider_iface, + return IServiceProvider_QueryService(&This->doc->window->base.outer_window->base.IServiceProvider_iface, guidService, riid, ppv); } diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 24c7ef2c817..ea53166f354 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -76,10 +76,10 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost TRACE("(%p)->(%ld %p %ld %p %ld %lx %lx)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); - if(!This->outer_window) + if(!This->window || !This->window->base.outer_window) return E_UNEXPECTED; - url = This->outer_window->url ? This->outer_window->url : L"about:blank"; + url = This->window->base.outer_window->url ? This->window->base.outer_window->url : L"about:blank"; return IInternetSecurityManager_ProcessUrlAction(get_security_manager(), url, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); @@ -181,10 +181,10 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos TRACE("(%p)->(%s %p %p %p %ld %lx)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); - if(!This->outer_window) + if(!This->window || !This->window->base.outer_window) return E_UNEXPECTED; - url = This->outer_window->url ? This->outer_window->url : L"about:blank"; + url = This->window->base.outer_window->url ? This->window->base.outer_window->url : L"about:blank"; hres = IInternetSecurityManager_QueryCustomPolicy(get_security_manager(), url, guidKey, ppPolicy, pcbPolicy, pContext, cbContext, dwReserved);

1 0

Gabriel Ivăncescu : mshtml: Skip navigation handling on anchor/area elements for detached documents.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: db12c470c8dc9c0dd8f137124d93fb48776eb9f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/db12c470c8dc9c0dd8f137124d93fb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Skip navigation handling on anchor/area elements for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 5398f87ce55..b3bdd3584d7 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -48,12 +48,15 @@ static HRESULT navigate_href_new_window(HTMLElement *element, nsAString *href_st IUri *uri; HRESULT hres; + if(!element->node.doc->window->base.outer_window) + return S_OK; + nsAString_GetData(href_str, &href); - hres = create_relative_uri(element->node.doc->outer_window, href, &uri); + hres = create_relative_uri(element->node.doc->window->base.outer_window, href, &uri); if(FAILED(hres)) return hres; - hres = navigate_new_window(element->node.doc->outer_window, uri, target, NULL, NULL); + hres = navigate_new_window(element->node.doc->window->base.outer_window, uri, target, NULL, NULL); IUri_Release(uri); return hres; } @@ -110,7 +113,10 @@ static HRESULT navigate_href(HTMLElement *element, nsAString *href_str, nsAStrin const PRUnichar *href; HRESULT hres; - window = get_target_window(element->node.doc->outer_window, target_str, &use_new_window); + if(!element->node.doc->window->base.outer_window) + return S_OK; + + window = get_target_window(element->node.doc->window->base.outer_window, target_str, &use_new_window); if(!window) { if(use_new_window) { const PRUnichar *target;

1 0

Gabriel Ivăncescu : mshtml: Return failure in IHTMLDocument2::domain for detached documents.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: d4aee460e77587f5d2ededa2e4d53ed6766ac007 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4aee460e77587f5d2ededa2e4d53e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Return failure in IHTMLDocument2::domain for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/navigation.js | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 45618ad3eba..b0872207819 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1160,12 +1160,12 @@ static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) return E_NOTIMPL; } - if(This->outer_window && !This->outer_window->uri) + if(This->window && (!This->window->base.outer_window || !This->window->base.outer_window->uri)) return E_FAIL; nsAString_Init(&nsstr, NULL); nsres = nsIDOMHTMLDocument_GetDomain(This->html_document, &nsstr); - if(NS_SUCCEEDED(nsres) && This->outer_window && This->outer_window->uri) { + if(NS_SUCCEEDED(nsres) && This->window) { const PRUnichar *str; HRESULT hres; @@ -1173,7 +1173,7 @@ static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) if(!*str) { TRACE("Gecko returned empty string, fallback to loaded URL.\n"); nsAString_Finish(&nsstr); - hres = IUri_GetHost(This->outer_window->uri, p); + hres = IUri_GetHost(This->window->base.outer_window->uri, p); return FAILED(hres) ? hres : S_OK; } } diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index fb8d1d5de5b..ad10372b4c6 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -119,6 +119,7 @@ function detached_iframe_doc() { expect_exception(function() { origDoc.onclick; }, true); expect_exception(function() { origDoc.toString; }, true); expect_exception(function() { origDoc.toString(); }, true); + expect_exception(function() { origDoc.domain; }); expect_exception(function() { origDoc.frames; }); expect_exception(function() { origDoc.readyState; }, true); expect_exception(function() { origDoc.URL; });

1 0