June 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : include: Add some more EVR mixer interfaces.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 1f57af100f43c9ecd0d30b0f1200f5c605b18297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f57af100f43c9ecd0d30b0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 17:57:57 2020 +0300 include: Add some more EVR mixer interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/evr9.idl | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9f70e72b4c..90fb873f20 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -276,6 +276,7 @@ SOURCES = \ evntprov.h \ evntrace.h \ evr.idl \ + evr9.idl \ excpt.h \ exdisp.idl \ exdispid.h \ diff --git a/include/evr9.idl b/include/evr9.idl new file mode 100644 index 0000000000..1572d87838 --- /dev/null +++ b/include/evr9.idl @@ -0,0 +1,114 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "evr.idl"; +import "dxva2api.idl"; + +typedef struct MFVideoAlphaBitmapParams +{ + DWORD dwFlags; + COLORREF clrSrcKey; + RECT rcSrc; + MFVideoNormalizedRect nrcDest; + FLOAT fAlpha; + DWORD dwFilterMode; +} MFVideoAlphaBitmapParams; + +typedef struct MFVideoAlphaBitmap +{ + BOOL GetBitmapFromDC; + union + { + HDC hdc; + IDirect3DSurface9 *pDDS; + } bitmap; + MFVideoAlphaBitmapParams params; +} MFVideoAlphaBitmap; + +[ + object, + uuid(814c7b20-0fdb-4eec-af8f-f957c8f69edc), + local +] +interface IMFVideoMixerBitmap : IUnknown +{ + HRESULT SetAlphaBitmap( + [in] const MFVideoAlphaBitmap *bitmap + ); + HRESULT ClearAlphaBitmap(void); + HRESULT UpdateAlphaBitmapParameters( + [in] const MFVideoAlphaBitmapParams *params + ); + HRESULT GetAlphaBitmapParameters( + [out] MFVideoAlphaBitmapParams *params + ); +} + +[ + object, + uuid(6AB0000C-FECE-4d1f-A2AC-A9573530656E), + pointer_default(unique) +] +interface IMFVideoProcessor : IUnknown +{ + HRESULT GetAvailableVideoProcessorModes( + [out] UINT *count, + [out, size_is(*count)] GUID **modes + ); + HRESULT GetVideoProcessorCaps( + [in] GUID *mode, + [out] DXVA2_VideoProcessorCaps *caps + ); + HRESULT GetVideoProcessorMode( + [out] GUID *mode + ); + HRESULT SetVideoProcessorMode( + [in] GUID *mode + ); + HRESULT GetProcAmpRange( + [in] DWORD prop, + [out] DXVA2_ValueRange *range + ); + HRESULT GetProcAmpValues( + [in] DWORD flags, + [out] DXVA2_ProcAmpValues *values + ); + HRESULT SetProcAmpValues( + [in] DWORD flags, + [in] DXVA2_ProcAmpValues *values + ); + HRESULT GetFilteringRange( + [in] DWORD prop, + [out] DXVA2_ValueRange *range + ); + HRESULT GetFilteringValue( + [in] DWORD prop, + [out] DXVA2_Fixed32 *value + ); + HRESULT SetFilteringValue( + [in] DWORD prop, + [in] DXVA2_Fixed32 *value + ); + HRESULT GetBackgroundColor( + [out] COLORREF *color + ); + HRESULT SetBackgroundColor( + [in] COLORREF color + ); +}

1 0

