February 2010 - Wine-commits

Vitaly Perov : mshtml: Silence IStdMarshalInfo in htmldoc_qi FIXME.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: e2f3b143fd2f8cc960d0fa25eb5da99c36c0484f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f3b143fd2f8cc960d0fa25e… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Mon Feb 22 19:19:31 2010 +0300 mshtml: Silence IStdMarshalInfo in htmldoc_qi FIXME. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 93aea06..8adfdb1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1776,6 +1776,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IExternalConnection, riid)) { TRACE("(%p)->(IID_IExternalConnection %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) { + TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv); + *ppv = NULL; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); *ppv = OBJSITE(This); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index adc318a..08e0359 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4314,6 +4314,11 @@ static void test_QueryInterface(IHTMLDocument2 *doc) hres = IUnknown_QueryInterface(doc, &IID_IExternalConnection, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); + + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(doc, &IID_IStdMarshalInfo, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); } static void init_test(enum load_state_t ls) {

1 0

André Hentschel : oleaut32: Reorder some code to make it easier to read and look like the block above.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: c665c3c61945887d6b6f67eb9c906e1dcaa962bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c665c3c61945887d6b6f67eb9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 22 18:52:37 2010 +0100 oleaut32: Reorder some code to make it easier to read and look like the block above. --- dlls/oleaut32/varformat.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 370b4f0..9db390d 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1264,13 +1264,11 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, /* Exponent format: length of the integral number part is fixed and specified by the format. */ pad = need_int - have_int; - if (pad >= 0) - exponent -= pad; - else + exponent -= pad; + if (pad < 0) { have_int = need_int; have_frac -= pad; - exponent -= pad; pad = 0; } }

1 0

Eric Pouech : ntdll: Notify valgrind for stack management while in exception.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 27fb22637a36ebf05c863da30cfdf2bfd57e6862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb22637a36ebf05c863da30… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 22 21:03:35 2010 +0100 ntdll: Notify valgrind for stack management while in exception. --- dlls/ntdll/signal_x86_64.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 97a952e..45cdb32 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -50,6 +50,10 @@ #include "ntdll_misc.h" #include "wine/debug.h" +#ifdef HAVE_VALGRIND_MEMCHECK_H +#include <valgrind/memcheck.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(seh); struct _DISPATCHER_CONTEXT; @@ -1679,6 +1683,11 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun } stack--; /* push the stack_layout structure */ +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack)); +#elif defined(VALGRIND_MAKE_WRITABLE) + VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); +#endif stack->rec.ExceptionRecord = NULL; stack->rec.ExceptionCode = exception_code; stack->rec.ExceptionFlags = EXCEPTION_CONTINUABLE;

1 0

Maarten Lankhorst : mmdevapi: Add tests for renderclient.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 8f76035d97f390883d491f9664f7eaba0539be7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f76035d97f390883d491f966… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 11:53:11 2010 +0100 mmdevapi: Add tests for renderclient. --- dlls/mmdevapi/tests/Makefile.in | 3 +- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/render.c | 247 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 250 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f76035d97f390883d491…

1 0

Maarten Lankhorst : mmdevapi: Add todo_wine in dependency test.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 520a2830d5319185021efc973f57f603d15968f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520a2830d5319185021efc973… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 11:53:38 2010 +0100 mmdevapi: Add todo_wine in dependency test. --- dlls/mmdevapi/tests/dependency.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 0d60cb2..23c3614 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -72,7 +72,7 @@ START_TEST(dependency) ok(!GetModuleHandle("dsound.dll"), "dsound.dll was already loaded!\n"); hr = IMMDevice_Activate(dev, &IID_IDirectSound8, CLSCTX_INPROC_SERVER, NULL, (void**)&ds8); - ok(hr == S_OK, "Activating ds8 interface failed: 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "Activating ds8 interface failed: 0x%08x\n", hr); if (hr == S_OK) { ok(GetModuleHandle("dsound.dll") != NULL, "dsound.dll not loaded!\n");

1 0

Jörg Höhle : winmm: Do not access MIDIHDR past MOM_DONE DriverCallback.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 63d0aeeafa24a2b62ffb917274468bd9a477ee71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d0aeeafa24a2b62ffb91727… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 16 22:10:03 2010 +0100 winmm: Do not access MIDIHDR past MOM_DONE DriverCallback. --- dlls/winmm/winmm.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 46a3c06..1898e28 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1485,13 +1485,15 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); /* empty list of already submitted buffers */ - for (lpMidiHdr = lpMidiStrm->lpMidiHdr; lpMidiHdr; lpMidiHdr = lpMidiHdr->lpNext) { - lpMidiHdr->dwFlags |= MHDR_DONE; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + for (lpMidiHdr = lpMidiStrm->lpMidiHdr; lpMidiHdr; ) { + LPMIDIHDR lphdr = lpMidiHdr; + lpMidiHdr = lpMidiHdr->lpNext; + lphdr->dwFlags |= MHDR_DONE; + lphdr->dwFlags &= ~MHDR_INQUEUE; DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, (HDRVR)lpMidiStrm->hDevice, MM_MOM_DONE, - lpwm->mod.dwInstance, (DWORD_PTR)lpMidiHdr, 0); + lpwm->mod.dwInstance, (DWORD_PTR)lphdr, 0); } lpMidiStrm->lpMidiHdr = 0; SetEvent(lpMidiStrm->hEvent);

