February 2010 - Wine-commits

Alexandre Julliard : dbghelp: Fix broken sw_read_mem() call in i386 stack backtrace.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 58e08ebc085e91b8ae0eb0eede68a2c67f6af23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e08ebc085e91b8ae0eb0eed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 19:24:00 2010 +0100 dbghelp: Fix broken sw_read_mem() call in i386 stack backtrace. --- dlls/dbghelp/cpu_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 32a341f..f3de652 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -236,7 +236,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame) tmp.Offset = OFFSETOF(next_switch); p = sw_xlat_addr(csw, &tmp); - if (!sw_read_mem(csw->hProcess, p, &frame16, sizeof(frame16))) + if (!sw_read_mem(csw, p, &frame16, sizeof(frame16))) { WARN("Bad stack frame 0x%08x\n", p); goto done_err;

1 0

Alexandre Julliard : fonts: Remove the rules for font symlinks and go back to standard VPATH usage.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 8350aafd5495c77ad4ba005dc4ae3f61a1ad1147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8350aafd5495c77ad4ba005dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 20:29:23 2010 +0100 fonts: Remove the rules for font symlinks and go back to standard VPATH usage. --- fonts/Makefile.in | 93 +++++++++++++++++++++++------------------------------ 1 files changed, 40 insertions(+), 53 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 8ac4282..bf3da14 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -1,6 +1,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ +VPATH = @srcdir@ MODULE = none fontdir = $(datadir)/wine/fonts INSTALLDIRS = $(DESTDIR)$(fontdir) @@ -58,136 +59,123 @@ all: $(FONTS) @MAKE_RULES@ -coure.fon: $(SRCDIR)/courier.ttf +coure.fon: courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1252,8 -couree.fon: $(SRCDIR)/courier.ttf +couree.fon: courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1250,8 -courer.fon: $(SRCDIR)/courier.ttf +courer.fon: courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1251,8 -coureg.fon: $(SRCDIR)/courier.ttf +coureg.fon: courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1253,8 -couret.fon: $(SRCDIR)/courier.ttf +couret.fon: courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1254,8 -coue1255.fon: $(SRCDIR)/courier.ttf +coue1255.fon: courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1255,8 -coue1256.fon: $(SRCDIR)/courier.ttf +coue1256.fon: courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1256,8 -coue1257.fon: $(SRCDIR)/courier.ttf +coue1257.fon: courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1257,8 -sserife.fon: $(SRCDIR)/ms_sans_serif.ttf +sserife.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8 -sserifee.fon: $(SRCDIR)/ms_sans_serif.ttf +sserifee.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1250,5 16,1250,7 -sserifer.fon: $(SRCDIR)/ms_sans_serif.ttf +sserifer.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8 -sserifeg.fon: $(SRCDIR)/ms_sans_serif.ttf +sserifeg.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8 -sserifet.fon: $(SRCDIR)/ms_sans_serif.ttf +sserifet.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8 -ssee1255.fon: $(SRCDIR)/ms_sans_serif.ttf +ssee1255.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8 -ssee1256.fon: $(SRCDIR)/ms_sans_serif.ttf +ssee1256.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8 -ssee1257.fon: $(SRCDIR)/ms_sans_serif.ttf +ssee1257.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8 -ssee874.fon: $(SRCDIR)/ms_sans_serif.ttf +ssee874.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8 -smalle.fon: $(SRCDIR)/small_fonts.ttf +smalle.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1252,5 -smallee.fon: $(SRCDIR)/small_fonts.ttf +smallee.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1250,5 -smaller.fon: $(SRCDIR)/small_fonts.ttf +smaller.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1251,5 -smalleg.fon: $(SRCDIR)/small_fonts.ttf +smalleg.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1253,5 -smallet.fon: $(SRCDIR)/small_fonts.ttf +smallet.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1254,5 -smae1255.fon: $(SRCDIR)/small_fonts.ttf +smae1255.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1255,5 -smae1256.fon: $(SRCDIR)/small_fonts.ttf +smae1256.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1256,5 -smae1257.fon: $(SRCDIR)/small_fonts.ttf +smae1257.fon: small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1257,5 -jsmalle.fon: $(SRCDIR)/small_fonts_jp.ttf +jsmalle.fon: small_fonts_jp.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts_jp.ttf 11,932,7 -vgasys.fon: $(SRCDIR)/system.ttf +vgasys.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1252,7 -vgasyse.fon: $(SRCDIR)/system.ttf +vgasyse.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1250,7 -vgasysr.fon: $(SRCDIR)/system.ttf +vgasysr.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1251,7 -vgasysg.fon: $(SRCDIR)/system.ttf +vgasysg.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1253,7 -vgasyst.fon: $(SRCDIR)/system.ttf +vgasyst.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1254,7 -vgas1255.fon: $(SRCDIR)/system.ttf +vgas1255.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1255,7 -vgas1256.fon: $(SRCDIR)/system.ttf +vgas1256.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1256,7 -vgas1257.fon: $(SRCDIR)/system.ttf +vgas1257.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1257,7 -vgas874.fon: $(SRCDIR)/system.ttf +vgas874.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,874,7 -jvgasys.fon: $(SRCDIR)/system.ttf +jvgasys.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 18,932,8 -svgasys.fon: $(SRCDIR)/system.ttf +svgasys.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,936,7 16,1252,7 -hvgasys.fon: $(SRCDIR)/system.ttf +hvgasys.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,949,7 -cvgasys.fon: $(SRCDIR)/system.ttf +cvgasys.fon: system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,950,7 16,1252,7 -# Use $(TOPSRCDIR)/fonts instead of $(SRCDIR) to confuse make when building in the source tree -marlett.ttf: $(TOPSRCDIR)/fonts/marlett.ttf - [ $(SRCDIR) = . ] || ($(RM) $@ && $(LN_S) $(SRCDIR)/marlett.ttf $@) - -symbol.ttf: $(TOPSRCDIR)/fonts/symbol.ttf - [ $(SRCDIR) = . ] || ($(RM) $@ && $(LN_S) $(SRCDIR)/symbol.ttf $@) - -tahoma.ttf: $(TOPSRCDIR)/fonts/tahoma.ttf - [ $(SRCDIR) = . ] || ($(RM) $@ && $(LN_S) $(SRCDIR)/tahoma.ttf $@) - -tahomabd.ttf: $(TOPSRCDIR)/fonts/tahomabd.ttf - [ $(SRCDIR) = . ] || ($(RM) $@ && $(LN_S) $(SRCDIR)/tahomabd.ttf $@) - $(BITMAP_FONTS): $(SFNT2FNT) install install-lib:: $(FONTS) $(INSTALLDIRS) @@ -200,4 +188,3 @@ uninstall:: clean:: $(RM) $(BITMAP_FONTS) - [ $(SRCDIR) = . ] || $(RM) $(TRUETYPE_FONTS)

1 0

Marcus Meissner : msi: Handle some error returns (Coverity).
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 5c4a3bd61b054747f50351765fa56aacf0791191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4a3bd61b054747f50351765… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Feb 4 15:26:53 2010 +0100 msi: Handle some error returns (Coverity). --- dlls/msi/tests/install.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9b334ed..62d3a66 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -7475,6 +7475,7 @@ static void test_start_services(void) } scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); ok(scm != NULL, "Failed to open the SC Manager\n"); + if (!scm) return; service = OpenService(scm, "Spooler", SC_MANAGER_ALL_ACCESS); if (!service && GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) @@ -7483,7 +7484,11 @@ static void test_start_services(void) CloseServiceHandle(scm); return; } - ok(service != NULL, "Failed to open Spooler\n"); + ok(service != NULL, "Failed to open Spooler, error %d\n", GetLastError()); + if (!service) { + CloseServiceHandle(scm); + return; + } ret = StartService(service, 0, NULL); if (!ret && (error = GetLastError()) != ERROR_SERVICE_ALREADY_RUNNING)

