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

[PATCH 1/3] dmime: Use a rbtree to store the PChannels of a performance

by Michael Stefaniuc

The PChannel id is a 32bit, potentially random identifier and not an array index. Fixes also the handling of channel group "dwGroup" 0. As it is invalid it is used to mark uninitialized PChannels. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17766 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24740 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Supersedes the Staging patch dmime-PChannel-range. Fixes memory corruption related crashes: - Fixes bug 17766, tested with Empire Earth Demo. - Should fix bug 24740 too as that is the origin of the workaround included in Staging. But BigFish GameLauncher is a pita so can't test. - Fixes the first crash in bug 31562 and lets the game continue until it hits the next crash (unrelated to PChannels). dlls/dmime/performance.c | 109 +++++++++++++++++++++++++++------------ 1 file changed, 75 insertions(+), 34 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 615a3f8b14..2124c1fe35 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -19,10 +19,18 @@ */ #include "dmime_private.h" +#include "wine/heap.h" +#include "wine/rbtree.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); +struct pchannel_block { + DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ + DMUSIC_PRIVATE_PCHANNEL pchannel[16]; + struct wine_rb_entry entry; +}; + typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; @@ -35,7 +43,7 @@ typedef struct IDirectMusicPerformance8Impl { float fMasterTempo; long lMasterVolume; /* performance channels */ - DMUSIC_PRIVATE_PCHANNEL PChannel[32]; + struct wine_rb_tree pchannels; /* IDirectMusicPerformance8Impl fields */ IDirectMusicAudioPath *pDefaultPath; HANDLE hNotification; @@ -192,6 +200,49 @@ static BOOL PostMessageToProcessMsgThread(IDirectMusicPerformance8Impl* This, UI return PostThreadMessageA(This->procThreadId, iMsg, 0, 0); } +static int pchannel_block_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, const struct pchannel_block, entry); + + return *(DWORD *)key - b->block_num; +} + +static void pchannel_block_free(struct wine_rb_entry *entry, void *context) +{ + struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + + heap_free(b); +} + +static struct pchannel_block *pchannel_block_set(struct wine_rb_tree *tree, DWORD block_num, + IDirectMusicPort *port, DWORD group, BOOL only_set_new) +{ + struct pchannel_block *block; + struct wine_rb_entry *entry; + unsigned int i; + + entry = wine_rb_get(tree, &block_num); + if (entry) { + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + if (only_set_new) + return block; + } else { + if (!(block = heap_alloc(sizeof(*block)))) + return NULL; + block->block_num = block_num; + } + + for (i = 0; i < 16; ++i) { + block->pchannel[i].port = port; + block->pchannel[i].group = group; + block->pchannel[i].channel = i; + } + if (!entry) + wine_rb_put(tree, &block->block_num, &block->entry); + + return block; +} + static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(IDirectMusicPerformance8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface); @@ -236,6 +287,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { + wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); This->safe.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->safe); HeapFree(GetProcessHeap(), 0, This); @@ -579,7 +631,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman GUID port_guid; IDirectMusicPort* pDefaultPort = NULL; DMUS_PORTPARAMS params; - int i, j; hr = IDirectMusic8_GetDefaultPort(This->dmusic, &port_guid); if (FAILED(hr)) return hr; ZeroMemory(&params, sizeof(params)); @@ -591,15 +642,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman if (FAILED(hr)) return hr; hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } - j = 0; - for (i = 0; i < 16; ++i) { - if (NULL == This->PChannel[i].port) { - This->PChannel[i].port = pPort; - This->PChannel[i].group = 0; - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - } + IDirectMusicPerformance8_AssignPChannelBlock(iface, 0, pDefaultPort, 1); } else { IDirectMusicPort_AddRef(pPort); } @@ -621,41 +664,38 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RemovePort(IDirectMusicPerfor } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMusicPerformance8 *iface, - DWORD dwBlockNum, IDirectMusicPort *pPort, DWORD dwGroup) + DWORD block_num, IDirectMusicPort *port, DWORD group) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - int i, j, range /* min value in range */; - - FIXME("(%p, %d, %p, %d): semi-stub\n", This, dwBlockNum, pPort, dwGroup-1); - if (NULL == pPort) return E_POINTER; - - range = 16 * dwBlockNum; - j = 0; - for (i = range; i < range+16; i++) { - /*TRACE("Setting PChannel[%i] to port %p, group %ld, MIDI port %i\n", i, pPort, dwGroup-1, j); */ - This->PChannel[i].port = pPort; - This->PChannel[i].group = dwGroup - 1; /* first index is always zero */ - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - /*if (dwGroup > 2) return S_FALSE;*/ + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - return S_OK; + FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + + if (!port) + return E_POINTER; + if (block_num > MAXDWORD / 16) + return E_INVALIDARG; + + pchannel_block_set(&This->pchannels, block_num, port, group, FALSE); + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort *port, DWORD group, DWORD MChannel) + DWORD pchannel, IDirectMusicPort *port, DWORD group, DWORD channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + struct pchannel_block *block; - TRACE("(%p)->(%d, %p, %d, %d)\n", This, PChannel, port, group, MChannel); + FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); if (!port) return E_POINTER; - This->PChannel[PChannel].port = port; - This->PChannel[PChannel].group = group; - This->PChannel[PChannel].channel = MChannel; + block = pchannel_block_set(&This->pchannels, pchannel / 16, port, 0, TRUE); + if (block) { + block->pchannel[pchannel % 16].group = group; + block->pchannel[pchannel % 16].channel = channel; + } return S_OK; } @@ -1211,6 +1251,7 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe"); + wine_rb_init(&obj->pchannels, pchannel_block_compare); obj->rtLatencyTime = 100; /* 100 ms TO FIX */ obj->dwBumperLength = 50; /* 50 ms default */ -- 2.24.1

