December 2019 - Wine-Devel - list.winehq.org

[PATCH] dmstyle/tests: Use wide-char string literals

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a63d1dbd1c..5130af773c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -475,8 +475,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc = {0}; HRESULT hr; DWORD valid; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -550,7 +548,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -562,7 +560,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -583,7 +581,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

Dec. 16, 2019

[PATCH] dmime/tests: Use wide-char string literals

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 5bb3a8b5b3..99295f391b 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -956,8 +956,6 @@ static void test_parsedescriptor(void) HRESULT hr; DWORD valid; unsigned int i; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; - const WCHAR s_inam[] = {'I','\0'}; /* fourcc ~0 will be replaced later on */ FOURCC alldesc[] = { @@ -1092,7 +1090,7 @@ static void test_parsedescriptor(void) "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); if (forms[i].form != mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -1130,7 +1128,7 @@ static void test_parsedescriptor(void) valid |= DMUS_OBJ_NAME; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); if (forms[i].form == mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'I'\n", + ok(!lstrcmpW(desc.wszName, L"I"), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

Dec. 16, 2019

[PATCH v2] dmloader: Release objects on error paths (Coverity)

by Michael Stefaniuc

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> CID: 1448587 CID: 1449363 CID: 1448601 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: - Add missing {} to an if - Whitespace fixes dlls/dmloader/loader.c | 12 ++++++++++++ dlls/dmloader/loaderstream.c | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 66c0f92b1b..c5f5094fab 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -384,18 +384,24 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac /* create object */ result = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(result)) { + IStream_Release(pStream); ERR(": could not create object\n"); return result; } /* acquire PersistStream interface */ result = IDirectMusicObject_QueryInterface (pObject, &IID_IPersistStream, (LPVOID*)&pPersistStream); if (FAILED(result)) { + IStream_Release(pStream); + IDirectMusicObject_Release(pObject); ERR("failed to Query\n"); return result; } /* load */ result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { + IStream_Release(pStream); + IPersistStream_Release(pPersistStream); + IDirectMusicObject_Release(pObject); WARN(": failed to (completely) load object (%08x)\n", result); return result; } @@ -408,6 +414,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac lstrcpyW (GotDesc.wszFileName, pDesc->wszFileName); } if (FAILED(result)) { + IStream_Release(pStream); + IPersistStream_Release(pPersistStream); + IDirectMusicObject_Release(pObject); ERR(": failed to get descriptor\n"); return result; } @@ -524,6 +533,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* create object */ hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(hr)) { + IStream_Release(pStream); ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr); return DMUS_E_LOADER_FAILEDOPEN; } @@ -537,6 +547,8 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { + IStream_Release(pStream); + IDirectMusicObject_Release(pObject); ERR(": couldn't parse descriptor\n"); return DMUS_E_LOADER_FORMATNOTSUPPORTED; } diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 855203ec3e..150a53524a 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -663,10 +663,11 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if TRACE("(%p, %p)\n", iface, ppstm); result = DMUSIC_CreateDirectMusicLoaderGenericStream ((LPVOID*)&pOther); if (FAILED(result)) return result; - - if (FAILED(IStream_Clone (This->pStream, &pLowLevel))) + + if (FAILED(IStream_Clone (This->pStream, &pLowLevel))) { + IStream_Release(pOther); return E_FAIL; - + } IDirectMusicLoaderGenericStream_Attach (pOther, pLowLevel, This->pLoader); TRACE(": succeeded\n"); -- 2.23.0

Dec. 16, 2019

[PATCH] dmband/tests: Use wide-char string literals

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/tests/dmband.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index dce8a47ba4..4b8aaf6120 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -392,8 +392,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc = {0}; HRESULT hr; DWORD valid; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -477,7 +475,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, @@ -492,7 +490,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -513,7 +511,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

Dec. 16, 2019

[PATCH] jscript/tests: Allow GetTypeInfo calls.

by Jacek Caban

It's called by some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/activex.c | 4 +--- dlls/jscript/tests/caller.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)

Dec. 16, 2019

Re: [PATCH 2/2] kernel32: Forwrad OpenProcessToken() to kernelbase.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62223 Your paranoid android. === debian10 (32 bit report) === kernel32: debugger.c:320: Test failed: GetThreadContext failed: 5

