wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Eric Pouech : winedbg: Fix 'break file : lineno' command so that file can be in other modules than the current one.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: cf7120b8cce712bdd450d19585427633b7033544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7120b8cce712bdd450d1958… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 7 22:41:09 2011 +0100 winedbg: Fix 'break file : lineno' command so that file can be in other modules than the current one. --- programs/winedbg/break.c | 60 +++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 24 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index debc0c7..e156a40 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -270,6 +270,7 @@ void break_add_break_from_id(const char *name, int lineno, BOOL swbp) struct cb_break_lineno { + const char* filename; int lineno; ADDRESS64 addr; }; @@ -287,6 +288,17 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) return TRUE; } +static BOOL CALLBACK mcb(PCWSTR module, DWORD64 base, void* user) +{ + struct cb_break_lineno* bkln = user; + + SymEnumLines(dbg_curr_process->handle, base, NULL, bkln->filename, line_cb, bkln); + /* continue module enum if no addr found + * FIXME: we don't report when several addresses match the same filename/lineno pair + */ + return !bkln->addr.Offset; +} + /*********************************************************************** * break_add_break_from_lineno * @@ -295,38 +307,38 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp) { struct cb_break_lineno bkln; + bkln.addr.Offset = 0; + bkln.lineno = lineno; - memory_get_current_pc(&bkln.addr); - - if (lineno != -1) + if (!filename) { + DWORD disp; + ADDRESS64 curr; IMAGEHLP_LINE64 il; - DWORD_PTR linear = (DWORD_PTR)memory_to_linear_addr(&bkln.addr); + DWORD_PTR linear; - if (!filename) + memory_get_current_pc(&curr); + linear = (DWORD_PTR)memory_to_linear_addr(&curr); + il.SizeOfStruct = sizeof(il); + if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) { - DWORD disp; - - il.SizeOfStruct = sizeof(il); - if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) - { - dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); - return; - } - filename = il.FileName; - } - bkln.addr.Offset = 0; - bkln.lineno = lineno; - SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); - if (!bkln.addr.Offset) - { - dbg_printf("Unknown line number\n" - "(either out of file, or no code at given line number)\n"); + dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); return; } + filename = il.FileName; + SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); } - - break_add_break(&bkln.addr, TRUE, swbp); + else + { + /* we have to enumerate across modules */ + bkln.filename = filename; + SymEnumerateModulesW64(dbg_curr_process->handle, mcb, &bkln); + } + if (bkln.addr.Offset) + break_add_break(&bkln.addr, TRUE, swbp); + else + dbg_printf("Unknown line number\n" + "(either out of file, or no code at given line number)\n"); } /***********************************************************************

1 0

Eric Pouech : dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form).
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 2d570921dc37a9cec36a9a1bf4e71205bf199c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d570921dc37a9cec36a9a1bf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 7 22:41:02 2011 +0100 dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form). --- dlls/dbghelp/symbol.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 07e62e2..78b0b2c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -220,6 +220,10 @@ static BOOL compile_file_regex(regex_t* re, const char* srcfile) *p++ = '\\'; *p++ = '.'; break; + case '*': + *p++ = '.'; + *p++ = '*'; + break; default: *p++ = *srcfile; break; @@ -2029,8 +2033,8 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (dli->is_source_file) { file = source_get(pair.effective, dli->u.source_file); - if (!match_regexp(&re, file)) file = ""; - strcpy(sci.FileName, file); + if (!match_regexp(&re, file)) sci.FileName[0] = '\0'; + else strcpy(sci.FileName, file); } else if (sci.FileName[0]) {

1 0

Nikolay Sivov : msxml3: Merge obsolete interfaces tests in a single file.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 1b1c4c014021a99811154bdb0caef1d862d699ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1c4c014021a99811154bdb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 00:39:24 2011 +0300 msxml3: Merge obsolete interfaces tests in a single file. --- dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/xmldoc.c | 534 ++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/xmlelem.c | 598 ----------------------------------------- 3 files changed, 535 insertions(+), 600 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1c4c014021a99811154…

1 0

Henri Verbeet : winex11.drv: Allow disabling vertical sync using EXT_swap_control.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 727ecc17145b98e8cfcbc85cdb7a7a5374615b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=727ecc17145b98e8cfcbc85cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:27 2011 +0100 winex11.drv: Allow disabling vertical sync using EXT_swap_control. EXT_swap_control redefines glXSwapIntervalSGI() as glXSwapIntervalEXT() on the current drawable (if any), and glXSwapIntervalEXT() supports disabling vsync. --- dlls/winex11.drv/opengl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4b56c3f..a9cc178 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -150,6 +150,7 @@ static Wine_GLContext *context_list; static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; static int use_render_texture_ati = 0; +static BOOL has_swap_control; static int swap_interval = 1; #define MAX_EXTENSIONS 16 @@ -3424,7 +3425,7 @@ static BOOL WINAPI X11DRV_wglSwapIntervalEXT(int interval) { SetLastError(ERROR_INVALID_DATA); return FALSE; } - else if (interval == 0) + else if (!has_swap_control && interval == 0) { /* wglSwapIntervalEXT considers an interval value of zero to mean that * vsync should be disabled, but glXSwapIntervalSGI considers such a @@ -3738,6 +3739,9 @@ static void X11DRV_WineGL_LoadExtensions(void) if(glxRequireExtension("GLX_EXT_fbconfig_packed_float")) register_extension_string("WGL_EXT_pixel_format_packed_float"); + if (glxRequireExtension("GLX_EXT_swap_control")) + has_swap_control = TRUE; + /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL) register_extension(&WGL_NV_vertex_array_range);

1 0

Henri Verbeet : ddraw: Just pass NULL as swapchain parent.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 015ad93d47d9b3ea281979f18f0600836442bde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=015ad93d47d9b3ea281979f18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:26 2011 +0100 ddraw: Just pass NULL as swapchain parent. The swapchain was the last place using IParent, so this allows us to kill IParent completely. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/ddraw.c | 24 +------- dlls/ddraw/ddraw_private.h | 45 --------------- dlls/ddraw/parent.c | 135 -------------------------------------------- 4 files changed, 4 insertions(+), 201 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 1d49e79..bc232f0 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -11,7 +11,6 @@ C_SRCS = \ main.c \ material.c \ palette.c \ - parent.c \ surface.c \ utils.c \ vertexbuffer.c \ diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e1d5c62..aeabe59 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2628,14 +2628,11 @@ static HRESULT ddraw_recreate_surfaces(IDirectDrawImpl *This) ddraw_recreate_surfaces_cb); } -ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) +ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *swapchain) { - IUnknown *swapChainParent; + TRACE("swapchain %p.\n", swapchain); - TRACE("swapchain %p.\n", pSwapChain); - - swapChainParent = IWineD3DSwapChain_GetParent(pSwapChain); - return IUnknown_Release(swapChainParent); + return IWineD3DSwapChain_Release(swapchain); } /***************************************************************************** @@ -5919,32 +5916,19 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar { struct IDirectDrawImpl *This = ddraw_from_device_parent(iface); IDirectDrawSurfaceImpl *iterator; - IParentImpl *object; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IParentImpl)); - if (!object) - { - FIXME("Allocation of memory failed\n"); - *swapchain = NULL; - return DDERR_OUTOFVIDEOMEMORY; - } - - ddraw_parent_init(object); - hr = IWineD3DDevice_CreateSwapChain(This->wineD3DDevice, present_parameters, - This->ImplType, object, swapchain); + This->ImplType, NULL, swapchain); if (FAILED(hr)) { FIXME("(%p) CreateSwapChain failed, returning %#x\n", iface, hr); - HeapFree(GetProcessHeap(), 0 , object); *swapchain = NULL; return hr; } - object->child = (IUnknown *)*swapchain; This->d3d_target->wineD3DSwapChain = *swapchain; iterator = This->d3d_target->complex_array[0]; while (iterator) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7899deb..7df059f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -39,30 +39,6 @@ extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; -/***************************************************************************** - * IParent - a helper interface - *****************************************************************************/ -DEFINE_GUID(IID_IParent, 0xc20e4c88, 0x74e7, 0x4940, 0xba, 0x9f, 0x2e, 0x32, 0x3f, 0x9d, 0xc9, 0x81); -typedef struct IParent *LPPARENT, *PPARENT; - -#define INTERFACE IParent -DECLARE_INTERFACE_(IParent,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -}; -#undef INTERFACE - -#if !defined(__cplusplus) || defined(CINTERFACE) -/*** IUnknown methods ***/ -#define IParent_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IParent_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IParent_Release(p) (p)->lpVtbl->Release(p) -#endif - - /* Typdef the interfaces */ typedef struct IDirectDrawImpl IDirectDrawImpl; typedef struct IDirectDrawSurfaceImpl IDirectDrawSurfaceImpl; @@ -74,7 +50,6 @@ typedef struct IDirect3DViewportImpl IDirect3DViewportImpl; typedef struct IDirect3DMaterialImpl IDirect3DMaterialImpl; typedef struct IDirect3DExecuteBufferImpl IDirect3DExecuteBufferImpl; typedef struct IDirect3DVertexBufferImpl IDirect3DVertexBufferImpl; -typedef struct IParentImpl IParentImpl; /* Callbacks for implicit object destruction */ extern ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN; @@ -270,26 +245,6 @@ static inline IDirectDrawSurfaceImpl *surface_from_surface3(IDirectDrawSurface3 #define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.dwRGBBitCount+7)/8)) #define GET_BPP(desc) PFGET_BPP(desc.ddpfPixelFormat) -/***************************************************************************** - * IParent Implementation - *****************************************************************************/ -struct IParentImpl -{ - /* IUnknown fields */ - const IParentVtbl *lpVtbl; - LONG ref; - - /* IParentImpl fields */ - IUnknown *child; - -}; - -void ddraw_parent_init(IParentImpl *parent) DECLSPEC_HIDDEN; - -/***************************************************************************** - * IDirect3DDevice implementation - *****************************************************************************/ - #define DDRAW_INVALID_HANDLE ~0U enum ddraw_handle_type diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c deleted file mode 100644 index 871f066..0000000 --- a/dlls/ddraw/parent.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * IParent implementation - * - * Copyright (c) 2006 Stefan Dösinger - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * A universal parent interface for everything in WineD3D that doesn't have - * a DDraw counterpart - */ - -#include "config.h" -#include "wine/port.h" - -#include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); - -/***************************************************************************** - * IUnknown methods - *****************************************************************************/ - -/***************************************************************************** - * IParent::Queryinterface - * - * It can't query any interfaces, and it's not used for anything. So - * it just returns E_NOINTERFACE - * - * Params: - * riid: guid of queried interface - * obj: returns a pointer to the interface - * - * Return values - * This implementation always returns E_NOINTERFACE and NULL - * - *****************************************************************************/ -static HRESULT WINAPI -IParentImpl_QueryInterface(IParent *iface, - REFIID riid, - void **obj) -{ - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); - - *obj = NULL; - if ( IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IParent, riid ) ) - { - *obj = iface; - IParent_AddRef(iface); - return DD_OK; - } - return E_NOINTERFACE; -} - -/***************************************************************************** - * IParent::AddRef - * - * Increases the refcount - * - * Params: - * - * Return values - * The new refcount - * - *****************************************************************************/ -static ULONG WINAPI -IParentImpl_AddRef(IParent *iface) -{ - IParentImpl *This = (IParentImpl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("%p increasing refcount to %u.\n", This, ref); - - return ref; -} - - -/***************************************************************************** - * IParent::Release - * - * Releases the refcount, and destroys the object if the refcount falls to 0 - * Also releases the child object, if destroyed. That's almost the whole sense - * of this interface. - * - * Params: - * - * Return values - * The new refcount - * - *****************************************************************************/ -static ULONG WINAPI IParentImpl_Release(IParent *iface) -{ - IParentImpl *This = (IParentImpl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("%p decreasing refcount to %u.\n", This, ref); - - if (ref == 0) - { - TRACE("(%p) Releasing child at %p\n", This, This->child); - if(This->child) - IUnknown_Release(This->child); - HeapFree(GetProcessHeap(), 0, This); - TRACE("Released\n"); - } - return ref; -} - -/***************************************************************************** - * The VTable - *****************************************************************************/ -static const struct IParentVtbl ddraw_parent_vtbl = -{ - IParentImpl_QueryInterface, - IParentImpl_AddRef, - IParentImpl_Release, -}; - -void ddraw_parent_init(IParentImpl *parent) -{ - parent->lpVtbl = &ddraw_parent_vtbl; - parent->ref = 1; -}

