wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 21 Apr '21

21 Apr '21

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_9: New DLL.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 9e44c3556dedf7f55cefcd7140e1e54f6141b032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e44c3556dedf7f55cefcd71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 20 22:26:14 2021 -0500 xactengine2_9: New DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41468 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_9/Makefile.in | 11 +++++++++++ dlls/xactengine2_9/xactengine2_9.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 2 ++ 5 files changed, 22 insertions(+) diff --git a/configure b/configure index 30c403dfea9..39639235469 100755 --- a/configure +++ b/configure @@ -1730,6 +1730,7 @@ enable_x3daudio1_7 enable_xactengine2_0 enable_xactengine2_4 enable_xactengine2_7 +enable_xactengine2_9 enable_xactengine3_0 enable_xactengine3_1 enable_xactengine3_2 @@ -16441,6 +16442,7 @@ then enable_xactengine2_0=${enable_xactengine2_0:-no} enable_xactengine2_4=${enable_xactengine2_4:-no} enable_xactengine2_7=${enable_xactengine2_7:-no} + enable_xactengine2_9=${enable_xactengine2_9:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -21228,6 +21230,7 @@ wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 wine_fn_config_makefile dlls/xactengine2_0 enable_xactengine2_0 wine_fn_config_makefile dlls/xactengine2_4 enable_xactengine2_4 wine_fn_config_makefile dlls/xactengine2_7 enable_xactengine2_7 +wine_fn_config_makefile dlls/xactengine2_9 enable_xactengine2_9 wine_fn_config_makefile dlls/xactengine3_0 enable_xactengine3_0 wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 diff --git a/configure.ac b/configure.ac index 2564fd17b42..797f8cfbbbf 100644 --- a/configure.ac +++ b/configure.ac @@ -1918,6 +1918,7 @@ then enable_xactengine2_0=${enable_xactengine2_0:-no} enable_xactengine2_4=${enable_xactengine2_4:-no} enable_xactengine2_7=${enable_xactengine2_7:-no} + enable_xactengine2_9=${enable_xactengine2_9:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -3897,6 +3898,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) WINE_CONFIG_MAKEFILE(dlls/xactengine2_0) WINE_CONFIG_MAKEFILE(dlls/xactengine2_4) WINE_CONFIG_MAKEFILE(dlls/xactengine2_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine2_9) WINE_CONFIG_MAKEFILE(dlls/xactengine3_0) WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) diff --git a/dlls/xactengine2_9/Makefile.in b/dlls/xactengine2_9/Makefile.in new file mode 100644 index 00000000000..eae7c26b9fb --- /dev/null +++ b/dlls/xactengine2_9/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine2_9.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0209 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine2_9/xactengine2_9.spec b/dlls/xactengine2_9/xactengine2_9.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine2_9/xactengine2_9.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 077f64a78e1..f978c05d18e 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -28,6 +28,8 @@ uuid(bc3e0fc6-2e0d-4c45-bc61-d9c328319bd8) #elif XACT3_VER == 0x0207 uuid(cd0d66ec-8057-43f5-acbd-66dfb36fd78c) +#elif XACT3_VER == 0x0209 + uuid(343e68e6-8f82-4a8d-a2da-6e9a944b378c) #elif XACT3_VER == 0x0300 uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) #elif XACT3_VER == 0x0301

1 0

