September 2012 - Wine-Commits

Dmitry Timoshkov : include/wincodecsdk.idl: Add some missing metadata writer UIDs.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 847cdf3fd0fe7229ccf2c13d8f98ffb7d826a2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847cdf3fd0fe7229ccf2c13d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:26:57 2012 +0900 include/wincodecsdk.idl: Add some missing metadata writer UIDs. --- include/wincodecsdk.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index e681c64..fcf05b6 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -52,8 +52,11 @@ cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39, cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") 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_WICIfdMetadataWriter, 0xb1ebfc28,0xc9bd,0x47a2,0x8d,0x33,0xb9,0x48,0x76,0x97,0x77,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xbf,0x9b,0x77,0x89,0x81,0x50,0xa4,0x42);") +cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataWriter, 0xc9a14cda,0xc339,0x460b,0x90,0x78,0xd4,0xde,0xbc,0xfa,0xbe,0x91);") cpp_quote("DEFINE_GUID(CLSID_WICXMPStructMetadataReader, 0x01b90d9a,0x8209,0x47f7,0x9c,0x52,0xe1,0x24,0x4b,0xf5,0x0c,0xed);") +cpp_quote("DEFINE_GUID(CLSID_WICXMPStructMetadataWriter, 0x22c21f93,0x7ddb,0x411c,0x9b,0x17,0xc5,0xb7,0xbd,0x06,0x4a,0xbc);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

