February 2010 - Wine-commits

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

04 Feb '10

Module: wine Branch: master Commit: 7deb07cf2f13c10f48e8c7da36eadf1de87bd385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7deb07cf2f13c10f48e8c7da3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 12:19:06 2010 +0000 msdaps: Add server side stubs for IAccessor. --- dlls/msdaps/row_server.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/msdaps/row_server.idl | 18 ++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 5fab315..6c35270 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -371,6 +371,40 @@ static HRESULT WINAPI server_GetSpecification(IWineRowServer* iface, REFIID riid return E_NOTIMPL; } +static HRESULT WINAPI server_AddRefAccessor(IWineRowServer* iface, HACCESSOR hAccessor, + DBREFCOUNT *pcRefCount) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_CreateAccessor(IWineRowServer* iface, DBACCESSORFLAGS dwAccessorFlags, + DBCOUNTITEM cBindings, const DBBINDING *rgBindings, DBLENGTH cbRowSize, + HACCESSOR *phAccessor, DBBINDSTATUS *rgStatus) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%08x, %d, %p, %d, %p, %p): stub\n", This, dwAccessorFlags, cBindings, rgBindings, cbRowSize, phAccessor, rgStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_GetBindings(IWineRowServer* iface, HACCESSOR hAccessor, + DBACCESSORFLAGS *pdwAccessorFlags, DBCOUNTITEM *pcBindings, + DBBINDING **prgBindings) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%08lx, %p, %p, %p): stub\n", This, hAccessor, pdwAccessorFlags, pcBindings, prgBindings); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_ReleaseAccessor(IWineRowServer* iface, HACCESSOR hAccessor, + DBREFCOUNT *pcRefCount) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p)->(%08lx, %p): stub\n", This, hAccessor, pcRefCount); + return E_NOTIMPL; +} + static const IWineRowServerVtbl server_vtbl = { server_QueryInterface, @@ -393,7 +427,11 @@ static const IWineRowServerVtbl server_vtbl = server_Hash, server_GetProperties, server_GetReferencedRowset, - server_GetSpecification + server_GetSpecification, + server_AddRefAccessor, + server_CreateAccessor, + server_GetBindings, + server_ReleaseAccessor }; 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 5f12847..aca9686 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -153,7 +153,25 @@ typedef struct HRESULT GetSpecification([in] REFIID riid, [out, iid_is(riid)] IUnknown **ppSpecification); + /* IAccessor */ + HRESULT AddRefAccessor([in] HACCESSOR hAccessor, + [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount); + + HRESULT CreateAccessor([in] DBACCESSORFLAGS dwAccessorFlags, + [in] DBCOUNTITEM cBindings, + [in, unique, size_is(cBindings)] const DBBINDING *rgBindings, + [in] DBLENGTH cbRowSize, + [out] HACCESSOR *phAccessor, + [in, out, unique, size_is(cBindings)] DBBINDSTATUS *rgStatus); + + HRESULT GetBindings([in] HACCESSOR hAccessor, + [out] DBACCESSORFLAGS *pdwAccessorFlags, + [in, out] DBCOUNTITEM *pcBindings, + [out, size_is(,*pcBindings)] DBBINDING **prgBindings); + + HRESULT ReleaseAccessor([in] HACCESSOR hAccessor, + [in, out, unique] DBREFCOUNT *pcRefCount); } [

1 0

Huw Davies : msdaps: Expose IRowsetLocate, IRowsetInfo and IAccessor on the client side.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 7cbf164fe3811ed3d05f3b99c191d011d3094801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbf164fe3811ed3d05f3b99c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 12:33:06 2010 +0000 msdaps: Expose IRowsetLocate, IRowsetInfo and IAccessor on the client side. --- dlls/msdaps/row_server.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 245 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cbf164fe3811ed3d05f3…

1 0

