wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Serge Gautherie : psapi/tests: NtQueryVirtualMemory() 3rd parameter is MEMORY_INFORMATION_CLASS, not ULONG.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: fbda6efe95064114aaeb92df97f4e2a293598bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbda6efe95064114aaeb92df… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sun Mar 15 01:45:10 2020 +0100 psapi/tests: NtQueryVirtualMemory() 3rd parameter is MEMORY_INFORMATION_CLASS, not ULONG. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0df247e9bf..0ea1b1f6f1 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -39,7 +39,7 @@ #include "wine/test.h" static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); -static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); +static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, MEMORY_INFORMATION_CLASS, PVOID, SIZE_T, SIZE_T *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *);

1 0

Serge Gautherie : include: Remove comment about now old NTDDI_VERSION.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: a48211a2b79d58f756c9220cb935bfec0a8a8e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48211a2b79d58f756c9220c… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 14 18:06:51 2020 +0100 include: Remove comment about now old NTDDI_VERSION. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mssip.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/mssip.h b/include/mssip.h index c14f02de5f..ee225f1cbe 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -157,7 +157,6 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszIsFunctionNameFmt2; - /* NTDDI_VERSION >= NTDDI_WIN8 */ WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h>

1 0

Serge Gautherie : shell32/tests: Remove now useless forced 0x0501 API versions.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 8fc0b7d525ae5e85b5a796eaf6572d22591e02c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fc0b7d525ae5e85b5a796ea… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 14 18:06:33 2020 +0100 shell32/tests: Remove now useless forced 0x0501 API versions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0bc7eab0cd..eec1a63d38 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -30,11 +30,6 @@ * we could check */ -/* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ -#define NTDDI_WINXPSP1 0x05010100 -#define NTDDI_VERSION NTDDI_WINXPSP1 -#define _WIN32_WINNT 0x0501 - #include <stdio.h> #include <assert.h>

1 0

Serge Gautherie : rpcrt4/tests: Remove now useless forced 0x0500 API versions.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 57f08ba5259e56ae681bab1e61f86d6e8ab96f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57f08ba5259e56ae681bab1e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 14 18:06:14 2020 +0100 rpcrt4/tests: Remove now useless forced 0x0500 API versions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e4a4c6a727..b206c37b23 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0500 -#define NTDDI_WIN2K 0x05000000 -#define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ #define COBJMACROS #include <stdarg.h>

1 0

Dmitry Timoshkov : wldap32/tests: Add ldap_bind_s test.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 56c1590dfe6f8202c5fdb8c338b258a4ab74530e URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c1590dfe6f8202c5fdb8c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 10 15:41:41 2020 +0800 wldap32/tests: Add ldap_bind_s test. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/tests/parse.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index c4c97e1157..d96ae654bf 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -2,6 +2,7 @@ * test parsing functions * * Copyright 2008 Hans Leidekker for CodeWeavers + * Copyright 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,10 @@ #include "wine/test.h" +#ifndef LDAP_AUTH_SIMPLE +#define LDAP_AUTH_SIMPLE 0x80 +#endif + static void test_ldap_parse_sort_control( LDAP *ld ) { ULONG ret, result; @@ -132,10 +137,39 @@ static void test_ldap_get_optionW( LDAP *ld ) ok( version == LDAP_VERSION3, "got %u\n", version ); } +static void test_ldap_bind_sA( void ) +{ + LDAP *ld; + ULONG ret; + int version; + + ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + version = LDAP_VERSION3; + ret = ldap_set_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip( "test server can't be reached\n" ); + ldap_unbind( ld ); + return; + } + + ret = ldap_connect( ld, NULL ); + ok( !ret, "ldap_connect failed 0x%08x\n", ret ); + + ret = ldap_bind_sA( ld, (char *)"CN=read-only-admin,DC=example,DC=com", (char *)"password", LDAP_AUTH_SIMPLE ); + ok( !ret, "ldap_bind_s failed 0x%08x\n", ret ); + + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; + test_ldap_bind_sA(); + ld = ldap_initA((char *)"ldap.itd.umich.edu", 389 ); ok( ld != NULL, "ldap_init failed\n" );

1 0

Zebediah Figura : winegstreamer: Clamp both timestamp and timestamp + diff to 0.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 5ca1d28e8df7e3e87e5b9f3ff51445b07dfcc2fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ca1d28e8df7e3e87e5b9f3f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 21:28:26 2020 -0500 winegstreamer: Clamp both timestamp and timestamp + diff to 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2e3fbd2925..d2f5072235 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1965,6 +1965,8 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil { struct gstdemux_source *pin = impl_from_IQualityControl(iface); GstQOSType type = GST_QOS_TYPE_OVERFLOW; + GstClockTime timestamp; + GstClockTimeDiff diff; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1974,16 +1976,23 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil mark_wine_thread(); - if (qm.Type == Flood) - qm.Late = 0; - /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but * DirectShow filters might use Famine, so check that there actually is an * underrun. */ if (qm.Type == Famine && qm.Proportion > 1000) type = GST_QOS_TYPE_UNDERFLOW; - evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); + /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the + * current time instead of the time of the last buffer). GstClockTime is + * unsigned, so clamp it to 0. */ + timestamp = max(qm.TimeStamp * 100, 0); + + /* The documentation specifies that timestamp + diff must be nonnegative. */ + diff = qm.Late * 100; + if (timestamp < -diff) + diff = -timestamp; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp); if (!evt) { WARN("Failed to create QOS event\n");

1 0

Zebediah Figura : winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 38c50751fe0a5ca104ca17728a3db95d95900243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c50751fe0a5ca104ca1772… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 21:28:25 2020 -0500 winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9d7f85b82d..2e3fbd2925 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1964,6 +1964,7 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); + GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1976,8 +1977,13 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil if (qm.Type == Flood) qm.Late = 0; - evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + * DirectShow filters might use Famine, so check that there actually is an + * underrun. */ + if (qm.Type == Famine && qm.Proportion > 1000) + type = GST_QOS_TYPE_UNDERFLOW; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); if (!evt) { WARN("Failed to create QOS event\n");

1 0

Francois Gouget : shell32/tests: Fix some wording issues in shlexec comments.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 1ac9bf9e45beccbfa8ca3ce7a081aa5ef82f969e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ac9bf9e45beccbfa8ca3ce7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 15 14:30:32 2020 +0100 shell32/tests: Fix some wording issues in shlexec comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54525..0bc7eab0cd 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1105,12 +1105,12 @@ static void test_lpFile_parsed(void) return; } - /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); - /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* if quoted, existing "drawback_file.noassoc" does not prevent finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, @@ -1127,7 +1127,7 @@ static void test_lpFile_parsed(void) todo_wine okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win9x/2000 */, "failed: rc=%lu\n", rc); - /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ + /* nonexistent "drawback_nonexist.noassoc" does not prevent finding "drawback_nonexist.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_nonexist.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc);

1 0

Francois Gouget : gameux/tests: Avoid an ever changing value in a gamestatistics failure message.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 142c8df4041c5ea2329a6328f1b1acaf495ce9fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=142c8df4041c5ea2329a6328… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 23:56:34 2020 +0100 gameux/tests: Avoid an ever changing value in a gamestatistics failure message. The whole point of printing the IGameStatisticsMgr::GetGameStatistics() return value was to check whether the pointer had been modified. So provide this information without including an ever changing value in the failure message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index d823af1aab..8d4da4a0f4 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -181,7 +181,8 @@ static void test_gamestatisticsmgr( void ) gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); - ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs); + ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", + (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef")); /* now, allow them to be created */ hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs);

1 0

Alistair Leslie-Hughes : dmime: Free more interfaces in IDirectMusicPerformance FreePMsg.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: b28512f6c7ac325fce63003a1c6cdbfed34a589e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b28512f6c7ac325fce63003a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 16 06:59:22 2020 +0000 dmime: Free more interfaces in IDirectMusicPerformance FreePMsg. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b7b71637a1..f535fe888f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -535,6 +535,12 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma DMUS_ItemRemoveFromQueue( This, pItem ); LeaveCriticalSection(&This->safe); + if (pPMSG->pTool) + IDirectMusicTool_Release(pPMSG->pTool); + + if (pPMSG->pGraph) + IDirectMusicGraph_Release(pPMSG->pGraph); + if (pPMSG->punkUser) IUnknown_Release(pPMSG->punkUser);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020