Alexandre Julliard : mp3dmod: Use the bundled mpg123 and build with msvcrt.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2113c422634cb2ae2ea09a3b22702c599bac86de
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2113c422634cb2ae2ea09a3b2...

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;