March 2009 - Wine-commits - list.winehq.org

Huw Davies : ole32: Reimplement the formatetc enumerator using ' Ole Private Data'.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 969e5d7ee1e5b486e141be3146bf8781eed49c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969e5d7ee1e5b486e141be314… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 30 12:00:44 2009 +0100 ole32: Reimplement the formatetc enumerator using 'Ole Private Data'. --- dlls/ole32/clipboard.c | 189 ++++++++++++++++++++---------------------------- 1 files changed, 80 insertions(+), 109 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 9815749..66f620a 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -146,6 +146,22 @@ typedef struct /* then follows any DVTARGETDEVICE structures referenced in the FORMATETCs */ } ole_priv_data; +/* Create an empty data structure. The only thing that really matters + here is setting count and size members. This is used by the enumerator as a + convenience when there's an empty list. */ +static HRESULT create_empty_priv_data(ole_priv_data **data) +{ + ole_priv_data *ptr; + + *data = NULL; + ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(*ptr)); + if(!ptr) return E_OUTOFMEMORY; + ptr->size = sizeof(*ptr); + ptr->count = 0; + *data = ptr; + return S_OK; +} + /*---------------------------------------------------------------------* * Implementation of the internal IEnumFORMATETC interface returned by * the OLE clipboard's IDataObject. @@ -157,8 +173,7 @@ typedef struct enum_fmtetc LONG ref; UINT pos; /* current enumerator position */ - UINT countFmt; /* number of EnumFORMATETC's in array */ - LPFORMATETC pFmt; /* array of EnumFORMATETC's */ + ole_priv_data *data; } enum_fmtetc; static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) @@ -225,8 +240,8 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) if (!ref) { TRACE("() - destroying IEnumFORMATETC(%p)\n",This); - HeapFree(GetProcessHeap(), 0, This->pFmt); - HeapFree(GetProcessHeap(),0,This); + HeapFree(GetProcessHeap(), 0, This->data); + HeapFree(GetProcessHeap(), 0, This); } return ref; } @@ -240,22 +255,31 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next (LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed) { enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); - UINT cfetch; + UINT cfetch, i; HRESULT hres = S_FALSE; TRACE("(%p)->(pos=%u)\n", This, This->pos); - if (This->pos < This->countFmt) + if (This->pos < This->data->count) { - cfetch = This->countFmt - This->pos; + cfetch = This->data->count - This->pos; if (cfetch >= celt) { cfetch = celt; hres = S_OK; } - memcpy(rgelt, &This->pFmt[This->pos], cfetch * sizeof(FORMATETC)); - This->pos += cfetch; + for(i = 0; i < cfetch; i++) + { + rgelt[i] = This->data->entries[This->pos++].fmtetc; + if(rgelt[i].ptd) + { + DVTARGETDEVICE *target = (DVTARGETDEVICE *)((char *)This->data + (DWORD)rgelt[i].ptd); + rgelt[i].ptd = CoTaskMemAlloc(target->tdSize); + if(!rgelt[i].ptd) return E_OUTOFMEMORY; + memcpy(rgelt[i].ptd, target, target->tdSize); + } + } } else { @@ -281,9 +305,9 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULON TRACE("(%p)->(num=%u)\n", This, celt); This->pos += celt; - if (This->pos > This->countFmt) + if (This->pos > This->data->count) { - This->pos = This->countFmt; + This->pos = This->data->count; return S_FALSE; } return S_OK; @@ -303,7 +327,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) return S_OK; } -static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **obj); +static HRESULT enum_fmtetc_construct(ole_priv_data *data, UINT pos, IEnumFORMATETC **obj); /************************************************************************ * OLEClipbrd_IEnumFORMATETC_Clone (IEnumFORMATETC) @@ -311,19 +335,20 @@ static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFOR * Standard enumerator members for IEnumFORMATETC */ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone - (LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum) + (LPENUMFORMATETC iface, LPENUMFORMATETC* obj) { enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); - HRESULT hr = S_OK; + ole_priv_data *new_data; - TRACE("(%p)->(ppenum=%p)\n", This, ppenum); + TRACE("(%p)->(%p)\n", This, obj); - if ( !ppenum ) - return E_INVALIDARG; + if ( !obj ) return E_INVALIDARG; + *obj = NULL; - hr = enum_fmtetc_construct(This->countFmt, This->pFmt, ppenum); + new_data = HeapAlloc(GetProcessHeap(), 0, This->data->size); + if(!new_data) return E_OUTOFMEMORY; - return hr; + return enum_fmtetc_construct(new_data, This->pos, obj); } static const IEnumFORMATETCVtbl efvt = @@ -340,13 +365,11 @@ static const IEnumFORMATETCVtbl efvt = /************************************************************************ * enum_fmtetc_construct * - * Creates an IEnumFORMATETC enumerator from an array of FORMATETC - * Structures. + * Creates an IEnumFORMATETC enumerator from ole_priv_data which it then owns. */ -static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **obj) +static HRESULT enum_fmtetc_construct(ole_priv_data *data, UINT pos, IEnumFORMATETC **obj) { enum_fmtetc* ef; - DWORD size=cfmt * sizeof(FORMATETC); *obj = NULL; ef = HeapAlloc(GetProcessHeap(), 0, sizeof(*ef)); @@ -354,19 +377,10 @@ static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFOR ef->ref = 1; ef->lpVtbl = &efvt; + ef->data = data; + ef->pos = pos; - ef->pos = 0; - ef->countFmt = cfmt; - ef->pFmt = HeapAlloc(GetProcessHeap(), 0, size); - if (ef->pFmt) - memcpy(ef->pFmt, afmt, size); - else - { - HeapFree(GetProcessHeap(), 0, ef); - return E_OUTOFMEMORY; - } - - TRACE("(%p)->()\n",ef); + TRACE("(%p)->()\n", ef); *obj = (IEnumFORMATETC *)ef; return S_OK; } @@ -969,90 +983,47 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_SetData( static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc( IDataObject* iface, DWORD dwDirection, - IEnumFORMATETC** ppenumFormatEtc) + IEnumFORMATETC** enum_fmt) { - HRESULT hr = S_OK; - FORMATETC *afmt = NULL; - int cfmt, i; - UINT format; - BOOL bClipboardOpen; - ole_clipbrd *This = impl_from_IDataObject(iface); + HRESULT hr = S_OK; + ole_clipbrd *This = impl_from_IDataObject(iface); + HGLOBAL handle; + ole_priv_data *data = NULL; - TRACE("(%p, %x, %p)\n", iface, dwDirection, ppenumFormatEtc); + TRACE("(%p, %x, %p)\n", iface, dwDirection, enum_fmt); - /* - * If we have a data source placed on the clipboard (via OleSetClipboard) - * simply delegate to the source object's EnumFormatEtc - */ - if ( This->pIDataObjectSrc ) - { - return IDataObject_EnumFormatEtc(This->pIDataObjectSrc, - dwDirection, ppenumFormatEtc); - } + *enum_fmt = NULL; - /* - * Otherwise we must provide our own enumerator which wraps around the - * Windows clipboard function EnumClipboardFormats - */ - if ( !ppenumFormatEtc ) - return E_INVALIDARG; - - if ( dwDirection != DATADIR_GET ) /* IDataObject_SetData not implemented */ - return E_NOTIMPL; - - /* - * Store all current clipboard formats in an array of FORMATETC's, - * and create an IEnumFORMATETC enumerator from this list. - */ - cfmt = CountClipboardFormats(); - afmt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(FORMATETC) * cfmt); - /* - * Open the Windows clipboard, associating it with our hidden window - */ - if ( !(bClipboardOpen = OpenClipboard(This->hWndClipboard)) ) - HANDLE_ERROR( CLIPBRD_E_CANT_OPEN ); + if ( dwDirection != DATADIR_GET ) return E_NOTIMPL; + if ( !OpenClipboard(This->hWndClipboard) ) return CLIPBRD_E_CANT_OPEN; - /* - * Store all current clipboard formats in an array of FORMATETC's - * TODO: Handle TYMED_IStorage media which were put on the clipboard - * by copying the storage into global memory. We must convert this - * TYMED_HGLOBAL back to TYMED_IStorage. - */ - for (i = 0, format = 0; i < cfmt; i++) - { - format = EnumClipboardFormats(format); - if (!format) /* Failed! */ + handle = GetClipboardData( ole_priv_data_clipboard_format ); + if(handle) { - ERR("EnumClipboardFormats failed to return format!\n"); - HANDLE_ERROR( E_FAIL ); + ole_priv_data *src = GlobalLock(handle); + if(src) + { + /* FIXME: sanity check on size */ + data = HeapAlloc(GetProcessHeap(), 0, src->size); + if(!data) + { + GlobalUnlock(handle); + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(data, src, src->size); + GlobalUnlock(handle); + } } - /* Init the FORMATETC struct */ - afmt[i].cfFormat = format; - afmt[i].ptd = NULL; - afmt[i].dwAspect = DVASPECT_CONTENT; - afmt[i].lindex = -1; - afmt[i].tymed = TYMED_HGLOBAL; - } + if(!data) hr = create_empty_priv_data(&data); + if(FAILED(hr)) goto end; - hr = enum_fmtetc_construct( cfmt, afmt, ppenumFormatEtc ); - if (FAILED(hr)) - HANDLE_ERROR( hr ); + hr = enum_fmtetc_construct( data, 0, enum_fmt ); -CLEANUP: - /* - * Free the array of FORMATETC's - */ - HeapFree(GetProcessHeap(), 0, afmt); - - /* - * Close Windows clipboard - */ - if ( bClipboardOpen && !CloseClipboard() ) - hr = CLIPBRD_E_CANT_CLOSE; - - return hr; +end: + if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; + return hr; } /************************************************************************

1 0

Huw Davies : ole32/tests: Fix DVTARGETDEVICE offsets.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 89dcb968a33b3128bb3d574feb6fe32db47bb793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dcb968a33b3128bb3d574fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 30 12:05:25 2009 +0100 ole32/tests: Fix DVTARGETDEVICE offsets. --- dlls/ole32/tests/clipboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 47921af..0dfecb7 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -387,12 +387,12 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) dm.dmSize = sizeof(dm); dm.dmDriverExtra = 0; lstrcpyW(dm.dmDeviceName, devname); - obj->fmtetc[3].ptd = HeapAlloc(GetProcessHeap(), 0, sizeof(DVTARGETDEVICE) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra); - obj->fmtetc[3].ptd->tdSize = sizeof(DVTARGETDEVICE) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra; - obj->fmtetc[3].ptd->tdDriverNameOffset = sizeof(DVTARGETDEVICE); + obj->fmtetc[3].ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra); + obj->fmtetc[3].ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra; + obj->fmtetc[3].ptd->tdDriverNameOffset = FIELD_OFFSET(DVTARGETDEVICE, tdData); obj->fmtetc[3].ptd->tdDeviceNameOffset = 0; obj->fmtetc[3].ptd->tdPortNameOffset = 0; - obj->fmtetc[3].ptd->tdExtDevmodeOffset = sizeof(DVTARGETDEVICE) + sizeof(devname); + obj->fmtetc[3].ptd->tdExtDevmodeOffset = obj->fmtetc[3].ptd->tdDriverNameOffset + sizeof(devname); lstrcpyW((WCHAR*)obj->fmtetc[3].ptd->tdData, devname); memcpy(obj->fmtetc[3].ptd->tdData + sizeof(devname), &dm, dm.dmSize + dm.dmDriverExtra);

1 0

Huw Davies : ole32/tests: Tests for EnumFormatEtc.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 59501e037b741a4c049d7a222038c74f8ec9fd41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59501e037b741a4c049d7a222… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 30 12:08:51 2009 +0100 ole32/tests: Tests for EnumFormatEtc. --- dlls/ole32/tests/clipboard.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 0dfecb7..7e18549 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -61,6 +61,7 @@ typedef struct EnumFormatImpl { static BOOL expect_DataObjectImpl_QueryGetData = TRUE; static ULONG DataObjectImpl_GetData_calls = 0; +static ULONG DataObjectImpl_EnumFormatEtc_calls = 0; static UINT cf_stream, cf_storage, cf_another, cf_onemore; @@ -291,6 +292,8 @@ static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwD { DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl_EnumFormatEtc_calls++; + if(dwDirection != DATADIR_GET) { ok(0, "unexpected direction %d\n", dwDirection); return E_NOTIMPL; @@ -502,6 +505,61 @@ static void test_get_clipboard(void) IDataObject_Release(data_obj); } +static void test_enum_fmtetc(IDataObject *src) +{ + HRESULT hr; + IDataObject *data; + IEnumFORMATETC *enum_fmt, *src_enum; + FORMATETC fmt, src_fmt; + DWORD count = 0; + + hr = OleGetClipboard(&data); + ok(hr == S_OK, "OleGetClipboard failed with error 0x%08x\n", hr); + + hr = IDataObject_EnumFormatEtc(data, DATADIR_SET, &enum_fmt); + ok(hr == E_NOTIMPL, "got %08x\n", hr); + + DataObjectImpl_EnumFormatEtc_calls = 0; + hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt); + ok(hr == S_OK, "got %08x\n", hr); + ok(DataObjectImpl_EnumFormatEtc_calls == 0, "EnumFormatEtc was called\n"); + + if(src) IDataObject_EnumFormatEtc(src, DATADIR_GET, &src_enum); + + while((hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL)) == S_OK) + { + ok(src != NULL, "shouldn't be here\n"); + hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); + ok(hr == S_OK, "%d: got %08x\n", count, hr); + ok(fmt.cfFormat == src_fmt.cfFormat, "%d: %04x %04x\n", count, fmt.cfFormat, src_fmt.cfFormat); + ok(fmt.dwAspect == src_fmt.dwAspect, "%d: %08x %08x\n", count, fmt.dwAspect, src_fmt.dwAspect); + ok(fmt.lindex == src_fmt.lindex, "%d: %08x %08x\n", count, fmt.lindex, src_fmt.lindex); + ok(fmt.tymed == src_fmt.tymed, "%d: %08x %08x\n", count, fmt.tymed, src_fmt.tymed); + if(fmt.ptd) + { + ok(src_fmt.ptd != NULL, "%d: expected non-NULL\n", count); + CoTaskMemFree(fmt.ptd); + CoTaskMemFree(src_fmt.ptd); + } + count++; + } + + ok(hr == S_FALSE, "%d: got %08x\n", count, hr); + + if(src) + { + hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); + ok(hr == S_FALSE, "%d: got %08x\n", count, hr); + IEnumFORMATETC_Release(src_enum); + } + + hr = IEnumFORMATETC_Reset(enum_fmt); + ok(hr == S_OK, "got %08x\n", hr); + + IEnumFORMATETC_Release(enum_fmt); + IDataObject_Release(data); +} + static void test_cf_dataobject(IDataObject *data) { UINT cf = 0; @@ -718,9 +776,12 @@ static void test_set_clipboard(void) hr = OleSetClipboard(data_cmpl); ok(hr == S_OK, "failed to set clipboard to complex data, hr = 0x%08x\n", hr); test_cf_dataobject(data_cmpl); + test_enum_fmtetc(data_cmpl); ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); + test_enum_fmtetc(NULL); + ref = IDataObject_Release(data1); ok(ref == 0, "expected data1 ref=0, got %d\n", ref); ref = IDataObject_Release(data2);

1 0

Christian Costa : mciqtz32: Implement driver messages.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: e0574936dc8352833a933c1a9142a25896b6df9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0574936dc8352833a933c1a9… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Mar 29 23:50:26 2009 +0200 mciqtz32: Implement driver messages. --- dlls/mciqtz32/Makefile.in | 2 +- dlls/mciqtz32/mciqtz.c | 142 +++++++++++++++++++++++++++++++++++++++- dlls/mciqtz32/mciqtz_private.h | 28 ++++++++ 3 files changed, 169 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in index 1d136eb..8321d2d 100644 --- a/dlls/mciqtz32/Makefile.in +++ b/dlls/mciqtz32/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciqtz32.dll -IMPORTS = kernel32 +IMPORTS = winmm user32 kernel32 C_SRCS = \ mciqtz.c diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 6d272b5..786105a 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -21,11 +21,16 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "mmddk.h" #include "wine/debug.h" +#include "mciqtz_private.h" WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); +static DWORD MCIQTZ_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS); +static DWORD MCIQTZ_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); + /*======================================================================* * MCI QTZ implementation * *======================================================================*/ @@ -46,6 +51,120 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } +/************************************************************************** + * MCIQTZ_drvOpen [internal] + */ +static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) +{ + WINE_MCIQTZ* wma; + + TRACE("%s, %p\n", debugstr_w(str), modp); + + /* session instance */ + if (!modp) + return 0xFFFFFFFF; + + wma = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCIQTZ)); + if (!wma) + return 0; + + wma->wDevID = modp->wDeviceID; + mciSetDriverData(wma->wDevID, (DWORD_PTR)wma); + + return modp->wDeviceID; +} + +/************************************************************************** + * MCIQTZ_drvClose [internal] + */ +static DWORD MCIQTZ_drvClose(DWORD dwDevID) +{ + WINE_MCIQTZ* wma; + + TRACE("%04x\n", dwDevID); + + /* finish all outstanding things */ + MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); + + wma = (WINE_MCIQTZ*)mciGetDriverData(dwDevID); + + if (wma) { + HeapFree(GetProcessHeap(), 0, wma); + return 1; + } + + return (dwDevID == 0xFFFFFFFF) ? 1 : 0; +} + +/************************************************************************** + * MCIQTZ_drvConfigure [internal] + */ +static DWORD MCIQTZ_drvConfigure(DWORD dwDevID) +{ + WINE_MCIQTZ* wma; + + TRACE("%04x\n", dwDevID); + + MCIQTZ_mciStop(dwDevID, MCI_WAIT, NULL); + + wma = (WINE_MCIQTZ*)mciGetDriverData(dwDevID); + + if (wma) { + MessageBoxA(0, "Sample QTZ Wine Driver !", "MM-Wine Driver", MB_OK); + return 1; + } + + return 0; +} + +/************************************************************************** + * MCIQTZ_mciGetOpenDev [internal] + */ +static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) +{ + WINE_MCIQTZ* wma = (WINE_MCIQTZ*)mciGetDriverData(wDevID); + + if (!wma) { + WARN("Invalid wDevID=%u\n", wDevID); + return 0; + } + return wma; +} + +/*************************************************************************** + * MCIQTZ_mciClose [internal] + */ +static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + return 0; +} + +/*************************************************************************** + * MCIQTZ_mciStop [internal] + */ +static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + return 0; +} + /*======================================================================* * MCI QTZ entry points * *======================================================================*/ @@ -56,8 +175,27 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - FIXME("(%08lX, %p, %08X, %08lX, %08lX): Stub!\n", - dwDevID, hDriv, wMsg, dwParam1, dwParam2); + TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + dwDevID, hDriv, wMsg, dwParam1, dwParam2); + + switch (wMsg) { + case DRV_LOAD: return 1; + case DRV_FREE: return 1; + case DRV_OPEN: return MCIQTZ_drvOpen((LPCWSTR)dwParam1, (LPMCI_OPEN_DRIVER_PARMSW)dwParam2); + case DRV_CLOSE: return MCIQTZ_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; + case DRV_QUERYCONFIGURE: return 1; + case DRV_CONFIGURE: return MCIQTZ_drvConfigure(dwDevID); + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; + } + + /* session instance */ + if (dwDevID == 0xFFFFFFFF) + return 1; + + FIXME("Unsupported command [%u]\n", wMsg); return MCIERR_UNRECOGNIZED_COMMAND; } diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h new file mode 100644 index 0000000..4134d8d --- /dev/null +++ b/dlls/mciqtz32/mciqtz_private.h @@ -0,0 +1,28 @@ +/* + * DirectShow MCI Driver + * + * Copyright 2009 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_PRIVATE_MCIQTZ_H +#define __WINE_PRIVATE_MCIQTZ_H + +typedef struct { + MCIDEVICEID wDevID; +} WINE_MCIQTZ; + +#endif /* __WINE_PRIVATE_MCIQTZ_H */

