December 2023 - Wine-commits

Alexandre Julliard : vkd3d: Import upstream release 1.10.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 23111d625b21b50f4195cd4deff8b180d6b7dd24 URL: https://gitlab.winehq.org/wine/wine/-/commit/23111d625b21b50f4195cd4deff8b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 16:15:53 2023 +0100 vkd3d: Import upstream release 1.10. --- libs/vkd3d/AUTHORS | 3 + libs/vkd3d/Makefile.in | 1 - libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 23 +- libs/vkd3d/include/vkd3d.h | 1 + libs/vkd3d/include/vkd3d_shader.h | 170 +- libs/vkd3d/libs/vkd3d-common/blob.c | 1 + libs/vkd3d/libs/vkd3d-shader/d3d_asm.c | 139 +- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 142 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 162 +- libs/vkd3d/libs/vkd3d-shader/dxil.c | 3268 ++++++++++++++++++-- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 355 ++- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 110 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 57 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 703 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 1186 +++++-- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 417 ++- libs/vkd3d/libs/vkd3d-shader/ir.c | 651 +++- libs/vkd3d/libs/vkd3d-shader/spirv.c | 931 ++++-- libs/vkd3d/libs/vkd3d-shader/tpf.c | 1718 +++++----- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 294 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 233 +- libs/vkd3d/libs/vkd3d/command.c | 356 ++- libs/vkd3d/libs/vkd3d/device.c | 453 ++- libs/vkd3d/libs/vkd3d/resource.c | 121 +- libs/vkd3d/libs/vkd3d/state.c | 413 ++- libs/vkd3d/libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 61 +- libs/vkd3d/libs/vkd3d/vkd3d_shaders.h | 568 ++-- 29 files changed, 9597 insertions(+), 2948 deletions(-)

1 0

Bernhard Übelacker : mlang: Allow encoding name "ISO8859-1".
by Alexandre Julliard 06 Dec '23

06 Dec '23

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

Fabian Maurer : coml2: Move StgIsStorageILockBytes from ole32.
by Alexandre Julliard 06 Dec '23

06 Dec '23

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

Fabian Maurer : coml2: Move StgIsStorageFile from ole32.
by Alexandre Julliard 06 Dec '23