Alexandre Julliard : ntdll: Move RtlGetSystemTimePrecise() to the Unix library.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: b8dc6b241204f5348563a23f51765234ef19f044 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8dc6b241204f5348563a23f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 18:07:38 2020 +0200 ntdll: Move RtlGetSystemTimePrecise() to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 25 +------------------------ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/sync.c | 21 +++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 ++- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 3174a39c2c..d6466b9dd1 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -32,9 +32,6 @@ #include <string.h> #include <limits.h> #include <time.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -399,27 +396,7 @@ NTSTATUS WINAPI NtQuerySystemTime( LARGE_INTEGER *time ) */ LONGLONG WINAPI RtlGetSystemTimePrecise( void ) { - LONGLONG time; - -#ifdef HAVE_CLOCK_GETTIME - struct timespec ts; - - if (!clock_gettime( CLOCK_REALTIME, &ts )) - { - time = ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - time += (ts.tv_nsec + 50) / 100; - } - else -#endif - { - struct timeval now; - - gettimeofday( &now, 0 ); - time = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - time += now.tv_usec * 10; - } - - return time; + return unix_funcs->RtlGetSystemTimePrecise(); } /****************************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d8f7ab1bf0..68018b49fb 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1450,6 +1450,7 @@ static struct unix_funcs unix_funcs = NtWriteVirtualMemory, NtYieldExecution, DbgUiIssueRemoteBreakin, + RtlGetSystemTimePrecise, RtlWaitOnAddress, RtlWakeAddressAll, RtlWakeAddressSingle, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 299a311496..f02d1ed8a2 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -679,7 +679,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f { LARGE_INTEGER now; - RtlQueryPerformanceCounter(&now); + NtQueryPerformanceCounter( &now, NULL ); abs_timeout -= now.QuadPart; } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index bcf5fef017..4402584f28 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1044,7 +1044,7 @@ NTSTATUS WINAPI NtQueryTimer( HANDLE handle, TIMER_INFORMATION_CLASS class, if (basic_info->RemainingTime.QuadPart > 0) NtQuerySystemTime( &now ); else { - RtlQueryPerformanceCounter( &now ); + NtQueryPerformanceCounter( &now, NULL ); basic_info->RemainingTime.QuadPart = -basic_info->RemainingTime.QuadPart; } @@ -1242,6 +1242,23 @@ ULONG WINAPI NtGetTickCount(void) } +/****************************************************************************** + * RtlGetSystemTimePrecise (NTDLL.@) + */ +LONGLONG WINAPI RtlGetSystemTimePrecise(void) +{ + struct timeval now; +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; + + if (!clock_gettime( CLOCK_REALTIME, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970 + (ts.tv_nsec + 50) / 100; +#endif + gettimeofday( &now, 0 ); + return now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970 + now.tv_usec * 10; +} + + /****************************************************************************** * NtCreateKeyedEvent (NTDLL.@) */ @@ -2248,7 +2265,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size { LARGE_INTEGER now; - RtlQueryPerformanceCounter(&now); + NtQueryPerformanceCounter( &now, NULL ); abs_timeout -= now.QuadPart; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1f06c91eff..ee6caaec8f 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -89,6 +89,7 @@ extern NTSTATUS CDECL fast_RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE * RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) DECLSPEC_HIDDEN; +extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 3f93b961a6..62117eabb6 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -29,7 +29,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 62 +#define NTDLL_UNIXLIB_VERSION 63 struct unix_funcs { @@ -261,6 +261,7 @@ struct unix_funcs /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); + LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); NTSTATUS (WINAPI *RtlWaitOnAddress)( const void *addr, const void *cmp, SIZE_T size, const LARGE_INTEGER *timeout ); void (WINAPI *RtlWakeAddressAll)( const void *addr );

1 0

