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

Józef Kucia : d3dx9: Fix ID3DXConstantTable::SetVector .
by Alexandre Julliard 16 Aug '12

16 Aug '12

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: Fix ID3DXConstantTable::SetMatrix .
by Alexandre Julliard 16 Aug '12

16 Aug '12

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

Vincent Povirk : windowscodecs: Implement IWICBitmap::CopyPixels.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 54a3134194cd2cdfd6ba3362a72bf571c33ea786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a3134194cd2cdfd6ba3362a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 15:36:30 2012 -0500 windowscodecs: Implement IWICBitmap::CopyPixels. --- dlls/windowscodecs/bitmap.c | 8 +++++--- dlls/windowscodecs/tests/bitmap.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 8a03c68..0f93c76 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -300,9 +300,11 @@ static HRESULT WINAPI BitmapImpl_CopyPalette(IWICBitmap *iface, static HRESULT WINAPI BitmapImpl_CopyPixels(IWICBitmap *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - return E_NOTIMPL; + return copy_pixels(This->bpp, This->data, This->width, This->height, + This->stride, prc, cbStride, cbBufferSize, pbBuffer); } static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock, @@ -426,7 +428,7 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, datasize = stride * uiHeight; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); - data = HeapAlloc(GetProcessHeap(), 0, datasize); + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); if (!This || !data) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 4de4855..f772e0d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -85,7 +85,7 @@ static void test_createbitmap(void) /* pixel data is initially zeroed */ hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, 27, returned_data); - todo_wine ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); + ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); for (i=0; i<27; i++) ok(returned_data[i] == 0, "returned_data[%i] == %i\n", i, returned_data[i]); @@ -193,10 +193,10 @@ static void test_createbitmap(void) /* test that the data we wrote is returned by CopyPixels */ hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, 27, returned_data); - todo_wine ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); + ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); for (i=0; i<27; i++) - todo_wine ok(returned_data[i] == bitmap_data[i], "returned_data[%i] == %i\n", i, returned_data[i]); + ok(returned_data[i] == bitmap_data[i], "returned_data[%i] == %i\n", i, returned_data[i]); /* try a valid partial rect, and write mode */ rc.X = 2;

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmap::GetPixelFormat.
by Alexandre Julliard 16 Aug '12

16 Aug '12

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: Implement IWICBitmap::GetSize.
by Alexandre Julliard 16 Aug '12

16 Aug '12

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

Vincent Povirk : windowscodecs: Implement IWICBitmap:: SetResolution and GetResolution.
by Alexandre Julliard 16 Aug '12

16 Aug '12

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: Add test for IWICImagingFactory:: CreateBitmapFromSource.
by Alexandre Julliard 16 Aug '12

16 Aug '12

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