Dec. 16, 2019

Code freeze

by Alexandre Julliard

Folks, As you know, we are now in code freeze towards 5.0. This means that patches will only be accepted if they are small enough, and fix an actual bug. Please make sure to mention in the patch which bug you are fixing, so that I can assess the benefit/risk ratio of the changes. Patches that can't go in will be marked as "deferred", and will have to be resubmitted once 5.0 is out. Changes to the tests are still welcome as long as they don't touch the code outside the tests, so this is a good opportunity to work on making the test results look better... As usual, I'll be making rc releases every week until the final 5.0, which I expect to be ready in the second half of January. -- Alexandre Julliard julliard(a)winehq.org

Dec. 16, 2019

Re: [PATCH 1/2] kernel32: Forward OpenThreadToken() to kernelbase.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62222 Your paranoid android. === debian10 (32 bit report) === kernel32: comm.c:918: Test failed: OutQueue should not be empty debugger: Timeout === debian10 (32 bit Chinese:China report) === kernel32: change.c:320: Test failed: should be ready debugger.c:320: Test failed: GetThreadContext failed: 5

Dec. 16, 2019

Re: [PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.

by Alexandre Julliard

Zebediah Figura <z.figura12(a)gmail.com> writes: > On 12/16/19 6:10 AM, Francois Gouget wrote: >> On Mon, 16 Dec 2019, Dmitry Timoshkov wrote: >> >>> Marvin <testbot(a)winehq.org> wrote: >>> >>>> === debian10 (32 bit report) === >>>> >>>> adsldp: >>>> ldap.c:45: Test failed: got 0x80040154 >>>> Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x004015c0). >>>> >>>> Report errors: >>>> adsldp:ldap crashed (c0000005) >>> >>> testbot is broken and doesn't update Wine prefix. >> >> The TestBot recreates the WinePrefixes from scratch with the daily Wine >> commits: >> >> https://source.winehq.org/git/tools.git/blob/HEAD:/testbot/bin/build/WineRe… >> >> But it does not recreate the wineprefixes from scratch with each patch. >> For those it just runs Wine which is supposed to update the wineprefix >> automatically. >> >> Not updating the wineprefix automatically would force the users to >> delete and recreate their wineprefixes, including reinstalling >> applications, every time they upgrade Wine, which I would argue is a >> bug. >> > > I'd agree. Unfortunately, we don't have a way of automatically detecting > when a new WINE_REGISTRY resource is added to an existing DLL. I'm not > sure what would be a good solution there (manually updating wine.inf.in?) wine.inf is updated on every release, so it's not an issue for users. Developers are expected to be able to figure out such issues and update manually when necessary (which happens rarely in practice). The testbot could probably update on every patch, or update and retry when a test failed. -- Alexandre Julliard julliard(a)winehq.org

Dec. 16, 2019

[PATCH 2/2] kernel32: Forwrad OpenProcessToken() to kernelbase.

by Chip Davis

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 466ef5e52a16..c7a8e2024431 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1127,7 +1127,7 @@ # @ stub OpenPrivateNamespaceA # @ stub OpenPrivateNamespaceW @ stdcall -import OpenProcess(long long long) -# @ stub OpenProcessToken +@ stdcall -import OpenProcessToken(long long ptr) @ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr) -- 2.24.0

Dec. 16, 2019

[PATCH 1/2] kernel32: Forward OpenThreadToken() to kernelbase.

by Chip Davis

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 408ea415401a..466ef5e52a16 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1132,7 +1132,7 @@ @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr) @ stdcall -import OpenThread(long long long) -# @ stub OpenThreadToken +@ stdcall -import OpenThreadToken(long long long ptr) @ stdcall -i386 OpenVxDHandle(long) @ stdcall OpenWaitableTimerA(long long str) @ stdcall -import OpenWaitableTimerW(long long wstr) -- 2.24.0

Dec. 16, 2019

Re: [PATCH v3 2/3] qedit/samplegrabber: Consistently the "pMemInputPin" member of struct strmbase_source.

by Zebediah Figura

On 12/16/19 2:36 AM, Sven Baars wrote: > Hey Zeb, > > I think you forgot a verb in the commit message. > > Sven > Thanks for catching that, it should be "Consistently use the "pMemInputPin" member of struct strmbase_source." Alexandre, would you mind fixing that up, please?