Maarten Lankhorst : includes: Fix typo in mmdeviceapi.idl.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 50eec87029309e37a7ed4de1aa19e7f0977fa029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50eec87029309e37a7ed4de1a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Feb 4 13:27:43 2010 +0100 includes: Fix typo in mmdeviceapi.idl. --- include/mmdeviceapi.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mmdeviceapi.idl b/include/mmdeviceapi.idl index e452e89..d1fb6ae 100644 --- a/include/mmdeviceapi.idl +++ b/include/mmdeviceapi.idl @@ -174,7 +174,7 @@ interface IMMDeviceCollection : IUnknown nonextensible, pointer_default(unique) ] -interface IMMEndPoint : IUnknown +interface IMMEndpoint : IUnknown { [id(1)] HRESULT GetDataFlow( [out] EDataFlow *pDataFlow

1 0

Maarten Lankhorst : msvcrt: Forward _ftol2 to ntdll._ftol.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: ffc100c58f270fbc3b39c36edac6a14a77c80184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc100c58f270fbc3b39c36ed… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 3 22:53:41 2010 +0100 msvcrt: Forward _ftol2 to ntdll._ftol. --- dlls/msvcrt/msvcrt.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2b3d22c..51cb7df 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -272,6 +272,7 @@ @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime64(ptr) MSVCRT__ftime64 @ cdecl -ret64 _ftol() ntdll._ftol +@ cdecl -ret64 _ftol2() ntdll._ftol @ cdecl -ret64 _ftol2_sse() ntdll._ftol #FIXME: SSE variant should be implemented @ cdecl _fullpath(ptr str long) @ cdecl _futime(long ptr)

1 0

Alexandre Julliard : winex11: Update the window shape offset when the window rect changes.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 4c7b8ca524e6aab75bfc96b04de3dd4cccc4e86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7b8ca524e6aab75bfc96b04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 17:27:19 2010 +0100 winex11: Update the window shape offset when the window rect changes. --- dlls/winex11.drv/window.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1dfecce..f466cd1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1326,6 +1326,15 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data data->configure_serial = NextRequest( display ); XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); +#ifdef HAVE_LIBXSHAPE + if (data->shaped) + { + int x_offset = old_whole_rect->left - data->whole_rect.left; + int y_offset = old_whole_rect->top - data->whole_rect.top; + if (x_offset || y_offset) + XShapeOffsetShape( display, data->whole_window, ShapeBounding, x_offset, y_offset ); + } +#endif wine_tsx11_unlock(); TRACE( "win %p/%lx pos %d,%d,%dx%d after %lx changes=%x serial=%lu\n",

1 0

Marcus Meissner : ws2_32: Check namelen before dereferencing it in TRACE ( Coverity).
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: d28125219692e14558dbfe6938bb25043c850cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28125219692e14558dbfe693… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Feb 4 15:07:30 2010 +0100 ws2_32: Check namelen before dereferencing it in TRACE (Coverity). --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a9e9538..c66c853 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1795,7 +1795,7 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, *namelen); + TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen?*namelen:0); fd = get_sock_fd( s, 0, NULL ); res = SOCKET_ERROR;

1 0

Hans Leidekker : msi: Make room for the new row in STREAMS_insert_row.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 24dd10c6b0fe346f2180f0278494ae3b4b2033bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dd10c6b0fe346f2180f0278… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:02:26 2010 +0100 msi: Make room for the new row in STREAMS_insert_row. --- dlls/msi/streams.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index bdb2e2c..120b2b7 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -218,6 +218,7 @@ done: static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + UINT i; TRACE("(%p, %p, %d, %d)\n", view, rec, row, temporary); @@ -227,7 +228,11 @@ static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row if (row == -1) row = sv->num_rows - 1; - /* FIXME have to readjust rows */ + /* shift the rows to make room for the new row */ + for (i = sv->num_rows - 1; i > row; i--) + { + sv->streams[i] = sv->streams[i - 1]; + } return STREAMS_set_row(view, row, rec, 0); }

1 0

Hans Leidekker : msi: Give the Name field from the _Streams table a valid type.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 95a21c27da63991f5c19811d28f36dac33eefed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a21c27da63991f5c19811d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:02:59 2010 +0100 msi: Give the Name field from the _Streams table a valid type. --- dlls/msi/streams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 120b2b7..76b38cd 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -287,7 +287,7 @@ static UINT STREAMS_get_column_info(struct tagMSIVIEW *view, UINT n, { case 1: name_ptr = Name; - if (type) *type = MSITYPE_STRING | MAX_STREAM_NAME_LEN; + if (type) *type = MSITYPE_STRING | MSITYPE_VALID | MAX_STREAM_NAME_LEN; break; case 2:

1 0

Hans Leidekker : msi: Fix an off-by-one error in STREAMS_find_matching_rows .
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 19b50cff345de861d1fc04d45e6e7672ed462577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b50cff345de861d1fc04d45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 4 10:03:21 2010 +0100 msi: Fix an off-by-one error in STREAMS_find_matching_rows. --- dlls/msi/streams.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 76b38cd..8d2e748 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -450,7 +450,8 @@ static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col, } *handle = UlongToPtr(++index); - if (index >= sv->num_rows) + + if (index > sv->num_rows) return ERROR_NO_MORE_ITEMS; return ERROR_SUCCESS;

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