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

Gabriel Ivăncescu : msscript.ocx: Move IScriptControl::AddObject implementation into a helper.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 523f9d2a4ffffd3b9b6dbe0959a4d3285212ddd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523f9d2a4ffffd3b9b6dbe09… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 25 17:59:21 2020 +0300 msscript.ocx: Move IScriptControl::AddObject implementation into a helper. 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 | 59 ++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index df63220888..bc1811b4c2 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -250,6 +250,40 @@ static HRESULT start_script(ScriptHost *host) return hr; } +static HRESULT add_script_object(ScriptHost *host, BSTR name, IDispatch *object, DWORD flags) +{ + struct named_item *item; + HRESULT hr; + + if (host_get_named_item(host, name)) + return E_INVALIDARG; + + item = heap_alloc(sizeof(*item)); + if (!item) + return E_OUTOFMEMORY; + + item->name = SysAllocString(name); + if (!item->name) + { + heap_free(item); + return E_OUTOFMEMORY; + } + IDispatch_AddRef(item->disp = object); + list_add_tail(&host->named_items, &item->entry); + + hr = IActiveScript_AddNamedItem(host->script, name, flags); + if (FAILED(hr)) + { + list_remove(&item->entry); + IDispatch_Release(item->disp); + SysFreeString(item->name); + heap_free(item); + return hr; + } + + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -1392,8 +1426,6 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, { ScriptControl *This = impl_from_IScriptControl(iface); DWORD flags = SCRIPTITEM_ISVISIBLE | SCRIPTITEM_ISSOURCE; - struct named_item *item; - HRESULT hr; TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(name), object, add_members); @@ -1403,30 +1435,9 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, if (!This->host) return E_FAIL; - if (host_get_named_item(This->host, name)) - return E_INVALIDARG; - - item = heap_alloc(sizeof(*item)); - if (!item) - return E_OUTOFMEMORY; - - item->name = SysAllocString(name); - IDispatch_AddRef(item->disp = object); - list_add_tail(&This->host->named_items, &item->entry); - if (add_members) flags |= SCRIPTITEM_GLOBALMEMBERS; - hr = IActiveScript_AddNamedItem(This->host->script, name, flags); - if (FAILED(hr)) { - list_remove(&item->entry); - IDispatch_Release(item->disp); - SysFreeString(item->name); - heap_free(item); - return hr; - } - - - return hr; + return add_script_object(This->host, name, object, flags); } static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface)

1 0

Hans Leidekker : winhttp: Set socket state before sending notifications.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: b9038c736b829a3cd5b615d6c41df8b71f938f54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9038c736b829a3cd5b615d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 25 11:00:23 2020 +0200 winhttp: Set socket state before sending notifications. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 457abb9f84..623fdf5db5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3372,10 +3372,11 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) { + struct netconn *netconn = socket->request->netconn; DWORD count, ret = ERROR_SUCCESS; - if (!socket->read_size) ret = receive_frame( socket->request->netconn, &socket->read_size, &socket->opcode ); - if (!ret) ret = receive_bytes( socket->request->netconn, buf, min(len, socket->read_size), &count ); + if (!socket->read_size) ret = receive_frame( netconn, &socket->read_size, &socket->opcode ); + if (!ret) ret = receive_bytes( netconn, buf, min(len, socket->read_size), &count ); if (!ret) { socket->read_size -= count; @@ -3385,7 +3386,6 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_type = map_opcode( socket->opcode, socket->read_size != 0 ); } } - if (async) { if (!ret) @@ -3458,9 +3458,13 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D static DWORD socket_shutdown( struct socket *socket, USHORT status, const void *reason, DWORD len, BOOL async ) { + struct netconn *netconn = socket->request->netconn; DWORD ret; - ret = send_frame( socket->request->netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ); + if (!(ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) + { + socket->state = SOCKET_STATE_SHUTDOWN; + } if (async) { if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); @@ -3473,8 +3477,6 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } - - if (!ret) socket->state = SOCKET_STATE_SHUTDOWN; return ret; } @@ -3559,7 +3561,10 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea goto done; } socket->status = RtlUshortByteSwap( socket->status ); - ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ); + if (!(ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ))) + { + socket->state = SOCKET_STATE_CLOSED; + } done: if (async) @@ -3574,8 +3579,6 @@ done: send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } - - if (!ret) socket->state = SOCKET_STATE_CLOSED; return ret; }