Dec. 16, 2019

Re: [PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.

by Zebediah Figura

On 12/16/19 6:10 AM, Francois Gouget wrote: > On Mon, 16 Dec 2019, Dmitry Timoshkov wrote: > >> Marvin <testbot(a)winehq.org> wrote: >> >>> === debian10 (32 bit report) === >>> >>> adsldp: >>> ldap.c:45: Test failed: got 0x80040154 >>> Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x004015c0). >>> >>> Report errors: >>> adsldp:ldap crashed (c0000005) >> >> testbot is broken and doesn't update Wine prefix. > > The TestBot recreates the WinePrefixes from scratch with the daily Wine > commits: > > https://source.winehq.org/git/tools.git/blob/HEAD:/testbot/bin/build/WineRe… > > But it does not recreate the wineprefixes from scratch with each patch. > For those it just runs Wine which is supposed to update the wineprefix > automatically. > > Not updating the wineprefix automatically would force the users to > delete and recreate their wineprefixes, including reinstalling > applications, every time they upgrade Wine, which I would argue is a > bug. > I'd agree. Unfortunately, we don't have a way of automatically detecting when a new WINE_REGISTRY resource is added to an existing DLL. I'm not sure what would be a good solution there (manually updating wine.inf.in?)

Dec. 16, 2019

Re: [PATCH 2/5] activeds: Implement ADsOpenObject.

by Zebediah Figura