06 Dec '23

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 FmtIdToPropStgName from ole32.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: ce60cfeb81e559587b5698218976be47d30c76d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce60cfeb81e559587b5698218976be… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:22:58 2023 +0100 coml2: Move FmtIdToPropStgName from ole32. --- dlls/coml2/Makefile.in | 1 + dlls/coml2/coml2.spec | 2 +- dlls/coml2/stg_prop.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/stg_prop.c | 67 -------------------------- 4 files changed, 126 insertions(+), 68 deletions(-) diff --git a/dlls/coml2/Makefile.in b/dlls/coml2/Makefile.in index 5aa96ded363..739f791d4c5 100644 --- a/dlls/coml2/Makefile.in +++ b/dlls/coml2/Makefile.in @@ -5,4 +5,5 @@ IMPORTS = uuid SOURCES = \ memlockbytes.c \ + stg_prop.c \ storage32.c diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index 364413dbf4d..eea1f4332f4 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -11,7 +11,7 @@ @ stub Coml2DllGetClassObject @ stdcall CreateILockBytesOnHGlobal(ptr long ptr) @ stub DllGetClassObject -@ stub FmtIdToPropStgName +@ stdcall FmtIdToPropStgName(ptr wstr) @ stdcall GetConvertStg(ptr) @ stdcall GetHGlobalFromILockBytes(ptr ptr) @ stub PropStgNameToFmtId diff --git a/dlls/coml2/stg_prop.c b/dlls/coml2/stg_prop.c new file mode 100644 index 00000000000..3e1e23dfb5a --- /dev/null +++ b/dlls/coml2/stg_prop.c @@ -0,0 +1,124 @@ +/* + * Compound Storage (32 bit version) + * Storage implementation + * + * This file contains the compound file implementation + * of the storage interface. + * + * Copyright 1999 Francis Beaudet + * Copyright 1999 Sylvain St-Germain + * Copyright 1999 Thuy Nguyen + * Copyright 2005 Mike McCormack + * Copyright 2005 Juan Lang + * Copyright 2006 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * TODO: + * - I don't honor the maximum property set size. + * - Certain bogus files could result in reading past the end of a buffer. + * - Mac-generated files won't be read correctly, even if they're little + * endian, because I disregard whether the generator was a Mac. This means + * strings will probably be munged (as I don't understand Mac scripts.) + * - Not all PROPVARIANT types are supported. + * - User defined properties are not supported, see comment in + * PropertyStorage_ReadFromStream + */ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winuser.h" +#include "wine/asm.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "oleauto.h" + +WINE_DEFAULT_DEBUG_CHANNEL(storage); + +/*********************************************************************** + * Format ID <-> name conversion + */ +static const WCHAR szSummaryInfo[] = L"\5SummaryInformation"; +static const WCHAR szDocSummaryInfo[] = L"\5DocumentSummaryInformation"; + +#define BITS_PER_BYTE 8 +#define CHARMASK 0x1f +#define BITS_IN_CHARMASK 5 +#define NUM_ALPHA_CHARS 26 + +/*********************************************************************** + * FmtIdToPropStgName [coml2.@] + */ +HRESULT WINAPI FmtIdToPropStgName(const FMTID *rfmtid, LPOLESTR str) +{ + static const char fmtMap[] = "abcdefghijklmnopqrstuvwxyz012345"; + + TRACE("%s, %p\n", debugstr_guid(rfmtid), str); + + if (!rfmtid) return E_INVALIDARG; + if (!str) return E_INVALIDARG; + + if (IsEqualGUID(&FMTID_SummaryInformation, rfmtid)) + lstrcpyW(str, szSummaryInfo); + else if (IsEqualGUID(&FMTID_DocSummaryInformation, rfmtid)) + lstrcpyW(str, szDocSummaryInfo); + else if (IsEqualGUID(&FMTID_UserDefinedProperties, rfmtid)) + lstrcpyW(str, szDocSummaryInfo); + else + { + const BYTE *fmtptr; + WCHAR *pstr = str; + ULONG bitsRemaining = BITS_PER_BYTE; + + *pstr++ = 5; + for (fmtptr = (const BYTE *)rfmtid; fmtptr < (const BYTE *)rfmtid + sizeof(FMTID); ) + { + ULONG i = *fmtptr >> (BITS_PER_BYTE - bitsRemaining); + + if (bitsRemaining >= BITS_IN_CHARMASK) + { + *pstr = (WCHAR)(fmtMap[i & CHARMASK]); + if (bitsRemaining == BITS_PER_BYTE && *pstr >= 'a' && + *pstr <= 'z') + *pstr += 'A' - 'a'; + pstr++; + bitsRemaining -= BITS_IN_CHARMASK; + if (bitsRemaining == 0) + { + fmtptr++; + bitsRemaining = BITS_PER_BYTE; + } + } + else + { + if (++fmtptr < (const BYTE *)rfmtid + sizeof(FMTID)) + i |= *fmtptr << bitsRemaining; + *pstr++ = (WCHAR)(fmtMap[i & CHARMASK]); + bitsRemaining += BITS_PER_BYTE - BITS_IN_CHARMASK; + } + } + *pstr = 0; + } + TRACE("returning %s\n", debugstr_w(str)); + return S_OK; +} diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8bc159c7dd5..db998e6d30a 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -3005,73 +3005,6 @@ static const WCHAR szDocSummaryInfo[] = L"\5DocumentSummaryInformation"; #define BITS_IN_CHARMASK 5 #define NUM_ALPHA_CHARS 26 -/*********************************************************************** - * FmtIdToPropStgName [ole32.@] - * Returns the storage name of the format ID rfmtid. - * PARAMS - * rfmtid [I] Format ID for which to return a storage name - * str [O] Storage name associated with rfmtid. - * - * RETURNS - * E_INVALIDARG if rfmtid or str i NULL, S_OK otherwise. - * - * NOTES - * str must be at least CCH_MAX_PROPSTG_NAME characters in length. - */ -HRESULT WINAPI FmtIdToPropStgName(const FMTID *rfmtid, LPOLESTR str) -{ - static const char fmtMap[] = "abcdefghijklmnopqrstuvwxyz012345"; - - TRACE("%s, %p\n", debugstr_guid(rfmtid), str); - - if (!rfmtid) return E_INVALIDARG; - if (!str) return E_INVALIDARG; - - if (IsEqualGUID(&FMTID_SummaryInformation, rfmtid)) - lstrcpyW(str, szSummaryInfo); - else if (IsEqualGUID(&FMTID_DocSummaryInformation, rfmtid)) - lstrcpyW(str, szDocSummaryInfo); - else if (IsEqualGUID(&FMTID_UserDefinedProperties, rfmtid)) - lstrcpyW(str, szDocSummaryInfo); - else - { - const BYTE *fmtptr; - WCHAR *pstr = str; - ULONG bitsRemaining = BITS_PER_BYTE; - - *pstr++ = 5; - for (fmtptr = (const BYTE *)rfmtid; fmtptr < (const BYTE *)rfmtid + sizeof(FMTID); ) - { - ULONG i = *fmtptr >> (BITS_PER_BYTE - bitsRemaining); - - if (bitsRemaining >= BITS_IN_CHARMASK) - { - *pstr = (WCHAR)(fmtMap[i & CHARMASK]); - if (bitsRemaining == BITS_PER_BYTE && *pstr >= 'a' && - *pstr <= 'z') - *pstr += 'A' - 'a'; - pstr++; - bitsRemaining -= BITS_IN_CHARMASK; - if (bitsRemaining == 0) - { - fmtptr++; - bitsRemaining = BITS_PER_BYTE; - } - } - else - { - if (++fmtptr < (const BYTE *)rfmtid + sizeof(FMTID)) - i |= *fmtptr << bitsRemaining; - *pstr++ = (WCHAR)(fmtMap[i & CHARMASK]); - bitsRemaining += BITS_PER_BYTE - BITS_IN_CHARMASK; - } - } - *pstr = 0; - } - TRACE("returning %s\n", debugstr_w(str)); - return S_OK; -} - /*********************************************************************** * PropStgNameToFmtId [ole32.@] * Returns the format ID corresponding to the given name.