1 0

Hans Leidekker : winhttp: Add stubs for new proxy functions.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 23db5357bb0b473ecaba6cb4466e474f07cf4645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23db5357bb0b473ecaba6cb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 25 11:00:25 2020 +0200 winhttp: Add stubs for new proxy functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 12 ++++++ 2 files changed, 119 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 186b70e4a2..228eb646ae 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2028,6 +2028,113 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) return ret; } +/*********************************************************************** + * WinHttpCreateProxyResolver (winhttp.@) + */ +DWORD WINAPI WinHttpCreateProxyResolver( HINTERNET hsession, HINTERNET *hresolver ) +{ + FIXME("%p, %p\n", hsession, hresolver); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpFreeProxyResult (winhttp.@) + */ +void WINAPI WinHttpFreeProxyResult( WINHTTP_PROXY_RESULT *result ) +{ + FIXME("%p\n", result); +} + +/*********************************************************************** + * WinHttpFreeProxyResultEx (winhttp.@) + */ +void WINAPI WinHttpFreeProxyResultEx( WINHTTP_PROXY_RESULT_EX *result ) +{ + FIXME("%p\n", result); +} + +/*********************************************************************** + * WinHttpFreeProxySettings (winhttp.@) + */ +void WINAPI WinHttpFreeProxySettings( WINHTTP_PROXY_SETTINGS *settings ) +{ + FIXME("%p\n", settings); +} + +/*********************************************************************** + * WinHttpGetProxyForUrlEx (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyForUrlEx( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, + DWORD_PTR ctx ) +{ + FIXME("%p, %s, %p, %lx\n", hresolver, debugstr_w(url), options, ctx); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyForUrlEx2 (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyForUrlEx2( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, + DWORD selection_len, BYTE *selection, DWORD_PTR ctx ) +{ + FIXME("%p, %s, %p, %u, %p, %lx\n", hresolver, debugstr_w(url), options, selection_len, selection, ctx); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyResult (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyResult( HINTERNET hresolver, WINHTTP_PROXY_RESULT *result ) +{ + FIXME("%p, %p\n", hresolver, result); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyResultEx (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyResultEx( HINTERNET hresolver, WINHTTP_PROXY_RESULT_EX *result ) +{ + FIXME("%p, %p\n", hresolver, result); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxySettingsVersion (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxySettingsVersion( HINTERNET hsession, DWORD *version ) +{ + FIXME("%p, %p\n", hsession, version); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpReadProxySettings (winhttp.@) + */ +DWORD WINAPI WinHttpReadProxySettings( HINTERNET hsession, const WCHAR *connection, BOOL use_defaults, + BOOL set_autodiscover, DWORD *version, BOOL *defaults_returned, + WINHTTP_PROXY_SETTINGS *settings) +{ + FIXME("%p, %s, %d, %d, %p, %p, %p\n", hsession, debugstr_w(connection), use_defaults, set_autodiscover, + version, defaults_returned, settings); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpResetAutoProxy (winhttp.@) + */ +DWORD WINAPI WinHttpResetAutoProxy( HINTERNET hsession, DWORD flags ) +{ + FIXME("%p, %08x\n", hsession, flags); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +DWORD WINAPI WinHttpWriteProxySettings( HINTERNET hsession, BOOL force, WINHTTP_PROXY_SETTINGS *settings ) +{ + FIXME("%p, %d, %p\n", hsession, force, settings); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + /*********************************************************************** * WinHttpSetStatusCallback (winhttp.@) */ diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index beace245a8..581918791e 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -7,11 +7,20 @@ @ stdcall WinHttpCloseHandle(ptr) @ stdcall WinHttpConnect(ptr wstr long long) @ stdcall WinHttpCrackUrl(wstr long long ptr) +@ stdcall WinHttpCreateProxyResolver(ptr ptr) @ stdcall WinHttpCreateUrl(ptr long ptr ptr) @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) +@ stdcall WinHttpFreeProxyResult(ptr) +@ stdcall WinHttpFreeProxyResultEx(ptr) +@ stdcall WinHttpFreeProxySettings(ptr) @ stdcall WinHttpGetDefaultProxyConfiguration(ptr) @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stdcall WinHttpGetProxyForUrl(ptr wstr ptr ptr) +@ stdcall WinHttpGetProxyForUrlEx(ptr wstr ptr ptr) +@ stdcall WinHttpGetProxyForUrlEx2(ptr wstr ptr long ptr ptr) +@ stdcall WinHttpGetProxyResult(ptr ptr) +@ stdcall WinHttpGetProxyResultEx(ptr ptr) +@ stdcall WinHttpGetProxySettingsVersion(ptr ptr) @ stdcall WinHttpOpen(wstr long wstr wstr long) @ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) @ stdcall WinHttpQueryAuthSchemes(ptr ptr ptr ptr) @@ -19,7 +28,9 @@ @ stdcall WinHttpQueryHeaders(ptr long wstr ptr ptr ptr) @ stdcall WinHttpQueryOption(ptr long ptr ptr) @ stdcall WinHttpReadData(ptr ptr long ptr) +@ stdcall WinHttpReadProxySettings(ptr wstr long long ptr ptr ptr) @ stdcall WinHttpReceiveResponse(ptr ptr) +@ stdcall WinHttpResetAutoProxy(ptr long) @ stdcall WinHttpSendRequest(ptr wstr long ptr long long long) @ stdcall WinHttpSetCredentials(ptr long long wstr ptr ptr) @ stdcall WinHttpSetDefaultProxyConfiguration(ptr) @@ -35,3 +46,4 @@ @ stdcall WinHttpWebSocketSend(ptr long ptr long) @ stdcall WinHttpWebSocketShutdown(ptr long ptr long) @ stdcall WinHttpWriteData(ptr ptr long ptr) +@ stdcall WinHttpWriteProxySettings(ptr long ptr)

1 0

Alexandre Julliard : ntdll: Move the timezone detection code to the Unix library.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 13c1f008c0d8beca934ebfd347dc8354f4c9db05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13c1f008c0d8beca934ebfd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 15:28:26 2020 +0200 ntdll: Move the timezone detection code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 36 +++- dlls/ntdll/time.c | 453 +---------------------------------------- dlls/ntdll/unix/system.c | 398 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 6 + include/winternl.h | 1 + 5 files changed, 440 insertions(+), 454 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13c1f008c0d8beca934e…

1 0

Zebediah Figura : quartz: Don't register the VMR7.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 79c3a24a087b2f73fac42f5218c318fd4d4e4b06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c3a24a087b2f73fac42f52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 24 16:52:44 2020 -0500 quartz: Don't register the VMR7. Oddly, Windows doesn't either. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/regsvr.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index f867c4178a..92555630e9 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -198,18 +198,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_VideoMixingRenderer, - &CLSID_LegacyAmFilterCategory, - L"Video Mixing Renderer", - 0x200000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Video, &GUID_NULL }, - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_VideoMixingRenderer9, &CLSID_LegacyAmFilterCategory, L"Video Mixing Renderer 9",

1 0

Alexandre Julliard : ntdll: Always set the thread context through NtSetContextThread().
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: c031662fd0bf1bc366185fe85a342bf60a9fc0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c031662fd0bf1bc366185fe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 10:33:31 2020 +0200 ntdll: Always set the thread context through NtSetContextThread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 21 --------- dlls/ntdll/signal_arm64.c | 28 +----------- dlls/ntdll/signal_x86_64.c | 106 +-------------------------------------------- 3 files changed, 2 insertions(+), 153 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index adac496525..77c6676cce 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -85,27 +85,6 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, ) -/*********************************************************************** - * set_cpu_context - * - * Set the new CPU context. - */ -void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ); -__ASM_GLOBAL_FUNC( set_cpu_context, - ".arm\n\t" - "ldr r2, [r0, #0x44]\n\t" /* context->Cpsr */ - "tst r2, #0x20\n\t" /* thumb? */ - "ldr r1, [r0, #0x40]\n\t" /* context->Pc */ - "orrne r1, r1, #1\n\t" /* Adjust PC according to thumb */ - "biceq r1, r1, #1\n\t" /* Adjust PC according to arm */ - "msr CPSR_f, r2\n\t" - "ldr lr, [r0, #0x3c]\n\t" /* context->Lr */ - "ldr sp, [r0, #0x38]\n\t" /* context->Sp */ - "push {r1}\n\t" - "ldmib r0, {r0-r12}\n\t" /* context->R0..R12 */ - "pop {pc}" ) - - /********************************************************************** * call_stack_handlers * diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index f396504ae6..798ebe3013 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -68,20 +68,6 @@ struct MSVCRT_JUMP_BUFFER double D[8]; }; -struct arm64_thread_data -{ - void *exit_frame; /* exit frame pointer */ - CONTEXT *context; /* context to set with SIGUSR2 */ -}; - -C_ASSERT( sizeof(struct arm64_thread_data) <= sizeof(((TEB *)0)->SystemReserved2) ); -C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct arm64_thread_data, exit_frame ) == 0x300 ); - -static inline struct arm64_thread_data *arm64_thread_data(void) -{ - return (struct arm64_thread_data *)NtCurrentTeb()->SystemReserved2; -} - /******************************************************************* * is_valid_frame @@ -122,18 +108,6 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ "ret" ) -/*********************************************************************** - * set_cpu_context - * - * Set the new CPU context. - */ -static void set_cpu_context( const CONTEXT *context ) -{ - InterlockedExchangePointer( (void **)&arm64_thread_data()->context, (void *)context ); - raise( SIGUSR2 ); -} - - /********************************************************************** * virtual_unwind @@ -1039,7 +1013,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) } TRACE( "returning to %lx stack %lx\n", context->Pc, context->Sp ); - set_cpu_context( context ); + NtSetContextThread( GetCurrentThread(), context ); } /******************************************************************* diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1f97fbcedb..ec1c0f2d0b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -222,25 +222,6 @@ struct MSVCRT_JUMP_BUFFER #error You must define the signal context functions for your platform #endif -struct amd64_thread_data -{ - DWORD_PTR dr0; /* debug registers */ - DWORD_PTR dr1; - DWORD_PTR dr2; - DWORD_PTR dr3; - DWORD_PTR dr6; - DWORD_PTR dr7; - void *exit_frame; /* exit frame pointer */ -}; - -C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((TEB *)0)->SystemReserved2) ); -C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct amd64_thread_data, exit_frame ) == 0x330 ); - -static inline struct amd64_thread_data *amd64_thread_data(void) -{ - return (struct amd64_thread_data *)NtCurrentTeb()->SystemReserved2; -} - /*********************************************************************** * Definitions for Win32 unwind tables @@ -525,91 +506,6 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "movdqa %xmm15,0x290(%rcx)\n\t" /* context->Xmm15 */ "ret" ); -/*********************************************************************** - * set_full_cpu_context - * - * Set the new CPU context. - */ -extern void set_full_cpu_context( const CONTEXT *context ); -__ASM_GLOBAL_FUNC( set_full_cpu_context, - "subq $40,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 0x40\n\t") - __ASM_SEH(".seh_endprologue\n\t") - __ASM_CFI(".cfi_adjust_cfa_offset 40\n\t") - "ldmxcsr 0x34(%rdi)\n\t" /* context->MxCsr */ - "movw 0x38(%rdi),%ax\n\t" /* context->SegCs */ - "movq %rax,8(%rsp)\n\t" - "movw 0x42(%rdi),%ax\n\t" /* context->SegSs */ - "movq %rax,32(%rsp)\n\t" - "movq 0x44(%rdi),%rax\n\t" /* context->Eflags */ - "movq %rax,16(%rsp)\n\t" - "movq 0x80(%rdi),%rcx\n\t" /* context->Rcx */ - "movq 0x88(%rdi),%rdx\n\t" /* context->Rdx */ - "movq 0x90(%rdi),%rbx\n\t" /* context->Rbx */ - "movq 0x98(%rdi),%rax\n\t" /* context->Rsp */ - "movq %rax,24(%rsp)\n\t" - "movq 0xa0(%rdi),%rbp\n\t" /* context->Rbp */ - "movq 0xa8(%rdi),%rsi\n\t" /* context->Rsi */ - "movq 0xb8(%rdi),%r8\n\t" /* context->R8 */ - "movq 0xc0(%rdi),%r9\n\t" /* context->R9 */ - "movq 0xc8(%rdi),%r10\n\t" /* context->R10 */ - "movq 0xd0(%rdi),%r11\n\t" /* context->R11 */ - "movq 0xd8(%rdi),%r12\n\t" /* context->R12 */ - "movq 0xe0(%rdi),%r13\n\t" /* context->R13 */ - "movq 0xe8(%rdi),%r14\n\t" /* context->R14 */ - "movq 0xf0(%rdi),%r15\n\t" /* context->R15 */ - "movq 0xf8(%rdi),%rax\n\t" /* context->Rip */ - "movq %rax,(%rsp)\n\t" - "fxrstor 0x100(%rdi)\n\t" /* context->FtlSave */ - "movdqa 0x1a0(%rdi),%xmm0\n\t" /* context->Xmm0 */ - "movdqa 0x1b0(%rdi),%xmm1\n\t" /* context->Xmm1 */ - "movdqa 0x1c0(%rdi),%xmm2\n\t" /* context->Xmm2 */ - "movdqa 0x1d0(%rdi),%xmm3\n\t" /* context->Xmm3 */ - "movdqa 0x1e0(%rdi),%xmm4\n\t" /* context->Xmm4 */ - "movdqa 0x1f0(%rdi),%xmm5\n\t" /* context->Xmm5 */ - "movdqa 0x200(%rdi),%xmm6\n\t" /* context->Xmm6 */ - "movdqa 0x210(%rdi),%xmm7\n\t" /* context->Xmm7 */ - "movdqa 0x220(%rdi),%xmm8\n\t" /* context->Xmm8 */ - "movdqa 0x230(%rdi),%xmm9\n\t" /* context->Xmm9 */ - "movdqa 0x240(%rdi),%xmm10\n\t" /* context->Xmm10 */ - "movdqa 0x250(%rdi),%xmm11\n\t" /* context->Xmm11 */ - "movdqa 0x260(%rdi),%xmm12\n\t" /* context->Xmm12 */ - "movdqa 0x270(%rdi),%xmm13\n\t" /* context->Xmm13 */ - "movdqa 0x280(%rdi),%xmm14\n\t" /* context->Xmm14 */ - "movdqa 0x290(%rdi),%xmm15\n\t" /* context->Xmm15 */ - "movq 0x78(%rdi),%rax\n\t" /* context->Rax */ - "movq 0xb0(%rdi),%rdi\n\t" /* context->Rdi */ - "iretq" ); - - -/*********************************************************************** - * set_cpu_context - * - * Set the new CPU context. Used by NtSetContextThread. - */ -void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ) -{ - DWORD flags = context->ContextFlags & ~CONTEXT_AMD64; - - if (flags & CONTEXT_DEBUG_REGISTERS) - { - amd64_thread_data()->dr0 = context->Dr0; - amd64_thread_data()->dr1 = context->Dr1; - amd64_thread_data()->dr2 = context->Dr2; - amd64_thread_data()->dr3 = context->Dr3; - amd64_thread_data()->dr6 = context->Dr6; - amd64_thread_data()->dr7 = context->Dr7; - } - if (flags & CONTEXT_FULL) - { - if (!(flags & CONTEXT_CONTROL)) - FIXME( "setting partial context (%x) not supported\n", flags ); - else - set_full_cpu_context( context ); - } -} - - /****************************************************************************** * RtlWow64GetThreadContext (NTDLL.@) */ @@ -1320,7 +1216,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) } TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); - set_cpu_context( context ); + NtSetContextThread( GetCurrentThread(), context ); }