On 12/16/19 3:21 AM, Dmitry Timoshkov wrote: > Nikolay Sivov <bunglehead(a)gmail.com> wrote: > >>>>>>> + hr = >>> IADsOpenDSObject_OpenDSObject(adsopen, >>>>> (BSTR)path, (BSTR)user, (BSTR)password, reserved, &disp); >>>>>>> + if (hr == S_OK) >>>>>> You cannot cast to a BSTR, it will corrupt the data structure. >>>>> >>>>> I depends wheather the callee uses SysStringLen() and friends, in this >>>>> particular case it works just fine, there are many other places in the >>> code >>>>> when it's not necessary to create intermediate copies of the strings. >>>>> >>>> >>>> It does not matter if it works in this case, arguments should use correct >>>> types. If we have similar violations somewhere else, those need fixing as >>>> well. >>> >>> That's a pretty incorrect assertion, there's nothing wrong in casting >>> BSTR to LPWSTR and vice versa. >>> >> >> What's incorrect about it? You can use BSTR as WCHAR * argument, obviously. >> Not the other way around, even if it happens to work. > > You are contradicting yourself: if it works that means that's correct > behaviour. If you are going to further argue, please show the code that > won't work for this particular implementation. > I think it's just a matter of following correct and documented behaviour on principle. You wouldn't intentionally use an object after calling Release() just because it happens to work (relying on the fact that the object is static, or that the heap memory just doesn't get overwritten). Native might already have used something like SysStringLen() internally and have corrupted data structures that simply aren't causing any problems yet with this test. It also might not, but it costs very little to just do the documented thing.

Dec. 16, 2019

Re: [PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.

by Dmitry Timoshkov

Sven Baars <sven.wine(a)gmail.com> wrote: > On 16-12-2019 15:05, Dmitry Timoshkov wrote: > > Sven Baars <sven.wine(a)gmail.com> wrote: > > > >>> +START_TEST(ldap) > >>> +{ > >>> + HRESULT hr; > >>> + > >>> + hr = CoInitialize(NULL); > >>> + ok(hr == S_OK, "got %#x\n", hr); > >>> + > >>> + test_LDAP(); > >>> +} > >>> > >> I think you forgot to call CoUninitialize here. > > > > The process is going to terminate anyway, so it's a waste of time. > > > In that case, you might as well remove all *_Release calls from your > tests... *_Release calls in the test help to ensure that reference counting works correctly, and I do check that when looking at the logs. However calling CoUninitialize() is meaningless for the test results. -- Dmitry.

Dec. 16, 2019

Re: [PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.

by Sven Baars

On 16-12-2019 15:05, Dmitry Timoshkov wrote: > Sven Baars <sven.wine(a)gmail.com> wrote: > >>> +START_TEST(ldap) >>> +{ >>> + HRESULT hr; >>> + >>> + hr = CoInitialize(NULL); >>> + ok(hr == S_OK, "got %#x\n", hr); >>> + >>> + test_LDAP(); >>> +} >>> >> I think you forgot to call CoUninitialize here. > > The process is going to terminate anyway, so it's a waste of time. > In that case, you might as well remove all *_Release calls from your tests...

Dec. 16, 2019

Re: [PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.

by Dmitry Timoshkov

Sven Baars <sven.wine(a)gmail.com> wrote: > > +START_TEST(ldap) > > +{ > > + HRESULT hr; > > + > > + hr = CoInitialize(NULL); > > + ok(hr == S_OK, "got %#x\n", hr); > > + > > + test_LDAP(); > > +} > > > I think you forgot to call CoUninitialize here. The process is going to terminate anyway, so it's a waste of time. -- Dmitry.

Dec. 16, 2019

[PATCH 2/2] kernelbase: Use translated Unicode default char to check invalid chars.

by Akihiro Sagawa

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48288 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/codepage.c | 3 +++ dlls/kernelbase/locale.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

Dec. 16, 2019

[PATCH 1/2] kernel32/tests: Refactor MB_ERR_INVALID_CHARS tests.

by Akihiro Sagawa

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/codepage.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

Dec. 16, 2019

Re: [PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.

by Sven Baars

On 16-12-2019 02:42, Dmitry Timoshkov wrote: > + > +START_TEST(ldap) > +{ > + HRESULT hr; > + > + hr = CoInitialize(NULL); > + ok(hr == S_OK, "got %#x\n", hr); > + > + test_LDAP(); > +} > I think you forgot to call CoUninitialize here.

Dec. 16, 2019

Re: [PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.

by Francois Gouget

On Mon, 16 Dec 2019, Dmitry Timoshkov wrote: > Marvin <testbot(a)winehq.org> wrote: > > > === debian10 (32 bit report) === > > > > adsldp: > > ldap.c:45: Test failed: got 0x80040154 > > Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x004015c0). > > > > Report errors: > > adsldp:ldap crashed (c0000005) > > testbot is broken and doesn't update Wine prefix. The TestBot recreates the WinePrefixes from scratch with the daily Wine commits: https://source.winehq.org/git/tools.git/blob/HEAD:/testbot/bin/build/WineRe… But it does not recreate the wineprefixes from scratch with each patch. For those it just runs Wine which is supposed to update the wineprefix automatically. Not updating the wineprefix automatically would force the users to delete and recreate their wineprefixes, including reinstalling applications, every time they upgrade Wine, which I would argue is a bug. -- Francois Gouget <fgouget(a)codeweavers.com>

Dec. 16, 2019

[PATCH] dmloader: Release objects on error paths (Coverity)

by Alistair Leslie-Hughes

CID: 1448587 CID: 1449363 CID: 1448601 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 12 ++++++++++++ dlls/dmloader/loaderstream.c | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index cd7f6ff7ee3..2af4de9fc80 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -383,18 +383,24 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac /* create object */ result = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(result)) { + IStream_Release (pStream); ERR(": could not create object\n"); return result; } /* acquire PersistStream interface */ result = IDirectMusicObject_QueryInterface (pObject, &IID_IPersistStream, (LPVOID*)&pPersistStream); if (FAILED(result)) { + IStream_Release (pStream); + IDirectMusicObject_Release (pObject); ERR("failed to Query\n"); return result; } /* load */ result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { + IStream_Release (pStream); + IPersistStream_Release (pPersistStream); + IDirectMusicObject_Release (pObject); WARN(": failed to (completely) load object (%08x)\n", result); return result; } @@ -407,6 +413,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac lstrcpyW (GotDesc.wszFileName, pDesc->wszFileName); } if (FAILED(result)) { + IStream_Release (pStream); + IPersistStream_Release (pPersistStream); + IDirectMusicObject_Release (pObject); ERR(": failed to get descriptor\n"); return result; } @@ -523,6 +532,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* create object */ hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(hr)) { + IStream_Release (pStream); ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr); return DMUS_E_LOADER_FAILEDOPEN; } @@ -536,6 +546,8 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { + IStream_Release (pStream); + IDirectMusicObject_Release (pObject); ERR(": couldn't parse descriptor\n"); return DMUS_E_LOADER_FORMATNOTSUPPORTED; } diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 855203ec3e8..b306672771f 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -665,6 +665,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if if (FAILED(result)) return result; if (FAILED(IStream_Clone (This->pStream, &pLowLevel))) + IStream_Release(pOther); return E_FAIL; IDirectMusicLoaderGenericStream_Attach (pOther, pLowLevel, This->pLoader); -- 2.24.0

Dec. 16, 2019

[PATCH] msado15: Implement _Recordset get_CursorLocation and put_CursorLocation.

by Hans Leidekker

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1d28d6b957..1f16add4c3 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -43,6 +43,7 @@ struct recordset LONG allocated; LONG index; VARIANT *data; + CursorLocationEnum cursor_location; }; struct fields @@ -1229,14 +1230,24 @@ static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affec static HRESULT WINAPI recordset_get_CursorLocation( _Recordset *iface, CursorLocationEnum *cursor_loc ) { - FIXME( "%p, %p\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_loc ); + + *cursor_loc = recordset->cursor_location; + + return S_OK; } static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLocationEnum cursor_loc ) { - FIXME( "%p, %u\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %u\n", iface, cursor_loc ); + + recordset->cursor_location = cursor_loc; + + return S_OK; } static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *records_affected, _Recordset **record_set ) @@ -1524,6 +1535,7 @@ HRESULT Recordset_create( void **obj ) recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->cursor_location = adUseServer; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..917d131063 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -65,6 +65,7 @@ static void test_Recordset(void) Field *field; LONG refs, count, state; VARIANT missing, val, index; + CursorLocationEnum location; BSTR name; HRESULT hr; @@ -132,6 +133,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %d\n", state ); + location = -1; + hr = _Recordset_get_CursorLocation( recordset, &location ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( location == adUseServer, "got %d\n", location ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.20.1

Dec. 16, 2019

Re: [PATCH 2/5] activeds: Implement ADsOpenObject.

by Dmitry Timoshkov

Nikolay Sivov <bunglehead(a)gmail.com> wrote: > > > > > > + hr = > > IADsOpenDSObject_OpenDSObject(adsopen, > > > > (BSTR)path, (BSTR)user, (BSTR)password, reserved, &disp); > > > > > > + if (hr == S_OK) > > > > > You cannot cast to a BSTR, it will corrupt the data structure. > > > > > > > > I depends wheather the callee uses SysStringLen() and friends, in this > > > > particular case it works just fine, there are many other places in the > > code > > > > when it's not necessary to create intermediate copies of the strings. > > > > > > > > > > It does not matter if it works in this case, arguments should use correct > > > types. If we have similar violations somewhere else, those need fixing as > > > well. > > > > That's a pretty incorrect assertion, there's nothing wrong in casting > > BSTR to LPWSTR and vice versa. > > > > What's incorrect about it? You can use BSTR as WCHAR * argument, obviously. > Not the other way around, even if it happens to work. You are contradicting yourself: if it works that means that's correct behaviour. If you are going to further argue, please show the code that won't work for this particular implementation. -- Dmitry.

Dec. 16, 2019

Re: [PATCH 2/5] activeds: Implement ADsOpenObject.

by Nikolay Sivov

On Mon, Dec 16, 2019 at 11:52 AM Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > Nikolay Sivov <bunglehead(a)gmail.com> wrote: > > > > > > + hr = > IADsOpenDSObject_OpenDSObject(adsopen, > > > (BSTR)path, (BSTR)user, (BSTR)password, reserved, &disp); > > > > > + if (hr == S_OK) > > > > You cannot cast to a BSTR, it will corrupt the data structure. > > > > > > I depends wheather the callee uses SysStringLen() and friends, in this > > > particular case it works just fine, there are many other places in the > code > > > when it's not necessary to create intermediate copies of the strings. > > > > > > > It does not matter if it works in this case, arguments should use correct > > types. If we have similar violations somewhere else, those need fixing as > > well. > > That's a pretty incorrect assertion, there's nothing wrong in casting > BSTR to LPWSTR and vice versa. > What's incorrect about it? You can use BSTR as WCHAR * argument, obviously. Not the other way around, even if it happens to work. > > -- > Dmitry. > >

Dec. 16, 2019