- Wine-Devel - list.winehq.org

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 60 +++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 104cd493c8e..d095bd0a92e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-23 14:40+0800\n" +"PO-Revision-Date: 2021-11-28 00:32+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -1155,8 +1155,8 @@ msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"您必須先安裝印表機才能使用與印表機有關的功能 (如: 版面設定，列印檔案)。請安裝" -"印表機後再試一次。" +"您必須先安裝印表機才能使用與印表機有關的功能 (如: 版面設定，列印檔案)。請在安" +"裝印表機後再試一次。" #: dlls/comdlg32/comdlg32.rc:142 msgid "Select a font size between %1!d! and %2!d! points." @@ -1224,7 +1224,7 @@ msgstr "印表機離線; " #: dlls/comdlg32/comdlg32.rc:93 msgid "I/O Active; " -msgstr "I/O 活動; " +msgstr "I/O 活動中; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " @@ -1268,7 +1268,7 @@ msgstr "墨水用盡; " #: dlls/comdlg32/comdlg32.rc:104 msgid "Page punt; " -msgstr "頁處理記憶體超支; " +msgstr "紙張有問題; " #: dlls/comdlg32/comdlg32.rc:105 msgid "Interrupted by user; " @@ -2510,15 +2510,15 @@ msgstr "請選擇您要使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-encoded X.509 (*.cer)" +msgstr "DER-encoded X.509 (*.cer)(&D)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-encoded X.509 (*.cer):" +msgstr "Base64-encoded X.509 (*.cer)(&S):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "密碼訊息語法標準/PK&CS #7 訊息 (*.p7b)" +msgstr "密碼訊息語法標準/PK&CS #7 訊息 (*.p7b)(&C)" #: dlls/cryptui/cryptui.rc:419 msgid "&Include all certificates in the certification path if possible" @@ -2526,7 +2526,7 @@ msgstr "儘量在憑證路徑中包含所有憑證(&I)" #: dlls/cryptui/cryptui.rc:421 msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "個人資訊交換/&PKCS #12 (*.pfx)" +msgstr "個人資訊交換/&PKCS #12 (*.pfx)(&P)" #: dlls/cryptui/cryptui.rc:423 msgid "Incl&ude all certificates in the certification path if possible" @@ -2588,7 +2588,7 @@ msgstr "找不到這個憑證的簽發者。" #: dlls/cryptui/cryptui.rc:36 msgid "All the intended purposes of this certificate could not be verified." -msgstr "這個憑證的所有預定目的都無法被驗證。" +msgstr "無法驗證這個憑證的所有預定目的。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" @@ -2855,7 +2855,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證解密訊息，或用它簽署訊息。\n" -"確定要移除這個憑證?" +"您確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2864,7 +2864,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證解密訊息，或用它們簽署訊息。\n" -"確定要移除這些憑證?" +"您確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2873,7 +2873,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您將不能再以這個憑證加密訊息，或驗證以它簽署的訊息。\n" -"確定要移除這個憑證?" +"您確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:113 msgid "" @@ -2882,7 +2882,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您將不能再以這些憑證加密訊息，或驗證以它們簽署的訊息。\n" -"確定要移除這些憑證?" +"您確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2891,7 +2891,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "由這個憑證授權單位所發的憑證將不再被信任。\n" -"確定要移除這個憑證?" +"您確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2900,7 +2900,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "由這些憑證授權單位所發的憑證將不再被信任。\n" -"確定要移除這些憑證?" +"您確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2909,7 +2909,7 @@ msgid "" "Are you sure you want to remove this trusted root certificate?" msgstr "" "由這個憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" -"確定要移除這個信任的根憑證?" +"您確定要移除這個信任的根憑證?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2918,7 +2918,7 @@ msgid "" "Are you sure you want to remove these trusted root certificates?" msgstr "" "由這些憑證授權單位所發的憑證或憑證授權單位將不再被信任。\n" -"確定要移除這些信任的根憑證?" +"您確定要移除這些信任的根憑證?" #: dlls/cryptui/cryptui.rc:118 msgid "" @@ -2926,7 +2926,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "由這個發行者簽署的軟體將將不再被信任。\n" -"確定要移除這個憑證?" +"您確定要移除這個憑證?" #: dlls/cryptui/cryptui.rc:119 msgid "" @@ -2934,7 +2934,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "由這些發行者簽署的軟體將不再被信任。\n" -"確定要移除這些憑證?" +"您確定要移除這些憑證?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" @@ -13076,13 +13076,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "使用中的字碼頁: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "無效的訊息。\n" +msgstr "無效的字碼頁\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13095,6 +13093,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [數字]\n" +"\n" +" 設定或顯示主控臺正在使用的字碼頁。\n" +"\n" +" 數字要在主控臺使用的字碼頁。\n" +"\n" +" 輸入 CHCP 而不輸入數字則顯示主控臺正在使用的字碼頁。\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -18901,7 +18907,7 @@ msgstr "RichEdit 庫載入失敗。" msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "您已經選擇儲存為純文字格式, 這可能導致格式遺失。您確定要這麼做嗎?" +msgstr "您已經選擇儲存為純文字格式。這可能導致格式遺失。您確定要這麼做嗎?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." @@ -19037,10 +19043,10 @@ msgstr "" "XCOPY 來源 [目的地] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" -"位置:\n" +"其中:\n" "\n" "[/I] 如果目的不存在且複製兩個或更多檔案時，\n" -"\t將目的假設為目錄。\n" +"\t將假設目的地為目錄。\n" "[/S] 複製目錄和子目錄。\n" "[/E] 複製目錄和子目錄，包括任何空目錄。\n" "[/Q] 安靜模式，在複製期間不列出名稱。\n" -- 2.33.0.windows.2