Zebediah Figura : xactengine2_7: New DLL.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: b3b318b3c0c53a405cae294b03a4e32612e2e43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b318b3c0c53a405cae294b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 20 22:26:13 2021 -0500 xactengine2_7: New DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49668 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_7/Makefile.in | 11 +++++++++++ dlls/xactengine2_7/xactengine2_7.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 2 ++ 5 files changed, 22 insertions(+) diff --git a/configure b/configure index 611901c092b..30c403dfea9 100755 --- a/configure +++ b/configure @@ -1729,6 +1729,7 @@ enable_x3daudio1_6 enable_x3daudio1_7 enable_xactengine2_0 enable_xactengine2_4 +enable_xactengine2_7 enable_xactengine3_0 enable_xactengine3_1 enable_xactengine3_2 @@ -16439,6 +16440,7 @@ then enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xactengine2_0=${enable_xactengine2_0:-no} enable_xactengine2_4=${enable_xactengine2_4:-no} + enable_xactengine2_7=${enable_xactengine2_7:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -21225,6 +21227,7 @@ wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 wine_fn_config_makefile dlls/xactengine2_0 enable_xactengine2_0 wine_fn_config_makefile dlls/xactengine2_4 enable_xactengine2_4 +wine_fn_config_makefile dlls/xactengine2_7 enable_xactengine2_7 wine_fn_config_makefile dlls/xactengine3_0 enable_xactengine3_0 wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 diff --git a/configure.ac b/configure.ac index f6c241e3c19..2564fd17b42 100644 --- a/configure.ac +++ b/configure.ac @@ -1917,6 +1917,7 @@ then enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xactengine2_0=${enable_xactengine2_0:-no} enable_xactengine2_4=${enable_xactengine2_4:-no} + enable_xactengine2_7=${enable_xactengine2_7:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -3895,6 +3896,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) WINE_CONFIG_MAKEFILE(dlls/xactengine2_0) WINE_CONFIG_MAKEFILE(dlls/xactengine2_4) +WINE_CONFIG_MAKEFILE(dlls/xactengine2_7) WINE_CONFIG_MAKEFILE(dlls/xactengine3_0) WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) diff --git a/dlls/xactengine2_7/Makefile.in b/dlls/xactengine2_7/Makefile.in new file mode 100644 index 00000000000..8807677e44a --- /dev/null +++ b/dlls/xactengine2_7/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine2_7.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0207 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine2_7/xactengine2_7.spec b/dlls/xactengine2_7/xactengine2_7.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine2_7/xactengine2_7.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 72de1cf302d..077f64a78e1 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -26,6 +26,8 @@ uuid(0aa000aa-f404-11d9-bd7a-0010dc4f8f81) #elif XACT3_VER == 0x0204 uuid(bc3e0fc6-2e0d-4c45-bc61-d9c328319bd8) +#elif XACT3_VER == 0x0207 + uuid(cd0d66ec-8057-43f5-acbd-66dfb36fd78c) #elif XACT3_VER == 0x0300 uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) #elif XACT3_VER == 0x0301

1 0

Zebediah Figura : xactengine2_4: New DLL.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 521d54ef381f20ca42f625d4c271e9550b918f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=521d54ef381f20ca42f625d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 20 22:26:12 2021 -0500 xactengine2_4: New DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49671 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_4/Makefile.in | 11 +++++++++++ dlls/xactengine2_4/xactengine2_4.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 2 ++ 5 files changed, 22 insertions(+) diff --git a/configure b/configure index 3330df8d56b..611901c092b 100755 --- a/configure +++ b/configure @@ -1728,6 +1728,7 @@ enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 enable_xactengine2_0 +enable_xactengine2_4 enable_xactengine3_0 enable_xactengine3_1 enable_xactengine3_2 @@ -16437,6 +16438,7 @@ then enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xactengine2_0=${enable_xactengine2_0:-no} + enable_xactengine2_4=${enable_xactengine2_4:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -21222,6 +21224,7 @@ wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 wine_fn_config_makefile dlls/xactengine2_0 enable_xactengine2_0 +wine_fn_config_makefile dlls/xactengine2_4 enable_xactengine2_4 wine_fn_config_makefile dlls/xactengine3_0 enable_xactengine3_0 wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 diff --git a/configure.ac b/configure.ac index c0125716a0a..f6c241e3c19 100644 --- a/configure.ac +++ b/configure.ac @@ -1916,6 +1916,7 @@ then enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xactengine2_0=${enable_xactengine2_0:-no} + enable_xactengine2_4=${enable_xactengine2_4:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -3893,6 +3894,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) WINE_CONFIG_MAKEFILE(dlls/xactengine2_0) +WINE_CONFIG_MAKEFILE(dlls/xactengine2_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_0) WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) diff --git a/dlls/xactengine2_4/Makefile.in b/dlls/xactengine2_4/Makefile.in new file mode 100644 index 00000000000..51c7e5eb45a --- /dev/null +++ b/dlls/xactengine2_4/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine2_4.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0204 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine2_4/xactengine2_4.spec b/dlls/xactengine2_4/xactengine2_4.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine2_4/xactengine2_4.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 91a9c19ff67..72de1cf302d 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -24,6 +24,8 @@ threading(both), #if XACT3_VER == 0x0200 uuid(0aa000aa-f404-11d9-bd7a-0010dc4f8f81) +#elif XACT3_VER == 0x0204 + uuid(bc3e0fc6-2e0d-4c45-bc61-d9c328319bd8) #elif XACT3_VER == 0x0300 uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) #elif XACT3_VER == 0x0301

1 0

Zebediah Figura : xactengine2_0: New DLL.
by Alexandre Julliard 21 Apr '21

21 Apr '21

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

Alexandre Julliard : ntdll: Support a full path name in the loadFrom dll redirection entry.
by Alexandre Julliard 21 Apr '21

21 Apr '21

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 21 Apr '21

21 Apr '21

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 21 Apr '21

21 Apr '21

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 : winedump: Support dumping Windows Metafiles.
by Alexandre Julliard 20 Apr '21

20 Apr '21

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

Zhiyi Zhang : include: Add META_SETLAYOUT definition.
by Alexandre Julliard 20 Apr '21

20 Apr '21

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

← Newer
1
...
27
28
29
30
31
32
33
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021