1 0

Henri Verbeet : wined3d: Don' t require container parents for IWineD3DDeviceParent methods to be COM objects .
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: b9fae5e9a8a142195aeb5dbe738101d0cd893d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fae5e9a8a142195aeb5dbe7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:25 2011 +0100 wined3d: Don't require container parents for IWineD3DDeviceParent methods to be COM objects. --- dlls/d3d10core/device.c | 18 +++++++++--------- dlls/d3d8/device.c | 26 +++++++++++++------------- dlls/d3d9/device.c | 28 ++++++++++++++-------------- dlls/ddraw/ddraw.c | 18 +++++++++--------- include/wine/wined3d.idl | 6 +++--- 5 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9fae5e9a8a142195aeb5…

1 0

Henri Verbeet : wined3d: Pass gl_info to volume_bind_and_dirtify().
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: aa420ced0e6483e0c622b150064d738ebbf14a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa420ced0e6483e0c622b1500… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 21:45:24 2011 +0100 wined3d: Pass gl_info to volume_bind_and_dirtify(). --- dlls/wined3d/volume.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 03bc5e6..e6f7687 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* Context activation is done by the caller. */ -static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume) +static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &volume->resource.device->adapter->gl_info; IWineD3DBaseTextureImpl *container = (IWineD3DBaseTextureImpl *)volume->container; DWORD active_sampler; @@ -102,7 +101,7 @@ void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) TRACE("volume %p, level %u, srgb %#x, format %s (%#x).\n", volume, level, srgb_mode, debug_d3dformat(format->id), format->id); - volume_bind_and_dirtify(volume); + volume_bind_and_dirtify(volume, gl_info); ENTER_GL(); GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, level, format->glInternal,

