October 2019 - Wine-commits

Nikolay Sivov : wined3d: Fail UAV creation for resources without corresponding bind flag.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 97ef647837dd1d1ca538cd984a823a88d3af4354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97ef647837dd1d1ca538cd98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 1 16:40:24 2019 +0300 wined3d: Fail UAV creation for resources without corresponding bind flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 16 +++++++++++++++- dlls/wined3d/view.c | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 456d34470c..da4627d7a8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -17239,7 +17239,7 @@ static void test_create_unordered_access_view(void) ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); - ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); memset(&uav_desc, 0, sizeof(uav_desc)); ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc); @@ -17254,6 +17254,20 @@ static void test_create_unordered_access_view(void) ID3D11UnorderedAccessView_Release(uav); ID3D11Buffer_Release(buffer); + /* Without D3D11_BIND_UNORDERED_ACCESS. */ + buffer = create_buffer(device, 0, 1024, NULL); + + uav_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = 64; + U(uav_desc).Buffer.Flags = 0; + + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D11Buffer_Release(buffer); + texture2d_desc.Width = 512; texture2d_desc.Height = 512; texture2d_desc.SampleDesc.Count = 1; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f1c99a3b6a..6710abb270 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1134,6 +1134,8 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->parent = parent; view->parent_ops = parent_ops; + if (!(resource->bind_flags & WINED3D_BIND_UNORDERED_ACCESS)) + return E_INVALIDARG; if (!(view->format = validate_resource_view(desc, resource, TRUE, FALSE))) return E_INVALIDARG; view->desc = *desc;

1 0

