April 2021 - Wine-Commits - list.winehq.org

Hans Leidekker : kerberos: Move support for SpSealMessage to the Unix library.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 9120045653eab18136f92a80b11ea994c0399e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9120045653eab18136f92a80… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:28 2021 +0200 kerberos: Move support for SpSealMessage to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 107 +----------------------------------------------- dlls/kerberos/unixlib.c | 102 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 104 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9120045653eab18136f9…

1 0

Hans Leidekker : kerberos: Move support for SpQueryContextAttributes to the Unix library.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: ed517857444df621e9f2137119c48d787a216e72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed517857444df621e9f21371… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:27 2021 +0200 kerberos: Move support for SpQueryContextAttributes to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 18 +----------------- dlls/kerberos/unixlib.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 3 +++ 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index f3cbf34ee81..61833b4e040 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -927,23 +927,7 @@ static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, X(SECPKG_ATTR_TARGET_INFORMATION); case SECPKG_ATTR_SIZES: { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buffer; - ULONG size_max_signature = 37, size_security_trailer = 49; -#ifdef SONAME_LIBGSSAPI_KRB5 - gss_ctx_id_t ctxt_handle; - - if (!(ctxt_handle = ctxthandle_sspi_to_gss( context ))) return SEC_E_INVALID_HANDLE; - if (is_dce_style_context( ctxt_handle )) - { - size_max_signature = 28; - size_security_trailer = 76; - } -#endif - sizes->cbMaxToken = KERBEROS_MAX_BUF; - sizes->cbMaxSignature = size_max_signature; - sizes->cbBlockSize = 1; - sizes->cbSecurityTrailer = size_security_trailer; - return SEC_E_OK; + return krb5_funcs->query_context_attributes( context, attribute, buffer ); } case SECPKG_ATTR_NEGOTIATION_INFO: { diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 06f0ffc8a04..34da8460406 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -211,6 +211,13 @@ fail: return FALSE; } +static BOOL is_dce_style_context( gss_ctx_id_t ctx ) +{ + OM_uint32 ret, minor_status, flags; + ret = pgss_inquire_context( &minor_status, ctx, NULL, NULL, NULL, NULL, &flags, NULL, NULL ); + return (ret == GSS_S_COMPLETE && (flags & GSS_C_DCE_STYLE)); +} + static int get_buffer_index( SecBufferDesc *desc, DWORD type ) { UINT i; @@ -587,6 +594,45 @@ static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg return status_gss_to_sspi( ret ); } +#define KERBEROS_MAX_SIGNATURE 37 +#define KERBEROS_SECURITY_TRAILER 49 +#define KERBEROS_MAX_SIGNATURE_DCE 28 +#define KERBEROS_SECURITY_TRAILER_DCE 76 + +static NTSTATUS CDECL query_context_attributes( LSA_SEC_HANDLE context, ULONG attr, void *buf ) +{ + switch (attr) + { + case SECPKG_ATTR_SIZES: + { + SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buf; + ULONG size_max_signature, size_security_trailer; + gss_ctx_id_t ctx = ctxhandle_sspi_to_gss( context ); + + if (is_dce_style_context( ctx )) + { + size_max_signature = KERBEROS_MAX_SIGNATURE_DCE; + size_security_trailer = KERBEROS_SECURITY_TRAILER_DCE; + } + else + { + size_max_signature = KERBEROS_MAX_SIGNATURE; + size_security_trailer = KERBEROS_SECURITY_TRAILER; + } + sizes->cbMaxToken = KERBEROS_MAX_BUF; + sizes->cbMaxSignature = size_max_signature; + sizes->cbBlockSize = 1; + sizes->cbSecurityTrailer = size_security_trailer; + return SEC_E_OK; + } + default: + FIXME( "unhandled attribute %u\n", attr ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static NTSTATUS CDECL verify_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop ) { OM_uint32 ret, minor_status; @@ -618,6 +664,7 @@ static const struct krb5_funcs funcs = free_credentials_handle, initialize_context, make_signature, + query_context_attributes, verify_signature, }; diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 6a73444aae8..8fd562a28d7 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define KERBEROS_MAX_BUF 12000 + struct krb5_funcs { NTSTATUS (CDECL *accept_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, SecBufferDesc *, LSA_SEC_HANDLE *, @@ -30,6 +32,7 @@ struct krb5_funcs NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); + NTSTATUS (CDECL *query_context_attributes)(LSA_SEC_HANDLE, ULONG, void *); NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); };

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: af1016ca59454782ab5ebdbc6e2ee365f3cf0531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af1016ca59454782ab5ebdbc… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 21 09:20:16 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index f7d9e48c687..689e63aacd1 100644 --- a/po/lt.po +++ b/po/lt.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-04-09 19:27+0300\n" +"PO-Revision-Date: 2021-04-21 09:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14685,10 +14685,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Netinkamas sisteminis raktas [%1]\n" +msgstr "reg: Netinkamas sisteminis raktas\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?"

1 0

Zebediah Figura : xactengine2_0: New DLL.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: d01f636bb8b484ffc956b19b6bf574c4b1477e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01f636bb8b484ffc956b19b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 20 22:26:11 2021 -0500 xactengine2_0: New DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41048 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 + configure.ac | 2 + dlls/xactengine2_0/Makefile.in | 11 ++++ dlls/xactengine2_0/xactengine2_0.spec | 4 ++ dlls/xactengine3_7/xact_classes.idl | 4 +- dlls/xactengine3_7/xact_dll.c | 115 ++++++++++++++++++++++++++++++++-- 6 files changed, 132 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d01f636bb8b484ffc956…

1 0

Hans Leidekker : kerberos: Build with msvcrt.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 455e37850be14a45c3cf38075e8ad6e81e3863b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=455e37850be14a45c3cf3807… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:31 2021 +0200 kerberos: Build with msvcrt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/Makefile.in | 2 ++ dlls/kerberos/krb5_ap.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/Makefile.in b/dlls/kerberos/Makefile.in index ab5e6b59976..acfd9030955 100644 --- a/dlls/kerberos/Makefile.in +++ b/dlls/kerberos/Makefile.in @@ -1,6 +1,8 @@ MODULE = kerberos.dll EXTRAINCL = $(KRB5_CFLAGS) $(GSSAPI_CFLAGS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ krb5_ap.c \ unixlib.c diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 792ee974983..6e3135a9f02 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -34,7 +34,6 @@ #include "winternl.h" #include "wine/heap.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(kerberos); @@ -397,8 +396,8 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) { SecPkgInfoW *ret; - DWORD size_name = (strlenW(info->Name) + 1) * sizeof(WCHAR); - DWORD size_comment = (strlenW(info->Comment) + 1) * sizeof(WCHAR); + DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR); if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; ret->fCapabilities = info->fCapabilities;

1 0

Alexandre Julliard : ntdll: Support a full path name in the loadFrom dll redirection entry.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 1cf2ae1907e2e9cbaea2b1d92c9e72000bb76912 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf2ae1907e2e9cbaea2b1d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 08:55:38 2021 +0200 ntdll: Support a full path name in the loadFrom dll redirection entry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50978 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4a5422b52ac..9f614db01c5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2451,7 +2451,8 @@ static NTSTATUS build_dlldata_path( LPCWSTR libname, ACTCTX_SECTION_KEYED_DATA * memcpy( p, base + dlldata->paths[i].offset, dlldata->paths[i].len ); p += dlldata->paths[i].len / sizeof(WCHAR); } - wcscpy( p, libname ); + if (p == buffer || p[-1] == '\\') wcscpy( p, libname ); + else *p = 0; if (dlldata->flags & DLL_REDIRECT_PATH_EXPAND) {

1 0

Francois Gouget : winetest: Provide more detailed status information on index pages.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: tools Branch: master Commit: 6654181dcb5547849ec2f12f01d34d94a2322cad URL: https://source.winehq.org/git/tools.git/?a=commit;h=6654181dcb5547849ec2f12… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 16:26:43 2021 +0200 winetest: Provide more detailed status information on index pages. This requires dissect to store more detailed status information in the summary.txt file. Then gather can convert these into more specific cell labels and descriptions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 43 ++++++++++++++++++++++---- winetest/gather | 91 +++++++++++++++++++++++++++++++++++++------------------- 2 files changed, 98 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=6654181dcb5547849ec…

1 0

Francois Gouget : winetest/gather: Simplify the result status to cell label conversion.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: tools Branch: master Commit: d260ee7c3a64a10560b61744e2b4a8e96f6a86fb URL: https://source.winehq.org/git/tools.git/?a=commit;h=d260ee7c3a64a10560b6174… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 16:26:39 2021 +0200 winetest/gather: Simplify the result status to cell label conversion. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/winetest/gather b/winetest/gather index a3a0a65..456fa0b 100755 --- a/winetest/gather +++ b/winetest/gather @@ -735,30 +735,18 @@ sub singletest($$$) { !$result->{errors}->[1] ? $result->{todos}->[1] : "$result->{errors}->[1]+$result->{todos}->[1]"; } - elsif ($status eq "dll missing") - { - $msg = "n/a"; - } - elsif ($status eq "filelimit") - { - $msg = "truncated"; - } - elsif ($status eq "missing") - { - $msg = "not run"; - } - elsif ($status eq "skipped") - { - $msg = "skipped"; - } - elsif ($status eq "mixed") - { - $msg = "mixed"; - } else { - $msg = $status eq "crash" ? "crashed" : - $status eq "258" ? "timeout": "failed"; + my %status2label = ( + missing => "not run", + "dll missing" => "n/a", + skipped => "skipped", + crash => "crashed", + 258 => "timeout", + mixed => "mixed", + filelimit => "truncated", + ); + $msg = $status2label{$status} || "failed"; } $title = join(" | ", $prefix, $title); printf OUT " <td class=\"%s\"><a %s %s>%s</a></td>\n",

1 0

Zhiyi Zhang : include: Add META_SETLAYOUT definition.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: wine Branch: master Commit: 91c9393b7f1c81bbec9c63272348d97116cdba04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c9393b7f1c81bbec9c6327… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 19 15:17:39 2021 +0800 include: Add META_SETLAYOUT definition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/wingdi.h b/include/wingdi.h index d989fb6f71b..c10d7518337 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -2125,6 +2125,7 @@ typedef struct #define META_ENDPAGE 0x0050 #define META_ABORTDOC 0x0052 #define META_ENDDOC 0x005E +#define META_SETLAYOUT 0x0149 #define META_DELETEOBJECT 0x01F0 #define META_CREATEPALETTE 0x00F7 #define META_CREATEBRUSH 0x00F8

1 0

Zhiyi Zhang : winedump: Support dumping Windows Metafiles.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: wine Branch: master Commit: 788fd4ee44fc9877b01888fdd3cd72b9ac88228e URL: https://source.winehq.org/git/wine.git/?a=commit;h=788fd4ee44fc9877b01888fd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 19 15:17:48 2021 +0800 winedump: Support dumping Windows Metafiles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/Makefile.in | 1 + tools/winedump/dump.c | 1 + tools/winedump/mf.c | 219 +++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 4 +- 4 files changed, 224 insertions(+), 1 deletion(-) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 43e200ab6ed..54028024b0d 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ lib.c \ lnk.c \ main.c \ + mf.c \ minidump.c \ misc.c \ msc.c \ diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 412880c4bd6..d2e920ef6cb 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -265,6 +265,7 @@ dumpers[] = {SIG_MDMP, get_kind_mdmp, mdmp_dump}, {SIG_LNK, get_kind_lnk, lnk_dump}, {SIG_EMF, get_kind_emf, emf_dump}, + {SIG_MF, get_kind_mf, mf_dump}, {SIG_FNT, get_kind_fnt, fnt_dump}, {SIG_TLB, get_kind_tlb, tlb_dump}, {SIG_NLS, get_kind_nls, nls_dump}, diff --git a/tools/winedump/mf.c b/tools/winedump/mf.c new file mode 100644 index 00000000000..37869d3bb8a --- /dev/null +++ b/tools/winedump/mf.c @@ -0,0 +1,219 @@ +/* + * Dump a Windows Metafile + * + * Copyright 2021 Zhiyi Zhang 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 + */ + +#include "config.h" +#include "wine/port.h" +#include "winedump.h" + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" + +#define META_EOF 0 +#define METAFILE_MEMORY 1 +#define METAFILE_DISK 2 + +static unsigned offset = 0; + +static unsigned short read_word(const unsigned char *buffer) +{ + return buffer[0] + (buffer[1] << 8); +} + +static unsigned int read_int(const unsigned char *buffer) +{ + return buffer[0] + (buffer[1] << 8) + (buffer[2] << 16) + (buffer[3] << 24); +} + +static int dump_mfrecord(void) +{ + unsigned int type, size, i; + const unsigned char *ptr; + + ptr = PRD(offset, 6); + if (!ptr) + return -1; + + /* METAHEADER */ + if (offset == 0) + { + type = read_word(ptr); + /* mtHeaderSize is in words */ + size = read_word(ptr + 2) * 2; + } + /* METARECORD */ + else + { + /* rdSize is in words */ + size = read_int(ptr) * 2; + type = read_word(ptr + 4); + } + +#define MRCASE(x) \ + case x: \ + printf("%-20s %08x\n", #x, size); \ + break + + switch (type) + { + case METAFILE_MEMORY: + case METAFILE_DISK: + { + const METAHEADER *header = PRD(offset, sizeof(*header)); + + printf("%-20s %08x\n", "METAHEADER", size); + printf("type %d header_size %#x version %#x size %#x object_count %d max_record_size %#x " + "parameter_count %d\n", + header->mtType, header->mtHeaderSize * 2, header->mtVersion, header->mtSize * 2, + header->mtNoObjects, header->mtMaxRecord * 2, header->mtNoParameters); + break; + } + MRCASE(META_SETBKCOLOR); + MRCASE(META_SETBKMODE); + MRCASE(META_SETMAPMODE); + MRCASE(META_SETROP2); + MRCASE(META_SETRELABS); + MRCASE(META_SETPOLYFILLMODE); + MRCASE(META_SETSTRETCHBLTMODE); + MRCASE(META_SETTEXTCHAREXTRA); + MRCASE(META_SETTEXTCOLOR); + MRCASE(META_SETTEXTJUSTIFICATION); + MRCASE(META_SETWINDOWORG); + MRCASE(META_SETWINDOWEXT); + MRCASE(META_SETVIEWPORTORG); + MRCASE(META_SETVIEWPORTEXT); + MRCASE(META_OFFSETWINDOWORG); + MRCASE(META_SCALEWINDOWEXT); + MRCASE(META_OFFSETVIEWPORTORG); + MRCASE(META_SCALEVIEWPORTEXT); + MRCASE(META_LINETO); + MRCASE(META_MOVETO); + MRCASE(META_EXCLUDECLIPRECT); + MRCASE(META_INTERSECTCLIPRECT); + MRCASE(META_ARC); + MRCASE(META_ELLIPSE); + MRCASE(META_FLOODFILL); + MRCASE(META_PIE); + MRCASE(META_RECTANGLE); + MRCASE(META_ROUNDRECT); + MRCASE(META_PATBLT); + MRCASE(META_SAVEDC); + MRCASE(META_SETPIXEL); + MRCASE(META_OFFSETCLIPRGN); + MRCASE(META_TEXTOUT); + MRCASE(META_BITBLT); + MRCASE(META_STRETCHBLT); + MRCASE(META_POLYGON); + MRCASE(META_POLYLINE); + MRCASE(META_ESCAPE); + MRCASE(META_RESTOREDC); + MRCASE(META_FILLREGION); + MRCASE(META_FRAMEREGION); + MRCASE(META_INVERTREGION); + MRCASE(META_PAINTREGION); + MRCASE(META_SELECTCLIPREGION); + MRCASE(META_SELECTOBJECT); + MRCASE(META_SETTEXTALIGN); + MRCASE(META_DRAWTEXT); + MRCASE(META_CHORD); + MRCASE(META_SETMAPPERFLAGS); + MRCASE(META_EXTTEXTOUT); + MRCASE(META_SETDIBTODEV); + MRCASE(META_SELECTPALETTE); + MRCASE(META_REALIZEPALETTE); + MRCASE(META_ANIMATEPALETTE); + MRCASE(META_SETPALENTRIES); + MRCASE(META_POLYPOLYGON); + MRCASE(META_RESIZEPALETTE); + MRCASE(META_DIBBITBLT); + MRCASE(META_DIBSTRETCHBLT); + MRCASE(META_DIBCREATEPATTERNBRUSH); + MRCASE(META_STRETCHDIB); + MRCASE(META_EXTFLOODFILL); + MRCASE(META_RESETDC); + MRCASE(META_STARTDOC); + MRCASE(META_STARTPAGE); + MRCASE(META_ENDPAGE); + MRCASE(META_ABORTDOC); + MRCASE(META_ENDDOC); + MRCASE(META_SETLAYOUT); + MRCASE(META_DELETEOBJECT); + MRCASE(META_CREATEPALETTE); + MRCASE(META_CREATEBRUSH); + MRCASE(META_CREATEPATTERNBRUSH); + MRCASE(META_CREATEPENINDIRECT); + MRCASE(META_CREATEFONTINDIRECT); + MRCASE(META_CREATEBRUSHINDIRECT); + MRCASE(META_CREATEBITMAPINDIRECT); + MRCASE(META_CREATEBITMAP); + MRCASE(META_CREATEREGION); + MRCASE(META_UNKNOWN); + MRCASE(META_EOF); + + default: + printf("%u %08x\n", type, size); + break; + } + +#undef MRCASE + + if ((size < 6) || (size % 2)) + return -1; + + /* METARECORD */ + if (offset) + { + size -= 6; + offset += 6; + } + + for (i = 0; i < size; i += 2) + { + if (i % 16 == 0) + printf(" "); + if (!(ptr = PRD(offset, 2))) + return -1; + offset += 2; + printf("%04x ", read_word(ptr)); + if ((i % 16 == 14) || (i + 2 == size)) + printf("\n"); + } + + return 0; +} + +enum FileSig get_kind_mf(void) +{ + const METAHEADER *hdr; + + hdr = PRD(0, sizeof(*hdr)); + if (hdr && (hdr->mtType == METAFILE_MEMORY || hdr->mtType == METAFILE_DISK) + && hdr->mtHeaderSize == sizeof(METAHEADER) / sizeof(WORD) + && (hdr->mtVersion == 0x0100 || hdr->mtVersion == 0x0300)) + return SIG_MF; + return SIG_UNKNOWN; +} + +void mf_dump(void) +{ + offset = 0; + while (!dump_mfrecord()) + ; +} diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 240f31d2f2d..16b9cdc7cf8 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -216,7 +216,7 @@ const char *get_machine_str(int mach); /* file dumping functions */ enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, - SIG_EMF, SIG_FNT, SIG_TLB, SIG_NLS}; + SIG_EMF, SIG_MF, SIG_FNT, SIG_TLB, SIG_NLS}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -251,6 +251,8 @@ enum FileSig get_kind_lnk(void); void lnk_dump( void ); enum FileSig get_kind_emf(void); void emf_dump( void ); +enum FileSig get_kind_mf(void); +void mf_dump(void); enum FileSig get_kind_pdb(void); void pdb_dump(void); enum FileSig get_kind_fnt(void);

1 0