October 2021 - Wine-commits

Rémi Bernon : winebus.sys: Prefer USAGE_AND_PAGE over BYTE arrays.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 6295af0840eb20483b00e35518216b78d7dd4c4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6295af0840eb20483b00e355… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 10:06:57 2021 +0200 winebus.sys: Prefer USAGE_AND_PAGE over BYTE arrays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 133 +++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6295af0840eb20483b00…

1 0

Rémi Bernon : winebus.sys: Count all absolute axes.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: d168f1e8e50a447b000d49580e72829858810edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d168f1e8e50a447b000d4958… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 10:06:58 2021 +0200 winebus.sys: Count all absolute axes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f0651a8e529..0ad63c4f77f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -581,10 +581,7 @@ static INT count_abs_axis(int device_fd) } for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) - if (test_bit(absbits, i) && - (absolute_usages[i].Usage >= HID_USAGE_GENERIC_X && - absolute_usages[i].Usage <= HID_USAGE_GENERIC_WHEEL)) - abs_count++; + if (test_bit(absbits, i)) abs_count++; return abs_count; }

1 0

Rémi Bernon : winebus.sys: Map REL_HWEEL to HID_USAGE_GENERIC_SLIDER.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 3453c3ea32026d29bfc87ce4506ee9b073c9f4dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3453c3ea32026d29bfc87ce4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 10:06:59 2021 +0200 winebus.sys: Map REL_HWEEL to HID_USAGE_GENERIC_SLIDER. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 0ad63c4f77f..8889b6a3e1f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -186,7 +186,7 @@ static const USAGE_AND_PAGE relative_usages[] = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, /* REL_RX */ {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, /* REL_RY */ {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, /* REL_RZ */ - {0}, /* REL_HWHEEL */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER},/* REL_HWHEEL */ {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ {0}, /* REL_MISC */

1 0

Rémi Bernon : winebus.sys: Map SDL joystick axes the same way as UDEV evdev.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 25bc9092837ace3bfd56e6f45f982d101f62c73a URL: https://source.winehq.org/git/wine.git/?a=commit;h=25bc9092837ace3bfd56e6f4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 10:27:43 2021 +0200 winebus.sys: Map SDL joystick axes the same way as UDEV evdev. And increase the arbitrary absolute axis count limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 64 ++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 403c4821f24..fe3a960649c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -227,33 +227,47 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) { - static const USAGE joystick_usages[] = + static const USAGE_AND_PAGE absolute_usages[] = { - HID_USAGE_GENERIC_X, - HID_USAGE_GENERIC_Y, - HID_USAGE_GENERIC_Z, - HID_USAGE_GENERIC_RX, - HID_USAGE_GENERIC_RY, - HID_USAGE_GENERIC_RZ, - HID_USAGE_GENERIC_SLIDER, - HID_USAGE_GENERIC_DIAL, - HID_USAGE_GENERIC_WHEEL + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, + }; + static const USAGE_AND_PAGE relative_usages[] = + { + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, }; struct sdl_device *impl = impl_from_unix_device(iface); int i, button_count, axis_count, ball_count, hat_count; axis_count = pSDL_JoystickNumAxes(impl->sdl_joystick); - if (axis_count > 6) + if (axis_count > ARRAY_SIZE(absolute_usages)) { - FIXME("Clamping joystick to 6 axis\n"); - axis_count = 6; + FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); + axis_count = ARRAY_SIZE(absolute_usages); } ball_count = pSDL_JoystickNumBalls(impl->sdl_joystick); - if (axis_count + ball_count * 2 > ARRAY_SIZE(joystick_usages)) + if (ball_count > ARRAY_SIZE(relative_usages) / 2) { - FIXME("Capping ball + axis at 9\n"); - ball_count = (ARRAY_SIZE(joystick_usages) - axis_count) / 2; + FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_usages)); + ball_count = ARRAY_SIZE(relative_usages) / 2; } hat_count = pSDL_JoystickNumHats(impl->sdl_joystick); @@ -265,13 +279,19 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) if (!hid_device_begin_input_report(iface)) return STATUS_NO_MEMORY; - if (axis_count && !hid_device_add_axes(iface, axis_count, HID_USAGE_PAGE_GENERIC, - joystick_usages, FALSE, -32768, 32767)) - return STATUS_NO_MEMORY; + for (i = 0; i < axis_count; i++) + { + if (!hid_device_add_axes(iface, 1, absolute_usages[i].UsagePage, + &absolute_usages[i].Usage, FALSE, -32768, 32767)) + return STATUS_NO_MEMORY; + } - if (ball_count && !hid_device_add_axes(iface, ball_count * 2, HID_USAGE_PAGE_GENERIC, - &joystick_usages[axis_count], TRUE, INT32_MIN, INT32_MAX)) - return STATUS_NO_MEMORY; + for (i = 0; i < ball_count; i++) + { + if (!hid_device_add_axes(iface, 2, relative_usages[2 * i].UsagePage, + &relative_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) + return STATUS_NO_MEMORY; + } if (hat_count && !hid_device_add_hatswitch(iface, hat_count)) return STATUS_NO_MEMORY;

1 0

Martin Storsjö : xslt: Build with LIBXSLT_STATIC, fix building with clang in MSVC mode.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 683b43b99623384a8805e127611405b28aa3ccdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=683b43b99623384a8805e127… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Oct 21 12:15:36 2021 +0300 xslt: Build with LIBXSLT_STATIC, fix building with clang in MSVC mode. This avoids unnecessarily embedding dllexport directives in all the object files. This also fixes building with clang in MSVC mode, as the MSVC definition of XSLTPUBVAR in xsltexports.h is lacking 'extern' when doing dllexport. (This probably used to work before compilers defaulted to -fcommon.) This fixes duplicate symbols like these: lld-link: error: duplicate symbol: xsltGenericError >>> defined at ../src/libs/xslt/libxslt/xsltutils.h:140 >>> libxslt.cross.a(documents.cross.o) >>> defined at ../src/libs/xslt/libxslt/xsltutils.h:140 >>> libxslt.cross.a(extensions.cross.o) Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- libs/xslt/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4854f976b78..efae283f9fa 100755 --- a/configure +++ b/configure @@ -10771,7 +10771,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: libxml2 cflags: $XML2_PE_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: libxml2 libs: $XML2_PE_LIBS" >&5 if ${XSLT_PE_CFLAGS:+false} :; then : - XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt" + XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" else enable_libxslt=no fi diff --git a/configure.ac b/configure.ac index 3f1d50a4dfc..62af43220ce 100644 --- a/configure.ac +++ b/configure.ac @@ -1060,7 +1060,7 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt") +WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread **** diff --git a/libs/xslt/Makefile.in b/libs/xslt/Makefile.in index 3550010ce31..b620710c5af 100644 --- a/libs/xslt/Makefile.in +++ b/libs/xslt/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libxslt.a -EXTRAINCL = $(XML2_PE_CFLAGS) +EXTRAINCL = $(XML2_PE_CFLAGS) $(XSLT_PE_CFLAGS) C_SRCS = \ libxslt/attributes.c \

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 9f0cdd2a6a1dd32b4be949f4261ca78cdeb3e442 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f0cdd2a6a1dd32b4be949f4… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Oct 21 09:30:54 2021 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/de.po b/po/de.po index 9dde202d981..84907846db2 100644 --- a/po/de.po +++ b/po/de.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-09-27 17:07+0200\n" +"PO-Revision-Date: 2021-10-21 09:30+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3715,30 +3715,24 @@ msgid "&Disable" msgstr "&Deaktivieren" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Reset" +msgstr "&Reset" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "&Aktivieren" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Überschreibung bearbeiten" +msgstr "Ü&berschreiben" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Verbunden" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Spracheingabegerät:" +msgstr "Verbunden (xinput-Geräte)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled"

1 0

Alexandre Julliard : libs: Import upstream code from jxrlib 1.1.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: cfc8f154e5a7a3231db5045d5eac129da1cb638e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfc8f154e5a7a3231db5045d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:26:16 2021 +0200 libs: Import upstream code from jxrlib 1.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 + configure.ac | 2 + libs/jxr/LICENSE | 23 + libs/jxr/Makefile.in | 25 + libs/jxr/image/decode/JXRTranscode.c | 991 +++++++++ libs/jxr/image/decode/decode.c | 200 ++ libs/jxr/image/decode/decode.h | 143 ++ libs/jxr/image/decode/postprocess.c | 288 +++ libs/jxr/image/decode/segdec.c | 1205 ++++++++++ libs/jxr/image/decode/strInvTransform.c | 1888 ++++++++++++++++ libs/jxr/image/decode/strPredQuantDec.c | 539 +++++ libs/jxr/image/decode/strdec.c | 3628 +++++++++++++++++++++++++++++++ libs/jxr/image/encode/encode.c | 144 ++ libs/jxr/image/encode/encode.h | 113 + libs/jxr/image/encode/segenc.c | 1186 ++++++++++ libs/jxr/image/encode/strFwdTransform.c | 1111 ++++++++++ libs/jxr/image/encode/strPredQuantEnc.c | 511 +++++ libs/jxr/image/encode/strenc.c | 2370 ++++++++++++++++++++ libs/jxr/image/sys/adapthuff.c | 511 +++++ libs/jxr/image/sys/ansi.h | 61 + libs/jxr/image/sys/common.h | 131 ++ libs/jxr/image/sys/image.c | 183 ++ libs/jxr/image/sys/perfTimer.h | 115 + libs/jxr/image/sys/strPredQuant.c | 306 +++ libs/jxr/image/sys/strTransform.c | 85 + libs/jxr/image/sys/strTransform.h | 50 + libs/jxr/image/sys/strcodec.c | 1251 +++++++++++ libs/jxr/image/sys/strcodec.h | 678 ++++++ libs/jxr/image/sys/windowsmediaphoto.h | 515 +++++ libs/jxr/image/sys/xplatform_image.h | 84 + libs/jxr/image/x86/x86.h | 58 + libs/jxr/jxrgluelib/JXRGlue.c | 930 ++++++++ libs/jxr/jxrgluelib/JXRGlue.h | 642 ++++++ libs/jxr/jxrgluelib/JXRGlueJxr.c | 2280 +++++++++++++++++++ libs/jxr/jxrgluelib/JXRGluePFC.c | 2338 ++++++++++++++++++++ libs/jxr/jxrgluelib/JXRMeta.c | 905 ++++++++ libs/jxr/jxrgluelib/JXRMeta.h | 258 +++ 37 files changed, 25772 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cfc8f154e5a7a3231db5…

1 0

Alexandre Julliard : wmphoto: Use the bundled jxrlib.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: eb0180e7b4df18d806ceb31e4a96e9a771b4db3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb0180e7b4df18d806ceb31e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:36:41 2021 +0200 wmphoto: Use the bundled jxrlib. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 122 ---------------------------------- configure.ac | 16 ----- dlls/wmphoto/Makefile.in | 9 ++- dlls/wmphoto/{unix_lib.c => jxrlib.c} | 108 +----------------------------- dlls/wmphoto/main.c | 4 +- include/config.h.in | 6 -- 6 files changed, 10 insertions(+), 255 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb0180e7b4df18d806ce…

1 0

Alexandre Julliard : libs: Import upstream code from mpg123 1.29.1.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: bafb747d2df70b2ce30ec099c78d3a19ab7bda0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bafb747d2df70b2ce30ec099… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:39:48 2021 +0200 libs: Import upstream code from mpg123 1.29.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 + configure.ac | 2 + libs/mpg123/AUTHORS | 176 + libs/mpg123/LICENSE | 19 + libs/mpg123/Makefile.in | 31 + libs/mpg123/config.h | 529 +++ libs/mpg123/src/compat/compat.c | 508 +++ libs/mpg123/src/compat/compat.h | 301 ++ libs/mpg123/src/compat/compat_str.c | 105 + libs/mpg123/src/compat/wpathconv.h | 120 + libs/mpg123/src/intsym.h | 370 ++ libs/mpg123/src/libmpg123/abi_align.h | 41 + libs/mpg123/src/libmpg123/costabs.h | 81 + libs/mpg123/src/libmpg123/dct64.c | 175 + libs/mpg123/src/libmpg123/debug.h | 132 + libs/mpg123/src/libmpg123/decode.h | 292 ++ libs/mpg123/src/libmpg123/dither.c | 3 + libs/mpg123/src/libmpg123/dither.h | 23 + libs/mpg123/src/libmpg123/dither_impl.h | 119 + libs/mpg123/src/libmpg123/equalizer.c | 17 + libs/mpg123/src/libmpg123/fmt123.h | 159 + libs/mpg123/src/libmpg123/format.c | 776 ++++ libs/mpg123/src/libmpg123/frame.c | 1066 ++++++ libs/mpg123/src/libmpg123/frame.h | 431 +++ libs/mpg123/src/libmpg123/gapless.h | 119 + libs/mpg123/src/libmpg123/getbits.h | 103 + libs/mpg123/src/libmpg123/getcpuflags.h | 101 + libs/mpg123/src/libmpg123/huffman.h | 340 ++ libs/mpg123/src/libmpg123/icy.c | 34 + libs/mpg123/src/libmpg123/icy.h | 38 + libs/mpg123/src/libmpg123/icy2utf8.c | 440 +++ libs/mpg123/src/libmpg123/icy2utf8.h | 10 + libs/mpg123/src/libmpg123/id3.c | 1470 +++++++ libs/mpg123/src/libmpg123/id3.h | 43 + libs/mpg123/src/libmpg123/index.c | 132 + libs/mpg123/src/libmpg123/index.h | 59 + libs/mpg123/src/libmpg123/l12tabs.h | 1224 ++++++ libs/mpg123/src/libmpg123/l2tables.h | 167 + libs/mpg123/src/libmpg123/l3bandgain.h | 94 + libs/mpg123/src/libmpg123/l3tabs.h | 5285 ++++++++++++++++++++++++++ libs/mpg123/src/libmpg123/layer1.c | 250 ++ libs/mpg123/src/libmpg123/layer2.c | 380 ++ libs/mpg123/src/libmpg123/layer3.c | 1943 ++++++++++ libs/mpg123/src/libmpg123/lfs_wrap.c | 781 ++++ libs/mpg123/src/libmpg123/libmpg123.c | 1879 +++++++++ libs/mpg123/src/libmpg123/mpeghead.h | 89 + libs/mpg123/src/libmpg123/mpg123.h | 2001 ++++++++++ libs/mpg123/src/libmpg123/mpg123lib_intern.h | 342 ++ libs/mpg123/src/libmpg123/newhuffman.h | 824 ++++ libs/mpg123/src/libmpg123/ntom.c | 148 + libs/mpg123/src/libmpg123/optimize.c | 1164 ++++++ libs/mpg123/src/libmpg123/optimize.h | 388 ++ libs/mpg123/src/libmpg123/parse.c | 1385 +++++++ libs/mpg123/src/libmpg123/parse.h | 25 + libs/mpg123/src/libmpg123/reader.h | 140 + libs/mpg123/src/libmpg123/readers.c | 1257 ++++++ libs/mpg123/src/libmpg123/sample.h | 195 + libs/mpg123/src/libmpg123/stringbuf.c | 250 ++ libs/mpg123/src/libmpg123/swap_bytes_impl.h | 103 + libs/mpg123/src/libmpg123/synth.c | 1192 ++++++ libs/mpg123/src/libmpg123/synth.h | 196 + libs/mpg123/src/libmpg123/synth_8bit.c | 142 + libs/mpg123/src/libmpg123/synth_8bit.h | 86 + libs/mpg123/src/libmpg123/synth_mono.h | 64 + libs/mpg123/src/libmpg123/synth_ntom.h | 213 ++ libs/mpg123/src/libmpg123/synth_real.c | 585 +++ libs/mpg123/src/libmpg123/synth_s32.c | 598 +++ libs/mpg123/src/libmpg123/synths.h | 52 + libs/mpg123/src/libmpg123/tabinit.c | 345 ++ libs/mpg123/src/libmpg123/true.h | 15 + 70 files changed, 32193 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bafb747d2df70b2ce30e…

1 0

Alexandre Julliard : mp3dmod: Use the bundled mpg123 and build with msvcrt.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 2113c422634cb2ae2ea09a3b22702c599bac86de URL: https://source.winehq.org/git/wine.git/?a=commit;h=2113c422634cb2ae2ea09a3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:40:09 2021 +0200 mp3dmod: Use the bundled mpg123 and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/Makefile.in | 7 ++----- dlls/mp3dmod/mp3dmod.c | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index 49d3ceba590..dabbb1dfeae 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,9 +1,6 @@ MODULE = mp3dmod.dll -IMPORTS = dmoguids msdmo ole32 uuid wmcodecdspuuid -EXTRAINCL = $(MPG123_CFLAGS) -EXTRALIBS = $(MPG123_LIBS) - -EXTRADLLFLAGS = -mcygwin +IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase +EXTRAINCL = $(MPG123_PE_CFLAGS) C_SRCS = \ mp3dmod.c diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 35d3a2d4cc3..adcee393806 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -513,7 +513,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags else if (err != MPG123_OK) ERR("mpg123_read() returned %d\n", err); if (written < framesize) - ERR("short write: %zd/%u\n", written, framesize); + ERR("short write: %Id/%u\n", written, framesize); got_data = 1; @@ -668,7 +668,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj) */ HRESULT WINAPI DllRegisterServer(void) { - static const WCHAR nameW[] = {'M','P','3',' ','D','e','c','o','d','e','r',' ','D','M','O',0}; DMO_PARTIAL_MEDIATYPE in, out; HRESULT hr; @@ -676,7 +675,7 @@ HRESULT WINAPI DllRegisterServer(void) in.subtype = WMMEDIASUBTYPE_MP3; out.type = WMMEDIATYPE_Audio; out.subtype = WMMEDIASUBTYPE_PCM; - hr = DMORegister(nameW, &CLSID_CMP3DecMediaObject, &DMOCATEGORY_AUDIO_DECODER, + hr = DMORegister(L"MP3 Decoder DMO", &CLSID_CMP3DecMediaObject, &DMOCATEGORY_AUDIO_DECODER, 0, 1, &in, 1, &out); if (FAILED(hr)) return hr;

1 0