Gabriel Ivăncescu : msscript.ocx: Always detach the modules when changing the language.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: d3fde3b198f4a4383395ce81dfa156423c9afd07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3fde3b198f4a4383395ce81… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:24 2020 +0300 msscript.ocx: Always detach the modules when changing the language. 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/msscript.c | 26 ++++++++++---- dlls/msscript.ocx/tests/msscript.c | 70 +++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 9783c7730e..5f3993b3e5 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -615,6 +615,17 @@ static void detach_script_host(ScriptHost *host) host->script = NULL; } +static void detach_module(ScriptModule *module) +{ + ScriptHost *host = module->host; + + if (host) { + module->host = NULL; + detach_script_host(host); + IActiveScriptSite_Release(&host->IActiveScriptSite_iface); + } +} + static HRESULT WINAPI ScriptModule_QueryInterface(IScriptModule *iface, REFIID riid, void **ppv) { ScriptModule *This = impl_from_IScriptModule(iface); @@ -654,8 +665,7 @@ static ULONG WINAPI ScriptModule_Release(IScriptModule *iface) if (!ref) { - detach_script_host(This->host); - IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); + detach_module(This); SysFreeString(This->name); heap_free(This); } @@ -823,12 +833,14 @@ static ScriptModule *create_module(ScriptHost *host, BSTR name) return module; } -static void release_modules(ScriptControl *control) +static void release_modules(ScriptControl *control, BOOL force_detach) { - unsigned int i; + unsigned int i, module_count = control->host->module_count; - for (i = 0; i < control->host->module_count; i++) + for (i = 0; i < module_count; i++) { + if (force_detach) detach_module(control->modules[i]); IScriptModule_Release(&control->modules[i]->IScriptModule_iface); + } heap_free(control->modules); } @@ -1200,7 +1212,7 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) IOleClientSite_Release(This->site); if (This->host) { - release_modules(This); + release_modules(This, FALSE); IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); } heap_free(This); @@ -1301,7 +1313,7 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan return CTL_E_INVALIDPROPERTYVALUE; if (This->host) { - release_modules(This); + release_modules(This, TRUE); IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); This->host = NULL; } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 701363a6e7..35ab1ba3d0 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2446,10 +2446,21 @@ static void test_IScriptControl_get_Modules(void) ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); SysFreeString(str); + /* The module collection changes and module ref is invalid */ hr = IScriptModuleCollection_get_Count(mods, &count); ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); ok(count == 1, "count is not 1, got %d.\n", count); + hr = IScriptModule_get_Name(mod, &str); + todo_wine ok(hr == E_FAIL, "IScriptModule_get_Name returned: 0x%08x.\n", hr); + str = SysAllocString(L"function closed() { }\n"); + hr = IScriptModule_AddCode(mod, str); + todo_wine ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + SysFreeString(str); + str = SysAllocString(L"sub closed\nend sub"); + hr = IScriptModule_AddCode(mod, str); + todo_wine ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); IScriptModule_Release(mod); + SysFreeString(str); hr = IScriptControl_put_Language(sc, NULL); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); @@ -2564,11 +2575,68 @@ static void test_IScriptControl_get_Modules(void) SET_EXPECT(Close); hr = IScriptControl_put_Language(sc, NULL); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); - todo_wine CHECK_CALLED(Close); + CHECK_CALLED(Close); IScriptModuleCollection_Release(mods); IActiveScriptSite_Release(site); IScriptControl_Release(sc); IScriptModule_Release(mod); + + /* Now try holding a module ref while closing the script */ + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + hr = IScriptControl_get_Modules(sc, &mods); + ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); + + SET_EXPECT(AddNamedItem); + str = SysAllocString(L"foo"); + AddNamedItem_expected_name = str; + AddNamedItem_expected_flags = SCRIPTITEM_CODEONLY; + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = NULL; + hr = IScriptModuleCollection_Add(mods, str, &var, &mod); + ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); + VariantClear(&var); + CHECK_CALLED(AddNamedItem); + + unknown = (IUnknown*)0xdeadbeef; + hr = IActiveScriptSite_GetItemInfo(site, str, SCRIPTINFO_IUNKNOWN, &unknown, NULL); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "IActiveScriptSite_GetItemInfo returned: 0x%08x.\n", hr); + IScriptModuleCollection_Release(mods); + IActiveScriptSite_Release(site); + IScriptControl_Release(sc); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_item_name = str; + parse_flags = SCRIPTTEXT_ISVISIBLE; + code_str = SysAllocString(L"code after close"); + hr = IScriptModule_AddCode(mod, code_str); + todo_wine ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + todo_wine CHECK_CALLED(SetScriptState_STARTED); + todo_wine CHECK_CALLED(ParseScriptText); + SysFreeString(code_str); + SysFreeString(str); + + SET_EXPECT(Close); + IScriptModule_Release(mod); + CHECK_CALLED(Close); } }

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptModuleCollection::get_Item.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 7c0231b8c3469a994add3d12f55c30f23ec3e310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0231b8c3469a994add3d12… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:23 2020 +0300 msscript.ocx: Implement IScriptModuleCollection::get_Item. 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/msscript.c | 28 ++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 60 +++++++++++++++++++++++++++++++------- 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 696059897f..9783c7730e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -954,10 +954,34 @@ static HRESULT WINAPI ScriptModuleCollection_get_Item(IScriptModuleCollection *i IScriptModule **ppmod) { ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ScriptModule *module; + unsigned int i; + HRESULT hr; - FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppmod); + TRACE("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppmod); - return E_NOTIMPL; + if (!ppmod) return E_POINTER; + if (!This->host) return E_FAIL; + + if (V_VT(&index) == VT_BSTR) + { + module = find_module(This, V_BSTR(&index)); + if (!module) return CTL_E_ILLEGALFUNCTIONCALL; + } + else + { + hr = VariantChangeType(&index, &index, 0, VT_INT); + if (FAILED(hr)) return hr; + + i = V_INT(&index) - 1; + if (i >= This->host->module_count) return 0x800a0009; + + module = This->modules[i]; + } + + *ppmod = &module->IScriptModule_iface; + IScriptModule_AddRef(*ppmod); + return S_OK; } static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection *iface, LONG *plCount) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 8945186b87..701363a6e7 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2341,9 +2341,9 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_I4; V_I4(&var) = -1; hr = IScriptModuleCollection_get_Item(mods, var, NULL); - todo_wine ok(hr == E_POINTER, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); V_VT(&var) = VT_EMPTY; str = SysAllocString(L"foobar"); @@ -2378,34 +2378,69 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_I4; V_I4(&var) = count + 1; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"non-existent module"); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); V_VT(&var) = VT_I4; V_I4(&var) = 1; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); - if (hr == S_OK) IScriptModule_Release(mod); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + hr = IScriptModule_get_Name(mod, NULL); + todo_wine ok(hr == E_POINTER, "IScriptModule_get_Name returned: 0x%08x.\n", hr); + hr = IScriptModule_get_Name(mod, &str); + todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + if (hr == S_OK) SysFreeString(str); + str = SysAllocString(L"function add(a, b) { return a + b; }\n"); + hr = IScriptModule_AddCode(mod, str); + todo_wine ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + IScriptModule_Release(mod); + SysFreeString(str); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"some other module"); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); - if (hr == S_OK) IScriptModule_Release(mod); + hr = IScriptModule_get_Name(mod, &str); + todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + IScriptModule_Release(mod); + if (hr == S_OK) SysFreeString(str); V_VT(&var) = VT_R8; V_R8(&var) = 2.0; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); - if (hr == S_OK) IScriptModule_Release(mod); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + hr = IScriptModule_get_Name(mod, &str); + todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + if (hr == S_OK) SysFreeString(str); + str = SysAllocString(L"function sub(a, b) { return a - b; }\n"); + hr = IScriptModule_AddCode(mod, str); + todo_wine ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + IScriptModule_Release(mod); + SysFreeString(str); + /* The 'Global' module is the same as the script control */ + str = SysAllocString(L"add(10, 5)"); + hr = IScriptControl_Eval(sc, str, &var); + todo_wine ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + todo_wine ok(V_VT(&var) == VT_I4 && V_I4(&var) == 15, "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + SysFreeString(str); + str = SysAllocString(L"sub(10, 5)"); + hr = IScriptControl_Eval(sc, str, &var); + ok(FAILED(hr), "IScriptControl_Eval succeeded: 0x%08x.\n", hr); + SysFreeString(str); + + /* Grab a module ref and change the language to something valid */ + V_VT(&var) = VT_I2; + V_I2(&var) = 3; + hr = IScriptModuleCollection_get_Item(mods, var, &mod); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); str = SysAllocString(L"vbscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); @@ -2414,12 +2449,17 @@ static void test_IScriptControl_get_Modules(void) hr = IScriptModuleCollection_get_Count(mods, &count); ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); ok(count == 1, "count is not 1, got %d.\n", count); + IScriptModule_Release(mod); hr = IScriptControl_put_Language(sc, NULL); ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); hr = IScriptModuleCollection_get_Count(mods, &count); ok(hr == E_FAIL, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); + V_VT(&var) = VT_I4; + V_I4(&var) = 1; + hr = IScriptModuleCollection_get_Item(mods, var, &mod); + ok(hr == E_FAIL, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = NULL; str = SysAllocString(L"module_name");

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptModuleCollection::Add.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: a328ac5bc946e87cbfc5362f815ad2b17960de90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a328ac5bc946e87cbfc5362f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:22 2020 +0300 msscript.ocx: Implement IScriptModuleCollection::Add. 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/msscript.c | 70 +++++++++++++++++++++++++++++++++++--- dlls/msscript.ocx/tests/msscript.c | 61 +++++++++++++++++++++++++++------ 2 files changed, 117 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a328ac5bc946e87cbfc5…

1 0

Dmitry Kislyuk : vbscript: Parse empty CASE ELSE clause.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 18e7e07a77a754c4b48c6c9bde225ad5c7295944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e7e07a77a754c4b48c6c9b… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Thu Jun 25 00:50:46 2020 -0500 vbscript: Parse empty CASE ELSE clause. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49439 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 5c18af13d4..71bea72b1b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -301,7 +301,7 @@ Else_opt CaseClausules : /* empty */ { $$ = NULL; } - | tCASE tELSE StSep StatementsNl { $$ = new_case_clausule(ctx, NULL, $4, NULL); } + | tCASE tELSE StSep StatementsNl_opt { $$ = new_case_clausule(ctx, NULL, $4, NULL); } | tCASE ExpressionList StSep StatementsNl_opt CaseClausules { $$ = new_case_clausule(ctx, $2, $4, $5); } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c50b8bbe59..94e2bbd436 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -681,6 +681,14 @@ select case 1 : end select Call ok(x, "wrong case") +select case 0 + case 1 + case else + 'empty else with comment test +end select + +select case 0 : case 1 : case else : end select + if false then Sub testsub x = true

1 0

Hans Leidekker : winhttp: Status and reason are optional in the close response.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 968b3745bb02fde13bfafce102de973fec7c6bd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=968b3745bb02fde13bfafce1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 25 11:00:24 2020 +0200 winhttp: Status and reason are optional in the close response. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 623fdf5db5..c15be38592 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3310,7 +3310,7 @@ static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD { DWORD err; if ((err = netconn_recv( netconn, buf, len, 0, (int *)ret_len ))) return err; - if (len && !*ret_len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + if (*ret_len != len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; return ERROR_SUCCESS; } @@ -3341,8 +3341,7 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket char hdr[2]; if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; - if (count != sizeof(hdr) || (hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || - (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) + if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } @@ -3353,14 +3352,12 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket { USHORT len16; if ((ret = receive_bytes( netconn, (char *)&len16, sizeof(len16), &count ))) return ret; - if (count != sizeof(len16)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; len = RtlUshortByteSwap( len16 ); } else if (len == 127) { ULONGLONG len64; if ((ret = receive_bytes( netconn, (char *)&len64, sizeof(len64), &count ))) return ret; - if (count != sizeof(len64)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; len = len64; } @@ -3548,23 +3545,21 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea } if ((ret = receive_frame( netconn, &count, &socket->opcode ))) goto done; - if (socket->opcode != SOCKET_OPCODE_CLOSE || (count && count > sizeof(socket->reason))) + if (socket->opcode != SOCKET_OPCODE_CLOSE || + (count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) { ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; goto done; } - if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; - if (count != sizeof(socket->status)) + if (count) { - ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; - goto done; - } - socket->status = RtlUshortByteSwap( socket->status ); - if (!(ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ))) - { - socket->state = SOCKET_STATE_CLOSED; + DWORD reason_len = count - sizeof(socket->status); + if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + socket->status = RtlUshortByteSwap( socket->status ); + if ((ret = receive_bytes( netconn, socket->reason, reason_len, &socket->reason_len ))) goto done; } + socket->state = SOCKET_STATE_CLOSED; done: if (async)

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptModule::get_Name.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 045372cbe4c3bcb3aae13a07e2bbcf8d5c8045ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=045372cbe4c3bcb3aae13a07… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:25 2020 +0300 msscript.ocx: Implement IScriptModule::get_Name. 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/msscript.c | 8 ++++++-- dlls/msscript.ocx/tests/msscript.c | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 5f3993b3e5..e55fec9ac6 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -738,9 +738,13 @@ static HRESULT WINAPI ScriptModule_get_Name(IScriptModule *iface, BSTR *pbstrNam { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%p)\n", This, pbstrName); + TRACE("(%p)->(%p)\n", This, pbstrName); - return E_NOTIMPL; + if (!pbstrName) return E_POINTER; + if (!This->host) return E_FAIL; + + *pbstrName = SysAllocString(This->name ? This->name : L"Global"); + return *pbstrName ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI ScriptModule_get_CodeObject(IScriptModule *iface, IDispatch **ppdispObject) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 35ab1ba3d0..871ff51bea 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2391,10 +2391,11 @@ static void test_IScriptControl_get_Modules(void) hr = IScriptModuleCollection_get_Item(mods, var, &mod); ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); hr = IScriptModule_get_Name(mod, NULL); - todo_wine ok(hr == E_POINTER, "IScriptModule_get_Name returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModule_get_Name returned: 0x%08x.\n", hr); hr = IScriptModule_get_Name(mod, &str); - todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); - if (hr == S_OK) SysFreeString(str); + ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"Global"), "got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); str = SysAllocString(L"function add(a, b) { return a + b; }\n"); hr = IScriptModule_AddCode(mod, str); todo_wine ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); @@ -2408,17 +2409,19 @@ static void test_IScriptControl_get_Modules(void) ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); hr = IScriptModule_get_Name(mod, &str); - todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"some other Module"), "got %s.\n", wine_dbgstr_w(str)); IScriptModule_Release(mod); - if (hr == S_OK) SysFreeString(str); + SysFreeString(str); V_VT(&var) = VT_R8; V_R8(&var) = 2.0; hr = IScriptModuleCollection_get_Item(mods, var, &mod); ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); hr = IScriptModule_get_Name(mod, &str); - todo_wine ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); - if (hr == S_OK) SysFreeString(str); + ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + ok(!lstrcmpW(str, L"foobar"), "got %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); str = SysAllocString(L"function sub(a, b) { return a - b; }\n"); hr = IScriptModule_AddCode(mod, str); todo_wine ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); @@ -2451,7 +2454,7 @@ static void test_IScriptControl_get_Modules(void) ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); ok(count == 1, "count is not 1, got %d.\n", count); hr = IScriptModule_get_Name(mod, &str); - todo_wine ok(hr == E_FAIL, "IScriptModule_get_Name returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_get_Name returned: 0x%08x.\n", hr); str = SysAllocString(L"function closed() { }\n"); hr = IScriptModule_AddCode(mod, str); todo_wine ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr);

1 0

Gabriel Ivăncescu : msscript.ocx: Implement get_script_dispatch on top of modules.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: f9fb1e3fbe25c3a04a0c710a672944513b0d6735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9fb1e3fbe25c3a04a0c710a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:26 2020 +0300 msscript.ocx: Implement get_script_dispatch on top of modules. 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/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 e55fec9ac6..e8c0f0af77 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -72,6 +72,7 @@ typedef struct { BSTR name; ScriptHost *host; + IDispatch *script_dispatch; } ScriptModule; struct ScriptHost { @@ -82,7 +83,6 @@ struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; - IDispatch *script_dispatch; SCRIPTSTATE script_state; CLSID clsid; @@ -225,14 +225,15 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam return NULL; } -static HRESULT get_script_dispatch(struct ScriptControl *control, IDispatch **disp) +static HRESULT get_script_dispatch(ScriptModule *module, IDispatch **disp) { - if (!control->host->script_dispatch) + if (!module->script_dispatch) { - HRESULT hr = IActiveScript_GetScriptDispatch(control->host->script, NULL, &control->host->script_dispatch); + HRESULT hr = IActiveScript_GetScriptDispatch(module->host->script, + module->name, &module->script_dispatch); if (FAILED(hr)) return hr; } - *disp = control->host->script_dispatch; + *disp = module->script_dispatch; return S_OK; } @@ -607,10 +608,7 @@ static void detach_script_host(ScriptHost *host) if (host->parse) IActiveScriptParse_Release(host->parse); - if (host->script_dispatch) - IDispatch_Release(host->script_dispatch); - host->script_dispatch = NULL; host->parse = NULL; host->script = NULL; } @@ -667,6 +665,8 @@ static ULONG WINAPI ScriptModule_Release(IScriptModule *iface) { detach_module(This); SysFreeString(This->name); + if (This->script_dispatch) + IDispatch_Release(This->script_dispatch); heap_free(This); } @@ -833,6 +833,7 @@ static ScriptModule *create_module(ScriptHost *host, BSTR name) return NULL; } module->host = host; + module->script_dispatch = NULL; IActiveScriptSite_AddRef(&host->IActiveScriptSite_iface); return module; } @@ -1089,7 +1090,6 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) host->ref = 1; host->script = NULL; host->parse = NULL; - host->script_dispatch = NULL; host->clsid = *clsid; host->module_count = 1; list_init(&host->named_items); @@ -1633,7 +1633,7 @@ static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_na hr = start_script(This->host); if (FAILED(hr)) return hr; - hr = get_script_dispatch(This, &disp); + hr = get_script_dispatch(This->modules[0], &disp); if (FAILED(hr)) return hr; hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &procedure_name, 1, LOCALE_USER_DEFAULT, &dispid);

1 0

Anton Baskanov : amstream: Return E_NOTIMPL from AMAudioStream::QueryInterface.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 117e13e05ebb5dbdc8562de13545226b08bbf14b URL: https://source.winehq.org/git/wine.git/?a=commit;h=117e13e05ebb5dbdc8562de1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jun 25 22:21:10 2020 +0700 amstream: Return E_NOTIMPL from AMAudioStream::QueryInterface. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 2 +- dlls/amstream/tests/amstream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index a19cb4ea96..60a2572b3b 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -1073,7 +1073,7 @@ static HRESULT WINAPI audio_sink_QueryId(IPin *iface, WCHAR **id) static HRESULT WINAPI audio_sink_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) { TRACE("iface %p, mt %p.\n", iface, mt); - return S_OK; + return E_NOTIMPL; } static HRESULT WINAPI audio_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 03c8660a42..43da41ae89 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1989,7 +1989,7 @@ static void test_media_types(void) ok(!memcmp(pmt->pbFormat, &expect_wfx, pmt->cbFormat), "Format blocks didn't match.\n"); hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); CoTaskMemFree(pmt);

1 0