wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Huw Davies : msdaps: Add server side stubs for IRowsetInfo.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 59c2caa6f489a9cc3601fef8e9fdf0cbd5fdecf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c2caa6f489a9cc3601fef8e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 12:12:35 2010 +0000 msdaps: Add server side stubs for IRowsetInfo. --- dlls/msdaps/row_server.c | 30 +++++++++++++++++++++++++++++- dlls/msdaps/row_server.idl | 15 +++++++++++++++ 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 817b1e9..5fab315 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -346,6 +346,31 @@ static HRESULT WINAPI server_Hash(IWineRowServer *iface, HCHAPTER hReserved, DBB return E_NOTIMPL; } +static HRESULT WINAPI server_GetProperties(IWineRowServer* iface, ULONG cPropertyIDSets, + const DBPROPIDSET *rgPropertyIDSets, ULONG *pcPropertySets, + DBPROPSET **prgPropertySets) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%d, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_GetReferencedRowset(IWineRowServer* iface, DBORDINAL iOrdinal, + REFIID riid, IUnknown **ppReferencedRowset) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_GetSpecification(IWineRowServer* iface, REFIID riid, + IUnknown **ppSpecification) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + static const IWineRowServerVtbl server_vtbl = { server_QueryInterface, @@ -365,7 +390,10 @@ static const IWineRowServerVtbl server_vtbl = server_Compare, server_GetRowsAt, server_GetRowsByBookmark, - server_Hash + server_Hash, + server_GetProperties, + server_GetReferencedRowset, + server_GetSpecification }; static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index b8c378e..5f12847 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -139,6 +139,21 @@ typedef struct [out, size_is(cBookmarks)] DBHASHVALUE rgHashedValues[], [out, size_is(cBookmarks)] DBROWSTATUS rgBookmarkStatus[]); + /* IRowsetInfo */ + + HRESULT GetProperties([in] ULONG cPropertyIDSets, + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, out] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets); + + HRESULT GetReferencedRowset([in] DBORDINAL iOrdinal, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppReferencedRowset); + + HRESULT GetSpecification([in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppSpecification); + + } [

1 0

Huw Davies : msdaps: Add server side stubs for IRowsetLocate.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 923805b576cb57a6e41ab14aae237691a766c386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=923805b576cb57a6e41ab14aa… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 12:07:08 2010 +0000 msdaps: Add server side stubs for IRowsetLocate. --- dlls/msdaps/row_server.c | 45 +++++++++++++++++++++++++++++++++++++++++++- dlls/msdaps/row_server.idl | 32 +++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 22088b7..817b1e9 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -307,6 +307,45 @@ static HRESULT WINAPI server_RestartPosition(IWineRowServer* iface, HCHAPTER hRe return E_NOTIMPL; } +static HRESULT WINAPI server_Compare(IWineRowServer *iface, HCHAPTER hReserved, DBBKMARK cbBookmark1, + const BYTE *pBookmark1, DBBKMARK cbBookmark2, const BYTE *pBookmark2, + DBCOMPARE *pComparison) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_GetRowsAt(IWineRowServer *iface, HWATCHREGION hReserved1, HCHAPTER hReserved2, + DBBKMARK cbBookmark, const BYTE *pBookmark, DBROWOFFSET lRowsOffset, + DBROWCOUNT cRows, DBCOUNTITEM *pcRowsObtained, HROW **prghRows) +{ + server *This = impl_from_IWineRowServer(iface); + + FIXME("(%p)->(%08lx, %08lx, %d, %p, %d, %d, %p, %p): stub\n", This, hReserved1, hReserved2, cbBookmark, pBookmark, + lRowsOffset, cRows, pcRowsObtained, prghRows); + + return E_NOTIMPL; +} + +static HRESULT WINAPI server_GetRowsByBookmark(IWineRowServer *iface, HCHAPTER hReserved, DBCOUNTITEM cRows, + const DBBKMARK rgcbBookmarks[], const BYTE * rgpBookmarks[], + HROW rghRows[], DBROWSTATUS rgRowStatus[]) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_Hash(IWineRowServer *iface, HCHAPTER hReserved, DBBKMARK cBookmarks, + const DBBKMARK rgcbBookmarks[], const BYTE * rgpBookmarks[], + DBHASHVALUE rgHashedValues[], DBROWSTATUS rgBookmarkStatus[]) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + static const IWineRowServerVtbl server_vtbl = { server_QueryInterface, @@ -322,7 +361,11 @@ static const IWineRowServerVtbl server_vtbl = server_GetData, server_GetNextRows, server_ReleaseRows, - server_RestartPosition + server_RestartPosition, + server_Compare, + server_GetRowsAt, + server_GetRowsByBookmark, + server_Hash }; static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index 580d9ba..b8c378e 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -107,6 +107,38 @@ typedef struct HRESULT RestartPosition([in] HCHAPTER hReserved); + /* IRowsetLocate */ + + HRESULT Compare([in] HCHAPTER hReserved, + [in] DBBKMARK cbBookmark1, + [in, size_is(cbBookmark1)] const BYTE *pBookmark1, + [in] DBBKMARK cbBookmark2, + [in, size_is(cbBookmark2)] const BYTE *pBookmark2, + [out] DBCOMPARE *pComparison); + + HRESULT GetRowsAt([in] HWATCHREGION hReserved1, + [in] HCHAPTER hReserved2, + [in] DBBKMARK cbBookmark, + [in, size_is(cbBookmark)] const BYTE *pBookmark, + [in] DBROWOFFSET lRowsOffset, + [in] DBROWCOUNT cRows, + [out] DBCOUNTITEM *pcRowsObtained, + [out, size_is(,cRows)] HROW **prghRows); + + HRESULT GetRowsByBookmark([in] HCHAPTER hReserved, + [in] DBCOUNTITEM cRows, + [in, size_is(cRows)] const DBBKMARK rgcbBookmarks[], + [in, size_is(cRows)] const BYTE *rgpBookmarks[], + [out, size_is(cRows)] HROW rghRows[], + [out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); + + HRESULT Hash([in] HCHAPTER hReserved, + [in] DBBKMARK cBookmarks, + [in, size_is(cBookmarks)] const DBBKMARK rgcbBookmarks[], + [in, size_is(cBookmarks)] const BYTE *rgpBookmarks[], + [out, size_is(cBookmarks)] DBHASHVALUE rgHashedValues[], + [out, size_is(cBookmarks)] DBROWSTATUS rgBookmarkStatus[]); + } [

1 0

Huw Davies : msdaps: Add support for remoting IRowset_ReleaseRows.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: e44206d102c624ac80a86b8a6da16a5146049e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44206d102c624ac80a86b8a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 11:55:36 2010 +0000 msdaps: Add support for remoting IRowset_ReleaseRows. --- dlls/msdaps/row_server.c | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 1dea799..22088b7 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -285,8 +285,19 @@ static HRESULT WINAPI server_ReleaseRows(IWineRowServer* iface, DBCOUNTITEM cRow DBROWOPTIONS rgRowOptions[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) { server *This = impl_from_IWineRowServer(iface); - FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); - return E_NOTIMPL; + IRowset *rowset; + HRESULT hr; + + TRACE("(%p)->(%d, %p, %p, %p, %p)\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset); + if(FAILED(hr)) return hr; + + hr = IRowset_ReleaseRows(rowset, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); + IRowset_Release(rowset); + + TRACE("returning %08x\n", hr); + return hr; } static HRESULT WINAPI server_RestartPosition(IWineRowServer* iface, HCHAPTER hReserved) @@ -660,10 +671,28 @@ static HRESULT WINAPI rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM cRows, cons DBROWOPTIONS rgRowOptions[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) { rowset_proxy *This = impl_from_IRowset(iface); + HRESULT hr; + DBROWOPTIONS *options = rgRowOptions; + DBREFCOUNT *refs = rgRefCounts; + DBROWSTATUS *status = rgRowStatus; - FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); + TRACE("(%p)->(%d, %p, %p, %p, %p)\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); - return E_NOTIMPL; + if(!options) + { + options = CoTaskMemAlloc(cRows * sizeof(options[0])); + memset(options, 0, cRows * sizeof(options[0])); + } + if(!refs) refs = CoTaskMemAlloc(cRows * sizeof(refs[0])); + if(!status) status = CoTaskMemAlloc(cRows * sizeof(status[0])); + + hr = IWineRowServer_ReleaseRows(This->server, cRows, rghRows, options, refs, status); + + if(status != rgRowStatus) CoTaskMemFree(status); + if(refs != rgRefCounts) CoTaskMemFree(refs); + if(options != rgRowOptions) CoTaskMemFree(options); + + return hr; } static HRESULT WINAPI rowset_RestartPosition(IRowset* iface, HCHAPTER hReserved)

1 0

Huw Davies : msdaps: Add support for remoting IRowset_GetNextRows.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 93ea2e00deb1962ccb26852203f29184b261cf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ea2e00deb1962ccb2685220… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 11:52:52 2010 +0000 msdaps: Add support for remoting IRowset_GetNextRows. --- dlls/msdaps/row_server.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index a1abbf3..1dea799 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -265,8 +265,20 @@ static HRESULT WINAPI server_GetNextRows(IWineRowServer* iface, HCHAPTER hReserv DBROWCOUNT cRows, DBCOUNTITEM *pcRowObtained, HROW **prghRows) { server *This = impl_from_IWineRowServer(iface); - FIXME("(%p)->(%08lx, %d, %d, %p, %p): stub\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); - return E_NOTIMPL; + IRowset *rowset; + HRESULT hr; + + TRACE("(%p)->(%08lx, %d, %d, %p, %p)\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset); + if(FAILED(hr)) return hr; + + *prghRows = NULL; + + hr = IRowset_GetNextRows(rowset, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); + IRowset_Release(rowset); + TRACE("returning %08x, got %d rows\n", hr, *pcRowObtained); + return hr; } static HRESULT WINAPI server_ReleaseRows(IWineRowServer* iface, DBCOUNTITEM cRows, const HROW rghRows[], @@ -627,10 +639,21 @@ static HRESULT WINAPI rowset_GetNextRows(IRowset *iface, HCHAPTER hReserved, DBR DBROWCOUNT cRows, DBCOUNTITEM *pcRowObtained, HROW **prghRows) { rowset_proxy *This = impl_from_IRowset(iface); + HRESULT hr; + HROW *rows = NULL; - FIXME("(%p)->(%08lx, %d, %d, %p, %p): stub\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); + TRACE("(%p)->(%08lx, %d, %d, %p, %p)\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); - return E_NOTIMPL; + hr = IWineRowServer_GetNextRows(This->server, hReserved, lRowsOffset, cRows, pcRowObtained, &rows); + if(*prghRows) + { + memcpy(*prghRows, rows, *pcRowObtained * sizeof(rows[0])); + CoTaskMemFree(rows); + } + else + *prghRows = rows; + + return hr; } static HRESULT WINAPI rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[],

1 0

Huw Davies : msdaps: Add support for remoting IRowset_AddRefRows.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: a7001bda127d572454d985bb7455d94fe255b072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7001bda127d572454d985bb7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 11:48:02 2010 +0000 msdaps: Add support for remoting IRowset_AddRefRows. --- dlls/msdaps/row_server.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index e1ef05d..a1abbf3 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -238,8 +238,19 @@ static HRESULT WINAPI server_AddRefRows(IWineRowServer* iface, DBCOUNTITEM cRows DBROWSTATUS rgRowStatus[]) { server *This = impl_from_IWineRowServer(iface); - FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, cRows, rghRows, rgRefCounts, rgRowStatus); - return E_NOTIMPL; + IRowset *rowset; + HRESULT hr; + + TRACE("(%p)->(%d, %p, %p, %p)\n", This, cRows, rghRows, rgRefCounts, rgRowStatus); + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset); + if(FAILED(hr)) return hr; + + hr = IRowset_AddRefRows(rowset, cRows, rghRows, rgRefCounts, rgRowStatus); + + IRowset_Release(rowset); + TRACE("returning %08x\n", hr); + return hr; } static HRESULT WINAPI server_GetData(IWineRowServer* iface, HROW hRow, @@ -586,10 +597,21 @@ static HRESULT WINAPI rowset_AddRefRows(IRowset *iface, DBCOUNTITEM cRows, const DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) { rowset_proxy *This = impl_from_IRowset(iface); + HRESULT hr; + DBREFCOUNT *refs = rgRefCounts; + DBSTATUS *stats = rgRowStatus; - FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, cRows, rghRows, rgRefCounts, rgRowStatus); + TRACE("(%p)->(%d, %p, %p, %p)\n", This, cRows, rghRows, rgRefCounts, rgRowStatus); - return E_NOTIMPL; + if(!refs) refs = CoTaskMemAlloc(cRows * sizeof(refs[0])); + if(!stats) stats = CoTaskMemAlloc(cRows * sizeof(stats[0])); + + hr = IWineRowServer_AddRefRows(This->server, cRows, rghRows, refs, stats); + + if(refs != rgRefCounts) CoTaskMemFree(refs); + if(stats != rgRowStatus) CoTaskMemFree(stats); + + return hr; } static HRESULT WINAPI rowset_GetData(IRowset *iface, HROW hRow, HACCESSOR hAccessor, void *pData)

1 0

Huw Davies : msdaps: Add server side stubs for IRowChange and IRowset. Expose IRowChange on the client side.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: b2769db6555bb02f7a4e09b70cb1e0861b081c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2769db6555bb02f7a4e09b70… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 11:43:38 2010 +0000 msdaps: Add server side stubs for IRowChange and IRowset. Expose IRowChange on the client side. --- dlls/msdaps/row_server.c | 101 +++++++++++++++++++++++++++++++++++++++++++- dlls/msdaps/row_server.idl | 41 ++++++++++++++++++ 2 files changed, 141 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 8a88d8c..e1ef05d 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -225,6 +225,54 @@ static HRESULT WINAPI server_Open(IWineRowServer* iface, IUnknown *pUnkOuter, DB return E_NOTIMPL; } +static HRESULT WINAPI server_SetColumns(IWineRowServer* iface, DBORDINAL num_cols, + wine_setcolumns_in *in_data, DBSTATUS *status) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%d, %p, %p): stub\n", This, num_cols, in_data, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_AddRefRows(IWineRowServer* iface, DBCOUNTITEM cRows, + const HROW rghRows[], DBREFCOUNT rgRefCounts[], + DBROWSTATUS rgRowStatus[]) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, cRows, rghRows, rgRefCounts, rgRowStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_GetData(IWineRowServer* iface, HROW hRow, + HACCESSOR hAccessor, BYTE *pData, DWORD size) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%08lx, %08lx, %p, %d): stub\n", This, hRow, hAccessor, pData, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_GetNextRows(IWineRowServer* iface, HCHAPTER hReserved, DBROWOFFSET lRowsOffset, + DBROWCOUNT cRows, DBCOUNTITEM *pcRowObtained, HROW **prghRows) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%08lx, %d, %d, %p, %p): stub\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_ReleaseRows(IWineRowServer* iface, DBCOUNTITEM cRows, const HROW rghRows[], + DBROWOPTIONS rgRowOptions[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_RestartPosition(IWineRowServer* iface, HCHAPTER hReserved) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%08lx): stub\n", This, hReserved); + return E_NOTIMPL; +} + static const IWineRowServerVtbl server_vtbl = { server_QueryInterface, @@ -234,7 +282,13 @@ static const IWineRowServerVtbl server_vtbl = server_GetMarshal, server_GetColumns, server_GetSourceRowset, - server_Open + server_Open, + server_SetColumns, + server_AddRefRows, + server_GetData, + server_GetNextRows, + server_ReleaseRows, + server_RestartPosition }; static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) @@ -275,6 +329,7 @@ HRESULT create_rowset_server(IUnknown *outer, void **obj) typedef struct { const IRowVtbl *row_vtbl; + const IRowChangeVtbl *row_change_vtbl; LONG ref; @@ -286,6 +341,11 @@ static inline row_proxy *impl_from_IRow(IRow *iface) return (row_proxy *)((char*)iface - FIELD_OFFSET(row_proxy, row_vtbl)); } +static inline row_proxy *impl_from_IRowChange(IRowChange *iface) +{ + return (row_proxy *)((char*)iface - FIELD_OFFSET(row_proxy, row_change_vtbl)); +} + static HRESULT WINAPI row_QueryInterface(IRow *iface, REFIID iid, void **obj) { row_proxy *This = impl_from_IRow(iface); @@ -296,6 +356,10 @@ static HRESULT WINAPI row_QueryInterface(IRow *iface, REFIID iid, void **obj) { *obj = &This->row_vtbl; } + else if(IsEqualIID(iid, &IID_IRowChange)) + { + *obj = &This->row_change_vtbl; + } else { FIXME("interface %s not implemented\n", debugstr_guid(iid)); @@ -402,6 +466,40 @@ static const IRowVtbl row_vtbl = row_Open }; +static HRESULT WINAPI row_change_QueryInterface(IRowChange *iface, REFIID iid, void **obj) +{ + row_proxy *This = impl_from_IRowChange(iface); + return IUnknown_QueryInterface((IUnknown *)This, iid, obj); +} + +static ULONG WINAPI row_change_AddRef(IRowChange *iface) +{ + row_proxy *This = impl_from_IRowChange(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI row_change_Release(IRowChange *iface) +{ + row_proxy *This = impl_from_IRowChange(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI row_change_SetColumns(IRowChange *iface, DBORDINAL cColumns, + DBCOLUMNACCESS rgColumns[]) +{ + row_proxy *This = impl_from_IRowChange(iface); + FIXME("(%p)->(%d, %p)\n", This, cColumns, rgColumns); + return E_NOTIMPL; +} + +static const IRowChangeVtbl row_change_vtbl = +{ + row_change_QueryInterface, + row_change_AddRef, + row_change_Release, + row_change_SetColumns +}; + static HRESULT create_row_proxy(IWineRowServer *server, IUnknown **obj) { row_proxy *proxy; @@ -413,6 +511,7 @@ static HRESULT create_row_proxy(IWineRowServer *server, IUnknown **obj) if(!proxy) return E_OUTOFMEMORY; proxy->row_vtbl = &row_vtbl; + proxy->row_change_vtbl = &row_change_vtbl; proxy->ref = 1; IWineRowServer_AddRef(server); proxy->server = server; diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index 1242aee..580d9ba 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -65,6 +65,47 @@ typedef struct [in] REFIID riid, [out, iid_is(riid)] IUnknown **ppUnk); + /* IRowChange */ +typedef struct +{ + VARIANT v; + DBID columnid; + DBLENGTH data_len; + DBSTATUS status; + DBLENGTH max_len; + DBTYPE type; + BYTE precision; + BYTE scale; +} wine_setcolumns_in; + + HRESULT SetColumns([in] DBORDINAL num_cols, + [in, size_is(num_cols)] wine_setcolumns_in *in_data, + [out, size_is(num_cols)] DBSTATUS *status); + + /* IRowset */ + HRESULT AddRefRows([in] DBCOUNTITEM cRows, + [in, size_is(cRows)] const HROW rghRows[], + [out, size_is(cRows)] DBREFCOUNT rgRefCounts[], + [out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); + + HRESULT GetData([in] HROW hRow, + [in] HACCESSOR hAccessor, + [in, out, size_is(size)] BYTE *pData, + [in] DWORD size); + + HRESULT GetNextRows([in] HCHAPTER hReserved, + [in] DBROWOFFSET lRowsOffset, + [in] DBROWCOUNT cRows, + [out] DBCOUNTITEM *pcRowObtained, + [out, size_is(,cRows)] HROW **prghRows); + + HRESULT ReleaseRows([in] DBCOUNTITEM cRows, + [in, size_is(cRows)] const HROW rghRows[], + [in, size_is(cRows)] DBROWOPTIONS rgRowOptions[], + [out, size_is(cRows)] DBREFCOUNT rgRefCounts[], + [out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); + + HRESULT RestartPosition([in] HCHAPTER hReserved); }

1 0

Paul Chitescu : qedit: Mostly stubbed out implementation of SampleGrabber filter.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 40c60e8cd2911eadb1590c7d83ee96c0f06bbc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c60e8cd2911eadb1590c7d8… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Thu Feb 4 02:02:59 2010 +0200 qedit: Mostly stubbed out implementation of SampleGrabber filter. --- dlls/qedit/Makefile.in | 3 +- dlls/qedit/main.c | 1 + dlls/qedit/qedit_private.h | 1 + dlls/qedit/regsvr.c | 6 + dlls/qedit/samplegrabber.c | 453 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 463 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40c60e8cd2911eadb1590…

1 0

Marcus Meissner : msi: Call Custom function via wrapper.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 9fab263d397cfd61c6940b049fadcc5906f3cd74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fab263d397cfd61c6940b049… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 3 16:57:00 2010 +0100 msi: Call Custom function via wrapper. --- dlls/msi/custom.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 508bf6b..2b2a3e1 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -647,6 +647,28 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, return ERROR_SUCCESS; } +#ifdef __i386__ +extern UINT CUSTOMPROC_wrapper( MsiCustomActionEntryPoint proc, MSIHANDLE handle ); +__ASM_GLOBAL_FUNC( CUSTOMPROC_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 12(%ebp)\n\t" + "movl 8(%ebp),%eax\n\t" + "call *%eax\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static inline UINT CUSTOMPROC_wrapper( MsiCustomActionEntryPoint proc, MSIHANDLE handle ) +{ + return proc(handle); +} +#endif + static DWORD ACTION_CallDllFunction( const GUID *guid ) { MsiCustomActionEntryPoint fn; @@ -685,7 +707,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) __TRY { - r = fn( hPackage ); + r = CUSTOMPROC_wrapper( fn, hPackage ); } __EXCEPT_PAGE_FAULT {