1 0

Christian Costa : mciqtz32: Add basic play capability.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 893fc77332e7542189006ca4debc4e994ce297b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=893fc77332e7542189006ca4d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Mar 29 23:51:49 2009 +0200 mciqtz32: Add basic play capability. --- dlls/mciqtz32/Makefile.in | 2 +- dlls/mciqtz32/mciqtz.c | 170 +++++++++++++++++++++++++++++++++++++++- dlls/mciqtz32/mciqtz_private.h | 9 ++- 3 files changed, 178 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in index 8321d2d..9bac216 100644 --- a/dlls/mciqtz32/Makefile.in +++ b/dlls/mciqtz32/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciqtz32.dll -IMPORTS = winmm user32 kernel32 +IMPORTS = strmiids oleaut32 ole32 winmm user32 kernel32 C_SRCS = \ mciqtz.c diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 786105a..ea3a9f7 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -25,6 +25,7 @@ #include "mmddk.h" #include "wine/debug.h" #include "mciqtz_private.h" +#include "digitalv.h" WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); @@ -132,6 +133,73 @@ static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) } /*************************************************************************** + * MCIQTZ_mciOpen [internal] + */ +static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, + LPMCI_DGV_OPEN_PARMSW lpOpenParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); + + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + + if (!lpOpenParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = (WINE_MCIQTZ*)mciGetDriverData(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&wma->pgraph); + if (FAILED(hr)) { + TRACE("Cannot create filtergraph (hr = %x)\n", hr); + goto err; + } + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaControl, (LPVOID*)&wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot get IMediaControl interface (hr = %x)\n", hr); + goto err; + } + + if (!((dwFlags & MCI_OPEN_ELEMENT) && (dwFlags & MCI_OPEN_ELEMENT))) { + TRACE("Wrong dwFlags %x\n", dwFlags); + goto err; + } + + if (!lpOpenParms->lpstrElementName && !lstrlenW(lpOpenParms->lpstrElementName)) { + TRACE("Invalid filename specified\n"); + goto err; + } + + TRACE("Open file %s\n", debugstr_w(lpOpenParms->lpstrElementName)); + + hr = IGraphBuilder_RenderFile(wma->pgraph, lpOpenParms->lpstrElementName, NULL); + if (FAILED(hr)) { + TRACE("Cannot render file (hr = %x)\n", hr); + goto err; + } + + return 0; + +err: + if (wma->pgraph) + IGraphBuilder_Release(wma->pgraph); + wma->pgraph = NULL; + if (wma->pmctrl) + IMediaControl_Release(wma->pmctrl); + wma->pmctrl = NULL; + + CoUninitialize(); + + return MCIERR_INTERNAL; +} + +/*************************************************************************** * MCIQTZ_mciClose [internal] */ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) @@ -146,6 +214,41 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP if (!wma) return MCIERR_INVALID_DEVICE_ID; + if (wma->pgraph) + IGraphBuilder_Release(wma->pgraph); + wma->pgraph = NULL; + if (wma->pmctrl) + IMediaControl_Release(wma->pmctrl); + wma->pmctrl = NULL; + + CoUninitialize(); + + return 0; +} + +/*************************************************************************** + * MCIQTZ_mciPlay [internal] + */ +static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + + hr = IMediaControl_Run(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot run filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + wma->started = TRUE; + return 0; } @@ -155,6 +258,7 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { WINE_MCIQTZ* wma; + HRESULT hr; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -162,6 +266,17 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa if (!wma) return MCIERR_INVALID_DEVICE_ID; + if (!wma->started) + return 0; + + hr = IMediaControl_Stop(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot stop filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + wma->started = FALSE; + return 0; } @@ -195,7 +310,60 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, if (dwDevID == 0xFFFFFFFF) return 1; - FIXME("Unsupported command [%u]\n", wMsg); + switch (wMsg) { + case MCI_OPEN_DRIVER: return MCIQTZ_mciOpen (dwDevID, dwParam1, (LPMCI_DGV_OPEN_PARMSW) dwParam2); + case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); + case MCI_RECORD: + case MCI_STOP: + case MCI_SET: + case MCI_PAUSE: + case MCI_RESUME: + case MCI_STATUS: + case MCI_GETDEVCAPS: + case MCI_INFO: + case MCI_SEEK: + case MCI_PUT: + case MCI_WINDOW: + case MCI_LOAD: + case MCI_SAVE: + case MCI_FREEZE: + case MCI_REALIZE: + case MCI_UNFREEZE: + case MCI_UPDATE: + case MCI_WHERE: + case MCI_STEP: + case MCI_COPY: + case MCI_CUT: + case MCI_DELETE: + case MCI_PASTE: + case MCI_CUE: + /* Digital Video specific */ + case MCI_CAPTURE: + case MCI_MONITOR: + case MCI_RESERVE: + case MCI_SETAUDIO: + case MCI_SIGNAL: + case MCI_SETVIDEO: + case MCI_QUALITY: + case MCI_LIST: + case MCI_UNDO: + case MCI_CONFIGURE: + case MCI_RESTORE: + FIXME("Unimplemented command [%u]\n", wMsg); + break; + case MCI_SPIN: + case MCI_ESCAPE: + WARN("Unsupported command [%u]\n", wMsg); + break; + case MCI_OPEN: + case MCI_CLOSE: + FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n"); + break; + default: + TRACE("Sending msg [%u] to default driver proc\n", wMsg); + return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + } return MCIERR_UNRECOGNIZED_COMMAND; } diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 4134d8d..cbcece0 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -21,8 +21,15 @@ #ifndef __WINE_PRIVATE_MCIQTZ_H #define __WINE_PRIVATE_MCIQTZ_H +#define COBJMACROS + +#include "dshow.h" + typedef struct { - MCIDEVICEID wDevID; + MCIDEVICEID wDevID; + IGraphBuilder* pgraph; + IMediaControl* pmctrl; + BOOL started; } WINE_MCIQTZ; #endif /* __WINE_PRIVATE_MCIQTZ_H */