Aric Stewart : usp10: Implement MarkToMark Attachment Positioning Subtable.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: af318c5fd096fba047e6a2984ee330d295c05979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af318c5fd096fba047e6a2984… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 16 08:03:58 2012 -0500 usp10: Implement MarkToMark Attachment Positioning Subtable. --- dlls/usp10/opentype.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 05ac53f..fe4bde4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -391,6 +391,24 @@ typedef struct { } GPOS_MarkArray; typedef struct { + WORD PosFormat; + WORD Mark1Coverage; + WORD Mark2Coverage; + WORD ClassCount; + WORD Mark1Array; + WORD Mark2Array; +} GPOS_MarkMarkPosFormat1; + +typedef struct { + WORD Mark2Anchor[1]; +} GPOS_Mark2Record; + +typedef struct { + WORD Mark2Count; + GPOS_Mark2Record Mark2Record[1]; +} GPOS_Mark2Array; + +typedef struct { WORD SequenceIndex; WORD LookupListIndex; } GPOS_PosLookupRecord; @@ -1292,6 +1310,71 @@ static VOID GPOS_apply_MarkToBase(const OT_LookupTable *look, const WORD *glyphs } } +static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT pt) +{ + int j; + + TRACE("MarkToMark Attachment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GPOS_MarkMarkPosFormat1 *mmpf1; + offset = GET_BE_WORD(look->SubTable[j]); + mmpf1 = (const GPOS_MarkMarkPosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(mmpf1->PosFormat) == 1) + { + int offset = GET_BE_WORD(mmpf1->Mark1Coverage); + int mark_index; + mark_index = GSUB_is_glyph_covered((const BYTE*)mmpf1+offset, glyphs[glyph_index]); + if (mark_index != -1) + { + int mark2_index; + offset = GET_BE_WORD(mmpf1->Mark2Coverage); + mark2_index = GSUB_is_glyph_covered((const BYTE*)mmpf1+offset, glyphs[glyph_index - write_dir]); + if (mark2_index != -1) + { + const GPOS_MarkArray *ma; + const GPOS_MarkRecord *mr; + const GPOS_Mark2Array *m2a; + const GPOS_Mark2Record *m2r; + int mark_class; + int class_count = GET_BE_WORD(mmpf1->ClassCount); + int mark2record_size; + POINT mark2_pt; + POINT mark_pt; + TRACE("Mark %x(%i) and Mark2 %x(%i)\n",glyphs[glyph_index], mark_index, glyphs[glyph_index - write_dir], mark2_index); + offset = GET_BE_WORD(mmpf1->Mark1Array); + ma = (const GPOS_MarkArray*)((const BYTE*)mmpf1 + offset); + if (mark_index > GET_BE_WORD(ma->MarkCount)) + { + ERR("Mark index exeeded mark count\n"); + return; + } + mr = &ma->MarkRecord[mark_index]; + mark_class = GET_BE_WORD(mr->Class); + TRACE("Mark Class %i total classes %i\n",mark_class,class_count); + offset = GET_BE_WORD(mmpf1->Mark2Array); + m2a = (const GPOS_Mark2Array*)((const BYTE*)mmpf1 + offset); + mark2record_size = class_count * sizeof(WORD); + m2r = (const GPOS_Mark2Record*)((const BYTE*)m2a + sizeof(WORD) + (mark2record_size * mark2_index)); + offset = GET_BE_WORD(m2r->Mark2Anchor[mark_class]); + GPOS_get_anchor_values((const BYTE*)m2a + offset, &mark2_pt, ppem); + offset = GET_BE_WORD(mr->MarkAnchor); + GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); + TRACE("Offset on mark2 is %i,%i design units\n",mark2_pt.x,mark2_pt.y); + TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + pt->x += mark2_pt.x - mark_pt.x; + pt->y += mark2_pt.y - mark_pt.y; + TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + } + } + } + else + FIXME("Unhandled Mark To Mark Format %i\n",GET_BE_WORD(mmpf1->PosFormat)); + } +} + static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, GOFFSET *pGoffset) { int j; @@ -1460,6 +1543,19 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I } break; } + case 6: + { + double devX, devY; + POINT desU = {0,0}; + GPOS_apply_MarkToMark(look, glyphs, glyph_index, write_dir, glyph_count, ppem, &desU); + if (desU.x || desU.y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); + pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index-1].du; + pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index-1].dv; + } + break; + } case 8: { return GPOS_apply_ChainContextPos(lpotm, lplogfont, piAdvance, lookup, look, glyphs, glyph_index, write_dir, glyph_count, ppem, pGoffset);

1 0

Jacek Caban : mshtml: Moved Invoke(DISPID_ENABLED) invocation to separated function.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 31201da6fa4c5cea25dc9e2355ec0ceaee7a2aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=31201da6fa4c5cea25dc9e235… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:42:06 2012 +0200 mshtml: Moved Invoke(DISPID_ENABLED) invocation to separated function. --- dlls/mshtml/pluginhost.c | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index e24131b..8fb0bfb 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -329,6 +329,29 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) IOleInPlaceObject_SetObjectRects(host->ip_object, &host->rect, &host->rect); } +static void notif_enabled(PluginHost *plugin_host) +{ + DISPPARAMS args = {NULL, NULL, 0, 0}; + IDispatch *disp; + ULONG err = 0; + VARIANT res; + HRESULT hres; + + hres = IUnknown_QueryInterface(plugin_host->plugin_unk, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) { + FIXME("Could not get IDispatch iface: %08x\n", hres); + return; + } + + V_VT(&res) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_ENABLED, &IID_NULL, 0/*FIXME*/, DISPATCH_PROPERTYGET, &args, &res, NULL, &err); + IDispatch_Release(disp); + if(SUCCEEDED(hres)) { + FIXME("Got enabled %s\n", debugstr_variant(&res)); + VariantClear(&res); + } +} + HRESULT get_plugin_disp(HTMLPluginContainer *plugin_container, IDispatch **ret) { PluginHost *host; @@ -849,11 +872,6 @@ static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_OnUIActivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - DISPPARAMS args = {NULL, NULL, 0, 0}; - IDispatch *disp; - ULONG err = 0; - VARIANT res; - HRESULT hres; TRACE("(%p)\n", This); @@ -864,20 +882,7 @@ static HRESULT WINAPI PHInPlaceSite_OnUIActivate(IOleInPlaceSiteEx *iface) This->ui_active = TRUE; - hres = IUnknown_QueryInterface(This->plugin_unk, &IID_IDispatch, (void**)&disp); - if(FAILED(hres)) { - FIXME("Could not get IDispatch iface: %08x\n", hres); - return hres; - } - - V_VT(&res) = VT_EMPTY; - hres = IDispatch_Invoke(disp, DISPID_ENABLED, &IID_NULL, 0/*FIXME*/, DISPATCH_PROPERTYGET, &args, &res, NULL, &err); - IDispatch_Release(disp); - if(SUCCEEDED(hres)) { - FIXME("Got enabled %s\n", debugstr_variant(&res)); - VariantClear(&res); - } - + notif_enabled(This); return S_OK; }

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement::put_width implementation.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: d98225fff9d083792c4c324f714bd4b17a7dedd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98225fff9d083792c4c324f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:42:32 2012 +0200 mshtml: Added IHTMLObjectElement::put_width implementation. --- dlls/mshtml/htmlobject.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/pluginhost.c | 17 +++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 0755463..6c21814 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -246,8 +246,33 @@ static HRESULT WINAPI HTMLObjectElement_get_form(IHTMLObjectElement *iface, IHTM static HRESULT WINAPI HTMLObjectElement_put_width(IHTMLObjectElement *iface, VARIANT v) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString width_str; + PRUnichar buf[12]; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + switch(V_VT(&v)) { + case VT_I4: { + static const WCHAR formatW[] = {'%','d',0}; + sprintfW(buf, formatW, V_I4(&v)); + break; + } + default: + FIXME("unimplemented for arg %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&width_str, buf); + nsres = nsIDOMHTMLObjectElement_SetWidth(This->nsobject, &width_str); + nsAString_Finish(&width_str); + if(NS_FAILED(nsres)) { + FIXME("SetWidth failed: %08x\n", nsres); + return E_FAIL; + } + + notif_container_change(&This->plugin_container, DISPID_UNKNOWN); + return S_OK; } static HRESULT WINAPI HTMLObjectElement_get_width(IHTMLObjectElement *iface, VARIANT *p) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8fb0bfb..ee7773f 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -352,6 +352,23 @@ static void notif_enabled(PluginHost *plugin_host) } } +void notif_container_change(HTMLPluginContainer *plugin_container, DISPID dispid) +{ + IOleControl *ole_control; + HRESULT hres; + + if(!plugin_container->plugin_host || !plugin_container->plugin_host->plugin_unk) + return; + + notif_enabled(plugin_container->plugin_host); + + hres = IUnknown_QueryInterface(plugin_container->plugin_host->plugin_unk, &IID_IOleControl, (void**)&ole_control); + if(SUCCEEDED(hres)) { + IOleControl_OnAmbientPropertyChange(ole_control, dispid); + IOleControl_Release(ole_control); + } +} + HRESULT get_plugin_disp(HTMLPluginContainer *plugin_container, IDispatch **ret) { PluginHost *host; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index e3acf61..d776885 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -70,3 +70,4 @@ HRESULT create_ip_frame(IOleInPlaceFrame**) DECLSPEC_HIDDEN; HRESULT get_plugin_disp(HTMLPluginContainer*,IDispatch**) DECLSPEC_HIDDEN; HRESULT get_plugin_dispid(HTMLPluginContainer*,WCHAR*,DISPID*) DECLSPEC_HIDDEN; HRESULT invoke_plugin_prop(HTMLPluginContainer*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*) DECLSPEC_HIDDEN; +void notif_container_change(HTMLPluginContainer*,DISPID);

1 0