wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

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

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

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

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: 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: 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

Huw Davies : ole32: Change the enum formatetc constructor to return HRESULT .
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 25f1b058a8f8440bd7f9387590ffa49fcbb92c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f1b058a8f8440bd7f938759… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 16:38:57 2009 +0000 ole32: Change the enum formatetc constructor to return HRESULT. --- dlls/ole32/clipboard.c | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index f973d2e..7d1bb26 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -303,7 +303,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) return S_OK; } -static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]); +static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **obj); /************************************************************************ * OLEClipbrd_IEnumFORMATETC_Clone (IEnumFORMATETC) @@ -321,8 +321,8 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone if ( !ppenum ) return E_INVALIDARG; - *ppenum = OLEClipbrd_IEnumFORMATETC_Construct(This->countFmt, - This->pFmt); + hr = enum_fmtetc_construct(This->countFmt, This->pFmt, ppenum); + if (FAILED(hr)) return hr; /* FIXME: This is wrong! */ if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum))) @@ -343,21 +343,20 @@ static const IEnumFORMATETCVtbl efvt = }; /************************************************************************ - * OLEClipbrd_IEnumFORMATETC_Construct + * enum_fmtetc_construct * * Creates an IEnumFORMATETC enumerator from an array of FORMATETC * Structures. * NOTE: this does not AddRef the interface. */ - -static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]) +static HRESULT enum_fmtetc_construct(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **obj) { enum_fmtetc* ef; DWORD size=cfmt * sizeof(FORMATETC); + *obj = NULL; ef = HeapAlloc(GetProcessHeap(), 0, sizeof(*ef)); - if (!ef) - return NULL; + if (!ef) return E_OUTOFMEMORY; ef->ref = 0; ef->lpVtbl = &efvt; @@ -370,11 +369,12 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM else { HeapFree(GetProcessHeap(), 0, ef); - return NULL; + return E_OUTOFMEMORY; } TRACE("(%p)->()\n",ef); - return (LPENUMFORMATETC)ef; + *obj = (IEnumFORMATETC *)ef; + return S_OK; } /*********************************************************************** @@ -1042,14 +1042,11 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc( afmt[i].tymed = TYMED_HGLOBAL; } - /* - * Create an EnumFORMATETC enumerator and return an - * EnumFORMATETC after bumping up its ref count - */ - *ppenumFormatEtc = OLEClipbrd_IEnumFORMATETC_Construct( cfmt, afmt ); - if (!(*ppenumFormatEtc)) - HANDLE_ERROR( E_OUTOFMEMORY ); + hr = enum_fmtetc_construct( cfmt, afmt, ppenumFormatEtc ); + if (FAILED(hr)) + HANDLE_ERROR( hr ); + /* FIXME: This is wrong! */ if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenumFormatEtc))) HANDLE_ERROR( hr );

1 0

