July 2015 - Wine-commits - list.winehq.org

Hans Leidekker : netprofm: Create a connection point object for INetworkCostManagerEvents.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: c42f38fd17a954337b77cc6aaea187107599a4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42f38fd17a954337b77cc6aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 24 10:34:15 2015 +0200 netprofm: Create a connection point object for INetworkCostManagerEvents. --- dlls/netprofm/list.c | 3 ++- dlls/netprofm/tests/list.c | 6 +++++- include/netlistmgr.idl | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 783b9cd..842f335 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -489,7 +489,8 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo if (!riid || !cp) return E_POINTER; - if (IsEqualGUID( riid, &IID_INetworkListManagerEvents )) + if (IsEqualGUID( riid, &IID_INetworkListManagerEvents ) || + IsEqualGUID( riid, &IID_INetworkCostManagerEvents )) return connection_point_create( cp, riid, iface ); FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 06a8086..7776f5c 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -103,8 +103,12 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( !memcmp( &iid, &IID_INetworkListManagerEvents, sizeof(iid) ), "Expected iid to be IID_INetworkListManagerEvents\n" ); - IConnectionPoint_Release( pt ); + + hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt ); + ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); + if (hr == S_OK) IConnectionPoint_Release( pt ); + IConnectionPointContainer_Release( cpc ); INetworkListManager_Release( mgr ); } diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index 5d2c811..fd3ef77 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -68,6 +68,8 @@ typedef struct NLM_SOCKADDR BYTE data[128]; } NLM_SOCKADDR; +const UINT32 NLM_UNKNOWN_DATAPLAN_STATUS = 0xffffffff; + typedef struct NLM_USAGE_DATA { DWORD UsageInMegabytes; @@ -108,6 +110,21 @@ interface INetworkCostManager : IUnknown } [ + object, + pointer_default(unique), + uuid(dcb00009-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkCostManagerEvents : IUnknown +{ + HRESULT CostChanged( + [in] DWORD newCost, + [in, unique] NLM_SOCKADDR *pDestAddr); + + HRESULT DataPlanStatusChanged( + [in, unique] NLM_SOCKADDR *pDestAddr); +} + +[ dual, object, oleautomation,

1 0

Hans Leidekker : netprofm: Improve the stub for INetworkCostManager:: GetDataPlanStatus.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: be7373f76420f93e19a265cd268911a3628af704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7373f76420f93e19a265cd2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 24 10:34:36 2015 +0200 netprofm: Improve the stub for INetworkCostManager::GetDataPlanStatus. --- dlls/netprofm/Makefile.in | 1 + dlls/netprofm/list.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- dlls/netprofm/tests/list.c | 7 ++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index 4dadfb0..def2614 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,4 +1,5 @@ MODULE = netprofm.dll +IMPORTS = iphlpapi C_SRCS = \ list.c \ diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 842f335..1808178 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -23,6 +23,12 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "ifdef.h" +#include "netioapi.h" #include "initguid.h" #include "objbase.h" #include "ocidl.h" @@ -240,12 +246,67 @@ static HRESULT WINAPI cost_manager_GetCost( return S_OK; } +static BOOL map_address_6to4( const SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) +{ + ULONG i; + + if (addr6->sin6_family != WS_AF_INET6) return FALSE; + + for (i = 0; i < 5; i++) + if (addr6->sin6_addr.u.Word[i]) return FALSE; + + if (addr6->sin6_addr.u.Word[5] != 0xffff) return FALSE; + + addr4->sin_family = WS_AF_INET; + addr4->sin_port = addr6->sin6_port; + addr4->sin_addr.S_un.S_addr = addr6->sin6_addr.u.Word[6] << 16 | addr6->sin6_addr.u.Word[7]; + memset( &addr4->sin_zero, 0, sizeof(addr4->sin_zero) ); + + return TRUE; +} + static HRESULT WINAPI cost_manager_GetDataPlanStatus( INetworkCostManager *iface, NLM_DATAPLAN_STATUS *pDataPlanStatus, NLM_SOCKADDR *pDestIPAddr) { + DWORD ret, index; + NET_LUID luid; + SOCKADDR *dst = (SOCKADDR *)pDestIPAddr; + SOCKADDR_IN addr4, *dst4; + FIXME( "%p, %p, %p\n", iface, pDataPlanStatus, pDestIPAddr ); - return E_NOTIMPL; + + if (!pDataPlanStatus) return E_POINTER; + + if (dst && ((dst->sa_family == WS_AF_INET && (dst4 = (SOCKADDR_IN *)dst)) || + ((dst->sa_family == WS_AF_INET6 && map_address_6to4( (const SOCKADDR_IN6 *)dst, &addr4 ) + && (dst4 = &addr4))))) + { + if ((ret = GetBestInterface( dst4->sin_addr.S_un.S_addr, &index ))) + return HRESULT_FROM_WIN32( ret ); + + if ((ret = ConvertInterfaceIndexToLuid( index, &luid ))) + return HRESULT_FROM_WIN32( ret ); + + if ((ret = ConvertInterfaceLuidToGuid( &luid, &pDataPlanStatus->InterfaceGuid ))) + return HRESULT_FROM_WIN32( ret ); + } + else + { + FIXME( "interface guid not found\n" ); + memset( &pDataPlanStatus->InterfaceGuid, 0, sizeof(pDataPlanStatus->InterfaceGuid) ); + } + + pDataPlanStatus->UsageData.UsageInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + memset( &pDataPlanStatus->UsageData.LastSyncTime, 0, sizeof(pDataPlanStatus->UsageData.LastSyncTime) ); + pDataPlanStatus->DataLimitInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->InboundBandwidthInKbps = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->OutboundBandwidthInKbps = NLM_UNKNOWN_DATAPLAN_STATUS; + memset( &pDataPlanStatus->NextBillingCycle, 0, sizeof(pDataPlanStatus->NextBillingCycle) ); + pDataPlanStatus->MaxTransferSizeInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->Reserved = 0; + + return S_OK; } static HRESULT WINAPI cost_manager_SetDestinationAddresses( diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 7776f5c..7e885c3 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -67,6 +67,7 @@ static void test_INetworkListManager( void ) if (hr == S_OK) { DWORD cost; + NLM_DATAPLAN_STATUS status; hr = INetworkCostManager_GetCost( cost_mgr, NULL, NULL ); ok( hr == E_POINTER, "got %08x\n", hr ); @@ -76,6 +77,12 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( cost != 0xdeadbeef, "cost not set\n" ); + hr = INetworkCostManager_GetDataPlanStatus( cost_mgr, NULL, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = INetworkCostManager_GetDataPlanStatus( cost_mgr, &status, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + INetworkCostManager_Release( cost_mgr ); }

1 0

Hans Leidekker : netapi32: Implement DavGetHTTPFromUNCPath.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 2e9a2d80626757b51357d83c4b702939752b74ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9a2d80626757b51357d83c4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 24 10:35:07 2015 +0200 netapi32: Implement DavGetHTTPFromUNCPath. --- dlls/netapi32/netapi32.c | 90 ++++++++++++++++++ dlls/netapi32/netapi32.spec | 1 + dlls/netapi32/tests/access.c | 218 +++++++++++++++++++++++++++++++++++++++++-- include/davclnt.h | 1 + 4 files changed, 301 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e9a2d80626757b51357d…

1 0

Jacek Caban : widl: Don' t output C++ default value if the argument is followed by another without default value.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: dd58fcc10edb1d3b9d96151cded067e1631a54ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd58fcc10edb1d3b9d96151cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 26 18:07:37 2015 +0200 widl: Don't output C++ default value if the argument is followed by another without default value. --- tools/widl/header.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c23faf4..bf824d8 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -937,8 +937,18 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i if (method == 2) { const expr_t *expr = get_attrp(arg->attrs, ATTR_DEFAULTVALUE); if (expr) { - fprintf(h, " = "); - write_expr( h, expr, 0, 1, NULL, NULL, "" ); + const var_t *tail_arg; + + /* Output default value only if all following arguments also have default value. */ + LIST_FOR_EACH_ENTRY_REV( tail_arg, args, const var_t, entry ) { + if(tail_arg == arg) { + fprintf(h, " = "); + write_expr( h, expr, 0, 1, NULL, NULL, "" ); + break; + } + if(!get_attrp(tail_arg->attrs, ATTR_DEFAULTVALUE)) + break; + } } } count++;

1 0

Sebastian Lackner : ntdll/tests: Add basic tests for RtlQueueWorkItem.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: c774a8c3ae89959be5798554cb60cb52dbfe1723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c774a8c3ae89959be5798554c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 26 23:23:57 2015 +0200 ntdll/tests: Add basic tests for RtlQueueWorkItem. --- dlls/ntdll/tests/threadpool.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index c69902b..7be3f0d 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -98,6 +98,51 @@ static BOOL init_threadpool(void) #undef NTDLL_GET_PROC +static DWORD CALLBACK rtl_work_cb(void *userdata) +{ + HANDLE semaphore = userdata; + trace("Running rtl_work callback\n"); + ReleaseSemaphore(semaphore, 1, NULL); + return 0; +} + +static void test_RtlQueueWorkItem(void) +{ + HANDLE semaphore; + NTSTATUS status; + DWORD result; + + semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_EXECUTEDEFAULT); + ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_EXECUTEINIOTHREAD); + ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_EXECUTEINPERSISTENTTHREAD); + ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_EXECUTELONGFUNCTION); + ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + status = RtlQueueWorkItem(rtl_work_cb, semaphore, WT_TRANSFER_IMPERSONATION); + ok(!status, "RtlQueueWorkItem failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + CloseHandle(semaphore); +} + static void CALLBACK simple_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE semaphore = userdata; @@ -1292,6 +1337,8 @@ static void test_tp_multi_wait(void) START_TEST(threadpool) { + test_RtlQueueWorkItem(); + if (!init_threadpool()) return;

1 0

Sebastian Lackner : ntdll: Reimplement RtlQueueWorkItem on top of new threadpool API.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 9562e818101e67304c613dec922b86a793c26e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9562e818101e67304c613dec9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 26 23:24:06 2015 +0200 ntdll: Reimplement RtlQueueWorkItem on top of new threadpool API. --- dlls/ntdll/threadpool.c | 143 +++++++++--------------------------------------- 1 file changed, 27 insertions(+), 116 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 23091f3..ad4951f 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -42,44 +42,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(threadpool); * Old thread pooling API */ -#define OLD_WORKER_TIMEOUT 30000 /* 30 seconds */ +struct rtl_work_item +{ + PRTL_WORK_ITEM_ROUTINE function; + PVOID context; +}; + #define EXPIRE_NEVER (~(ULONGLONG)0) #define TIMER_QUEUE_MAGIC 0x516d6954 /* TimQ */ -static RTL_CRITICAL_SECTION_DEBUG critsect_debug; static RTL_CRITICAL_SECTION_DEBUG critsect_compl_debug; static struct { - /* threadpool_cs must be held while modifying the following four elements */ - struct list work_item_list; - LONG num_workers; - LONG num_busy_workers; - LONG num_items_processed; - RTL_CONDITION_VARIABLE threadpool_cond; - RTL_CRITICAL_SECTION threadpool_cs; HANDLE compl_port; RTL_CRITICAL_SECTION threadpool_compl_cs; } old_threadpool = { - LIST_INIT(old_threadpool.work_item_list), /* work_item_list */ - 0, /* num_workers */ - 0, /* num_busy_workers */ - 0, /* num_items_processed */ - RTL_CONDITION_VARIABLE_INIT, /* threadpool_cond */ - { &critsect_debug, -1, 0, 0, 0, 0 }, /* threadpool_cs */ NULL, /* compl_port */ { &critsect_compl_debug, -1, 0, 0, 0, 0 }, /* threadpool_compl_cs */ }; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &old_threadpool.threadpool_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_cs") } -}; - static RTL_CRITICAL_SECTION_DEBUG critsect_compl_debug = { 0, 0, &old_threadpool.threadpool_compl_cs, @@ -87,13 +71,6 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_compl_debug = 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_compl_cs") } }; -struct work_item -{ - struct list entry; - PRTL_WORK_ITEM_ROUTINE function; - PVOID context; -}; - struct wait_work_item { HANDLE Object; @@ -364,47 +341,14 @@ static inline LONG interlocked_dec( PLONG dest ) return interlocked_xchg_add( dest, -1 ) - 1; } -static void WINAPI worker_thread_proc(void * param) +static void CALLBACK process_rtl_work_item( TP_CALLBACK_INSTANCE *instance, void *userdata ) { - struct list *item; - struct work_item *work_item_ptr, work_item; - LARGE_INTEGER timeout; - timeout.QuadPart = -(OLD_WORKER_TIMEOUT * (ULONGLONG)10000); - - RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); - old_threadpool.num_workers++; - - for (;;) - { - if ((item = list_head( &old_threadpool.work_item_list ))) - { - work_item_ptr = LIST_ENTRY( item, struct work_item, entry ); - list_remove( &work_item_ptr->entry ); - old_threadpool.num_busy_workers++; - old_threadpool.num_items_processed++; - RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); - - /* copy item to stack and do the work */ - work_item = *work_item_ptr; - RtlFreeHeap( GetProcessHeap(), 0, work_item_ptr ); - TRACE("executing %p(%p)\n", work_item.function, work_item.context); - work_item.function( work_item.context ); - - RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); - old_threadpool.num_busy_workers--; - } - else if (RtlSleepConditionVariableCS( &old_threadpool.threadpool_cond, - &old_threadpool.threadpool_cs, &timeout ) != STATUS_SUCCESS) - { - break; - } - } + struct rtl_work_item *item = userdata; - old_threadpool.num_workers--; - RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); - RtlExitUserThread( 0 ); + TRACE("executing %p(%p)\n", item->function, item->context); + item->function( item->context ); - /* never reached */ + RtlFreeHeap( GetProcessHeap(), 0, item ); } /*********************************************************************** @@ -413,9 +357,9 @@ static void WINAPI worker_thread_proc(void * param) * Queues a work item into a thread in the thread pool. * * PARAMS - * Function [I] Work function to execute. - * Context [I] Context to pass to the work function when it is executed. - * Flags [I] Flags. See notes. + * function [I] Work function to execute. + * context [I] Context to pass to the work function when it is executed. + * flags [I] Flags. See notes. * * RETURNS * Success: STATUS_SUCCESS. @@ -429,59 +373,26 @@ static void WINAPI worker_thread_proc(void * param) *|WT_EXECUTELONGFUNCTION - Hints that the execution can take a long time. *|WT_TRANSFER_IMPERSONATION - Executes the function with the current access token. */ -NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, ULONG Flags) +NTSTATUS WINAPI RtlQueueWorkItem( PRTL_WORK_ITEM_ROUTINE function, PVOID context, ULONG flags ) { - HANDLE thread; + TP_CALLBACK_ENVIRON environment; + struct rtl_work_item *item; NTSTATUS status; - LONG items_processed; - struct work_item *work_item = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(struct work_item)); - if (!work_item) + item = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*item) ); + if (!item) return STATUS_NO_MEMORY; - work_item->function = Function; - work_item->context = Context; - - if (Flags & ~WT_EXECUTELONGFUNCTION) - FIXME("Flags 0x%x not supported\n", Flags); - - RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); - list_add_tail( &old_threadpool.work_item_list, &work_item->entry ); - status = (old_threadpool.num_workers > old_threadpool.num_busy_workers) ? - STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - items_processed = old_threadpool.num_items_processed; - RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); - - /* FIXME: tune this algorithm to not be as aggressive with creating threads - * if WT_EXECUTELONGFUNCTION isn't specified */ - if (status == STATUS_SUCCESS) - RtlWakeConditionVariable( &old_threadpool.threadpool_cond ); - else - { - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - worker_thread_proc, NULL, &thread, NULL ); + memset( &environment, 0, sizeof(environment) ); + environment.Version = 1; + environment.u.s.LongFunction = (flags & WT_EXECUTELONGFUNCTION) != 0; + environment.u.s.Persistent = (flags & WT_EXECUTEINPERSISTENTTHREAD) != 0; - /* NOTE: we don't care if we couldn't create the thread if there is at - * least one other available to process the request */ - if (status == STATUS_SUCCESS) - NtClose( thread ); - else - { - RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); - if (old_threadpool.num_workers > 0 || - old_threadpool.num_items_processed != items_processed) - { - status = STATUS_SUCCESS; - } - else - list_remove( &work_item->entry ); - RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); - - if (status != STATUS_SUCCESS) - RtlFreeHeap( GetProcessHeap(), 0, work_item ); - } - } + item->function = function; + item->context = context; + status = TpSimpleTryPost( process_rtl_work_item, item, &environment ); + if (status) RtlFreeHeap( GetProcessHeap(), 0, item ); return status; }

1 0

Michael Stefaniuc : include: Add IAMVfwCaptureDialogs declaration.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 7f1a5d46783861c5aa2975da6eedf1c9a0b0f7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1a5d46783861c5aa2975da6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 27 09:25:46 2015 +0200 include: Add IAMVfwCaptureDialogs declaration. --- include/axextend.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/axextend.idl b/include/axextend.idl index 207dbce..716740c 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1258,3 +1258,23 @@ interface IAMGraphBuilderCallback : IUnknown HRESULT CreatedFilter( [in] IBaseFilter *pFil); }; + +[ + local, + object, + uuid(d8d715a0-6e5e-11d0-b3f0-00aa003761c5), + pointer_default(unique) +] +interface IAMVfwCaptureDialogs : IUnknown +{ + HRESULT HasDialog( + [in] int dialog); + HRESULT ShowDialog( + [in] int dialog, + [in] HWND hwnd); + HRESULT SendDriverMessage( + [in] int dialog, + [in] int msg, + [in] long data1, + [in] long data2); +};

1 0

Michael Stefaniuc : qcap: Remove initialization code from QI of VfwCapture.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 6984db834a0d9938a3ed83f0ab9f9783f5d0b4c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6984db834a0d9938a3ed83f0a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 27 09:26:56 2015 +0200 qcap: Remove initialization code from QI of VfwCapture. --- dlls/qcap/vfwcapture.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7804a3d..67cc8f5 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -181,22 +181,6 @@ static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid else if (IsEqualIID(riid, &IID_IPersistPropertyBag)) *ppv = &This->IPersistPropertyBag_iface; - if (!IsEqualIID(riid, &IID_IUnknown) && - !IsEqualIID(riid, &IID_IPersist) && - !IsEqualIID(riid, &IID_IPersistPropertyBag) && - !This->init) - { - FIXME("Capture system not initialised when looking for %s, " - "trying it on primary device now\n", debugstr_guid(riid)); - This->driver_info = qcap_driver_init( This->pOutputPin, 0 ); - if (!This->driver_info) - { - ERR("VfwCapture initialisation failed\n"); - return E_UNEXPECTED; - } - This->init = TRUE; - } - if (*ppv) { TRACE("Returning %s interface\n", debugstr_guid(riid));

1 0

Michael Stefaniuc : qcap: There can be only ONE QueryInterface in VfwCapture!.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: d3ceabf433d1c2b5528f9594e41471c4076dc6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ceabf433d1c2b5528f9594e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 27 09:28:22 2015 +0200 qcap: There can be only ONE QueryInterface in VfwCapture!. --- dlls/qcap/vfwcapture.c | 55 +++++++++----------------------------------------- 1 file changed, 10 insertions(+), 45 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 67cc8f5..4f7508a 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -276,23 +276,12 @@ static const IBaseFilterVtbl VfwCapture_Vtbl = }; /* AMStreamConfig interface, we only need to implement {G,S}etFormat */ -static HRESULT WINAPI -AMStreamConfig_QueryInterface( IAMStreamConfig * iface, REFIID riid, LPVOID * ppv ) +static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID riid, + void **ret_iface) { VfwCapture *This = impl_from_IAMStreamConfig(iface); - TRACE("%p --> %s\n", This, debugstr_guid(riid)); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAMStreamConfig)) - { - IAMStreamConfig_AddRef(iface); - *ppv = iface; - return S_OK; - } - - FIXME("No interface for iid %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return IUnknown_QueryInterface(&This->filter.IBaseFilter_iface, riid, ret_iface); } static ULONG WINAPI AMStreamConfig_AddRef( IAMStreamConfig * iface ) @@ -391,20 +380,12 @@ static const IAMStreamConfigVtbl IAMStreamConfig_VTable = AMStreamConfig_GetStreamCaps }; -static HRESULT WINAPI -AMVideoProcAmp_QueryInterface( IAMVideoProcAmp * iface, REFIID riid, - LPVOID * ppv ) +static HRESULT WINAPI AMVideoProcAmp_QueryInterface(IAMVideoProcAmp *iface, REFIID riid, + void **ret_iface) { - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAMVideoProcAmp)) - { - *ppv = iface; - IAMVideoProcAmp_AddRef( iface ); - return S_OK; - } + VfwCapture *This = impl_from_IAMVideoProcAmp(iface); - FIXME("No interface for iid %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return IUnknown_QueryInterface(&This->filter.IBaseFilter_iface, riid, ret_iface); } static ULONG WINAPI AMVideoProcAmp_AddRef(IAMVideoProcAmp * iface) @@ -459,27 +440,11 @@ static const IAMVideoProcAmpVtbl IAMVideoProcAmp_VTable = AMVideoProcAmp_Get, }; -static HRESULT WINAPI -PPB_QueryInterface( IPersistPropertyBag * iface, REFIID riid, LPVOID * ppv ) +static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, void **ret_iface) { - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IPersistPropertyBag)) - { - IPersistPropertyBag_AddRef(iface); - *ppv = iface; - return S_OK; - } - if (IsEqualIID(riid, &IID_IBaseFilter)) - { - /* FIXME: native devenum asks for IBaseFilter, should we return it? */ - IPersistPropertyBag_AddRef(iface); - *ppv = iface; - return S_OK; - } + VfwCapture *This = impl_from_IPersistPropertyBag(iface); - FIXME("No interface for iid %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return IUnknown_QueryInterface(&This->filter.IBaseFilter_iface, riid, ret_iface); } static ULONG WINAPI PPB_AddRef(IPersistPropertyBag * iface)

1 0

Michael Stefaniuc : qcap: Support COM aggregation in VfwCapture.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 67ced3c372ba34696e17fbb8d6db4c1ac00655b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ced3c372ba34696e17fbb8d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 28 11:03:23 2015 +0200 qcap: Support COM aggregation in VfwCapture. --- dlls/qcap/vfwcapture.c | 193 ++++++++++++++++++++++++++++++------------------- 1 file changed, 120 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67ced3c372ba34696e17f…

1 0