September 2012 - Wine-commits

Alistair Leslie-Hughes : scrrun: Silence unknown interfaces.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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

Thomas Faber : rpcrt4: Match MSVC version of call_server_func with GCC.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 25b76525f3f6edfcf630f235ccf15e395d009e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b76525f3f6edfcf630f235c… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Sep 22 12:38:11 2012 +0200 rpcrt4: Match MSVC version of call_server_func with GCC. --- dlls/rpcrt4/ndr_stubless.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index db41a1a..d7a81bd 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -990,11 +990,12 @@ __declspec(naked) LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigne __asm { push ebp + mov ebp, esp push edi ; Save registers push esi - mov ebp, esp mov eax, [ebp+16] ; Get stack size sub esp, eax ; Make room in stack for arguments + and esp, 0xFFFFFFF0 mov edi, esp mov ecx, eax mov esi, [ebp+12]

1 0

Dmitry Timoshkov : gdiplus: Make GIF palettes in a custom test image slightly more different.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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 24 Sep '12

24 Sep '12

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 SysCommand entry point.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 803fc6e27c2507a2cefe57d53bdbaab1770f3854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803fc6e27c2507a2cefe57d53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 13:41:20 2012 +0200 winex11: Add window data structure locking to the SysCommand entry point. --- dlls/winex11.drv/window.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4ff3678..66588d1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2397,8 +2397,8 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) int dir; struct x11drv_win_data *data; - if (!(data = X11DRV_get_win_data( hwnd ))) return -1; - if (!data->whole_window || !data->managed || !data->mapped) return -1; + if (!(data = get_win_data( hwnd ))) return -1; + if (!data->whole_window || !data->managed || !data->mapped) goto failed; switch (wparam & 0xfff0) { @@ -2408,7 +2408,7 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) break; case SC_SIZE: /* windows without WS_THICKFRAME are not resizable through the window manager */ - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) return -1; + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) goto failed; switch (hittest) { @@ -2427,24 +2427,30 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) case SC_KEYMENU: /* prevent a simple ALT press+release from activating the system menu, * as that can get confusing on managed windows */ - if ((WCHAR)lparam) return -1; /* got an explicit char */ - if (GetMenu( hwnd )) return -1; /* window has a real menu */ - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) return -1; /* no system menu */ + if ((WCHAR)lparam) goto failed; /* got an explicit char */ + if (GetMenu( hwnd )) goto failed; /* window has a real menu */ + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) goto failed; /* no system menu */ TRACE( "ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam ); + release_win_data( data ); return 0; default: - return -1; + goto failed; } - if (IsZoomed(hwnd)) return -1; + if (IsZoomed(hwnd)) goto failed; if (!is_netwm_supported( data->display, x11drv_atom(_NET_WM_MOVERESIZE) )) { TRACE( "_NET_WM_MOVERESIZE not supported\n" ); - return -1; + goto failed; } + release_win_data( data ); move_resize_window( hwnd, dir ); return 0; + +failed: + release_win_data( data ); + return -1; }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the WindowPosChanging/ Changed entry points.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 4c58210390d9f8a6b6662b61f0e87a736cc0e1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c58210390d9f8a6b6662b61f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 14:06:42 2012 +0200 winex11: Add window data structure locking to the WindowPosChanging/Changed entry points. --- dlls/winex11.drv/window.c | 109 ++++++++++++++++++++++++++++----------------- 1 files changed, 68 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c58210390d9f8a6b6662…

1 0

Alexandre Julliard : winex11: Add window data structure locking to the SetWindowStyle entry point.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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 SetLayeredWindowAttributes entry point .
by Alexandre Julliard 24 Sep '12

24 Sep '12

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

Alexandre Julliard : winex11: Add window data structure locking to the remaining entry points.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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 support for overriding builtin functions.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 6d3bfe8ee5a0bcfd8170b214e0fa422a5350195c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3bfe8ee5a0bcfd8170b214e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 14:10:05 2012 +0200 mshtml: Added support for overriding builtin functions. --- dlls/mshtml/dispex.c | 135 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 107 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index eca45a6..cc22ce4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -74,15 +74,21 @@ typedef struct { typedef struct { DispatchEx dispex; IUnknown IUnknown_iface; + LONG ref; DispatchEx *obj; func_info_t *info; } func_disp_t; +typedef struct { + func_disp_t *func_obj; + IDispatch *val; +} func_obj_entry_t; + struct dispex_dynamic_data_t { DWORD buf_size; DWORD prop_cnt; dynamic_prop_t *props; - func_disp_t **func_disps; + func_obj_entry_t *func_disps; }; #define DISPID_DYNPROP_0 0x50000000 @@ -575,19 +581,27 @@ static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void static ULONG WINAPI Function_AddRef(IUnknown *iface) { func_disp_t *This = impl_from_IUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p) ref=%d\n", This, ref); - return IDispatchEx_AddRef(&This->obj->IDispatchEx_iface); + return ref; } static ULONG WINAPI Function_Release(IUnknown *iface) { func_disp_t *This = impl_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p) ref=%d\n", This, ref); - return IDispatchEx_Release(&This->obj->IDispatchEx_iface); + if(!ref) { + assert(!This->obj); + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; } static const IUnknownVtbl FunctionUnkVtbl = { @@ -613,6 +627,8 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return E_INVALIDARG; /* fall through */ case DISPATCH_METHOD: + if(!This->obj) + return E_UNEXPECTED; hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; default: @@ -649,6 +665,7 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) ret->IUnknown_iface.lpVtbl = &FunctionUnkVtbl; init_dispex(&ret->dispex, &ret->IUnknown_iface, &function_dispex); + ret->ref = 1; ret->obj = obj; ret->info = info; @@ -696,6 +713,37 @@ static HRESULT invoke_disp_value(DispatchEx *This, IDispatch *func_disp, LCID lc return hres; } +static HRESULT get_func_obj_entry(DispatchEx *This, func_info_t *func, func_obj_entry_t **ret) +{ + dispex_dynamic_data_t *dynamic_data; + + dynamic_data = get_dynamic_data(This); + if(!dynamic_data) + return E_OUTOFMEMORY; + + if(!dynamic_data->func_disps) { + dynamic_data->func_disps = heap_alloc_zero(This->data->data->func_disp_cnt * sizeof(*dynamic_data->func_disps)); + if(!dynamic_data->func_disps) + return E_OUTOFMEMORY; + } + + if(!dynamic_data->func_disps[func->func_disp_idx].func_obj) { + func_disp_t *func_obj; + + func_obj = create_func_disp(This, func); + if(!func_obj) + return E_OUTOFMEMORY; + + dynamic_data->func_disps[func->func_disp_idx].func_obj = func_obj; + + IDispatchEx_AddRef(&func_obj->dispex.IDispatchEx_iface); + dynamic_data->func_disps[func->func_disp_idx].val = (IDispatch*)&func_obj->dispex.IDispatchEx_iface; + } + + *ret = dynamic_data->func_disps+func->func_disp_idx; + return S_OK; +} + static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei) { @@ -707,10 +755,25 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, return E_INVALIDARG; /* fall through */ case DISPATCH_METHOD: + if(This->dynamic_data && This->dynamic_data && This->dynamic_data->func_disps + && This->dynamic_data->func_disps[func->func_disp_idx].func_obj) { + func_obj_entry_t *entry = This->dynamic_data->func_disps + func->func_disp_idx; + + if((IDispatch*)&entry->func_obj->dispex.IDispatchEx_iface != entry->val) { + if(!entry->val) { + FIXME("Calling null\n"); + return E_FAIL; + } + + hres = invoke_disp_value(This, entry->val, 0, flags, dp, res, ei, NULL); + break; + } + } + hres = typeinfo_invoke(This, func, flags, dp, res, ei); break; case DISPATCH_PROPERTYGET: { - dispex_dynamic_data_t *dynamic_data; + func_obj_entry_t *entry; if(func->id == DISPID_VALUE) { BSTR ret; @@ -724,32 +787,46 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, return S_OK; } - dynamic_data = get_dynamic_data(This); - if(!dynamic_data) - return E_OUTOFMEMORY; + hres = get_func_obj_entry(This, func, &entry); + if(FAILED(hres)) + return hres; - if(!dynamic_data->func_disps) { - dynamic_data->func_disps = heap_alloc_zero(This->data->data->func_disp_cnt * sizeof(func_disp_t*)); - if(!dynamic_data->func_disps) - return E_OUTOFMEMORY; - } + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = entry->val; + if(V_DISPATCH(res)) + IDispatch_AddRef(V_DISPATCH(res)); + hres = S_OK; + break; + } + case DISPATCH_PROPERTYPUT: { + func_obj_entry_t *entry; + VARIANT *v; - if(!dynamic_data->func_disps[func->func_disp_idx]) { - dynamic_data->func_disps[func->func_disp_idx] = create_func_disp(This, func); - if(!dynamic_data->func_disps[func->func_disp_idx]) - return E_OUTOFMEMORY; + if(dp->cArgs != 1 || (dp->cNamedArgs == 1 && *dp->rgdispidNamedArgs != DISPID_PROPERTYPUT) + || dp->cNamedArgs > 1) { + FIXME("invalid args\n"); + return E_INVALIDARG; } - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)&dynamic_data->func_disps[func->func_disp_idx]->dispex.IDispatchEx_iface; - IDispatch_AddRef(V_DISPATCH(res)); + v = dp->rgvarg; + /* FIXME: not exactly right */ + if(V_VT(v) != VT_DISPATCH) + return E_NOTIMPL; + + hres = get_func_obj_entry(This, func, &entry); + if(FAILED(hres)) + return hres; + + if(entry->val) + IDispatch_Release(entry->val); + entry->val = V_DISPATCH(v); + if(entry->val) + IDispatch_AddRef(entry->val); hres = S_OK; break; } default: FIXME("Unimplemented flags %x\n", flags); - /* fall through */ - case DISPATCH_PROPERTYPUT: hres = E_NOTIMPL; } @@ -1445,13 +1522,15 @@ void release_dispex(DispatchEx *This) heap_free(This->dynamic_data->props); if(This->dynamic_data->func_disps) { - unsigned i; + func_obj_entry_t *iter; - for(i=0; i < This->data->data->func_disp_cnt; i++) { - if(This->dynamic_data->func_disps[i]) { - release_dispex(&This->dynamic_data->func_disps[i]->dispex); - heap_free(This->dynamic_data->func_disps[i]); + for(iter = This->dynamic_data->func_disps; iter < This->dynamic_data->func_disps+This->data->data->func_disp_cnt; iter++) { + if(iter->func_obj) { + iter->func_obj->obj = NULL; + IDispatchEx_Release(&iter->func_obj->dispex.IDispatchEx_iface); } + if(iter->val) + IDispatch_Release(iter->val); } heap_free(This->dynamic_data->func_disps);

1 0