wine-devel September 2019

wine-devel@winehq.org

76 participants
616 discussions

[PATCH 1/3] msscript.ocx: Move set_script_state to the top.
by Gabriel Ivăncescu 27 Sep '19

27 Sep '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These helpers will be needed by more methods and other helpers (such as the next patch) so it's better to place them at the top and avoid pointless forward declarations. dlls/msscript.ocx/msscript.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 816a99d..9cb8282 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -200,6 +200,16 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam return NULL; } +static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) +{ + HRESULT hr; + + hr = IActiveScript_SetScriptState(host->script, state); + if (SUCCEEDED(hr)) + host->script_state = state; + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -954,16 +964,6 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, return hr; } -static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) -{ - HRESULT hr; - - hr = IActiveScript_SetScriptState(host->script, state); - if (SUCCEEDED(hr)) - host->script_state = state; - return hr; -} - static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface); -- 2.21.0

2 6

[PATCH] kernel32/tests: Fix a test failure on Windows XP.
by Sven Baars 27 Sep '19

27 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/kernel32/tests/actctx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 2b8c3d710a..0dad5cb785 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3303,8 +3303,8 @@ static void get_application_directory(char *buffer, int buffer_size) /* Test loading two sxs dlls at the same time */ static void test_two_dlls_at_same_time(void) { - sxs_info dll_1; - sxs_info dll_2; + sxs_info dll_1 = {0}; + sxs_info dll_2 = {0}; char path1[MAX_PATH], path2[MAX_PATH]; if (!fill_sxs_info(&dll_1, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE)) -- 2.17.1

2 2

[PATCH] httpapi/tests: Use CancelIo to avoid a test failure on Windows XP.
by Sven Baars 27 Sep '19

27 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/httpapi/tests/httpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index abc5c95f0c..5c3b4ec13c 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -534,7 +534,7 @@ static void test_v1_short_buffer(void) ok(!ret, "Got error %u.\n", ret); ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); - CancelIoEx(queue, &ovl); + CancelIo(queue); ret = HttpRemoveUrl(queue, localhost_urlW); ok(!ret, "Got error %u.\n", ret); -- 2.17.1

2 1

[PATCH v2] msvcrt: Implement %T format for strftime
by Andrew Eikum 27 Sep '19

27 Sep '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix format string warning in tests. dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 12 ++++++++++++ dlls/ucrtbase/tests/misc.c | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 2b1c781b059..fea7ca19db4 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%T", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e6493b09aff..b7d11e0543a 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1193,6 +1193,18 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break; +#if _MSVCR_VER>=140 + case 'T': + if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) + return 0; + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) + return 0; + break; +#endif case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 4da6abff73e..bb0c2e3a0a2 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -136,6 +136,7 @@ static int (CDECL *p_fesetround)(int); static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); +static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); @@ -499,6 +500,7 @@ static BOOL init(void) p___setusermatherr = (void*)GetProcAddress(module, "__setusermatherr"); p_errno = (void*)GetProcAddress(module, "_errno"); p_asctime = (void*)GetProcAddress(module, "asctime"); + p_strftime = (void*)GetProcAddress(module, "strftime"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); @@ -887,6 +889,21 @@ static void test_asctime(void) ok(!strcmp(ret, "Thu Jan 1 00:00:00 1970\n"), "asctime returned %s\n", ret); } +static void test_strftime(void) +{ + const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + char bufA[256]; + size_t retA; + + retA = p_strftime(bufA, sizeof(bufA), "%T", &epoch); + ok(retA == 8, "expected 8, got %d\n", (int)retA); + ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#T", &epoch); + ok(retA == 5, "expected 5, got %d\n", (int)retA); + ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); +} + static LONG* get_failures_counter(HANDLE *map) { *map = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, @@ -1132,6 +1149,7 @@ START_TEST(misc) test_isblank(); test_math_errors(); test_asctime(); + test_strftime(); test_exit(arg_v[0]); test_quick_exit(arg_v[0]); test__stat32(); -- 2.23.0

2 1

[PATCH] x3daudio: fix lib exports
by Rafał Mużyło 27 Sep '19

27 Sep '19

x3daudio: fix lib exports 1. in case of x3daudio1_{0,1,2}, two exported functions are for some reason decorated 2. tests show these functions should be stdcall, not cdecl Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl>

3 4

[PATCH] msvcrt: Implement %T format for strftime
by Andrew Eikum 27 Sep '19

27 Sep '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 12 ++++++++++++ dlls/ucrtbase/tests/misc.c | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 2b1c781b059..fea7ca19db4 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%T", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e6493b09aff..b7d11e0543a 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1193,6 +1193,18 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break; +#if _MSVCR_VER>=140 + case 'T': + if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) + return 0; + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) + return 0; + break; +#endif case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 4da6abff73e..417e140893a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -136,6 +136,7 @@ static int (CDECL *p_fesetround)(int); static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); +static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); @@ -499,6 +500,7 @@ static BOOL init(void) p___setusermatherr = (void*)GetProcAddress(module, "__setusermatherr"); p_errno = (void*)GetProcAddress(module, "_errno"); p_asctime = (void*)GetProcAddress(module, "asctime"); + p_strftime = (void*)GetProcAddress(module, "strftime"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); @@ -887,6 +889,21 @@ static void test_asctime(void) ok(!strcmp(ret, "Thu Jan 1 00:00:00 1970\n"), "asctime returned %s\n", ret); } +static void test_strftime(void) +{ + const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + char bufA[256]; + size_t retA; + + retA = p_strftime(bufA, sizeof(bufA), "%T", &epoch); + ok(retA == 8, "expected 8, got %ld\n", retA); + ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#T", &epoch); + ok(retA == 5, "expected 5, got %ld\n", retA); + ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); +} + static LONG* get_failures_counter(HANDLE *map) { *map = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, @@ -1132,6 +1149,7 @@ START_TEST(misc) test_isblank(); test_math_errors(); test_asctime(); + test_strftime(); test_exit(arg_v[0]); test_quick_exit(arg_v[0]); test__stat32(); -- 2.23.0