Dmitry Timoshkov : windowscodecs: Add a bunch of tests for Logical Screen Descriptor metadata reader.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 0b0bf572c1e59f95bd8e8a49d32f67ad1ad01b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0bf572c1e59f95bd8e8a49d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:27:48 2012 +0900 windowscodecs: Add a bunch of tests for Logical Screen Descriptor metadata reader. --- dlls/windowscodecs/tests/metadata.c | 81 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 + 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 94a3d3e..6ebeb3e 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1258,6 +1258,86 @@ todo_wine IWICBitmapDecoder_Release(decoder); } +static void test_metadata_LSD(void) +{ + static const WCHAR LSD_name[] = {'L','o','g','i','c','a','l',' ','S','c','r','e','e','n',' ','D','e','s','c','r','i','p','t','o','r',' ','R','e','a','d','e','r',0}; + static const char LSD_data[] = "hello world!\x1\x2\x3\x4\xab\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf"; + static const struct test_data td[9] = + { + { VT_UI1|VT_VECTOR, 0, 6, {'w','o','r','l','d','!'}, NULL, { 'S','i','g','n','a','t','u','r','e',0 } }, + { VT_UI2, 0, 0, { 0x201 }, NULL, { 'W','i','d','t','h',0 } }, + { VT_UI2, 0, 0, { 0x403 }, NULL, { 'H','e','i','g','h','t',0 } }, + { VT_BOOL, 0, 0, { 1 }, NULL, { 'G','l','o','b','a','l','C','o','l','o','r','T','a','b','l','e','F','l','a','g',0 } }, + { VT_UI1, 0, 0, { 2 }, NULL, { 'C','o','l','o','r','R','e','s','o','l','u','t','i','o','n',0 } }, + { VT_BOOL, 0, 0, { 1 }, NULL, { 'S','o','r','t','F','l','a','g',0 } }, + { VT_UI1, 0, 0, { 3 }, NULL, { 'G','l','o','b','a','l','C','o','l','o','r','T','a','b','l','e','S','i','z','e',0 } }, + { VT_UI1, 0, 0, { 6 }, NULL, { 'B','a','c','k','g','r','o','u','n','d','C','o','l','o','r','I','n','d','e','x',0 } }, + { VT_UI1, 0, 0, { 7 }, NULL, { 'P','i','x','e','l','A','s','p','e','c','t','R','a','t','i','o',0 } } + }; + LARGE_INTEGER pos; + HRESULT hr; + IStream *stream; + IWICPersistStream *persist; + IWICMetadataReader *reader; + IWICMetadataHandlerInfo *info; + WCHAR name[64]; + UINT count, dummy; + GUID format; + CLSID id; + + hr = CoCreateInstance(&CLSID_WICLSDMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, + "CoCreateInstance error %#x\n", hr); + + stream = create_stream(LSD_data, sizeof(LSD_data)); + + if (SUCCEEDED(hr)) + { + pos.QuadPart = 6; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IWICPersistStream_Load(persist, stream); + ok(hr == S_OK, "Load error %#x\n", hr); + + IWICPersistStream_Release(persist); + } + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + + compare_metadata(reader, td, count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), "wrong format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); + ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); + + hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + ok(hr == S_OK, "GetCLSID error %#x\n", hr); + ok(IsEqualGUID(&id, &CLSID_WICLSDMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + + hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); + ok(hr == S_OK, "GetFriendlyName error %#x\n", hr); + ok(lstrcmpW(name, LSD_name) == 0, "wrong LSD reader name %s\n", wine_dbgstr_w(name)); + + IWICMetadataHandlerInfo_Release(info); + IWICMetadataReader_Release(reader); + } + + IStream_Release(stream); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1269,6 +1349,7 @@ START_TEST(metadata) test_create_reader(); test_metadata_png(); test_metadata_gif(); + test_metadata_LSD(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index fcf05b6..222ae64 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -57,6 +57,8 @@ cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xb cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataWriter, 0xc9a14cda,0xc339,0x460b,0x90,0x78,0xd4,0xde,0xbc,0xfa,0xbe,0x91);") cpp_quote("DEFINE_GUID(CLSID_WICXMPStructMetadataReader, 0x01b90d9a,0x8209,0x47f7,0x9c,0x52,0xe1,0x24,0x4b,0xf5,0x0c,0xed);") cpp_quote("DEFINE_GUID(CLSID_WICXMPStructMetadataWriter, 0x22c21f93,0x7ddb,0x411c,0x9b,0x17,0xc5,0xb7,0xbd,0x06,0x4a,0xbc);") +cpp_quote("DEFINE_GUID(CLSID_WICLSDMetadataReader, 0x41070793,0x59e4,0x479a,0xa1,0xf7,0x95,0x4a,0xdc,0x2e,0xf5,0xfc);") +cpp_quote("DEFINE_GUID(CLSID_WICLSDMetadataWriter, 0x73c037e7,0xe5d9,0x4954,0x87,0x6a,0x6d,0xa8,0x1d,0x6e,0x57,0x68);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

Alexandre Julliard : winex11: Disable client-side rendering for OpenGL windows.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: a39659fcc969eb547686e309c9ca4c02b3de13fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39659fcc969eb547686e309c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 10 16:16:05 2012 +0200 winex11: Disable client-side rendering for OpenGL windows. --- dlls/winex11.drv/opengl.c | 14 ++++++++++++++ dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 9c1f6e5..d04791d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1135,6 +1135,15 @@ static void release_gl_drawable( struct gl_drawable *gl ) if (gl) LeaveCriticalSection( &context_section ); } +BOOL has_gl_drawable( HWND hwnd ) +{ + struct gl_drawable *gl; + + gl = get_gl_drawable( hwnd, 0 ); + release_gl_drawable( gl ); + return gl != NULL; +} + static GLXContext create_glxcontext(Display *display, struct wgl_context *context, GLXContext shareList) { GLXContext ctx; @@ -3342,6 +3351,11 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) return FALSE; } +BOOL has_gl_drawable( HWND hwnd ) +{ + return FALSE; +} + void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8774670..16034ea 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2051,6 +2051,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window) return; if (swp_flags & SWP_HIDEWINDOW) return; if (data->whole_window == root_window) return; + if (has_gl_drawable( hwnd )) return; if (!client_side_graphics) return; surface_rect = get_surface_rect( visible_rect ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 73c89ee..1c4c341 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -558,6 +558,7 @@ extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_win_format( HWND hwnd, XID fbconfig_id ) DECLSPEC_HIDDEN; +extern BOOL has_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onscroll implementation.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 7293e84163297bca1c06e9fd86e2ca21956b968d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7293e84163297bca1c06e9fd8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 14:41:28 2012 +0200 mshtml: Added IHTMLWindow2::onscroll implementation. --- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f5880f9..f9f21df 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -113,6 +113,9 @@ static const WCHAR onreadystatechangeW[] = {'o','n','r','e','a','d','y','s','t', static const WCHAR resizeW[] = {'r','e','s','i','z','e',0}; static const WCHAR onresizeW[] = {'o','n','r','e','s','i','z','e',0}; +static const WCHAR scrollW[] = {'s','c','r','o','l','l',0}; +static const WCHAR onscrollW[] = {'o','n','s','c','r','o','l','l',0}; + static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0}; @@ -199,6 +202,8 @@ static const event_info_t event_info[] = { 0}, {resizeW, onresizeW, EVENTT_NONE, DISPID_EVMETH_ONRESIZE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {scrollW, onscrollW, EVENTT_HTML, DISPID_EVMETH_ONSCROLL, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b6ebf81..983d128 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -40,6 +40,7 @@ typedef enum { EVENTID_PASTE, EVENTID_READYSTATECHANGE, EVENTID_RESIZE, + EVENTID_SCROLL, EVENTID_SELECTSTART, EVENTID_SUBMIT, EVENTID_LAST diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ed1fa2b..fc432d8 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1075,15 +1075,19 @@ static HRESULT WINAPI HTMLWindow2_get_onresize(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onscroll(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_SCROLL, &v); } static HRESULT WINAPI HTMLWindow2_get_onscroll(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_SCROLL, p); } static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocument2 **p)

1 0

Dmitry Timoshkov : windowscodecs: Add a bunch of GIF metadata tests.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 248e9ef7c96c4e8af6f917c8678943cbe2eb8a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=248e9ef7c96c4e8af6f917c86… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:25:47 2012 +0900 windowscodecs: Add a bunch of GIF metadata tests. --- dlls/windowscodecs/tests/metadata.c | 296 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 3 + 2 files changed, 299 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=248e9ef7c96c4e8af6f91…

1 0

Dmitry Timoshkov : windowscodecs: Add a bunch of tests for Graphic Control Extension metadata reader.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 2b5739269cd3de922994f638591bae2b7405194f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5739269cd3de922994f6385… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:29:22 2012 +0900 windowscodecs: Add a bunch of tests for Graphic Control Extension metadata reader. --- dlls/windowscodecs/tests/metadata.c | 77 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 + 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index fec283e..4bb33ae 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1417,6 +1417,82 @@ todo_wine IStream_Release(stream); } +static void test_metadata_GCE(void) +{ + static const WCHAR GCE_name[] = {'G','r','a','p','h','i','c',' ','C','o','n','t','r','o','l',' ','E','x','t','e','n','s','i','o','n',' ','R','e','a','d','e','r',0}; + static const char GCE_data[] = "hello world!\xa\x2\x3\x4\x5\x6\x7\x8\xed\xa\xb\xc\xd\xe\xf"; + static const struct test_data td[5] = + { + { VT_UI1, 0, 0, { 2 }, NULL, { 'D','i','s','p','o','s','a','l',0 } }, + { VT_BOOL, 0, 0, { 1 }, NULL, { 'U','s','e','r','I','n','p','u','t','F','l','a','g',0 } }, + { VT_BOOL, 0, 0, { 0 }, NULL, { 'T','r','a','n','s','p','a','r','e','n','c','y','F','l','a','g',0 } }, + { VT_UI2, 0, 0, { 0x302 }, NULL, { 'D','e','l','a','y',0 } }, + { VT_UI1, 0, 0, { 4 }, NULL, { 'T','r','a','n','s','p','a','r','e','n','t','C','o','l','o','r','I','n','d','e','x',0 } } + }; + LARGE_INTEGER pos; + HRESULT hr; + IStream *stream; + IWICPersistStream *persist; + IWICMetadataReader *reader; + IWICMetadataHandlerInfo *info; + WCHAR name[64]; + UINT count, dummy; + GUID format; + CLSID id; + + hr = CoCreateInstance(&CLSID_WICGCEMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, + "CoCreateInstance error %#x\n", hr); + + stream = create_stream(GCE_data, sizeof(GCE_data)); + + if (SUCCEEDED(hr)) + { + pos.QuadPart = 12; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IWICPersistStream_Load(persist, stream); + ok(hr == S_OK, "Load error %#x\n", hr); + + IWICPersistStream_Release(persist); + } + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + + compare_metadata(reader, td, count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), "wrong format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); + ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); + + hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + ok(hr == S_OK, "GetCLSID error %#x\n", hr); + ok(IsEqualGUID(&id, &CLSID_WICGCEMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + + hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); + ok(hr == S_OK, "GetFriendlyName error %#x\n", hr); + ok(lstrcmpW(name, GCE_name) == 0, "wrong GCE reader name %s\n", wine_dbgstr_w(name)); + + IWICMetadataHandlerInfo_Release(info); + IWICMetadataReader_Release(reader); + } + + IStream_Release(stream); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1430,6 +1506,7 @@ START_TEST(metadata) test_metadata_gif(); test_metadata_LSD(); test_metadata_IMD(); + test_metadata_GCE(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index ce7cf9f..2a5b389 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -61,6 +61,8 @@ cpp_quote("DEFINE_GUID(CLSID_WICLSDMetadataReader, 0x41070793,0x59e4,0x479a,0xa1 cpp_quote("DEFINE_GUID(CLSID_WICLSDMetadataWriter, 0x73c037e7,0xe5d9,0x4954,0x87,0x6a,0x6d,0xa8,0x1d,0x6e,0x57,0x68);") cpp_quote("DEFINE_GUID(CLSID_WICIMDMetadataReader, 0x7447a267,0x0015,0x42c8,0xa8,0xf1,0xfb,0x3b,0x94,0xc6,0x83,0x61);") cpp_quote("DEFINE_GUID(CLSID_WICIMDMetadataWriter, 0x8c89071f,0x452e,0x4e95,0x96,0x82,0x9d,0x10,0x24,0x62,0x71,0x72);") +cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataReader, 0xb92e345d,0xf52d,0x41f3,0xb5,0x62,0x08,0x1b,0xc7,0x72,0xe3,0xb9);") +cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataWriter, 0xaf95dc76,0x16b2,0x47f4,0xb3,0xea,0x3c,0x31,0x79,0x66,0x93,0xe7);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

Jacek Caban : mshtml: Use first script host's GUID as default script guid.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 156e94429d8bbcf73c194e82864cc9ed2bee1771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156e94429d8bbcf73c194e828… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 10:34:52 2012 +0200 mshtml: Use first script host's GUID as default script guid. --- dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/script.c | 18 ++++++++++-------- dlls/mshtml/tests/vbtest.html | 15 +++++++++++++-- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bdec9b9..ed1fa2b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2721,7 +2721,6 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, init_dispex(&window->dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); window->task_magic = get_task_target_magic(); - window->current_script_guid = CLSID_JScript; if(mon) { IMoniker_AddRef(mon); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 18496aa..fa4e073 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -388,7 +388,6 @@ struct HTMLInnerWindow { HTMLDocumentNode *doc; struct list script_hosts; - GUID current_script_guid; IHTMLEventObj *event; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 0fe4f5a..9aa875a 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -641,8 +641,6 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) TRACE("%s\n", debugstr_w(text)); - script_host->window->current_script_guid = script_host->guid; - VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); @@ -722,6 +720,14 @@ static void parse_script_elem(ScriptHost *script_host, nsIDOMHTMLScriptElement * nsAString_Finish(&src_str); } +static GUID get_default_script_guid(HTMLInnerWindow *window) +{ + /* If not specified, we should use very first script host that was created for the page (or JScript if none) */ + return list_empty(&window->script_hosts) + ? CLSID_JScript + : LIST_ENTRY(list_head(&window->script_hosts), ScriptHost, entry)->guid; +} + static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) { const WCHAR text_javascriptW[] = @@ -790,7 +796,7 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns if(*language) { ret = get_guid_from_language(language, guid); }else { - *guid = window->current_script_guid; + *guid = get_default_script_guid(window); ret = TRUE; } }else { @@ -871,7 +877,7 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) ptr++; }else { ptr = text; - guid = window->current_script_guid; + guid = get_default_script_guid(window); } if(IsEqualGUID(&CLSID_JScript, &guid) @@ -880,8 +886,6 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) return NULL; } - window->current_script_guid = guid; - script_host = get_script_host(window, &guid); if(!script_host || !script_host->parse_proc) return NULL; @@ -923,8 +927,6 @@ HRESULT exec_script(HTMLInnerWindow *window, const WCHAR *code, const WCHAR *lan return E_FAIL; } - window->current_script_guid = guid; - memset(&ei, 0, sizeof(ei)); TRACE(">>>\n"); hres = IActiveScriptParse_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei); diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index 7b8cebc..b864abc 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -12,19 +12,30 @@ End Sub <script> ' Verifies that we're in VBScript although there is no type specified If true then counter = counter+1 +function inccounter(x) + counter = counter+x +end function </script> <script type="text/javascript"> // We're in javascript +try { + counter++; + incCounter(2); +}catch(e) { + ok(false, "got an exception"); +} </script> -<script type="text/vbscript"> +<script> ' And back to VBScript If true then counter = counter+1 Sub runTest() - Call ok(counter = 3, "counter = " & counter) + Call ok(counter = 6, "counter = " & counter) Call external.reportSuccess() End Sub </script> +<script type="text/javascript"> +// We're in javascript </script> <body onload="If true then runTest()"> </body>