1 0

Huw Davies : ole32: AddRef does not return an HRESULT. Have the constructor create the object with one reference.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: fc78f552a0c5c0f5cccabf2939451c2f61900af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc78f552a0c5c0f5cccabf293… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 16:41:59 2009 +0000 ole32: AddRef does not return an HRESULT. Have the constructor create the object with one reference. --- dlls/ole32/clipboard.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 7d1bb26..9815749 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -322,13 +322,8 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone return E_INVALIDARG; hr = enum_fmtetc_construct(This->countFmt, This->pFmt, ppenum); - if (FAILED(hr)) return hr; - /* FIXME: This is wrong! */ - if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum))) - return ( hr ); - - return (*ppenum) ? S_OK : E_OUTOFMEMORY; + return hr; } static const IEnumFORMATETCVtbl efvt = @@ -347,7 +342,6 @@ static const IEnumFORMATETCVtbl efvt = * * Creates an IEnumFORMATETC enumerator from an array of FORMATETC * Structures. - * NOTE: this does not AddRef the interface. */ static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **obj) { @@ -358,7 +352,7 @@ static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFOR ef = HeapAlloc(GetProcessHeap(), 0, sizeof(*ef)); if (!ef) return E_OUTOFMEMORY; - ef->ref = 0; + ef->ref = 1; ef->lpVtbl = &efvt; ef->pos = 0; @@ -1046,12 +1040,6 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc( if (FAILED(hr)) HANDLE_ERROR( hr ); - /* FIXME: This is wrong! */ - if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenumFormatEtc))) - HANDLE_ERROR( hr ); - - hr = S_OK; - CLEANUP: /* * Free the array of FORMATETC's

1 0

Henri Verbeet : wined3d: Use the output slot when we have one.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 1205c33c90ed493fd26fc4bc102d55b8df28d9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1205c33c90ed493fd26fc4bc1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:54 2009 +0200 wined3d: Use the output slot when we have one. --- dlls/wined3d/device.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84f216a..5d3f400 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -250,7 +250,19 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, if (use_vshader) { - stride_used = vshader_get_input(This->stateBlock->vertexShader, element->usage, element->usage_idx, &idx); + if (element->output_slot == ~0U) + { + /* TODO: Assuming vertexdeclarations are usually used with the + * same or a similar shader, it might be worth it to store the + * last used output slot and try that one first. */ + stride_used = vshader_get_input(This->stateBlock->vertexShader, + element->usage, element->usage_idx, &idx); + } + else + { + idx = element->output_slot; + stride_used = TRUE; + } } else {

1 0

Henri Verbeet : d3d10core: Add a DXBC parser.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 7c3fa5d76d1de49842f791a94bf329182d7bc275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3fa5d76d1de49842f791a94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:54 2009 +0200 d3d10core: Add a DXBC parser. We may want to push this into either wined3d or our future shader compiler dll. It's not a whole lot of code though. --- dlls/d3d10core/d3d10core_private.h | 23 +++++++++++++ dlls/d3d10core/utils.c | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 9703821..ff723ba 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -34,6 +34,11 @@ #include "wine/wined3d.h" #include "wine/winedxgi.h" +#define MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ + ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') + /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); const char *debug_dxgi_format(DXGI_FORMAT format); @@ -41,6 +46,24 @@ const char *debug_dxgi_format(DXGI_FORMAT format); DXGI_FORMAT dxgi_format_from_wined3dformat(WINED3DFORMAT format); WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format); +static inline void read_dword(const char **ptr, DWORD *d) +{ + memcpy(d, *ptr, sizeof(*d)); + *ptr += sizeof(*d); +} + +void skip_dword_unknown(const char **ptr, unsigned int count); + +static inline void read_tag(const char **ptr, DWORD *t, char t_str[5]) +{ + read_dword(ptr, t); + memcpy(t_str, t, 4); + t_str[4] = '\0'; +} + +HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx); + /* IDirect3D10Device */ extern const struct ID3D10DeviceVtbl d3d10_device_vtbl; extern const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl; diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index b3e5fef..29f1e7a 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -344,3 +344,68 @@ WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format) return WINED3DFMT_UNKNOWN; } } + +void skip_dword_unknown(const char **ptr, unsigned int count) +{ + unsigned int i; + DWORD d; + + FIXME("Skipping %u unknown DWORDs:\n", count); + for (i = 0; i < count; ++i) + { + read_dword(ptr, &d); + FIXME("\t0x%08x\n", d); + } +} + +HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) +{ + const char *ptr = data; + HRESULT hr = S_OK; + DWORD chunk_count; + DWORD total_size; + char tag_str[5]; + unsigned int i; + DWORD tag; + + read_tag(&ptr, &tag, tag_str); + TRACE("tag: %s\n", tag_str); + + if (tag != TAG_DXBC) + { + WARN("Wrong tag.\n"); + return E_FAIL; + } + + /* checksum? */ + skip_dword_unknown(&ptr, 4); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &total_size); + TRACE("total size: %#x\n", total_size); + + read_dword(&ptr, &chunk_count); + TRACE("chunk count: %#x\n", chunk_count); + + for (i = 0; i < chunk_count; ++i) + { + DWORD chunk_tag, chunk_size; + const char *chunk_ptr; + DWORD chunk_offset; + + read_dword(&ptr, &chunk_offset); + TRACE("chunk %u at offset %#x\n", i, chunk_offset); + + chunk_ptr = data + chunk_offset; + + read_dword(&chunk_ptr, &chunk_tag); + read_dword(&chunk_ptr, &chunk_size); + + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); + if (FAILED(hr)) break; + } + + return hr; +}