1 0

[PATCH] msi: GetBinaryType() doesn't accept DLLs.
by Hans Leidekker Dec. 10, 2021

Dec. 10, 2021

With help from Dmitry Timoshkov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51790 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/custom.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fb03958eb11..19ad3917265 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -22,6 +22,9 @@ #include <stdarg.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -697,6 +700,51 @@ static DWORD WINAPI custom_client_thread(void *arg) return rc; } +/* based on kernel32.GetBinaryTypeW() */ +static BOOL get_binary_type( const WCHAR *name, DWORD *type ) +{ + HANDLE hfile, mapping; + NTSTATUS status; + + hfile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (hfile == INVALID_HANDLE_VALUE) + return FALSE; + + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY, NULL, NULL, PAGE_READONLY, + SEC_IMAGE, hfile ); + CloseHandle( hfile ); + + switch (status) + { + case STATUS_SUCCESS: + { + SECTION_IMAGE_INFORMATION info; + + status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL ); + CloseHandle( mapping ); + if (status) return FALSE; + switch (info.Machine) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARMNT: + *type = SCS_32BIT_BINARY; + return TRUE; + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + *type = SCS_64BIT_BINARY; + return TRUE; + default: + return FALSE; + } + } + case STATUS_INVALID_IMAGE_WIN_64: + *type = SCS_64BIT_BINARY; + return TRUE; + default: + return FALSE; + } +} + static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { @@ -744,7 +792,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( info->package->rpc_server_started = 1; } - ret = GetBinaryTypeW(source, &info->arch); + ret = get_binary_type(source, &info->arch); if (!ret) info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); -- 2.30.2

1 0

[PATCH] maintainers: Add the nsi include file.
by Huw Davies Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ea27dc41af3..d1f92c3a50b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,6 +221,7 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/iphlpapi/ F: dlls/nsi/ F: dlls/nsiproxy.sys/ +F: include/wine/nsi.h OLE Embedding M: Huw Davies <huw(a)codeweavers.com> -- 2.23.0

1 0

[PATCH] nsi: Use a whole byte for each nsi_ip_neighbour_dynamic flag
by Alex Henrie Dec. 10, 2021

Dec. 10, 2021

Fixes the failure of the test at dlls/nsi/tests/nsi.c:679 on certain testbot machines. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/wine/nsi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8c3488dc19c..b8e59c7bf54 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -226,8 +226,8 @@ struct nsi_ip_neighbour_dynamic DWORD time; struct { - USHORT is_router : 1; - USHORT is_unreachable : 1; + BOOLEAN is_router; + BOOLEAN is_unreachable; } flags; USHORT phys_addr_len; DWORD unk; -- 2.34.1

2 1