1 0

Hans Leidekker : msi: Implement the DeleteServices standard action.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: b9da31f11219e2744108f69c2ac5b0dfb4d2907e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9da31f11219e2744108f69c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:04:09 2010 +0100 msi: Implement the DeleteServices standard action. --- dlls/msi/action.c | 119 ++++++++++++++++++++++++++++++++++----------- dlls/msi/tests/install.c | 43 +++++++++++++++++ 2 files changed, 133 insertions(+), 29 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 885b415..46d0f7e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4570,26 +4570,12 @@ error: return FALSE; } -static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) +static UINT stop_service( LPCWSTR name ) { - MSIPACKAGE *package = param; - MSICOMPONENT *comp; + SC_HANDLE scm = NULL, service = NULL; SERVICE_STATUS status; SERVICE_STATUS_PROCESS ssp; - SC_HANDLE scm = NULL, service = NULL; - LPWSTR name, args; - DWORD event, needed; - - event = MSI_RecordGetInteger(rec, 3); - if (!(event & msidbServiceControlEventStop)) - return ERROR_SUCCESS; - - comp = get_loaded_component(package, MSI_RecordGetString(rec, 6)); - if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) - return ERROR_SUCCESS; - - deformat_string(package, MSI_RecordGetString(rec, 2), &name); - deformat_string(package, MSI_RecordGetString(rec, 4), &args); + DWORD needed; scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!scm) @@ -4604,16 +4590,14 @@ static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) SERVICE_ENUMERATE_DEPENDENTS); if (!service) { - WARN("Failed to open service (%s): %d\n", - debugstr_w(name), GetLastError()); + WARN("Failed to open service (%s): %d\n", debugstr_w(name), GetLastError()); goto done; } if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (LPBYTE)&ssp, sizeof(SERVICE_STATUS_PROCESS), &needed)) { - WARN("Failed to query service status (%s): %d\n", - debugstr_w(name), GetLastError()); + WARN("Failed to query service status (%s): %d\n", debugstr_w(name), GetLastError()); goto done; } @@ -4628,8 +4612,28 @@ static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) done: CloseServiceHandle(service); CloseServiceHandle(scm); - msi_free(name); - msi_free(args); + + return ERROR_SUCCESS; +} + +static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = param; + MSICOMPONENT *comp; + LPWSTR name; + DWORD event; + + event = MSI_RecordGetInteger( rec, 3 ); + if (!(event & msidbServiceControlEventStop)) + return ERROR_SUCCESS; + + comp = get_loaded_component( package, MSI_RecordGetString( rec, 6 ) ); + if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + return ERROR_SUCCESS; + + deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); + stop_service( name ); + msi_free( name ); return ERROR_SUCCESS; } @@ -4653,6 +4657,69 @@ static UINT ACTION_StopServices( MSIPACKAGE *package ) return rc; } +static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = param; + MSICOMPONENT *comp; + LPWSTR name = NULL; + DWORD event; + SC_HANDLE scm = NULL, service = NULL; + + event = MSI_RecordGetInteger( rec, 3 ); + if (!(event & msidbServiceControlEventDelete)) + return ERROR_SUCCESS; + + comp = get_loaded_component( package, MSI_RecordGetString(rec, 6) ); + if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + return ERROR_SUCCESS; + + deformat_string( package, MSI_RecordGetString(rec, 2), &name ); + stop_service( name ); + + scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ); + if (!scm) + { + WARN("Failed to open the SCM: %d\n", GetLastError()); + goto done; + } + + service = OpenServiceW( scm, name, DELETE ); + if (!service) + { + WARN("Failed to open service (%s): %u\n", debugstr_w(name), GetLastError()); + goto done; + } + + if (!DeleteService( service )) + WARN("Failed to delete service (%s): %u\n", debugstr_w(name), GetLastError()); + +done: + CloseServiceHandle( service ); + CloseServiceHandle( scm ); + msi_free( name ); + + return ERROR_SUCCESS; +} + +static UINT ACTION_DeleteServices( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_DeleteService, package ); + msiobj_release( &view->hdr ); + + return rc; +} + static MSIFILE *msi_find_file( MSIPACKAGE *package, LPCWSTR filename ) { MSIFILE *file; @@ -5995,12 +6062,6 @@ static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "SelfUnregModules", table ); } -static UINT ACTION_DeleteServices( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { - 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; - return msi_unimplemented_action_stub( package, "DeleteServices", table ); -} static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) { static const WCHAR table[] = { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 153f51a..9b334ed 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -367,6 +367,7 @@ static const CHAR sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n" "StartServices\t\t5000\n" + "DeleteServices\t\t5500\n" "InstallFinalize\t\t6600\n" "InstallInitialize\t\t1500\n" "InstallValidate\t\t1400\n" @@ -1849,6 +1850,19 @@ static const msi_table sss_tables[] = ADD_TABLE(property) }; +static const msi_table sds_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(sss_install_exec_seq), + ADD_TABLE(service_control), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -7521,6 +7535,34 @@ static void test_start_services(void) } } +static void test_delete_services(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -7614,6 +7656,7 @@ START_TEST(install) test_feature_override(); test_create_folder(); test_start_services(); + test_delete_services(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Add tests for the _Streams table implementation.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 3d38c077064d10451d3c1465498cdcd5a42532e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d38c077064d10451d3c14654… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:03:47 2010 +0100 msi: Add tests for the _Streams table implementation. --- dlls/msi/tests/db.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 79d0d77..037be7d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1454,8 +1454,30 @@ static void test_streamtable(void) MsiViewClose( view ); MsiCloseHandle( view ); + /* insert another one */ + create_file( "test1.txt" ); + + rec = MsiCreateRecord( 2 ); + MsiRecordSetString( rec, 1, "data1" ); + + r = MsiRecordSetStream( rec, 2, "test1.txt" ); + ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r); + + DeleteFile("test1.txt"); + + r = MsiDatabaseOpenView( hdb, + "INSERT INTO `_Streams` ( `Name`, `Data` ) VALUES ( ?, ? )", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); + + r = MsiViewExecute( view, rec ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); + + MsiCloseHandle( rec ); + MsiViewClose( view ); + MsiCloseHandle( view ); + r = MsiDatabaseOpenView( hdb, - "SELECT `Name`, `Data` FROM `_Streams`", &view ); + "SELECT `Name`, `Data` FROM `_Streams` WHERE `Name` = 'data'", &view ); ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); r = MsiViewExecute( view, 0 ); @@ -1476,10 +1498,76 @@ static void test_streamtable(void) ok( !lstrcmp(buf, "test.txt\n"), "Expected 'test.txt\\n', got %s\n", buf); MsiCloseHandle( rec ); + MsiViewClose( view ); + MsiCloseHandle( view ); + + r = MsiDatabaseOpenView( hdb, + "SELECT `Name`, `Data` FROM `_Streams` WHERE `Name` = 'data1'", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); + + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); + + r = MsiViewFetch( view, &rec ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetString( rec, 1, file, &size ); + ok( r == ERROR_SUCCESS, "Failed to get string: %d\n", r); + ok( !lstrcmp(file, "data1"), "Expected 'data1', got %s\n", file); + + size = MAX_PATH; + memset(buf, 0, MAX_PATH); + r = MsiRecordReadStream( rec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); + ok( !lstrcmp(buf, "test1.txt\n"), "Expected 'test1.txt\\n', got %s\n", buf); + + MsiCloseHandle( rec ); + MsiViewClose( view ); + MsiCloseHandle( view ); + + /* perform an update */ + create_file( "test2.txt" ); + rec = MsiCreateRecord( 1 ); + + r = MsiRecordSetStream( rec, 1, "test2.txt" ); + ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r); + + DeleteFile("test2.txt"); + + r = MsiDatabaseOpenView( hdb, + "UPDATE `_Streams` SET `Data` = ? WHERE `Name` = 'data1'", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); + + r = MsiViewExecute( view, rec ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); + + MsiCloseHandle( rec ); + MsiViewClose( view ); + MsiCloseHandle( view ); + + r = MsiDatabaseOpenView( hdb, + "SELECT `Name`, `Data` FROM `_Streams` WHERE `Name` = 'data1'", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); + + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); r = MsiViewFetch( view, &rec ); - ok( r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok( r == ERROR_SUCCESS, "Failed to fetch record: %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetString( rec, 1, file, &size ); + ok( r == ERROR_SUCCESS, "Failed to get string: %d\n", r); + ok( !lstrcmp(file, "data1"), "Expected 'data1', got %s\n", file); + size = MAX_PATH; + memset(buf, 0, MAX_PATH); + r = MsiRecordReadStream( rec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); + todo_wine ok( !lstrcmp(buf, "test2.txt\n"), "Expected 'test2.txt\\n', got %s\n", buf); + + MsiCloseHandle( rec ); MsiViewClose( view ); MsiCloseHandle( view ); MsiCloseHandle( hdb );

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
79
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 February 2010