October 2021 - Wine-Commits

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

Oct. 21, 2021

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: Map REL_HWEEL to HID_USAGE_GENERIC_SLIDER.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

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

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

Oct. 21, 2021

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

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

Oct. 21, 2021

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

Rémi Bernon : dinput: Move EnumCreatedEffectObjects checks to device.c.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: df08662f8486726d9c4770f553a03750f53040d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df08662f8486726d9c4770f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 09:53:47 2021 +0200 dinput: Move EnumCreatedEffectObjects checks to device.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 18 +++++++++++++----- dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick_hid.c | 12 +++++------- dlls/dinput/keyboard.c | 1 + dlls/dinput/mouse.c | 1 + 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b8da627b1ea..d9b92e82271 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1799,12 +1799,20 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand( IDirectInputDe return hr; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8W iface, - LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, LPVOID lpvRef, DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *context, DWORD flags ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)0>(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); - return DI_OK; + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + if (flags) return DIERR_INVALIDPARAM; + if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) return DI_OK; + if (!impl->vtbl->enum_created_effect_objects) return DIERR_UNSUPPORTED; + + return impl->vtbl->enum_created_effect_objects( iface, callback, context, flags ); } HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDIEFFESCAPE lpDIEEsc) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index b90c6bf2dcd..16d28323281 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -71,6 +71,8 @@ struct dinput_device_vtbl HRESULT (*get_effect_info)( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ); HRESULT (*create_effect)( IDirectInputDevice8W *iface, IDirectInputEffect **out ); HRESULT (*send_force_feedback_command)( IDirectInputDevice8W *iface, DWORD command ); + HRESULT (*enum_created_effect_objects)( IDirectInputDevice8W *iface, LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *context, DWORD flags ); }; #define DEVICE_STATE_MAX_SIZE 1024 diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index e9bbfa081e8..5fb4e9a2de9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -982,18 +982,15 @@ static HRESULT hid_joystick_internal_send_force_feedback_command( IDirectInputDe return DI_OK; } -static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, - LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, - void *context, DWORD flags ) +static HRESULT hid_joystick_internal_enum_created_effect_objects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *context, DWORD flags ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); struct hid_joystick_effect *effect, *next; TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); - if (!callback) return DIERR_INVALIDPARAM; - if (flags) return DIERR_INVALIDPARAM; - LIST_FOR_EACH_ENTRY_SAFE(effect, next, &impl->effect_list, struct hid_joystick_effect, entry) if (callback( &effect->IDirectInputEffect_iface, context ) != DIENUM_CONTINUE) break; @@ -1028,7 +1025,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_GetEffectInfo, IDirectInputDevice2WImpl_GetForceFeedbackState, IDirectInputDevice2WImpl_SendForceFeedbackCommand, - hid_joystick_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, IDirectInputDevice2WImpl_Poll, IDirectInputDevice2WImpl_SendDeviceData, @@ -1269,6 +1266,7 @@ static const struct dinput_device_vtbl hid_joystick_internal_vtbl = hid_joystick_internal_get_effect_info, hid_joystick_internal_create_effect, hid_joystick_internal_send_force_feedback_command, + hid_joystick_internal_enum_created_effect_objects, }; static DWORD device_type_for_version( DWORD type, DWORD version ) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a04b59e9c0c..fb6cf33b911 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -341,6 +341,7 @@ static const struct dinput_device_vtbl keyboard_internal_vtbl = NULL, NULL, NULL, + NULL, }; static const IDirectInputDevice8WVtbl SysKeyboardWvt = diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index faf093489cf..1b91fa12189 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -654,6 +654,7 @@ static const struct dinput_device_vtbl mouse_internal_vtbl = NULL, NULL, NULL, + NULL, }; static const IDirectInputDevice8WVtbl SysMouseWvt =

1 0

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

Oct. 21, 2021

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

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

Oct. 21, 2021

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 Oct. 21, 2021

Oct. 21, 2021

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 Oct. 21, 2021