1 0

Jörg Höhle : winmm: MIDIHDR. dwOffset is set with MEVT_F_CALLBACK only.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: a8f1d2eb2f55f49fcbfe306946d37f3074eeab64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f1d2eb2f55f49fcbfe30694… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 16 10:31:05 2010 +0100 winmm: MIDIHDR.dwOffset is set with MEVT_F_CALLBACK only. At the same time, the change to the player loop prevents a buffer overshoot and a (perhaps unlikely) program trace where a sequence Suspend; Stop; midiStreamOut could send MOM_DONE twice and access memory possibly released within a MOM_DONE DCB_FUNCTION callback. --- dlls/winmm/winmm.c | 66 ++++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 1898e28..06aed09 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1577,7 +1577,6 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI lpMidiHdr->lpNext = 0; lpMidiHdr->dwFlags |= MHDR_INQUEUE; lpMidiHdr->dwFlags &= ~MHDR_DONE; - lpMidiHdr->dwOffset = 0; break; default: @@ -1598,8 +1597,7 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) DWORD dwToGo; DWORD dwCurrTC; LPMIDIHDR lpMidiHdr; - LPMIDIEVENT me; - LPBYTE lpData = 0; + DWORD dwOffset; TRACE("(%p)!\n", lpMidiStrm); @@ -1618,23 +1616,21 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) /* midiStreamOpen is waiting for ack */ SetEvent(lpMidiStrm->hEvent); - for (;;) { - lpMidiHdr = lpMidiStrm->lpMidiHdr; - if (!lpMidiHdr) { - /* for first message, block until one arrives, then process all that are available */ - GetMessageA(&msg, 0, 0, 0); - do { - if (!MMSYSTEM_MidiStream_MessageHandler(lpMidiStrm, lpwm, &msg)) - goto the_end; - } while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)); - lpData = 0; - continue; - } - - if (!lpData) - lpData = (LPBYTE)lpMidiHdr->lpData; +start_header: + lpMidiHdr = lpMidiStrm->lpMidiHdr; + if (!lpMidiHdr) { + /* for first message, block until one arrives, then process all that are available */ + GetMessageA(&msg, 0, 0, 0); + do { + if (!MMSYSTEM_MidiStream_MessageHandler(lpMidiStrm, lpwm, &msg)) + goto the_end; + } while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)); + goto start_header; + } - me = (LPMIDIEVENT)(lpData + lpMidiHdr->dwOffset); + dwOffset = 0; + while (dwOffset + offsetof(MIDIEVENT,dwParms) <= lpMidiHdr->dwBytesRecorded) { + LPMIDIEVENT me = (LPMIDIEVENT)(lpMidiHdr->lpData+dwOffset); /* do we have to wait ? */ if (me->dwDeltaTime) { @@ -1650,8 +1646,11 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { if (!MMSYSTEM_MidiStream_MessageHandler(lpMidiStrm, lpwm, &msg)) goto the_end; + /* is lpMidiHdr still current? */ + if (lpMidiHdr != lpMidiStrm->lpMidiHdr) { + goto start_header; + } } - lpData = 0; } else { /* timeout, so me->dwDeltaTime is elapsed, can break the while loop */ break; @@ -1681,25 +1680,26 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) break; } if (me->dwEvent & MEVT_F_CALLBACK) { + /* native fills dwOffset regardless of the cbMidiHdr size argument to midiStreamOut */ + lpMidiHdr->dwOffset = dwOffset; DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, (HDRVR)lpMidiStrm->hDevice, MM_MOM_POSITIONCB, lpwm->mod.dwInstance, (LPARAM)lpMidiHdr, 0L); } - lpMidiHdr->dwOffset += sizeof(MIDIEVENT) - sizeof(me->dwParms); + dwOffset += offsetof(MIDIEVENT,dwParms); if (me->dwEvent & MEVT_F_LONG) - lpMidiHdr->dwOffset += (MEVT_EVENTPARM(me->dwEvent) + 3) & ~3; - if (lpMidiHdr->dwOffset >= lpMidiHdr->dwBytesRecorded) { - /* done with this header */ - lpMidiHdr->dwFlags |= MHDR_DONE; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - - lpMidiStrm->lpMidiHdr = lpMidiHdr->lpNext; - DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, - (HDRVR)lpMidiStrm->hDevice, MM_MOM_DONE, - lpwm->mod.dwInstance, (DWORD_PTR)lpMidiHdr, 0); - lpData = 0; - } + dwOffset += (MEVT_EVENTPARM(me->dwEvent) + 3) & ~3; } + /* done with this header */ + lpMidiStrm->lpMidiHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags |= MHDR_DONE; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + + DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, + (HDRVR)lpMidiStrm->hDevice, MM_MOM_DONE, + lpwm->mod.dwInstance, (DWORD_PTR)lpMidiHdr, 0); + goto start_header; + the_end: TRACE("End of thread\n"); return 0;