2 1

[v2 PATCH 1/2] mf: Fix stream IID loader should be testing for.
by Nikolay Sivov 27 Sep '19

27 Sep '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fix variable type too, thanks Zebediah. dlls/mf/topology.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e48792eab6..926fd48747 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1726,7 +1726,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in IMFTopology **output_topology, IMFTopology *current_topology) { struct topology *topology = unsafe_impl_from_IMFTopology(input_topology); - IMFMediaSink *sink; + IMFStreamSink *sink; HRESULT hr; size_t i; @@ -1745,9 +1745,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (node->object) { /* Sinks must be bound beforehand. */ - if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFMediaSink, (void **)&sink))) + if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFStreamSink, (void **)&sink))) return MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; - IMFMediaSink_Release(sink); + IMFStreamSink_Release(sink); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: -- 2.23.0

1 1

[PATCH v2] dsound: Primary buffer doesn't support flag DSBCAPS_CTRLFX.
by Alistair Leslie-Hughes 27 Sep '19

27 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40740 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- Fix failing tests. dlls/dmime/performance.c | 1 + dlls/dsound/dsound.c | 6 +++++ dlls/dsound/tests/dsound8.c | 50 +++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 6e4dae6be7..b7b4d01017 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1064,6 +1064,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire /* Update description for creating primary buffer */ desc.dwFlags |= DSBCAPS_PRIMARYBUFFER; + desc.dwFlags &= ~DSBCAPS_CTRLFX; desc.dwBufferBytes = 0; desc.lpwfxFormat = NULL; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index f3030d6834..8e2b839fe8 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -451,6 +451,12 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } + if (dsbd->dwFlags & DSBCAPS_CTRLFX) + { + WARN("Invalid parameter DSBCAPS_CTRLFX\n"); + return DSERR_INVALIDPARAM; + } + if (device->primary) { WARN("Primary Buffer already created\n"); IDirectSoundBuffer8_AddRef(&device->primary->IDirectSoundBuffer8_iface); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 6ed32abbcb..b66275973f 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1173,6 +1173,55 @@ static void test_COM(void) while (IUnknown_Release(unk)); } +static void test_primary_flags(void) +{ + HRESULT rc; + IDirectSound8 *dso; + IDirectSoundBuffer *primary = NULL; + IDirectSoundFXI3DL2Reverb *reverb; + DSBUFFERDESC bufdesc; + DSCAPS dscaps; + + /* Create a DirectSound8 object */ + rc = pDirectSoundCreate8(NULL, &dso, NULL); + ok(rc == DS_OK || rc==DSERR_NODRIVER, "Failed: %08x\n",rc); + + if (rc!=DS_OK) + return; + + rc = IDirectSound8_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); + ok(rc == DS_OK,"Failed: %08x\n", rc); + if (rc != DS_OK) { + IDirectSound8_Release(dso); + return; + } + + dscaps.dwSize = sizeof(dscaps); + rc = IDirectSound8_GetCaps(dso, &dscaps); + ok(rc == DS_OK,"Failed: %08x\n", rc); + trace("0x%x\n", dscaps.dwFlags); + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLFX; + rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); + ok(rc == E_INVALIDARG, "got %08x\n", rc); + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRL3D; + rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); + ok((rc == DS_OK && primary != NULL), "Failed to create a primary buffer: %08x\n", rc); + if (rc == DS_OK) { + rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundFXI3DL2Reverb, (LPVOID*)&reverb); + ok(rc==E_NOINTERFACE,"Failed: %08x\n", rc); + + IDirectSoundBuffer_Release(primary); + } + + IDirectSound8_Release(dso); +} + static void test_effects(void) { HRESULT rc; @@ -1711,6 +1760,7 @@ START_TEST(dsound8) dsound8_tests(); test_hw_buffers(); test_first_device(); + test_primary_flags(); test_effects(); test_effects_parameters(); } -- 2.23.0

2 1

[PATCH] msxml3: Don't return NULL namespace and local name in saxreader callbacks.
by Piotr Caban 27 Sep '19

27 Sep '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msxml3/saxreader.c | 10 ++++++---- dlls/msxml3/tests/saxreader.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-)

2 1

[PATCH 1/2] mf: Fix stream IID loader should be testing for.
by Nikolay Sivov 27 Sep '19

27 Sep '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e48792eab6..14f6a39be5 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1745,7 +1745,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (node->object) { /* Sinks must be bound beforehand. */ - if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFMediaSink, (void **)&sink))) + if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFStreamSink, (void **)&sink))) return MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; IMFMediaSink_Release(sink); } -- 2.23.0

1 1

← Newer
1
...
5
6
7
8
9
10
11
...
62
Older →

Jump to page:

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-devel September 2019