February 2010 - Wine-Commits

Huw Davies : msdaps: Make use of the row server in ICommand_Execute.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 06abf0006c7e4dfc41b4b3f76a97add655178b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=06abf0006c7e4dfc41b4b3f76… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 19:22:21 2010 +0000 msdaps: Make use of the row server in ICommand_Execute. --- dlls/msdaps/usrmarshal.c | 60 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index f889097..f08f9fc 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -766,11 +766,34 @@ HRESULT __RPC_STUB ICommand_Cancel_Stub(ICommand* This, IErrorInfo **ppErrorInfo HRESULT CALLBACK ICommand_Execute_Proxy(ICommand* This, IUnknown *pUnkOuter, REFIID riid, DBPARAMS *pParams, DBROWCOUNT *pcRowsAffected, IUnknown **ppRowset) { - FIXME("(%p)->(%p, %s, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), pParams, + HRESULT hr; + DBROWCOUNT affected; + + *ppRowset = NULL; + + TRACE("(%p)->(%p, %s, %p, %p, %p)\n", This, pUnkOuter, debugstr_guid(riid), pParams, pcRowsAffected, ppRowset); - if(pParams) TRACE("params {%p, %d, %08lx}\n", pParams->pData, pParams->cParamSets, pParams->hAccessor); - return E_NOTIMPL; + if(pParams) + { + FIXME("Unhandled params {%p, %d, %08lx}\n", pParams->pData, pParams->cParamSets, pParams->hAccessor); + return E_NOTIMPL; + } + + if(pUnkOuter) + { + FIXME("Aggregation not supported\n"); + return CLASS_E_NOAGGREGATION; + } + + hr = ICommand_RemoteExecute_Proxy(This, pUnkOuter, riid, 0, 0, NULL, 0, NULL, NULL, 0, NULL, NULL, &affected, + ppRowset); + + TRACE("Execute returns %08x\n", hr); + + if(pcRowsAffected) *pcRowsAffected = affected; + + return hr; } HRESULT __RPC_STUB ICommand_Execute_Stub(ICommand* This, IUnknown *pUnkOuter, REFIID riid, HACCESSOR hAccessor, @@ -778,10 +801,37 @@ HRESULT __RPC_STUB ICommand_Execute_Stub(ICommand* This, IUnknown *pUnkOuter, RE RMTPACK *pOutputParams, DBCOUNTITEM cBindings, DBBINDING *rgBindings, DBSTATUS *rgStatus, DBROWCOUNT *pcRowsAffected, IUnknown **ppRowset) { - FIXME("(%p)->(%p, %s, %08lx, %d, %p, %d, %p, %p, %d, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), + IWineRowServer *rowset_server; + IMarshal *marshal; + IUnknown *obj = NULL; + HRESULT hr; + + TRACE("(%p)->(%p, %s, %08lx, %d, %p, %d, %p, %p, %d, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), hAccessor, cParamSets, pGuid, ulGuidOffset, pInputParams, pOutputParams, cBindings, rgBindings, rgStatus, pcRowsAffected, ppRowset); - return E_NOTIMPL; + + *ppRowset = NULL; + + hr = CoCreateInstance(&CLSID_wine_rowset_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&rowset_server); + if(FAILED(hr)) return hr; + + IWineRowServer_GetMarshal(rowset_server, &marshal); + + hr = ICommand_Execute(This, (IUnknown*)marshal, &IID_IUnknown, NULL, pcRowsAffected, &obj); + + IMarshal_Release(marshal); + + if(FAILED(hr)) + { + IWineRowServer_Release(rowset_server); + return hr; + } + + IWineRowServer_SetInnerUnk(rowset_server, obj); + hr = IUnknown_QueryInterface(obj, riid, (void**)ppRowset); + IUnknown_Release(obj); + + return hr; } HRESULT CALLBACK ICommand_GetDBSession_Proxy(ICommand* This, REFIID riid, IUnknown **ppSession)

1 0

Huw Davies : msdaps: Add support for remoting IRow_Open.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: d3f81a95df3a7f0528a1c45b39a4c289f015d158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f81a95df3a7f0528a1c45b3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 19:54:59 2010 +0000 msdaps: Add support for remoting IRow_Open. --- dlls/msdaps/row_server.c | 54 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 26d0e13..a9f7a45 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -219,10 +219,51 @@ static HRESULT WINAPI server_Open(IWineRowServer* iface, IUnknown *pUnkOuter, DB IUnknown **ppUnk) { server *This = impl_from_IWineRowServer(iface); + IRow *row; + HRESULT hr; + IWineRowServer *new_server; + IMarshal *marshal; + IUnknown *obj; - FIXME("(%p)->(%p, %p, %s, %08x, %s, %p): stub\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), + TRACE("(%p)->(%p, %p, %s, %08x, %s, %p)\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), dwBindFlags, debugstr_guid(riid), ppUnk); - return E_NOTIMPL; + + *ppUnk = NULL; + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRow, (void**)&row); + if(FAILED(hr)) return hr; + + if(IsEqualGUID(rguidColumnType, &DBGUID_ROWSET)) + hr = CoCreateInstance(&CLSID_wine_rowset_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&new_server); + else + { + FIXME("Unhandled object %s\n", debugstr_guid(rguidColumnType)); + hr = E_NOTIMPL; + } + + if(FAILED(hr)) + { + IRow_Release(row); + return hr; + } + + IWineRowServer_GetMarshal(new_server, &marshal); + hr = IRow_Open(row, (IUnknown*)marshal, pColumnID, rguidColumnType, dwBindFlags, &IID_IUnknown, &obj); + IMarshal_Release(marshal); + IRow_Release(row); + + if(FAILED(hr)) + { + IWineRowServer_Release(new_server); + return hr; + } + + IWineRowServer_SetInnerUnk(new_server, obj); + hr = IUnknown_QueryInterface(obj, riid, (void**)ppUnk); + IUnknown_Release(obj); + + TRACE("returning %08x\n", hr); + return hr; } static HRESULT WINAPI server_SetColumns(IWineRowServer* iface, DBORDINAL num_cols, @@ -659,10 +700,15 @@ static HRESULT WINAPI row_Open(IRow* iface, IUnknown *pUnkOuter, { row_proxy *This = impl_from_IRow(iface); - FIXME("(%p)->(%p, %p, %s, %08x, %s, %p): stub\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), + TRACE("(%p)->(%p, %p, %s, %08x, %s, %p)\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), dwBindFlags, debugstr_guid(riid), ppUnk); + if(pUnkOuter) + { + FIXME("Aggregation not supported\n"); + return CLASS_E_NOAGGREGATION; + } - return E_NOTIMPL; + return IWineRowServer_Open(This->server, pUnkOuter, pColumnID, rguidColumnType, dwBindFlags, riid, ppUnk); } static const IRowVtbl row_vtbl =

1 0

Huw Davies : msdaps: Make use of the row server in IBindResource_Bind.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 82d35b0bf22a05cb99854923db9e638126be52ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d35b0bf22a05cb99854923d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 15:22:29 2010 +0000 msdaps: Make use of the row server in IBindResource_Bind. --- dlls/msdaps/main.c | 1 + dlls/msdaps/usrmarshal.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index 92ed78b..1312fc4 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -31,6 +31,7 @@ #include "winerror.h" #include "objbase.h" #include "oleauto.h" +#define DBINITCONSTANTS #include "oledb.h" #include "row_server.h" diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index a2cea91..f889097 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -448,6 +448,12 @@ HRESULT CALLBACK IBindResource_Bind_Proxy(IBindResource* This, IUnknown *pUnkOut TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pImplSession, pdwBindStatus, ppUnk); + if(pUnkOuter) + { + FIXME("Aggregation not supported\n"); + return CLASS_E_NOAGGREGATION; + } + hr = IBindResource_RemoteBind_Proxy(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, pImplSession ? pImplSession->pUnkOuter : NULL, pImplSession ? pImplSession->piid : NULL, pImplSession ? &pImplSession->pSession : NULL, pdwBindStatus, ppUnk); @@ -460,16 +466,46 @@ HRESULT __RPC_STUB IBindResource_Bind_Stub(IBindResource* This, IUnknown *pUnkOu { HRESULT hr; DBIMPLICITSESSION impl_session; + IWineRowServer *server; + IMarshal *marshal; + IUnknown *obj; TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pSessionUnkOuter, piid, ppSession, pdwBindStatus, ppUnk); + *ppUnk = NULL; + + if(IsEqualGUID(rguid, &DBGUID_ROWSET)) + hr = CoCreateInstance(&CLSID_wine_rowset_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&server); + else if(IsEqualGUID(rguid, &DBGUID_ROW)) + hr = CoCreateInstance(&CLSID_wine_row_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&server); + else + { + hr = E_NOTIMPL; + FIXME("Unhandled object %s\n", debugstr_guid(rguid)); + } + + if(FAILED(hr)) return hr; + impl_session.pUnkOuter = pSessionUnkOuter; impl_session.piid = piid; impl_session.pSession = NULL; - hr = IBindResource_Bind(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, - ppSession ? &impl_session : NULL, pdwBindStatus, ppUnk); + IWineRowServer_GetMarshal(server, &marshal); + + hr = IBindResource_Bind(This, (IUnknown*)marshal, pwszURL, dwBindURLFlags, rguid, &IID_IUnknown, pAuthenticate, + ppSession ? &impl_session : NULL, pdwBindStatus, &obj); + + IMarshal_Release(marshal); + if(FAILED(hr)) + { + IWineRowServer_Release(server); + return hr; + } + + IWineRowServer_SetInnerUnk(server, obj); + hr = IUnknown_QueryInterface(obj, riid, (void**)ppUnk); + IUnknown_Release(obj); if(ppSession) *ppSession = impl_session.pSession; return hr;

1 0

Bernhard Übelacker : user32: Don' t hide the window in SetParent when window and parent are equal.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 8d127f3a813700ba7086133fa9ec7cede812f97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d127f3a813700ba7086133fa… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Feb 2 14:16:02 2010 +0100 user32: Don't hide the window in SetParent when window and parent are equal. --- dlls/user32/tests/win.c | 6 ++++++ dlls/user32/win.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 615cb2a..d524bcc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -445,6 +445,12 @@ static void test_parent_owner(void) ret = SetParent( test, child ); ok( ret == desktop, "SetParent return value %p expected %p\n", ret, desktop ); check_parents( test, child, child, 0, 0, hwndMain, test ); + + ShowWindow( test, SW_SHOW ); + ret = SetParent( test, test ); + ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); + ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); + check_parents( test, child, child, 0, 0, hwndMain, test ); DestroyWindow( test ); /* owned popup */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9a19b2a..adf74d0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2701,6 +2701,12 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) if (!(full_handle = WIN_IsCurrentThread( hwnd ))) return (HWND)SendMessageW( hwnd, WM_WINE_SETPARENT, (WPARAM)parent, 0 ); + if (full_handle == parent) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + /* Windows hides the window first, then shows it again * including the WM_SHOWWINDOW messages and all */ was_visible = ShowWindow( hwnd, SW_HIDE );

