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

Lucas Zawacki : joy.cpl: Added a Graphical Axis test.
by Alexandre Julliard June 8, 2012

June 8, 2012

1 0

Lucas Zawacki : joy.cpl: Added joystick testing tab and button tests.
by Alexandre Julliard June 8, 2012

June 8, 2012

1 0

Lucas Zawacki : joy.cpl: Added trace messages to show joystick input.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 69dda4cdcd4a00bd6cf9cc859868711df9d74e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69dda4cdcd4a00bd6cf9cc859… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Jun 7 14:44:14 2012 -0300 joy.cpl: Added trace messages to show joystick input. --- dlls/joy.cpl/main.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 1c8b6ac..2882575 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -174,6 +174,20 @@ INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) * Joystick testing functions * */ +static void dump_joy_state(DIJOYSTATE* st, int num_buttons) +{ + int i; + TRACE("Ax (% 5d,% 5d,% 5d)\n", st->lX,st->lY, st->lZ); + TRACE("RAx (% 5d,% 5d,% 5d)\n", st->lRx, st->lRy, st->lRz); + TRACE("Slider (% 5d,% 5d)\n", st->rglSlider[0], st->rglSlider[1]); + TRACE("Pov (% 5d,% 5d,% 5d,% 5d)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]); + + TRACE("Buttons "); + for(i=0; i < num_buttons; i++) + TRACE(" %c",st->rgbButtons[i] ? 'x' : 'o'); + TRACE("\n"); +} + static void poll_input(const struct Joystick *joy, DIJOYSTATE *state) { HRESULT hr; @@ -205,6 +219,8 @@ static DWORD WINAPI input_thread(void *param) int i; poll_input(&data->joysticks[data->chosen_joystick], &state); + dump_joy_state(&state, data->joysticks[data->chosen_joystick].num_buttons); + /* Indicate pressed buttons */ for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) if (state.rgbButtons[i])

1 0

Vincent Povirk : include: Add declarations for metadata handler info interfaces.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: eae43717dba764a7e2ed58ca21311dccf0c23e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae43717dba764a7e2ed58ca2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 31 10:56:46 2012 -0500 include: Add declarations for metadata handler info interfaces. --- include/wincodecsdk.idl | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 3089ebc..e39b99b 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -48,6 +48,21 @@ cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72, cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90,0x19,0x0b,0xf9,0x6d,0x8a,0x9e,0xe6);") cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xbf,0x9b,0x77,0x89,0x81,0x50,0xa4,0x42);") +typedef struct WICMetadataPattern { + ULARGE_INTEGER Position; + ULONG Length; + BYTE *Pattern; + BYTE *Mask; + ULARGE_INTEGER DataOffset; +} WICMetadataPattern; + +typedef struct WICMetadataHeader { + ULARGE_INTEGER Position; + ULONG Length; + BYTE *Header; + ULARGE_INTEGER DataOffset; +} WICMetadataHeader; + [ object, uuid(aba958bf-c672-44d1-8d61-ce6df2e682c2) @@ -114,6 +129,29 @@ interface IWICMetadataReader : IUnknown [ object, + uuid(eebf1f5b-07c1-4447-a3ab-22acaf78a804) +] +interface IWICMetadataReaderInfo : IWICMetadataHandlerInfo +{ + [local] + HRESULT GetPatterns( + [in] REFGUID guidContainerFormat, + [in] UINT cbSize, + [out, unique] WICMetadataPattern *pPattern, + [out, unique] UINT *pcCount, + [out, unique] UINT *pcbActual); + + HRESULT MatchesPattern( + [in] REFGUID guidContainerFormat, + [in] IStream *pIStream, + [out] BOOL *pfMatches); + + HRESULT CreateInstance( + [out] IWICMetadataReader **ppIReader); +} + +[ + object, uuid(f7836e16-3be0-470b-86bb-160d0aecd7de) ] interface IWICMetadataWriter : IWICMetadataReader @@ -139,6 +177,23 @@ interface IWICMetadataWriter : IWICMetadataReader [ object, + uuid(b22e3fba-3925-4323-b5c1-9ebfc430f236) +] +interface IWICMetadataWriterInfo : IWICMetadataHandlerInfo +{ + [local] + HRESULT GetHeader( + [in] REFGUID guidContainerFormat, + [in] UINT cbSize, + [out, unique] WICMetadataHeader *pHeader, + [out, unique] UINT *pcbActual); + + HRESULT CreateInstance( + [out] IWICMetadataWriter **ppIWriter); +} + +[ + object, uuid(feaa2a8d-b3f3-43e4-b25c-d1de990a1ae1) ] interface IWICMetadataBlockReader : IUnknown

1 0

Józef Kucia : d3dx9/tests: Add tests for device state changes for ID3DXRenderToSurface interface.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: cda45bca926fd166cfb1307afe0d559fe36272d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda45bca926fd166cfb1307af… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jun 7 16:52:01 2012 +0200 d3dx9/tests: Add tests for device state changes for ID3DXRenderToSurface interface. --- dlls/d3dx9_36/tests/core.c | 187 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 187 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 75c4568..a19e570 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -618,6 +618,191 @@ static void check_ID3DXRenderToSurface(IDirect3DDevice9 *device, UINT width, UIN check_release((IUnknown *)render, 0); } +struct device_state +{ + IDirect3DSurface9 *render_target; + IDirect3DSurface9 *depth_stencil; + D3DVIEWPORT9 viewport; +}; + +static void release_device_state(struct device_state *state) +{ + if (state->render_target) IDirect3DSurface9_Release(state->render_target); + if (state->depth_stencil) IDirect3DSurface9_Release(state->depth_stencil); + memset(state, 0, sizeof(*state)); +} + +static HRESULT retrieve_device_state(IDirect3DDevice9 *device, struct device_state *state) +{ + HRESULT hr; + + memset(state, 0, sizeof(*state)); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &state->render_target); + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &state->depth_stencil); + if (hr == D3DERR_NOTFOUND) + state->depth_stencil = NULL; + else if (FAILED(hr)) + goto cleanup; + + hr = IDirect3DDevice9_GetViewport(device, &state->viewport); + if (SUCCEEDED(hr)) return hr; + +cleanup: + release_device_state(state); + return hr; +} + +static HRESULT apply_device_state(IDirect3DDevice9 *device, struct device_state *state) +{ + HRESULT hr; + HRESULT status = D3D_OK; + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, state->render_target); + if (FAILED(hr)) status = hr; + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, state->depth_stencil); + if (FAILED(hr)) status = hr; + + hr = IDirect3DDevice9_SetViewport(device, &state->viewport); + if (FAILED(hr)) status = hr; + + return status; +} + +static void compare_device_state(struct device_state *state1, struct device_state *state2, BOOL equal) +{ + BOOL cmp; + const char *message = equal ? "differs" : "is the same"; + + cmp = state1->render_target == state2->render_target; + ok(equal ? cmp : !cmp, "Render target %s %p, %p\n", message, state1->render_target, state2->render_target); + + cmp = state1->depth_stencil == state2->depth_stencil; + ok(equal ? cmp : !cmp, "Depth stencil surface %s %p, %p\n", message, state1->depth_stencil, state2->depth_stencil); + + cmp = state1->viewport.X == state2->viewport.X && state1->viewport.Y == state2->viewport.Y + && state1->viewport.Width == state2->viewport.Width && state1->viewport.Height == state2->viewport.Height; + ok(equal ? cmp : !cmp, "Viewport %s (%u, %u, %u, %u), (%u, %u, %u, %u)\n", message, + state1->viewport.X, state1->viewport.Y, state1->viewport.Width, state1->viewport.Height, + state2->viewport.X, state2->viewport.Y, state2->viewport.Width, state2->viewport.Height); +} + +static void test_ID3DXRenderToSurface_device_state(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DSurface9 *surface = NULL; + ID3DXRenderToSurface *render = NULL; + struct device_state pre_state; + struct device_state current_state; + IDirect3DSurface9 *depth_stencil_surface; + + /* make sure there is a depth stencil surface present */ + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &depth_stencil_surface); + if (SUCCEEDED(hr)) + { + IDirect3DSurface9_Release(depth_stencil_surface); + depth_stencil_surface = NULL; + } + else if (hr == D3DERR_NOTFOUND) + { + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 256, 256, D3DFMT_D24X8, + D3DMULTISAMPLE_NONE, 0, TRUE, &depth_stencil_surface, NULL); + if (SUCCEEDED(hr)) IDirect3DDevice9_SetDepthStencilSurface(device, depth_stencil_surface); + } + + if (FAILED(hr)) + { + skip("Failed to create depth stencil surface\n"); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, + FALSE, &surface, NULL); + if (FAILED(hr)) + { + skip("Failed to create render target\n"); + goto cleanup; + } + + hr = retrieve_device_state(device, &pre_state); + + hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, TRUE, D3DFMT_D24X8, &render); + ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + hr = ID3DXRenderToSurface_BeginScene(render, surface, NULL); + ok(hr == D3D_OK, "ID3DXRenderToSurface::BeginScene returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, FALSE); + release_device_state(&current_state); + + hr = ID3DXRenderToSurface_EndScene(render, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "ID3DXRenderToSurface::EndScene returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, TRUE); + release_device_state(&current_state); + + check_release((IUnknown *)render, 0); + } + + hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); + if (SUCCEEDED(hr)) + { + hr = ID3DXRenderToSurface_BeginScene(render, surface, NULL); + ok(hr == D3D_OK, "ID3DXRenderToSurface::BeginScene returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, FALSE); + release_device_state(&current_state); + + hr = ID3DXRenderToSurface_EndScene(render, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "ID3DXRenderToSurface::EndScene returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, TRUE); + release_device_state(&current_state); + + hr = ID3DXRenderToSurface_BeginScene(render, surface, NULL); + ok(hr == D3D_OK, "ID3DXRenderToSurface::BeginScene returned %#x, expected %#x\n", hr, D3D_OK); + + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, FALSE); + release_device_state(&current_state); + + /* if EndScene isn't called, the device state isn't restored */ + hr = retrieve_device_state(device, &current_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); + compare_device_state(&current_state, &pre_state, FALSE); + release_device_state(&current_state); + + hr = apply_device_state(device, &pre_state); + ok(SUCCEEDED(hr), "Failed to restore previous device state\n"); + + check_release((IUnknown *)render, 0); + } + + release_device_state(&pre_state); + +cleanup: + if (depth_stencil_surface) + { + IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + IDirect3DSurface9_Release(depth_stencil_surface); + } + + if (surface) check_release((IUnknown *)surface, 0); +} + static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) { int i; @@ -694,6 +879,8 @@ static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, TRUE); check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, FALSE); } + + test_ID3DXRenderToSurface_device_state(device); } START_TEST(core)