1 0

Thomas Mullaly : mshtml: Correctly forward IHTMLWindow's IHTMLDocument' s ConnectionPointContainer.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: a46e0c617b84226fba0fc70fd4030b20f91d9940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46e0c617b84226fba0fc70fd… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat Feb 26 23:55:16 2011 -0500 mshtml: Correctly forward IHTMLWindow's IHTMLDocument's ConnectionPointContainer. --- dlls/mshtml/conpoint.c | 2 +- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/tests/events.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index df6c5cf..ca45524 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -266,7 +266,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo TRACE("(%p)->(%s %p)\n", This, debugstr_cp_guid(riid), ppCP); if(This->forward_container) - return IConnectionPointContainer_FindConnectionPoint(&This->IConnectionPointContainer_iface, + return IConnectionPointContainer_FindConnectionPoint(&This->forward_container->IConnectionPointContainer_iface, riid, ppCP); *ppCP = NULL; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d0d378f..a4fa1be 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -40,6 +40,8 @@ static struct list window_list = LIST_INIT(window_list); static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) { if(window->doc) { + if(window->doc_obj && window == window->doc_obj->basedoc.window) + window->doc->basedoc.cp_container.forward_container = NULL; abort_document_bindings(window->doc); window->doc->basedoc.window = NULL; htmldoc_release(&window->doc->basedoc); @@ -2245,6 +2247,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_init(&window->script_hosts); window->task_magic = get_task_target_magic(); + *ret = window; update_window_doc(window); list_init(&window->children); @@ -2257,7 +2260,6 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_add_tail(&parent->children, &window->sibling_entry); } - *ret = window; return S_OK; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index b1d1423..bdb8460 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2407,7 +2407,7 @@ static void test_empty_document(void) cp = get_cp((IUnknown*)doc, &IID_IDispatch); hres = IConnectionPoint_Unadvise(cp, cookie); IConnectionPoint_Release(cp); - todo_wine ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); IHTMLDocument2_Release(windows_doc); }

