March 2015 - Wine-Commits - list.winehq.org

Jacek Caban : dxgi1_2.idl: Added IDXGIAdapter2 declaration.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 3c5387da058f893c4337cebd073e6aa210d6e431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5387da058f893c4337cebd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 15:24:18 2015 +0100 dxgi1_2.idl: Added IDXGIAdapter2 declaration. --- include/dxgi1_2.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index 775b81c..92f9c0e 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -190,3 +190,45 @@ interface IDXGIFactory2 : IDXGIFactory1 [in] IDXGIOutput *pRestrictToOutput, [out] IDXGISwapChain1 **ppSwapChain); } + +typedef enum DXGI_GRAPHICS_PREEMPTION_GRANULARITY { + DXGI_GRAPHICS_PREEMPTION_DMA_BUFFER_BOUNDARY, + DXGI_GRAPHICS_PREEMPTION_PRIMITIVE_BOUNDARY, + DXGI_GRAPHICS_PREEMPTION_TRIANGLE_BOUNDARY, + DXGI_GRAPHICS_PREEMPTION_PIXEL_BOUNDARY, + DXGI_GRAPHICS_PREEMPTION_INSTRUCTION_BOUNDARY +} DXGI_GRAPHICS_PREEMPTION_GRANULARITY; + +typedef enum DXGI_COMPUTE_PREEMPTION_GRANULARITY { + DXGI_COMPUTE_PREEMPTION_DMA_BUFFER_BOUNDARY, + DXGI_COMPUTE_PREEMPTION_DISPATCH_BOUNDARY, + DXGI_COMPUTE_PREEMPTION_THREAD_GROUP_BOUNDARY, + DXGI_COMPUTE_PREEMPTION_THREAD_BOUNDARY, + DXGI_COMPUTE_PREEMPTION_INSTRUCTION_BOUNDARY +} DXGI_COMPUTE_PREEMPTION_GRANULARITY; + +typedef struct DXGI_ADAPTER_DESC2 { + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; + UINT Flags; + DXGI_GRAPHICS_PREEMPTION_GRANULARITY GraphicsPreemptionGranularity; + DXGI_COMPUTE_PREEMPTION_GRANULARITY ComputePreemptionGranularity; +} DXGI_ADAPTER_DESC2; + +[ + object, + uuid(0aa1ae0a-fa0e-4b84-8644-e05ff8e5acb5), + local, + pointer_default(unique) +] +interface IDXGIAdapter2 : IDXGIAdapter1 +{ + HRESULT GetDesc2([out] DXGI_ADAPTER_DESC2 *pDesc); +}

1 0