Dec. 19, 2019

Re: [PATCH v2] msvcrt: Implement strtod without using 'long double'.

by Alexandre Julliard

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > On Thu, Dec 19, 2019 at 2:58 AM Alexandre Julliard <julliard(a)winehq.org> wrote: >> "Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: >>. .. >> > Subject: msvcrt: Implement strtod without using 'long double'. >> > >> > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48160 >> > Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> >> ... >> >> Thanks! Do we still need the control87 call then? > > No problem! Yes, unfortunately calculating 1.7976931348623158e+308 > (DBL_MAX) requires 64-bit doubles*. This works just fine on x86-64, > but x86-32 defaults to 53-bit precision. However, it would be > possible to only change the precision if we get into the range of > values where it becomes a problem, though that might be a little > complicated to do properly. > >> Also we should do the same changes in wcstod(). > > Would you like that as a separate patch or part of this one? A separate patch would be nice. I've committed the first one with a few changes. -- Alexandre Julliard julliard(a)winehq.org

Dec. 19, 2019

Re: [PATCH] include: Define the _STGMEDIUM_UNION type for C++ only.

by Alexandre Julliard

Jeff Smith <whydoubt(a)gmail.com> writes: > @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown > default: wireHGLOBAL hGeneric; > } GDI_OBJECT; > > + /* Defining the _STGMEDIUM_UNION type yields a violation of the C spec when > + * NONAMELESSUNION is not defined, so only define it for C++. */ > + cpp_quote("#ifndef __cplusplus") > + cpp_quote("#define _STGMEDIUM_UNION") > + cpp_quote("#endif") You may want to make this conditional on NONAMELESSUNION then. This way there's an easy way to get the definition if necessary. -- Alexandre Julliard julliard(a)winehq.org

Dec. 19, 2019

Wine Gecko 2.47.1 is not compatible with Python 2 or 3

by Michael Cronenworth