Oct. 21, 2021

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 : l3codeca.acm: Use the bundled mpg123 and build with msvcrt.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: 5329da61ac51995f7a690edffbbc57d955566a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5329da61ac51995f7a690edf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:41:21 2021 +0200 l3codeca.acm: Use the bundled mpg123 and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 ------------------------------------------ configure.ac | 19 -------- dlls/l3codeca.acm/Makefile.in | 7 +-- dlls/l3codeca.acm/mpegl3.c | 6 --- include/config.h.in | 3 -- 5 files changed, 2 insertions(+), 143 deletions(-) diff --git a/configure b/configure index 4e64db49eed..8d4ca1ac653 100755 --- a/configure +++ b/configure @@ -637,8 +637,6 @@ VKD3D_CFLAGS NETAPI_LIBS NETAPI_CFLAGS PROCSTAT_LIBS -MPG123_LIBS -MPG123_CFLAGS JPEG_LIBS JPEG_CFLAGS GSSAPI_LIBS @@ -874,7 +872,6 @@ with_jpeg with_krb5 with_ldap with_mingw -with_mpg123 with_netapi with_openal with_opencl @@ -1992,8 +1989,6 @@ GSSAPI_CFLAGS GSSAPI_LIBS JPEG_CFLAGS JPEG_LIBS -MPG123_CFLAGS -MPG123_LIBS NETAPI_CFLAGS NETAPI_LIBS VKD3D_CFLAGS @@ -2665,7 +2660,6 @@ Optional Packages: --without-krb5 do not use krb5 (Kerberos) --without-ldap do not use LDAP --without-mingw do not use the MinGW cross-compiler - --without-mpg123 do not use the mpg123 library --without-netapi do not use the Samba NetAPI library --without-openal do not use OpenAL --without-opencl do not use OpenCL @@ -2818,9 +2812,6 @@ Some influential environment variables: GSSAPI_LIBS Linker flags for krb5-gssapi, overriding pkg-config JPEG_CFLAGS C compiler flags for libjpeg, overriding pkg-config JPEG_LIBS Linker flags for libjpeg, overriding pkg-config - MPG123_CFLAGS - C compiler flags for libmpg123, overriding pkg-config - MPG123_LIBS Linker flags for libmpg123, overriding pkg-config NETAPI_CFLAGS C compiler flags for netapi, overriding pkg-config NETAPI_LIBS Linker flags for netapi, overriding pkg-config @@ -4133,12 +4124,6 @@ if test "${with_mingw+set}" = set; then : fi -# Check whether --with-mpg123 was given. -if test "${with_mpg123+set}" = set; then : - withval=$with_mpg123; -fi - - # Check whether --with-netapi was given. if test "${with_netapi+set}" = set; then : withval=$with_netapi; @@ -15416,99 +15401,6 @@ esac fi -if test "x$with_mpg123" != "xno" -then - if ${MPG123_CFLAGS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - MPG123_CFLAGS=`$PKG_CONFIG --cflags libmpg123 2>/dev/null` -fi -fi - -if ${MPG123_LIBS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - MPG123_LIBS=`$PKG_CONFIG --libs libmpg123 2>/dev/null` -fi -fi - -MPG123_LIBS=${MPG123_LIBS:-"-lmpg123"} -$as_echo "$as_me:${as_lineno-$LINENO}: libmpg123 cflags: $MPG123_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: libmpg123 libs: $MPG123_LIBS" >&5 -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $MPG123_CFLAGS" -for ac_header in mpg123.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "mpg123.h" "ac_cv_header_mpg123_h" "$ac_includes_default" -if test "x$ac_cv_header_mpg123_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MPG123_H 1 -_ACEOF - -fi - -done - - if test "$ac_cv_header_mpg123_h" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in -lmpg123" >&5 -$as_echo_n "checking for mpg123_feed in -lmpg123... " >&6; } -if ${ac_cv_lib_mpg123_mpg123_feed+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpg123 $MPG123_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char mpg123_feed (); -int -main () -{ -return mpg123_feed (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mpg123_mpg123_feed=yes -else - ac_cv_lib_mpg123_mpg123_feed=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpg123_mpg123_feed" >&5 -$as_echo "$ac_cv_lib_mpg123_mpg123_feed" >&6; } -if test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes; then : - : -else - MPG123_LIBS="" -fi - - else - MPG123_CFLAGS="" - MPG123_LIBS="" - fi -CPPFLAGS=$ac_save_CPPFLAGS - -fi -if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes; then : - case "x$with_mpg123" in - x) as_fn_append wine_notices "|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;; - xno) ;; - *) as_fn_error $? "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported. -This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; -esac -enable_l3codeca_acm=${enable_l3codeca_acm:-no} -fi -test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_mp3dmod=${enable_mp3dmod:-no} - if test "$ac_cv_header_AL_al_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lopenal" >&5 @@ -18935,8 +18827,6 @@ GSSAPI_CFLAGS = $GSSAPI_CFLAGS GSSAPI_LIBS = $GSSAPI_LIBS JPEG_CFLAGS = $JPEG_CFLAGS JPEG_LIBS = $JPEG_LIBS -MPG123_CFLAGS = $MPG123_CFLAGS -MPG123_LIBS = $MPG123_LIBS PROCSTAT_LIBS = $PROCSTAT_LIBS NETAPI_CFLAGS = $NETAPI_CFLAGS NETAPI_LIBS = $NETAPI_LIBS diff --git a/configure.ac b/configure.ac index 047e2b82638..63bf4f25162 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,6 @@ AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerbero AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) AC_ARG_WITH(mingw, AS_HELP_STRING([--without-mingw],[do not use the MinGW cross-compiler])) -AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library])) AC_ARG_WITH(netapi, AS_HELP_STRING([--without-netapi],[do not use the Samba NetAPI library])) AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi]) @@ -1722,24 +1721,6 @@ fi WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], [libjpeg ${notice_platform}development files not found, JPEG won't be supported.]) -dnl **** Check for mpg123 **** -if test "x$with_mpg123" != "xno" -then - WINE_PACKAGE_FLAGS(MPG123,[libmpg123],[-lmpg123],,, - [AC_CHECK_HEADERS([mpg123.h]) - if test "$ac_cv_header_mpg123_h" = "yes" - then - AC_CHECK_LIB(mpg123,mpg123_feed,[:],[MPG123_LIBS=""],[$MPG123_LIBS]) - else - MPG123_CFLAGS="" - MPG123_LIBS="" - fi]) -fi -WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes], - [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.], - [enable_l3codeca_acm]) -test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_mp3dmod=${enable_mp3dmod:-no} - dnl **** Check for OpenAL 1.1 **** if test "$ac_cv_header_AL_al_h" = "yes" then diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in index e527ec28675..451794b2624 100644 --- a/dlls/l3codeca.acm/Makefile.in +++ b/dlls/l3codeca.acm/Makefile.in @@ -1,9 +1,6 @@ MODULE = l3codeca.acm -IMPORTS = winmm user32 -EXTRAINCL = $(MPG123_CFLAGS) -EXTRALIBS = $(MPG123_LIBS) - -EXTRADLLFLAGS = -mcygwin +IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase +EXTRAINCL = $(MPG123_PE_CFLAGS) C_SRCS = \ mpegl3.c diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index fa9f38258e5..336e706bb83 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -19,13 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <string.h> - #include <mpg123.h> #include "windef.h" @@ -212,14 +208,12 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) instance->dwDriver = (DWORD_PTR)handle; mpg123_open_feed(handle); -#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information * to ask for seeks in order to read specific frames in the file. * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ mpg123_param(handle, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); -#endif return MMSYSERR_NOERROR; } diff --git a/include/config.h.in b/include/config.h.in index 2a408c3e74f..9493574d2d7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -327,9 +327,6 @@ /* Define to 1 if you have the <mntent.h> header file. */ #undef HAVE_MNTENT_H -/* Define to 1 if you have the <mpg123.h> header file. */ -#undef HAVE_MPG123_H - /* Define if MTLDevice protocol has registryID property. */ #undef HAVE_MTLDEVICE_REGISTRYID

1 0