[PATCH 1/2] comctl32/tests: Fix a test failure on Win10 21H1 with Hebrew locale.
by Zhiyi Zhang Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/propsheet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 9acdea85c66..04a540b07e6 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -78,8 +78,8 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) size = SizeofResource(module, hrsrc); ok(size != 0, "Failed to get size of propsheet dialog resource\n"); buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); - ok(buffer_size == 2 * size, "Unexpected template buffer size %u, resource size %u\n", - buffer_size, size); + ok(buffer_size == 2 * size || buffer_size == 2 * size + 8 /* Win10 21H1 Hebrew (Israel) */, + "Unexpected template buffer size %u, resource size %u\n", buffer_size, size); break; } case PSCB_INITIALIZED: -- 2.32.0

3 4

[PATCH] winegstreamer: Set MF_MT_AUDIO_BLOCK_ALIGNMENT attribute for raw types.
by Nikolay Sivov Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 58200dc409a..5404728ba83 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -564,6 +564,7 @@ static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format * IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, format->u.audio.channels); IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, format->u.audio.channels * audio_formats[i].depth / 8); return type; } -- 2.33.0

1 0

[PATCH] include: Add some of the XPS OM interfaces.
by Nikolay Sivov Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 2 + include/xpsobjectmodel.idl | 546 +++++++++++++++++++++++++++++++++++ include/xpsobjectmodel_1.idl | 49 ++++ 3 files changed, 597 insertions(+) create mode 100644 include/xpsobjectmodel.idl create mode 100644 include/xpsobjectmodel_1.idl diff --git a/include/Makefile.in b/include/Makefile.in index 302e0bb2a73..e5ae8429ed0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -879,4 +879,6 @@ SOURCES = \ xmldso.idl \ xmldsodid.h \ xmllite.idl \ + xpsobjectmodel.idl \ + xpsobjectmodel_1.idl \ zmouse.h diff --git a/include/xpsobjectmodel.idl b/include/xpsobjectmodel.idl new file mode 100644 index 00000000000..8f8a8313bd1 --- /dev/null +++ b/include/xpsobjectmodel.idl @@ -0,0 +1,546 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +import "msopc.idl"; + +interface IXpsOMPrintTicketResource; +interface IXpsOMDocumentStructureResource; +interface IXpsOMSignatureBlockResourceCollection; +interface IXpsOMPartUriCollection; +interface IXpsOMPage; +interface IXpsOMStoryFragmentsResource; +interface IXpsOMImageResource; +interface IXpsOMResource; +interface IXpsOMObjectFactory; +interface IXpsOMSignatureBlockResource; +interface IXpsOMDictionary; +interface IXpsOMRemoteDictionaryResource; +interface IXpsOMPartResources; +interface IXpsOMDocument; +interface IXpsOMPageReference; +interface IXpsOMCanvas; +interface IXpsOMFontResource; +interface IXpsOMGlyphs; +interface IXpsOMPath; +interface IXpsOMGeometry; +interface IXpsOMGeometryFigure; +interface IXpsOMMatrixTransform; +interface IXpsOMColorProfileResource; +interface IXpsOMSolidColorBrush; +interface IXpsOMImageBrush; +interface IXpsOMVisualBrush; +interface IXpsOMGradientStop; +interface IXpsOMLinearGradientBrush; +interface IXpsOMRadialGradientBrush; +interface IXpsOMCoreProperties; +interface IXpsOMPackageWriter; +interface IXpsOMPackage; + +typedef [v1_enum] enum +{ + XPS_COLOR_TYPE_SRGB = 1, + XPS_COLOR_TYPE_SCRGB, + XPS_COLOR_TYPE_CONTEXT +} XPS_COLOR_TYPE; + +typedef [v1_enum] enum +{ + XPS_IMAGE_TYPE_JPEG = 1, + XPS_IMAGE_TYPE_PNG, + XPS_IMAGE_TYPE_TIFF, + XPS_IMAGE_TYPE_WDP, + XPS_IMAGE_TYPE_JXR +} XPS_IMAGE_TYPE; + +typedef [v1_enum] enum +{ + XPS_FONT_EMBEDDING_NORMAL = 1, + XPS_FONT_EMBEDDING_OBFUSCATED, + XPS_FONT_EMBEDDING_RESTRICTED, + XPS_FONT_EMBEDDING_RESTRICTED_UNOBFUSCATED +} XPS_FONT_EMBEDDING; + +typedef [v1_enum] enum +{ + XPS_INTERLEAVING_OFF = 1, + XPS_INTERLEAVING_ON, +} XPS_INTERLEAVING; + +typedef struct +{ + FLOAT width; + FLOAT height; +} XPS_SIZE; + +typedef struct +{ + FLOAT x; + FLOAT y; +} XPS_POINT; + +typedef struct +{ + FLOAT x; + FLOAT y; + FLOAT width; + FLOAT height; +} XPS_RECT; + +typedef struct +{ + FLOAT m11; + FLOAT m12; + FLOAT m21; + FLOAT m22; + FLOAT m31; + FLOAT m32; +} XPS_MATRIX; + +typedef union switch (XPS_COLOR_TYPE colorType) value +{ + case XPS_COLOR_TYPE_SRGB: + struct + { + UINT8 alpha, red, green, blue; + } sRGB; + case XPS_COLOR_TYPE_SCRGB: + struct + { + FLOAT alpha, red, green, blue; + } scRGB; + case XPS_COLOR_TYPE_CONTEXT: + struct + { + UINT8 channelCount; + FLOAT channels[9]; + } context; +} XPS_COLOR; + +[ + object, + uuid(74eb2f0b-a91e-4486-afac-0fabeca3dfc6) +] +interface IXpsOMPart : IUnknown +{ + HRESULT GetPartName( + [out, retval] IOpcPartUri **partUri + ); + + HRESULT SetPartName( + [in] IOpcPartUri *partUri + ); +} + +[ + object, + pointer_default(ref), + uuid(d1c87f0d-e947-4754-8a25-971478f7e83e) +] +interface IXpsOMDocumentCollection : IUnknown +{ + HRESULT GetCount( + [out, retval] UINT32 *count + ); + + HRESULT GetAt( + [in] UINT32 index, + [out, retval] IXpsOMDocument **document + ); + + HRESULT InsertAt( + [in] UINT32 index, + [in] IXpsOMDocument *document + ); + + HRESULT RemoveAt( + [in] UINT32 index + ); + + HRESULT SetAt( + [in] UINT32 index, + [in] IXpsOMDocument *document + ); + + HRESULT Append( + [in] IXpsOMDocument *document + ); +} + +[ + object, + pointer_default(ref), + uuid(56492eb4-d8d5-425e-8256-4c2b64ad0264) +] +interface IXpsOMDocumentSequence : IXpsOMPart +{ + HRESULT GetOwner( + [out, retval] IXpsOMPackage **package + ); + + HRESULT GetDocuments( + [out, retval] IXpsOMDocumentCollection **documents + ); + + HRESULT GetPrintTicketResource( + [out, retval] IXpsOMPrintTicketResource **printTicketResource + ); + + HRESULT SetPrintTicketResource( + [in] IXpsOMPrintTicketResource *printTicketResource + ); +} + +[ + object, + local, + pointer_default(ref), + uuid(18c3df65-81e1-4674-91dc-fc452f5a416f) +] +interface IXpsOMPackage : IUnknown +{ + HRESULT GetDocumentSequence( + [out, retval] IXpsOMDocumentSequence **documentSequence + ); + + HRESULT SetDocumentSequence( + [in] IXpsOMDocumentSequence *documentSequence + ); + + HRESULT GetCoreProperties( + [out, retval] IXpsOMCoreProperties **coreProperties + ); + + HRESULT SetCoreProperties( + [in] IXpsOMCoreProperties *coreProperties + ); + + HRESULT GetDiscardControlPartName( + [out, retval] IOpcPartUri **discardControlPartUri + ); + + HRESULT SetDiscardControlPartName( + [in] IOpcPartUri *discardControlPartUri + ); + + HRESULT GetThumbnailResource( + [out, retval] IXpsOMImageResource **imageResource + ); + + HRESULT SetThumbnailResource( + [in] IXpsOMImageResource *imageResource + ); + + HRESULT WriteToFile( + [in, string] LPCWSTR fileName, + [in, unique] LPSECURITY_ATTRIBUTES securityAttributes, + [in] DWORD flagsAndAttributes, + [in] BOOL optimizeMarkupSize + ); + + HRESULT WriteToStream( + [in] ISequentialStream *stream, + [in] BOOL optimizeMarkupSize + ); +} + +[ + object, + local, + pointer_default(ref), + uuid(f9b2a685-a50d-4fc2-b764-b56e093ea0ca), +] +interface IXpsOMObjectFactory : IUnknown +{ + HRESULT CreatePackage( + [out, retval] IXpsOMPackage **package + ); + + HRESULT CreatePackageFromFile( + [in, string] LPCWSTR filename, + [in] BOOL reuseObjects, + [out, retval] IXpsOMPackage **package + ); + + HRESULT CreatePackageFromStream( + [in] IStream *stream, + [in] BOOL reuseObjects, + [out, retval] IXpsOMPackage **package + ); + + HRESULT CreateStoryFragmentsResource( + [in] IStream *acquiredStream, + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMStoryFragmentsResource **storyFragmentsResource + ); + + HRESULT CreateDocumentStructureResource( + [in] IStream *acquiredStream, + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMDocumentStructureResource **documentStructureResource + ); + + HRESULT CreateSignatureBlockResource( + [in] IStream *acquiredStream, + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMSignatureBlockResource **signatureBlockResource + ); + + HRESULT CreateRemoteDictionaryResource( + [in] IXpsOMDictionary *dictionary, + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMRemoteDictionaryResource **remoteDictionaryResource + ); + + HRESULT CreateRemoteDictionaryResourceFromStream( + [in] IStream *dictionaryMarkupStream, + [in] IOpcPartUri *dictionaryPartUri, + [in] IXpsOMPartResources *resources, + [out, retval] IXpsOMRemoteDictionaryResource **dictionaryResource + ); + + HRESULT CreatePartResources( + [out, retval] IXpsOMPartResources **partResources + ); + + HRESULT CreateDocumentSequence( + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMDocumentSequence **documentSequence + ); + + HRESULT CreateDocument( + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMDocument **document + ); + + HRESULT CreatePageReference( + [in] const XPS_SIZE *advisoryPageDimensions, + [out, retval] IXpsOMPageReference **pageReference + ); + + HRESULT CreatePage( + [in] const XPS_SIZE *pageDimensions, + [in, string] LPCWSTR language, + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMPage **page + ); + + HRESULT CreatePageFromStream( + [in] IStream *pageMarkupStream, + [in] IOpcPartUri *partUri, + [in] IXpsOMPartResources *resources, + [in] BOOL reuseObjects, + [out, retval] IXpsOMPage **page + ); + + HRESULT CreateCanvas( + [out, retval] IXpsOMCanvas **canvas + ); + + HRESULT CreateGlyphs( + [in] IXpsOMFontResource *fontResource, + [out, retval] IXpsOMGlyphs **glyphs + ); + + HRESULT CreatePath( + [out, retval] IXpsOMPath **path + ); + + HRESULT CreateGeometry( + [out, retval] IXpsOMGeometry **geometry + ); + + HRESULT CreateGeometryFigure( + [in] const XPS_POINT *startPoint, + [out, retval] IXpsOMGeometryFigure **figure + ); + + HRESULT CreateMatrixTransform( + [in] const XPS_MATRIX *matrix, + [out, retval] IXpsOMMatrixTransform **transform + ); + + HRESULT CreateSolidColorBrush( + [in] const XPS_COLOR *color, + [in] IXpsOMColorProfileResource *colorProfile, + [out, retval] IXpsOMSolidColorBrush **solidColorBrush + ); + + HRESULT CreateColorProfileResource( + [in] IStream *acquiredStream, + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMColorProfileResource **colorProfileResource + ); + + HRESULT CreateImageBrush( + [in] IXpsOMImageResource *image, + [in] const XPS_RECT *viewBox, + [in] const XPS_RECT *viewPort, + [out, retval] IXpsOMImageBrush **imageBrush + ); + + HRESULT CreateVisualBrush( + [in] const XPS_RECT *viewBox, + [in] const XPS_RECT *viewPort, + [out, retval] IXpsOMVisualBrush **visualBrush + ); + + HRESULT CreateImageResource( + [in] IStream *acquiredStream, + [in] XPS_IMAGE_TYPE contentType, + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMImageResource **imageResource + ); + + HRESULT CreatePrintTicketResource( + [in] IStream *acquiredStream, + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMPrintTicketResource **printTicketResource + ); + + HRESULT CreateFontResource( + [in] IStream *acquiredStream, + [in] XPS_FONT_EMBEDDING fontEmbedding, + [in] IOpcPartUri *partUri, + [in] BOOL isObfSourceStream, + [out, retval] IXpsOMFontResource **fontResource + ); + + HRESULT CreateGradientStop( + [in] const XPS_COLOR *color, + [in] IXpsOMColorProfileResource *colorProfile, + [in] FLOAT offset, + [out, retval] IXpsOMGradientStop **gradientStop + ); + + HRESULT CreateLinearGradientBrush( + [in] IXpsOMGradientStop *gradStop1, + [in] IXpsOMGradientStop *gradStop2, + [in] const XPS_POINT *startPoint, + [in] const XPS_POINT *endPoint, + [out, retval] IXpsOMLinearGradientBrush **linearGradientBrush + ); + + HRESULT CreateRadialGradientBrush + ( + [in] IXpsOMGradientStop *gradStop1, + [in] IXpsOMGradientStop *gradStop2, + [in] const XPS_POINT *centerPoint, + [in] const XPS_POINT *gradientOrigin, + [in] const XPS_SIZE *radiiSizes, + [out, retval] IXpsOMRadialGradientBrush **radialGradientBrush + ); + + HRESULT CreateCoreProperties( + [in] IOpcPartUri *partUri, + [out, retval] IXpsOMCoreProperties **coreProperties + ); + + HRESULT CreateDictionary( + [out, retval] IXpsOMDictionary **dictionary + ); + + HRESULT CreatePartUriCollection( + [out, retval] IXpsOMPartUriCollection **partUriCollection + ); + + HRESULT CreatePackageWriterOnFile( + [in, string] LPCWSTR fileName, + [in, unique] LPSECURITY_ATTRIBUTES securityAttributes, + [in] DWORD flagsAndAttributes, + [in] BOOL optimizeMarkupSize, + [in] XPS_INTERLEAVING interleaving, + [in] IOpcPartUri *documentSequencePartName, + [in] IXpsOMCoreProperties *coreProperties, + [in] IXpsOMImageResource *packageThumbnail, + [in] IXpsOMPrintTicketResource *documentSequencePrintTicket, + [in] IOpcPartUri *discardControlPartName, + [out, retval] IXpsOMPackageWriter **packageWriter + ); + + HRESULT CreatePackageWriterOnStream + ( + [in] ISequentialStream *outputStream, + [in] BOOL optimizeMarkupSize, + [in] XPS_INTERLEAVING interleaving, + [in] IOpcPartUri *documentSequencePartName, + [in] IXpsOMCoreProperties *coreProperties, + [in] IXpsOMImageResource *packageThumbnail, + [in] IXpsOMPrintTicketResource *documentSequencePrintTicket, + [in] IOpcPartUri *discardControlPartName, + [out, retval] IXpsOMPackageWriter **packageWriter + ); + + HRESULT CreatePartUri( + [in, string] LPCWSTR uri, + [out, retval] IOpcPartUri **partUri + ); + + HRESULT CreateReadOnlyStreamOnFile( + [in, string] LPCWSTR filename, + [out, retval] IStream **stream + ); +} + +[ + object, + uuid(4e2aa182-a443-42c6-b41b-4f8e9de73ff9) +] +interface IXpsOMPackageWriter : IUnknown +{ + HRESULT StartNewDocument( + [in] IOpcPartUri *documentPartName, + [in] IXpsOMPrintTicketResource *documentPrintTicket, + [in] IXpsOMDocumentStructureResource *documentStructure, + [in] IXpsOMSignatureBlockResourceCollection *signatureBlockResources, + [in] IXpsOMPartUriCollection *restrictedFonts + ); + + HRESULT AddPage( + [in] IXpsOMPage *page, + [in] const XPS_SIZE *advisoryPageDimensions, + [in] IXpsOMPartUriCollection *discardableResourceParts, + [in] IXpsOMStoryFragmentsResource *storyFragments, + [in] IXpsOMPrintTicketResource *pagePrintTicket, + [in] IXpsOMImageResource *pageThumbnail + ); + + HRESULT AddResource( + [in] IXpsOMResource *resource + ); + + HRESULT Close(); + + HRESULT IsClosed( + [out, retval] BOOL *isClosed + ); +} + +[ + uuid(b47491a0-cf33-4fe4-9a48-b0acdae207e8) +] +library MSXPS +{ +[ + uuid(e974d26d-3d9b-4d47-88cc-3872f2dc3585) +] +coclass XpsOMObjectFactory +{ + interface IXpsOMObjectFactory; +} + +} diff --git a/include/xpsobjectmodel_1.idl b/include/xpsobjectmodel_1.idl new file mode 100644 index 00000000000..f10ffeb81a0 --- /dev/null +++ b/include/xpsobjectmodel_1.idl @@ -0,0 +1,49 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +import "xpsobjectmodel.idl"; + +typedef [v1_enum] enum +{ + XPS_DOCUMENT_TYPE_UNSPECIFIED = 1, + XPS_DOCUMENT_TYPE_XPS, + XPS_DOCUMENT_TYPE_OPENXPS +} XPS_DOCUMENT_TYPE; + +[ + object, + local, + pointer_default(ref), + uuid(3b0b6d38-53ad-41da-b212-d37637a6714e), +] +interface IXpsDocumentPackageTarget : IUnknown +{ + HRESULT GetXpsOMPackageWriter( + [in] IOpcPartUri *documentpart, + [in] IOpcPartUri *controlpart, + [out, retval] IXpsOMPackageWriter **writer + ); + + HRESULT GetXpsOMFactory( + [out, retval] IXpsOMObjectFactory **factory + ); + + HRESULT GetXpsType( + [out, retval] XPS_DOCUMENT_TYPE *document_type + ); +} -- 2.33.0