1 0

Jörg Höhle : winecoreaudio: Ignore failure to notify MIDI clients.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 945588a302c92530551769e1ec0fdf0ccd4ad1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945588a302c92530551769e1e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 4 22:13:34 2010 +0100 winecoreaudio: Ignore failure to notify MIDI clients. --- dlls/winecoreaudio.drv/midi.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index b6b26ea..bb105fc 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -222,7 +222,7 @@ LONG CoreAudio_MIDIRelease(void) /************************************************************************** * MIDI_NotifyClient [internal] */ -static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { DWORD dwCallBack; UINT uFlags; @@ -255,12 +255,11 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD dwParam1, DWORD dwP dwInstance = sources[wDevID].midiDesc.dwInstance; break; default: - WARN("Unsupported MSW-MIDI message %u\n", wMsg); - return MMSYSERR_ERROR; + ERR("Unsupported MSW-MIDI message %u\n", wMsg); + return; } - return DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2) ? - MMSYSERR_NOERROR : MMSYSERR_ERROR; + DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } static DWORD MIDIOut_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) @@ -307,7 +306,8 @@ static DWORD MIDIOut_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) dest->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); dest->midiDesc = *lpDesc; - return MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); + MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; } static DWORD MIDIOut_Close(WORD wDevID) @@ -327,10 +327,7 @@ static DWORD MIDIOut_Close(WORD wDevID) destinations[wDevID].graph = 0; destinations[wDevID].synth = 0; - if (MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - ret = MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); destinations[wDevID].midiDesc.hMidi = 0; return ret; @@ -446,10 +443,7 @@ static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - if (MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD)lpMidiHdr, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD)lpMidiHdr, 0L); return MMSYSERR_NOERROR; } @@ -632,7 +626,8 @@ static DWORD MIDIIn_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) sources[wDevID].startTime = 0; sources[wDevID].state = 0; - return MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); + MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; } static DWORD MIDIIn_Close(WORD wDevID) @@ -654,7 +649,7 @@ static DWORD MIDIIn_Close(WORD wDevID) return MIDIERR_STILLPLAYING; } - ret = MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); + MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); sources[wDevID].midiDesc.hMidi = 0; return ret; } @@ -814,9 +809,7 @@ static DWORD MIDIIn_Reset(WORD wDevID) sources[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; sources[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)sources[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) { - WARN("Couldn't notify client\n"); - } + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)sources[wDevID].lpQueueHdr, dwTime); sources[wDevID].lpQueueHdr = (LPMIDIHDR)sources[wDevID].lpQueueHdr->lpNext; } LeaveCriticalSection(&midiInLock);

