wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Jacek Caban : dxgi1_2.idl: Added IDXGIAdapter2 declaration.
by Alexandre Julliard 25 Mar '15

25 Mar '15

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 25 Mar '15

25 Mar '15

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

Michael Müller : netprofm/tests: Add tests for ConnectionPointContainer::FindConnectionPoint.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: d07f76e39affdbe29f8733ffb1087d400b305a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07f76e39affdbe29f8733ffb… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 25 12:03:48 2015 +0100 netprofm/tests: Add tests for ConnectionPointContainer::FindConnectionPoint. The refcounting is also tested because some apps depend on that. --- dlls/netprofm/tests/list.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index ce4891a..06a8086 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -27,12 +27,15 @@ static void test_INetworkListManager( void ) { - IConnectionPointContainer *cpc; + IConnectionPointContainer *cpc, *cpc2; INetworkListManager *mgr; INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; VARIANT_BOOL connected; + IConnectionPoint *pt; HRESULT hr; + ULONG ref1, ref2; + IID iid; hr = CoCreateInstance( &CLSID_NetworkListManager, NULL, CLSCTX_INPROC_SERVER, &IID_INetworkListManager, (void **)&mgr ); @@ -78,8 +81,31 @@ static void test_INetworkListManager( void ) hr = INetworkListManager_QueryInterface( mgr, &IID_IConnectionPointContainer, (void**)&cpc ); ok( hr == S_OK, "got %08x\n", hr ); + + ref1 = IConnectionPointContainer_AddRef( cpc ); + + hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt ); + ok( hr == S_OK, "got %08x\n", hr ); + + ref2 = IConnectionPointContainer_AddRef( cpc ); + ok( ref2 == ref1 + 2, "Expected refcount %d, got %d\n", ref1 + 2, ref2 ); + + IConnectionPointContainer_Release( cpc ); IConnectionPointContainer_Release( cpc ); + hr = IConnectionPoint_GetConnectionPointContainer( pt, &cpc2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cpc2 == cpc, "Expected cpc2 == %p, but got %p\n", cpc, cpc2 ); + IConnectionPointContainer_Release( cpc2 ); + + memset( &iid, 0, sizeof(iid) ); + hr = IConnectionPoint_GetConnectionInterface( pt, &iid ); + 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 ); + IConnectionPointContainer_Release( cpc ); INetworkListManager_Release( mgr ); }

1 0

Michael Müller : netprofm: Add stubbed IConnectionPoint interface.
by Alexandre Julliard 25 Mar '15

25 Mar '15

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

Hans Leidekker : msi: Check file state before installing global assemblies.
by Alexandre Julliard 25 Mar '15

25 Mar '15

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

Hans Leidekker : msi: Skip files from the original media if a patch is applied.
by Alexandre Julliard 25 Mar '15

25 Mar '15

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 the component enabled flag earlier.
by Alexandre Julliard 25 Mar '15

25 Mar '15

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 25 Mar '15

25 Mar '15

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

Hans Leidekker : msi: Avoid allocating a database handle only to retrieve the summary information.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: cd73576ec0f7f7a7f810bf3fd6e17b6625d6d2f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd73576ec0f7f7a7f810bf3fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:32:17 2015 +0100 msi: Avoid allocating a database handle only to retrieve the summary information. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 70 +-------------------------- dlls/msi/suminfo.c | 140 ++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 102 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd73576ec0f7f7a7f810b…

1 0

Hans Leidekker : msi: Fall back to the database summary information stream in MSI_OpenPackageW.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 052b3a748e144093ec7043e68333fbc2e85fcdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052b3a748e144093ec7043e68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 14:31:47 2015 +0100 msi: Fall back to the database summary information stream in MSI_OpenPackageW. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 18 +++++++++++++----- dlls/msi/suminfo.c | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a953d28..b67698a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -952,6 +952,7 @@ extern UINT msi_spawn_error_dialog( MSIPACKAGE*, LPWSTR, LPWSTR ) DECLSPEC_HIDDE /* summary information */ extern UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; +extern UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index de50703..6fbbbf5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1488,8 +1488,12 @@ static WCHAR *get_package_code( MSIDATABASE *db ) r = msi_get_suminfo( db->storage, 0, &si ); if (r != ERROR_SUCCESS) { - WARN("failed to load summary info %u\n", r); - return NULL; + r = msi_get_db_suminfo( db, 0, &si ); + if (r != ERROR_SUCCESS) + { + WARN("failed to load summary info %u\n", r); + return NULL; + } } ret = msi_suminfo_dup_string( si, PID_REVNUMBER ); msiobj_release( &si->hdr ); @@ -1638,9 +1642,13 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) r = msi_get_suminfo( db->storage, 0, &si ); if (r != ERROR_SUCCESS) { - WARN("failed to load summary info\n"); - msiobj_release( &package->hdr ); - return ERROR_INSTALL_PACKAGE_INVALID; + r = msi_get_db_suminfo( db, 0, &si ); + if (r != ERROR_SUCCESS) + { + WARN("failed to load summary info\n"); + msiobj_release( &package->hdr ); + return ERROR_INSTALL_PACKAGE_INVALID; + } } r = parse_suminfo( si, package ); msiobj_release( &si->hdr ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 97544d5..bb5e935 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -469,7 +469,7 @@ UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **ret ) return ERROR_SUCCESS; } -static UINT get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **ret ) +UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **ret ) { IStream *stm; MSISUMMARYINFO *si; @@ -547,7 +547,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, ret = msi_get_suminfo( db->storage, uiUpdateCount, &si ); if (ret != ERROR_SUCCESS) - ret = get_db_suminfo( db, uiUpdateCount, &si ); + ret = msi_get_db_suminfo( db, uiUpdateCount, &si ); if (ret != ERROR_SUCCESS) { if ((si = create_suminfo( db->storage, uiUpdateCount )))

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015