1 0

Nikolay Sivov : comctl32/updown: Use set acceleration value while processing keyboard keypresses.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 8c16c4030b3757a1bd237abce653f92685d3970c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c16c4030b3757a1bd237abce… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Feb 4 19:05:14 2010 +0300 comctl32/updown: Use set acceleration value while processing keyboard keypresses. --- dlls/comctl32/updown.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 076e315..75653e1 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -461,7 +461,7 @@ static LRESULT UPDOWN_Paint (const UPDOWN_INFO *infoPtr, HDC hdc) */ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) { - int arrow; + int arrow, accel; if (key == VK_UP) arrow = FLAG_INCR; else if (key == VK_DOWN) arrow = FLAG_DECR; @@ -472,7 +472,8 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) infoPtr->Flags |= FLAG_PRESSED | arrow; InvalidateRect (infoPtr->Self, NULL, FALSE); SetTimer(infoPtr->Self, TIMER_AUTOPRESS, AUTOPRESS_DELAY, 0); - UPDOWN_DoAction (infoPtr, 1, arrow); + accel = (infoPtr->AccelCount && infoPtr->AccelVect) ? infoPtr->AccelVect[0].nInc : 1; + UPDOWN_DoAction (infoPtr, accel, arrow); return 0; } @@ -929,18 +930,18 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L /* if initial timer, kill it and start the repeat timer */ if(wParam == TIMER_AUTOREPEAT) { - int temp; + INT delay; KillTimer(hwnd, TIMER_AUTOREPEAT); /* if no accel info given, used default timer */ if(infoPtr->AccelCount==0 || infoPtr->AccelVect==0) { infoPtr->AccelIndex = -1; - temp = REPEAT_DELAY; + delay = REPEAT_DELAY; } else { infoPtr->AccelIndex = 0; /* otherwise, use it */ - temp = infoPtr->AccelVect[infoPtr->AccelIndex].nSec * 1000 + 1; + delay = infoPtr->AccelVect[infoPtr->AccelIndex].nSec * 1000 + 1; } - SetTimer(hwnd, TIMER_ACCEL, temp, 0); + SetTimer(hwnd, TIMER_ACCEL, delay, 0); } /* now, if the mouse is above us, do the thing...*/ @@ -1010,8 +1011,6 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case UDM_SETACCEL: { - unsigned temp; - TRACE("UDM_SETACCEL\n"); if(infoPtr->AccelVect) { @@ -1025,8 +1024,14 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L memcpy(infoPtr->AccelVect, (void*)lParam, wParam*sizeof(UDACCEL)); infoPtr->AccelCount = wParam; - for (temp = 0; temp < wParam; temp++) - TRACE("%d: nSec %u nInc %u\n", temp, infoPtr->AccelVect[temp].nSec, infoPtr->AccelVect[temp].nInc); + if (TRACE_ON(updown)) + { + INT i; + + for (i = 0; i < wParam; i++) + TRACE("%d: nSec %u nInc %u\n", i, + infoPtr->AccelVect[i].nSec, infoPtr->AccelVect[i].nInc); + } return TRUE; }

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

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 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_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 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 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