1 0

Alexandre Julliard : mlang/tests: Fix a test failure on Win2k.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: d8d70020d8c4766d59a8d4e6974d41a451843699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d70020d8c4766d59a8d4e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 11:50:24 2010 +0100 mlang/tests: Fix a test failure on Win2k. --- dlls/mlang/tests/mlang.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index e29da39..11e26db 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1946,7 +1946,8 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) * up an installation dialog on some platforms, even when specifying CPIOD_PEEK. */ if (IsValidCodePage(i)) - ok(hr == S_OK, "code page %u is valid but not installable 0x%08x\n", i, hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG), /* win2k */ + "code page %u is valid but not installable 0x%08x\n", i, hr); } }

1 0

Alexandre Julliard : ddraw/tests: Fix a test that fails on Win2k.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 6d1ba98f5b45e96335a17f0dedbedbd5ffdb673f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1ba98f5b45e96335a17f0de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 11:54:51 2010 +0100 ddraw/tests: Fix a test that fails on Win2k. --- dlls/ddraw/tests/ddrawmodes.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index c584684..aa72731 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -665,9 +665,10 @@ static void testddraw7(void) { dddi2Bytes = FIELD_OFFSET(DDDEVICEIDENTIFIER2, dwWHQLLevel) + sizeof(DWORD); - pdddi2 = HeapAlloc( GetProcessHeap(), 0, dddi2Bytes + sizeof(DWORD) ); + pdddi2 = HeapAlloc( GetProcessHeap(), 0, dddi2Bytes + 2*sizeof(DWORD) ); pend = (DWORD *)((char *)pdddi2 + dddi2Bytes); - *pend = 0xdeadbeef; + pend[0] = 0xdeadbeef; + pend[1] = 0xdeadbeef; hr = IDirectDraw7_GetDeviceIdentifier(dd7, pdddi2, 0); ok(hr==DD_OK, "get device identifier failed with %08x\n", hr); @@ -678,7 +679,9 @@ static void testddraw7(void) ok(pdddi2->szDriver[MAX_DDDEVICEID_STRING - 1]==0, "szDriver not cleared\n"); ok(pdddi2->szDescription[MAX_DDDEVICEID_STRING - 1]==0, "szDescription not cleared\n"); /* verify that 8 byte structure size alignment will not overwrite memory */ - ok(*pend==0xdeadbeef, "memory beyond DDDEVICEIDENTIFIER2 overwritten\n"); + ok(pend[0]==0xdeadbeef || broken(pend[0] != 0xdeadbeef), /* win2k */ + "memory beyond DDDEVICEIDENTIFIER2 overwritten\n"); + ok(pend[1]==0xdeadbeef, "memory beyond DDDEVICEIDENTIFIER2 overwritten\n"); } IDirectDraw_Release(dd7);

