November 2020 - Wine-devel - list.winehq.org

[PATCH] dpnet: Use wide-char string literals.
by Michael Stefaniuc 17 Nov '20

17 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpnet/peer.c | 9 +++------ dlls/dpnet/tests/address.c | 21 ++++++++++----------- dlls/dpnet/tests/client.c | 16 ++++++++-------- dlls/dpnet/tests/server.c | 22 +++++++--------------- dlls/dpnet/tests/thread.c | 5 ++--- 5 files changed, 30 insertions(+), 43 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 7536af67963..329d9b3a828 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -128,12 +128,9 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, DWORD * const buf_size, DWORD * const returned) { - static const WCHAR serviceproviders[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\', - 'D','i','r','e','c','t','P','l','a','y','8','\\', - 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','s',0}; - static const WCHAR friendly[] = {'F','r','i','e','n','d','l','y',' ','N','a','m','e',0}; - static const WCHAR dp_adapterW[] = {'L','o','c','a','l',' ','A','r','e','a',' ','C','o','n','n','e','c','t','i','o','n', - ' ','-',' ','I','P','v','4',0}; + static const WCHAR serviceproviders[] = L"SOFTWARE\\Microsoft\\DirectPlay8\\Service Providers"; + static const WCHAR friendly[] = L"Friendly Name"; + static const WCHAR dp_adapterW[] = L"Local Area Connection - IPv4"; static const GUID adapter_guid = {0x4ce725f6, 0xd3c0, 0xdade, {0xba, 0x6f, 0x11, 0xf9, 0x65, 0xbc, 0x42, 0x99}}; DWORD req_size = 0; LONG res; diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index a1dcdef100d..a8d31c9854a 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -26,7 +26,7 @@ /* {6733C6E8-A0D6-450E-8C18-CEACF331DC27} */ static const GUID IID_Random = {0x6733c6e8, 0xa0d6, 0x450e, { 0x8c, 0x18, 0xce, 0xac, 0xf3, 0x31, 0xdc, 0x27 } }; -static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; +static const WCHAR localhost[] = L"localhost"; static void create_directplay_address(void) { @@ -72,7 +72,6 @@ static void create_directplay_address(void) static void address_addcomponents(void) { - static const WCHAR UNKNOWN[] = { 'u','n','k','n','o','w','n',0 }; static const char testing[] = "testing"; HRESULT hr; IDirectPlay8Address *localaddr = NULL; @@ -92,10 +91,10 @@ static void address_addcomponents(void) WCHAR *name = NULL; /* We can add any Component to the Address interface not just the predefined ones. */ - hr = IDirectPlay8Address_AddComponent(localaddr, UNKNOWN, &IID_Random, sizeof(GUID), DPNA_DATATYPE_GUID); + hr = IDirectPlay8Address_AddComponent(localaddr, L"unknown", &IID_Random, sizeof(GUID), DPNA_DATATYPE_GUID); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDirectPlay8Address_AddComponent(localaddr, UNKNOWN, &IID_Random, sizeof(GUID)+1, DPNA_DATATYPE_GUID); + hr = IDirectPlay8Address_AddComponent(localaddr, L"unknown", &IID_Random, sizeof(GUID)+1, DPNA_DATATYPE_GUID); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)+2, DPNA_DATATYPE_STRING); @@ -150,31 +149,31 @@ static void address_addcomponents(void) ok(hr == E_POINTER, "got 0x%08x\n", hr); size = sizeof(GUID)-1; - hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, NULL, &size, &type); + hr = IDirectPlay8Address_GetComponentByName(localaddr, L"unknown", NULL, &size, &type); ok(hr == E_POINTER, "got 0x%08x\n", hr); size = sizeof(GUID); - hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, NULL, &size, &type); + hr = IDirectPlay8Address_GetComponentByName(localaddr, L"unknown", NULL, &size, &type); ok(hr == E_POINTER, "got 0x%08x\n", hr); - hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, NULL, &type); + hr = IDirectPlay8Address_GetComponentByName(localaddr, L"unknown", &compguid, NULL, &type); ok(hr == E_POINTER, "got 0x%08x\n", hr); size = sizeof(GUID)-1; - hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, NULL); + hr = IDirectPlay8Address_GetComponentByName(localaddr, L"unknown", &compguid, &size, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); size = sizeof(GUID); - hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, NULL); + hr = IDirectPlay8Address_GetComponentByName(localaddr, L"unknown", &compguid, &size, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); size = sizeof(GUID)-1; - hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, &type); + hr = IDirectPlay8Address_GetComponentByName(localaddr, L"unknown", &compguid, &size, &type); ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); ok(size == sizeof(GUID), "got %d\n", size); size = sizeof(GUID); - hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, &type); + hr = IDirectPlay8Address_GetComponentByName(localaddr, L"unknown", &compguid, &size, &type); ok(IsEqualGUID(&compguid, &IID_Random), "incorrect guid\n"); ok(size == sizeof(GUID), "incorrect size got %d\n", size); ok(type == DPNA_DATATYPE_GUID, "incorrect type\n"); diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index af56d85baa3..da42e6d6951 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -33,7 +33,7 @@ static IDirectPlay8Peer* peer = NULL; static IDirectPlay8Client* client = NULL; static IDirectPlay8LobbiedApplication* lobbied = NULL; static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; -static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; +static const WCHAR localhost[] = L"127.0.0.1"; static HRESULT lastAsyncCode = E_FAIL; static DPNHANDLE lastAsyncHandle = 0xdeadbeef; @@ -91,7 +91,7 @@ static HRESULT WINAPI DirectPlayLobbyClientMessageHandler(void *context, DWORD m static void create_server(void) { - static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; + static WCHAR sessionname[] = L"winegamesserver"; HRESULT hr; IDirectPlay8Address *localaddr = NULL; DPN_APPLICATION_DESC appdesc; @@ -473,9 +473,9 @@ static void test_player_info(void) { HRESULT hr; DPN_PLAYER_INFO info; - WCHAR name[] = {'w','i','n','e',0}; - WCHAR name2[] = {'w','i','n','e','2',0}; - WCHAR data[] = {'X','X','X','X',0}; + WCHAR name[] = L"wine"; + WCHAR name2[] = L"wine2"; + WCHAR data[] = L"XXXX"; ZeroMemory( &info, sizeof(DPN_PLAYER_INFO) ); info.dwSize = sizeof(DPN_PLAYER_INFO); @@ -876,9 +876,9 @@ static void test_player_info_peer(void) { HRESULT hr; DPN_PLAYER_INFO info; - WCHAR name[] = {'w','i','n','e',0}; - WCHAR name2[] = {'w','i','n','e','2',0}; - WCHAR data[] = {'X','X','X','X',0}; + WCHAR name[] = L"wine"; + WCHAR name2[] = L"wine2"; + WCHAR data[] = L"XXXX"; ZeroMemory( &info, sizeof(DPN_PLAYER_INFO) ); info.dwSize = sizeof(DPN_PLAYER_INFO); diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index ec7b76698fc..74a0e5adfcf 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -28,7 +28,7 @@ /* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; -static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; +static WCHAR sessionname[] = L"winegamesserver"; static BOOL nCreatePlayer; static BOOL nDestroyPlayer; @@ -106,9 +106,9 @@ static void test_server_info(void) { HRESULT hr; DPN_PLAYER_INFO info; - WCHAR name[] = {'w','i','n','e',0}; - WCHAR name2[] = {'w','i','n','e','2',0}; - WCHAR data[] = {'X','X','X','X',0}; + WCHAR name[] = L"wine"; + WCHAR name2[] = L"wine2"; + WCHAR data[] = L"XXXX"; IDirectPlay8Server *server = NULL; hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); @@ -235,13 +235,6 @@ done: HRESULT set_firewall( enum firewall_op op ) { - static const WCHAR dpnsvrW[] = - {'d','p','n','s','v','r','.','e','x','e',0}; - static const WCHAR separator[] = {'\\',0}; - static const WCHAR clientW[] = - {'d','p','n','e','t','_','c','l','i','e','n','t',0}; - static const WCHAR serverW[] = - {'d','p','n','e','t','_','s','e','r','v','e','r',0}; HRESULT hr, init; INetFwMgr *mgr = NULL; INetFwPolicy *policy = NULL; @@ -262,8 +255,7 @@ HRESULT set_firewall( enum firewall_op op ) SysFreeString( image ); return E_FAIL; } - lstrcatW(path, separator); - lstrcatW(path, dpnsvrW); + lstrcatW(path, L"\\dpnsvr.exe"); init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); @@ -291,7 +283,7 @@ HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; - name = SysAllocString( clientW ); + name = SysAllocString( L"dpnet_client" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); ok( hr == S_OK, "got %08x\n", hr ); @@ -316,7 +308,7 @@ HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; - name = SysAllocString( serverW ); + name = SysAllocString( L"dpnet_server" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index d7295ac5223..d681abded91 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -119,7 +119,6 @@ static void test_enum_hosts(void) IDirectPlay8ThreadPool *pool1 = NULL; DPN_APPLICATION_DESC appdesc; DPNHANDLE async = 0, async2 = 0; - static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; DWORD threadcnt, threadorig; enumevent = CreateEventA( NULL, TRUE, FALSE, NULL); @@ -163,8 +162,8 @@ static void test_enum_hosts(void) hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); - hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), - DPNA_DATATYPE_STRING); + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, L"127.0.0.1", sizeof(L"127.0.0.1"), + DPNA_DATATYPE_STRING); ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); -- 2.26.2

1 0

[PATCH v2 1/4] amstream: Factor out the common code of MediaStreamFilter seeking tests.
by Anton Baskanov 17 Nov '20

17 Nov '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/tests/amstream.c | 412 ++++++--------------------------- 1 file changed, 67 insertions(+), 345 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c5fd5abe620..9a4d5066714 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6227,7 +6227,8 @@ static void test_mediastreamfilter_support_seeking(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_mediastreamfilter_set_positions(void) +static void check_mediastreamfilter_seeking(void (*check)(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr)) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); static const MSPID mspid1 = {0x88888888, 1}; @@ -6237,11 +6238,9 @@ static void test_mediastreamfilter_set_positions(void) struct testfilter source1; struct testfilter source2; struct testfilter source3; - LONGLONG current_position; IAMMediaStream *stream1; IAMMediaStream *stream2; IAMMediaStream *stream3; - LONGLONG stop_position; IMediaSeeking *seeking; IGraphBuilder *graph; IPin *pin1; @@ -6308,108 +6307,20 @@ static void test_mediastreamfilter_set_positions(void) hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); ok(hr == S_OK, "Got hr %#x.\n", hr); - current_position = 12345678; - stop_position = 87654321; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source2.current_position = 0xdeadbeefdeadbeefULL; - source2.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source2.current_position == 12345678, "Got current position %s.\n", - wine_dbgstr_longlong(source2.current_position)); - ok(source2.stop_position == 87654321, "Got stop position %s.\n", - wine_dbgstr_longlong(source2.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); - - source2.set_positions_hr = E_FAIL; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - current_position = 12345678; - stop_position = 87654321; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); - - source2.set_positions_hr = E_NOTIMPL; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - current_position = 12345678; - stop_position = 87654321; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); + check(seeking, &source1, &source2, &source3, S_OK, S_OK); + check(seeking, &source1, &source2, &source3, E_FAIL, E_FAIL); + check(seeking, &source1, &source2, &source3, E_NOTIMPL, E_NOTIMPL); source2.IMediaSeeking_iface.lpVtbl = NULL; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - current_position = 12345678; - stop_position = 87654321; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); + + check(seeking, &source1, &source2, &source3, S_OK, E_NOTIMPL); + + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; IGraphBuilder_Disconnect(graph, pin2); IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); - source2.IMediaSeeking_iface.lpVtbl = NULL; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - current_position = 12345678; - stop_position = 87654321; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); + check(seeking, &source1, &source2, &source3, S_OK, E_NOTIMPL); IGraphBuilder_Disconnect(graph, pin2); IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); @@ -6434,262 +6345,75 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_mediastreamfilter_get_duration(void) +static void check_mediastreamfilter_set_positions(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr) { - IAMMultiMediaStream *mmstream = create_ammultimediastream(); - static const MSPID mspid1 = {0x88888888, 1}; - static const MSPID mspid2 = {0x88888888, 2}; - static const MSPID mspid3 = {0x88888888, 3}; - struct testfilter source1, source2, source3; - IAMMediaStream *stream1, *stream2, *stream3; - IMediaStreamFilter *filter; - IPin *pin1, *pin2, *pin3; - IMediaSeeking *seeking; - IGraphBuilder *graph; - LONGLONG duration; + LONGLONG current_position = 12345678; + LONGLONG stop_position = 87654321; HRESULT hr; - ULONG ref; - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(graph != NULL, "Expected non-NULL graph.\n"); - testfilter_init(&source1); - testfilter_init(&source2); - testfilter_init(&source3); - source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - duration = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); - - source2.get_duration_hr = E_FAIL; - duration = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); - - source2.get_duration_hr = E_NOTIMPL; - duration = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); - - source2.IMediaSeeking_iface.lpVtbl = NULL; - duration = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + source2->set_positions_hr = source2_hr; + source1->current_position = 0xdeadbeefdeadbeefULL; + source1->stop_position = 0xdeadbeefdeadbeefULL; + source2->current_position = 0xdeadbeefdeadbeefULL; + source2->stop_position = 0xdeadbeefdeadbeefULL; + source3->current_position = 0xdeadbeefdeadbeefULL; + source3->stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, + &stop_position, AM_SEEKING_AbsolutePositioning); + ok(hr == expected_hr, "Got hr %#x.\n", hr); + ok(source1->current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", + wine_dbgstr_longlong(source1->current_position)); + ok(source1->stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(source1->stop_position)); + if (SUCCEEDED(expected_hr)) + { + ok(source2->current_position == 12345678, "Got current position %s.\n", + wine_dbgstr_longlong(source2->current_position)); + ok(source2->stop_position == 87654321, "Got stop position %s.\n", + wine_dbgstr_longlong(source2->stop_position)); + } + ok(source3->current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", + wine_dbgstr_longlong(source3->current_position)); + ok(source3->stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(source3->stop_position)); +} - IGraphBuilder_Disconnect(graph, pin2); - IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); +static void check_mediastreamfilter_get_duration(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr) +{ + LONGLONG duration = 0xdeadbeefdeadbeefULL; + HRESULT hr; - source2.IMediaSeeking_iface.lpVtbl = NULL; - duration = 0xdeadbeefdeadbeefULL; + source2->get_duration_hr = source2_hr; hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); - - IGraphBuilder_Disconnect(graph, pin2); - IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); - IGraphBuilder_Disconnect(graph, pin3); - IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); - - ref = IAMMultiMediaStream_Release(mmstream); - ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IGraphBuilder_Release(graph); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IMediaSeeking_Release(seeking); - ref = IMediaStreamFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin1); - ref = IAMMediaStream_Release(stream1); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin2); - ref = IAMMediaStream_Release(stream2); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin3); - ref = IAMMediaStream_Release(stream3); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(hr == expected_hr, "Got hr %#x.\n", hr); + if (SUCCEEDED(expected_hr)) + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + else + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); } -static void test_mediastreamfilter_get_stop_position(void) +static void check_mediastreamfilter_get_stop_position(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr) { - IAMMultiMediaStream *mmstream = create_ammultimediastream(); - static const MSPID mspid1 = {0x88888888, 1}; - static const MSPID mspid2 = {0x88888888, 2}; - static const MSPID mspid3 = {0x88888888, 3}; - struct testfilter source1, source2, source3; - IAMMediaStream *stream1, *stream2, *stream3; - IMediaStreamFilter *filter; - IPin *pin1, *pin2, *pin3; - IMediaSeeking *seeking; - IGraphBuilder *graph; - LONGLONG stop; + LONGLONG stop = 0xdeadbeefdeadbeefULL; HRESULT hr; - ULONG ref; - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(graph != NULL, "Expected non-NULL graph.\n"); - testfilter_init(&source1); - testfilter_init(&source2); - testfilter_init(&source3); - source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - stop = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stop == 0x8000000000000000ULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - source2.get_stop_position_hr = E_FAIL; - stop = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - source2.get_stop_position_hr = E_NOTIMPL; - stop = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - source2.IMediaSeeking_iface.lpVtbl = NULL; - stop = 0xdeadbeefdeadbeefULL; + source2->get_stop_position_hr = source2_hr; hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - IGraphBuilder_Disconnect(graph, pin2); - IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); - - source2.IMediaSeeking_iface.lpVtbl = NULL; - stop = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - IGraphBuilder_Disconnect(graph, pin2); - IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); - IGraphBuilder_Disconnect(graph, pin3); - IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + ok(hr == expected_hr, "Got hr %#x.\n", hr); + if (SUCCEEDED(expected_hr)) + ok(stop == 0x8000000000000000ULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); + else + ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); +} - ref = IAMMultiMediaStream_Release(mmstream); - ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IGraphBuilder_Release(graph); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IMediaSeeking_Release(seeking); - ref = IMediaStreamFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin1); - ref = IAMMediaStream_Release(stream1); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin2); - ref = IAMMediaStream_Release(stream2); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin3); - ref = IAMMediaStream_Release(stream3); - ok(!ref, "Got outstanding refcount %d.\n", ref); +static void test_mediastreamfilter_seeking(void) +{ + check_mediastreamfilter_seeking(check_mediastreamfilter_set_positions); + check_mediastreamfilter_seeking(check_mediastreamfilter_get_duration); + check_mediastreamfilter_seeking(check_mediastreamfilter_get_stop_position); } static void test_mediastreamfilter_get_current_stream_time(void) @@ -8886,9 +8610,7 @@ START_TEST(amstream) test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); - test_mediastreamfilter_set_positions(); - test_mediastreamfilter_get_duration(); - test_mediastreamfilter_get_stop_position(); + test_mediastreamfilter_seeking(); test_mediastreamfilter_get_current_stream_time(); test_mediastreamfilter_reference_time_to_stream_time(); test_mediastreamfilter_wait_until(); -- 2.17.1

2 9

[PATCH v2 1/3] include: Add xact2wb.h
by Vijay Kiran Kamuju 17 Nov '20

17 Nov '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH v2] vbscript: Support properties with parameters.
by Robert Wilhelm 17 Nov '20

17 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++ dlls/vbscript/vbdisp.c | 45 ++++++++++++++++++++++++++---------- 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a9f4c540fcb..8f1c1307794 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -454,7 +454,7 @@ ClassBody PropertyDecl : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 53f36b6e710..c36302c0c2f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1770,6 +1770,28 @@ class TestPropSyntax end property end class +Class TestPropParam + Public oDict + Public m_obj + Public Property Let Key(oldKey, newKey) + oDict =oldKey & newKey + End Property + Public Property Let three(uno,due,tre) + oDict =uno & due & tre + End Property + Public Property Let ten(a,b,c,d,e,f,g,h,i,j) + oDict =a & b & c & d & e & f & g & h & i & j + End Property +End Class + +Set x = new TestPropParam +x.key("old") = "new" +call ok(x.oDict = "oldnew","x.oDict = " & x.oDict & " expected oldnew") +x.three(1,2) = 3 +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +x.ten(1,2,3,4,5,6,7,8,9) = 0 +call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") + set x = new TestPropSyntax set x.prop = new TestPropSyntax set x.prop.prop = new TestPropSyntax diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5f493d420bd..75b7badc5c7 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -78,7 +78,7 @@ HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, vbdisp_invoke_type_t invoke_typ return DISP_E_UNKNOWNNAME; } -static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD flags, VARIANT *v, BOOL *is_owned) +static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD flags, VARIANT *v, BOOL *is_owned, INT *index) { unsigned i; @@ -88,9 +88,11 @@ static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD fla } if(i == dp->cNamedArgs) { WARN("no value to set\n"); + *index=-1; return DISP_E_PARAMNOTOPTIONAL; } + *index = i; *v = dp->rgvarg[i]; if(V_VT(v) == (VT_VARIANT|VT_BYREF)) *v = *V_VARIANTREF(v); @@ -134,8 +136,9 @@ static HRESULT invoke_variant_prop(script_ctx_t *ctx, VARIANT *v, WORD flags, DI case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { VARIANT put_val; BOOL own_val; + INT index; - hres = get_propput_arg(ctx, dp, flags, &put_val, &own_val); + hres = get_propput_arg(ctx, dp, flags, &put_val, &own_val, &index); if(FAILED(hres)) return hres; @@ -197,28 +200,46 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { DISPPARAMS dp = {NULL, NULL, 1, 0}; BOOL needs_release; - VARIANT put_val; + VARIANT buf[6]; HRESULT hres; - - if(arg_cnt(params)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + INT index,i,j; + + dp.cArgs = arg_cnt(params) + 1; + if(dp.cArgs > ARRAY_SIZE(buf)) { + dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); + if(!dp.rgvarg) + return E_OUTOFMEMORY; + }else { + dp.rgvarg = buf; } - hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); - if(FAILED(hres)) + hres = get_propput_arg(This->desc->ctx, params, flags, dp.rgvarg, &needs_release, &index); + if(FAILED(hres)) { + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; + } - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + func = This->desc->funcs[id].entries[V_VT(dp.rgvarg) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return DISP_E_MEMBERNOTFOUND; } + for( i=1,j=0; i<dp.cArgs;i++,j++) { + if (j==index) { + j++; + } + dp.rgvarg[i]=params->rgvarg[j]; + } + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) - VariantClear(&put_val); + VariantClear(dp.rgvarg); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; } default: -- 2.26.2

2 2

[PATCH 2/2] windowscodecs: Fix allocation in tiff_decoder_get_metadata_blocks.
by Esme Povirk 17 Nov '20

17 Nov '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libtiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 27f89679766..7f174bbd5dd 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -1127,7 +1127,7 @@ static HRESULT CDECL tiff_decoder_get_metadata_blocks(struct decoder *iface, result.options |= WICPersistOptionNoCacheStream|DECODER_BLOCK_FULL_STREAM|DECODER_BLOCK_READER_CLSID; result.reader_clsid = CLSID_WICIfdMetadataReader; - *blocks = malloc(sizeof(**blocks)); + *blocks = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(**blocks)); **blocks = result; return S_OK; -- 2.17.1

1 0

[PATCH 1/2] windowscodecs: Fix memory leak in common decoder.
by Esme Povirk 17 Nov '20

17 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50140 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/decoder.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index ad5127cd258..0e97135bc16 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -95,6 +95,7 @@ static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface) IStream_Release(This->stream); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); + decoder_destroy(This->decoder); HeapFree(GetProcessHeap(), 0, This); } -- 2.17.1

1 0

[PATCH] msvcrt: Save and restore rounding mode in fegetenv() / fesetenv().
by Paul Gofman 17 Nov '20

17 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 23 ++++++++++++++++++++--- dlls/msvcrt/math.c | 10 ++++++++-- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 52531ddad72..8663fc81ee8 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <float.h> #include <math.h> +#include <fenv.h> #include <limits.h> #include <wctype.h> @@ -183,6 +184,9 @@ static float (CDECL *p_wcstof)(const wchar_t*, wchar_t**); static double (CDECL *p_remainder)(double, double); static int* (CDECL *p_errno)(void); static int (CDECL *p_fegetenv)(fenv_t*); +static int (CDECL *p_fesetenv)(const fenv_t*); +static int (CDECL *p_fegetround)(void); +static int (CDECL *p_fesetround)(int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -254,6 +258,10 @@ static BOOL init(void) p_free_locale = (void*)GetProcAddress(module, "_free_locale"); SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); + SET(p_fesetenv, "fesetenv"); + SET(p_fegetround, "fegetround"); + SET(p_fesetround, "fesetround"); + SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); @@ -780,18 +788,27 @@ static void test_critical_section(void) call_func1(p_critical_section_dtor, &cs); } -static void test_fegetenv(void) +static void test_feenv(void) { + fenv_t env, env2; int ret; - fenv_t env; p__clearfp(); ret = p_fegetenv(&env); ok(!ret, "fegetenv returned %x\n", ret); + p_fesetround(FE_UPWARD); ok(env.control == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID), "env.control = %x\n", env.control); ok(!env.status, "env.status = %x\n", env.status); + ret = p_fegetenv(&env2); + ok(!ret, "fegetenv returned %x\n", ret); + ok(env2.control == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID | FE_UPWARD), + "env2.control = %x\n", env2.control); + ret = p_fesetenv(&env); + ok(!ret, "fesetenv returned %x\n", ret); + ret = p_fegetround(); + ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); } static void test__wcreate_locale(void) @@ -1110,7 +1127,7 @@ START_TEST(msvcr120) test__strtof(); test_remainder(); test_critical_section(); - test_fegetenv(); + test_feenv(); test__wcreate_locale(); test__Condition_variable(); test_wctype(); diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8e8324b8fbe..96eac9190c6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2076,7 +2076,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) { env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | - MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); + MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID | MSVCRT__RC_CHOP); env->status = _statusfp(); return 0; } @@ -2214,12 +2214,18 @@ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) DWORD fpword; __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - fpword &= ~0x1e80; + fpword &= ~0x7e80; if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; + switch (env->control & MSVCRT__MCW_RC) + { + case MSVCRT__RC_CHOP: fpword |= 0x6000; break; + case MSVCRT__RC_UP: fpword |= 0x4000; break; + case MSVCRT__RC_DOWN: fpword |= 0x2000; break; + } __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } -- 2.28.0

2 2

[PATCH 3/3] kernel32: Import WriteFile from kernelbase.
by Jacek Caban 17 Nov '20

17 Nov '20

Console special-case is no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 11 ----------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-)

2 1

[PATCH 2/3] server: Support writing directly on console handle.
by Jacek Caban 17 Nov '20

17 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 58 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 12 deletions(-)

1 0

[PATCH 1/3] kernelbase: Move Unicode conversion from WriteConsoleA to conhost.
by Jacek Caban 17 Nov '20

17 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 13 ++++--------- include/wine/condrv.h | 15 ++++++++------- programs/conhost/conhost.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 16 deletions(-)

1 0