January 2011 - Wine-commits

Alexandre Julliard : winebuild: Don't remove stdcall decorations on non-x86 .
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: a5decb5444b3f371528aa40a67e3734375748c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5decb5444b3f371528aa40a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 17:39:45 2011 +0100 winebuild: Don't remove stdcall decorations on non-x86. --- tools/winebuild/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1dbb6d6..9aadf14 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -664,6 +664,7 @@ int remove_stdcall_decoration( char *name ) { char *p, *end = strrchr( name, '@' ); if (!end || !end[1] || end == name) return -1; + if (target_cpu != CPU_x86) return -1; /* make sure all the rest is digits */ for (p = end + 1; *p; p++) if (!isdigit(*p)) return -1; *end = 0;

1 0

Charles Davis : winecoreaudio: Fix deprecation warnings in audio.c.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 94d1e8ec7faaf97a4863ff3d21cb385ed2aea548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d1e8ec7faaf97a4863ff3d2… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Jan 29 16:42:25 2011 -0700 winecoreaudio: Fix deprecation warnings in audio.c. --- dlls/winecoreaudio.drv/audio.c | 52 ++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index cf876ff..ded830d 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -486,27 +486,44 @@ BOOL CoreAudio_GetDevCaps (void) OSStatus status; UInt32 propertySize; AudioDeviceID devId = CoreAudio_DefaultDevice.outputDeviceID; + AudioObjectPropertyAddress propertyAddress; - char name[MAXPNAMELEN]; + CFStringRef name; + CFRange range; - propertySize = MAXPNAMELEN; - status = AudioDeviceGetProperty(devId, 0 , FALSE, kAudioDevicePropertyDeviceName, &propertySize, name); + propertySize = sizeof(name); + propertyAddress.mSelector = kAudioObjectPropertyName; + propertyAddress.mScope = kAudioDevicePropertyScopeOutput; + propertyAddress.mElement = kAudioObjectPropertyElementMaster; + status = AudioObjectGetPropertyData(devId, &propertyAddress, 0, NULL, &propertySize, &name); if (status) { - ERR("AudioHardwareGetProperty for kAudioDevicePropertyDeviceName return %s\n", wine_dbgstr_fourcc(status)); + ERR("AudioObjectGetPropertyData for kAudioObjectPropertyName return %s\n", wine_dbgstr_fourcc(status)); return FALSE; } - memcpy(CoreAudio_DefaultDevice.ds_desc.szDesc, name, sizeof(name)); + CFStringGetCString(name, CoreAudio_DefaultDevice.ds_desc.szDesc, + sizeof(CoreAudio_DefaultDevice.ds_desc.szDesc), + kCFStringEncodingUTF8); strcpy(CoreAudio_DefaultDevice.ds_desc.szDrvname, "winecoreaudio.drv"); - MultiByteToWideChar(CP_UNIXCP, 0, name, sizeof(name), - CoreAudio_DefaultDevice.out_caps.szPname, - sizeof(CoreAudio_DefaultDevice.out_caps.szPname) / sizeof(WCHAR)); - memcpy(CoreAudio_DefaultDevice.dev_name, name, 32); + range = CFRangeMake(0, min(sizeof(CoreAudio_DefaultDevice.out_caps.szPname) / sizeof(WCHAR) - 1, CFStringGetLength(name))); + CFStringGetCharacters(name, range, CoreAudio_DefaultDevice.out_caps.szPname); + CoreAudio_DefaultDevice.out_caps.szPname[range.length] = 0; + CFStringGetCString(name, CoreAudio_DefaultDevice.dev_name, 32, kCFStringEncodingUTF8); + CFRelease(name); propertySize = sizeof(CoreAudio_DefaultDevice.streamDescription); - status = AudioDeviceGetProperty(devId, 0, FALSE , kAudioDevicePropertyStreamFormat, &propertySize, &CoreAudio_DefaultDevice.streamDescription); + /* FIXME: kAudioDevicePropertyStreamFormat is deprecated. We're + * "supposed" to get an AudioStream object from the AudioDevice, + * then query it for the format with kAudioStreamPropertyVirtualFormat. + * Apple says that this is for our own good, because this property + * "has been shown to lead to programming mistakes by clients when + * working with devices with multiple streams." Only one problem: + * which stream? For now, just query the device. + */ + propertyAddress.mSelector = kAudioDevicePropertyStreamFormat; + status = AudioObjectGetPropertyData(devId, &propertyAddress, 0, NULL, &propertySize, &CoreAudio_DefaultDevice.streamDescription); if (status != noErr) { - ERR("AudioHardwareGetProperty for kAudioDevicePropertyStreamFormat return %s\n", wine_dbgstr_fourcc(status)); + ERR("AudioObjectGetPropertyData for kAudioDevicePropertyStreamFormat return %s\n", wine_dbgstr_fourcc(status)); return FALSE; } @@ -549,6 +566,7 @@ LONG CoreAudio_WaveInit(void) { OSStatus status; UInt32 propertySize; + AudioObjectPropertyAddress propertyAddress; int i; CFStringRef messageThreadPortName; CFMessagePortRef port_ReceiveInMessageThread; @@ -557,19 +575,23 @@ LONG CoreAudio_WaveInit(void) TRACE("()\n"); /* number of sound cards */ - AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, &propertySize, NULL); + propertyAddress.mSelector = kAudioHardwarePropertyDevices; + propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; + propertyAddress.mElement = kAudioObjectPropertyElementMaster; + AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propertySize); propertySize /= sizeof(AudioDeviceID); TRACE("sound cards : %lu\n", propertySize); /* Get the output device */ propertySize = sizeof(CoreAudio_DefaultDevice.outputDeviceID); - status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propertySize, &CoreAudio_DefaultDevice.outputDeviceID); + propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice; + status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propertySize, &CoreAudio_DefaultDevice.outputDeviceID); if (status) { - ERR("AudioHardwareGetProperty return %s for kAudioHardwarePropertyDefaultOutputDevice\n", wine_dbgstr_fourcc(status)); + ERR("AudioObjectGetPropertyData return %s for kAudioHardwarePropertyDefaultOutputDevice\n", wine_dbgstr_fourcc(status)); return DRV_FAILURE; } if (CoreAudio_DefaultDevice.outputDeviceID == kAudioDeviceUnknown) { - ERR("AudioHardwareGetProperty: CoreAudio_DefaultDevice.outputDeviceID == kAudioDeviceUnknown\n"); + ERR("AudioObjectGetPropertyData: CoreAudio_DefaultDevice.outputDeviceID == kAudioDeviceUnknown\n"); return DRV_FAILURE; }