Jacek Caban : d3d11sdklayers.idl: Added ID3D11Debug declaration.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: a79621a689e637273acb6f8f1350b7c11107d839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79621a689e637273acb6f8f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 15:24:04 2015 +0100 d3d11sdklayers.idl: Added ID3D11Debug declaration. --- include/d3d11sdklayers.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/d3d11sdklayers.idl b/include/d3d11sdklayers.idl index e74922a..638e53c 100644 --- a/include/d3d11sdklayers.idl +++ b/include/d3d11sdklayers.idl @@ -1184,6 +1184,11 @@ typedef enum D3D11_MESSAGE_ID { D3D11_MESSAGE_ID_D3D11_1_MESSAGES_END } D3D11_MESSAGE_ID; +typedef enum D3D11_RLDO_FLAGS { + D3D11_RLDO_SUMMARY = 1, + D3D11_RLDO_DETAIL = 2 +} D3D11_RLDO_FLAGS; + typedef struct D3D11_MESSAGE { D3D11_MESSAGE_CATEGORY Category; D3D11_MESSAGE_SEVERITY Severity; @@ -1210,6 +1215,24 @@ cpp_quote("#define D3D11_INFO_QUEUE_DEFAULT_MESSAGE_COUNT_LIMIT 1024") [ object, + uuid(79cf2233-7536-4948-9d36-1e4692dc5760), + local, + pointer_default(unique) +] +interface ID3D11Debug : IUnknown { + HRESULT SetFeatureMask(UINT Mask); + UINT GetFeatureMask(); + HRESULT SetPresentPerRenderOpDelay(UINT Milliseconds); + UINT GetPresentPerRenderOpDelay(); + HRESULT SetSwapChain(IDXGISwapChain *pSwapChain); + HRESULT GetSwapChain(IDXGISwapChain **ppSwapChain); + HRESULT ValidateContext(ID3D11DeviceContext *pContext); + HRESULT ReportLiveDeviceObjects(D3D11_RLDO_FLAGS Flags); + HRESULT ValidateContextForDispatch(ID3D11DeviceContext *pContext); +} + +[ + object, uuid(6543dbb6-1b48-42f5-ab82-e97ec74326f6), local, pointer_default(unique)

1 0

Hans Leidekker : msi: Check the component enabled flag earlier.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: b7453555a29440ec4b95df87938bf4b00387123b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7453555a29440ec4b95df879… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:33:08 2015 +0100 msi: Check the component enabled flag earlier. --- dlls/msi/files.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 531ce38..36e91ca 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -72,7 +72,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil DWORD size; comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) { TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; @@ -353,7 +353,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) rc = ERROR_FUNCTION_FAILED; goto done; } - if (!file->Component->Enabled) continue; if (file->state != msifs_hashmatch && file->state != msifs_skipped &&

1 0

Hans Leidekker : msi: Use the last sequence number specified for patch media when updating media records.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: f8dc7c221bc73c851eb1a7e8d6e28295cd542210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8dc7c221bc73c851eb1a7e8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:32:44 2015 +0100 msi: Use the last sequence number specified for patch media when updating media records. --- dlls/msi/msipriv.h | 1 - dlls/msi/patch.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fd7667e..ac7ba32 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -193,7 +193,6 @@ typedef struct tagMSIPATCHINFO MSIPATCHSTATE state; BOOL delete_on_close; UINT disk_id; - UINT last_sequence; } MSIPATCHINFO; typedef struct tagMSIBINARY diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index 838dbb0..b7bf2ef 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -741,7 +741,7 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF disk_id = package->db->media_transform_disk_id; TRACE("disk id %u\n", disk_id); - TRACE("last sequence %u\n", patch->last_sequence); + TRACE("last sequence %u\n", media->last_sequence); TRACE("prompt %s\n", debugstr_w(media->prompt)); TRACE("cabinet %s\n", debugstr_w(media->cabinet)); TRACE("volume %s\n", debugstr_w(media->volume)); @@ -749,7 +749,7 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF rec = MSI_CreateRecord( 6 ); MSI_RecordSetInteger( rec, 1, disk_id ); - MSI_RecordSetInteger( rec, 2, patch->last_sequence ); + MSI_RecordSetInteger( rec, 2, media->last_sequence ); MSI_RecordSetStringW( rec, 3, media->prompt ); MSI_RecordSetStringW( rec, 4, media->cabinet ); MSI_RecordSetStringW( rec, 5, media->volume ); @@ -828,7 +828,6 @@ static UINT patch_set_offsets( MSIDATABASE *db, MSIPATCHINFO *patch ) if (r != ERROR_SUCCESS) ERR("Failed to update Media table entry, expect breakage (%u)\n", r); - patch->last_sequence = last_sequence; db->media_transform_offset = last_sequence + 1; patch_offset_list_free( pos );

1 0

