February 2010 - Wine-Commits

Alexandre Julliard : dbghelp: Fix broken sw_read_mem() call in i386 stack backtrace.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

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 Feb. 5, 2010

Feb. 5, 2010

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

Nikolay Sivov : comctl32/updown: Use set acceleration value while processing keyboard keypresses.
by Alexandre Julliard Feb. 4, 2010

Feb. 4, 2010

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

Marcus Meissner : msi: Handle some error returns (Coverity).
by Alexandre Julliard Feb. 4, 2010

Feb. 4, 2010

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

Marcus Meissner : ws2_32: Check namelen before dereferencing it in TRACE ( Coverity).
by Alexandre Julliard Feb. 4, 2010

Feb. 4, 2010

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

Maarten Lankhorst : includes: Fix typo in mmdeviceapi.idl.
by Alexandre Julliard Feb. 4, 2010

Feb. 4, 2010

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 Feb. 4, 2010

Feb. 4, 2010

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

Huw Davies : msdaps: Expose IRowsetLocate, IRowsetInfo and IAccessor on the client side.
by Alexandre Julliard Feb. 4, 2010

Feb. 4, 2010

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

Huw Davies : msdaps: Add server side stubs for IAccessor.
by Alexandre Julliard Feb. 4, 2010

Feb. 4, 2010

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: Add server side stubs for IRowsetInfo.
by Alexandre Julliard Feb. 4, 2010

Feb. 4, 2010

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