- Wine-Devel - list.winehq.org

[PATCH 3/5] wineoss: Move AUXDM_GETDEVCAPS to the unixlib.
by Huw Davies May 3, 2022

May 3, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmaux.c | 42 +--------------------------------------- dlls/wineoss.drv/oss.c | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 9fb1eeb7cd7..a3a12a96bea 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -33,9 +33,9 @@ #include "winbase.h" #include "mmddk.h" #include "audioclient.h" +#include "winternl.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -46,44 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmaux); /*-----------------------------------------------------------------------*/ -DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2); - -/************************************************************************** - * AUX_GetDevCaps [internal] - */ -static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) -{ - int mixer, volume; - static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; - unsigned int num_aux = OSS_auxMessage(0, AUXDM_GETNUMDEVS, 0, 0, 0); - - TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize); - if (lpCaps == NULL) return MMSYSERR_NOTENABLED; - if (wDevID >= num_aux) return MMSYSERR_BADDEVICEID; - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - return MMSYSERR_NOTENABLED; - } - if (ioctl(mixer, SOUND_MIXER_READ_LINE, &volume) == -1) { - close(mixer); - WARN("unable to read mixer !\n"); - return MMSYSERR_NOTENABLED; - } - close(mixer); - lpCaps->wMid = 0xAA; - lpCaps->wPid = 0x55 + wDevID; - lpCaps->vDriverVersion = 0x0100; - strcpyW(lpCaps->szPname, ini); - lpCaps->szPname[9] = '0' + wDevID; /* 6 at max */ - lpCaps->wTechnology = wDevID == 2 ? AUXCAPS_CDAUDIO : AUXCAPS_AUXIN; - lpCaps->wReserved1 = 0; - lpCaps->dwSupport = AUXCAPS_VOLUME | AUXCAPS_LRVOLUME; - - return MMSYSERR_NOERROR; -} - - /************************************************************************** * AUX_GetVolume [internal] */ @@ -212,8 +174,6 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case AUXDM_GETDEVCAPS: - return AUX_GetDevCaps(wDevID, (LPAUXCAPSW)dwParam1, dwParam2); case AUXDM_GETVOLUME: return AUX_GetVolume(wDevID, (LPDWORD)dwParam1); case AUXDM_SETVOLUME: diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index d469bbebb4e..e387a2a4a71 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1412,6 +1412,38 @@ static UINT aux_exit(void) return 0; } +static UINT aux_get_devcaps(WORD dev_id, AUXCAPSW *caps, UINT size) +{ + int mixer, volume; + static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; + + TRACE("(%04X, %p, %u);\n", dev_id, caps, size); + if (caps == NULL) return MMSYSERR_NOTENABLED; + if (dev_id >= num_aux) return MMSYSERR_BADDEVICEID; + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + return MMSYSERR_NOTENABLED; + } + if (ioctl(mixer, SOUND_MIXER_READ_LINE, &volume) == -1) + { + close(mixer); + WARN("unable to read mixer !\n"); + return MMSYSERR_NOTENABLED; + } + close(mixer); + caps->wMid = 0xAA; + caps->wPid = 0x55 + dev_id; + caps->vDriverVersion = 0x0100; + memcpy(caps->szPname, ini, sizeof(ini)); + caps->szPname[9] = '0' + dev_id; /* 6 at max */ + caps->wTechnology = (dev_id == 2) ? AUXCAPS_CDAUDIO : AUXCAPS_AUXIN; + caps->wReserved1 = 0; + caps->dwSupport = AUXCAPS_VOLUME | AUXCAPS_LRVOLUME; + + return MMSYSERR_NOERROR; +} + static NTSTATUS aux_message(void *args) { struct aux_message_params *params = args; @@ -1429,6 +1461,9 @@ static NTSTATUS aux_message(void *args) /* FIXME: Pretend this is supported */ *params->err = 0; break; + case AUXDM_GETDEVCAPS: + *params->err = aux_get_devcaps(params->dev_id, (AUXCAPSW *)params->param_1, params->param_2); + break; case AUXDM_GETNUMDEVS: TRACE("return %d;\n", num_aux); *params->err = num_aux; -- 2.25.1

2 1

[PATCH 2/5] wineoss: Move AUXDM_GETNUMDEVS to the unixlib.
by Huw Davies May 3, 2022

