February 2010 - Wine-Commits

Huw Davies : msdaps: Add a stub rowset proxy object.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 92c88618412b1be16d129c777ee6c98937e38790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c88618412b1be16d129c777… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 16:49:47 2010 +0000 msdaps: Add a stub rowset proxy object. --- dlls/msdaps/row_server.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 143 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 92c82fb..97e5657 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -289,12 +289,155 @@ static HRESULT create_row_proxy(IWineRowServer *server, IUnknown **obj) return S_OK; } +typedef struct +{ + const IRowsetVtbl *rowset_vtbl; + + LONG ref; + + IWineRowServer *server; +} rowset_proxy; + +static inline rowset_proxy *impl_from_IRowset(IRowset *iface) +{ + return (rowset_proxy *)((char*)iface - FIELD_OFFSET(rowset_proxy, rowset_vtbl)); +} + +static HRESULT WINAPI rowset_QueryInterface(IRowset *iface, REFIID iid, void **obj) +{ + rowset_proxy *This = impl_from_IRowset(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), obj); + + *obj = NULL; + + if(IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IRowset)) + { + *obj = &This->rowset_vtbl; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IRowset_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI rowset_AddRef(IRowset *iface) +{ + rowset_proxy *This = impl_from_IRowset(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI rowset_Release(IRowset *iface) +{ + rowset_proxy *This = impl_from_IRowset(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + if(This->server) IWineRowServer_Release(This->server); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI rowset_AddRefRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], + DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + rowset_proxy *This = impl_from_IRowset(iface); + + FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, cRows, rghRows, rgRefCounts, rgRowStatus); + + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_GetData(IRowset *iface, HROW hRow, HACCESSOR hAccessor, void *pData) +{ + rowset_proxy *This = impl_from_IRowset(iface); + + FIXME("(%p)->(%lx, %lx, %p): stub\n", This, hRow, hAccessor, pData); + + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_GetNextRows(IRowset *iface, HCHAPTER hReserved, DBROWOFFSET lRowsOffset, + DBROWCOUNT cRows, DBCOUNTITEM *pcRowObtained, HROW **prghRows) +{ + rowset_proxy *This = impl_from_IRowset(iface); + + FIXME("(%p)->(%08lx, %d, %d, %p, %p): stub\n", This, hReserved, lRowsOffset, cRows, pcRowObtained, prghRows); + + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], + DBROWOPTIONS rgRowOptions[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + rowset_proxy *This = impl_from_IRowset(iface); + + FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, cRows, rghRows, rgRowOptions, rgRefCounts, rgRowStatus); + + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_RestartPosition(IRowset* iface, HCHAPTER hReserved) +{ + rowset_proxy *This = impl_from_IRowset(iface); + + FIXME("(%p)->(%lx): stub\n", This, hReserved); + + return E_NOTIMPL; +} + +static const IRowsetVtbl rowset_vtbl = +{ + rowset_QueryInterface, + rowset_AddRef, + rowset_Release, + rowset_AddRefRows, + rowset_GetData, + rowset_GetNextRows, + rowset_ReleaseRows, + rowset_RestartPosition +}; + +HRESULT create_rowset_proxy(IWineRowServer *server, IUnknown **obj) +{ + rowset_proxy *proxy; + + TRACE("(%p, %p)\n", server, obj); + *obj = NULL; + + proxy = HeapAlloc(GetProcessHeap(), 0, sizeof(*proxy)); + if(!proxy) return E_OUTOFMEMORY; + + proxy->rowset_vtbl = &rowset_vtbl; + proxy->ref = 1; + IWineRowServer_AddRef(server); + proxy->server = server; + + *obj = (IUnknown *)&proxy->rowset_vtbl; + TRACE("returing %p\n", *obj); + return S_OK; +} + static HRESULT create_proxy(IWineRowServer *server, const CLSID *class, IUnknown **obj) { *obj = NULL; if(IsEqualGUID(class, &CLSID_wine_row_proxy)) return create_row_proxy(server, obj); + else if(IsEqualGUID(class, &CLSID_wine_rowset_proxy)) + return create_rowset_proxy(server, obj); else FIXME("Unhandled proxy class %s\n", debugstr_guid(class)); return E_NOTIMPL;

1 0

Jörg Höhle : winmm/tests: Initial set of MIDI tests.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 771a29da8693a958ae24ae67cf030537cdeedf06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=771a29da8693a958ae24ae67c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 27 18:32:23 2010 +0100 winmm/tests: Initial set of MIDI tests. --- dlls/winmm/tests/Makefile.in | 1 + dlls/winmm/tests/midi.c | 485 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 486 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=771a29da8693a958ae24a…

1 0

Jörg Höhle : midimap: Support midiOutGetVolume, returning FFFFFFFF.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: bceee275920c68b0910c3257664bafca4a1066a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bceee275920c68b0910c32576… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 28 16:39:52 2010 +0100 midimap: Support midiOutGetVolume, returning FFFFFFFF. --- dlls/midimap/midimap.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 293465f..129427f 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -430,6 +430,22 @@ static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPar return MMSYSERR_NOERROR; } +static DWORD modGetVolume(MIDIMAPDATA* mom, DWORD* lpdwVolume) +{ + if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; + if (!lpdwVolume) return MMSYSERR_INVALPARAM; + *lpdwVolume = 0xFFFFFFFF; /* tests show this initial value */ + return MMSYSERR_NOERROR; +} + +static DWORD modSetVolume(MIDIMAPDATA* mom, DWORD dwVolume) +{ + /* Native forwards it to some underlying device + * GetVolume returns what was last set here. */ + FIXME("stub\n"); + return MMSYSERR_NOERROR; +} + static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD_PTR size) { static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; @@ -441,7 +457,8 @@ static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiC lpMidiCaps->wVoices = 0; lpMidiCaps->wNotes = 0; lpMidiCaps->wChannelMask = 0xFFFF; - lpMidiCaps->dwSupport = 0L; + /* Native returns volume caps of underlying device | MIDICAPS_STREAM */ + lpMidiCaps->dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; return MMSYSERR_NOERROR; } @@ -494,8 +511,8 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MODM_GETDEVCAPS: return modGetDevCaps (wDevID, (MIDIMAPDATA*)dwUser, (LPMIDIOUTCAPSW)dwParam1,dwParam2); case MODM_GETNUMDEVS: return 1; - case MODM_GETVOLUME: return MMSYSERR_NOTSUPPORTED; - case MODM_SETVOLUME: return MMSYSERR_NOTSUPPORTED; + case MODM_GETVOLUME: return modGetVolume ((MIDIMAPDATA*)dwUser, (DWORD*)dwParam1); + case MODM_SETVOLUME: return modSetVolume ((MIDIMAPDATA*)dwUser, dwParam1); default: FIXME("unknown message %d!\n", wMsg); }

1 0

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

Feb. 3, 2010

Module: wine Branch: master Commit: 3d2464b84065a164e5352e21aa35cf0f37f1f17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2464b84065a164e5352e21a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 3 12:02:49 2010 +0000 msdaps: Make use of the row server in ICreateRow_CreateRow. --- dlls/msdaps/usrmarshal.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 0624c3a..a2cea91 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -33,6 +33,8 @@ #include "oleauto.h" #include "oledb.h" +#include "row_server.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); @@ -482,6 +484,12 @@ HRESULT CALLBACK ICreateRow_CreateRow_Proxy(ICreateRow* This, IUnknown *pUnkOute TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pImplSession, pdwBindStatus, ppwszNewURL, ppUnk); + if(pUnkOuter) + { + FIXME("Aggregation not supported\n"); + return CLASS_E_NOAGGREGATION; + } + hr = ICreateRow_RemoteCreateRow_Proxy(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, pImplSession ? pImplSession->pUnkOuter : NULL, pImplSession ? pImplSession->piid : NULL, pImplSession ? &pImplSession->pSession : NULL, pdwBindStatus, ppwszNewURL, ppUnk); @@ -495,17 +503,38 @@ HRESULT __RPC_STUB ICreateRow_CreateRow_Stub(ICreateRow* This, IUnknown *pUnkOut { HRESULT hr; DBIMPLICITSESSION impl_session; + IWineRowServer *row_server; + IMarshal *marshal; + IUnknown *obj; TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pSessionUnkOuter, piid, ppSession, pdwBindStatus, ppwszNewURL, ppUnk); + *ppUnk = NULL; + + hr = CoCreateInstance(&CLSID_wine_row_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&row_server); + if(FAILED(hr)) return hr; + impl_session.pUnkOuter = pSessionUnkOuter; impl_session.piid = piid; impl_session.pSession = NULL; - hr = ICreateRow_CreateRow(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, - ppSession ? &impl_session : NULL, pdwBindStatus, ppwszNewURL, ppUnk); + IWineRowServer_GetMarshal(row_server, &marshal); + + hr = ICreateRow_CreateRow(This, (IUnknown*) marshal, pwszURL, dwBindURLFlags, rguid, &IID_IUnknown, pAuthenticate, + ppSession ? &impl_session : NULL, pdwBindStatus, ppwszNewURL, &obj); + IMarshal_Release(marshal); + + if(FAILED(hr)) + { + IWineRowServer_Release(row_server); + return hr; + } + + IWineRowServer_SetInnerUnk(row_server, obj); + hr = IUnknown_QueryInterface(obj, riid, (void**)ppUnk); + IUnknown_Release(obj); if(ppSession) *ppSession = impl_session.pSession; return hr;

1 0

Jörg Höhle : winmm: The 64KB buffer limit on MIDIHDR buffers applies to streams only.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: a758c6a981b1f4d3653f9cf44f6d136f2fc0e6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a758c6a981b1f4d3653f9cf44… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 31 21:19:39 2010 +0100 winmm: The 64KB buffer limit on MIDIHDR buffers applies to streams only. --- dlls/winealsa.drv/midi.c | 8 +++----- dlls/winecoreaudio.drv/midi.c | 6 ++---- dlls/wineoss.drv/midi.c | 8 +++----- dlls/winmm/tests/midi.c | 6 +++--- dlls/winmm/winmm.c | 1 + 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index b62a885..33d5783 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -611,8 +611,7 @@ static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize); if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || - lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || - lpMidiHdr->dwBufferLength >= 0x10000ul) + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0) return MMSYSERR_INVALPARAM; lpMidiHdr->lpNext = 0; @@ -633,7 +632,7 @@ static DWORD midUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || - lpMidiHdr->lpData == 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) + lpMidiHdr->lpData == 0) return MMSYSERR_INVALPARAM; if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; @@ -1057,8 +1056,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) * So at least check for the inqueue flag */ if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || - lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || - lpMidiHdr->dwBufferLength >= 0x10000ul) { + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0) { WARN("%p %p %08x %d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, lpMidiHdr ? lpMidiHdr->dwFlags : 0, dwSize); return MMSYSERR_INVALPARAM; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index a31a076..e66d435 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -470,8 +470,7 @@ static DWORD MIDIOut_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) * So at least check for the inqueue flag */ if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || - lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || - lpMidiHdr->dwBufferLength >= 0x10000ul) { + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0) { WARN("%p %p %08x %lu/%d\n", lpMidiHdr, lpMidiHdr->lpData, lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize); return MMSYSERR_INVALPARAM; @@ -721,8 +720,7 @@ static DWORD MIDIIn_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) * So at least check for the inqueue flag */ if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || - lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || - lpMidiHdr->dwBufferLength >= 0x10000ul) { + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0) { WARN("Invalid parameter %p %p %08x %d\n", lpMidiHdr, lpMidiHdr->lpData, lpMidiHdr->dwFlags, dwSize); return MMSYSERR_INVALPARAM; diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 99a9ce0..d82dbdc 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -875,8 +875,7 @@ static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize); if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || - lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || - lpMidiHdr->dwBufferLength >= 0x10000ul) + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0) return MMSYSERR_INVALPARAM; lpMidiHdr->lpNext = 0; @@ -897,7 +896,7 @@ static DWORD midUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || - lpMidiHdr->lpData == 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) + lpMidiHdr->lpData == 0) return MMSYSERR_INVALPARAM; if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; @@ -1621,8 +1620,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) * So at least check for the inqueue flag */ if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || - lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || - lpMidiHdr->dwBufferLength >= 0x10000ul) { + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0) { WARN("%p %p %08x %d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, lpMidiHdr ? lpMidiHdr->dwFlags : 0, dwSize); return MMSYSERR_INVALPARAM; diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 082cf3c..82d61d1 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -121,7 +121,7 @@ static void test_midiIn_device(UINT udev, HWND hwnd) ok(mhdr.lpData!=NULL, "No %d bytes of memory!\n", mhdr.dwBufferLength); if (mhdr.lpData) { rc = midiInPrepareHeader(hm, &mhdr, sizeof(mhdr)); - todo_wine ok(!rc, "midiInPrepare rc=%s\n", mmsys_error(rc)); + ok(!rc, "midiInPrepare rc=%s\n", mmsys_error(rc)); rc = midiInUnprepareHeader(hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiInUnprepare rc=%s\n", mmsys_error(rc)); trace("MIDIHDR flags=%x when unsent\n", mhdr.dwFlags); @@ -260,7 +260,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) test_notification(hwnd, "midiOutLong unprepared", 0, WHATEVER); rc = midiOutPrepareHeader(hm, &mhdr, sizeof(mhdr)); - todo_wine ok(!rc, "midiOutPrepare rc=%s\n", mmsys_error(rc)); + ok(!rc, "midiOutPrepare rc=%s\n", mmsys_error(rc)); rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); trace("MIDIHDR flags=%x when unsent\n", mhdr.dwFlags); @@ -416,7 +416,7 @@ static void test_midiStream(UINT udev, HWND hwnd) mhdr.dwFlags = 0; /* PrepareHeader detects the too large buffer is for a stream. */ rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); - ok(rc==MMSYSERR_INVALPARAM, "midiOutPrepare stream too large rc=%s\n", mmsys_error(rc)); + todo_wine ok(rc==MMSYSERR_INVALPARAM, "midiOutPrepare stream too large rc=%s\n", mmsys_error(rc)); rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 3fee0a8..a2074f6 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -969,6 +969,7 @@ UINT WINAPI midiOutPrepareHeader(HMIDIOUT hMidiOut, if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, FALSE)) == NULL) return MMSYSERR_INVALHANDLE; + /* FIXME: detect MIDIStream handles and enforce 64KB buffer limit on those */ return MMDRV_Message(wmld, MODM_PREPARE, (DWORD_PTR)lpMidiOutHdr, uSize); }

1 0

Huw Davies : msdaps: Add a stub row proxy object.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 53ecb953466bf83f8ed421bf470aec6676001504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ecb953466bf83f8ed421bf4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 16:35:43 2010 +0000 msdaps: Add a stub row proxy object. --- dlls/msdaps/row_server.c | 128 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 017f8c4..92c82fb 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -169,10 +169,134 @@ HRESULT create_rowset_server(IUnknown *outer, void **obj) return create_server(outer, &CLSID_wine_rowset_server, obj); } -HRESULT create_proxy(IWineRowServer *server, const CLSID *class, IUnknown **obj) +typedef struct +{ + const IRowVtbl *row_vtbl; + + LONG ref; + + IWineRowServer *server; +} row_proxy; + +static inline row_proxy *impl_from_IRow(IRow *iface) +{ + return (row_proxy *)((char*)iface - FIELD_OFFSET(row_proxy, row_vtbl)); +} + +static HRESULT WINAPI row_QueryInterface(IRow *iface, REFIID iid, void **obj) +{ + row_proxy *This = impl_from_IRow(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), obj); + + if(IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IRow)) + { + *obj = &This->row_vtbl; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IRow_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI row_AddRef(IRow *iface) +{ + row_proxy *This = impl_from_IRow(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI row_Release(IRow *iface) +{ + row_proxy *This = impl_from_IRow(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + if(This->server) IWineRowServer_Release(This->server); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI row_GetColumns(IRow* iface, DBORDINAL cColumns, DBCOLUMNACCESS rgColumns[]) +{ + row_proxy *This = impl_from_IRow(iface); + + FIXME("(%p)->(%d, %p): stub\n", This, cColumns, rgColumns); + + return E_NOTIMPL; +} + +static HRESULT WINAPI row_GetSourceRowset(IRow* iface, REFIID riid, IUnknown **ppRowset, + HROW *phRow) +{ + row_proxy *This = impl_from_IRow(iface); + + FIXME("(%p)->(%s, %p, %p): stub\n", This, debugstr_guid(riid), ppRowset, phRow); + + return E_NOTIMPL; +} + +static HRESULT WINAPI row_Open(IRow* iface, IUnknown *pUnkOuter, + DBID *pColumnID, REFGUID rguidColumnType, + DWORD dwBindFlags, REFIID riid, IUnknown **ppUnk) { - FIXME("stub\n"); + row_proxy *This = impl_from_IRow(iface); + + FIXME("(%p)->(%p, %p, %s, %08x, %s, %p): stub\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), + dwBindFlags, debugstr_guid(riid), ppUnk); + + return E_NOTIMPL; +} + +static const IRowVtbl row_vtbl = +{ + row_QueryInterface, + row_AddRef, + row_Release, + row_GetColumns, + row_GetSourceRowset, + row_Open +}; + +static HRESULT create_row_proxy(IWineRowServer *server, IUnknown **obj) +{ + row_proxy *proxy; + + TRACE("(%p, %p)\n", server, obj); *obj = NULL; + + proxy = HeapAlloc(GetProcessHeap(), 0, sizeof(*proxy)); + if(!proxy) return E_OUTOFMEMORY; + + proxy->row_vtbl = &row_vtbl; + proxy->ref = 1; + IWineRowServer_AddRef(server); + proxy->server = server; + + *obj = (IUnknown*)&proxy->row_vtbl; + TRACE("returing %p\n", *obj); + return S_OK; +} + +static HRESULT create_proxy(IWineRowServer *server, const CLSID *class, IUnknown **obj) +{ + *obj = NULL; + + if(IsEqualGUID(class, &CLSID_wine_row_proxy)) + return create_row_proxy(server, obj); + else + FIXME("Unhandled proxy class %s\n", debugstr_guid(class)); return E_NOTIMPL; }

1 0

Huw Davies : msdaps: Add support for remoting IRow_GetColumns.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 83eb77928841a8db41ed400d36376025c88ce568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83eb77928841a8db41ed400d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 3 11:48:21 2010 +0000 msdaps: Add support for remoting IRow_GetColumns. --- .gitignore | 1 + dlls/msdaps/Makefile.in | 3 +- dlls/msdaps/row_server.c | 139 +++++++++++++++++++++++++++++++++++++++++++- dlls/msdaps/row_server.idl | 36 +++++++++++ 4 files changed, 175 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6c26883..b11e8b5 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ dlls/msdaps/msdaps_i.c dlls/msdaps/msdaps_p.c dlls/msdaps/row_server.h dlls/msdaps/row_server_i.c +dlls/msdaps/row_server_p.c dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h dlls/msi/cond.tab.c diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 7287cd6..8836f58 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -20,7 +20,8 @@ IDL_I_SRCS = \ row_server.idl IDL_P_SRCS = \ - msdaps.idl + msdaps.idl \ + row_server.idl @MAKE_DLL_RULES@ diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 97e5657..8a88d8c 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -39,6 +39,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); +static inline DBLENGTH db_type_size(DBTYPE type, DBLENGTH var_len) +{ + switch(type) + { + case DBTYPE_I1: + case DBTYPE_UI1: + return 1; + case DBTYPE_I2: + case DBTYPE_UI2: + return 2; + case DBTYPE_I4: + case DBTYPE_UI4: + case DBTYPE_R4: + return 4; + case DBTYPE_I8: + case DBTYPE_UI8: + case DBTYPE_R8: + return 8; + case DBTYPE_CY: + return sizeof(CY); + case DBTYPE_FILETIME: + return sizeof(FILETIME); + case DBTYPE_BSTR: + return sizeof(BSTR); + case DBTYPE_GUID: + return sizeof(GUID); + case DBTYPE_WSTR: + return var_len; + default: + FIXME("Unhandled type %04x\n", type); + return 0; + } +} typedef struct { @@ -125,13 +158,83 @@ static HRESULT WINAPI server_GetMarshal(IWineRowServer *iface, IMarshal **marsha return S_OK; } +static HRESULT WINAPI server_GetColumns(IWineRowServer* iface, DBORDINAL num_cols, + wine_getcolumns_in *in_data, wine_getcolumns_out *out_data) +{ + server *This = impl_from_IWineRowServer(iface); + HRESULT hr; + DBORDINAL i; + DBCOLUMNACCESS *cols; + IRow *row; + + TRACE("(%p)->(%d, %p, %p)\n", This, num_cols, in_data, out_data); + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRow, (void**)&row); + if(FAILED(hr)) return hr; + + cols = CoTaskMemAlloc(num_cols * sizeof(cols[0])); + + for(i = 0; i < num_cols; i++) + { + TRACE("%d:\tmax_len %d type %04x\n", i, in_data[i].max_len, in_data[i].type); + cols[i].pData = CoTaskMemAlloc(db_type_size(in_data[i].type, in_data[i].max_len)); + cols[i].columnid = in_data[i].columnid; + cols[i].cbMaxLen = in_data[i].max_len; + cols[i].wType = in_data[i].type; + cols[i].bPrecision = in_data[i].precision; + cols[i].bScale = in_data[i].scale; + } + + hr = IRow_GetColumns(row, num_cols, cols); + IRow_Release(row); + + for(i = 0; i < num_cols; i++) + { + VariantInit(&out_data[i].v); + if(cols[i].dwStatus == DBSTATUS_S_OK) + { + V_VT(&out_data[i].v) = in_data[i].type; + memcpy(&V_I1(&out_data[i].v), cols[i].pData, cols[i].cbDataLen); + } + CoTaskMemFree(cols[i].pData); + out_data[i].data_len = cols[i].cbDataLen; + out_data[i].status = cols[i].dwStatus; + } + + CoTaskMemFree(cols); + + return hr; +} + +static HRESULT WINAPI server_GetSourceRowset(IWineRowServer* iface, REFIID riid, IUnknown **ppRowset, + HROW *phRow) +{ + server *This = impl_from_IWineRowServer(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI server_Open(IWineRowServer* iface, IUnknown *pUnkOuter, DBID *pColumnID, + REFGUID rguidColumnType, DWORD dwBindFlags, REFIID riid, + IUnknown **ppUnk) +{ + server *This = impl_from_IWineRowServer(iface); + + FIXME("(%p)->(%p, %p, %s, %08x, %s, %p): stub\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), + dwBindFlags, debugstr_guid(riid), ppUnk); + return E_NOTIMPL; +} + static const IWineRowServerVtbl server_vtbl = { server_QueryInterface, server_AddRef, server_Release, server_SetInnerUnk, - server_GetMarshal + server_GetMarshal, + server_GetColumns, + server_GetSourceRowset, + server_Open }; static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) @@ -231,10 +334,40 @@ static ULONG WINAPI row_Release(IRow *iface) static HRESULT WINAPI row_GetColumns(IRow* iface, DBORDINAL cColumns, DBCOLUMNACCESS rgColumns[]) { row_proxy *This = impl_from_IRow(iface); + DBORDINAL i; + wine_getcolumns_in *in_data; + wine_getcolumns_out *out_data; + HRESULT hr; - FIXME("(%p)->(%d, %p): stub\n", This, cColumns, rgColumns); + TRACE("(%p)->(%d, %p)\n", This, cColumns, rgColumns); - return E_NOTIMPL; + in_data = CoTaskMemAlloc(cColumns * sizeof(in_data[0])); + out_data = CoTaskMemAlloc(cColumns * sizeof(out_data[0])); + + for(i = 0; i < cColumns; i++) + { + TRACE("%d:\tdata %p data_len %d status %08x max_len %d type %04x\n", i, rgColumns[i].pData, + rgColumns[i].cbDataLen, rgColumns[i].dwStatus, rgColumns[i].cbMaxLen, rgColumns[i].wType); + in_data[i].columnid = rgColumns[i].columnid; + in_data[i].max_len = rgColumns[i].cbMaxLen; + in_data[i].type = rgColumns[i].wType; + in_data[i].precision = rgColumns[i].bPrecision; + in_data[i].scale = rgColumns[i].bScale; + } + + hr = IWineRowServer_GetColumns(This->server, cColumns, in_data, out_data); + + for(i = 0; i < cColumns; i++) + { + rgColumns[i].cbDataLen = out_data[i].data_len; + rgColumns[i].dwStatus = out_data[i].status; + if(rgColumns[i].dwStatus == DBSTATUS_S_OK) + memcpy(rgColumns[i].pData, &V_I1(&out_data[i].v), out_data[i].data_len); + } + + CoTaskMemFree(out_data); + CoTaskMemFree(in_data); + return hr; } static HRESULT WINAPI row_GetSourceRowset(IRow* iface, REFIID riid, IUnknown **ppRowset, diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index f6d6303..1242aee 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -30,6 +30,42 @@ interface IWineRowServer : IUnknown [local] HRESULT SetInnerUnk([in] IUnknown *unknown); [local] HRESULT GetMarshal([out] IMarshal **marshal); + + + /* IRow */ + +typedef struct +{ + DBID columnid; + DBLENGTH max_len; + DBTYPE type; + BYTE precision; + BYTE scale; +} wine_getcolumns_in; + +typedef struct +{ + VARIANT v; + DBLENGTH data_len; + DBSTATUS status; +} wine_getcolumns_out; + + HRESULT GetColumns([in] DBORDINAL num_cols, + [in, size_is(num_cols)] wine_getcolumns_in *in_data, + [out, size_is(num_cols)] wine_getcolumns_out *out_cols); + + HRESULT GetSourceRowset([in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppRowset, + [out] HROW *phRow); + + HRESULT Open([in, unique] IUnknown *pUnkOuter, + [in] DBID *pColumnID, + [in] REFGUID rguidColumnType, + [in] DWORD dwBindFlags, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppUnk); + + } [

1 0

Henri Verbeet : wined3d: Select the blitter during adapter initialization.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 7ff576bbabae44e97d7d38a56eef57acd8736997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff576bbabae44e97d7d38a56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:20 2010 +0100 wined3d: Select the blitter during adapter initialization. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 17 +++++++++++++---- dlls/wined3d/utils.c | 11 ----------- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 56e970d..bf5ad3c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6948,7 +6948,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, return hr; } - device->blitter = select_blit_implementation(adapter, device_type); + device->blitter = adapter->blitter; return WINED3D_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c9d3f90..e259375 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1655,6 +1655,17 @@ static const shader_backend_t *select_shader_backend(struct wined3d_adapter *ada return &none_shader_backend; } +static const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter) +{ + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); + if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) + && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_blit; + else return &ffp_blit; +} + /* Context activation is done by the caller. */ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { @@ -2095,6 +2106,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) adapter->fragment_pipe = select_fragment_implementation(adapter); adapter->shader_backend = select_shader_backend(adapter); + adapter->blitter = select_blit_implementation(adapter); /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment @@ -3231,8 +3243,6 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, const struct GlPixelFormatDesc *adapter_format_desc, WINED3DDEVTYPE DeviceType, const struct GlPixelFormatDesc *check_format_desc, WINED3DSURFTYPE SurfaceType) { - const struct blit_shader *blitter; - if(SurfaceType == SURFACE_GDI) { switch(check_format_desc->format) { @@ -3268,8 +3278,7 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, const struct if (CheckDepthStencilCapability(adapter, adapter_format_desc, check_format_desc)) return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ - blitter = select_blit_implementation(adapter, DeviceType); - if (blitter->color_fixup_supported(check_format_desc->color_fixup)) + if (adapter->blitter->color_fixup_supported(check_format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5e6da24..55872df 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2840,14 +2840,3 @@ void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, else if (gl_info->supported[ATI_FRAGMENT_SHADER]) *ps_selected = SHADER_ATI; else *ps_selected = SHADER_NONE; } - -const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); - if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) - && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_blit; - else return &ffp_blit; -} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fca1a9a..afc4511 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1365,6 +1365,7 @@ struct wined3d_adapter const struct fragment_pipeline *fragment_pipe; const shader_backend_t *shader_backend; + const struct blit_shader *blitter; }; BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; @@ -2569,8 +2570,6 @@ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; -const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, - WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) DECLSPEC_HIDDEN; typedef struct local_constant {

1 0

Henri Verbeet : wined3d: Preload textures before applying states.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 31d51fb1754d02514e28f2b8db6fbe8206834f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d51fb1754d02514e28f2b8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:21 2010 +0100 wined3d: Preload textures before applying states. --- dlls/wined3d/context.c | 1 + dlls/wined3d/device.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 1 - dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a3da14a..ffc105e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2214,6 +2214,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI } IWineD3DDeviceImpl_FindTexUnitMap(device); + device_preload_textures(device); ENTER_GL(); for (i = 0; i < context->numDirtyEntries; ++i) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bf5ad3c..0652172 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -370,6 +370,50 @@ void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info, } } +static void device_preload_texture(IWineD3DStateBlockImpl *stateblock, unsigned int idx) +{ + IWineD3DBaseTextureImpl *texture; + enum WINED3DSRGB srgb; + + if (!(texture = (IWineD3DBaseTextureImpl *)stateblock->textures[idx])) return; + srgb = stateblock->samplerState[idx][WINED3DSAMP_SRGBTEXTURE] ? SRGB_SRGB : SRGB_RGB; + texture->baseTexture.internal_preload((IWineD3DBaseTexture *)texture, srgb); +} + +void device_preload_textures(IWineD3DDeviceImpl *device) +{ + IWineD3DStateBlockImpl *stateblock = device->stateBlock; + unsigned int i; + + if (use_vs(stateblock)) + { + for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + { + if (((IWineD3DBaseShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.sampler_type[i]) + device_preload_texture(stateblock, MAX_FRAGMENT_SAMPLERS + i); + } + } + + if (use_ps(stateblock)) + { + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (((IWineD3DBaseShaderImpl *)stateblock->pixelShader)->baseShader.reg_maps.sampler_type[i]) + device_preload_texture(stateblock, i); + } + } + else + { + WORD ffu_map = device->fixed_function_usage_map; + + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (ffu_map & 1) + device_preload_texture(stateblock, i); + } + } +} + /********************************************************** * IUnknown parts follows **********************************************************/ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5384f3e..81f5386 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3527,7 +3527,6 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wine if(stateblock->textures[sampler]) { BOOL srgb = stateblock->samplerState[sampler][WINED3DSAMP_SRGBTEXTURE]; IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *) stateblock->textures[sampler]; - tex_impl->baseTexture.internal_preload(stateblock->textures[sampler], srgb ? SRGB_SRGB : SRGB_RGB); IWineD3DBaseTexture_BindTexture(stateblock->textures[sampler], srgb); basetexture_apply_state_changes(stateblock->textures[sampler], stateblock->textureState[sampler], stateblock->samplerState[sampler], gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index afc4511..17e2733 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1620,6 +1620,7 @@ struct IWineD3DDeviceImpl HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, IUnknown *parent, IWineD3DDeviceParent *device_parent) DECLSPEC_HIDDEN; +void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Update the stream info before applying states.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 040452ad90927aa8839b1f31a510b1b8a1afac1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=040452ad90927aa8839b1f31a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:22 2010 +0100 wined3d: Update the stream info before applying states. --- dlls/wined3d/context.c | 2 + dlls/wined3d/device.c | 72 +++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 84 ++-------------------------------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 78 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=040452ad90927aa8839b1…

1 0