1 0

Jörg Höhle : winmm: Accept the ancient, smaller MIDIHDR.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 64b6287e83c17f3c787060303a9fdcbec31d4c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b6287e83c17f3c787060303… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 16 09:32:53 2010 +0100 winmm: Accept the ancient, smaller MIDIHDR. --- dlls/midimap/midimap.c | 2 +- dlls/winealsa.drv/midi.c | 10 +++++----- dlls/winecoreaudio.drv/midi.c | 12 ++++++------ dlls/wineoss.drv/midi.c | 10 +++++----- dlls/winmm/winmm.c | 10 +++++----- include/mmsystem.h | 1 + 6 files changed, 23 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64b6287e83c17f3c78706…

1 0

Jörg Höhle : winmm/tests: MIDIHDR tests.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 9b442134cfdb394b1ce4295d4abcd8f8c2bb0229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b442134cfdb394b1ce4295d4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 17 00:36:56 2010 +0100 winmm/tests: MIDIHDR tests. --- dlls/winmm/tests/midi.c | 152 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 140 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b442134cfdb394b1ce42…

1 0

Huw Davies : rpcrt4: Add support for FC_FLOAT and FC_DOUBLE in complex structures.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 87b712be8b6ea2b24246cb8d9e3b5bc7c29b6b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b712be8b6ea2b24246cb8d9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 22 11:49:19 2010 +0000 rpcrt4: Add support for FC_FLOAT and FC_DOUBLE in complex structures. --- dlls/rpcrt4/ndr_marshall.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3b10af4..e594c95 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2696,11 +2696,21 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, safe_copy_to_buffer(pStubMsg, pMemory, 4); pMemory += 4; break; + case RPC_FC_FLOAT: + TRACE("float=%f <= %p\n", *(float*)pMemory, pMemory); + safe_copy_to_buffer(pStubMsg, pMemory, sizeof(float)); + pMemory += sizeof(float); + break; case RPC_FC_HYPER: TRACE("longlong=%s <= %p\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory), pMemory); safe_copy_to_buffer(pStubMsg, pMemory, 8); pMemory += 8; break; + case RPC_FC_DOUBLE: + TRACE("double=%f <= %p\n", *(double*)pMemory, pMemory); + safe_copy_to_buffer(pStubMsg, pMemory, sizeof(double)); + pMemory += sizeof(double); + break; case RPC_FC_POINTER: { unsigned char *saved_buffer; @@ -2825,11 +2835,21 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("long=%d => %p\n", *(DWORD*)pMemory, pMemory); pMemory += 4; break; + case RPC_FC_FLOAT: + safe_copy_from_buffer(pStubMsg, pMemory, sizeof(float)); + TRACE("float=%f => %p\n", *(float*)pMemory, pMemory); + pMemory += sizeof(float); + break; case RPC_FC_HYPER: safe_copy_from_buffer(pStubMsg, pMemory, 8); TRACE("longlong=%s => %p\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory), pMemory); pMemory += 8; break; + case RPC_FC_DOUBLE: + safe_copy_from_buffer(pStubMsg, pMemory, sizeof(double)); + TRACE("double=%f => %p\n", *(double*)pMemory, pMemory); + pMemory += sizeof(double); + break; case RPC_FC_POINTER: { unsigned char *saved_buffer; @@ -2950,10 +2970,12 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: + case RPC_FC_FLOAT: safe_buffer_length_increment(pStubMsg, 4); pMemory += 4; break; case RPC_FC_HYPER: + case RPC_FC_DOUBLE: safe_buffer_length_increment(pStubMsg, 8); pMemory += 8; break; @@ -3053,9 +3075,11 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_ULONG: case RPC_FC_ENUM16: case RPC_FC_ENUM32: + case RPC_FC_FLOAT: pMemory += 4; break; case RPC_FC_HYPER: + case RPC_FC_DOUBLE: pMemory += 8; break; case RPC_FC_POINTER: @@ -3141,10 +3165,12 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: + case RPC_FC_FLOAT: size += 4; safe_buffer_increment(pStubMsg, 4); break; case RPC_FC_HYPER: + case RPC_FC_DOUBLE: size += 8; safe_buffer_increment(pStubMsg, 8); break; @@ -3236,9 +3262,11 @@ ULONG ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) case RPC_FC_ULONG: case RPC_FC_ENUM16: case RPC_FC_ENUM32: + case RPC_FC_FLOAT: size += 4; break; case RPC_FC_HYPER: + case RPC_FC_DOUBLE: size += 8; break; case RPC_FC_POINTER:

1 0