May 3, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmaux.c | 59 ++++++++++++----------------------- dlls/wineoss.drv/oss.c | 63 ++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 11 +++++++ 3 files changed, 93 insertions(+), 40 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 02ef912bd34..9fb1eeb7cd7 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -32,40 +32,20 @@ #include "windef.h" #include "winbase.h" #include "mmddk.h" -#include "wine/unicode.h" +#include "audioclient.h" + #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/unixlib.h" + +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(mmaux); #define MIXER_DEV "/dev/mixer" -static int NumDev = 6; - -/*-----------------------------------------------------------------------*/ - -static LRESULT OSS_AuxInit(void) -{ - int mixer; - TRACE("()\n"); - - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - NumDev = 0; - } else { - close(mixer); - NumDev = 6; - } - return 0; -} - /*-----------------------------------------------------------------------*/ -static LRESULT OSS_AuxExit(void) -{ - TRACE("()\n"); - return 0; -} - DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); @@ -225,29 +205,28 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct aux_message_params params; + UINT err; + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case DRVM_INIT: - return OSS_AuxInit(); - case DRVM_EXIT: - return OSS_AuxExit(); - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; case AUXDM_GETDEVCAPS: return AUX_GetDevCaps(wDevID, (LPAUXCAPSW)dwParam1, dwParam2); - case AUXDM_GETNUMDEVS: - TRACE("return %d;\n", NumDev); - return NumDev; case AUXDM_GETVOLUME: return AUX_GetVolume(wDevID, (LPDWORD)dwParam1); case AUXDM_SETVOLUME: return AUX_SetVolume(wDevID, dwParam1); - default: - WARN("unknown message !\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + OSS_CALL(aux_message, &params); + + return err; } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a5aea9ee724..d469bbebb4e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "initguid.h" #include "audioclient.h" +#include "mmddk.h" #include "wine/debug.h" #include "wine/unixlib.h" @@ -1380,6 +1381,67 @@ static NTSTATUS is_started(void *args) return oss_unlock_result(stream, &params->result, stream->playing ? S_OK : S_FALSE); } +/* Aux driver */ + +static unsigned int num_aux; + +#define MIXER_DEV "/dev/mixer" + +static UINT aux_init(void) +{ + int mixer; + + TRACE("()\n"); + + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + num_aux = 0; + } + else + { + close(mixer); + num_aux = 6; + } + return 0; +} + +static UINT aux_exit(void) +{ + TRACE("()\n"); + return 0; +} + +static NTSTATUS aux_message(void *args) +{ + struct aux_message_params *params = args; + + switch (params->msg) + { + case DRVM_INIT: + *params->err = aux_init(); + break; + case DRVM_EXIT: + *params->err = aux_exit(); + break; + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + *params->err = 0; + break; + case AUXDM_GETNUMDEVS: + TRACE("return %d;\n", num_aux); + *params->err = num_aux; + break; + default: + WARN("unknown message !\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + break; + } + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -1409,4 +1471,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, + aux_message, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 6a7dc9288d9..25e9a7007b3 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -250,6 +250,16 @@ struct midi_notify_wait_params struct notify_context *notify; }; +struct aux_message_params +{ + UINT dev_id; + UINT msg; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; +}; + enum oss_funcs { oss_test_connect, @@ -279,6 +289,7 @@ enum oss_funcs oss_midi_out_message, oss_midi_in_message, oss_midi_notify_wait, + oss_aux_message, }; NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 1/5] wineoss: Use AUXDM_GETNUMDEVS to retrieve the number of devices.
by Huw Davies May 3, 2022

May 3, 2022