1 0

Henri Verbeet : d3d10core: Create a vertex declaration from the input layout.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: ec0370a2d297e6436a4364d81c16c5ff86cc1684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0370a2d297e6436a4364d81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:55 2009 +0200 d3d10core: Create a vertex declaration from the input layout. --- dlls/d3d10core/d3d10core_private.h | 9 ++- dlls/d3d10core/device.c | 23 +++++- dlls/d3d10core/inputlayout.c | 139 ++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ff723ba..df9794f 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Henri Verbeet for CodeWeavers + * Copyright 2008-2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,7 @@ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); @@ -118,8 +119,14 @@ struct d3d10_input_layout { const struct ID3D10InputLayoutVtbl *vtbl; LONG refcount; + + IWineD3DVertexDeclaration *wined3d_decl; }; +HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, + UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, + WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count); + /* ID3D10VertexShader */ extern const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl; struct d3d10_vertex_shader diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7320f92..ff31b53 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Henri Verbeet for CodeWeavers + * Copyright 2008-2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -909,10 +909,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, ID3D10InputLayout **input_layout) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_input_layout *object; + WINED3DVERTEXELEMENT *wined3d_elements; + UINT wined3d_element_count; + HRESULT hr; - FIXME("iface %p, element_descs %p, element_count %u, shader_byte_code %p," - "\tshader_byte_code_length %lu, input_layout %p stub!\n", + TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p," + "\tshader_byte_code_length %lu, input_layout %p\n", iface, element_descs, element_count, shader_byte_code, shader_byte_code_length, input_layout); @@ -926,6 +930,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if object->vtbl = &d3d10_input_layout_vtbl; object->refcount = 1; + hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, + shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + IWineD3DDevice_CreateVertexDeclaration(This->wined3d_device, &object->wined3d_decl, + (IUnknown *)object, wined3d_elements, wined3d_element_count); + + HeapFree(GetProcessHeap(), 0, wined3d_elements); + *input_layout = (ID3D10InputLayout *)object; return S_OK; diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index 034a642..d78ecad 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -24,6 +24,144 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +struct input_signature_element +{ + const char *semantic_name; + UINT semantic_idx; + DWORD unknown; /* system value semantic? */ + DWORD component_type; + UINT register_idx; + DWORD mask; +}; + +struct input_signature +{ + struct input_signature_element *elements; + UINT element_count; +}; + +static HRESULT parse_isgn(const char *data, struct input_signature *is) +{ + struct input_signature_element *e; + const char *ptr = data; + unsigned int i; + DWORD count; + + read_dword(&ptr, &count); + TRACE("%u elements\n", count); + + skip_dword_unknown(&ptr, 1); + + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); + if (!e) + { + ERR("Failed to allocate input signature memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; ++i) + { + UINT name_offset; + + read_dword(&ptr, &name_offset); + e[i].semantic_name = data + name_offset; + read_dword(&ptr, &e[i].semantic_idx); + read_dword(&ptr, &e[i].unknown); + read_dword(&ptr, &e[i].component_type); + read_dword(&ptr, &e[i].register_idx); + read_dword(&ptr, &e[i].mask); + + TRACE("semantic: %s, semantic idx: %u, unknown %#x, type %u, register idx: %u, use_mask %#x, input_mask %#x\n", + e[i].semantic_name, e[i].semantic_idx, e[i].unknown, e[i].component_type, + e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); + } + + is->elements = e; + is->element_count = count; + + return S_OK; +} + +static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) +{ + struct input_signature *is = ctx; + const char *ptr = data; + char tag_str[5]; + + switch(tag) + { + case TAG_ISGN: + return parse_isgn(ptr, is); + + default: + memcpy(tag_str, &tag, 4); + tag_str[4] = '\0'; + FIXME("Unhandled chunk %s\n", tag_str); + return S_OK; + } +} + +HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, + UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, + WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count) +{ + struct input_signature is; + HRESULT hr; + UINT i; + + hr = parse_dxbc(shader_byte_code, shader_byte_code_length, isgn_handler, &is); + if (FAILED(hr)) + { + ERR("Failed to parse input signature.\n"); + return E_FAIL; + } + + *wined3d_elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(**wined3d_elements)); + if (!*wined3d_elements) + { + ERR("Failed to allocate wined3d vertex element array memory.\n"); + HeapFree(GetProcessHeap(), 0, is.elements); + return E_OUTOFMEMORY; + } + *wined3d_element_count = 0; + + for (i = 0; i < element_count; ++i) + { + UINT j; + + for (j = 0; j < is.element_count; ++j) + { + if (!strcmp(element_descs[i].SemanticName, is.elements[j].semantic_name) + && element_descs[i].SemanticIndex == is.elements[j].semantic_idx) + { + WINED3DVERTEXELEMENT *e = &(*wined3d_elements)[(*wined3d_element_count)++]; + const D3D10_INPUT_ELEMENT_DESC *f = &element_descs[i]; + + e->format = wined3dformat_from_dxgi_format(f->Format); + e->input_slot = f->InputSlot; + e->offset = f->AlignedByteOffset; + e->output_slot = is.elements[j].register_idx; + e->method = WINED3DDECLMETHOD_DEFAULT; + e->usage = 0; + e->usage_idx = 0; + + if (f->AlignedByteOffset == D3D10_APPEND_ALIGNED_ELEMENT) + FIXME("D3D10_APPEND_ALIGNED_ELEMENT not supported\n"); + if (f->InputSlotClass != D3D10_INPUT_PER_VERTEX_DATA) + FIXME("Ignoring input slot class (%#x)\n", f->InputSlotClass); + if (f->InstanceDataStepRate) + FIXME("Ignoring instace data step rate (%#x)\n", f->InstanceDataStepRate); + + break; + } + } + } + + HeapFree(GetProcessHeap(), 0, is.elements); + + return S_OK; +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLayout *iface, @@ -65,6 +203,7 @@ static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *ifa if (!refcount) { + IWineD3DVertexDeclaration_Release(This->wined3d_decl); HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : bcrypt: Add a mostly empty bcrypt.dll.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 5c8985002f76928cea3be36f1586e5209921ba71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8985002f76928cea3be36f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 11:24:55 2009 +0200 bcrypt: Add a mostly empty bcrypt.dll. This is the "Cryptography API: Next Generation" introduced by Vista. --- configure | 9 +++++++ configure.ac | 1 + dlls/bcrypt/Makefile.in | 15 +++++++++++ dlls/bcrypt/bcrypt.spec | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++++++++++++++++ dlls/bcrypt/version.rc | 26 ++++++++++++++++++++ 6 files changed, 149 insertions(+), 0 deletions(-) diff --git a/configure b/configure index eb66b54..7812661 100755 --- a/configure +++ b/configure @@ -24413,6 +24413,14 @@ dlls/avifile.dll16/Makefile: dlls/avifile.dll16/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/avifile.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/bcrypt/Makefile" +test "x$enable_bcrypt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + bcrypt" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/bcrypt/Makefile: dlls/bcrypt/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/bcrypt/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/browseui/Makefile" test "x$enable_browseui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ browseui" @@ -28883,6 +28891,7 @@ do "dlls/avicap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avicap32/Makefile" ;; "dlls/avifil32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifil32/Makefile" ;; "dlls/avifile.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifile.dll16/Makefile" ;; + "dlls/bcrypt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/bcrypt/Makefile" ;; "dlls/browseui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/browseui/Makefile" ;; "dlls/browseui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/browseui/tests/Makefile" ;; "dlls/cabinet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cabinet/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9c90bff..c33980f 100644 --- a/configure.ac +++ b/configure.ac @@ -1883,6 +1883,7 @@ WINE_CONFIG_MAKEFILE([dlls/authz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_ WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avifile.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) +WINE_CONFIG_MAKEFILE([dlls/bcrypt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/cabinet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in new file mode 100644 index 0000000..ec26227 --- /dev/null +++ b/dlls/bcrypt/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = bcrypt.dll +IMPORTS = kernel32 + +C_SRCS = \ + bcrypt_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec new file mode 100644 index 0000000..7d85e12 --- /dev/null +++ b/dlls/bcrypt/bcrypt.spec @@ -0,0 +1,58 @@ +@ stub BCryptAddContextFunction +@ stub BCryptAddContextFunctionProvider +@ stub BCryptCloseAlgorithmProvider +@ stub BCryptConfigureContext +@ stub BCryptConfigureContextFunction +@ stub BCryptCreateContext +@ stub BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeleteContext +@ stub BCryptDeriveKey +@ stub BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stub BCryptEnumAlgorithms +@ stub BCryptEnumContextFunctionProviders +@ stub BCryptEnumContextFunctions +@ stub BCryptEnumContexts +@ stub BCryptEnumProviders +@ stub BCryptEnumRegisteredProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stub BCryptFinishHash +@ stub BCryptFreeBuffer +@ stub BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stub BCryptGetFipsAlgorithmMode +@ stub BCryptGetProperty +@ stub BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptOpenAlgorithmProvider +@ stub BCryptQueryContextConfiguration +@ stub BCryptQueryContextFunctionConfiguration +@ stub BCryptQueryContextFunctionProperty +@ stub BCryptQueryProviderRegistration +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptRegisterProvider +@ stub BCryptRemoveContextFunction +@ stub BCryptRemoveContextFunctionProvider +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetAuditingInterface +@ stub BCryptSetContextFunctionProperty +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptUnregisterProvider +@ stub BCryptVerifySignature +@ stub GetAsymmetricEncryptionInterface +@ stub GetCipherInterface +@ stub GetHashInterface +@ stub GetRngInterface +@ stub GetSecretAgreementInterface +@ stub GetSignatureInterface diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c new file mode 100644 index 0000000..abe9750 --- /dev/null +++ b/dlls/bcrypt/bcrypt_main.c @@ -0,0 +1,40 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#include "winbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("fdwReason %u\n", fdwReason); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} diff --git a/dlls/bcrypt/version.rc b/dlls/bcrypt/version.rc new file mode 100644 index 0000000..54253a9 --- /dev/null +++ b/dlls/bcrypt/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Crypto Library" +#define WINE_FILENAME_STR "bcrypt.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc"

1 0