Huw Davies : ole32: Don't hold a reference on the parent IDataObject.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 1cc023c53afc2ec468b3b52a9d9b7caa93178ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc023c53afc2ec468b3b52a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 16:25:37 2009 +0000 ole32: Don't hold a reference on the parent IDataObject. --- dlls/ole32/clipboard.c | 34 ++++++---------------------------- 1 files changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 6da8c34..f973d2e 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -159,13 +159,6 @@ typedef struct enum_fmtetc UINT pos; /* current enumerator position */ UINT countFmt; /* number of EnumFORMATETC's in array */ LPFORMATETC pFmt; /* array of EnumFORMATETC's */ - - - /* - * IUnknown implementation of the parent data object. - */ - IUnknown* pUnkDataObj; - } enum_fmtetc; static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) @@ -207,20 +200,12 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface /************************************************************************ * OLEClipbrd_IEnumFORMATETC_AddRef (IUnknown) * - * Since enumerating formats only makes sense when our data object is around, - * we insure that it stays as long as we stay by calling our parents IUnknown - * for AddRef and Release. But since we are not controlled by the lifetime of - * the outer object, we still keep our own reference count in order to - * free ourselves. */ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) { enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(count=%u)\n",This, This->ref); - if (This->pUnkDataObj) - IUnknown_AddRef(This->pUnkDataObj); - return InterlockedIncrement(&This->ref); } @@ -236,9 +221,6 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) TRACE("(%p)->(count=%u)\n",This, This->ref); - if (This->pUnkDataObj) - IUnknown_Release(This->pUnkDataObj); /* Release parent data object */ - ref = InterlockedDecrement(&This->ref); if (!ref) { @@ -321,8 +303,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) return S_OK; } -static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[], - LPUNKNOWN pUnkDataObj); +static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]); /************************************************************************ * OLEClipbrd_IEnumFORMATETC_Clone (IEnumFORMATETC) @@ -341,8 +322,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone return E_INVALIDARG; *ppenum = OLEClipbrd_IEnumFORMATETC_Construct(This->countFmt, - This->pFmt, - This->pUnkDataObj); + This->pFmt); /* FIXME: This is wrong! */ if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum))) @@ -363,15 +343,14 @@ static const IEnumFORMATETCVtbl efvt = }; /************************************************************************ - * OLEClipbrd_IEnumFORMATETC_Construct (UINT, const FORMATETC, LPUNKNOWN) + * OLEClipbrd_IEnumFORMATETC_Construct * * Creates an IEnumFORMATETC enumerator from an array of FORMATETC - * Structures. pUnkOuter is the outer unknown for reference counting only. + * Structures. * NOTE: this does not AddRef the interface. */ -static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[], - LPUNKNOWN pUnkDataObj) +static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[]) { enum_fmtetc* ef; DWORD size=cfmt * sizeof(FORMATETC); @@ -382,7 +361,6 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM ef->ref = 0; ef->lpVtbl = &efvt; - ef->pUnkDataObj = pUnkDataObj; ef->pos = 0; ef->countFmt = cfmt; @@ -1068,7 +1046,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc( * Create an EnumFORMATETC enumerator and return an * EnumFORMATETC after bumping up its ref count */ - *ppenumFormatEtc = OLEClipbrd_IEnumFORMATETC_Construct( cfmt, afmt, (LPUNKNOWN)iface); + *ppenumFormatEtc = OLEClipbrd_IEnumFORMATETC_Construct( cfmt, afmt ); if (!(*ppenumFormatEtc)) HANDLE_ERROR( E_OUTOFMEMORY );

1 0

Huw Davies : ole32: Rename a variable.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 1213964330f87c8d6fc315ac7034990bdf8673c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1213964330f87c8d6fc315ac7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 16:20:18 2009 +0000 ole32: Rename a variable. --- dlls/ole32/clipboard.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a571412..6da8c34 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -156,7 +156,7 @@ typedef struct enum_fmtetc const IEnumFORMATETCVtbl *lpVtbl; LONG ref; - UINT posFmt; /* current enumerator position */ + UINT pos; /* current enumerator position */ UINT countFmt; /* number of EnumFORMATETC's in array */ LPFORMATETC pFmt; /* array of EnumFORMATETC's */ @@ -261,19 +261,19 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next UINT cfetch; HRESULT hres = S_FALSE; - TRACE("(%p)->(pos=%u)\n", This, This->posFmt); + TRACE("(%p)->(pos=%u)\n", This, This->pos); - if (This->posFmt < This->countFmt) + if (This->pos < This->countFmt) { - cfetch = This->countFmt - This->posFmt; + cfetch = This->countFmt - This->pos; if (cfetch >= celt) { cfetch = celt; hres = S_OK; } - memcpy(rgelt, &This->pFmt[This->posFmt], cfetch * sizeof(FORMATETC)); - This->posFmt += cfetch; + memcpy(rgelt, &This->pFmt[This->pos], cfetch * sizeof(FORMATETC)); + This->pos += cfetch; } else { @@ -298,10 +298,10 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULON enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(num=%u)\n", This, celt); - This->posFmt += celt; - if (This->posFmt > This->countFmt) + This->pos += celt; + if (This->pos > This->countFmt) { - This->posFmt = This->countFmt; + This->pos = This->countFmt; return S_FALSE; } return S_OK; @@ -317,7 +317,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->()\n", This); - This->posFmt = 0; + This->pos = 0; return S_OK; } @@ -344,6 +344,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone This->pFmt, This->pUnkDataObj); + /* FIXME: This is wrong! */ if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum))) return ( hr ); @@ -383,7 +384,7 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM ef->lpVtbl = &efvt; ef->pUnkDataObj = pUnkDataObj; - ef->posFmt = 0; + ef->pos = 0; ef->countFmt = cfmt; ef->pFmt = HeapAlloc(GetProcessHeap(), 0, size); if (ef->pFmt)