Hi Jacek, Trying to build 2.47.1 on Fedora Rawhide (32) results in failures for both Python 3 and Python 2. Python 3: ... File "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/testing/mozbase/mozinfo/mozinfo/mozinfo.py", line 93, in <module> (distro, os_version, codename) = platform.dist() AttributeError: module 'platform' has no attribute 'dist' Python 2: ... File "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/build/mach_bootstrap.py", line 331 print(NO_MERCURIAL_SETUP.format(mach=sys.argv[0]), file=sys.stderr) ^ SyntaxError: invalid syntax Am I missing something? Thanks, Michael

Dec. 19, 2019

Re: [PATCH] dmime: IDirectMusicPerformance8_FreePMsg Release the unknown pointer.

by Michael Stefaniuc

Hello Alistair, On 12/19/19 7:59 AM, Alistair Leslie-Hughes wrote: > I have another patch that causes this function to be called (faking a > set notification). So, Yes it's currently a noop but it's small and not > going to effect anything. if you need it for a patch that fixes a bug than sure, please resubmit it as patch series with that patch during the freeze. I've would have signed-off on the patch after reading the documentation I've linked. But the timing wasn't right for a low risk but zero benefit during the freeze patch. > I happy for it to be differed for required. I've had to create a 'dmdefer' branch anyway for my two outstanding patches. So I've added your patch to that too. thanks bye michael > > Alistair. > > > On 19/12/19 7:55 am, Michael Stefaniuc wrote: >> Hello Alistair, >> >> while this patch is technically correct >> https://nam02.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdoc.51wind… >> I'm wondering why it was triggered by bug #25728 (comments 34 and 35). >> >> I don't see a FreePMsg in the log >> https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.wine… >> I also don't see a FreePMsg in any of the logs I have. >> Nor in the attachments of all directx-dmusic bugs. >> >> Also we don't set punkUser anywhere in the whole Wine code >> >> wine$ git grep -n punkUser >> dlls/dmime/performance.c:482: if (pPMSG->punkUser) >> dlls/dmime/performance.c:483: IUnknown_Release(pPMSG->punkUser); >> dlls/dmime/tests/performance.c:447: ok(msg->punkUser != NULL, >> "Unexpected NULL pointer\n"); >> dlls/dmime/tests/performance.c:448: if (msg->punkUser) { >> dlls/dmime/tests/performance.c:452: hr = >> IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, >> (void**)&segmentstate); >> include/dmusici.h:363: IUnknown* punkUser; >> >> While we seem to have a test that checks for non-NULL punkUser, that >> test doesn't runs on Wine. Changing to ok(msg->punkUser == NULL, ...) >> still passes on Wine. >> That test does run on Windows though >> https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftestbot.w… >> >> >> So this patch is a no-op for now iff we allocate zero all the messages. >> Else we might crash on uninitialized memory. So it does sound like a >> "Deferred" to me. >> >> >> bye >> michael >> >> >> >> On 12/18/19 6:17 AM, Alistair Leslie-Hughes wrote: >>> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> >>> --- >>> dlls/dmime/performance.c | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>> >>> diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c >>> index 9dbb469f388..a63bd3b4517 100644 >>> --- a/dlls/dmime/performance.c >>> +++ b/dlls/dmime/performance.c >>> @@ -479,7 +479,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma >>> DMUS_ItemRemoveFromQueue( This, pItem ); >>> LeaveCriticalSection(&This->safe); >>> >>> - /** TODO: see if we should Release the pItem->pMsg->punkUser and others Interfaces */ >>> + if (pPMSG->punkUser) >>> + IUnknown_Release(pPMSG->punkUser); >>> + >>> HeapFree(GetProcessHeap(), 0, pItem); >>> return S_OK; >>> } >>> >>

Dec. 19, 2019

Re: [PATCH v2] msvcrt: Implement strtod without using 'long double'.

by Erich E. Hoover