1 0

Alexandre Julliard : urlmon/tests: Comment out a test that crashes on Win2k .
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 1e2b0ad4847187bdfaafcea9d1d3ddfeab1086cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2b0ad4847187bdfaafcea9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 11:50:36 2010 +0100 urlmon/tests: Comment out a test that crashes on Win2k. --- dlls/urlmon/tests/stream.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 6b25e2d..329addb 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -299,8 +299,11 @@ static void test_URLOpenBlockingStreamW(void) hr = URLOpenBlockingStreamW(NULL, NULL, &pStream, 0, &BindStatusCallback); ok(hr == E_INVALIDARG, "URLOpenBlockingStreamW should have failed with E_INVALIDARG instead of 0x%08x\n", hr); - hr = URLOpenBlockingStreamW(NULL, INDEX_HTML, NULL, 0, &BindStatusCallback); - ok(hr == E_INVALIDARG, "URLOpenBlockingStreamW should have failed with E_INVALIDARG instead of 0x%08x\n", hr); + if (0) /* crashes on Win2k */ + { + hr = URLOpenBlockingStreamW(NULL, INDEX_HTML, NULL, 0, &BindStatusCallback); + ok(hr == E_INVALIDARG, "URLOpenBlockingStreamW should have failed with E_INVALIDARG instead of 0x%08x\n", hr); + } SET_EXPECT(GetBindInfo); SET_EXPECT(QueryInterface_IServiceProvider);