Nikita Morozkin : advapi32: Stub SetPrivateObjectSecurityEx().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: c27ee58420b08db8f116548637b19348870ff8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c27ee58420b08db8f1165486… Author: Nikita Morozkin <nmzikcs(a)gmail.com> Date: Thu Sep 26 14:01:28 2019 -0400 advapi32: Stub SetPrivateObjectSecurityEx(). Signed-off-by: Nikita Morozkin <nmzikcs(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 11 +++++++++++ include/winbase.h | 1 + 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 3db5612c61..54b479dc5d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -749,7 +749,7 @@ # @ stub SetNamedSecurityInfoExW @ stdcall SetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr) @ stdcall -import SetPrivateObjectSecurity(long ptr ptr ptr long) -# @ stub SetPrivateObjectSecurityEx +@ stdcall -import SetPrivateObjectSecurityEx(long ptr ptr long ptr long) # @ stub SetSecurityAccessMask @ stdcall -import SetSecurityDescriptorControl(ptr long long) @ stdcall -import SetSecurityDescriptorDacl(ptr long ptr long) diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index b831e873f8..097c313303 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -86,7 +86,7 @@ @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW @ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity -@ stub SetPrivateObjectSecurityEx +@ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) advapi32.SetPrivateObjectSecurityEx @ stub SetSecurityAccessMask @ stdcall SetSecurityDescriptorControl(ptr long long) advapi32.SetSecurityDescriptorControl @ stdcall SetSecurityDescriptorDacl(ptr long ptr long) advapi32.SetSecurityDescriptorDacl diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 93472ac6c8..b80ce69360 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -91,7 +91,7 @@ @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW @ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity -@ stub SetPrivateObjectSecurityEx +@ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) advapi32.SetPrivateObjectSecurityEx @ stub SetSecurityAccessMask @ stdcall SetSecurityDescriptorControl(ptr long long) advapi32.SetSecurityDescriptorControl @ stdcall SetSecurityDescriptorDacl(ptr long ptr long) advapi32.SetSecurityDescriptorDacl diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b582b3d092..7d86399af5 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1451,7 +1451,7 @@ @ stdcall SetNamedPipeHandleState(long ptr ptr ptr) @ stdcall SetPriorityClass(long long) @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) -@ stub SetPrivateObjectSecurityEx +@ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) @ stdcall SetProcessAffinityUpdateMode(long long) # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 34734b566c..327172c236 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -1151,6 +1151,17 @@ BOOL WINAPI SetPrivateObjectSecurity( SECURITY_INFORMATION info, PSECURITY_DESCR return TRUE; } +/************************************************************************* + * SetPrivateObjectSecurityEx (kernelbase.@) + */ +BOOL WINAPI SetPrivateObjectSecurityEx( SECURITY_INFORMATION info, PSECURITY_DESCRIPTOR descr, + PSECURITY_DESCRIPTOR *obj_descr, ULONG flags, + PGENERIC_MAPPING mapping, HANDLE token ) +{ + FIXME( "0x%08x %p %p %u %p %p - stub\n", info, descr, obj_descr, flags, mapping, token ); + return TRUE; +} + /****************************************************************************** * SetSecurityDescriptorControl (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 83a09d8473..90179b3d85 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2654,6 +2654,7 @@ WINBASEAPI BOOL WINAPI SetMailslotInfo(HANDLE,DWORD); WINBASEAPI BOOL WINAPI SetNamedPipeHandleState(HANDLE,LPDWORD,LPDWORD,LPDWORD); WINBASEAPI BOOL WINAPI SetPriorityClass(HANDLE,DWORD); WINADVAPI BOOL WINAPI SetPrivateObjectSecurity(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,PGENERIC_MAPPING,HANDLE); +WINADVAPI BOOL WINAPI SetPrivateObjectSecurityEx(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,ULONG,PGENERIC_MAPPING,HANDLE); WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD);

1 0

Gabriel Ivăncescu : msscript.ocx/tests: Add tests for IScriptControl::Run.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 5dbe0e3be8ba66a793beaf094766b408fc39bab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dbe0e3be8ba66a793beaf09… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 1 14:38:14 2019 +0300 msscript.ocx/tests: Add tests for IScriptControl::Run. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 385 ++++++++++++++++++++++++++++++++++++- 1 file changed, 383 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5dbe0e3be8ba66a793be…

1 0

Nikolay Sivov : mf: Partially implement topology cloning.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 0d41926cc067eec06bd0bf3114a4ca6c0e7e2b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d41926cc067eec06bd0bf31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 1 16:35:32 2019 +0300 mf: Partially implement topology cloning. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 - dlls/mf/topology.c | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4eba79e120..b221398a71 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1308,7 +1308,6 @@ todo_wine { ok(value == MF_TOPOLOGY_RESOLUTION_SUCCEEDED, "Unexpected value %#x.\n", value); } hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); -todo_wine ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology2, "Unexpected instance.\n"); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 926fd48747..dacb57d264 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -111,6 +111,8 @@ static struct topology_node *unsafe_impl_from_IMFTopologyNode(IMFTopologyNode *i return impl_from_IMFTopologyNode(iface); } +static struct topology *unsafe_impl_from_IMFTopology(IMFTopology *iface); + static struct topology_loader *impl_from_IMFTopoLoader(IMFTopoLoader *iface) { return CONTAINING_RECORD(iface, struct topology_loader, IMFTopoLoader_iface); @@ -574,14 +576,11 @@ static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID i return MF_E_NOT_FOUND; } -static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node_iface) +static HRESULT topology_add_node(struct topology *topology, IMFTopologyNode *node_iface) { - struct topology *topology = impl_from_IMFTopology(iface); struct topology_node *node = unsafe_impl_from_IMFTopologyNode(node_iface); struct topology_node *match; - TRACE("%p, %p.\n", iface, node_iface); - if (!node) return E_POINTER; @@ -603,6 +602,15 @@ static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node return S_OK; } +static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node) +{ + struct topology *topology = impl_from_IMFTopology(iface); + + TRACE("%p, %p.\n", iface, node); + + return topology_add_node(topology, node); +} + static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *node) { struct topology *topology = impl_from_IMFTopology(iface); @@ -672,11 +680,41 @@ static HRESULT WINAPI topology_Clear(IMFTopology *iface) return S_OK; } -static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src_topology) +static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src) { - FIXME("(%p)->(%p)\n", iface, src_topology); + struct topology *topology = impl_from_IMFTopology(iface); + struct topology *src_topology = unsafe_impl_from_IMFTopology(src); + IMFTopologyNode *node; + HRESULT hr; + size_t i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, src); + + topology_clear(topology); + + /* Clone nodes. */ + for (i = 0; i < src_topology->nodes.count; ++i) + { + if (FAILED(hr = MFCreateTopologyNode(src_topology->nodes.nodes[i]->node_type, &node))) + { + WARN("Failed to create a node, hr %#x.\n", hr); + break; + } + + if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(node, &src_topology->nodes.nodes[i]->IMFTopologyNode_iface))) + topology_add_node(topology, node); + + IMFTopologyNode_Release(node); + } + + FIXME("Clone node connections.\n"); + + /* Copy attributes and id. */ + hr = IMFTopology_CopyAllItems(src, (IMFAttributes *)&topology->IMFTopology_iface); + if (SUCCEEDED(hr)) + topology->id = src_topology->id; + + return S_OK; } static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **ret)

1 0

Nikolay Sivov : mf: Implement initial support for starting media sources within a session.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 350a3ec6a218822ed5208c17aff7acabf74d5de9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=350a3ec6a218822ed5208c17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 1 16:35:33 2019 +0300 mf: Implement initial support for starting media sources within a session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 188 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=350a3ec6a218822ed520…

1 0