1 0

Józef Kucia : d3dx9/tests: Add tests for ID3DXRenderToSurface interface.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: bccda19e8fb8facd33281360f40021267f0a531d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bccda19e8fb8facd33281360f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jun 7 16:52:00 2012 +0200 d3dx9/tests: Add tests for ID3DXRenderToSurface interface. --- dlls/d3dx9_36/tests/core.c | 192 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 181 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bccda19e8fb8facd33281…

1 0

Józef Kucia : d3dx9: Implement ID3DXRenderToSurface:: BeginScene and ID3DXRenderToSurface::EndScene.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: c0e583af6d8a81db7f00dc3498647029804684d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e583af6d8a81db7f00dc349… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jun 7 16:51:59 2012 +0200 d3dx9: Implement ID3DXRenderToSurface::BeginScene and ID3DXRenderToSurface::EndScene. --- dlls/d3dx9_36/render.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 210 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0e583af6d8a81db7f00d…

1 0

Vincent Povirk : windowscodecs: Add stub IWICMetadataBlockReader to PNG decoder.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 434e7b8e1e5399a2b891c3a39532b4d82adafbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434e7b8e1e5399a2b891c3a39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 30 16:08:16 2012 -0500 windowscodecs: Add stub IWICMetadataBlockReader to PNG decoder. --- dlls/windowscodecs/pngformat.c | 71 +++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 12 +++--- 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index ce99509..c440d3e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -31,6 +31,7 @@ #include "winbase.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wincodecs_private.h" @@ -152,6 +153,7 @@ static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; png_structp png_ptr; png_infop info_ptr; @@ -175,6 +177,11 @@ static inline PngDecoder *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode return CONTAINING_RECORD(iface, PngDecoder, IWICBitmapFrameDecode_iface); } +static inline PngDecoder *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, PngDecoder, IWICMetadataBlockReader_iface); +} + static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl; static HRESULT WINAPI PngDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, @@ -559,6 +566,7 @@ static const IWICBitmapDecoderVtbl PngDecoder_Vtbl = { static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); if (!ppv) return E_INVALIDARG; if (IsEqualIID(&IID_IUnknown, iid) || @@ -567,6 +575,10 @@ static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *ifa { *ppv = iface; } + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) + { + *ppv = (void**)&This->IWICMetadataBlockReader_iface; + } else { *ppv = NULL; @@ -744,6 +756,64 @@ static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl = { PngDecoder_Frame_GetThumbnail }; +static HRESULT WINAPI PngDecoder_Block_QueryInterface(IWICMetadataBlockReader *iface, REFIID iid, + void **ppv) +{ + PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); +} + +static ULONG WINAPI PngDecoder_Block_AddRef(IWICMetadataBlockReader *iface) +{ + PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI PngDecoder_Block_Release(IWICMetadataBlockReader *iface) +{ + PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI PngDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, + GUID *pguidContainerFormat) +{ + if (!pguidContainerFormat) return E_INVALIDARG; + memcpy(pguidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID)); + return S_OK; +} + +static HRESULT WINAPI PngDecoder_Block_GetCount(IWICMetadataBlockReader *iface, + UINT *pcCount) +{ + FIXME("%p,%p: stub\n", iface, pcCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, + UINT nIndex, IWICMetadataReader **ppIMetadataReader) +{ + FIXME("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, + IEnumUnknown **ppIEnumMetadata) +{ + FIXME("%p,%p\n", iface, ppIEnumMetadata); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl PngDecoder_BlockVtbl = { + PngDecoder_Block_QueryInterface, + PngDecoder_Block_AddRef, + PngDecoder_Block_Release, + PngDecoder_Block_GetContainerFormat, + PngDecoder_Block_GetCount, + PngDecoder_Block_GetReaderByIndex, + PngDecoder_Block_GetEnumerator, +}; + HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) { PngDecoder *This; @@ -766,6 +836,7 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->IWICBitmapDecoder_iface.lpVtbl = &PngDecoder_Vtbl; This->IWICBitmapFrameDecode_iface.lpVtbl = &PngDecoder_FrameVtbl; + This->IWICMetadataBlockReader_iface.lpVtbl = &PngDecoder_BlockVtbl; This->ref = 1; This->png_ptr = NULL; This->info_ptr = NULL; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index b87c5c4..9f74c0a 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -569,7 +569,7 @@ static void test_metadata_png(void) ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void**)&blockreader); - todo_wine ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { @@ -581,11 +581,11 @@ static void test_metadata_png(void) ok(IsEqualGUID(&containerformat, &GUID_ContainerFormatPng), "unexpected container format\n"); hr = IWICMetadataBlockReader_GetCount(blockreader, NULL); - ok(hr == E_INVALIDARG, "GetCount failed, hr=%x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "GetCount failed, hr=%x\n", hr); hr = IWICMetadataBlockReader_GetCount(blockreader, &count); - ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - ok(count == 1, "unexpected count %d\n", count); + todo_wine ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + todo_wine ok(count == 1, "unexpected count %d\n", count); if (0) { @@ -595,7 +595,7 @@ static void test_metadata_png(void) } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); - ok(hr == S_OK, "GetReaderByIndex failed, hr=%x\n", hr); + todo_wine ok(hr == S_OK, "GetReaderByIndex failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { @@ -608,7 +608,7 @@ static void test_metadata_png(void) } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 1, &reader); - ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "GetReaderByIndex failed, hr=%x\n", hr); + todo_wine ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "GetReaderByIndex failed, hr=%x\n", hr); IWICMetadataBlockReader_Release(blockreader); }

