February 2014 - Wine-commits

Henri Verbeet : d3d10core: Implement d3d10_buffer_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 82fc81b644d2dd4e0000c3c9dd805c70d6a30ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fc81b644d2dd4e0000c3c9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:21 2014 +0100 d3d10core: Implement d3d10_buffer_GetDevice(). --- dlls/d3d10core/buffer.c | 20 +++++++++++++++++++- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/tests/device.c | 14 ++++++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index 90ff0e8..b9ac6e1 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -59,7 +59,10 @@ static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) TRACE("%p increasing refcount to %u.\n", buffer, refcount); if (refcount == 1) + { + ID3D10Device1_AddRef(buffer->device); wined3d_buffer_incref(buffer->wined3d_buffer); + } return refcount; } @@ -72,7 +75,14 @@ static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) + { + ID3D10Device1 *device = buffer->device; + wined3d_buffer_decref(buffer->wined3d_buffer); + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D10Device1_Release(device); + } return refcount; } @@ -81,7 +91,12 @@ static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)buffer->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, @@ -226,5 +241,8 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi return hr; } + buffer->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(buffer->device); + return S_OK; } diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index eb95f42..012c884 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -108,6 +108,7 @@ struct d3d10_buffer LONG refcount; struct wined3d_buffer *wined3d_buffer; + ID3D10Device1 *device; }; HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6014a93..429869d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -260,12 +260,12 @@ static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; D3D10_BUFFER_DESC buffer_desc; ID3D10RenderTargetView *rtview; + ID3D10Device *device, *tmp; ID3D10Texture2D *texture; ID3D10Buffer *buffer; - ID3D10Device *device; - ULONG refcount; HRESULT hr; if (!(device = create_device())) @@ -280,8 +280,18 @@ static void test_create_rendertarget_view(void) buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Buffer_GetDevice(buffer, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER;

1 0

Stefan Dösinger : wined3d: Don' t use NP2 repacking for RECT textures.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 65833790773138531f2eb46b7ed507f510bb4681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65833790773138531f2eb46b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 12 12:24:24 2014 +0100 wined3d: Don't use NP2 repacking for RECT textures. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 628a4a5..8a34807 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -674,7 +674,8 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) surface->texture_target = GL_TEXTURE_2D; /* Non-power2 support */ - if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] + || gl_info->supported[ARB_TEXTURE_RECTANGLE]) { pow2Width = surface->resource.width; pow2Height = surface->resource.height;

1 0

Stefan Dösinger : wined3d: Reject height scaled repacked np2 textures.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 2728e7b8879868e6210ebd78d5fcffe0aaab11e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2728e7b8879868e6210ebd78d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 12 12:24:25 2014 +0100 wined3d: Reject height scaled repacked np2 textures. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8a34807..371f3bc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -695,9 +695,9 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (pow2Width > surface->resource.width || pow2Height > surface->resource.height) { /* TODO: Add support for non power two compressed textures. */ - if (surface->resource.format->flags & WINED3DFMT_FLAG_COMPRESSED) + if (surface->resource.format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) { - FIXME("(%p) Compressed non-power-two textures are not supported w(%d) h(%d)\n", + FIXME("(%p) Compressed or height scaled non-power-two textures are not supported w(%d) h(%d)\n", surface, surface->resource.width, surface->resource.height); return WINED3DERR_NOTAVAILABLE; }

1 0

Andrey Gusev : Assorted typos fixes.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: add85f4687e2249c40090ea33ad07a914ec13721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add85f4687e2249c40090ea33… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 12 19:53:52 2014 +0200 Assorted typos fixes. --- dlls/dinput/tests/joystick.c | 4 ++-- dlls/dinput8/dinput8_main.c | 2 +- dlls/dinput8/tests/device.c | 4 ++-- dlls/dmsynth/synth.c | 2 +- dlls/dmusic/port.c | 2 +- dlls/dplayx/dplaysp.c | 2 +- dlls/dpnaddr/version.rc | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 231d019..e5bb4eb 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -550,7 +550,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); - ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not udated: %i\n", dip_gain_get.dwData); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); hr = IDirectInputDevice_Acquire(pJoystick); ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); dip_gain_set.dwData = 2; @@ -558,7 +558,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); - ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not udated: %i\n", dip_gain_get.dwData); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); /* Test range and internal clamping. */ dip_gain_set.dwData = -1; hr = IDirectInputDevice_SetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_set.diph); diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 679e7fd..9824c76 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -58,7 +58,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer IDirectInputA *pDI; HRESULT hr, hrCo; - TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); + TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p)\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); if (!ppDI) return E_POINTER; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 53afdf3..c66c43c 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -401,7 +401,7 @@ static void test_save_settings(void) if (hr == DI_SETTINGSNOTSAVED) { - skip ("Cant test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); + skip ("Can't test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); return; } @@ -455,7 +455,7 @@ static void test_save_settings(void) if (hr == DI_SETTINGSNOTSAVED) { - skip ("Cant test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); + skip ("Can't test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); return; } diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 7a966a8..9850628 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -118,7 +118,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(LPDIRECTMUSICSY { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p->(%d): stub\n", This, groups); + FIXME("(%p)->(%d): stub\n", This, groups); return S_OK; } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 2e60828..9d42667 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -686,7 +686,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou HRESULT hr = E_FAIL; int i; - TRACE("(%p,%p,%p,%p,%p%d)\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%p,%p,%p,%p,%p,%d)\n", guid, object, unkouter, port_params, port_caps, device); *object = NULL; diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 25cb7c4..43938e8 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries( IDirectPlaySP *iface, LP /* Should be able to call the comctl32 undocumented MRU routines. I suspect that the interface works appropriately */ - FIXME( "(%p)->(%p,%p,%p,%p,): stub\n", + FIXME( "(%p)->(%p,%p,%p,%p): stub\n", This, lpSection, lpKey, lpEnumMRUCallback, lpContext ); return DP_OK; diff --git a/dlls/dpnaddr/version.rc b/dlls/dpnaddr/version.rc index b66e785..5d30a48 100644 --- a/dlls/dpnaddr/version.rc +++ b/dlls/dpnaddr/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine DpnAddr dll" -#define WINE_FILENAME_STR "dpnadr.dll" +#define WINE_FILENAME_STR "dpnaddr.dll" #define WINE_FILEVERSION 5,3,2600,2180 #define WINE_FILEVERSION_STR "5.3.2600.2180" #define WINE_PRODUCTVERSION 5,3,2600,2180

1 0

Alistair Leslie-Hughes : dpnet: Add DirectPlay8 registry keys.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 2c6ce9a02fc988bc74a0ae03bca4b0f431be0c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6ce9a02fc988bc74a0ae03b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 15 12:51:22 2014 +1100 dpnet: Add DirectPlay8 registry keys. --- dlls/dpnet/dpnet.rgs | 20 ++++++++++++++++++++ dlls/dpnet/version.rc | 3 +++ 2 files changed, 23 insertions(+) diff --git a/dlls/dpnet/dpnet.rgs b/dlls/dpnet/dpnet.rgs new file mode 100644 index 0000000..22717a0 --- /dev/null +++ b/dlls/dpnet/dpnet.rgs @@ -0,0 +1,20 @@ +HKLM +{ + NoRemove 'Software' + { + NoRemove 'Microsoft' + { + 'DirectPlay8' + { + 'Service Providers' + { + 'DPNSPWinsockTCP' + { + val 'Friendly Name' = s 'Internet TCP/IP Connection For DirectPlay' + val 'GUID' = s '{EBFE7BA0-628D-11D2-AE0F-006097B01411}' + } + } + } + } + } +} diff --git a/dlls/dpnet/version.rc b/dlls/dpnet/version.rc index b6a8488..3291ed7 100644 --- a/dlls/dpnet/version.rc +++ b/dlls/dpnet/version.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: dpnet.rgs */ +2 WINE_REGISTRY dpnet.rgs + #define WINE_FILEDESCRIPTION_STR "Wine DirectPlay 8" #define WINE_FILENAME_STR "dpnet.dll" #define WINE_FILEVERSION 5,3,0,900

1 0

Jacek Caban : wmp: Added IConnectionPointContainer stub implementation.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 8b7c4e3b24c3d0e6fb344f4062ebba396c2072b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7c4e3b24c3d0e6fb344f406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 12 11:33:07 2014 +0100 wmp: Added IConnectionPointContainer stub implementation. --- dlls/wmp/oleobj.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 4 ++++ 2 files changed, 59 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 773b0b0..26f338a 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -17,6 +17,7 @@ */ #include "wmp_private.h" +#include "olectl.h" #include "wine/debug.h" @@ -27,6 +28,7 @@ struct WindowsMediaPlayer { IProvideClassInfo2 IProvideClassInfo2_iface; IPersistStreamInit IPersistStreamInit_iface; IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; @@ -78,6 +80,9 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IOleInPlaceObjectWindowless)) { TRACE("(%p)->(IID_IOleInPlaceObjectWindowless %p)\n", This, ppv); *ppv = &This->IOleInPlaceObjectWindowless_iface; + }else if(IsEqualGUID(riid, &IID_IConnectionPointContainer)) { + TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); + *ppv = &This->IConnectionPointContainer_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -559,6 +564,55 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +static inline WindowsMediaPlayer *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IConnectionPointContainer_iface); +} + +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, LPVOID *ppv) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + return CONNECT_E_NOCONNECTION; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { @@ -575,6 +629,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; wmp->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; wmp->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; + wmp->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; wmp->ref = 1; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 8f2eed2..fba35e5 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -626,6 +626,10 @@ static void test_QI(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, (void**)&tmp); ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless iface: %08x\n", hres); IUnknown_Release(tmp); + + hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&tmp); + ok(hres == S_OK, "Could not get IConnectionPointContainer iface: %08x\n", hres); + IUnknown_Release(tmp); } static void test_wmp(void)

1 0

Henri Verbeet : d3d10core: Implement ID3D10Multithread.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 28510c73c23f5336c13d070d657172ac7a25d718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28510c73c23f5336c13d070d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 12 12:10:31 2014 +0100 d3d10core: Implement ID3D10Multithread. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 78 +++++++++++++++++++++++++++++++++++- dlls/dxgi/tests/device.c | 4 ++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ab014ac..62392e5 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -290,6 +290,7 @@ struct d3d10_device { IUnknown IUnknown_inner; ID3D10Device1 ID3D10Device1_iface; + ID3D10Multithread ID3D10Multithread_iface; IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; IUnknown *outer_unk; LONG refcount; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0606af9..9c1467f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -50,6 +50,10 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *ifa { *out = &device->ID3D10Device1_iface; } + else if (IsEqualGUID(riid, &IID_ID3D10Multithread)) + { + *out = &device->ID3D10Multithread_iface; + } else if (IsEqualGUID(riid, &IID_IWineDXGIDeviceParent)) { *out = &device->IWineDXGIDeviceParent_iface; @@ -1791,6 +1795,77 @@ static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = d3d10_device_inner_Release, }; +static inline struct d3d10_device *impl_from_ID3D10Multithread(ID3D10Multithread *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_device, ID3D10Multithread_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_multithread_QueryInterface(ID3D10Multithread *iface, REFIID iid, void **out) +{ + struct d3d10_device *device = impl_from_ID3D10Multithread(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return IUnknown_QueryInterface(device->outer_unk, iid, out); +} + +static ULONG STDMETHODCALLTYPE d3d10_multithread_AddRef(ID3D10Multithread *iface) +{ + struct d3d10_device *device = impl_from_ID3D10Multithread(iface); + + TRACE("iface %p.\n", iface); + + return IUnknown_AddRef(device->outer_unk); +} + +static ULONG STDMETHODCALLTYPE d3d10_multithread_Release(ID3D10Multithread *iface) +{ + struct d3d10_device *device = impl_from_ID3D10Multithread(iface); + + TRACE("iface %p.\n", iface); + + return IUnknown_Release(device->outer_unk); +} + +static void STDMETHODCALLTYPE d3d10_multithread_Enter(ID3D10Multithread *iface) +{ + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); +} + +static void STDMETHODCALLTYPE d3d10_multithread_Leave(ID3D10Multithread *iface) +{ + TRACE("iface %p.\n", iface); + + wined3d_mutex_unlock(); +} + +static BOOL STDMETHODCALLTYPE d3d10_multithread_SetMultithreadProtected(ID3D10Multithread *iface, BOOL protect) +{ + FIXME("iface %p, protect %#x stub!\n", iface, protect); + + return TRUE; +} + +static BOOL STDMETHODCALLTYPE d3d10_multithread_GetMultithreadProtected(ID3D10Multithread *iface) +{ + FIXME("iface %p stub!\n", iface); + + return TRUE; +} + +static const struct ID3D10MultithreadVtbl d3d10_multithread_vtbl = +{ + d3d10_multithread_QueryInterface, + d3d10_multithread_AddRef, + d3d10_multithread_Release, + d3d10_multithread_Enter, + d3d10_multithread_Leave, + d3d10_multithread_SetMultithreadProtected, + d3d10_multithread_GetMultithreadProtected, +}; + static void STDMETHODCALLTYPE d3d10_subresource_destroyed(void *parent) {} static const struct wined3d_parent_ops d3d10_subresource_parent_ops = @@ -2048,8 +2123,9 @@ static const struct wine_rb_functions d3d10_rasterizer_state_rb_ops = HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { - device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; + device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; + device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl; device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d10_dxgi_device_parent_vtbl; device->device_parent.ops = &d3d10_wined3d_device_parent_ops; device->refcount = 1; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7200d64..84567a1 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -75,6 +75,10 @@ static void test_device_interfaces(void) ok(SUCCEEDED(hr), "Failed to query ID3D10Device interface, hr %#x.\n", hr); IUnknown_Release(iface); + hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to query ID3D10Multithread interface, hr %#x.\n", hr); + IUnknown_Release(iface); + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface))) IUnknown_Release(iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,

1 0

Frédéric Delanoy : dsound/tests: Use wine_dbgstr_guid for printing GUIDs.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 86e2f37ebc6f2cdff3722198fdfc33e5811eeecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e2f37ebc6f2cdff3722198f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 12 12:10:45 2014 +0100 dsound/tests: Use wine_dbgstr_guid for printing GUIDs. --- dlls/dsound/tests/propset.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 454c707..49e6f51 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -75,12 +75,7 @@ static BOOL CALLBACK callback(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA dat data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); @@ -104,12 +99,7 @@ static BOOL CALLBACK callback1(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" DescriptionA: %s\n", data->DescriptionA); WideCharToMultiByte(CP_ACP, 0, data->DescriptionW, -1, descriptionA, sizeof(descriptionA), NULL, NULL); trace(" DescriptionW: %s\n", descriptionA); @@ -133,12 +123,7 @@ static BOOL CALLBACK callbackA(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); @@ -163,12 +148,7 @@ static BOOL CALLBACK callbackW(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace("\tDeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace("\tDeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); WideCharToMultiByte(CP_ACP, 0, data->Description, -1, descriptionA, sizeof(descriptionA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data->Module, -1, moduleA, sizeof(moduleA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data->Interface, -1, interfaceA, sizeof(interfaceA), NULL, NULL);

1 0

Frédéric Delanoy : ole32/tests: Use wine_dbgstr_guid for printing GUIDs.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: a0c258460bccf99b07e1cc003911491fe9889caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c258460bccf99b07e1cc003… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 12 12:10:46 2014 +0100 ole32/tests: Use wine_dbgstr_guid for printing GUIDs. --- dlls/ole32/tests/marshal.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 680b831..5ff6ab2 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2428,10 +2428,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * } if (size >= 3*sizeof(DWORD) + sizeof(GUID)) { - trace("got guid data: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - ((GUID *)marshal_data)->Data1, ((GUID *)marshal_data)->Data2, ((GUID *)marshal_data)->Data3, - ((GUID *)marshal_data)->Data4[0], ((GUID *)marshal_data)->Data4[1], ((GUID *)marshal_data)->Data4[2], ((GUID *)marshal_data)->Data4[3], - ((GUID *)marshal_data)->Data4[4], ((GUID *)marshal_data)->Data4[5], ((GUID *)marshal_data)->Data4[6], ((GUID *)marshal_data)->Data4[7]); + trace("got guid data: %s\n", wine_dbgstr_guid((GUID *)marshal_data)); } } else

1 0

Alexandre Julliard : widl: Ignore unknown -m target options.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: a2683dca6403aafd3eef8f205dbcb47d329bb5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2683dca6403aafd3eef8f205… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:55:36 2014 +0100 widl: Ignore unknown -m target options. --- tools/widl/widl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 5fa67f4..eace69f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -635,7 +635,6 @@ int main(int argc,char *argv[]) case 'm': if (!strcmp( optarg, "32" )) typelib_kind = SYS_WIN32; else if (!strcmp( optarg, "64" )) typelib_kind = SYS_WIN64; - else error( "Invalid -m argument '%s'\n", optarg ); break; case 'N': no_preprocess = 1;

1 0