Piotr Caban : msvcrt: Fix NAN handling in printf.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 46db64ce1b0b0c729fed3e4737505da4d22c0e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46db64ce1b0b0c729fed3e473… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 25 14:22:02 2015 +0100 msvcrt: Fix NAN handling in printf. --- dlls/msvcrt/printf.h | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 80133d6..4757931 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -26,6 +26,10 @@ #define FUNC_NAME(func) func ## _a #endif +#ifndef signbit +#define signbit(x) ((x) < 0) +#endif + typedef struct FUNC_NAME(pf_flags_t) { APICHAR Sign, LeftAlign, Alternate, PadZero; @@ -539,19 +543,23 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API int len = flags.Precision + 10; double val = pf_args(args_ctx, pos, VT_R8, valist).get_double; int r; - BOOL inf = FALSE, nan = FALSE; + BOOL inf = FALSE, nan = FALSE, ind = FALSE; if(isinf(val)) inf = TRUE; - else if(isnan(val)) - nan = TRUE; /* FIXME: NaN value may be displayed as #IND or #QNAN */ + else if(isnan(val)) { + if(!signbit(val)) + nan = TRUE; + else + ind = TRUE; + } - if(inf || nan) { - if(nan || val<0) + if(inf || nan || ind) { + if(ind || val<0) flags.Sign = '-'; if(flags.Format=='g' || flags.Format=='G') - val = 1.1234; /* fraction will be overwritten with #INF or #IND string */ + val = (nan ? 1.12345 : 1.1234); /* fraction will be overwritten with #INF, #IND or #QNAN string */ else val = 1; @@ -592,18 +600,33 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(decimal_point) { *decimal_point = *locinfo->lconv->decimal_point; - if(inf || nan) { + if(inf || nan || ind) { static const char inf_str[] = "#INF"; static const char ind_str[] = "#IND"; + static const char nan_str[] = "#QNAN"; + + const char *str; + int size; + + if(inf) { + str = inf_str; + size = sizeof(inf_str); + }else if(ind) { + str = ind_str; + size = sizeof(ind_str); + }else { + str = nan_str; + size = sizeof(nan_str); + } - for(i=1; i<(inf ? sizeof(inf_str) : sizeof(ind_str)); i++) { + for(i=1; i<size; i++) { if(decimal_point[i]<'0' || decimal_point[i]>'9') break; - decimal_point[i] = inf ? inf_str[i-1] : ind_str[i-1]; + decimal_point[i] = str[i-1]; } - if(i!=sizeof(inf_str) && i!=1) + if(i!=size && i!=1) decimal_point[i-1]++; } }

1 0

Jacek Caban : wininet: Pass timeout as DWORD in setsockopt calls.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: b720e42fcfbf148f9d2d0606549a805745fbc90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b720e42fcfbf148f9d2d06065… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 13:10:14 2015 +0100 wininet: Pass timeout as DWORD in setsockopt calls. --- dlls/wininet/netconnection.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a268aa7..9f64cb9 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -949,22 +949,10 @@ int NETCON_GetCipherStrength(netconn_t *connection) DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) { int result; - struct timeval tv; - /* value is in milliseconds, convert to struct timeval */ - if (value == INFINITE) - { - tv.tv_sec = 0; - tv.tv_usec = 0; - } - else - { - tv.tv_sec = value / 1000; - tv.tv_usec = (value % 1000) * 1000; - } result = setsockopt(connection->socket, SOL_SOCKET, - send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, - sizeof(tv)); + send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&value, + sizeof(value)); if (result == -1) { WARN("setsockopt failed\n");

1 0

Alexandre Julliard : server: Fix the string type in traces for I/ O completion names.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 9fc48b28662414afe1ea7c60a6b08f2103bc8439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc48b28662414afe1ea7c60a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 20:30:30 2015 +0900 server: Fix the string type in traces for I/O completion names. --- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 4 ++-- server/trace.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1b7831e..0205131 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4845,7 +4845,7 @@ struct create_completion_request unsigned int attributes; unsigned int concurrent; obj_handle_t rootdir; - /* VARARG(filename,string); */ + /* VARARG(filename,unicode_str); */ char __pad_28[4]; }; struct create_completion_reply @@ -4863,7 +4863,7 @@ struct open_completion_request unsigned int access; unsigned int attributes; obj_handle_t rootdir; - /* VARARG(filename,string); */ + /* VARARG(filename,unicode_str); */ }; struct open_completion_reply { diff --git a/server/protocol.def b/server/protocol.def index 2cd8272..a34dde9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3366,7 +3366,7 @@ enum coords_relative unsigned int attributes; /* object attributes */ unsigned int concurrent; /* max number of concurrent active threads */ obj_handle_t rootdir; /* root directory */ - VARARG(filename,string); /* port name */ + VARARG(filename,unicode_str); /* port name */ @REPLY obj_handle_t handle; /* port handle */ @END @@ -3377,7 +3377,7 @@ enum coords_relative unsigned int access; /* desired access to a port */ unsigned int attributes; /* object attributes */ obj_handle_t rootdir; /* root directory */ - VARARG(filename,string); /* port name */ + VARARG(filename,unicode_str); /* port name */ @REPLY obj_handle_t handle; /* port handle */ @END diff --git a/server/trace.c b/server/trace.c index c7f4921..e5d3cd3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3951,7 +3951,7 @@ static void dump_create_completion_request( const struct create_completion_reque fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", concurrent=%08x", req->concurrent ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); - dump_varargs_string( ", filename=", cur_size ); + dump_varargs_unicode_str( ", filename=", cur_size ); } static void dump_create_completion_reply( const struct create_completion_reply *req ) @@ -3964,7 +3964,7 @@ static void dump_open_completion_request( const struct open_completion_request * fprintf( stderr, " access=%08x", req->access ); fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); - dump_varargs_string( ", filename=", cur_size ); + dump_varargs_unicode_str( ", filename=", cur_size ); } static void dump_open_completion_reply( const struct open_completion_reply *req )

