- Wine-Devel - list.winehq.org

[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

[PATCH v2 0/2] 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> -- v2: include/msvcrt: redefine towlower* & towupper* with wint_t types https://gitlab.winehq.org/wine/wine/-/merge_requests/20

2 2

Default GitLab merge request target
by Alex Henrie May 3, 2022

May 3, 2022

Would it be possible to make merge requests from forked Wine projects target the upstream Wine project by default, as described at [1]? I just accidentally created a merge request to merge my own topic branch into my own master branch, because for some reason that's the default when you click the "Create merge request" button in the "You pushed to <topic branch> just now" banner. -Alex [1] https://docs.gitlab.com/14.10/ee/user/project/merge_requests/creating_merge…

2 2