September 2012 - Wine-Commits

Francois Gouget : Use the CP_ACP and NULL macros instead of numeric literals when converting strings between ANSI and Unicode .
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 709a0b764d448c08ff416a1e076a621b61da3fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709a0b764d448c08ff416a1e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 13:04:26 2012 +0200 Use the CP_ACP and NULL macros instead of numeric literals when converting strings between ANSI and Unicode. --- dlls/ntdll/tests/reg.c | 2 +- dlls/riched20/style.c | 8 ++++---- dlls/shell32/shellstring.c | 6 +++--- dlls/shlwapi/istream.c | 2 +- dlls/shlwapi/reg.c | 2 +- dlls/shlwapi/string.c | 4 ++-- dlls/shlwapi/tests/path.c | 4 ++-- dlls/shlwapi/tests/string.c | 14 +++++++------- dlls/shlwapi/tests/url.c | 8 ++++---- dlls/shlwapi/thread.c | 2 +- dlls/shlwapi/url.c | 26 +++++++++++++------------- dlls/wintrust/tests/crypt.c | 8 ++++---- dlls/wintrust/tests/softpub.c | 2 +- 13 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=709a0b764d448c08ff416…

1 0

Jacek Caban : mshtml: Use custom VT_BSTR to VT_BOOL conversion in InvokeEx implementation.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 514e65c1e9cd7f56f4b3f91cd2c96c2fb3ac5967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=514e65c1e9cd7f56f4b3f91cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 14:10:33 2012 +0200 mshtml: Use custom VT_BSTR to VT_BOOL conversion in InvokeEx implementation. --- dlls/mshtml/dispex.c | 10 +++++++ dlls/mshtml/tests/jstest.html | 29 ++++++++++++++++++++- dlls/mshtml/tests/script.c | 57 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index cc22ce4..7ce53b2 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -927,6 +927,16 @@ static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvi } } + switch(vt) { + case VT_BOOL: + if(V_VT(src) == VT_BSTR) { + V_VT(dst) = VT_BOOL; + V_BOOL(dst) = V_BSTR(src) && *V_BSTR(src) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; + } + break; + } + return VariantChangeType(dst, src, 0, vt); } diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 224e19a..70478e4 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -98,6 +98,24 @@ function test_clone_node() { ok(cloned.style.filter === "alpha(opacity=50)", "cloned.style.filter = " + cloned.style.filter); } +function test_setAttribute() { + var input; + + document.body.innerHTML = '<input id="inputid"></input>'; + input = document.getElementById("inputid"); + ok(input.checked === false, "input.checked = " + input.checked); + + input.setAttribute("checked", "test"); + ok(input.checked === true, "input.checked = " + input.checked); + + input.setAttribute("checked", 0); + ok(input.checked === false, "input.checked = " + input.checked); + + input.setAttribute("checked", ""); + ok(input.checked === false, "input.checked = " + input.checked); + +} + function test_getter_call() { document.body.innerHTML = '<div id="divid"></div>'; @@ -133,7 +151,7 @@ function test_override_functions() { var globalVar = false; -function runTest() { +function runTests() { obj = new Object(); ok(obj === window.obj, "obj !== window.obj"); @@ -147,11 +165,20 @@ function runTest() { test_document_name_as_index(); test_remove_style_attribute(); test_getter_call(); + test_setAttribute(); test_override_functions(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r); ok(globalVar === true, "globalVar = " + globalVar); +} + +function runTest() { + try { + runTests(); + }catch(e) { + ok(false, "got exception"); + } external.reportSuccess(); } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 59d03dd..0fa6eba 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2028,6 +2028,62 @@ static void test_arg_conv(IHTMLWindow2 *window) IDispatchEx_Release(dispex); } +#define test_elem_disabled(a,b) _test_elem_disabled(__LINE__,a,b) +static void _test_elem_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL exb) +{ + IHTMLElement3 *elem3; + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement3, (void**)&elem3); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLElement3 iface: %08x\n", hres); + + hres = IHTMLElement3_get_disabled(elem3, &b); + ok_(__FILE__,line)(hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(b == exb, "disabled = %x, expected %x\n", b, exb); + + IHTMLElement3_Release(elem3); +} + +static void test_default_arg_conv(IHTMLWindow2 *window) +{ + IHTMLDocument2 *doc; + IDispatchEx *dispex; + IHTMLElement *elem; + VARIANT v; + HRESULT hres; + + hres = IHTMLWindow2_get_document(window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + hres = IHTMLDocument2_get_body(doc, &elem); + IHTMLDocument2_Release(doc); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + test_elem_disabled(elem, VARIANT_FALSE); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("test"); + hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + SysFreeString(V_BSTR(&v)); + + test_elem_disabled(elem, VARIANT_TRUE); + + V_VT(&v) = VT_I4; + V_BSTR(&v) = 0; + hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + test_elem_disabled(elem, VARIANT_FALSE); + + IHTMLElement_Release(elem); + IDispatchEx_Release(dispex); +} + static void test_script_run(void) { IDispatchEx *document, *dispex; @@ -2198,6 +2254,7 @@ static void test_script_run(void) test_nextdispid(dispex); test_arg_conv(window); + test_default_arg_conv(window); IHTMLWindow2_Release(window); tmp = a2bstr("test");

1 0

Jacek Caban : mshtml: Added function overriding tests.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 4d469b55a5850a9aad05003f6770338754924150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d469b55a5850a9aad05003f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 14:10:19 2012 +0200 mshtml: Added function overriding tests. --- dlls/mshtml/tests/jstest.html | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index d9d6da5..224e19a 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -103,15 +103,34 @@ function test_getter_call() { var e = document.getElementById("divid"); - e.myfunc = function(x) { this.myfinc_called = x; }; + e.myfunc = function(x) { this.myfunc_called = x; }; e.myfunc("test"); - ok(e.myfinc_called === "test", "e.myfinc_called = " + e.myfinc_called); + ok(e.myfunc_called === "test", "e.myfunc_called = " + e.myfunc_called); e.onmousedown = function(x) { this.onmousedown_called = x; }; e.onmousedown("test"); ok(e.onmousedown_called === "test", "e.onmousedown_called = " + e.onmousedown_called); } +function test_override_functions() { + function override_func() { return "test"; } + + ok(typeof(window.showModalDialog) === "object", "typeof(window.showModalDialog) = " + typeof(window.showModalDialog)); + window.showModalDialog = override_func; + ok(window.showModalDialog === override_func, "window.showModalDialog != override_func"); + ok(typeof(window.showModalDialog) === "function", "typeof(window.showModalDialog) = " + typeof(window.showModalDialog)); + + document.body.innerHTML = '<div id="divid"></div>'; + var div = document.getElementById("divid"); + ok(typeof(div.addBehavior) === "object", "typeof(div.addBehavior) = " + typeof(div.addBehavior)); + div.addBehavior = override_func; + ok(div.addBehavior === override_func, "div.addBehavior != override_func"); + ok(typeof(div.addBehavior) === "function", "typeof(div.addBehavior) = " + typeof(div.addBehavior)); + + var tmp = div.addBehavior(); + ok(tmp === "test", "div.addBehavior() = " + tmp); +} + var globalVar = false; function runTest() { @@ -128,6 +147,7 @@ function runTest() { test_document_name_as_index(); test_remove_style_attribute(); test_getter_call(); + test_override_functions(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Alexandre Julliard : winex11: Add window data structure locking to the SetLayeredWindowAttributes entry point .
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: b515beb4a07f9ac325e2cbb9efefb086b2ac9d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b515beb4a07f9ac325e2cbb9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 14:09:04 2012 +0200 winex11: Add window data structure locking to the SetLayeredWindowAttributes entry point. --- dlls/winex11.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6b8dc0c..c9211f4 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2325,7 +2325,7 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) */ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data = get_win_data( hwnd ); if (data) { @@ -2333,6 +2333,7 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph sync_window_opacity( data->display, data->whole_window, key, alpha, flags ); if (data->surface) set_surface_color_key( data->surface, (flags & LWA_COLORKEY) ? key : CLR_INVALID ); + release_win_data( data ); } else { @@ -2341,7 +2342,7 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph { sync_window_opacity( gdi_display, win, key, alpha, flags ); if (flags & LWA_COLORKEY) - FIXME( "LWA_COLORKEY not supported on foreign thread window %p\n", hwnd ); + FIXME( "LWA_COLORKEY not supported on foreign process window %p\n", hwnd ); } } }

1 0

Alistair Leslie-Hughes : scrrun: Silence unknown interfaces.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 5912bdeec2ec191a066e7b238e83eb7672f2ffe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5912bdeec2ec191a066e7b238… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 21 13:29:02 2012 +1000 scrrun: Silence unknown interfaces. --- dlls/scrrun/dictionary.c | 2 +- dlls/scrrun/scrrun.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index a02c957..7664af8 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -70,7 +70,7 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + WARN("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 932d124..cd07027 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -54,7 +54,7 @@ static HRESULT WINAPI scrruncf_QueryInterface(IClassFactory *iface, REFIID riid, return S_OK; } - FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; }

1 0

Dmitry Timoshkov : gdiplus: Make GIF palettes in a custom test image slightly more different.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 5f9be70570c756b27b78a34caf9e30a7f146d38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9be70570c756b27b78a34ca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 16:05:45 2012 +0900 gdiplus: Make GIF palettes in a custom test image slightly more different. --- dlls/gdiplus/tests/image.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 59a5064..b792ebe 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3922,7 +3922,7 @@ static void test_DrawImage_scale(void) static const BYTE animatedgif[] = { 'G','I','F','8','9','a',0x01,0x00,0x01,0x00,0xA1,0x02,0x00, -0x6F,0x6F,0x6F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c, /*0x21,0xFF,0x0B,'A','N','I','M','E','X','T','S','1','.','0',*/ 0x21,0xFF,0x0B,'N','E','T','S','C','A','P','E','2','.','0', 0x03,0x01,0x05,0x00,0x00, @@ -3930,14 +3930,14 @@ static const BYTE animatedgif[] = { 0x21,0x01,0x0D,'a','n','i','m','a','t','i','o','n','.','g','i','f',0x00, 0x21,0xF9,0x04,0xff,0x0A,0x00,0x08,0x00, 0x2C,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, -0xDE,0xDE,0xDE,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x4C,0x01,0x00, +0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac, +0x02,0x02,0x4C,0x01,0x00, 0x21,0xFE,0x08,'i','m','a','g','e',' ','#','1',0x00, 0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','1',0x00, 0x21,0xF9,0x04,0x00,0x14,0x00,0x01,0x00, 0x2C,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, -0x4D,0x4D,0x4D,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x44,0x01,0x00, +0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc, +0x02,0x02,0x44,0x01,0x00, 0x21,0xFE,0x08,'i','m','a','g','e',' ','#','2',0x00, 0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','2',0x00,0x3B }; @@ -3953,7 +3953,7 @@ static void test_gif_properties(void) { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,20,0,0,0 } }, { PropertyTagTypeASCII, PropertyTagExifUserComment, 13, { 'H','e','l','l','o',' ','W','o','r','l','d','!',0 } }, { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 5,0 } }, - { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0x6f,0x6f,0x6f,0,0,0,0,0,0,0,0,0 } }, + { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c } }, { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 2 } }, { PropertyTagTypeByte, PropertyTagIndexTransparent, 1, { 8 } } };

1 0

Alexandre Julliard : winex11: Add window data structure locking to the ShowWindow entry point.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 6a9f5e18d1e95979ad308c4d67182d46950b207a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9f5e18d1e95979ad308c4d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 13:36:35 2012 +0200 winex11: Add window data structure locking to the ShowWindow entry point. --- dlls/winex11.drv/window.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 931f60e..4ff3678 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2208,20 +2208,20 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) Window root, top; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data = get_win_data( hwnd ); - if (!data || !data->whole_window || !data->managed || !data->mapped || data->iconic) return swp; - if (style & WS_MINIMIZE) return swp; - if (IsRectEmpty( rect )) return swp; + if (!data || !data->whole_window || !data->managed || !data->mapped || data->iconic) goto done; + if (style & WS_MINIMIZE) goto done; + if (IsRectEmpty( rect )) goto done; /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */ if (!thread_data->current_event || thread_data->current_event->xany.window != data->whole_window) - return swp; + goto done; if (thread_data->current_event->type != ConfigureNotify && thread_data->current_event->type != PropertyNotify) - return swp; + goto done; TRACE( "win %p/%lx cmd %d at %s flags %08x\n", hwnd, data->whole_window, cmd, wine_dbgstr_rect(rect), swp ); @@ -2235,7 +2235,11 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) rect->bottom = y + height; OffsetRect( rect, virtual_screen_rect.left, virtual_screen_rect.top ); X11DRV_X_to_window_rect( data, rect ); - return swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); + swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); + +done: + release_win_data( data ); + return swp; }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the SetWindowStyle entry point.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 84918e7f0603d61652f7f28b0ee3e48ca5e53a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84918e7f0603d61652f7f28b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 14:08:33 2012 +0200 winex11: Add window data structure locking to the SetWindowStyle entry point. --- dlls/winex11.drv/window.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 65f40fd..6b8dc0c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1480,13 +1480,12 @@ void CDECL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) */ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - DWORD changed; + struct x11drv_win_data *data; + DWORD changed = style->styleNew ^ style->styleOld; if (hwnd == GetDesktopWindow()) return; - if (!data || !data->whole_window) return; - - changed = style->styleNew ^ style->styleOld; + if (!(data = get_win_data( hwnd ))) return; + if (!data->whole_window) goto done; if (offset == GWL_STYLE && (changed & WS_DISABLED)) set_wm_hints( data ); @@ -1495,6 +1494,8 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) sync_window_opacity( data->display, data->whole_window, 0, 0, 0 ); if (data->surface) set_surface_color_key( data->surface, CLR_INVALID ); } +done: + release_win_data( data ); }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the remaining entry points.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 313157a036ba361f95d0a69949368cc868e5b3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=313157a036ba361f95d0a6994… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 14:09:43 2012 +0200 winex11: Add window data structure locking to the remaining entry points. --- dlls/winex11.drv/desktop.c | 3 ++- dlls/winex11.drv/window.c | 29 ++++++++--------------------- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b35ccaa..69cc346 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -177,7 +177,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; int mask = 0; - if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; + if (!(data = get_win_data( hwnd ))) return TRUE; /* update the full screen state */ update_net_wm_states( data ); @@ -193,6 +193,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam XReconfigureWMWindow( data->display, data->whole_window, DefaultScreen(data->display), mask, &changes ); } + release_win_data( data ); if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, TRUE ); return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c9211f4..2a8b010 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1671,24 +1671,6 @@ void release_win_data( struct x11drv_win_data *data ) /*********************************************************************** - * X11DRV_get_win_data - * - * Return the X11 data structure associated with a window. - */ -struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) -{ - struct x11drv_win_data *data = get_win_data( hwnd ); - - if (data) - { - release_win_data( data ); - if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) data = NULL; - } - return data; -} - - -/*********************************************************************** * X11DRV_create_win_data * * Create an X11 data window structure for an existing window. @@ -1882,7 +1864,6 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { struct x11drv_escape_set_drawable escape; - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); HWND parent; escape.code = X11DRV_SET_DRAWABLE; @@ -1897,10 +1878,13 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, if (top == hwnd) { + struct x11drv_win_data *data = get_win_data( hwnd ); + escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); /* special case: when repainting the root window, clip out top-level windows */ if (data && data->whole_window == root_window) escape.mode = ClipByChildren; + release_win_data( data ); } else { @@ -2372,8 +2356,11 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); return 0; case WM_X11DRV_SET_CURSOR: - if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) - set_window_cursor( data->whole_window, (HCURSOR)lp ); + if ((data = get_win_data( hwnd ))) + { + if (data->whole_window) set_window_cursor( data->whole_window, (HCURSOR)lp ); + release_win_data( data ); + } else if (hwnd == x11drv_thread_data()->clip_hwnd) set_window_cursor( x11drv_thread_data()->clip_window, (HCURSOR)lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6b4657f..d2ce84f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -557,7 +557,6 @@ struct x11drv_win_data extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; -extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLDocument::get_charset implementation.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: efb08f261d88061f0ccc7b959f7986d4d06044c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb08f261d88061f0ccc7b959… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 14:10:50 2012 +0200 mshtml: Added IHTMLDocument::get_charset implementation. --- dlls/mshtml/htmldoc.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ff917d9..322751a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -729,8 +729,19 @@ static HRESULT WINAPI HTMLDocument_put_charset(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_charset(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString charset_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_FAIL; + } + + nsAString_Init(&charset_str, NULL); + nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str); + return return_nsstr(nsres, &charset_str, p); } static HRESULT WINAPI HTMLDocument_put_defaultCharset(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 149aa5e..c988ac6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4745,6 +4745,7 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElement2 *elem2; IHTMLElement *elem; IHTMLStyle *style; + BSTR str; LONG l; HRESULT hres; IHTMLElementCollection *collection; @@ -4819,6 +4820,12 @@ static void test_defaults(IHTMLDocument2 *doc) test_ifaces((IUnknown*)style, style_iids); IHTMLStyle_Release(style); + str = NULL; + hres = IHTMLDocument2_get_charset(doc, &str); + ok(hres == S_OK, "get_charset failed: %08x\n", hres); + ok(str && *str, "charset is empty"); /* FIXME: better tests */ + SysFreeString(str); + test_window(doc); test_compatmode(doc); test_location(doc);

1 0