August 2012 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Implement IWICBitmap:: SetResolution and GetResolution.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 3e88d4ff0fcde40879228f129d430198f0d13f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e88d4ff0fcde40879228f129… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 15:54:10 2012 -0500 windowscodecs: Implement IWICBitmap::SetResolution and GetResolution. --- dlls/windowscodecs/bitmap.c | 30 ++++++++++++++++++++++++++---- dlls/windowscodecs/tests/bitmap.c | 2 -- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 22a4876..520fdef 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -44,6 +44,8 @@ typedef struct BitmapImpl { UINT stride; UINT bpp; WICPixelFormatGUID pixelformat; + double dpix, dpiy; + CRITICAL_SECTION cs; } BitmapImpl; typedef struct BitmapLockImpl { @@ -256,6 +258,8 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) if (ref == 0) { if (This->palette) IWICPalette_Release(This->palette); + This->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); } @@ -295,9 +299,18 @@ static HRESULT WINAPI BitmapImpl_GetPixelFormat(IWICBitmap *iface, static HRESULT WINAPI BitmapImpl_GetResolution(IWICBitmap *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + + if (!pDpiX || !pDpiY) + return E_INVALIDARG; + + EnterCriticalSection(&This->cs); + *pDpiX = This->dpix; + *pDpiY = This->dpiy; + LeaveCriticalSection(&This->cs); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BitmapImpl_CopyPalette(IWICBitmap *iface, @@ -408,9 +421,15 @@ static HRESULT WINAPI BitmapImpl_SetPalette(IWICBitmap *iface, IWICPalette *pIPa static HRESULT WINAPI BitmapImpl_SetResolution(IWICBitmap *iface, double dpiX, double dpiY) { - FIXME("(%p,%f,%f)\n", iface, dpiX, dpiY); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%f,%f)\n", iface, dpiX, dpiY); - return E_NOTIMPL; + EnterCriticalSection(&This->cs); + This->dpix = dpiX; + This->dpiy = dpiY; + LeaveCriticalSection(&This->cs); + + return S_OK; } static const IWICBitmapVtbl BitmapImpl_Vtbl = { @@ -462,6 +481,9 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, This->stride = stride; This->bpp = bpp; memcpy(&This->pixelformat, pixelFormat, sizeof(GUID)); + This->dpix = This->dpiy = 0.0; + InitializeCriticalSection(&This->cs); + This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BitmapImpl.lock"); *ppIBitmap = &This->IWICBitmap_iface; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index a0926ab..34305cd 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -243,7 +243,6 @@ static void test_createbitmap(void) ok(hr == S_OK, "IWICBitmap_GetPixelFormat failed hr=%x\n", hr); ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); -todo_wine { hr = IWICBitmap_GetResolution(bitmap, &dpix, &dpiy); ok(hr == S_OK, "IWICBitmap_GetResolution failed hr=%x\n", hr); ok(dpix == 0.0, "got %f, expected 0.0\n", dpix); @@ -256,7 +255,6 @@ todo_wine { ok(hr == S_OK, "IWICBitmap_GetResolution failed hr=%x\n", hr); ok(dpix == 12.0, "got %f, expected 12.0\n", dpix); ok(dpiy == 34.0, "got %f, expected 34.0\n", dpiy); -} hr = IWICBitmap_GetSize(bitmap, &width, &height); ok(hr == S_OK, "IWICBitmap_GetSize failed hr=%x\n", hr);

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmap::GetPixelFormat.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: f26402cad7db8d62ae9f230ad02bfc6316703b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26402cad7db8d62ae9f230ad… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 15:39:58 2012 -0500 windowscodecs: Implement IWICBitmap::GetPixelFormat. --- dlls/windowscodecs/bitmap.c | 17 +++++++++++++---- dlls/windowscodecs/tests/bitmap.c | 10 +++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 0f93c76..0a7ecf5 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -43,6 +43,7 @@ typedef struct BitmapImpl { UINT width, height; UINT stride; UINT bpp; + WICPixelFormatGUID pixelformat; } BitmapImpl; typedef struct BitmapLockImpl { @@ -195,9 +196,10 @@ static HRESULT WINAPI BitmapLockImpl_GetDataPointer(IWICBitmapLock *iface, static HRESULT WINAPI BitmapLockImpl_GetPixelFormat(IWICBitmapLock *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p)\n", iface, pPixelFormat); + BitmapLockImpl *This = impl_from_IWICBitmapLock(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + return IWICBitmap_GetPixelFormat(&This->parent->IWICBitmap_iface, pPixelFormat); } static const IWICBitmapLockVtbl BitmapLockImpl_Vtbl = { @@ -272,9 +274,15 @@ static HRESULT WINAPI BitmapImpl_GetSize(IWICBitmap *iface, static HRESULT WINAPI BitmapImpl_GetPixelFormat(IWICBitmap *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p)\n", iface, pPixelFormat); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + if (!pPixelFormat) + return E_INVALIDARG; + + memcpy(pPixelFormat, &This->pixelformat, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI BitmapImpl_GetResolution(IWICBitmap *iface, @@ -446,6 +454,7 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, This->height = uiHeight; This->stride = stride; This->bpp = bpp; + memcpy(&This->pixelformat, pixelFormat, sizeof(GUID)); *ppIBitmap = &This->IWICBitmap_iface; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index f772e0d..fc45375 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -152,8 +152,8 @@ static void test_createbitmap(void) base_lock_buffer = lock_buffer; hr = IWICBitmapLock_GetPixelFormat(lock, &pixelformat); - todo_wine ok(hr == S_OK, "IWICBitmapLock_GetPixelFormat failed hr=%x\n", hr); - todo_wine ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + ok(hr == S_OK, "IWICBitmapLock_GetPixelFormat failed hr=%x\n", hr); + ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); hr = IWICBitmapLock_GetSize(lock, &width, &height); ok(hr == S_OK, "IWICBitmapLock_GetSize failed hr=%x\n", hr); @@ -228,8 +228,8 @@ static void test_createbitmap(void) ok(lock_buffer == base_lock_buffer+6, "got %p, expected %p+6\n", lock_buffer, base_lock_buffer); hr = IWICBitmapLock_GetPixelFormat(lock, &pixelformat); - todo_wine ok(hr == S_OK, "IWICBitmapLock_GetPixelFormat failed hr=%x\n", hr); - todo_wine ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + ok(hr == S_OK, "IWICBitmapLock_GetPixelFormat failed hr=%x\n", hr); + ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); hr = IWICBitmapLock_GetSize(lock, &width, &height); ok(hr == S_OK, "IWICBitmapLock_GetSize failed hr=%x\n", hr); @@ -239,11 +239,11 @@ static void test_createbitmap(void) IWICBitmapLock_Release(lock); } -todo_wine { hr = IWICBitmap_GetPixelFormat(bitmap, &pixelformat); ok(hr == S_OK, "IWICBitmap_GetPixelFormat failed hr=%x\n", hr); ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); +todo_wine { hr = IWICBitmap_GetResolution(bitmap, &dpix, &dpiy); ok(hr == S_OK, "IWICBitmap_GetResolution failed hr=%x\n", hr); ok(dpix == 0.0, "got %f, expected 0.0\n", dpix);

1 0

Vincent Povirk : windowscodecs: Add test for IWICImagingFactory:: CreateBitmapFromSource.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 6c1fcaa3924966e9d0323495975a3da8be0e0095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1fcaa3924966e9d03234959… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 16:15:12 2012 -0500 windowscodecs: Add test for IWICImagingFactory::CreateBitmapFromSource. --- dlls/windowscodecs/tests/bitmap.c | 103 +++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 34305cd..56b4cfd 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -264,6 +264,108 @@ static void test_createbitmap(void) IWICBitmap_Release(bitmap); } +static void test_createbitmapfromsource(void) +{ + HRESULT hr; + IWICBitmap *bitmap, *bitmap2; + IWICPalette *palette; + IWICBitmapLock *lock; + int i; + WICRect rc; + const BYTE bitmap_data[27] = { + 128,128,255, 128,128,128, 128,255,128, + 128,128,128, 128,128,128, 255,255,255, + 255,128,128, 255,255,255, 255,255,255}; + BYTE returned_data[27] = {0}; + BYTE *lock_buffer=NULL; + UINT lock_buffer_stride=0; + UINT lock_buffer_size=0; + WICPixelFormatGUID pixelformat = {0}; + UINT width=0, height=0; + double dpix=10.0, dpiy=10.0; + + hr = IWICImagingFactory_CreateBitmap(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmap failed hr=%x\n", hr); + + if (FAILED(hr)) + return; + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "IWICImagingFactory_CreatePalette failed hr=%x\n", hr); + + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray256, FALSE); + ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); + + hr = IWICBitmap_SetPalette(bitmap, palette); + ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); + + IWICPalette_Release(palette); + + rc.X = rc.Y = 0; + rc.Width = 3; + rc.Height = 3; + hr = IWICBitmap_Lock(bitmap, &rc, WICBitmapLockWrite, &lock); + ok(hr == S_OK, "IWICBitmap_Lock failed hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapLock_GetStride(lock, &lock_buffer_stride); + ok(hr == S_OK, "IWICBitmapLock_GetStride failed hr=%x\n", hr); + ok(lock_buffer_stride == 12, "got %i, expected 12\n", lock_buffer_stride); + + hr = IWICBitmapLock_GetDataPointer(lock, &lock_buffer_size, &lock_buffer); + ok(hr == S_OK, "IWICBitmapLock_GetDataPointer failed hr=%x\n", hr); + ok(lock_buffer_size == 33, "got %i, expected 33\n", lock_buffer_size); + ok(lock_buffer != NULL, "got NULL data pointer\n"); + + for (i=0; i<3; i++) + memcpy(lock_buffer + lock_buffer_stride*i, bitmap_data + i*9, 9); + + IWICBitmapLock_Release(lock); + } + + hr = IWICBitmap_SetResolution(bitmap, 12.0, 34.0); + ok(hr == S_OK, "IWICBitmap_SetResolution failed hr=%x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromSource(factory, (IWICBitmapSource*)bitmap, + WICBitmapCacheOnLoad, &bitmap2); + todo_wine ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); + + IWICBitmap_Release(bitmap); + + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "IWICImagingFactory_CreatePalette failed hr=%x\n", hr); + + hr = IWICBitmap_CopyPalette(bitmap2, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + + IWICPalette_Release(palette); + + hr = IWICBitmap_CopyPixels(bitmap2, NULL, 9, 27, returned_data); + ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); + + for (i=0; i<27; i++) + ok(returned_data[i] == bitmap_data[i], "returned_data[%i] == %i\n", i, returned_data[i]); + + hr = IWICBitmap_GetPixelFormat(bitmap2, &pixelformat); + ok(hr == S_OK, "IWICBitmap_GetPixelFormat failed hr=%x\n", hr); + ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + + hr = IWICBitmap_GetResolution(bitmap2, &dpix, &dpiy); + ok(hr == S_OK, "IWICBitmap_GetResolution failed hr=%x\n", hr); + ok(dpix == 12.0, "got %f, expected 12.0\n", dpix); + ok(dpiy == 34.0, "got %f, expected 34.0\n", dpiy); + + hr = IWICBitmap_GetSize(bitmap2, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize failed hr=%x\n", hr); + ok(width == 3, "got %d, expected 3\n", width); + ok(height == 3, "got %d, expected 3\n", height); + + IWICBitmap_Release(bitmap2); +} + START_TEST(bitmap) { HRESULT hr; @@ -275,6 +377,7 @@ START_TEST(bitmap) ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); test_createbitmap(); + test_createbitmapfromsource(); IWICImagingFactory_Release(factory);

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmap::GetSize.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: a62bd245a4d36ef18a931ed93d959f7e953b9617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62bd245a4d36ef18a931ed93… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 15:49:02 2012 -0500 windowscodecs: Implement IWICBitmap::GetSize. --- dlls/windowscodecs/bitmap.c | 11 +++++++++-- dlls/windowscodecs/tests/bitmap.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 0a7ecf5..22a4876 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -266,9 +266,16 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) static HRESULT WINAPI BitmapImpl_GetSize(IWICBitmap *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + if (!puiWidth || !puiHeight) + return E_INVALIDARG; + + *puiWidth = This->width; + *puiHeight = This->height; + + return S_OK; } static HRESULT WINAPI BitmapImpl_GetPixelFormat(IWICBitmap *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index fc45375..a0926ab 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -256,12 +256,12 @@ todo_wine { ok(hr == S_OK, "IWICBitmap_GetResolution failed hr=%x\n", hr); ok(dpix == 12.0, "got %f, expected 12.0\n", dpix); ok(dpiy == 34.0, "got %f, expected 34.0\n", dpiy); +} hr = IWICBitmap_GetSize(bitmap, &width, &height); ok(hr == S_OK, "IWICBitmap_GetSize failed hr=%x\n", hr); ok(width == 3, "got %d, expected 3\n", width); ok(height == 3, "got %d, expected 3\n", height); -} IWICBitmap_Release(bitmap); }

1 0

Józef Kucia : d3dx9: Fix ID3DXConstantTable::SetMatrix .
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: b31b9864d92c86ed04b26a7dfb25f4e202233888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31b9864d92c86ed04b26a7df… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:23 2012 +0200 d3dx9: Fix ID3DXConstantTable::SetMatrix. --- dlls/d3dx9_36/shader.c | 36 ++---------------------------------- dlls/d3dx9_36/tests/shader.c | 12 ++++++------ 2 files changed, 8 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 900459e..9482518 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1178,7 +1178,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, matrix); - return ID3DXConstantTable_SetMatrixArray(iface, device, constant, matrix, 1); + return set_matrix_array(iface, device, constant, matrix, 1, D3DXPT_FLOAT, 4, 4); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -1186,41 +1186,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable * { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - D3DXCONSTANT_DESC desc; - HRESULT hr; - UINT i, desc_count = 1; - D3DXMATRIX temp; - TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); - hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); - if (FAILED(hr)) - { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); - return D3DERR_INVALIDCALL; - } - - switch (desc.RegisterSet) - { - case D3DXRS_FLOAT4: - /* i * 4 + 3 is the last register we set. The conditional makes sure that we don't access - registers we're not supposed to */ - for (i = 0; i < count && i * 4 + 3 < desc.RegisterCount; i++) - { - if (desc.Class == D3DXPC_MATRIX_ROWS) - temp = matrix[i]; - else - D3DXMatrixTranspose(&temp, &matrix[i]); - - set_float_shader_constant(This, device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); - } - break; - default: - FIXME("Handle other register sets\n"); - return E_NOTIMPL; - } - - return D3D_OK; + return set_matrix_array(iface, device, constant, matrix, count, D3DXPT_FLOAT, 4, 4); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 18636d9..8bfea43 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -674,7 +674,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) (int)S(U(fmatrix))._21, (int)S(U(fmatrix))._22, (int)S(U(fmatrix))._23, 0); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f, + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f, "The variable fmatrix3x1 was not set correctly, out={%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3], S(U(fmatrix))._11, S(U(fmatrix))._21, S(U(fmatrix))._31, 0.0f); @@ -700,7 +700,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable c3x3: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 3); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == 0.0f && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == 0.0f && out[3] == 0.0f && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == 0.0f && out[7] == 0.0f && out[8] == S(U(fmatrix))._13 && out[9] == S(U(fmatrix))._23 && out[10] == 0.0f && out[11] == 0.0f, "The variable c2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, " @@ -716,7 +716,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable r4x4: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 15, out, 2); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == S(U(fmatrix))._13 && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == S(U(fmatrix))._13 && out[3] == 0.0f && out[4] == S(U(fmatrix))._21 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._23 && out[7] == 0.0f, "The variable r2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f}, " "should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", @@ -725,7 +725,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._21, S(U(fmatrix))._22, S(U(fmatrix))._23, 0.0f); IDirect3DDevice9_GetVertexShaderConstantF(device, 13, out, 2); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._32 && out[7] == 0.0f, "The variable c3x2 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f}, " "should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", @@ -734,7 +734,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._12, S(U(fmatrix))._22, S(U(fmatrix))._32, 0.0f); IDirect3DDevice9_GetVertexShaderConstantF(device, 4, out, 3); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == 0.0f && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == 0.0f && out[3] == 0.0f && out[4] == S(U(fmatrix))._21 && out[5] == S(U(fmatrix))._22 && out[6] == 0.0f && out[7] == 0.0f && out[8] == S(U(fmatrix))._31 && out[9] == S(U(fmatrix))._32 && out[10] == 0.0f && out[11] == 0.0f, "The variable r3x2 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, " @@ -745,7 +745,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._31, S(U(fmatrix))._32, 0.0f, 0.0f); IDirect3DDevice9_GetVertexShaderConstantF(device, 10, out, 3); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._32 && out[7] == 0.0f && out[8] == S(U(fmatrix))._13 && out[9] == S(U(fmatrix))._23 && out[10] == S(U(fmatrix))._33 && out[11] == 0.0f, "The variable c3x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, "