1 0

Dmitry Timoshkov : windowscodecs: Add more tests for PNG metadata.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 44e6a494d9d4e225e94b3dca67c9ef3d108d2f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e6a494d9d4e225e94b3dca6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:25:00 2012 +0900 windowscodecs: Add more tests for PNG metadata. --- dlls/windowscodecs/tests/metadata.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index acd9255..807e00a 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -504,9 +504,10 @@ struct test_data int count; /* if VT_VECTOR */ LONGLONG value[13]; const char *string; + const WCHAR id_string[32]; }; -static void compare_ifd_metadata(IWICMetadataReader *reader, const struct test_data *td, ULONG count) +static void compare_metadata(IWICMetadataReader *reader, const struct test_data *td, ULONG count) { HRESULT hr; IWICEnumMetadataItem *enumerator; @@ -530,8 +531,13 @@ static void compare_ifd_metadata(IWICMetadataReader *reader, const struct test_d ok(items_returned == 1, "unexpected item count %u\n", items_returned); ok(schema.vt == VT_EMPTY, "%u: unexpected vt: %u\n", i, schema.vt); - ok(id.vt == VT_UI2, "%u: unexpected vt: %u\n", i, id.vt); - ok(U(id).uiVal == td[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, U(id).uiVal); + ok(id.vt == VT_UI2 || id.vt == VT_LPWSTR, "%u: unexpected vt: %u\n", i, id.vt); + if (id.vt == VT_UI2) + ok(U(id).uiVal == td[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, U(id).uiVal); + else if (id.vt == VT_LPWSTR) + ok(!lstrcmpW(td[i].id_string, U(id).pwszVal), + "%u: expected %s, got %s\n", i, wine_dbgstr_w(td[i].id_string), wine_dbgstr_w(U(id).pwszVal)); + ok(value.vt == td[i].type, "%u: expected vt %#x, got %#x\n", i, td[i].type, value.vt); if (value.vt & VT_VECTOR) { @@ -670,7 +676,7 @@ static void test_metadata_IFD(void) ok(hr == S_OK, "GetCount error %#x\n", hr); ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); - compare_ifd_metadata(reader, td, count); + compare_metadata(reader, td, count); /* test IFD data with different endianness */ if (persist_options == WICPersistOptionsLittleEndian) @@ -685,7 +691,7 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); - compare_ifd_metadata(reader, td, count); + compare_metadata(reader, td, count); HeapFree(GetProcessHeap(), 0, IFD_data_swapped); hr = IWICMetadataReader_GetMetadataFormat(reader, &format); @@ -864,6 +870,15 @@ todo_wine static void test_metadata_png(void) { + static const struct test_data td[6] = + { + { VT_UI2, 0, 0, { 2005 }, NULL, { 'Y','e','a','r',0 } }, + { VT_UI1, 0, 0, { 6 }, NULL, { 'M','o','n','t','h',0 } }, + { VT_UI1, 0, 0, { 3 }, NULL, { 'D','a','y',0 } }, + { VT_UI1, 0, 0, { 15 }, NULL, { 'H','o','u','r',0 } }, + { VT_UI1, 0, 0, { 7 }, NULL, { 'M','i','n','u','t','e',0 } }, + { VT_UI1, 0, 0, { 45 }, NULL, { 'S','e','c','o','n','d',0 } } + }; IStream *stream; IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; @@ -926,6 +941,12 @@ static void test_metadata_png(void) broken(IsEqualGUID(&containerformat, &GUID_MetadataFormatUnknown)) /* Windows XP */, "unexpected container format\n"); + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == 6 || broken(count == 1) /* XP */, "expected 6, got %u\n", count); + if (count == 6) + compare_metadata(reader, td, count); + IWICMetadataReader_Release(reader); }

1 0

Dmitry Timoshkov : windowscodecs: Add a bunch of tests for Image Descriptor metadata reader.
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: 7f93e0a6d2b3618b27c25ba36f323c21d32b0cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f93e0a6d2b3618b27c25ba36… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 10 16:28:39 2012 +0900 windowscodecs: Add a bunch of tests for Image Descriptor metadata reader. --- dlls/windowscodecs/tests/metadata.c | 80 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 + 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 6ebeb3e..fec283e 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1338,6 +1338,85 @@ todo_wine IStream_Release(stream); } +static void test_metadata_IMD(void) +{ + static const WCHAR IMD_name[] = {'I','m','a','g','e',' ','D','e','s','c','r','i','p','t','o','r',' ','R','e','a','d','e','r',0}; + static const char IMD_data[] = "hello world!\x1\x2\x3\x4\x5\x6\x7\x8\xed\xa\xb\xc\xd\xe\xf"; + static const struct test_data td[8] = + { + { VT_UI2, 0, 0, { 0x201 }, NULL, { 'L','e','f','t',0 } }, + { VT_UI2, 0, 0, { 0x403 }, NULL, { 'T','o','p',0 } }, + { VT_UI2, 0, 0, { 0x605 }, NULL, { 'W','i','d','t','h',0 } }, + { VT_UI2, 0, 0, { 0x807 }, NULL, { 'H','e','i','g','h','t',0 } }, + { VT_BOOL, 0, 0, { 1 }, NULL, { 'L','o','c','a','l','C','o','l','o','r','T','a','b','l','e','F','l','a','g',0 } }, + { VT_BOOL, 0, 0, { 1 }, NULL, { 'I','n','t','e','r','l','a','c','e','F','l','a','g',0 } }, + { VT_BOOL, 0, 0, { 1 }, NULL, { 'S','o','r','t','F','l','a','g',0 } }, + { VT_UI1, 0, 0, { 5 }, NULL, { 'L','o','c','a','l','C','o','l','o','r','T','a','b','l','e','S','i','z','e',0 } } + }; + LARGE_INTEGER pos; + HRESULT hr; + IStream *stream; + IWICPersistStream *persist; + IWICMetadataReader *reader; + IWICMetadataHandlerInfo *info; + WCHAR name[64]; + UINT count, dummy; + GUID format; + CLSID id; + + hr = CoCreateInstance(&CLSID_WICIMDMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, + "CoCreateInstance error %#x\n", hr); + + stream = create_stream(IMD_data, sizeof(IMD_data)); + + if (SUCCEEDED(hr)) + { + pos.QuadPart = 12; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IWICPersistStream_Load(persist, stream); + ok(hr == S_OK, "Load error %#x\n", hr); + + IWICPersistStream_Release(persist); + } + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + + compare_metadata(reader, td, count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), "wrong format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); + ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); + + hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + ok(hr == S_OK, "GetCLSID error %#x\n", hr); + ok(IsEqualGUID(&id, &CLSID_WICIMDMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + + hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); + ok(hr == S_OK, "GetFriendlyName error %#x\n", hr); + ok(lstrcmpW(name, IMD_name) == 0, "wrong IMD reader name %s\n", wine_dbgstr_w(name)); + + IWICMetadataHandlerInfo_Release(info); + IWICMetadataReader_Release(reader); + } + + IStream_Release(stream); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1350,6 +1429,7 @@ START_TEST(metadata) test_metadata_png(); test_metadata_gif(); test_metadata_LSD(); + test_metadata_IMD(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 222ae64..ce7cf9f 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -59,6 +59,8 @@ cpp_quote("DEFINE_GUID(CLSID_WICXMPStructMetadataReader, 0x01b90d9a,0x8209,0x47f cpp_quote("DEFINE_GUID(CLSID_WICXMPStructMetadataWriter, 0x22c21f93,0x7ddb,0x411c,0x9b,0x17,0xc5,0xb7,0xbd,0x06,0x4a,0xbc);") cpp_quote("DEFINE_GUID(CLSID_WICLSDMetadataReader, 0x41070793,0x59e4,0x479a,0xa1,0xf7,0x95,0x4a,0xdc,0x2e,0xf5,0xfc);") cpp_quote("DEFINE_GUID(CLSID_WICLSDMetadataWriter, 0x73c037e7,0xe5d9,0x4954,0x87,0x6a,0x6d,0xa8,0x1d,0x6e,0x57,0x68);") +cpp_quote("DEFINE_GUID(CLSID_WICIMDMetadataReader, 0x7447a267,0x0015,0x42c8,0xa8,0xf1,0xfb,0x3b,0x94,0xc6,0x83,0x61);") +cpp_quote("DEFINE_GUID(CLSID_WICIMDMetadataWriter, 0x8c89071f,0x452e,0x4e95,0x96,0x82,0x9d,0x10,0x24,0x62,0x71,0x72);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

Jacek Caban : mshtml: Check if value is function only when it needs to be in invoke_builtin_prop .
by Alexandre Julliard Sept. 10, 2012

Sept. 10, 2012

Module: wine Branch: master Commit: a4869de7fa5e72fe2daed6bdae11b934f4350aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4869de7fa5e72fe2daed6bda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 10:35:05 2012 +0200 mshtml: Check if value is function only when it needs to be in invoke_builtin_prop. --- dlls/mshtml/dispex.c | 12 ++++++------ dlls/mshtml/tests/vbtest.html | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a3ac623..eca45a6 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -979,13 +979,13 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(FAILED(hres)) return hres; - if(V_VT(&v) != VT_DISPATCH) { - FIXME("Not a function %s\n", debugstr_variant(&v)); - VariantClear(&v); - return E_FAIL; - } - if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + if(V_VT(&v) != VT_DISPATCH) { + FIXME("Not a function %s\n", debugstr_variant(&v)); + VariantClear(&v); + return E_FAIL; + } + hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); IDispatch_Release(V_DISPATCH(&v)); }else if(res) { diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index b864abc..f424b38 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -31,6 +31,7 @@ If true then counter = counter+1 Sub runTest() Call ok(counter = 6, "counter = " & counter) + Call ok(isNull(document.onkeyup), "document.onkeyup is not null") Call external.reportSuccess() End Sub </script>

1 0