1 0

Vincent Povirk : windowscodecs: Add test for IWICMetadataBlockReader interface.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 8fdddd8779e9d21d13bbfa842328b81f64ef0d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdddd8779e9d21d13bbfa842… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 30 15:33:32 2012 -0500 windowscodecs: Add test for IWICMetadataBlockReader interface. --- dlls/windowscodecs/tests/metadata.c | 91 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 1 + 2 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 70a3913..b87c5c4 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -91,6 +91,16 @@ static const char metadata_tEXt[] = { 0x3f,0x64,0x19,0xf3 /* chunk CRC */ }; +static const char pngimage[285] = { +0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, +0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, +0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, +0x13,0x01,0x00,0x9a,0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xd5, +0x06,0x03,0x0f,0x07,0x2d,0x12,0x10,0xf0,0xfd,0x00,0x00,0x00,0x0c,0x49,0x44,0x41, +0x54,0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59, +0xe7,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 +}; + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -530,6 +540,86 @@ todo_wine IWICComponentFactory_Release(factory); } +static void test_metadata_png(void) +{ + IStream *stream; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICMetadataBlockReader *blockreader; + IWICMetadataReader *reader; + GUID containerformat; + HRESULT hr; + UINT count; + + hr = CoCreateInstance(&CLSID_WICPngDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + if (FAILED(hr)) return; + + stream = create_stream(pngimage, sizeof(pngimage)); + + hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICMetadataBlockReader, (void**)&blockreader); + ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); + + hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void**)&blockreader); + todo_wine ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataBlockReader_GetContainerFormat(blockreader, NULL); + ok(hr == E_INVALIDARG, "GetContainerFormat failed, hr=%x\n", hr); + + hr = IWICMetadataBlockReader_GetContainerFormat(blockreader, &containerformat); + ok(hr == S_OK, "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&containerformat, &GUID_ContainerFormatPng), "unexpected container format\n"); + + hr = IWICMetadataBlockReader_GetCount(blockreader, NULL); + ok(hr == E_INVALIDARG, "GetCount failed, hr=%x\n", hr); + + hr = IWICMetadataBlockReader_GetCount(blockreader, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %d\n", count); + + if (0) + { + /* Crashes on Windows XP */ + hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, NULL); + ok(hr == E_INVALIDARG, "GetReaderByIndex failed, hr=%x\n", hr); + } + + hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); + ok(hr == S_OK, "GetReaderByIndex failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetMetadataFormat(reader, &containerformat); + ok(IsEqualGUID(&containerformat, &GUID_MetadataFormatChunktIME) || + broken(IsEqualGUID(&containerformat, &GUID_MetadataFormatUnknown)) /* Windows XP */, + "unexpected container format\n"); + + IWICMetadataReader_Release(reader); + } + + hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 1, &reader); + ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "GetReaderByIndex failed, hr=%x\n", hr); + + IWICMetadataBlockReader_Release(blockreader); + } + + IWICBitmapFrameDecode_Release(frame); + + IWICBitmapDecoder_Release(decoder); + + IWICStream_Release(stream); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -539,6 +629,7 @@ START_TEST(metadata) test_metadata_IFD(); test_metadata_Exif(); test_create_reader(); + test_metadata_png(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 55e3654..3089ebc 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -37,6 +37,7 @@ typedef enum WICMetadataCreationOptions { cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktIME, 0x6b00ae2d,0xe24b,0x460a,0x98,0xb6,0x87,0x8b,0xd0,0x30,0x72,0xfd);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatIfd, 0x537396c6,0x2d8a,0x4bb6,0x9b,0xf8,0x2f,0x0a,0x8e,0x2a,0x3a,0xdf);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatExif, 0x1c3c4f9d,0xb84a,0x467d,0x94,0x93,0x36,0xcf,0xbd,0x59,0xea,0x57);")

