January 2009 - Wine-commits

Alasdair Sinclair : comctl32: Fix missing void in empty parameter list.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 4475045fe125cad638a4b4460ea7de18d75f5971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4475045fe125cad638a4b4460… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Sun Jan 25 22:27:28 2009 +0000 comctl32: Fix missing void in empty parameter list. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d991ea1..1ca9c8f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3311,7 +3311,7 @@ TOOLBAR_GetBitmap (HWND hwnd, WPARAM wParam) static inline LRESULT -TOOLBAR_GetBitmapFlags () +TOOLBAR_GetBitmapFlags (void) { return (GetDeviceCaps (0, LOGPIXELSX) >= 120) ? TBBF_LARGE : 0; }

1 0

Alasdair Sinclair : advapi32/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: d2915c0f99555e2becc1568c1c27d9e8ac63640e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2915c0f99555e2becc1568c1… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Sun Jan 25 22:27:04 2009 +0000 advapi32/tests: Fix missing void in empty parameter list. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8e8728a..260ebf5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1351,7 +1351,7 @@ struct well_known_sid_value /* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"} }; -static void test_CreateWellKnownSid() +static void test_CreateWellKnownSid(void) { SID_IDENTIFIER_AUTHORITY ident = { SECURITY_NT_AUTHORITY }; PSID domainsid; @@ -2564,7 +2564,7 @@ static void test_ConvertStringSecurityDescriptor(void) "Expected ERROR_INVALID_ACL or ERROR_INVALID_SID, got %d\n", GetLastError()); } -static void test_ConvertSecurityDescriptorToString() +static void test_ConvertSecurityDescriptorToString(void) { SECURITY_DESCRIPTOR desc; SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION|SACL_SECURITY_INFORMATION;

1 0

Alasdair Sinclair : comctl32/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 4f0e6885d08fc7342e9521d15828361c3fcd67e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0e6885d08fc7342e9521d15… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Sun Jan 25 22:27:18 2009 +0000 comctl32/tests: Fix missing void in empty parameter list. --- dlls/comctl32/tests/status.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index e5b9155..8b8facf 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -78,7 +78,7 @@ static LRESULT WINAPI create_test_wndproc(HWND hwnd, UINT msg, WPARAM wParam, LP return ret; } -static void register_subclass() +static void register_subclass(void) { WNDCLASSEX cls; @@ -91,7 +91,7 @@ static void register_subclass() ok(RegisterClassEx(&cls), "RegisterClassEx failed\n"); } -static void test_create() +static void test_create(void) { RECT rc; HWND hwnd;

1 0

Andrew Nguyen : winmm: Make the return behavior of waveOutPrepareHeader consistent for 16-bit and 32-bit .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: cb6ddfc75bf3d295e657699d9e85146b8cf1237e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6ddfc75bf3d295e657699d9… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Jan 25 02:56:48 2009 -0600 winmm: Make the return behavior of waveOutPrepareHeader consistent for 16-bit and 32-bit. --- dlls/winmm/mmsystem.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index f3046b6..69f14fc 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -1279,15 +1279,26 @@ UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ { LPWINE_MLD wmld; LPWAVEHDR lpWaveOutHdr = MapSL(lpsegWaveOutHdr); + UINT16 result; TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); if (lpWaveOutHdr == NULL) return MMSYSERR_INVALPARAM; if ((wmld = MMDRV_Get(HWAVEOUT_32(hWaveOut), MMDRV_WAVEOUT, FALSE)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_INVALHANDLE; + + if ((result = MMDRV_Message(wmld, WODM_PREPARE, lpsegWaveOutHdr, + uSize, FALSE)) != MMSYSERR_NOTSUPPORTED) + return result; - return MMDRV_Message(wmld, WODM_PREPARE, lpsegWaveOutHdr, uSize, FALSE); + if (lpWaveOutHdr->dwFlags & WHDR_INQUEUE) + return WAVERR_STILLPLAYING; + + lpWaveOutHdr->dwFlags |= WHDR_PREPARED; + lpWaveOutHdr->dwFlags &= ~WHDR_DONE; + + return MMSYSERR_NOERROR; } /**************************************************************************

1 0

Juan Lang : include: Add definition of OBJECT_NAME_INFORMATION.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 33d05e87b182a4028094695c226548b17b8b24b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d05e87b182a4028094695c2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Jan 25 10:46:02 2009 -0800 include: Add definition of OBJECT_NAME_INFORMATION. --- include/winternl.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index b3f980e..c0185b1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1122,6 +1122,10 @@ typedef struct _OBJECT_BASIC_INFORMATION { LARGE_INTEGER CreateTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; +typedef struct _OBJECT_NAME_INFORMATION { + UNICODE_STRING Name; +} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; + typedef struct _PROCESS_BASIC_INFORMATION { #ifdef __WINESRC__ DWORD_PTR ExitStatus;

1 0

Henri Verbeet : d3d10core: Handle a NULL view desc in CreateRenderTargetView().
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 2953d81463d5886c4adce7a86db0ded93fc39f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2953d81463d5886c4adce7a86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 26 09:38:14 2009 +0100 d3d10core: Handle a NULL view desc in CreateRenderTargetView(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 134 ++++++++++++++++++++++++++++++++++++ dlls/d3d10core/view.c | 6 ++- 3 files changed, 140 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index d5132b2..e12fdf6 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -79,6 +79,7 @@ struct d3d10_rendertarget_view LONG refcount; ID3D10Resource *resource; + D3D10_RENDER_TARGET_VIEW_DESC desc; }; /* Layered device */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index cba8498..978fcd3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -670,6 +670,125 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev return E_NOTIMPL; } +static HRESULT d3d10_device_set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10Resource *resource) +{ + D3D10_RESOURCE_DIMENSION dimension; + HRESULT hr; + + ID3D10Resource_GetType(resource, &dimension); + + switch(dimension) + { + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + { + ID3D10Texture1D *texture; + D3D10_TEXTURE1D_DESC texture_desc; + + hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture); + if (FAILED(hr)) + { + ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D?\n"); + return E_INVALIDARG; + } + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + ID3D10Texture1D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE1D; + desc->Texture1D.MipSlice = 0; + } + else + { + desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE1DARRAY; + desc->Texture1DArray.MipSlice = 0; + desc->Texture1DArray.FirstArraySlice = 0; + desc->Texture1DArray.ArraySize = 1; + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + { + ID3D10Texture2D *texture; + D3D10_TEXTURE2D_DESC texture_desc; + + hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture); + if (FAILED(hr)) + { + ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D?\n"); + return E_INVALIDARG; + } + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + ID3D10Texture2D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; + desc->Texture2D.MipSlice = 0; + } + else + { + desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DMS; + } + } + else + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DARRAY; + desc->Texture2DArray.MipSlice = 0; + desc->Texture2DArray.FirstArraySlice = 0; + desc->Texture2DArray.ArraySize = 1; + } + else + { + desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DMSARRAY; + desc->Texture2DMSArray.FirstArraySlice = 0; + desc->Texture2DMSArray.ArraySize = 1; + } + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + { + ID3D10Texture3D *texture; + D3D10_TEXTURE3D_DESC texture_desc; + + hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture); + if (FAILED(hr)) + { + ERR("Resource of type TEXTURE3D doesn't implement ID3D10Texture3D?\n"); + return E_INVALIDARG; + } + + ID3D10Texture3D_GetDesc(texture, &texture_desc); + ID3D10Texture3D_Release(texture); + + desc->Format = texture_desc.Format; + desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE3D; + desc->Texture3D.MipSlice = 0; + desc->Texture3D.FirstWSlice = 0; + desc->Texture3D.WSize = 1; + + return S_OK; + } + + default: + FIXME("Unhandled resource dimension %#x\n", dimension); + return E_INVALIDARG; + } +} + static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device *iface, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { @@ -686,6 +805,21 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic object->vtbl = &d3d10_rendertarget_view_vtbl; object->refcount = 1; + + if (!desc) + { + HRESULT hr = d3d10_device_set_rtdesc_from_resource(&object->desc, resource); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + } + else + { + object->desc = *desc; + } + object->resource = resource; ID3D10Resource_AddRef(resource); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 7810c82..59d56b6 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -124,7 +124,11 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTa static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDesc(ID3D10RenderTargetView* iface, D3D10_RENDER_TARGET_VIEW_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + + TRACE("iface %p, desc %p\n", iface, desc); + + *desc = This->desc; } const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl =

1 0

Henri Verbeet : d3d10core: Add a small test for CreateRenderTargetView().
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 7742fe283a06249891dabc132a13ff8b2e0ca615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7742fe283a06249891dabc132… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 26 09:38:14 2009 +0100 d3d10core: Add a small test for CreateRenderTargetView(). --- dlls/d3d10core/tests/device.c | 60 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1a3f331..9c05398 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -140,6 +140,65 @@ static void test_create_texture(ID3D10Device *device) ID3D10Texture2D_Release(texture); } +static void test_create_rendertarget_view(ID3D10Device *device) +{ + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_BUFFER_DESC buffer_desc; + ID3D10RenderTargetView *rtview; + ID3D10Texture2D *texture; + ID3D10Buffer *buffer; + HRESULT hr; + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER; + rtv_desc.Buffer.ElementOffset = 0; + rtv_desc.Buffer.ElementWidth = 64; + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview); + ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x\n", hr); + + ID3D10RenderTargetView_Release(rtview); + ID3D10Buffer_Release(buffer); + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + /* For texture resources it's allowed to specify NULL as desc */ + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x\n", hr); + + ID3D10RenderTargetView_GetDesc(rtview, &rtv_desc); + ok(rtv_desc.Format == texture_desc.Format, "Expected format %#x, got %#x\n", texture_desc.Format, rtv_desc.Format); + ok(rtv_desc.ViewDimension == D3D10_RTV_DIMENSION_TEXTURE2D, + "Expected view dimension D3D10_RTV_DIMENSION_TEXTURE2D, got %#x\n", rtv_desc.ViewDimension); + ok(rtv_desc.Texture2D.MipSlice == 0, "Expected mip slice 0, got %#x\n", rtv_desc.Texture2D.MipSlice); + + ID3D10RenderTargetView_Release(rtview); + ID3D10Texture2D_Release(texture); +} + START_TEST(device) { ID3D10Device *device; @@ -154,6 +213,7 @@ START_TEST(device) test_device_interfaces(device); test_create_texture(device); + test_create_rendertarget_view(device); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Henri Verbeet : d3d10core: Implement ID3D10Buffer::GetType().
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 9c1abc908a5bd962ef39cd9d35c41a018fc24f09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1abc908a5bd962ef39cd9d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 26 09:38:14 2009 +0100 d3d10core: Implement ID3D10Buffer::GetType(). --- dlls/d3d10core/buffer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index b6d60af..c4f32bf 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -108,7 +108,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buff static void STDMETHODCALLTYPE d3d10_buffer_GetType(ID3D10Buffer *iface, D3D10_RESOURCE_DIMENSION *resource_dimension) { - FIXME("iface %p, resource_dimension %p stub!\n", iface, resource_dimension); + TRACE("iface %p, resource_dimension %p\n", iface, resource_dimension); + + *resource_dimension = D3D10_RESOURCE_DIMENSION_BUFFER; } static void STDMETHODCALLTYPE d3d10_buffer_SetEvictionPriority(ID3D10Buffer *iface, UINT eviction_priority)

1 0

Henri Verbeet : d3d10core: Implement ID3D10Texture2D::GetType().
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 04e4abf6771de88d7cad5dc635a92c89383fd2ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e4abf6771de88d7cad5dc63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 26 09:38:14 2009 +0100 d3d10core: Implement ID3D10Texture2D::GetType(). --- dlls/d3d10core/texture2d.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture2d.c index 1ce7d3a..8119e19 100644 --- a/dlls/d3d10core/texture2d.c +++ b/dlls/d3d10core/texture2d.c @@ -119,7 +119,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateDataInterface(ID3D10T static void STDMETHODCALLTYPE d3d10_texture2d_GetType(ID3D10Texture2D *iface, D3D10_RESOURCE_DIMENSION *resource_dimension) { - FIXME("iface %p, resource_dimension %p stub!\n", iface, resource_dimension); + TRACE("iface %p, resource_dimension %p\n", iface, resource_dimension); + + *resource_dimension = D3D10_RESOURCE_DIMENSION_TEXTURE2D; } static void STDMETHODCALLTYPE d3d10_texture2d_SetEvictionPriority(ID3D10Texture2D *iface, UINT eviction_priority)

1 0

Henri Verbeet : d3d10core: Implement ID3D10Texture2D::GetDesc().
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 1fa7fea8a088d43b07f9499dad975c2c4ef07667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa7fea8a088d43b07f9499da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 26 09:38:14 2009 +0100 d3d10core: Implement ID3D10Texture2D::GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 1 + dlls/d3d10core/texture2d.c | 6 +++++- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index b9e3a49..d5132b2 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -60,6 +60,7 @@ struct d3d10_texture2d IUnknown *dxgi_surface; IWineD3DSurface *wined3d_surface; + D3D10_TEXTURE2D_DESC desc; }; /* ID3D10Buffer */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 71291cf..cba8498 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -604,6 +604,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac object->vtbl = &d3d10_texture2d_vtbl; object->refcount = 1; + object->desc = *desc; if (desc->MipLevels == 1 && desc->ArraySize == 1) { diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture2d.c index afb6167..1ce7d3a 100644 --- a/dlls/d3d10core/texture2d.c +++ b/dlls/d3d10core/texture2d.c @@ -152,7 +152,11 @@ static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + + TRACE("iface %p, desc %p\n", iface, desc); + + *desc = This->desc; } const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl =

1 0