1 0

[PATCH] include: Add document target ids.
by Nikolay Sivov Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/documenttarget.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/documenttarget.idl b/include/documenttarget.idl index 17c7cefe5b5..a1cbbd939f4 100644 --- a/include/documenttarget.idl +++ b/include/documenttarget.idl @@ -111,3 +111,7 @@ coclass PrintDocumentPackageTargetFactory } } /* library */ + +cpp_quote("DEFINE_GUID(ID_DOCUMENTPACKAGETARGET_MSXPS, 0x9cae40a8, 0xded1, 0x41c9, 0xa9, 0xfd, 0xd7, 0x35, 0xef, 0x33, 0xae, 0xda);") +cpp_quote("DEFINE_GUID(ID_DOCUMENTPACKAGETARGET_OPENXPS, 0x0056bb72, 0x8c9c, 0x4612, 0xbd, 0x0f, 0x93, 0x01, 0x2a, 0x87, 0x09, 0x9d);") +cpp_quote("DEFINE_GUID(ID_DOCUMENTPACKAGETARGET_OPENXPS_WITH_3D, 0x63dbd720, 0x8b14, 0x4577, 0xb0, 0x74, 0x7b, 0xb1, 0x1b, 0x59, 0x6d, 0x28);") -- 2.33.0

1 0