1 0

Charles Davis : winecoreaudio: Fix deprecation warnings in mixer.c.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 8c6353ea7ed5f740cea72c94fb8edfb964acbf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6353ea7ed5f740cea72c94f… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Jan 29 16:44:24 2011 -0700 winecoreaudio: Fix deprecation warnings in mixer.c. --- dlls/winecoreaudio.drv/mixer.c | 97 +++++++++++++++++++++++++++------------- 1 files changed, 66 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c6353ea7ed5f740cea72…

1 0

Alexander Scott-Johns : user32: Partially fix clipboard viewer infinite recursion bug.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 6c6b15f2d4c929f2e74837d7d424d130bdc400a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6b15f2d4c929f2e74837d7d… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jan 25 22:38:49 2011 +0000 user32: Partially fix clipboard viewer infinite recursion bug. --- dlls/user32/clipboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 99733c3..7b84686 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -291,7 +291,7 @@ BOOL WINAPI CloseClipboard(void) { BOOL bRet = FALSE; - TRACE("(%d)\n", bCBHasChanged); + TRACE("() Changed=%d\n", bCBHasChanged); if (CLIPBOARD_CloseClipboard()) { @@ -301,10 +301,10 @@ BOOL WINAPI CloseClipboard(void) USER_Driver->pEndClipboardUpdate(); + bCBHasChanged = FALSE; + if (hWndViewer) SendMessageW(hWndViewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); - - bCBHasChanged = FALSE; } bRet = TRUE;

1 0

Alexander Scott-Johns : ole32: Fix error handling in get_data_from_metafilepict and get_data_from_bitmap.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: e39fc20638d384a2c9b2ae5469565709c0d2637e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39fc20638d384a2c9b2ae546… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jan 28 19:49:50 2011 +0000 ole32: Fix error handling in get_data_from_metafilepict and get_data_from_bitmap. --- dlls/ole32/clipboard.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b59b554..b98404f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -876,9 +876,8 @@ static HRESULT get_data_from_metafilepict(IDataObject *data, FORMATETC *fmt, HGL if(FAILED(hr)) return hr; hr = dup_metafilepict(med.u.hMetaFilePict, &copy); - if(FAILED(hr)) return hr; - *mem = copy; + if(SUCCEEDED(hr)) *mem = copy; ReleaseStgMedium(&med); @@ -906,10 +905,8 @@ static HRESULT get_data_from_bitmap(IDataObject *data, FORMATETC *fmt, HBITMAP * if(FAILED(hr)) return hr; hr = dup_bitmap(med.u.hBitmap, &copy); - if(FAILED(hr)) return hr; - if(hbm) *hbm = copy; - else hr = E_FAIL; + if(SUCCEEDED(hr)) *hbm = copy; ReleaseStgMedium(&med);

1 0

Alexander Scott-Johns : winex11.drv: Remove broken HeapFree call.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: e81e49787c5f4313f4f34f8986e639cf5d1173e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81e49787c5f4313f4f34f898… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jan 28 20:35:33 2011 +0000 winex11.drv: Remove broken HeapFree call. --- dlls/winex11.drv/clipboard.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index c3f1b55..75f94e1 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1546,7 +1546,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportXAString(LPWINE_CLIPDATA lpData, LPDWORD lp *lpBytes = j; /* Number of bytes in string */ done: - HeapFree(GetProcessHeap(), 0, text); GlobalUnlock(lpData->hData); return lpstr;

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DVolume8 iface.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 05b6032fb655f6b9e57f2cdab862935c05a1a973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b6032fb655f6b9e57f2cdab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:37:33 2011 +0100 d3d8: COM cleanup for the IDirect3DVolume8 iface. --- dlls/d3d8/d3d8_private.h | 11 +++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/volume.c | 69 +++++++++++++++++++++++++++++---------------- 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 372d51c..d8f79f0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -204,18 +204,17 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte */ struct IDirect3DVolume8Impl { - /* IUnknown fields */ - const IDirect3DVolume8Vtbl *lpVtbl; - LONG ref; + IDirect3DVolume8 IDirect3DVolume8_iface; + LONG ref; /* IDirect3DVolume8 fields */ - IWineD3DVolume *wineD3DVolume; + IWineD3DVolume *wineD3DVolume; /* The volume container */ - IUnknown *container; + IUnknown *container; /* If set forward refcounting to this object */ - IUnknown *forwardReference; + IUnknown *forwardReference; }; HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, UINT width, UINT height, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b5c5da3..6f6622a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2873,7 +2873,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent *volume = object->wineD3DVolume; IWineD3DVolume_AddRef(*volume); - IDirect3DVolume8_Release((IDirect3DVolume8 *)object); + IDirect3DVolume8_Release(&object->IDirect3DVolume8_iface); object->container = superior; object->forwardReference = superior; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 75fb07c..3fd67da 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -23,9 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); -/* IDirect3DVolume8 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 iface, REFIID riid, LPVOID *ppobj) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static inline IDirect3DVolume8Impl *impl_from_IDirect3DVolume8(IDirect3DVolume8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVolume8Impl, IDirect3DVolume8_iface); +} + +static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(IDirect3DVolume8 *iface, REFIID riid, + void **ppobj) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -41,8 +47,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 ifac return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static ULONG WINAPI IDirect3DVolume8Impl_AddRef(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p.\n", iface); @@ -67,8 +74,9 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { } } -static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static ULONG WINAPI IDirect3DVolume8Impl_Release(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p.\n", iface); @@ -93,10 +101,10 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { } } -/* IDirect3DVolume8 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device) +static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, + IDirect3DDevice8 **device) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); IDirect3DResource8 *resource; HRESULT hr; @@ -114,8 +122,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, ID return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(IDirect3DVolume8 *iface, REFGUID refguid, + const void *pData, DWORD SizeOfData, DWORD Flags) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", @@ -128,8 +138,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 ifac return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(IDirect3DVolume8 *iface, REFGUID refguid, + void *pData, DWORD *pSizeOfData) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", @@ -142,8 +154,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 ifac return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(IDirect3DVolume8 *iface, REFGUID refguid) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); @@ -155,8 +168,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 ifa return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID riid, void **ppContainer) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(IDirect3DVolume8 *iface, REFIID riid, + void **ppContainer) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT res; TRACE("iface %p, riid %s, container %p.\n", @@ -171,8 +186,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, return res; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *pDesc) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); @@ -193,8 +209,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV return D3D_OK; } -static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface, + D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox, DWORD Flags) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, locked_box %p, box %p, flags %#x.\n", @@ -208,8 +226,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DL return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -253,7 +272,7 @@ HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, { HRESULT hr; - volume->lpVtbl = &Direct3DVolume8_Vtbl; + volume->IDirect3DVolume8_iface.lpVtbl = &Direct3DVolume8_Vtbl; volume->ref = 1; hr = IWineD3DDevice_CreateVolume(device->WineD3DDevice, width, height, depth, usage,

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DSwapChain8 iface.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 8ec3238b5ee6e937da22c0069f86d7fc233b2839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec3238b5ee6e937da22c0069… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:40:25 2011 +0100 d3d8: COM cleanup for the IDirect3DSwapChain8 iface. --- dlls/d3d8/d3d8_private.h | 8 ++++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/swapchain.c | 33 +++++++++++++++++++++------------ 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index d8f79f0..11ae25f 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -230,14 +230,14 @@ HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, struct IDirect3DSwapChain8Impl { /* IUnknown fields */ - const IDirect3DSwapChain8Vtbl *lpVtbl; - LONG ref; + IDirect3DSwapChain8 IDirect3DSwapChain8_iface; + LONG ref; /* IDirect3DSwapChain8 fields */ - IWineD3DSwapChain *wineD3DSwapChain; + IWineD3DSwapChain *wineD3DSwapChain; /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; + IDirect3DDevice8 *parentDevice; }; HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl *device, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6f6622a..0cd56e5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -547,7 +547,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(IDirect3DDe } TRACE("Created swapchain %p.\n", object); - *swapchain = (IDirect3DSwapChain8 *)object; + *swapchain = &object->IDirect3DSwapChain8_iface; return D3D_OK; } diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 4875d3a..d6b7a28 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -23,10 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); -/* IDirect3DSwapChain IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN8 iface, REFIID riid, LPVOID* ppobj) +static inline IDirect3DSwapChain8Impl *impl_from_IDirect3DSwapChain8(IDirect3DSwapChain8 *iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; + return CONTAINING_RECORD(iface, IDirect3DSwapChain8Impl, IDirect3DSwapChain8_iface); +} + +static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(IDirect3DSwapChain8 *iface, + REFIID riid, void **ppobj) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -42,8 +47,9 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(IDirect3DSwapChain8 *iface) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", iface, ref); @@ -51,8 +57,9 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) { return ref; } -static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static ULONG WINAPI IDirect3DSwapChain8Impl_Release(IDirect3DSwapChain8 *iface) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", iface, ref); @@ -68,9 +75,11 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) return ref; } -/* IDirect3DSwapChain8 parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(IDirect3DSwapChain8 *iface, + const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, + const RGNDATA *pDirtyRegion) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); HRESULT hr; TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", @@ -86,7 +95,7 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8 *iface, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface8 **ppBackBuffer) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); IWineD3DSurface *mySurface = NULL; HRESULT hr; @@ -123,7 +132,7 @@ HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl HRESULT hr; swapchain->ref = 1; - swapchain->lpVtbl = &Direct3DSwapChain8_Vtbl; + swapchain->IDirect3DSwapChain8_iface.lpVtbl = &Direct3DSwapChain8_Vtbl; wined3d_parameters.BackBufferWidth = present_parameters->BackBufferWidth; wined3d_parameters.BackBufferHeight = present_parameters->BackBufferHeight;

1 0

Michael Stefaniuc : d3d8: Remove the unused struct IDirect3DResource8Impl.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 75cc89857ef477e3bec9729603529ef02d2fdc2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cc89857ef477e3bec972960… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:44:00 2011 +0100 d3d8: Remove the unused struct IDirect3DResource8Impl. The rest was removed in cdb7a94ae2dc. --- dlls/d3d8/d3d8_private.h | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 11ae25f..7e852ad 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -109,7 +109,6 @@ typedef struct IDirect3DCubeTexture8Impl IDirect3DCubeTexture8Impl; typedef struct IDirect3DIndexBuffer8Impl IDirect3DIndexBuffer8Impl; typedef struct IDirect3DSurface8Impl IDirect3DSurface8Impl; typedef struct IDirect3DSwapChain8Impl IDirect3DSwapChain8Impl; -typedef struct IDirect3DResource8Impl IDirect3DResource8Impl; typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl; typedef struct IDirect3DVertexBuffer8Impl IDirect3DVertexBuffer8Impl; typedef struct IDirect3DVertexShader8Impl IDirect3DVertexShader8Impl; @@ -273,16 +272,6 @@ HRESULT surface_init(IDirect3DSurface8Impl *surface, IDirect3DDevice8Impl *devic UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) DECLSPEC_HIDDEN; -struct IDirect3DResource8Impl -{ - /* IUnknown fields */ - const IDirect3DResource8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource8 fields */ - IWineD3DResource *wineD3DResource; -}; - /* ---------------------- */ /* IDirect3DVertexBuffer8 */ /* ---------------------- */

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DCubeTexture8 iface.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 8a13f059eaa454685325047610921c6754008d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a13f059eaa45468532504761… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:46:17 2011 +0100 d3d8: COM cleanup for the IDirect3DCubeTexture8 iface. --- dlls/d3d8/cubetexture.c | 104 +++++++++++++++++++++++++++++----------------- dlls/d3d8/d3d8_private.h | 9 ++-- dlls/d3d8/device.c | 2 +- 3 files changed, 71 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a13f059eaa4546853250…

1 0