1 0

Vincent Povirk : windowscodecs: Add test for IWICMetadataReaderInfo.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 46991dc9fb74229011d3b427d1e4f13d39752752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46991dc9fb74229011d3b427d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 31 12:38:34 2012 -0500 windowscodecs: Add test for IWICMetadataReaderInfo. --- dlls/windowscodecs/tests/info.c | 143 +++++++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 3 + 2 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index de2dd32..cd89a40 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -24,6 +24,7 @@ #include "windef.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wine/test.h" static void test_decoder_info(void) @@ -91,11 +92,153 @@ static void test_decoder_info(void) IWICImagingFactory_Release(factory); } +static void test_reader_info(void) +{ + IWICImagingFactory *factory; + IWICComponentInfo *info; + IWICMetadataReaderInfo *reader_info; + HRESULT hr; + CLSID clsid; + GUID container_formats[10]; + UINT count, size; + WICMetadataPattern *patterns; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICUnknownMetadataReader, &info); + todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + + if (FAILED(hr)) + { + IWICImagingFactory_Release(factory); + return; + } + + hr = IWICComponentInfo_QueryInterface(info, &IID_IWICMetadataReaderInfo, (void**)&reader_info); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + hr = IWICMetadataReaderInfo_GetCLSID(reader_info, NULL); + ok(hr == E_INVALIDARG, "GetCLSID failed, hr=%x\n", hr); + + hr = IWICMetadataReaderInfo_GetCLSID(reader_info, &clsid); + ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr); + ok(IsEqualGUID(&CLSID_WICUnknownMetadataReader, &clsid), "GetCLSID returned wrong result\n"); + + hr = IWICMetadataReaderInfo_GetMetadataFormat(reader_info, &clsid); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&GUID_MetadataFormatUnknown, &clsid), "GetMetadataFormat returned wrong result\n"); + + hr = IWICMetadataReaderInfo_GetContainerFormats(reader_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetContainerFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetContainerFormats(reader_info, 0, NULL, &count); + ok(hr == S_OK, "GetContainerFormats failed, hr=%x\n", hr); + ok(count == 0, "unexpected count %d\n", count); + + hr = IWICMetadataReaderInfo_GetPatterns(reader_info, &GUID_ContainerFormatPng, + 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "GetPatterns failed, hr=%x\n", hr); + + count = size = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetPatterns(reader_info, &GUID_ContainerFormatPng, + 0, NULL, &count, &size); + ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND || broken(hr == S_OK) /* Windows XP */, + "GetPatterns failed, hr=%x\n", hr); + ok(count == 0xdeadbeef, "unexpected count %d\n", count); + ok(size == 0xdeadbeef, "unexpected size %d\n", size); + + IWICMetadataReaderInfo_Release(reader_info); + + IWICComponentInfo_Release(info); + + hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICXMBStructMetadataReader, &info); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + + hr = IWICComponentInfo_QueryInterface(info, &IID_IWICMetadataReaderInfo, (void**)&reader_info); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + hr = IWICMetadataReaderInfo_GetCLSID(reader_info, NULL); + ok(hr == E_INVALIDARG, "GetCLSID failed, hr=%x\n", hr); + + hr = IWICMetadataReaderInfo_GetCLSID(reader_info, &clsid); + ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr); + ok(IsEqualGUID(&CLSID_WICXMBStructMetadataReader, &clsid), "GetCLSID returned wrong result\n"); + + hr = IWICMetadataReaderInfo_GetMetadataFormat(reader_info, &clsid); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&GUID_MetadataFormatXMPStruct, &clsid), "GetMetadataFormat returned wrong result\n"); + + hr = IWICMetadataReaderInfo_GetContainerFormats(reader_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetContainerFormats failed, hr=%x\n", hr); + + count = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetContainerFormats(reader_info, 0, NULL, &count); + ok(hr == S_OK, "GetContainerFormats failed, hr=%x\n", hr); + ok(count >= 2, "unexpected count %d\n", count); + + count = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetContainerFormats(reader_info, 1, container_formats, &count); + ok(hr == S_OK, "GetContainerFormats failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %d\n", count); + + count = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetContainerFormats(reader_info, 10, container_formats, &count); + ok(hr == S_OK, "GetContainerFormats failed, hr=%x\n", hr); + ok(count == min(count, 10), "unexpected count %d\n", count); + + count = size = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetPatterns(reader_info, &GUID_ContainerFormatPng, + 0, NULL, &count, &size); + ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND || broken(hr == S_OK) /* Windows XP */, + "GetPatterns failed, hr=%x\n", hr); + ok(count == 0xdeadbeef, "unexpected count %d\n", count); + ok(size == 0xdeadbeef, "unexpected size %d\n", size); + + count = size = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetPatterns(reader_info, &GUID_MetadataFormatXMP, + 0, NULL, &count, &size); + ok(hr == S_OK, "GetPatterns failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %d\n", count); + ok(size > sizeof(WICMetadataPattern), "unexpected size %d\n", size); + + if (hr == S_OK) + { + patterns = HeapAlloc(GetProcessHeap(), 0, size); + + count = size = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetPatterns(reader_info, &GUID_MetadataFormatXMP, + size-1, patterns, &count, &size); + ok(hr == S_OK, "GetPatterns failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %d\n", count); + ok(size > sizeof(WICMetadataPattern), "unexpected size %d\n", size); + + count = size = 0xdeadbeef; + hr = IWICMetadataReaderInfo_GetPatterns(reader_info, &GUID_MetadataFormatXMP, + size, patterns, &count, &size); + ok(hr == S_OK, "GetPatterns failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %d\n", count); + ok(size == sizeof(WICMetadataPattern) + patterns->Length * 2, "unexpected size %d\n", size); + + HeapFree(GetProcessHeap(), 0, patterns); + } + + IWICMetadataReaderInfo_Release(reader_info); + + IWICComponentInfo_Release(info); + + IWICImagingFactory_Release(factory); +} + START_TEST(info) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_decoder_info(); + test_reader_info(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index e39b99b..0a8a531 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -40,6 +40,8 @@ cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktIME, 0x6b00ae2d,0xe24b,0x460a,0x98,0xb6,0x87,0x8b,0xd0,0x30,0x72,0xfd);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatIfd, 0x537396c6,0x2d8a,0x4bb6,0x9b,0xf8,0x2f,0x0a,0x8e,0x2a,0x3a,0xdf);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatExif, 0x1c3c4f9d,0xb84a,0x467d,0x94,0x93,0x36,0xcf,0xbd,0x59,0xea,0x57);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatXMP, 0xbb5acc38,0xf216,0x4cec,0xa6,0xc5,0x5f,0x6e,0x73,0x97,0x63,0xa9);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatXMPStruct, 0x22383cf1,0xed17,0x4e2e,0xaf,0x17,0xd8,0x5b,0x8f,0x6b,0x30,0xd0);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") @@ -47,6 +49,7 @@ cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a, cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90,0x19,0x0b,0xf9,0x6d,0x8a,0x9e,0xe6);") cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xbf,0x9b,0x77,0x89,0x81,0x50,0xa4,0x42);") +cpp_quote("DEFINE_GUID(CLSID_WICXMBStructMetadataReader, 0x01b90d9a,0x8209,0x47f7,0x9c,0x52,0xe1,0x24,0x4b,0xf5,0x0c,0xed);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0