[PATCH] advapi32/tests: Accept more broken values in the RegEnumValue name overflow tests
by Alex Henrie Dec. 10, 2021

Dec. 10, 2021

Fixes several intermittent testbot failures. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I have observed the values 8, 11, 12, and 13 on the testbot, always on Chinese, Japanese, or Korean Windows 10 machines, but with no consistent pattern. --- dlls/advapi32/tests/registry.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d09fe9a4add..c4f63c6cd27 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -548,12 +548,13 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 3, "val_count set to %d\n", val_count ); - ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); + /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count == 8 ), + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow empty name */ @@ -565,11 +566,12 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 0, "val_count set to %d\n", val_count ); - ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); + /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count == 8 ), + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow data */ -- 2.34.1

1 0

[PATCH 01/11] ntdll: Do not fill the IOSB in NtDeviceIoControlFile() if the NT status denotes error.
by Zebediah Figura Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 2 +- dlls/ws2_32/tests/afd.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e459087af76..51c92df57e3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5735,7 +5735,7 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT return server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - if (status != STATUS_PENDING) io->u.Status = status; + if (status != STATUS_PENDING && !NT_ERROR(status)) io->u.Status = status; return status; } diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9e888f1fcb9..17126fbdf7e 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1201,7 +1201,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); todo_wine ok(ret == STATUS_INVALID_CONNECTION, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -1213,7 +1213,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); wsabufs[0].len = sizeof(buffer); @@ -1301,7 +1301,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_DEVICE_NOT_READY, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); ret = send(server, "data", 5, 0); @@ -1368,7 +1368,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB | AFD_MSG_NOT_OOB; @@ -1376,7 +1376,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB; -- 2.34.1

2 14