On Thu, Dec 19, 2019 at 2:58 AM Alexandre Julliard <julliard(a)winehq.org> wrote: > "Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: >. .. > > Subject: msvcrt: Implement strtod without using 'long double'. > > > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48160 > > Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> > ... > > Thanks! Do we still need the control87 call then? No problem! Yes, unfortunately calculating 1.7976931348623158e+308 (DBL_MAX) requires 64-bit doubles*. This works just fine on x86-64, but x86-32 defaults to 53-bit precision. However, it would be possible to only change the precision if we get into the range of values where it becomes a problem, though that might be a little complicated to do properly. > Also we should do the same changes in wcstod(). Would you like that as a separate patch or part of this one? Best, Erich * I am unaware of a way to multiply 1.7976931348623158 by 1e+308 with 53-bit doubles.

Dec. 19, 2019

[PATCH] configure: Don't check for gssapi-krb5 if krb5 is missing

by Andrew Eikum

This works around a broken krb5 package in CentOS which is missing a dependency. configure would find gssapi-krb5, but not krb5, which would cause a build failure later in <dlls/kerberos>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48314 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure.ac | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 8a121bce016..c8399de6ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -1825,21 +1825,24 @@ WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported.]) dnl **** Check for gssapi **** -if test "x$with_gssapi" != "xno" +if test "x$ac_cv_lib_soname_krb5" != "x" -o "x$with_gssapi" = "xyes" then - WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, - [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], - [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], - [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) - if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" - then - WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS]) - else - GSSAPI_CFLAGS="" - fi]) + if test "x$with_gssapi" != "xno" + then + WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, + [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], + [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) + if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" + then + WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS]) + else + GSSAPI_CFLAGS="" + fi]) + fi + WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], + [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) fi -WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], - [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) dnl **** Check for libjpeg **** if test "x$with_jpeg" != "xno" -- 2.24.1

Dec. 19, 2019

[PATCH] include: Define the _STGMEDIUM_UNION type for C++ only.

by Jeff Smith

Fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d Based on a patch from Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- This is like https://source.winehq.org/patches/data/175999 except that this version uses #define to blank-out _STGMEDIUM_UNION for non-C++, rather than having an idl version of the enclosing struct for C++ and a baked version of that struct for non-C++. include/objidl.idl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..844b94af86 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; + /* Defining the _STGMEDIUM_UNION type yields a violation of the C spec when + * NONAMELESSUNION is not defined, so only define it for C++. */ + cpp_quote("#ifndef __cplusplus") + cpp_quote("#define _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1440,6 +1446,10 @@ interface IAdviseSink : IUnknown IUnknown *pUnkForRelease; } userSTGMEDIUM; + cpp_quote("#ifndef __cplusplus") + cpp_quote("#undef _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.23.0

Dec. 19, 2019

Re: [PATCH 2/2] ole32/tests: Add a trivial test for IMoniker::Enum().

by Nikolay Sivov

On 12/19/19 5:31 PM, Marvin wrote: > 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=62345 > > Your paranoid android. > > > === wxppro (32 bit report) === > > ole32: > moniker.c:2470: Test failed: Unexpected pointer. > moniker.c:2476: Test failed: Unexpected pointer. > > === w2003std (32 bit report) === > > ole32: > moniker.c:2470: Test failed: Unexpected pointer. > moniker.c:2476: Test failed: Unexpected pointer. Okay, ignore patch 2/2 please, older versions differ apparently.

Dec. 19, 2019

Re: [PATCH 2/2] wininet: Don't set default gopher protocol in InternetCrackUrlW.

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=62347 Your paranoid android. === debian10 (32 bit Chinese:China report) === wininet: http.c:5034: Test failed: expected 1 pending read, got 2

Dec. 19, 2019

Re: [PATCH 2/2] ole32/tests: Add a trivial test for IMoniker::Enum().

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=62345 Your paranoid android. === wxppro (32 bit report) === ole32: moniker.c:2470: Test failed: Unexpected pointer. moniker.c:2476: Test failed: Unexpected pointer. === w2003std (32 bit report) === ole32: moniker.c:2470: Test failed: Unexpected pointer. moniker.c:2476: Test failed: Unexpected pointer.

Dec. 19, 2019