1 0

Alexandre Julliard : ntdll: Return the current time and timezone bias in NtQuerySystemInformation(SystemTimeOfDayInformation).
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 7161dcd42653452a2373a7595a7020d0a59722f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7161dcd42653452a2373a759… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 12:30:00 2020 +0200 ntdll: Return the current time and timezone bias in NtQuerySystemInformation(SystemTimeOfDayInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 50 ++++++--------------------------------------- dlls/ntdll/unix/system.c | 12 +++++++++-- dlls/wbemprox/builtin.c | 2 +- include/winternl.h | 8 ++++---- programs/taskmgr/perfdata.c | 4 ++-- 5 files changed, 23 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 4d3c8afae6..96b8ceab3b 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -228,44 +228,6 @@ BOOLEAN WINAPI RtlTimeFieldsToTime( return TRUE; } -/*********************************************************************** - * TIME_GetBias [internal] - * - * Helper function calculates delta local time from UTC. - * - * PARAMS - * utc [I] The current utc time. - * pdaylight [I] Local daylight. - * - * RETURNS - * The bias for the current timezone. - */ -static LONG TIME_GetBias(void) -{ - static time_t last_utc; - static LONG last_bias; - LONG ret; - time_t utc; - - utc = time( NULL ); - - RtlEnterCriticalSection( &TIME_tz_section ); - if (utc != last_utc) - { - RTL_DYNAMIC_TIME_ZONE_INFORMATION tzi; - int is_dst = init_tz_info( &tzi ); - - last_utc = utc; - last_bias = tzi.Bias; - last_bias += is_dst ? tzi.DaylightBias : tzi.StandardBias; - last_bias *= SECSPERMIN; - } - - ret = last_bias; - - RtlLeaveCriticalSection( &TIME_tz_section ); - return ret; -} /****************************************************************************** * RtlLocalTimeToSystemTime [NTDLL.@] @@ -283,12 +245,12 @@ static LONG TIME_GetBias(void) NTSTATUS WINAPI RtlLocalTimeToSystemTime( const LARGE_INTEGER *LocalTime, PLARGE_INTEGER SystemTime) { - LONG bias; + SYSTEM_TIMEOFDAY_INFORMATION info; TRACE("(%p, %p)\n", LocalTime, SystemTime); - bias = TIME_GetBias(); - SystemTime->QuadPart = LocalTime->QuadPart + bias * (LONGLONG)TICKSPERSEC; + NtQuerySystemInformation( SystemTimeOfDayInformation, &info, sizeof(info), NULL ); + SystemTime->QuadPart = LocalTime->QuadPart + info.TimeZoneBias.QuadPart; return STATUS_SUCCESS; } @@ -308,12 +270,12 @@ NTSTATUS WINAPI RtlLocalTimeToSystemTime( const LARGE_INTEGER *LocalTime, NTSTATUS WINAPI RtlSystemTimeToLocalTime( const LARGE_INTEGER *SystemTime, PLARGE_INTEGER LocalTime ) { - LONG bias; + SYSTEM_TIMEOFDAY_INFORMATION info; TRACE("(%p, %p)\n", SystemTime, LocalTime); - bias = TIME_GetBias(); - LocalTime->QuadPart = SystemTime->QuadPart - bias * (LONGLONG)TICKSPERSEC; + NtQuerySystemInformation( SystemTimeOfDayInformation, &info, sizeof(info), NULL ); + LocalTime->QuadPart = SystemTime->QuadPart - info.TimeZoneBias.QuadPart; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 68de16b7e5..1d81e8a04f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1690,10 +1690,18 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemTimeOfDayInformation: { + struct tm *tm; + time_t now; SYSTEM_TIMEOFDAY_INFORMATION sti = {{{ 0 }}}; - /* liKeSystemTime, liExpTimeZoneBias, uCurrentTimeZoneId */ - sti.liKeBootTime.QuadPart = server_start_time; + sti.BootTime.QuadPart = server_start_time; + now = time( NULL ); + tm = gmtime( &now ); + sti.TimeZoneBias.QuadPart = mktime( tm ) - now; + tm = localtime( &now ); + if (tm->tm_isdst) sti.TimeZoneBias.QuadPart -= 3600; + sti.TimeZoneBias.QuadPart *= TICKSPERSEC; + NtQuerySystemTime( &sti.SystemTime ); if (size <= sizeof(sti)) { diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 466611721a..2ff3131936 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3275,7 +3275,7 @@ static WCHAR *get_lastbootuptime(void) if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); - RtlTimeToTimeFields( &ti.liKeBootTime, &tf ); + RtlTimeToTimeFields( &ti.BootTime, &tf ); swprintf( ret, 26, L"%04u%02u%02u%02u%02u%02u.%06u+000", tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); return ret; diff --git a/include/winternl.h b/include/winternl.h index 3ff15f28c1..ae41af85b3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1482,10 +1482,10 @@ typedef struct _SYSTEM_PERFORMANCE_INFORMATION { typedef struct _SYSTEM_TIMEOFDAY_INFORMATION { #ifdef __WINESRC__ - LARGE_INTEGER liKeBootTime; - LARGE_INTEGER liKeSystemTime; - LARGE_INTEGER liExpTimeZoneBias; - ULONG uCurrentTimeZoneId; + LARGE_INTEGER BootTime; + LARGE_INTEGER SystemTime; + LARGE_INTEGER TimeZoneBias; + ULONG TimeZoneId; ULONG Reserved; ULONGLONG BootTimeBias; ULONGLONG SleepTimeBias; diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 3b5997d759..d81ab10248 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -199,7 +199,7 @@ void PerfDataRefresh(void) /* CurrentValue = NewValue - OldValue */ dbIdleTime = Li2Double(SysPerfInfo.IdleTime) - Li2Double(liOldIdleTime); dbKernelTime = CurrentKernelTime - OldKernelTime; - dbSystemTime = Li2Double(SysTimeInfo.liKeSystemTime) - Li2Double(liOldSystemTime); + dbSystemTime = Li2Double(SysTimeInfo.SystemTime) - Li2Double(liOldSystemTime); /* CurrentCpuIdle = IdleTime / SystemTime */ dbIdleTime = dbIdleTime / dbSystemTime; @@ -212,7 +212,7 @@ void PerfDataRefresh(void) /* Store new CPU's idle and system time */ liOldIdleTime = SysPerfInfo.IdleTime; - liOldSystemTime = SysTimeInfo.liKeSystemTime; + liOldSystemTime = SysTimeInfo.SystemTime; OldKernelTime = CurrentKernelTime; /* Determine the process count

1 0

Zebediah Figura : quartz/vmr9: Return VFW_E_TYPE_NOT_ACCEPTED when connection fails.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 7595461f77a58d2864d4217adba5c8019671d18a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7595461f77a58d2864d4217a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 24 16:52:41 2020 -0500 quartz/vmr9: Return VFW_E_TYPE_NOT_ACCEPTED when connection fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 8 ++------ dlls/quartz/tests/vmr9.c | 14 ++------------ dlls/quartz/vmr9.c | 4 ++-- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 1f0af817f0..4422a1f914 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1366,12 +1366,8 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = 16; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + vih.bmiHeader.biBitCount = 32; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); if (hr == VFW_E_TYPE_NOT_ACCEPTED) /* w7u */ diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index fae824b827..69065d3576 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1618,20 +1618,10 @@ static void test_connect_pin(void) req_mt.subtype = MEDIASUBTYPE_RGB8; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_WAVE; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_RGB32; peer = (IPin *)0xdeadbeef; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 09d63b6a71..e49266c30c 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -424,7 +424,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE default: FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); free(filter->surfaces); - return E_INVALIDARG; + return VFW_E_TYPE_NOT_ACCEPTED; } info.dwFlags = VMR9AllocFlag_TextureSurface; @@ -456,7 +456,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE } free(filter->surfaces); - return hr; + return VFW_E_TYPE_NOT_ACCEPTED; } static void vmr_start_stream(struct strmbase_renderer *iface)