1 0

Fabian Maurer : coml2: Move PropStgNameToFmtId from ole32.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: e5df1b2e51cf34d6234faabd242bcd36e0b1b470 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5df1b2e51cf34d6234faabd242bcd… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:24:18 2023 +0100 coml2: Move PropStgNameToFmtId from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/stg_prop.c | 75 ++++++++++++++++++++++++++++++++++++++++ dlls/ole32/stg_prop.c | 94 --------------------------------------------------- 3 files changed, 76 insertions(+), 95 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index eea1f4332f4..694790350cc 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -14,7 +14,7 @@ @ stdcall FmtIdToPropStgName(ptr wstr) @ stdcall GetConvertStg(ptr) @ stdcall GetHGlobalFromILockBytes(ptr ptr) -@ stub PropStgNameToFmtId +@ stdcall PropStgNameToFmtId(wstr ptr) @ stdcall ReadClassStg(ptr ptr) @ stdcall ReadClassStm(ptr ptr) @ stub StgCreateDocfile diff --git a/dlls/coml2/stg_prop.c b/dlls/coml2/stg_prop.c index 3e1e23dfb5a..93d658c2a0a 100644 --- a/dlls/coml2/stg_prop.c +++ b/dlls/coml2/stg_prop.c @@ -122,3 +122,78 @@ HRESULT WINAPI FmtIdToPropStgName(const FMTID *rfmtid, LPOLESTR str) TRACE("returning %s\n", debugstr_w(str)); return S_OK; } + +/*********************************************************************** + * PropStgNameToFmtId [coml2.@] + */ +HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR str, FMTID *rfmtid) +{ + HRESULT hr = STG_E_INVALIDNAME; + + TRACE("%s, %p\n", debugstr_w(str), rfmtid); + + if (!rfmtid) return E_INVALIDARG; + if (!str) return STG_E_INVALIDNAME; + + if (!lstrcmpiW(str, szDocSummaryInfo)) + { + *rfmtid = FMTID_DocSummaryInformation; + hr = S_OK; + } + else if (!lstrcmpiW(str, szSummaryInfo)) + { + *rfmtid = FMTID_SummaryInformation; + hr = S_OK; + } + else + { + ULONG bits; + BYTE *fmtptr = (BYTE *)rfmtid - 1; + const WCHAR *pstr = str; + + memset(rfmtid, 0, sizeof(*rfmtid)); + for (bits = 0; bits < sizeof(FMTID) * BITS_PER_BYTE; + bits += BITS_IN_CHARMASK) + { + ULONG bitsUsed = bits % BITS_PER_BYTE, bitsStored; + WCHAR wc; + + if (bitsUsed == 0) + fmtptr++; + wc = *++pstr - 'A'; + if (wc > NUM_ALPHA_CHARS) + { + wc += 'A' - 'a'; + if (wc > NUM_ALPHA_CHARS) + { + wc += 'a' - '0' + NUM_ALPHA_CHARS; + if (wc > CHARMASK) + { + WARN("invalid character (%d)\n", *pstr); + goto end; + } + } + } + *fmtptr |= wc << bitsUsed; + bitsStored = min(BITS_PER_BYTE - bitsUsed, BITS_IN_CHARMASK); + if (bitsStored < BITS_IN_CHARMASK) + { + wc >>= BITS_PER_BYTE - bitsUsed; + if (bits + bitsStored == sizeof(FMTID) * BITS_PER_BYTE) + { + if (wc != 0) + { + WARN("extra bits\n"); + goto end; + } + break; + } + fmtptr++; + *fmtptr |= (BYTE)wc; + } + } + hr = S_OK; + } +end: + return hr; +} diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index db998e6d30a..66b12f3ae9e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2994,100 +2994,6 @@ static const IPropertyStorageVtbl IPropertyStorage_Vtbl = IPropertyStorage_fnStat, }; -/*********************************************************************** - * Format ID <-> name conversion - */ -static const WCHAR szSummaryInfo[] = L"\5SummaryInformation"; -static const WCHAR szDocSummaryInfo[] = L"\5DocumentSummaryInformation"; - -#define BITS_PER_BYTE 8 -#define CHARMASK 0x1f -#define BITS_IN_CHARMASK 5 -#define NUM_ALPHA_CHARS 26 - -/*********************************************************************** - * PropStgNameToFmtId [ole32.@] - * Returns the format ID corresponding to the given name. - * PARAMS - * str [I] Storage name to convert to a format ID. - * rfmtid [O] Format ID corresponding to str. - * - * RETURNS - * E_INVALIDARG if rfmtid or str is NULL or if str can't be converted to - * a format ID, S_OK otherwise. - */ -HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR str, FMTID *rfmtid) -{ - HRESULT hr = STG_E_INVALIDNAME; - - TRACE("%s, %p\n", debugstr_w(str), rfmtid); - - if (!rfmtid) return E_INVALIDARG; - if (!str) return STG_E_INVALIDNAME; - - if (!lstrcmpiW(str, szDocSummaryInfo)) - { - *rfmtid = FMTID_DocSummaryInformation; - hr = S_OK; - } - else if (!lstrcmpiW(str, szSummaryInfo)) - { - *rfmtid = FMTID_SummaryInformation; - hr = S_OK; - } - else - { - ULONG bits; - BYTE *fmtptr = (BYTE *)rfmtid - 1; - const WCHAR *pstr = str; - - memset(rfmtid, 0, sizeof(*rfmtid)); - for (bits = 0; bits < sizeof(FMTID) * BITS_PER_BYTE; - bits += BITS_IN_CHARMASK) - { - ULONG bitsUsed = bits % BITS_PER_BYTE, bitsStored; - WCHAR wc; - - if (bitsUsed == 0) - fmtptr++; - wc = *++pstr - 'A'; - if (wc > NUM_ALPHA_CHARS) - { - wc += 'A' - 'a'; - if (wc > NUM_ALPHA_CHARS) - { - wc += 'a' - '0' + NUM_ALPHA_CHARS; - if (wc > CHARMASK) - { - WARN("invalid character (%d)\n", *pstr); - goto end; - } - } - } - *fmtptr |= wc << bitsUsed; - bitsStored = min(BITS_PER_BYTE - bitsUsed, BITS_IN_CHARMASK); - if (bitsStored < BITS_IN_CHARMASK) - { - wc >>= BITS_PER_BYTE - bitsUsed; - if (bits + bitsStored == sizeof(FMTID) * BITS_PER_BYTE) - { - if (wc != 0) - { - WARN("extra bits\n"); - goto end; - } - break; - } - fmtptr++; - *fmtptr |= (BYTE)wc; - } - } - hr = S_OK; - } -end: - return hr; -} - #ifdef __i386__ /* thiscall functions are i386-specific */ #define DEFINE_STDCALL_WRAPPER(num,func,args) \