Re: [PATCH] wininet: Add missing schemes to url_schemes.

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=62342 Your paranoid android. === debian10 (32 bit report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (32 bit French report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (32 bit Japanese:Japan report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (32 bit Chinese:China report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (32 bit WoW report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (64 bit WoW report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8

Dec. 19, 2019

[PATCH 2/2] wininet: Don't set default gopher protocol in InternetCrackUrlW.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 3 --- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

Dec. 19, 2019

[PATCH v2 1/2] wininet: Add missing schemes to url_schemes.

by Jacek Caban

Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 23 +++++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 17 insertions(+), 11 deletions(-)

Dec. 19, 2019

Re: [PATCH] wininet: Add missing schemes to url_schemes.

by Jacek Caban

On 12/19/19 3:05 PM, Vijay Kiran Kamuju wrote: > Hi Jacek, > > There is a spell mistake it should be L"gopher", not L"gohper", Yeah, I messed more than that by sending a wrong version. I will send v2 soon. Thanks, Jacek

Dec. 19, 2019

[PATCH 2/2] ole32/tests: Add a trivial test for IMoniker::Enum().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 96 +++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e4d693b442..9806777698 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1532,6 +1532,7 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { IMoniker *moniker, *inverse, *reduced; + IEnumMoniker *enummoniker; HRESULT hr; DWORD moniker_type; DWORD hash; @@ -1609,6 +1610,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); @@ -1617,6 +1633,7 @@ todo_wine static void test_file_moniker(WCHAR* path) { IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; + IEnumMoniker *enummoniker; DWORD moniker_type; IBindCtx *bind_ctx; IStream *stream; @@ -1673,6 +1690,21 @@ todo_wine ok(reduced == moniker1, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker1, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bind_ctx); IStream_Release(stream); @@ -1792,6 +1824,7 @@ static void test_item_moniker(void) static const WCHAR wszDelimiter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; + IEnumMoniker *enummoniker; WCHAR *display_name; LARGE_INTEGER pos; IStream *stream; @@ -1946,6 +1979,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); /* IsEqual */ @@ -1996,6 +2044,7 @@ static void test_anti_moniker(void) FILETIME filetime; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; + IEnumMoniker *enummoniker; IStream *stream; WCHAR *name; @@ -2169,11 +2218,27 @@ todo_wine IStream_Release(stream); + /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); @@ -2181,6 +2246,7 @@ todo_wine static void test_generic_composite_moniker(void) { + IEnumMoniker *enummoniker; HRESULT hr; IMoniker *moniker; IMoniker *moniker1; @@ -2265,18 +2331,31 @@ todo_wine ok(moniker_type == MKSYS_GENERICCOMPOSITE, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } static void test_pointer_moniker(void) { + IMoniker *moniker, *inverse; + IEnumMoniker *enummoniker; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; IStream *stream; IROTData *rotdata; @@ -2383,6 +2462,19 @@ todo_wine IBindCtx_Release(bindctx); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + IMoniker_Release(moniker); } -- 2.24.0

Dec. 19, 2019

[PATCH 1/2] ole32/tests: Add some tests for Reduce().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 47 +++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b65c0115ca..e4d693b442 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1531,12 +1531,11 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { + IMoniker *moniker, *inverse, *reduced; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; - IMoniker *inverse; IUnknown *unknown; FILETIME filetime; @@ -1597,8 +1596,6 @@ todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown); - IBindCtx_Release(bindctx); - hr = IMoniker_Inverse(moniker, &inverse); ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); @@ -1606,13 +1603,22 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bindctx); + IMoniker_Release(moniker); } static void test_file_moniker(WCHAR* path) { - IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse; + IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; DWORD moniker_type; + IBindCtx *bind_ctx; IStream *stream; IUnknown *unk; HRESULT hr; @@ -1654,6 +1660,21 @@ todo_wine hr = IMoniker_IsEqual(moniker1, moniker2); ok_ole_success(hr, IsEqual); + /* Reduce() */ + hr = CreateBindCtx(0, &bind_ctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, NULL, MKRREDUCE_ALL, NULL, &reduced); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, bind_ctx, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker1, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bind_ctx); + IStream_Release(stream); if (moniker1) IMoniker_Release(moniker1); @@ -1761,7 +1782,7 @@ static void test_item_moniker(void) { L"%", L"A", 0x41 }, { L"%", L"a", 0x41 }, }; - IMoniker *moniker, *moniker2; + IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; DWORD hash; @@ -1919,6 +1940,12 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IMoniker_Release(moniker); /* IsEqual */ @@ -1961,13 +1988,12 @@ static void stream_write_dword(IStream *stream, DWORD value) static void test_anti_moniker(void) { - IMoniker *moniker, *moniker2, *moniker3; + IMoniker *moniker, *moniker2, *moniker3, *inverse, *reduced; HRESULT hr; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; IStream *stream; @@ -2143,6 +2169,11 @@ todo_wine IStream_Release(stream); + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); -- 2.24.0

Dec. 19, 2019

Re: [PATCH] wininet: Add missing schemes to url_schemes.

by Vijay Kiran Kamuju

Hi Jacek, There is a spell mistake it should be L"gopher", not L"gohper", Thanks, Vijay On Thu, Dec 19, 2019 at 2:51 PM Jacek Caban <jacek(a)codeweavers.com> wrote: > > > Fixes res URL scheme handling. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/wininet/internet.c | 20 ++++++++++---------- > dlls/wininet/tests/url.c | 5 ++++- > 2 files changed, 14 insertions(+), 11 deletions(-) > >

Dec. 19, 2019

[PATCH] wininet: Add missing schemes to url_schemes.

by Jacek Caban

Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 20 ++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 14 insertions(+), 11 deletions(-)

Dec. 19, 2019

[PATCH] rpcrt4: Support VT_BSTR in get_param_pointer_info.

by Jacek Caban

Fixes a leak in typelib marshaller. Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This was reported as a typelib marshaller rewrite regression. dlls/rpcrt4/ndr_typelib.c | 6 ++++++ 1 file changed, 6 insertions(+)

Dec. 19, 2019

Re: [PATCH v2] msvcrt: Implement strtod without using 'long double'.

by Alexandre Julliard

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > v2: Fix test results on 32-bit Debian *sigh* > > Fixes the "regression" with cl.exe caused by > 0e183cc3c0d3b6f89f79047cdd71c389afc75073. > ( https://bugs.winehq.org/show_bug.cgi?id=48160 ) > > Best, > Erich > > From 9742794ff106d76713f80c6497accc1fc78ae6c9 Mon Sep 17 00:00:00 2001 > From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> > Date: Wed, 18 Dec 2019 15:48:11 -0700 > Subject: msvcrt: Implement strtod without using 'long double'. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48160 > Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> > --- > dlls/msvcrt/string.c | 60 ++++++++++++++++++++++++++------------ > dlls/msvcrt/tests/string.c | 44 ++++++++++++++++++++++++++-- > 2 files changed, 83 insertions(+), 21 deletions(-) Thanks! Do we still need the control87 call then? Also we should do the same changes in wcstod(). -- Alexandre Julliard julliard(a)winehq.org

Dec. 19, 2019

Re: [PATCH 0/3] RFC: Implement MemoryWorkingSetExInformation.

by Paul Gofman

On 12/19/19 00:28, Alexandre Julliard wrote: > Andrew Wesie <awesie(a)gmail.com> writes: > >> If someone has an alternative approach, or there is appetite using the staging >> stub in upstream Wine, that would be very welcome feedback. > If the partial stub is enough to make the application happy, that's good > enough for now. Adding a more correct but more expensive solution can > wait until we find an app that requires it. > Just for consideration, I would like to point out that there is a set of native API functions most of DRM / anticheats calling these days (various NtQuery... functions at the first place). Many of their information classes are not implemented or implemented as simplistic stubs in various out of tree patches. Every time you test such a stuff in the applications you hit a number of these stubs and always have to suspect that this can have something to do with the problem. Sometimes it is, often not. Sorting this out takes a lot of time. So even if there is no application we currently know for sure depending on a correct implementation, still having the correct implementation for (some more) information classes would help greatly in this aspect. It seems to me that NtQueryVirtualMemory() and NtQueryInformationProcess(..., SystemModuleInformation / SystemModuleInformationEx) are currently the top hits.

Dec. 19, 2019

Re: [PATCH] dmime: IDirectMusicPerformance8_FreePMsg Release the unknown pointer.

by Alistair Leslie-Hughes

Hi Michael, I have another patch that causes this function to be called (faking a set notification). So, Yes it's currently a noop but it's small and not going to effect anything. I happy for it to be differed for required. Alistair. On 19/12/19 7:55 am, Michael Stefaniuc wrote: > Hello Alistair, > > while this patch is technically correct > https://nam02.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdoc.51wind… > I'm wondering why it was triggered by bug #25728 (comments 34 and 35). > > I don't see a FreePMsg in the log > https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.wine… > I also don't see a FreePMsg in any of the logs I have. > Nor in the attachments of all directx-dmusic bugs. > > Also we don't set punkUser anywhere in the whole Wine code > > wine$ git grep -n punkUser > dlls/dmime/performance.c:482: if (pPMSG->punkUser) > dlls/dmime/performance.c:483: IUnknown_Release(pPMSG->punkUser); > dlls/dmime/tests/performance.c:447: ok(msg->punkUser != NULL, > "Unexpected NULL pointer\n"); > dlls/dmime/tests/performance.c:448: if (msg->punkUser) { > dlls/dmime/tests/performance.c:452: hr = > IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, > (void**)&segmentstate); > include/dmusici.h:363: IUnknown* punkUser; > > While we seem to have a test that checks for non-NULL punkUser, that > test doesn't runs on Wine. Changing to ok(msg->punkUser == NULL, ...) > still passes on Wine. > That test does run on Windows though > https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftestbot.w… > > > So this patch is a no-op for now iff we allocate zero all the messages. > Else we might crash on uninitialized memory. So it does sound like a > "Deferred" to me. > > > bye > michael > > > > On 12/18/19 6:17 AM, Alistair Leslie-Hughes wrote: >> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> >> --- >> dlls/dmime/performance.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c >> index 9dbb469f388..a63bd3b4517 100644 >> --- a/dlls/dmime/performance.c >> +++ b/dlls/dmime/performance.c >> @@ -479,7 +479,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma >> DMUS_ItemRemoveFromQueue( This, pItem ); >> LeaveCriticalSection(&This->safe); >> >> - /** TODO: see if we should Release the pItem->pMsg->punkUser and others Interfaces */ >> + if (pPMSG->punkUser) >> + IUnknown_Release(pPMSG->punkUser); >> + >> HeapFree(GetProcessHeap(), 0, pItem); >> return S_OK; >> } >> >

Dec. 19, 2019

Re: [PATCH] ws2_32: enable a WSAEnumNetworkEvents test that never runs

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=62335 Your paranoid android. === wvistau64 (32 bit report) === ws2_32: sock.c:11455: Test failed: got 0 sock.c:11456: Test failed: got 00000000 sock.c:11457: Test failed: got 0000 sock.c:11458: Test failed: got 00000000 sock.c:11459: Test failed: got 00000000 === debian10 (32 bit report) === ws2_32: sock.c:3057: Test succeeded inside todo block: Test[1]: expected 0, got 0 === debian10 (32 bit WoW report) === ws2_32: sock.c:3051: Test failed: Test[1]: expected 2, got 0 sock.c:3051: Test failed: Test[2]: expected 2, got 0 sock.c:3051: Test failed: Test[1]: expected 2, got 0 sock.c:3051: Test failed: Test[2]: expected 2, got 0

Dec. 19, 2019

[PATCH] ws2_32: enable a WSAEnumNetworkEvents test that never runs

by Damjan Jovanovic

In test_WSAEnumNetworkEvents(), a test's condition is always false as the preceding "if" requires the opposite condition. The test already passes. Enable it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

Dec. 19, 2019