September 2015 - Wine-Commits

Gerald Pfeifer : quartz: Replace four occurrences of 1 << 31 by 1u << 31 to avoid shift overflow.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 2127f72f79ea3be59bddf369427b4e448e31f9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2127f72f79ea3be59bddf3694… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Aug 31 18:05:57 2015 +0200 quartz: Replace four occurrences of 1 << 31 by 1u << 31 to avoid shift overflow. --- dlls/quartz/avisplit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ccb4cec..6059511 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -203,7 +203,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe ++stream->index_next; } - rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(entry->dwSize & ~(1 << 31)); + rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(entry->dwSize & ~(1u << 31)); TRACE("offset(%u) size(%u)\n", (DWORD)BYTES_FROM_MEDIATIME(rtSampleStart), (DWORD)BYTES_FROM_MEDIATIME(rtSampleStop - rtSampleStart)); } @@ -596,7 +596,7 @@ static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **ind BOOL keyframe = !(pIndex->aIndex[x].dwSize >> 31); DWORDLONG offset = pIndex->qwBaseOffset + pIndex->aIndex[x].dwOffset; TRACE("dwOffset: %x%08x\n", (DWORD)(offset >> 32), (DWORD)offset); - TRACE("dwSize: %u\n", (pIndex->aIndex[x].dwSize & ~(1<<31))); + TRACE("dwSize: %u\n", (pIndex->aIndex[x].dwSize & ~(1u << 31))); TRACE("Frame is a keyframe: %s\n", keyframe ? "yes" : "no"); } @@ -994,7 +994,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) for (z = 0; z < stream->stdindex[y]->nEntriesInUse; ++z) { - UINT len = stream->stdindex[y]->aIndex[z].dwSize & ~(1 << 31); + UINT len = stream->stdindex[y]->aIndex[z].dwSize & ~(1u << 31); frames += len / stream->streamheader.dwSampleSize + !!(len % stream->streamheader.dwSampleSize); } } @@ -1342,7 +1342,7 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) { if (stream->streamheader.dwSampleSize) { - ULONG len = stream->stdindex[y]->aIndex[z].dwSize & ~(1 << 31); + ULONG len = stream->stdindex[y]->aIndex[z].dwSize & ~(1u << 31); ULONG size = stream->streamheader.dwSampleSize; pin->dwSamplesProcessed += len / size;

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateTexture3D().
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 9a2b73d315c2cee253e61a1faee8a9da24cf38fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2b73d315c2cee253e61a1fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 1 00:27:36 2015 +0200 d3d11: Implement d3d11_device_CreateTexture3D(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 24 ++++++++++++------------ dlls/d3d11/texture.c | 26 ++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6724a07..cbdfdfa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -130,8 +130,8 @@ struct d3d_texture3d ID3D11Device *device; }; -HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device, - const D3D11_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; +HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; /* ID3D10Buffer */ struct d3d10_buffer diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5f54795..c301dcc 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -92,9 +92,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device *ifac static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device *iface, const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture3D **texture) { - FIXME("iface %p, desc %p, data %p, texture %p stub!\n", iface, desc, data, texture); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_texture3d *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); + + if (FAILED(hr = d3d_texture3d_create(device, desc, data, &object))) + return hr; + + *texture = &object->ID3D11Texture3D_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device *iface, @@ -2050,10 +2059,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - d3d11_desc.Width = desc->Width; d3d11_desc.Height = desc->Height; d3d11_desc.Depth = desc->Depth; @@ -2064,14 +2069,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); - if (FAILED(hr = d3d_texture3d_init(object, device, &d3d11_desc, data))) - { - WARN("Failed to initialize texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_texture3d_create(device, &d3d11_desc, (const D3D11_SUBRESOURCE_DATA *)data, &object))) return hr; - } - TRACE("Created 3D texture %p.\n", object); *texture = &object->ID3D10Texture3D_iface; return S_OK; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 52c3dba..db99a9b 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -897,8 +897,8 @@ static const struct wined3d_parent_ops d3d_texture3d_wined3d_parent_ops = d3d_texture3d_wined3d_object_released, }; -HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device, - const D3D11_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) +static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device, + const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) { struct wined3d_resource_desc wined3d_desc; unsigned int levels; @@ -941,3 +941,25 @@ HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *dev return S_OK; } + +HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) +{ + struct d3d_texture3d *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_texture3d_init(object, device, desc, data))) + { + WARN("Failed to initialize texture, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created texture %p.\n", object); + *texture = object; + + return S_OK; +}

1 0

Józef Kucia : d3d11: Implement d3d11_texture3d_GetDesc().
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 11cd2dd897bcec3852b7c2a87b45c86577639ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11cd2dd897bcec3852b7c2a87… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 1 00:27:35 2015 +0200 d3d11: Implement d3d11_texture3d_GetDesc(). --- dlls/d3d11/d3d11_private.h | 5 +++-- dlls/d3d11/device.c | 13 ++++++++++++- dlls/d3d11/texture.c | 25 ++++++++++++++++++++----- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c5379ed..6724a07 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -62,6 +62,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; @@ -125,12 +126,12 @@ struct d3d_texture3d struct wined3d_private_store private_store; struct wined3d_texture *wined3d_texture; - D3D10_TEXTURE3D_DESC desc; + D3D11_TEXTURE3D_DESC desc; ID3D11Device *device; }; HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device, - const D3D10_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; + const D3D11_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; /* ID3D10Buffer */ struct d3d10_buffer diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7aef1f7..5f54795 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2044,6 +2044,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa ID3D10Texture3D **texture) { struct d3d_device *device = impl_from_ID3D10Device(iface); + D3D11_TEXTURE3D_DESC d3d11_desc; struct d3d_texture3d *object; HRESULT hr; @@ -2053,7 +2054,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_texture3d_init(object, device, desc, data))) + d3d11_desc.Width = desc->Width; + d3d11_desc.Height = desc->Height; + d3d11_desc.Depth = desc->Depth; + d3d11_desc.MipLevels = desc->MipLevels; + d3d11_desc.Format = desc->Format; + d3d11_desc.Usage = d3d11_usage_from_d3d10_usage(desc->Usage); + d3d11_desc.BindFlags = d3d11_bind_flags_from_d3d10_bind_flags(desc->BindFlags); + d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); + d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); + + if (FAILED(hr = d3d_texture3d_init(object, device, &d3d11_desc, data))) { WARN("Failed to initialize texture, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 55f5d49..52c3dba 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -467,7 +467,7 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = desc->SampleDesc.Quality; - wined3d_desc.usage = wined3d_usage_from_d3d10core(desc->BindFlags, desc->Usage); + wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); wined3d_desc.pool = WINED3D_POOL_DEFAULT; wined3d_desc.width = desc->Width; wined3d_desc.height = desc->Height; @@ -683,7 +683,11 @@ static UINT STDMETHODCALLTYPE d3d11_texture3d_GetEvictionPriority(ID3D11Texture3 static void STDMETHODCALLTYPE d3d11_texture3d_GetDesc(ID3D11Texture3D *iface, D3D11_TEXTURE3D_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = texture->desc; } static const struct ID3D11Texture3DVtbl d3d11_texture3d_vtbl = @@ -850,10 +854,21 @@ static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc) { struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); + D3D11_TEXTURE3D_DESC d3d11_desc; TRACE("iface %p, desc %p.\n", iface, desc); - *desc = texture->desc; + d3d11_texture3d_GetDesc(&texture->ID3D11Texture3D_iface, &d3d11_desc); + + desc->Width = d3d11_desc.Width; + desc->Height = d3d11_desc.Height; + desc->Depth = d3d11_desc.Depth; + desc->MipLevels = d3d11_desc.MipLevels; + desc->Format = d3d11_desc.Format; + desc->Usage = d3d10_usage_from_d3d11_usage(d3d11_desc.Usage); + desc->BindFlags = d3d10_bind_flags_from_d3d11_bind_flags(d3d11_desc.BindFlags); + desc->CPUAccessFlags = d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(d3d11_desc.CPUAccessFlags); + desc->MiscFlags = d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(d3d11_desc.MiscFlags); } static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl = @@ -883,7 +898,7 @@ static const struct wined3d_parent_ops d3d_texture3d_wined3d_parent_ops = }; HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device, - const D3D10_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) + const D3D11_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) { struct wined3d_resource_desc wined3d_desc; unsigned int levels; @@ -900,7 +915,7 @@ HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *dev wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; - wined3d_desc.usage = wined3d_usage_from_d3d10core(desc->BindFlags, desc->Usage); + wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); wined3d_desc.pool = WINED3D_POOL_DEFAULT; wined3d_desc.width = desc->Width; wined3d_desc.height = desc->Height;

1 0

Józef Kucia : d3d11: Add ID3D11Texture3D interface stub.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 4665ae626013c6aa19c643ea7f94af5b5f392cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4665ae626013c6aa19c643ea7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 1 00:27:33 2015 +0200 d3d11: Add ID3D11Texture3D interface stub. --- dlls/d3d11/d3d11_private.h | 3 +- dlls/d3d11/texture.c | 140 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 132 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 1da39d2..c0513a8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -116,9 +116,10 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture2d **texture) DECLSPEC_HIDDEN; struct d3d_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN; -/* ID3D10Texture3D */ +/* ID3D11Texture3D, ID3D10Texture3D */ struct d3d_texture3d { + ID3D11Texture3D ID3D11Texture3D_iface; ID3D10Texture3D ID3D10Texture3D_iface; LONG refcount; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 31df894..adb7474 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -542,24 +542,36 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE return S_OK; } -static inline struct d3d_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) +/* ID3D11Texture3D methods */ + +static inline struct d3d_texture3d *impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) { - return CONTAINING_RECORD(iface, struct d3d_texture3d, ID3D10Texture3D_iface); + return CONTAINING_RECORD(iface, struct d3d_texture3d, ID3D11Texture3D_iface); } -static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d11_texture3d_QueryInterface(ID3D11Texture3D *iface, REFIID riid, void **object) { + struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10Texture3D) - || IsEqualGUID(riid, &IID_ID3D10Resource) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + if (IsEqualGUID(riid, &IID_ID3D11Texture3D) + || IsEqualGUID(riid, &IID_ID3D11Resource) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { IUnknown_AddRef(iface); *object = iface; return S_OK; } + else if (IsEqualGUID(riid, &IID_ID3D10Texture3D) + || IsEqualGUID(riid, &IID_ID3D10Resource) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + IUnknown_AddRef(iface); + *object = &texture->ID3D10Texture3D_iface; + return S_OK; + } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); @@ -567,9 +579,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) +static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface) { - struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); ULONG refcount = InterlockedIncrement(&texture->refcount); TRACE("%p increasing refcount to %u.\n", texture, refcount); @@ -593,9 +605,9 @@ static void STDMETHODCALLTYPE d3d_texture3d_wined3d_object_released(void *parent HeapFree(GetProcessHeap(), 0, parent); } -static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) +static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface) { - struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); ULONG refcount = InterlockedDecrement(&texture->refcount); TRACE("%p decreasing refcount to %u.\n", texture, refcount); @@ -615,6 +627,113 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) return refcount; } +static void STDMETHODCALLTYPE d3d11_texture3d_GetDevice(ID3D11Texture3D *iface, ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_texture3d_GetPrivateData(ID3D11Texture3D *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_texture3d_SetPrivateData(ID3D11Texture3D *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_texture3d_SetPrivateDataInterface(ID3D11Texture3D *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d11_texture3d_GetType(ID3D11Texture3D *iface, + D3D11_RESOURCE_DIMENSION *resource_dimension) +{ + TRACE("iface %p, resource_dimension %p.\n", iface, resource_dimension); + + *resource_dimension = D3D11_RESOURCE_DIMENSION_TEXTURE3D; +} + +static void STDMETHODCALLTYPE d3d11_texture3d_SetEvictionPriority(ID3D11Texture3D *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %#x stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d11_texture3d_GetEvictionPriority(ID3D11Texture3D *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d3d11_texture3d_GetDesc(ID3D11Texture3D *iface, D3D11_TEXTURE3D_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11Texture3DVtbl d3d11_texture3d_vtbl = +{ + /* IUnknown methods */ + d3d11_texture3d_QueryInterface, + d3d11_texture3d_AddRef, + d3d11_texture3d_Release, + /* ID3D11DeviceChild methods */ + d3d11_texture3d_GetDevice, + d3d11_texture3d_GetPrivateData, + d3d11_texture3d_SetPrivateData, + d3d11_texture3d_SetPrivateDataInterface, + /* ID3D11Resource methods */ + d3d11_texture3d_GetType, + d3d11_texture3d_SetEvictionPriority, + d3d11_texture3d_GetEvictionPriority, + /* ID3D11Texture3D methods */ + d3d11_texture3d_GetDesc, +}; + +/* ID3D10Texture3D methods */ + +static inline struct d3d_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_texture3d, ID3D10Texture3D_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D *iface, REFIID riid, void **object) +{ + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_texture3d_QueryInterface(&texture->ID3D11Texture3D_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) +{ + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_texture3d_AddRef(&texture->ID3D11Texture3D_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) +{ + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_texture3d_Release(&texture->ID3D11Texture3D_iface); +} + static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, ID3D10Device **device) { struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); @@ -766,6 +885,7 @@ HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *dev unsigned int levels; HRESULT hr; + texture->ID3D11Texture3D_iface.lpVtbl = &d3d11_texture3d_vtbl; texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; wined3d_mutex_lock();

1 0

Józef Kucia : d3d11: Rename d3d10_texture3d to d3d_texture3d.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 0707fa19129d32c4fa07546e6ffd85624d3a0588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0707fa19129d32c4fa07546e6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 1 00:27:32 2015 +0200 d3d11: Rename d3d10_texture3d to d3d_texture3d. --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 4 ++-- dlls/d3d11/texture.c | 34 +++++++++++++++++----------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8adf6a3..1da39d2 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -117,7 +117,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE struct d3d_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN; /* ID3D10Texture3D */ -struct d3d10_texture3d +struct d3d_texture3d { ID3D10Texture3D ID3D10Texture3D_iface; LONG refcount; @@ -128,7 +128,7 @@ struct d3d10_texture3d ID3D10Device1 *device; }; -HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d_device *device, +HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device, const D3D10_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; /* ID3D10Buffer */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b722280..7aef1f7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2044,7 +2044,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa ID3D10Texture3D **texture) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_texture3d *object; + struct d3d_texture3d *object; HRESULT hr; TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); @@ -2053,7 +2053,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_texture3d_init(object, device, desc, data))) + if (FAILED(hr = d3d_texture3d_init(object, device, desc, data))) { WARN("Failed to initialize texture, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 8e9fa2f..31df894 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -542,9 +542,9 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE return S_OK; } -static inline struct d3d10_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) +static inline struct d3d_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) { - return CONTAINING_RECORD(iface, struct d3d10_texture3d, ID3D10Texture3D_iface); + return CONTAINING_RECORD(iface, struct d3d_texture3d, ID3D10Texture3D_iface); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D *iface, REFIID riid, void **object) @@ -569,7 +569,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); ULONG refcount = InterlockedIncrement(&texture->refcount); TRACE("%p increasing refcount to %u.\n", texture, refcount); @@ -585,9 +585,9 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) return refcount; } -static void STDMETHODCALLTYPE d3d10_texture3d_wined3d_object_released(void *parent) +static void STDMETHODCALLTYPE d3d_texture3d_wined3d_object_released(void *parent) { - struct d3d10_texture3d *texture = parent; + struct d3d_texture3d *texture = parent; wined3d_private_store_cleanup(&texture->private_store); HeapFree(GetProcessHeap(), 0, parent); @@ -595,7 +595,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_wined3d_object_released(void *pare static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); ULONG refcount = InterlockedDecrement(&texture->refcount); TRACE("%p decreasing refcount to %u.\n", texture, refcount); @@ -617,7 +617,7 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, ID3D10Device **device) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -628,7 +628,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -639,7 +639,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -650,7 +650,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -680,7 +680,7 @@ static UINT STDMETHODCALLTYPE d3d10_texture3d_GetEvictionPriority(ID3D10Texture3 static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); struct wined3d_map_desc wined3d_map_desc; struct wined3d_resource *sub_resource; HRESULT hr; @@ -708,7 +708,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource_idx) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); struct wined3d_resource *sub_resource; TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); @@ -726,7 +726,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc) { - struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); TRACE("iface %p, desc %p.\n", iface, desc); @@ -754,12 +754,12 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl = d3d10_texture3d_GetDesc, }; -static const struct wined3d_parent_ops d3d10_texture3d_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_texture3d_wined3d_parent_ops = { - d3d10_texture3d_wined3d_object_released, + d3d_texture3d_wined3d_object_released, }; -HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d_device *device, +HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device, const D3D10_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) { struct wined3d_resource_desc wined3d_desc; @@ -787,7 +787,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d_device if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, levels, 0, (struct wined3d_sub_resource_data *)data, texture, - &d3d10_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) + &d3d_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); wined3d_private_store_cleanup(&texture->private_store);

1 0

Józef Kucia : d3d10core/tests: Port test_texture2d_interfaces() from d3d11.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: f9ecce38efd22c8bf67e43a15e5891d1cad265f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ecce38efd22c8bf67e43a15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 1 00:27:31 2015 +0200 d3d10core/tests: Port test_texture2d_interfaces() from d3d11. --- dlls/d3d10core/tests/device.c | 141 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5e12f14..847abd1 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -297,6 +297,146 @@ static void test_create_texture2d(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_texture2d_interfaces(void) +{ + ID3D11Texture2D *d3d11_texture; + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + IDXGISurface *surface; + ID3D10Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct test + { + UINT bind_flags; + UINT misc_flags; + UINT expected_bind_flags; + UINT expected_misc_flags; + } + desc_conversion_tests[] = + { + { + D3D10_BIND_RENDER_TARGET, 0, + D3D11_BIND_RENDER_TARGET, 0 + }, + { + 0, D3D10_RESOURCE_MISC_SHARED, + 0, D3D11_RESOURCE_MISC_SHARED + }, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 0; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(hr == E_NOINTERFACE, "Texture should not implement IDXGISurface.\n"); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_ID3D11Texture2D, (void **)&d3d11_texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Texture should implement ID3D11Texture2D.\n"); + if (SUCCEEDED(hr)) ID3D11Texture2D_Release(d3d11_texture); + ID3D10Texture2D_Release(texture); + + if (FAILED(hr)) + { + win_skip("D3D11 is not available, skipping tests.\n"); + ID3D10Device_Release(device); + return; + } + + for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + { + const struct test *current = &desc_conversion_tests[i]; + D3D11_TEXTURE2D_DESC d3d11_desc; + ID3D11Device *d3d11_device; + + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = current->bind_flags; + desc.CPUAccessFlags = 0; + desc.MiscFlags = current->misc_flags; + + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + /* Shared resources are not supported by REF and WARP devices. */ + ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), + "Test %u: Failed to create a 2d texture, hr %#x.\n", i, hr); + if (FAILED(hr)) + { + win_skip("Failed to create ID3D10Texture2D, skipping test %u.\n", i); + continue; + } + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Test %u: Texture should implement IDXGISurface.\n", i); + IDXGISurface_Release(surface); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_ID3D11Texture2D, (void **)&d3d11_texture); + ok(SUCCEEDED(hr), "Test %u: Texture should implement ID3D11Texture2D.\n", i); + ID3D10Texture2D_Release(texture); + + ID3D11Texture2D_GetDesc(d3d11_texture, &d3d11_desc); + + ok(d3d11_desc.Width == desc.Width, + "Test %u: Got unexpected Width %u.\n", i, d3d11_desc.Width); + ok(d3d11_desc.Height == desc.Height, + "Test %u: Got unexpected Height %u.\n", i, d3d11_desc.Height); + ok(d3d11_desc.MipLevels == desc.MipLevels, + "Test %u: Got unexpected MipLevels %u.\n", i, d3d11_desc.MipLevels); + ok(d3d11_desc.ArraySize == desc.ArraySize, + "Test %u: Got unexpected ArraySize %u.\n", i, d3d11_desc.ArraySize); + ok(d3d11_desc.Format == desc.Format, + "Test %u: Got unexpected Format %u.\n", i, d3d11_desc.Format); + ok(d3d11_desc.SampleDesc.Count == desc.SampleDesc.Count, + "Test %u: Got unexpected SampleDesc.Count %u.\n", i, d3d11_desc.SampleDesc.Count); + ok(d3d11_desc.SampleDesc.Quality == desc.SampleDesc.Quality, + "Test %u: Got unexpected SampleDesc.Quality %u.\n", i, d3d11_desc.SampleDesc.Quality); + ok(d3d11_desc.Usage == (D3D11_USAGE)desc.Usage, + "Test %u: Got unexpected Usage %u.\n", i, d3d11_desc.Usage); + ok(d3d11_desc.BindFlags == current->expected_bind_flags, + "Test %u: Got unexpected BindFlags %#x.\n", i, d3d11_desc.BindFlags); + ok(d3d11_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, d3d11_desc.CPUAccessFlags); + ok(d3d11_desc.MiscFlags == current->expected_misc_flags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, d3d11_desc.MiscFlags); + + d3d11_device = NULL; + ID3D11Texture2D_GetDevice(d3d11_texture, &d3d11_device); + ok(!!d3d11_device, "Test %u: Got NULL, expected device pointer.\n", i); + ID3D11Device_Release(d3d11_device); + + ID3D11Texture2D_Release(d3d11_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture3d(void) { ULONG refcount, expected_refcount; @@ -3465,6 +3605,7 @@ START_TEST(device) { test_feature_level(); test_create_texture2d(); + test_texture2d_interfaces(); test_create_texture3d(); test_create_depthstencil_view(); test_create_rendertarget_view();

1 0

Nikolay Sivov : gdi32/tests: Add names to data structure GetFontRealizationInfo returns, explicitly test with older variant fields.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: adb0f582e03c63ce194868fbf3ea5355641e655f URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb0f582e03c63ce194868fbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 29 19:53:40 2015 +0300 gdi32/tests: Add names to data structure GetFontRealizationInfo returns, explicitly test with older variant fields. --- dlls/gdi32/tests/font.c | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 65685ac..fb603a4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4114,6 +4114,22 @@ todo_wine static void test_RealizationInfo(void) { + struct font_realization_info { + DWORD size; + DWORD flags; + DWORD cache_num; + DWORD instance_id; + DWORD unk; + DWORD face_index; + }; + + struct realization_info_t + { + DWORD flags; + DWORD cache_num; + DWORD instance_id; + }; + HDC hdc; DWORD info[4], info2[10]; BOOL r, have_file = FALSE; @@ -4166,6 +4182,9 @@ static void test_RealizationInfo(void) if (pGetFontRealizationInfo) { + struct font_realization_info *fri = (struct font_realization_info*)info2; + struct realization_info_t *ri = (struct realization_info_t*)info; + /* The first DWORD represents a struct size. On a newly rebooted system setting this to < 16 results in GetFontRealizationInfo failing. However there @@ -4180,9 +4199,11 @@ static void test_RealizationInfo(void) ok(r != 0, "ret 0\n"); /* We may get the '24' version here if that has been previously requested. */ - ok(info2[0] == 16 || info2[0] == 24, "got %d\n", info2[0]); - ok(!memcmp(info2 + 1, info, 3 * sizeof(DWORD)), "mismatch\n"); - ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n"); + ok(fri->size == 16 || fri->size == 24, "got %d\n", info2[0]); + ok(fri->flags == ri->flags, "flags mismatch\n"); + ok(fri->cache_num == ri->cache_num, "cache_num mismatch\n"); + ok(fri->instance_id == ri->instance_id, "instance id mismatch\n"); + ok(info2[6] == 0xcccccccc, "got wrong dword 6, 0x%08x\n", info2[6]); memset(info2, 0xcc, sizeof(info2)); info2[0] = 28; @@ -4193,12 +4214,15 @@ static void test_RealizationInfo(void) info2[0] = 24; r = pGetFontRealizationInfo(hdc, info2); ok(r != 0, "ret 0\n"); - ok(info2[0] == 24, "got %d\n", info2[0]); - ok(!memcmp(info2 + 1, info, 3 * sizeof(DWORD)), "mismatch\n"); + ok(fri->size == 24, "got %d\n", fri->size); + ok(fri->flags == ri->flags, "flags mismatch\n"); + ok(fri->cache_num == ri->cache_num, "cache_num mismatch\n"); + ok(fri->instance_id == ri->instance_id, "instance id mismatch\n"); + ok(fri->face_index == 0, "got wrong face index %u\n", fri->face_index); ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n"); /* Test GetFontFileInfo() */ - r = pGetFontFileInfo(info2[3], 0, &file_info, sizeof(file_info), &needed); + r = pGetFontFileInfo(fri->instance_id, 0, &file_info, sizeof(file_info), &needed); ok(r != 0 || GetLastError() == ERROR_NOACCESS, "ret %d gle %d\n", r, GetLastError()); if (r) @@ -4218,11 +4242,13 @@ static void test_RealizationInfo(void) } /* Get bytes 2 - 16 using GetFontFileData */ - r = pGetFontFileData(info2[3], 0, 2, data, sizeof(data)); + r = pGetFontFileData(fri->instance_id, 0, 2, data, sizeof(data)); ok(r != 0, "ret 0 gle %d\n", GetLastError()); if (have_file) ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); + else + win_skip("GetFontFileInfo() failed, skipping\n"); } DeleteObject(SelectObject(hdc, hfont_old));

1 0

Jacek Caban : msi: Fixed varg0 leak in InstallerImpl_SummaryInformation.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: d8f79a037cfb29104a960c4e6422e4718e3ecf43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f79a037cfb29104a960c4e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 20:11:53 2015 +0200 msi: Fixed varg0 leak in InstallerImpl_SummaryInformation. --- dlls/msi/automation.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index e974387..56823ee 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1841,32 +1841,28 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, if (!(wFlags & DISPATCH_PROPERTYGET)) return DISP_E_MEMBERNOTFOUND; - VariantInit(&varg0); - hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); - if (FAILED(hr)) - return hr; - VariantInit(&varg1); hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); if (FAILED(hr)) return hr; - V_VT(pVarResult) = VT_DISPATCH; + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; ret = MsiGetSummaryInformationW(0, V_BSTR(&varg0), V_I4(&varg1), &hsuminfo); + VariantClear(&varg0); if (ret != ERROR_SUCCESS) - { - hr = DISP_E_EXCEPTION; - goto done; - } + return DISP_E_EXCEPTION; hr = create_summaryinfo(hsuminfo, &dispatch); - if (SUCCEEDED(hr)) - V_DISPATCH(pVarResult) = dispatch; + if (FAILED(hr)) + return hr; -done: - VariantClear(&varg0); - return hr; + V_VT(pVarResult) = VT_DISPATCH; + V_DISPATCH(pVarResult) = dispatch; + return S_OK; } static HRESULT InstallerImpl_UILevel(WORD wFlags,

1 0