1 0

Gabriel Ivăncescu : mshtml: Use inner window's outer_window in IHTMLDocument2::readyState.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: ffb7ace4dfdd7741270a545082d5b35d33760ceb URL: https://gitlab.winehq.org/wine/wine/-/commit/ffb7ace4dfdd7741270a545082d5b3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Use inner window's outer_window in IHTMLDocument2::readyState. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/tests/navigation.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e37f04fee0b..3f844fddf8d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -905,7 +905,7 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p if(!p) return E_POINTER; - return get_readystate_string(This->outer_window ? This->outer_window->readystate : 0, p); + return get_readystate_string(This->window && This->window->base.outer_window ? This->window->base.outer_window->readystate : 0, p); } static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 402d933a54a..84a0bbdcb5d 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.readyState; }, true); expect_exception(function() { origDoc.URL; }); expect_exception(function() { origDoc.URL = "blank.html"; });

1 0

Gabriel Ivăncescu : mshtml: Return failure in IHTMLDocument2::frames for detached documents.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 2e77a62f1d21a7f20f2b241a1761ac29362f06d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e77a62f1d21a7f20f2b241a1761ac… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Return failure in IHTMLDocument2::frames 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, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3f844fddf8d..45618ad3eba 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -914,11 +914,13 @@ static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFrames TRACE("(%p)->(%p)\n", This, p); - if(!This->outer_window) { + if(!This->window) { /* Not implemented by IE */ return E_NOTIMPL; } - return IHTMLWindow2_get_frames(&This->outer_window->base.IHTMLWindow2_iface, p); + if(!This->window->base.outer_window) + return E_FAIL; + return IHTMLWindow2_get_frames(&This->window->base.outer_window->base.IHTMLWindow2_iface, p); } static HRESULT WINAPI HTMLDocument_get_embeds(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index 84a0bbdcb5d..fb8d1d5de5b 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.frames; }); expect_exception(function() { origDoc.readyState; }, true); expect_exception(function() { origDoc.URL; }); expect_exception(function() { origDoc.URL = "blank.html"; });