1 0

Hans Leidekker : msi: Skip files from the original media if a patch is applied.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 19e51936e0d7c37e201b45a1fbce007ca4808f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e51936e0d7c37e201b45a1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:33:26 2015 +0100 msi: Skip files from the original media if a patch is applied. --- dlls/msi/files.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 36e91ca..4337d51 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -77,6 +77,11 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; } + if (!list_empty( &package->patches ) && file->disk_id < MSI_INITIAL_MEDIA_TRANSFORM_DISKID) + { + TRACE("skipping %s (not part of patch)\n", debugstr_w(file->File)); + return msifs_skipped; + } if ((comp->assembly && !comp->assembly->application && !comp->assembly->installed) || GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) {

1 0

Hans Leidekker : msi: Check file state before installing global assemblies.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: c66f9bef6073ad77f75ec4db7afa0d1c712020ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66f9bef6073ad77f75ec4db7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:33:48 2015 +0100 msi: Check file state before installing global assemblies. --- dlls/msi/files.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4337d51..40cc3f6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -340,7 +340,6 @@ WCHAR *msi_resolve_file_source( MSIPACKAGE *package, MSIFILE *file ) UINT ACTION_InstallFiles(MSIPACKAGE *package) { MSIMEDIAINFO *mi; - MSICOMPONENT *comp; UINT rc = ERROR_SUCCESS; MSIFILE *file; @@ -418,18 +417,19 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) goto done; } } - LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - comp->Action = msi_get_component_action( package, comp ); - if (comp->Action == INSTALLSTATE_LOCAL && comp->assembly && !comp->assembly->installed) + MSICOMPONENT *comp = file->Component; + + if (!comp->assembly || (file->state != msifs_missing && file->state != msifs_overwrite)) + continue; + + rc = msi_install_assembly( package, comp ); + if (rc != ERROR_SUCCESS) { - rc = msi_install_assembly( package, comp ); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to install assembly\n"); - rc = ERROR_INSTALL_FAILURE; - break; - } + ERR("Failed to install assembly\n"); + rc = ERROR_INSTALL_FAILURE; + break; } }

1 0

Michael Müller : netprofm: Add stubbed IConnectionPoint interface.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 8e999722043527c85c1df565515fb4ad5e2beac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e999722043527c85c1df5655… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 25 11:55:13 2015 +0100 netprofm: Add stubbed IConnectionPoint interface. --- dlls/netprofm/list.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++- include/netlistmgr.idl | 13 ++++ 2 files changed, 181 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index b9ab1cc..783b9cd 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1,5 +1,6 @@ /* * Copyright 2014 Hans Leidekker for CodeWeavers + * Copyright 2015 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,7 @@ #include "objbase.h" #include "ocidl.h" #include "netlistmgr.h" +#include "olectl.h" #include "wine/debug.h" #include "netprofm_private.h" @@ -40,6 +42,14 @@ struct list_manager LONG refs; }; +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + IConnectionPointContainer *container; + LONG refs; + IID iid; +}; + static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, struct list_manager, IConnectionPointContainer_iface); @@ -51,6 +61,151 @@ static inline struct list_manager *impl_from_INetworkCostManager( return CONTAINING_RECORD( iface, struct list_manager, INetworkCostManager_iface ); } +static inline struct connection_point *impl_from_IConnectionPoint( + IConnectionPoint *iface ) +{ + return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); +} + +static HRESULT WINAPI connection_point_QueryInterface( + IConnectionPoint *iface, + REFIID riid, + void **obj ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + TRACE( "%p, %s, %p\n", cp, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_IConnectionPoint ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + IConnectionPoint_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI connection_point_AddRef( + IConnectionPoint *iface ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + return InterlockedIncrement( &cp->refs ); +} + +static ULONG WINAPI connection_point_Release( + IConnectionPoint *iface ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + LONG refs = InterlockedDecrement( &cp->refs ); + if (!refs) + { + TRACE( "destroying %p\n", cp ); + IConnectionPointContainer_Release( cp->container ); + HeapFree( GetProcessHeap(), 0, cp ); + } + return refs; +} + +static HRESULT WINAPI connection_point_GetConnectionInterface( + IConnectionPoint *iface, + IID *iid ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + TRACE( "%p, %p\n", cp, iid ); + + if (!iid) + return E_POINTER; + + memcpy( iid, &cp->iid, sizeof(*iid) ); + return S_OK; +} + +static HRESULT WINAPI connection_point_GetConnectionPointContainer( + IConnectionPoint *iface, + IConnectionPointContainer **container ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + TRACE( "%p, %p\n", cp, container ); + + if (!container) + return E_POINTER; + + IConnectionPointContainer_AddRef( cp->container ); + *container = cp->container; + return S_OK; +} + +static HRESULT WINAPI connection_point_Advise( + IConnectionPoint *iface, + IUnknown *sink, + DWORD *cookie ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p, %p - stub\n", cp, sink, cookie ); + + if (!sink || !cookie) + return E_POINTER; + + return CONNECT_E_CANNOTCONNECT; +} + +static HRESULT WINAPI connection_point_Unadvise( + IConnectionPoint *iface, + DWORD cookie ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %d - stub\n", cp, cookie ); + + return E_POINTER; +} + +static HRESULT WINAPI connection_point_EnumConnections( + IConnectionPoint *iface, + IEnumConnections **connections ) +{ + struct connection_point *cp = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p - stub\n", cp, connections ); + + return E_NOTIMPL; +} + +static const IConnectionPointVtbl connection_point_vtbl = +{ + connection_point_QueryInterface, + connection_point_AddRef, + connection_point_Release, + connection_point_GetConnectionInterface, + connection_point_GetConnectionPointContainer, + connection_point_Advise, + connection_point_Unadvise, + connection_point_EnumConnections +}; + +static HRESULT connection_point_create( + IConnectionPoint **obj, + REFIID riid, + IConnectionPointContainer *container ) +{ + struct connection_point *cp; + TRACE( "%p, %s, %p\n", obj, debugstr_guid(riid), container ); + + if (!(cp = HeapAlloc( GetProcessHeap(), 0, sizeof(*cp) ))) return E_OUTOFMEMORY; + cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; + cp->container = container; + cp->refs = 1; + + memcpy( &cp->iid, riid, sizeof(*riid) ); + IConnectionPointContainer_AddRef( container ); + + *obj = &cp->IConnectionPoint_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + static HRESULT WINAPI cost_manager_QueryInterface( INetworkCostManager *iface, REFIID riid, @@ -328,8 +483,19 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo REFIID riid, IConnectionPoint **cp) { struct list_manager *This = impl_from_IConnectionPointContainer( iface ); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), cp); - return E_NOTIMPL; + + TRACE( "%p, %s, %p\n", This, debugstr_guid(riid), cp ); + + if (!riid || !cp) + return E_POINTER; + + if (IsEqualGUID( riid, &IID_INetworkListManagerEvents )) + return connection_point_create( cp, riid, iface ); + + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + + *cp = NULL; + return E_NOINTERFACE; } static const struct IConnectionPointContainerVtbl cpc_vtbl = diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index 5be6e28..5d2c811 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -29,6 +29,7 @@ interface INetwork; interface INetworkConnection; interface INetworkCostManager; interface INetworkListManager; +interface INetworkListManagerEvents; typedef [v1_enum] enum NLM_CONNECTIVITY { @@ -145,3 +146,15 @@ interface INetworkListManager : IDispatch uuid(dcb00c01-570f-4a9b-8d69-199fdba5723b) ] coclass NetworkListManager { interface INetworkListManager; } + +[ + object, + oleautomation, + pointer_default(unique), + uuid(DCB00001-570F-4A9B-8D69-199FDBA5723B) +] +interface INetworkListManagerEvents : IUnknown +{ + HRESULT ConnectivityChanged( + [in] NLM_CONNECTIVITY newConnectivity); +}

1 0