Hans Leidekker : bcrypt: Avoid recreating the hash on every iteration in BCryptDeriveKeyPBKDF2.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 02723a8856eceb9041b954f20d9b278e7c181256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02723a8856eceb9041b954f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 1 17:57:13 2019 +0200 bcrypt: Avoid recreating the hash on every iteration in BCryptDeriveKeyPBKDF2. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 49 ++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 10e0b98869..c1a0a56e99 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1578,10 +1578,9 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA } } -static NTSTATUS pbkdf2( BCRYPT_ALG_HANDLE algorithm, UCHAR *pwd, ULONG pwd_len, UCHAR *salt, ULONG salt_len, +static NTSTATUS pbkdf2( BCRYPT_HASH_HANDLE handle, UCHAR *pwd, ULONG pwd_len, UCHAR *salt, ULONG salt_len, ULONGLONG iterations, ULONG i, UCHAR *dst, ULONG hash_len ) { - BCRYPT_HASH_HANDLE handle = NULL; NTSTATUS status = STATUS_INVALID_PARAMETER; UCHAR bytes[4], *buf; ULONG j, k; @@ -1590,16 +1589,15 @@ static NTSTATUS pbkdf2( BCRYPT_ALG_HANDLE algorithm, UCHAR *pwd, ULONG pwd_len, for (j = 0; j < iterations; j++) { - status = BCryptCreateHash( algorithm, &handle, NULL, 0, pwd, pwd_len, 0 ); - if (status != STATUS_SUCCESS) - goto done; - if (j == 0) { /* use salt || INT(i) */ status = BCryptHashData( handle, salt, salt_len, 0 ); if (status != STATUS_SUCCESS) - goto done; + { + heap_free( buf ); + return status; + } bytes[0] = (i >> 24) & 0xff; bytes[1] = (i >> 16) & 0xff; bytes[2] = (i >> 8) & 0xff; @@ -1608,21 +1606,22 @@ static NTSTATUS pbkdf2( BCRYPT_ALG_HANDLE algorithm, UCHAR *pwd, ULONG pwd_len, } else status = BCryptHashData( handle, buf, hash_len, 0 ); /* use U_j */ if (status != STATUS_SUCCESS) - goto done; + { + heap_free( buf ); + return status; + } status = BCryptFinishHash( handle, buf, hash_len, 0 ); if (status != STATUS_SUCCESS) - goto done; + { + heap_free( buf ); + return status; + } if (j == 0) memcpy( dst, buf, hash_len ); else for (k = 0; k < hash_len; k++) dst[k] ^= buf[k]; - - BCryptDestroyHash( handle ); - handle = NULL; } -done: - BCryptDestroyHash( handle ); heap_free( buf ); return status; } @@ -1632,6 +1631,7 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO { struct algorithm *alg = handle; ULONG hash_len, block_count, bytes_left, i; + BCRYPT_HASH_HANDLE hash; UCHAR *partial; NTSTATUS status; @@ -1646,26 +1646,39 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO block_count = 1 + ((dk_len - 1) / hash_len); /* ceil(dk_len / hash_len) */ bytes_left = dk_len - (block_count - 1) * hash_len; + status = BCryptCreateHash( handle, &hash, NULL, 0, pwd, pwd_len, BCRYPT_HASH_REUSABLE_FLAG ); + if (status != STATUS_SUCCESS) + return status; + /* full blocks */ for (i = 1; i < block_count; i++) { - status = pbkdf2( handle, pwd, pwd_len, salt, salt_len, iterations, i, dk + ((i - 1) * hash_len), hash_len ); + status = pbkdf2( hash, pwd, pwd_len, salt, salt_len, iterations, i, dk + ((i - 1) * hash_len), hash_len ); if (status != STATUS_SUCCESS) + { + BCryptDestroyHash( hash ); return status; + } } /* final partial block */ - if (!(partial = heap_alloc( hash_len ))) return STATUS_NO_MEMORY; + if (!(partial = heap_alloc( hash_len ))) + { + BCryptDestroyHash( hash ); + return STATUS_NO_MEMORY; + } - status = pbkdf2( handle, pwd, pwd_len, salt, salt_len, iterations, block_count, partial, hash_len ); + status = pbkdf2( hash, pwd, pwd_len, salt, salt_len, iterations, block_count, partial, hash_len ); if (status != STATUS_SUCCESS) { + BCryptDestroyHash( hash ); heap_free( partial ); return status; } memcpy( dk + ((block_count - 1) * hash_len), partial, bytes_left ); - heap_free( partial ); + BCryptDestroyHash( hash ); + heap_free( partial ); return STATUS_SUCCESS; }

1 0

Alistair Leslie-Hughes : dsound/tests: Add some GetStatus checks.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: b360cd67e8f7f8c01f09457bacb032fd4a248d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b360cd67e8f7f8c01f09457b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 30 01:00:24 2019 +0000 dsound/tests: Add some GetStatus checks. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 41818deb17..d242bf6b24 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1063,7 +1063,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, DWORD expected) { HRESULT rc; - DWORD ret; + DWORD ret, status; rc=IDirectSoundBuffer_SetCurrentPosition(dsb,0); ok(rc==DS_OK, @@ -1076,13 +1076,22 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, if(rc!=DS_OK) return rc; + rc = IDirectSoundBuffer_GetStatus(dsb, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == DSBSTATUS_PLAYING,"got %08x\n", status); + rc=IDirectSoundBuffer_Stop(dsb); ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08x\n",rc); if(rc!=DS_OK) return rc; + rc = IDirectSoundBuffer_GetStatus(dsb, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == 0 /* Stopped */,"got %08x\n", status); + ret=WaitForMultipleObjects(count,event,FALSE,0); ok(ret==expected,"expected %d. got %d\n",expected,ret); + return rc; } @@ -1537,7 +1546,7 @@ static void test_notifications(LPGUID lpGuid) WAVEFORMATEX wfx; DSBPOSITIONNOTIFY notifies[2]; HANDLE handles[2]; - DWORD expect; + DWORD expect, status; int cycles; rc = pDirectSoundCreate(lpGuid, &dso, NULL); @@ -1607,12 +1616,20 @@ static void test_notifications(LPGUID lpGuid) ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, "Got unexpected notification order or timeout: %u\n", wait); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING),"got %08x\n", status); + expect = !expect; } rc = IDirectSoundBuffer_Stop(buf); ok(rc == DS_OK, "Stop: %08x\n", rc); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == 0,"got %08x\n", status); + CloseHandle(notifies[0].hEventNotify); CloseHandle(notifies[1].hEventNotify);

1 0

Nikolay Sivov : include: Add Media Session capabilities flags definition.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: f359c39b2c19c4918ec7dec0f2efd31a713fcf80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f359c39b2c19c4918ec7dec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 1 12:56:10 2019 +0300 include: Add Media Session capabilities flags definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 346bd38d92..43f5cd6087 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -380,6 +380,14 @@ typedef enum MF_TOPOSTATUS_ENDED = 400, } MF_TOPOSTATUS; +/* Media Session capabilities. */ +#define MFSESSIONCAP_START 0x00000001 +#define MFSESSIONCAP_SEEK 0x00000002 +#define MFSESSIONCAP_PAUSE 0x00000004 +#define MFSESSIONCAP_RATE_FORWARD 0x00000010 +#define MFSESSIONCAP_RATE_REVERSE 0x00000020 +#define MFSESSIONCAP_DOES_NOT_USE_NETWORK 0x00000040 + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue);

1 0

Vijay Kiran Kamuju : msvcrt: Implement %D format for strftime.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 1ed44b355425f048328e919ca6804fe46686c79b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ed44b355425f048328e919c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Oct 1 11:51:07 2019 +0200 msvcrt: Implement %D format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 14 ++++++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index faf1a6dcb4..1bc9f3802b 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, "%D", 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(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index c72b3ed21e..7fe8529518 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1157,6 +1157,20 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; +#if _MSVCR_VER>=140 + case 'D': + if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = '/'; + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + return 0; + if(ret < max) + str[ret++] = '/'; + if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) + return 0; + break; +#endif case 'H': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 02ea1297bb..77221566b5 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,14 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch); + ok(retA == 8, "expected 8, got %d\n", (int)retA); + ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#D", &epoch); + ok(retA == 6, "expected 6, got %d\n", (int)retA); + ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch); ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "00:00"), "got %s\n", bufA);

1 0

Vijay Kiran Kamuju : msvcrt: Implement %F format for strftime.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 5da8af40dd70344440098350570dee025bce563c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da8af40dd70344440098350… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Oct 1 11:51:08 2019 +0200 msvcrt: Implement %F format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 13 +++++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 1bc9f3802b..016c9775de 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -613,6 +613,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%F", 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(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 7fe8529518..450663fd1f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1170,6 +1170,19 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) return 0; break; + case 'F': + tmp = 1900+mstm->tm_year; + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) + return 0; + if(ret < max) + str[ret++] = '-'; + if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = '-'; + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + return 0; + break; #endif case 'H': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 77221566b5..c58b631565 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -903,6 +903,14 @@ static void test_strftime(void) ok(retA == 6, "expected 6, got %d\n", (int)retA); ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%F", &epoch); + ok(retA == 10, "expected 10, got %d\n", (int)retA); + ok(!strcmp(bufA, "1970-01-01"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#F", &epoch); + ok(retA == 8, "expected 8, got %d\n", (int)retA); + ok(!strcmp(bufA, "1970-1-1"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch); ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "00:00"), "got %s\n", bufA);

1 0