1 0

Gabriel Ivăncescu : mshtml: Return failure in IHTMLDocument2::domain for detached documents.
by Alexandre Julliard 06 Dec '23

06 Dec '23

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

Gabriel Ivăncescu : mshtml: Return failure in IHTMLDocument2::cookie for detached documents.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 5e873c48be1f3e18de20f78e4246129da8f40707 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e873c48be1f3e18de20f78e424612… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 5 19:42:19 2023 +0200 mshtml: Return failure in IHTMLDocument2::cookie for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 14 +++++++++----- dlls/mshtml/tests/navigation.js | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b0872207819..e7ff2771050 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1188,10 +1188,12 @@ static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->outer_window) + if(!This->window) return S_OK; + if(!This->window->base.outer_window) + return E_FAIL; - bret = InternetSetCookieExW(This->outer_window->url, NULL, v, 0, 0); + bret = InternetSetCookieExW(This->window->base.outer_window->url, NULL, v, 0, 0); if(!bret) { FIXME("InternetSetCookieExW failed: %lu\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); @@ -1208,13 +1210,15 @@ static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - if(!This->outer_window) { + if(!This->window) { *p = NULL; return S_OK; } + if(!This->window->base.outer_window) + return E_FAIL; size = 0; - bret = InternetGetCookieExW(This->outer_window->url, NULL, NULL, &size, 0, NULL); + bret = InternetGetCookieExW(This->window->base.outer_window->url, NULL, NULL, &size, 0, NULL); if(!bret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { WARN("InternetGetCookieExW failed: %lu\n", GetLastError()); *p = NULL; @@ -1230,7 +1234,7 @@ static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) if(!*p) return E_OUTOFMEMORY; - bret = InternetGetCookieExW(This->outer_window->url, NULL, *p, &size, 0, NULL); + bret = InternetGetCookieExW(This->window->base.outer_window->url, NULL, *p, &size, 0, NULL); if(!bret) { ERR("InternetGetCookieExW failed: %lu\n", GetLastError()); return E_FAIL; diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js index ad10372b4c6..bc24fa646d3 100644 --- a/dlls/mshtml/tests/navigation.js +++ b/dlls/mshtml/tests/navigation.js @@ -119,6 +119,8 @@ 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.cookie; }); + expect_exception(function() { origDoc.cookie = "test=val"; }); expect_exception(function() { origDoc.domain; }); expect_exception(function() { origDoc.frames; }); expect_exception(function() { origDoc.readyState; }, true);

1 0