1 0

Thomas Mullaly : mshtml/tests: Added more ConnectionPoint tests for IHTMLDocument.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 1571097ed354f70931daeb06c6f3f56d1f869f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1571097ed354f70931daeb06c… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat Feb 26 23:14:59 2011 -0500 mshtml/tests: Added more ConnectionPoint tests for IHTMLDocument. --- dlls/mshtml/tests/events.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 65cf886..b1d1423 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -109,6 +109,9 @@ static const char img_doc_str[] = static const char input_doc_str[] = "<html><body><input id=\"inputid\"></input></body></html>"; +static const char iframe_doc_str[] = + "<html><body><iframe id=\"ifr\">Testing</iframe></body></html>"; + static const char form_doc_str[] = "<html><body><form id=\"formid\" method=\"post\" action=\"about:blank\">" "<input type=\"text\" value=\"test\" name=\"i\"/>" @@ -1717,6 +1720,77 @@ static void test_timeout(IHTMLDocument2 *doc) IHTMLWindow3_Release(win3); } +static IHTMLElement* find_element_by_id(IHTMLDocument2 *doc, const char *id) +{ + HRESULT hres; + IHTMLDocument3 *doc3; + IHTMLElement *result; + BSTR idW = a2bstr(id); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + + hres = IHTMLDocument3_getElementById(doc3, idW, &result); + ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(result != NULL, "result == NULL\n"); + SysFreeString(idW); + + IHTMLDocument3_Release(doc3); + return result; +} + +static IHTMLDocument2* get_iframe_doc(IHTMLIFrameElement *iframe) +{ + HRESULT hres; + IHTMLFrameBase2 *base; + IHTMLDocument2 *result = NULL; + + hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&base); + ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08x\n", hres); + if(hres == S_OK) { + IHTMLWindow2 *window; + + hres = IHTMLFrameBase2_get_contentWindow(base, &window); + ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(window != NULL, "window == NULL\n"); + if(window) { + hres = IHTMLWindow2_get_document(window, &result); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(result != NULL, "result == NULL\n"); + IHTMLWindow2_Release(window); + } + } + if(base) IHTMLFrameBase2_Release(base); + + return result; +} + +static void test_iframe_connections(IHTMLDocument2 *doc) +{ + HRESULT hres; + IHTMLIFrameElement *iframe; + IHTMLDocument2 *iframes_doc; + DWORD cookie; + IConnectionPoint *cp; + IHTMLElement *element = find_element_by_id(doc, "ifr"); + + hres = IHTMLElement_QueryInterface(element, &IID_IHTMLIFrameElement, (void**)&iframe); + IHTMLElement_Release(element); + ok(hres == S_OK, "QueryInterface(IID_IHTMLIFrameElement) failed: %08x\n", hres); + + iframes_doc = get_iframe_doc(iframe); + IHTMLIFrameElement_Release(iframe); + + cookie = register_cp((IUnknown*)iframes_doc, &IID_IDispatch, (IUnknown*)&div_onclick_disp); + + cp = get_cp((IUnknown*)doc, &IID_IDispatch); + hres = IConnectionPoint_Unadvise(cp, cookie); + IConnectionPoint_Release(cp); + ok(hres == CONNECT_E_NOCONNECTION, "Unadvise returned %08x, expected CONNECT_E_NOCONNECTION\n", hres); + + IHTMLDocument2_Release(iframes_doc); +} + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) @@ -2309,6 +2383,35 @@ static HWND create_container_window(void) 300, 300, NULL, NULL, NULL, NULL); } +static void test_empty_document(void) +{ + HRESULT hres; + IHTMLWindow2 *window; + IHTMLDocument2 *windows_doc, *doc; + IConnectionPoint *cp; + DWORD cookie; + + doc = create_document(); + if(!doc) + return; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_get_document(window, &windows_doc); + IHTMLWindow2_Release(window); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + cookie = register_cp((IUnknown*)windows_doc, &IID_IDispatch, (IUnknown*)&div_onclick_disp); + + cp = get_cp((IUnknown*)doc, &IID_IDispatch); + hres = IConnectionPoint_Unadvise(cp, cookie); + IConnectionPoint_Release(cp); + todo_wine ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IHTMLDocument2_Release(windows_doc); +} + START_TEST(events) { CoInitialize(NULL); @@ -2323,6 +2426,9 @@ START_TEST(events) run_test(img_doc_str, test_imgload); run_test(input_doc_str, test_focus); run_test(form_doc_str, test_submit); + run_test(iframe_doc_str, test_iframe_connections); + + test_empty_document(); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Alexandre Julliard : server: Fix checking of X button flags when updating the input key state.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 0b8571e3dc348d3ca0bbd43dd9d4e0895c59e0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8571e3dc348d3ca0bbd43dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 23:48:03 2011 +0100 server: Fix checking of X button flags when updating the input key state. --- server/queue.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 97e0c4d..7d25afa 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1147,8 +1147,8 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_XBUTTONUP: - if (msg->wparam == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); - else if (msg->wparam == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down ); + if (msg->wparam >> 16 == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); + else if (msg->wparam >> 16 == XBUTTON2) set_input_key_state( keystate, VK_XBUTTON2, down ); break; case WM_KEYDOWN: case WM_SYSKEYDOWN:

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011