1 0

Maarten Lankhorst : dwmapi: Silence a noisy fixme.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: b184b13c5f188df14e612acffe9082ed72c9c18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b184b13c5f188df14e612acff… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Feb 5 11:34:42 2010 +0100 dwmapi: Silence a noisy fixme. --- dlls/dwmapi/dwmapi_main.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6042028..ee86691 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -54,7 +54,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { - FIXME("%p\n", enabled); + static int once; + if (!once) + { + FIXME("%p\n", enabled); + once = 1; + } + else + TRACE("%p\n", enabled); *enabled = FALSE; return S_OK;

1 0

Alexandre Julliard : kernel32: Export InterlockedCompareExchange64.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: abf29377ba0882b1774a5402fe994a13386774db URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf29377ba0882b1774a5402f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 12:31:48 2010 +0100 kernel32: Export InterlockedCompareExchange64. --- dlls/kernel32/kernel32.spec | 1 + include/winbase.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7c32ff7..1dd449b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -726,6 +726,7 @@ @ stdcall InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall -arch=i386 InterlockedCompareExchange (ptr long long) +@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedDecrement(ptr) @ stdcall -arch=i386 InterlockedExchange(ptr long) @ stdcall -arch=i386 InterlockedExchangeAdd (ptr long ) diff --git a/include/winbase.h b/include/winbase.h index 06bc622..f5578c4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2376,6 +2376,8 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVO return (PVOID)InterlockedExchange( (LONG volatile*)dest, (LONG)val ); } +WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); + #else /* __i386__ */ static inline LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) @@ -2404,6 +2406,19 @@ static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *de #endif } +static inline LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ +#if defined(__x86_64__) && defined(__GNUC__) + LONGLONG ret; + __asm__ __volatile__( "lock; cmpxchgq %2,(%1)" + : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); + return ret; +#else + extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); + return interlocked_cmpxchg64( (__int64 *)dest, xchg, compare ); +#endif +} + static inline LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { #if defined(__x86_64__) && defined(__GNUC__)

1 0