1 0

Rémi Bernon : server: Pass msg and wparam to update_input_key_state helper.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 4d844b449e7fe8b57798ce3a1fdefb1f122ece6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d844b449e7fe8b57798ce3a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 24 15:28:40 2020 +0200 server: Pass msg and wparam to update_input_key_state helper. So that we can update individual states in next patch. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/server/queue.c b/server/queue.c index 7fd3be1662..5b018085cc 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1290,12 +1290,12 @@ static void set_input_key_state( unsigned char *keystate, unsigned char key, int /* update the input key state for a keyboard message */ static void update_input_key_state( struct desktop *desktop, unsigned char *keystate, - const struct message *msg ) + unsigned int msg, lparam_t wparam ) { unsigned char key; int down = 0; - switch (msg->msg) + switch (msg) { case WM_LBUTTONDOWN: down = (keystate == desktop->keystate) ? 0xc0 : 0x80; @@ -1319,8 +1319,8 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_XBUTTONUP: - if (msg->wparam >> 16 == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); - else if (msg->wparam >> 16 == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down ); + if (wparam >> 16 == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); + else if (wparam >> 16 == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down ); break; case WM_KEYDOWN: case WM_SYSKEYDOWN: @@ -1328,7 +1328,7 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys /* fall through */ case WM_KEYUP: case WM_SYSKEYUP: - key = (unsigned char)msg->wparam; + key = (unsigned char)wparam; set_input_key_state( keystate, key, down ); switch(key) { @@ -1382,7 +1382,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i } if (clr_bit) clear_queue_bits( queue, clr_bit ); - update_input_key_state( input->desktop, input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); list_remove( &msg->entry ); free_message( msg ); } @@ -1501,7 +1501,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg struct thread_input *input; unsigned int msg_code; - update_input_key_state( desktop, desktop->keystate, msg ); + update_input_key_state( desktop, desktop->keystate, msg->msg, msg->wparam ); last_input_time = get_tick_count(); if (msg->msg != WM_MOUSEMOVE) always_queue = 1; @@ -1536,7 +1536,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg win = find_hardware_message_window( desktop, input, msg, &msg_code, &thread ); if (!win || !thread) { - if (input) update_input_key_state( input->desktop, input->keystate, msg ); + if (input) update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); free_message( msg ); return; } @@ -1973,7 +1973,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user if (!win || !win_thread) { /* no window at all, remove it */ - update_input_key_state( input->desktop, input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); list_remove( &msg->entry ); free_message( msg ); continue; @@ -1989,7 +1989,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user else { /* for another thread input, drop it */ - update_input_key_state( input->desktop, input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg->msg, msg->wparam ); list_remove( &msg->entry ); free_message( msg ); }

1 0

Zebediah Figura : quartz/vmr9: Support YUV formats in the VMR7.
by Alexandre Julliard June 25, 2020

June 25, 2020

Module: wine Branch: master Commit: 8fcdca9dd533b1bd74eb41bcca87e354198bef6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fcdca9dd533b1bd74eb41bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 24 16:52:42 2020 -0500 quartz/vmr9: Support YUV formats in the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e49266c30c..e4db42223e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -417,17 +417,35 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE if (!is_vmr9(filter)) { - switch (filter->bmiheader.biBitCount) + switch (filter->bmiheader.biCompression) { - case 24: info.Format = D3DFMT_R8G8B8; break; - case 32: info.Format = D3DFMT_X8R8G8B8; break; - default: - FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); - free(filter->surfaces); - return VFW_E_TYPE_NOT_ACCEPTED; - } + case BI_RGB: + switch (filter->bmiheader.biBitCount) + { + case 24: info.Format = D3DFMT_R8G8B8; break; + case 32: info.Format = D3DFMT_X8R8G8B8; break; + default: + FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); + free(filter->surfaces); + return VFW_E_TYPE_NOT_ACCEPTED; + } + + info.dwFlags = VMR9AllocFlag_TextureSurface; + break; - info.dwFlags = VMR9AllocFlag_TextureSurface; + case mmioFOURCC('N','V','1','2'): + case mmioFOURCC('U','Y','V','Y'): + case mmioFOURCC('Y','U','Y','2'): + case mmioFOURCC('Y','V','1','2'): + info.Format = filter->bmiheader.biCompression; + info.dwFlags = VMR9AllocFlag_OffscreenSurface; + break; + + default: + WARN("Unhandled video compression %#x.\n", filter->bmiheader.biCompression); + free(filter->surfaces); + return VFW_E_TYPE_NOT_ACCEPTED; + } if (FAILED(hr = initialize_device(filter, &info, count))) free(filter->surfaces); return hr;

1 0