This is temporary and allows the global variable to move to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmaux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 7d0b8ed53cc..02ef912bd34 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -66,6 +66,9 @@ static LRESULT OSS_AuxExit(void) return 0; } +DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2); + /************************************************************************** * AUX_GetDevCaps [internal] */ @@ -73,10 +76,11 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) { int mixer, volume; static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; + unsigned int num_aux = OSS_auxMessage(0, AUXDM_GETNUMDEVS, 0, 0, 0); TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize); if (lpCaps == NULL) return MMSYSERR_NOTENABLED; - if (wDevID >= NumDev) return MMSYSERR_BADDEVICEID; + if (wDevID >= num_aux) return MMSYSERR_BADDEVICEID; if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { WARN("mixer device not available !\n"); return MMSYSERR_NOTENABLED; -- 2.25.1

2 1

[PATCH 0/9] MR26: dinput/tests: Test fixes and more WGI force feedback tests.
by Rémi Bernon May 3, 2022

May 3, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/26

4 12

[PATCH] xmllite/reader: Implement CreateXmlReaderInputWithEncodingCodePage().
by Nikolay Sivov May 3, 2022

May 3, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52953 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 36 ++++++++++++++++++++++++++---------- dlls/xmllite/tests/reader.c | 6 ++++++ dlls/xmllite/xmllite.spec | 2 +- include/xmllite.idl | 2 ++ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8d893b51f04..03bb6c409b7 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3663,19 +3663,12 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) return hr; } -HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, - IMalloc *imalloc, - LPCWSTR encoding, - BOOL hint, - LPCWSTR base_uri, - IXmlReaderInput **ppInput) +static HRESULT create_reader_input(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + BOOL hint, const WCHAR *base_uri, IXmlReaderInput **ppInput) { xmlreaderinput *readerinput; HRESULT hr; - TRACE("%p %p %s %d %s %p\n", stream, imalloc, wine_dbgstr_w(encoding), - hint, wine_dbgstr_w(base_uri), ppInput); - if (!stream || !ppInput) return E_INVALIDARG; if (!(readerinput = m_alloc(imalloc, sizeof(*readerinput)))) @@ -3686,7 +3679,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->ref = 1; readerinput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); - readerinput->encoding = parse_encoding_name(encoding, -1); + readerinput->encoding = encoding; readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); @@ -3706,3 +3699,26 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, return S_OK; } + +/*********************************************************************** + * CreateXmlReaderInputWithEncodingName (xmllite.@) + */ +HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *imalloc, + const WCHAR *encoding, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **input) +{ + TRACE("%p, %p, %s, %d, %s, %p.\n", stream, imalloc, wine_dbgstr_w(encoding), + hint, wine_dbgstr_w(base_uri), input); + + return create_reader_input(stream, imalloc, parse_encoding_name(encoding, -1), hint, base_uri, input); +} + +/*********************************************************************** + * CreateXmlReaderInputWithEncodingCodePage (xmllite.@) + */ +HRESULT WINAPI CreateXmlReaderInputWithEncodingCodePage(IUnknown *stream, IMalloc *imalloc, + UINT codepage, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **input) +{ + TRACE("%p, %p, %u, %d, %s, %p.\n", stream, imalloc, codepage, hint, wine_dbgstr_w(base_uri), input); + + return create_reader_input(stream, imalloc, get_encoding_from_codepage(codepage), hint, base_uri, input); +} diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c4af39173a6..c1778a9764e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -766,6 +766,12 @@ static void test_readerinput(void) IXmlReader_Release(reader); IUnknown_Release(reader_input); + + /* Using codepage */ + hr = CreateXmlReaderInputWithEncodingCodePage(input, NULL, 1200, FALSE, NULL, &reader_input); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IUnknown_Release(reader_input); + IUnknown_Release(input); } diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec index 574ed9865c3..3097e8d4e88 100644 --- a/dlls/xmllite/xmllite.spec +++ b/dlls/xmllite/xmllite.spec @@ -1,5 +1,5 @@ @ stdcall CreateXmlReader(ptr ptr ptr) -@ stub CreateXmlReaderInputWithEncodingCodePage +@ stdcall CreateXmlReaderInputWithEncodingCodePage(ptr ptr long long wstr ptr) @ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr wstr long wstr ptr) @ stdcall CreateXmlWriter(ptr ptr ptr) @ stdcall CreateXmlWriterOutputWithEncodingCodePage(ptr ptr long ptr) diff --git a/include/xmllite.idl b/include/xmllite.idl index 0fd68f7b781..b2de76e5630 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -228,6 +228,8 @@ typedef enum XmlError cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);") cpp_quote("typedef IUnknown IXmlReaderInput;") +cpp_quote("STDAPI CreateXmlReaderInputWithEncodingCodePage(IUnknown *stream, IMalloc *pMalloc,") +cpp_quote(" UINT encoding_codepage, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **pInput);") cpp_quote("STDAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,") cpp_quote(" LPCWSTR encoding, BOOL hint,") cpp_quote(" LPCWSTR base_uri, IXmlReaderInput **ppInput);") -- 2.35.1

1 0

[PATCH 0/5] MR25: mf/tests: Add dmo / transform tests for the audio resampler and color converters.
by Rémi Bernon May 3, 2022

May 3, 2022

I believe this doesn't conflict with https://gitlab.winehq.org/wine/wine/-/merge_requests/22 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/25

2 9

[PATCH 0/1] MR27: dlls/dbghelp: properly fail on PDB files generated by MSVC compiler version 14.31
by eric pouech (＠epo) May 3, 2022

May 3, 2022

Some internal bits of PDB files are different, so report & abort loading of such PDB file until it's properly understood & supported (instead of crashing) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/27

2 1

[PATCH 0/1] MR23: shell32: Sanitize Program Manager icon and group names
by Alex Henrie (＠alexhenrie) May 3, 2022

May 3, 2022

All of the new tests that are marked todo_wine fail because Wine's PathCombineW does not handle ".", "...", "....", or "foobar." correctly. They will pass once PathCombineW is fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/23

4 3

[PATCH 0/1] MR24: msado15: Implement _Recordset get_EditMode
by Alistair Leslie-Hughes (＠alesliehughes) May 3, 2022

May 3, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/24

2 1

[PATCH v3 0/1] MR20: include/msvcrt: redefine tolower & toupper with wint_t parameters
by eric pouech (＠epo) May 3, 2022

May 3, 2022

it conflicts in C++ compilation with MINGW builtin definitions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v3: include/msvcrt: redefine towlower* & towupper* with wint_t types https://gitlab.winehq.org/wine/wine/-/merge_requests/20

2 1