1 0

Józef Kucia : d3dx9: Fix ID3DXConstantTable::SetVector .
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 53ce2a240b0f69f1a301121753d91e3bb61ab422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ce2a240b0f69f1a30112175… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:22 2012 +0200 d3dx9: Fix ID3DXConstantTable::SetVector. --- dlls/d3dx9_36/shader.c | 25 ++----------------------- dlls/d3dx9_36/tests/shader.c | 3 ++- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 4dee641..900459e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1158,38 +1158,17 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, vector); - return ID3DXConstantTable_SetVectorArray(iface, device, constant, vector, 1); + return set_vector_array(iface, device, constant, vector, 1, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, CONST D3DXVECTOR4 *vector, UINT count) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - D3DXCONSTANT_DESC desc; - HRESULT hr; - UINT desc_count = 1; TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, vector, count); - hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); - if (FAILED(hr)) - { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); - return D3DERR_INVALIDCALL; - } - - switch (desc.RegisterSet) - { - case D3DXRS_FLOAT4: - set_float_shader_constant(This, device, desc.RegisterIndex, (float *)vector, - min(desc.RegisterCount, count)); - break; - default: - FIXME("Handle other register sets\n"); - return E_NOTIMPL; - } - - return D3D_OK; + return set_vector_array(iface, device, constant, vector, count, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index a371642..18636d9 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -632,7 +632,8 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetVector failed on variable f: 0x%08x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == f4.x, "The variable f was not set correctly by ID3DXConstantTable_SetVector, got %f, should be %f\n", + ok(out[0] == f4.x && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f was not set correctly by ID3DXConstantTable_SetVector, got %f, should be %f\n", out[0], f4.x); refcnt = ID3DXConstantTable_Release(ctable);

1 0

Józef Kucia : d3dx9/tests: Add tests for ID3DXConstantTable::SetValue.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 5fd7d9826c4f7bfe4e1b484374ec7bac7363dcbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd7d9826c4f7bfe4e1b48437… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:21 2012 +0200 d3dx9/tests: Add tests for ID3DXConstantTable::SetValue. --- dlls/d3dx9_36/tests/shader.c | 175 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fd7d9826c4f7bfe4e1b4…

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetBoolArray.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: fbba743484a00bc55e74e35c2081e23acdbdd9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbba743484a00bc55e74e35c2… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:18 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetBoolArray. --- dlls/d3dx9_36/shader.c | 4 ++-- dlls/d3dx9_36/tests/shader.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 350b83a..800622c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -953,9 +953,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *if { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, b, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, b, count); - return E_NOTIMPL; + return set_scalar_array(iface, device, constant, b, count, D3DXPT_BOOL); } static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index bdccb96..91001be 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -621,6 +621,7 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) static const D3DXVECTOR4 fvecarray[2] = { {0.745f, 0.997f, 0.353f, 0.237f}, {0.060f, 0.455f, 0.333f, 0.983f}}; + static BOOL barray[4] = {FALSE, 100, TRUE, TRUE}; ID3DXConstantTable *ctable; @@ -672,6 +673,9 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) res = ID3DXConstantTable_SetMatrixArray(ctable, device, "fmtxarray", fmtxarray, 2); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixArray failed: got 0x%08x\n", res); + res = ID3DXConstantTable_SetBoolArray(ctable, device, "barray", barray, 2); + ok(res == D3D_OK, "ID3DXConstantTable_SetBoolArray failed: got 0x%08x\n", res); + /* Read back constants */ IDirect3DDevice9_GetVertexShaderConstantF(device, 8, out, 4); ok(out[0] == farray[0] && out[4] == farray[1] && out[8] == farray[2] && out[12] == farray[3], @@ -686,6 +690,13 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) fvecarray[0].x, fvecarray[0].y, fvecarray[0].z, fvecarray[0].w, fvecarray[1].x, fvecarray[1].y, fvecarray[1].z, fvecarray[1].w); + IDirect3DDevice9_GetVertexShaderConstantF(device, 14, out, 2); + ok(out[0] == 0.0f && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f + && out[4] == 1.0f && out[5] == 0.0f && out[6] == 0.0f && out[7] == 0.0f, + "The variable barray was not set correctly, out={%f, %f %f, %f; %f, %f, %f, %f}, should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], + 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f); + IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 8); /* Just check a few elements in each matrix to make sure fmtxarray was set row-major */ ok(out[0] == S(U(fmtxarray[0]))._11 && out[1] == S(U(fmtxarray[0]))._12 && out[2] == S(U(fmtxarray[0]))._13 && out[3] == S(U(fmtxarray[0]))._14,

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetBool.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: d2bbbc712e47a77dc062c73c4ebc30cb4888a0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bbbc712e47a77dc062c73c4… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:17 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetBool. --- dlls/d3dx9_36/shader.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 728bff2..350b83a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -857,7 +857,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant return NULL; } -static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, const void *data, +static HRESULT set_scalar_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, UINT count, D3DXPARAMETER_TYPE type) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -876,7 +876,7 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi switch (desc.RegisterSet) { case D3DXRS_FLOAT4: - for (i = 0; i < count && i < desc.RegisterCount; i++) + for (i = 0; i < min(count, desc.RegisterCount); i++) { /* We need the for loop since each IDirect3DDevice9_Set*ShaderConstantF expects a float4 */ switch(type) @@ -887,8 +887,11 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi case D3DXPT_INT: row[0] = (float)((int *)data)[i]; break; + case D3DXPT_BOOL: + row[0] = ((BOOL *)data)[i] ? 1.0f : 0.0f; + break; default: - FIXME("Unhandled type passed to set_float_array\n"); + FIXME("Unhandled type %#x\n", type); return D3DERR_INVALIDCALL; } set_float_shader_constant(This, device, desc.RegisterIndex + i, row, 1); @@ -940,9 +943,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(ID3DXConstantTable *iface, { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %d): stub\n", This, device, constant, b); + TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, b); - return E_NOTIMPL; + return set_scalar_array(iface, device, constant, &b, 1, D3DXPT_BOOL); } static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -961,7 +964,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, L TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, n); - return ID3DXConstantTable_SetIntArray(iface, device, constant, &n, 1); + return set_scalar_array(iface, device, constant, &n, 1, D3DXPT_INT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -971,7 +974,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *ifa TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, n, count); - return set_float_array(iface, device, constant, n, count, D3DXPT_INT); + return set_scalar_array(iface, device, constant, n, count, D3DXPT_INT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -981,7 +984,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, TRACE("(%p)->(%p, %p, %f)\n", This, device, constant, f); - return ID3DXConstantTable_SetFloatArray(iface, device, constant, &f, 1); + return set_scalar_array(iface, device, constant, &f, 1, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -991,7 +994,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *i TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, f, count); - return set_float_array(iface, device, constant, f, count, D3DXPT_FLOAT); + return set_scalar_array(iface, device, constant, f, count, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Jacek Caban : mshtml: Added more IHTMLObjectElement tests.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: e4492f75695591a2301de6ea56317dfe0686905f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4492f75695591a2301de6ea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:43:19 2012 +0200 mshtml: Added more IHTMLObjectElement tests. --- dlls/mshtml/tests/activex.c | 55 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 02b9d01..ebd2057 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -90,6 +90,7 @@ DEFINE_EXPECT(QI_ITestActiveX); DEFINE_EXPECT(wrapped_AddRef); DEFINE_EXPECT(wrapped_Release); DEFINE_EXPECT(wrapped_func); +DEFINE_EXPECT(OnAmbientPropertyChange_UNKNOWN); #define DISPID_SCRIPTPROP 1000 @@ -305,8 +306,15 @@ static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *mMsg) static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + switch(dispID) { + case DISPID_UNKNOWN: + CHECK_EXPECT(OnAmbientPropertyChange_UNKNOWN); + break; + default: + ok(0, "unexpected call %d\n", dispID); + } + + return S_OK; } static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL bFreeze) @@ -1389,6 +1397,7 @@ static void test_object_elem(IHTMLDocument2 *doc) IDispatchEx *dispex; IHTMLElement *elem; IDispatch *disp; + VARIANT v; BSTR str; HRESULT hres; @@ -1420,6 +1429,48 @@ static void test_object_elem(IHTMLDocument2 *doc) test_iface_wrapping(objelem); + hres = IHTMLObjectElement_get_width(objelem, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "300"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLObjectElement_get_height(objelem, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "200"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 400; + SET_EXPECT(OnAmbientPropertyChange_UNKNOWN); + SET_EXPECT(Invoke_ENABLED); + hres = IHTMLObjectElement_put_width(objelem, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); + CHECK_CALLED(Invoke_ENABLED); + + hres = IHTMLObjectElement_get_width(objelem, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "400"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 250; + SET_EXPECT(OnAmbientPropertyChange_UNKNOWN); + SET_EXPECT(Invoke_ENABLED); + hres = IHTMLObjectElement_put_height(objelem, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); + CHECK_CALLED(Invoke_ENABLED); + + hres = IHTMLObjectElement_get_height(objelem, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "250"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLObjectElement_Release(objelem); }

1 0