1 0

Huw Davies : ole32: Use a helper function to access the enum format implementation.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: d93688a721ea2ff0105233893f7d79b2d5b1093d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93688a721ea2ff0105233893… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 15:42:13 2009 +0000 ole32: Use a helper function to access the enum format implementation. --- dlls/ole32/clipboard.c | 75 +++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 5dbcca8..a571412 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -105,32 +105,6 @@ static inline ole_clipbrd *impl_from_IDataObject(IDataObject *iface) return (ole_clipbrd*)((char*)iface - FIELD_OFFSET(ole_clipbrd, lpvtbl)); } -/**************************************************************************** -* IEnumFORMATETC implementation -* DO NOT add any members before the VTables declaration! -*/ -typedef struct -{ - /* IEnumFORMATETC VTable */ - const IEnumFORMATETCVtbl *lpVtbl; - - /* IEnumFORMATETC fields */ - UINT posFmt; /* current enumerator position */ - UINT countFmt; /* number of EnumFORMATETC's in array */ - LPFORMATETC pFmt; /* array of EnumFORMATETC's */ - - /* - * Reference count of this object - */ - LONG ref; - - /* - * IUnknown implementation of the parent data object. - */ - IUnknown* pUnkDataObj; - -} IEnumFORMATETCImpl; - typedef struct PresentationDataHeader { BYTE unknown1[28]; @@ -177,6 +151,28 @@ typedef struct * the OLE clipboard's IDataObject. *---------------------------------------------------------------------*/ +typedef struct enum_fmtetc +{ + const IEnumFORMATETCVtbl *lpVtbl; + LONG ref; + + UINT posFmt; /* current enumerator position */ + UINT countFmt; /* number of EnumFORMATETC's in array */ + LPFORMATETC pFmt; /* array of EnumFORMATETC's */ + + + /* + * IUnknown implementation of the parent data object. + */ + IUnknown* pUnkDataObj; + +} enum_fmtetc; + +static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) +{ + return (enum_fmtetc*)((char*)iface - FIELD_OFFSET(enum_fmtetc, lpVtbl)); +} + /************************************************************************ * OLEClipbrd_IEnumFORMATETC_QueryInterface (IUnknown) * @@ -185,21 +181,16 @@ typedef struct static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface (LPENUMFORMATETC iface, REFIID riid, LPVOID* ppvObj) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); - TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); - - /* - * Since enumerators are separate objects from the parent data object - * we only need to support the IUnknown and IEnumFORMATETC interfaces - */ + TRACE("(%p)->(IID: %s, %p)\n", This, debugstr_guid(riid), ppvObj); *ppvObj = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumFORMATETC)) { - *ppvObj = This; + *ppvObj = iface; } if(*ppvObj) @@ -224,7 +215,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface */ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(count=%u)\n",This, This->ref); if (This->pUnkDataObj) @@ -240,7 +231,7 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) */ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); ULONG ref; TRACE("(%p)->(count=%u)\n",This, This->ref); @@ -266,7 +257,7 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next (LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); UINT cfetch; HRESULT hres = S_FALSE; @@ -304,7 +295,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next */ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULONG celt) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(num=%u)\n", This, celt); This->posFmt += celt; @@ -323,7 +314,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULON */ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->()\n", This); This->posFmt = 0; @@ -341,7 +332,7 @@ static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORM static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone (LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); HRESULT hr = S_OK; TRACE("(%p)->(ppenum=%p)\n", This, ppenum); @@ -381,10 +372,10 @@ static const IEnumFORMATETCVtbl efvt = static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[], LPUNKNOWN pUnkDataObj) { - IEnumFORMATETCImpl* ef; + enum_fmtetc* ef; DWORD size=cfmt * sizeof(FORMATETC); - ef = HeapAlloc(GetProcessHeap(), 0, sizeof(IEnumFORMATETCImpl)); + ef = HeapAlloc(GetProcessHeap(), 0, sizeof(*ef)); if (!ef) return NULL;

1 0

← Newer
1
2
3
4
5
6
7
8
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009