October 2006 - Wine-Commits

lostwages/templates/en git.template
by Jeremy Newman Oct. 26, 2006

Oct. 26, 2006

ChangeSet ID: 29290 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/10/26 14:24:39 Modified files: templates/en : git.template Log message: Jan Zerebecki <jan.wine(a)zerebecki.de> git: Add the other modules still available through CVS. Patch: http://cvs.winehq.org/patch.py?id=29290 Old revision New revision Changes Path 1.2 1.3 +70 -1 lostwages/templates/en/git.template Index: lostwages/templates/en/git.template diff -u -p lostwages/templates/en/git.template:1.2 lostwages/templates/en/git.template:1.3 --- lostwages/templates/en/git.template:1.2 26 Oct 2006 19:24:39 -0000 +++ lostwages/templates/en/git.template 26 Oct 2006 19:24:39 -0000 @@ -7,7 +7,7 @@ Anyone may get the code, post opinions o and contribute patches. You will need to know C and/or perl, and something about <a href="{$root}/site/resources">Unix and Windows</a>.</p> -<p><a href="http://git.or.cz/" target="_blank">git</a> is a fast directory +<p><a href="http://git.or.cz/" target="_blank">Git</a> is a fast directory content manager, originally written for use with large repositories, such as the Linux Kernel source. </p> @@ -20,6 +20,8 @@ such as the Linux Kernel source. </p> <li><a href="#clone">Getting a local copy of Wine</a> <li><a href="#uptodate">Staying Up-To-Date</a> <li><a href="#sourcetree">Source Tree Browsing via the Web</a> + <li><a href="#modules">Other modules available from WineHQ</a> + <li><a href="#docs">Documentation module available from Sourceforge</a> </ol> <p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> @@ -71,6 +73,8 @@ you can use the following more dangerous <p>This will wipe out any local changes you have made, so use it with caution.</p> +<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> + <h1>Staying Up-To-Date</h1> <p> First, make sure to clean your tree as described above, then @@ -84,8 +88,12 @@ run the following commands from the top </td></tr> </table> +<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> + <a name="sourcetree" class=hidden></a> + <h1>Source Tree Browsing via the Web</h1> + <p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) cross-referenced and available for browsing, including a search engine. This cross-references source is based on the snapshot-releases and is made available at: </p> @@ -99,4 +107,65 @@ This cross-references source is based on <li><a href="http://source.winehq.org/git">source.winehq.org/git</a>, on the primary Git repository </ul> +<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> + +<a name="modules" class=hidden></a> + +<h1>Other modules available from WineHQ</h1> + +<p>The WineHQ CVS server makes a couple of other things available.</p> + +<ul> + <li><tt>lostwages</tt> -- source for the WineHQ web site</li> + <li><tt>tools</tt> -- tools used on the WineHQ site</li> + <li><tt>appdb</tt> -- source for the application database web site</li> + <li><tt>bugzilla</tt> -- source for the bugzilla version used on the WineHQ site</li> +</ul> + +<p>To login to the CVS server, run in a terminal:</p> + +<table width="500" border=0 cellpadding=10> + <tr><td class=black> + <span class=inverse> + CVSROOT=:pserver:cvs(a)cvs.winehq.org:/home/wine cvs login + </span> + </td></tr> +</table> + +<p>Use "cvs" as the password (without the quotes).</p> + +<p>To get a git repository of one of the modules listed above +create a new directory and in a terminal run in that directory:</p> + +<table width="550" border=0 cellpadding=10> + <tr><td class=black> + <span class=inverse> + git cvsimport -v -k -d :pserver:cvs(a)cvs.winehq.org:/home/wine MODULE<br/> + </span> + </td></tr> +</table> + +<p>Replace MODULE with one of the module names listed above.<br/> +But be aware that this can take quite some time.</p> + +<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> + +<a name="docs" class=hidden></a> + +<h1>Documentation module available from Sourceforge</h1> + +<p>The documentation lives in a separate CVS tree on Sourceforge.<br/> +To get a git repository of the documentation create a new directory and +in a terminal run in that directory:</p> +<table width="550" border=0 cellpadding=10> + <tr><td class=black> + <span class=inverse> + git cvsimport -v -k -d :pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine docs<br/> + </span> + </td></tr> +</table> + +<p>But be aware that this can take quite some time.</p> + + <p> </p>

1 0

Jacek Caban : shdocvw: Added CUrlHistory stub implementation.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 25d841752826b4bba55ff2ca4f09767315a51e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d841752826b4bba55ff2ca4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 23:06:35 2006 +0200 shdocvw: Added CUrlHistory stub implementation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/factory.c | 3 + dlls/shdocvw/shdocvw.h | 2 + dlls/shdocvw/urlhist.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 74d8e24..40eeb21 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -24,6 +24,7 @@ C_SRCS = \ regsvr.c \ shdocvw_main.c \ shlinstobj.c \ + urlhist.c \ view.c \ webbrowser.c diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index bbab810..71a37aa 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -124,6 +124,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI { static IClassFactoryImpl WB1ClassFactory = {&WBCF_Vtbl, WebBrowserV1_Create}; static IClassFactoryImpl WB2ClassFactory = {&WBCF_Vtbl, WebBrowserV2_Create}; + static IClassFactoryImpl CUHClassFactory = {&WBCF_Vtbl, CUrlHistory_Create}; TRACE("\n"); @@ -133,6 +134,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI if(IsEqualGUID(&CLSID_WebBrowser_V1, rclsid)) return IClassFactory_QueryInterface(FACTORY(&WB1ClassFactory), riid, ppv); + if(IsEqualGUID(&CLSID_CUrlHistory, rclsid)) + return IClassFactory_QueryInterface(FACTORY(&CUHClassFactory), riid, ppv); /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index be75263..61cdd94 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -196,6 +196,8 @@ HRESULT navigate_url(DocHost*,BSTR,VARIA HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**); void InternetExplorer_WebBrowser_Init(InternetExplorer*); +HRESULT CUrlHistory_Create(IUnknown*,REFIID,void**); + #define WB_WM_NAVIGATE2 (WM_USER+100) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) diff --git a/dlls/shdocvw/urlhist.c b/dlls/shdocvw/urlhist.c new file mode 100644 index 0000000..2b2e572 --- /dev/null +++ b/dlls/shdocvw/urlhist.c @@ -0,0 +1,128 @@ +/* + * Copyright 2006 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include "wine/debug.h" +#include "shdocvw.h" +#include "urlhist.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IUrlHistoryStg, riid)) { + TRACE("(IID_IUrlHistoryStg %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IUrlHistoryStg2, riid)) { + TRACE("(IID_IUrlHistoryStg2 %p)\n", ppv); + *ppv = iface; + } + + if(*ppv) + return S_OK; + + + WARN("(%s %p)\n", debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI UrlHistoryStg_AddRef(IUrlHistoryStg2 *iface) +{ + return 2; +} + +static ULONG WINAPI UrlHistoryStg_Release(IUrlHistoryStg2 *iface) +{ + return 1; +} + +static HRESULT WINAPI UrlHistoryStg_AddUrl(IUrlHistoryStg2 *iface, LPCOLESTR lpcsUrl, + LPCOLESTR pocsTitle, DWORD dwFlags) +{ + FIXME("(%s %s %08x)\n", debugstr_w(lpcsUrl), debugstr_w(pocsTitle), dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI UrlHistoryStg_DeleteUrl(IUrlHistoryStg2 *iface, LPCOLESTR lpcsUrl, + DWORD dwFlags) +{ + FIXME("(%s %08x)\n", debugstr_w(lpcsUrl), dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI UrlHistoryStg_QueryUrl(IUrlHistoryStg2 *iface, LPCOLESTR lpcsUrl, + DWORD dwFlags, LPSTATURL lpSTATURL) +{ + FIXME("(%s %08x %p)\n", debugstr_w(lpcsUrl), dwFlags, lpSTATURL); + return E_NOTIMPL; +} + +static HRESULT WINAPI UrlHistoryStg_BindToObject(IUrlHistoryStg2 *iface, LPCOLESTR lpcsUrl, + REFIID riid, void **ppv) +{ + FIXME("(%s %s %p)\n", debugstr_w(lpcsUrl), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI UrlHistoryStg_EnumUrls(IUrlHistoryStg2 *iface, IEnumSTATURL **ppEnum) +{ + FIXME("(%p)\n", ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI UrlHistoryStg_AddUrlAndNotify(IUrlHistoryStg2 *iface, LPCOLESTR pocsUrl, + LPCOLESTR pocsTitle, DWORD dwFlags, BOOL fWriteHistory, IOleCommandTarget *poctNotify, + IUnknown *punkISFolder) +{ + FIXME("(%s %s %08x %x %p %p)\n", debugstr_w(pocsUrl), debugstr_w(pocsTitle), + dwFlags, fWriteHistory, poctNotify, punkISFolder); + return E_NOTIMPL; +} + +static HRESULT WINAPI UrlHistoryStg_ClearHistory(IUrlHistoryStg2 *iface) +{ + FIXME("()\n"); + return E_NOTIMPL; +} + +static const IUrlHistoryStg2Vtbl UrlHistoryStg2Vtbl = { + UrlHistoryStg_QueryInterface, + UrlHistoryStg_AddRef, + UrlHistoryStg_Release, + UrlHistoryStg_AddUrl, + UrlHistoryStg_DeleteUrl, + UrlHistoryStg_QueryUrl, + UrlHistoryStg_BindToObject, + UrlHistoryStg_EnumUrls, + UrlHistoryStg_AddUrlAndNotify, + UrlHistoryStg_ClearHistory +}; + +static IUrlHistoryStg2 UrlHistoryStg2 = { &UrlHistoryStg2Vtbl }; + +HRESULT CUrlHistory_Create(IUnknown *pOuter, REFIID riid, void **ppv) +{ + if(pOuter) + return CLASS_E_NOAGGREGATION; + + return IUrlHistoryStg_QueryInterface(&UrlHistoryStg2, riid, ppv); +}

1 0

Jacek Caban : include: Added urlhist.idl.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 6501e2e57b7cb3ce022a95090b218a731770435d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6501e2e57b7cb3ce022a95090… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 23:05:50 2006 +0200 include: Added urlhist.idl. --- dlls/uuid/uuid.c | 1 + include/.gitignore | 1 + include/Makefile.in | 1 + include/urlhist.idl | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index b3c8511..5ee4074 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -66,6 +66,7 @@ #include "hlink.h" #include "optary.h" #include "indexsrv.h" #include "htiframe.h" +#include "urlhist.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/.gitignore b/include/.gitignore index d782fca..d3ee3d3 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -41,6 +41,7 @@ /strmif.h /tom.h /unknwn.h +/urlhist.h /urlmon.h /wtypes.h /xmldom.h diff --git a/include/Makefile.in b/include/Makefile.in index f0f3d52..2e2ddee 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -46,6 +46,7 @@ WINDOWS_IDL_SRCS = \ strmif.idl \ tom.idl \ unknwn.idl \ + urlhist.idl \ urlmon.idl \ wtypes.idl \ xmldom.idl \ diff --git a/include/urlhist.idl b/include/urlhist.idl new file mode 100644 index 0000000..0dde482 --- /dev/null +++ b/include/urlhist.idl @@ -0,0 +1,139 @@ +/* + * Copyright 2006 Jacek Caban for CodeWeavers + * + * 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 + */ + +import "objidl.idl"; +import "oleidl.idl"; +import "oaidl.idl"; +import "docobj.idl"; +import "servprov.idl"; + +typedef enum _ADDURL_FLAG +{ + ADDURL_FIRST = 0, + ADDURL_ADDTOHISTORYANDCACHE = 0, + ADDURL_ADDTOCACHE = 1, + ADDURL_Max = 0x7fffffff +} ADDURL_FLAG; + +/***************************************************************************** + * IEnumSTATURL interface + */ +[ + object, + uuid(3c374a42-bae4-11cf-bf7d-00aa006946ee), + pointer_default(unique) +] +interface IEnumSTATURL : IUnknown +{ + typedef [unique] IEnumSTATURL *LPENUMSTATURL; + + typedef struct _STATURL + { + DWORD cbSize; + LPWSTR pwcsUrl; + LPWSTR pwcsTitle; + FILETIME ftLastVisited; + FILETIME ftLastUpdated; + FILETIME ftExpires; + DWORD dwFlags; + } STATURL, *LPSTATURL; + + HRESULT Next( + [in] ULONG celt, + [in, out] LPSTATURL rgelt, + [in, out] ULONG *pceltFetched); + + HRESULT Skip([in] ULONG celt); + HRESULT Reset(); + HRESULT Clone([out] IEnumSTATURL **ppenum); + + HRESULT SetFilter( + [in] LPCOLESTR poszFilter, + [in] DWORD dwFlags); +} + +/***************************************************************************** + * IUrlHistoryStg interface + */ +[ + object, + uuid(3c374a41-bae4-11cf-bf7d-00aa006946ee), + pointer_default(unique) +] +interface IUrlHistoryStg : IUnknown +{ + typedef [unique] IUrlHistoryStg *LPURLHISTORYSTG; + + HRESULT AddUrl( + [in] LPCOLESTR pocsUrl, + [in, unique] LPCOLESTR pocsTitle, + [in] DWORD dwFlags); + + HRESULT DeleteUrl( + [in] LPCOLESTR pocsUrl, + [in] DWORD dwFlags); + + HRESULT QueryUrl( + [in] LPCOLESTR pocsUrl, + [in] DWORD dwFlags, + [in, out, unique] LPSTATURL lpSTATURL); + + HRESULT BindToObject( + [in] LPCOLESTR pocsUrl, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvOut); + + HRESULT EnumUrls( + [out] IEnumSTATURL **ppEnum); +} + +/***************************************************************************** + * IUrlHistoryStg2 interface + */ +[ + object, + uuid(afa0dc11-c313-11d0-831a-00c04fd5ae38), + pointer_default(unique) +] +interface IUrlHistoryStg2 : IUrlHistoryStg +{ + typedef [unique] IUrlHistoryStg2 *LPURLHISTORYSTG2; + + HRESULT AddUrlAndNotify( + [in] LPCOLESTR pocsUrl, + [in,unique] LPCOLESTR pocsTitle, + [in] DWORD dwFlags, + [in] BOOL fWriteHistory, + [in] IOleCommandTarget *poctNotify, + [in, unique] IUnknown *punkISFolder); + + HRESULT ClearHistory(); +} + +/***************************************************************************** + * IUrlHistoryNotify interface + */ +[ + object, + uuid(bc40bec1-c493-11d0-831b-00C04fd5ae38), + pointer_default(unique) +] +interface IUrlHistoryNotify : IOleCommandTarget +{ + typedef [unique] IUrlHistoryNotify *LPURLHISTORYNOTIFY; +}

1 0

Alexandre Julliard : winex11.drv: Offset X11 coordinates with the primary monitor position.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: a06aeaba39a5732856a037ac3221ce72c5cc4fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06aeaba39a5732856a037ac3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 26 12:53:59 2006 +0200 winex11.drv: Offset X11 coordinates with the primary monitor position. No longer force the primary monitor to contain the X11 (0,0) coordinate. --- dlls/winex11.drv/mouse.c | 13 +++++++++++-- dlls/winex11.drv/window.c | 14 +++++++++----- dlls/winex11.drv/winpos.c | 9 +++++++-- dlls/winex11.drv/xinerama.c | 19 +++++++++++-------- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ac714c..e6f899a 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -123,6 +123,11 @@ static void update_mouse_state( HWND hwn { struct x11drv_thread_data *data = x11drv_thread_data(); + if (window == root_window) + { + x += virtual_screen_rect.left; + y += virtual_screen_rect.top; + } get_coords( hwnd, x, y, pt ); update_key_state( state ); @@ -287,7 +292,8 @@ void X11DRV_send_mouse_input( HWND hwnd, { TRACE( "warping to (%d,%d)\n", pt.x, pt.y ); wine_tsx11_lock(); - XWarpPointer( thread_display(), root_window, root_window, 0, 0, 0, 0, pt.x, pt.y ); + XWarpPointer( thread_display(), root_window, root_window, 0, 0, 0, 0, + pt.x - virtual_screen_rect.left, pt.y - virtual_screen_rect.top ); wine_tsx11_unlock(); } } @@ -690,7 +696,8 @@ BOOL X11DRV_SetCursorPos( INT x, INT y ) TRACE( "warping to (%d,%d)\n", x, y ); wine_tsx11_lock(); - XWarpPointer( display, root_window, root_window, 0, 0, 0, 0, x, y ); + XWarpPointer( display, root_window, root_window, 0, 0, 0, 0, + x - virtual_screen_rect.left, y - virtual_screen_rect.top ); XFlush( display ); /* avoids bad mouse lag in games that do their own mouse warping */ cursor_pos.x = x; cursor_pos.y = y; @@ -714,6 +721,8 @@ BOOL X11DRV_GetCursorPos(LPPOINT pos) { update_key_state( xstate ); update_button_state( xstate ); + winX += virtual_screen_rect.left; + winY += virtual_screen_rect.top; TRACE("pointer at (%d,%d)\n", winX, winY ); cursor_pos.x = winX; cursor_pos.y = winY; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 39c58c9..b17efff 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -611,8 +611,8 @@ void X11DRV_set_iconic_state( HWND hwnd if (!(wm_hints = XGetWMHints( display, data->whole_window ))) wm_hints = XAllocWMHints(); wm_hints->flags |= StateHint | IconPositionHint; wm_hints->initial_state = iconic ? IconicState : NormalState; - wm_hints->icon_x = rect.left; - wm_hints->icon_y = rect.top; + wm_hints->icon_x = rect.left - virtual_screen_rect.left; + wm_hints->icon_y = rect.top - virtual_screen_rect.top; XSetWMHints( display, data->whole_window, wm_hints ); if (style & WS_VISIBLE) @@ -734,6 +734,8 @@ void X11DRV_sync_window_position( Displa wine_tsx11_lock(); if (mask & (CWWidth|CWHeight)) set_size_hints( display, data, style ); + if (mask & CWX) changes.x -= virtual_screen_rect.left; + if (mask & CWY) changes.y -= virtual_screen_rect.top; XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); wine_tsx11_unlock(); @@ -773,9 +775,11 @@ static Window create_whole_window( Displ wine_tsx11_lock(); data->whole_rect = rect; - data->whole_window = XCreateWindow( display, root_window, rect.left, rect.top, cx, cy, - 0, screen_depth, InputOutput, visual, - mask, &attr ); + data->whole_window = XCreateWindow( display, root_window, + rect.left - virtual_screen_rect.left, + rect.top - virtual_screen_rect.top, + cx, cy, 0, screen_depth, InputOutput, + visual, mask, &attr ); if (!data->whole_window) { diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 3215f7c..4ebcda8 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -102,6 +102,9 @@ void X11DRV_Expose( HWND hwnd, XEvent *x rect.right = rect.left + event->width; rect.bottom = rect.top + event->height; + if (event->window == root_window) + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + if (rect.left < data->client_rect.left || rect.top < data->client_rect.top || rect.right > data->client_rect.right || @@ -1168,6 +1171,7 @@ void X11DRV_MapNotify( HWND hwnd, XEvent rect.top = y; rect.right = x + width; rect.bottom = y + height; + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); X11DRV_X_to_window_rect( data, &rect ); invalidate_dce( hwnd, &data->window_rect ); @@ -1255,9 +1259,9 @@ void X11DRV_handle_desktop_resize( unsig screen_height = height; xinerama_init(); TRACE("desktop %p change to (%dx%d)\n", hwnd, width, height); - SetRect( &rect, 0, 0, width, height ); data->lock_changes++; - X11DRV_set_window_pos( hwnd, 0, &rect, &rect, SWP_NOZORDER|SWP_NOMOVE, NULL ); + X11DRV_set_window_pos( hwnd, 0, &virtual_screen_rect, &virtual_screen_rect, + SWP_NOZORDER|SWP_NOMOVE, NULL ); data->lock_changes--; SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_depth, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); @@ -1295,6 +1299,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, rect.top = y; rect.right = x + event->width; rect.bottom = y + event->height; + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); TRACE( "win %p new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, event->x, event->y, event->width, event->height ); diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 0d01b58..db39407 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -106,9 +106,6 @@ static int query_screens(void) nb_monitors = count; for (i = 0; i < nb_monitors; i++) { - /* FIXME: for now, force primary to be the screen that starts at (0,0) origin */ - if (!screens[i].x_org && !screens[i].y_org) primary_monitor = i; - monitors[i].cbSize = sizeof( monitors[i] ); monitors[i].rcMonitor.left = screens[i].x_org; monitors[i].rcMonitor.top = screens[i].y_org; @@ -121,11 +118,6 @@ static int query_screens(void) } get_primary()->dwFlags |= MONITORINFOF_PRIMARY; - - for (i = 0; i < nb_monitors; i++) - TRACE( "monitor %p: %s%s\n", - index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), - (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } else count = 0; @@ -145,6 +137,7 @@ #endif /* HAVE_LIBXINERAMA */ void xinerama_init(void) { MONITORINFOEXW *primary; + int i; wine_tsx11_lock(); @@ -158,8 +151,18 @@ void xinerama_init(void) } primary = get_primary(); + /* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &virtual_screen_rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); + for (i = 0; i < nb_monitors; i++) + { + OffsetRect( &monitors[i].rcMonitor, virtual_screen_rect.left, virtual_screen_rect.top ); + OffsetRect( &monitors[i].rcWork, virtual_screen_rect.left, virtual_screen_rect.top ); + TRACE( "monitor %p: %s%s\n", + index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), + (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); + } + screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; TRACE( "virtual size: %s primary size: %dx%d\n",

1 0

Alexandre Julliard : server: Always ignore the root window position when computing coordinates offsets.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 844374afaf3604d7f7333c8fca6ce21120a945ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=844374afaf3604d7f7333c8fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 26 12:51:54 2006 +0200 server: Always ignore the root window position when computing coordinates offsets. --- server/window.c | 79 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 53 insertions(+), 26 deletions(-) diff --git a/server/window.c b/server/window.c index ea6dc3b..22112b8 100644 --- a/server/window.c +++ b/server/window.c @@ -638,7 +638,7 @@ static int all_windows_from_point( struc struct window *ptr; /* make point relative to top window */ - for (ptr = top->parent; ptr; ptr = ptr->parent) + for (ptr = top->parent; ptr && !is_desktop_window(ptr); ptr = ptr->parent) { x -= ptr->client_rect.left; y -= ptr->client_rect.top; @@ -651,9 +651,12 @@ static int all_windows_from_point( struc x >= top->client_rect.left && x < top->client_rect.right && y >= top->client_rect.top && y < top->client_rect.bottom) { - if (!get_window_children_from_point( top, x - top->client_rect.left, - y - top->client_rect.top, array )) - return 0; + if (!is_desktop_window(top)) + { + x -= top->client_rect.left; + y -= top->client_rect.top; + } + if (!get_window_children_from_point( top, x, y, array )) return 0; } /* now add window to the array */ if (!add_handle_to_array( array, top->handle )) return 0; @@ -746,7 +749,7 @@ static struct region *intersect_window_r /* convert coordinates from client to screen coords */ static inline void client_to_screen( struct window *win, int *x, int *y ) { - for ( ; win; win = win->parent) + for ( ; win && !is_desktop_window(win); win = win->parent) { *x += win->client_rect.left; *y += win->client_rect.top; @@ -756,10 +759,13 @@ static inline void client_to_screen( str /* map the region from window to screen coordinates */ static inline void map_win_region_to_screen( struct window *win, struct region *region ) { - int x = win->window_rect.left; - int y = win->window_rect.top; - client_to_screen( win->parent, &x, &y ); - offset_region( region, x, y ); + if (!is_desktop_window(win)) + { + int x = win->window_rect.left; + int y = win->window_rect.top; + client_to_screen( win->parent, &x, &y ); + offset_region( region, x, y ); + } } @@ -849,19 +855,29 @@ static struct region *get_visible_region set_region_client_rect( region, win ); if (win->win_region && !intersect_window_region( region, win )) goto error; } - offset_x = win->window_rect.left; - offset_y = win->window_rect.top; /* clip children */ if (flags & DCX_CLIPCHILDREN) { - if (!clip_children( win, NULL, region, win->client_rect.left, win->client_rect.top )) - goto error; + if (is_desktop_window(win)) offset_x = offset_y = 0; + else + { + offset_x = win->client_rect.left; + offset_y = win->client_rect.top; + } + if (!clip_children( win, NULL, region, offset_x, offset_y )) goto error; } /* clip siblings of ancestors */ + if (is_desktop_window(win)) offset_x = offset_y = 0; + else + { + offset_x = win->window_rect.left; + offset_y = win->window_rect.top; + } + if (top && top != win && (tmp = create_empty_region()) != NULL) { while (win != top && win->parent) @@ -873,9 +889,12 @@ static struct region *get_visible_region } /* clip to parent client area */ win = win->parent; - offset_x += win->client_rect.left; - offset_y += win->client_rect.top; - offset_region( region, win->client_rect.left, win->client_rect.top ); + if (!is_desktop_window(win)) + { + offset_x += win->client_rect.left; + offset_y += win->client_rect.top; + offset_region( region, win->client_rect.left, win->client_rect.top ); + } set_region_client_rect( tmp, win ); if (win->win_region && !intersect_window_region( tmp, win )) goto error; if (!intersect_region( region, region, tmp )) goto error; @@ -913,7 +932,8 @@ static struct region *crop_region_to_win /* get bounding rect in client coords */ if (frame) set_region_rect( tmp, &win->window_rect ); else set_region_client_rect( tmp, win ); - offset_region( tmp, -win->client_rect.left, -win->client_rect.top ); + if (!is_desktop_window(win)) + offset_region( tmp, -win->client_rect.left, -win->client_rect.top ); /* intersect specified region with bounding rect */ if (region && !intersect_region( tmp, region, tmp )) goto done; @@ -1271,7 +1291,7 @@ static void expose_window( struct window offset_x = win->window_rect.left - win->client_rect.left; offset_y = win->window_rect.top - win->client_rect.top; - for (ptr = win; ptr != parent; ptr = ptr->parent) + for (ptr = win; ptr != parent && !is_desktop_window(ptr); ptr = ptr->parent) { offset_x += ptr->client_rect.left; offset_y += ptr->client_rect.top; @@ -1351,7 +1371,8 @@ static void set_window_pos( struct windo if (tmp) { set_region_rect( tmp, window_rect ); - offset_region( tmp, -window_rect->left, -window_rect->top ); + if (!is_desktop_window(win)) + offset_region( tmp, -window_rect->left, -window_rect->top ); if (intersect_region( tmp, win->update_region, tmp )) set_update_region( win, tmp ); else @@ -1381,7 +1402,8 @@ static void set_window_pos( struct windo set_region_rect( new_vis_rgn, window_rect ); if (subtract_region( tmp, new_vis_rgn, tmp )) { - offset_region( tmp, -client_rect->left, -client_rect->top ); + if (!is_desktop_window(win)) + offset_region( tmp, -client_rect->left, -client_rect->top ); redraw_window( win, tmp, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN ); } free_region( tmp ); @@ -1768,7 +1790,7 @@ DECL_HANDLER(get_windows_offset) if (req->from) { if (!(win = get_window( req->from ))) return; - while (win) + while (win && !is_desktop_window(win)) { reply->x += win->client_rect.left; reply->y += win->client_rect.top; @@ -1778,7 +1800,7 @@ DECL_HANDLER(get_windows_offset) if (req->to) { if (!(win = get_window( req->to ))) return; - while (win) + while (win && !is_desktop_window(win)) { reply->x -= win->client_rect.left; reply->y -= win->client_rect.top; @@ -1807,10 +1829,15 @@ DECL_HANDLER(get_visible_region) reply->top_win = top->handle; reply->top_org_x = top->visible_rect.left; reply->top_org_y = top->visible_rect.top; - reply->win_org_x = (req->flags & DCX_WINDOW) ? win->window_rect.left : win->client_rect.left; - reply->win_org_y = (req->flags & DCX_WINDOW) ? win->window_rect.top : win->client_rect.top; - client_to_screen( top->parent, &reply->top_org_x, &reply->top_org_y ); - client_to_screen( win->parent, &reply->win_org_x, &reply->win_org_y ); + + if (!is_desktop_window(top)) + { + reply->win_org_x = (req->flags & DCX_WINDOW) ? win->window_rect.left : win->client_rect.left; + reply->win_org_y = (req->flags & DCX_WINDOW) ? win->window_rect.top : win->client_rect.top; + client_to_screen( top->parent, &reply->top_org_x, &reply->top_org_y ); + client_to_screen( win->parent, &reply->win_org_x, &reply->win_org_y ); + } + else reply->win_org_x = reply->win_org_y = 0; }

1 0

David Anderson : dbghelp: Avoid printing too many "What the heck" messages from winedbg.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: c80f5181ff5e1bf7ad99dbea165b07610d3f1f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80f5181ff5e1bf7ad99dbea1… Author: David Anderson <davea42(a)earthlink.net> Date: Tue Oct 24 21:05:21 2006 -0700 dbghelp: Avoid printing too many "What the heck" messages from winedbg. --- dlls/dbghelp/dwarf.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index b1c8572..2f22d9e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1095,7 +1095,7 @@ static unsigned dwarf2_map_register(int switch (regno) { - case Wine_DW_no_register: FIXME("What the heck\n"); reg = 0; break; + case Wine_DW_no_register: FIXME("What the heck map reg 0x%x\n",regno); reg = 0; break; /* FIXME: this is a dirty hack */ case Wine_DW_frame_register: reg = 0; break; case 0: reg = CV_REG_EAX; break; @@ -1394,8 +1394,16 @@ static struct symt* dwarf2_parse_subprog subpgm.ctx = ctx; subpgm.compiland = compiland; - if (dwarf2_compute_location(ctx, di, DW_AT_frame_base, &subpgm.frame_offset, &subpgm.frame_reg)) + if (dwarf2_compute_location(ctx, di, DW_AT_frame_base, &subpgm.frame_offset, &subpgm.frame_reg)) { TRACE("For %s got %ld/%d\n", name.u.string, subpgm.frame_offset, subpgm.frame_reg); + if (subpgm.frame_reg == Wine_DW_no_register) { + /* Likely a constant, meaning a location list offset. + We do not handle those yet. */ + /*FIXME("need to handle location lists\n"); */ + subpgm.frame_reg = 0; + subpgm.frame_offset = 0; + } + } else /* on stack !! */ { subpgm.frame_reg = 0;

1 0

Andrey Turkin : ddraw: Add missing dereference operators.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 3bc442dc8c96e9138349c9cb1ab359a4854e181b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc442dc8c96e9138349c9cb1… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Thu Oct 26 06:23:23 2006 +0400 ddraw: Add missing dereference operators. --- dlls/ddraw/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index af7b0da..ac1371c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1693,7 +1693,7 @@ Thunk_IDirect3DDeviceImpl_2_GetCurrentVi hr = IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This, IDirect3DDevice3), (IDirect3DViewport3 **) Direct3DViewport2); if(hr != D3D_OK) return hr; - *Direct3DViewport2 = (IDirect3DViewport2 *) COM_INTERFACE_CAST(IDirect3DViewportImpl, IDirect3DViewport3, IDirect3DViewport3, Direct3DViewport2); + *Direct3DViewport2 = (IDirect3DViewport2 *) COM_INTERFACE_CAST(IDirect3DViewportImpl, IDirect3DViewport3, IDirect3DViewport3, *Direct3DViewport2); return D3D_OK; } @@ -1800,7 +1800,7 @@ Thunk_IDirect3DDeviceImpl_3_GetRenderTar hr = IDirect3DDevice7_GetRenderTarget(ICOM_INTERFACE(This, IDirect3DDevice7), (IDirectDrawSurface7 **) RenderTarget); if(hr != D3D_OK) return hr; - *RenderTarget = (IDirectDrawSurface4 *) COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirectDrawSurface7, IDirectDrawSurface7, RenderTarget); + *RenderTarget = (IDirectDrawSurface4 *) COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirectDrawSurface7, IDirectDrawSurface7, *RenderTarget); return D3D_OK; } @@ -1814,7 +1814,7 @@ Thunk_IDirect3DDeviceImpl_2_GetRenderTar hr = IDirect3DDevice7_GetRenderTarget(ICOM_INTERFACE(This, IDirect3DDevice7), (IDirectDrawSurface7 **) RenderTarget); if(hr != D3D_OK) return hr; - *RenderTarget = (IDirectDrawSurface *) COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirectDrawSurface7, IDirectDrawSurface3, RenderTarget); + *RenderTarget = (IDirectDrawSurface *) COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirectDrawSurface7, IDirectDrawSurface3, *RenderTarget); return D3D_OK; }

1 0

Marcus Meissner : mshtml: Moved release of dom_window to right place.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 2074a2314ac45d60895b94b5227b9c945ab6b9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2074a2314ac45d60895b94b52… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Oct 26 08:14:01 2006 +0200 mshtml: Moved release of dom_window to right place. --- dlls/mshtml/olecmd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index fa4afb4..7e6e0cf 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -422,7 +422,6 @@ static void setup_ns_editing(NSContainer } nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); - nsIDOMWindow_Release(dom_window); if(NS_FAILED(nsres)) { ERR("Could not get content DOM window: %08x\n", nsres); nsIEditingSession_Release(editing_session); @@ -431,6 +430,7 @@ static void setup_ns_editing(NSContainer nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, NULL, FALSE); nsIEditingSession_Release(editing_session); + nsIDOMWindow_Release(dom_window); if(NS_FAILED(nsres)) { ERR("MakeWindowEditable failed: %08x\n", nsres); return;

1 0

Mike McCormack : msi: Fix the join algorithm.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 1582f58036ae268b84e05f4c7a2399655db26476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1582f58036ae268b84e05f4c7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 26 18:29:52 2006 +0900 msi: Fix the join algorithm. --- dlls/msi/join.c | 9 ++++++--- dlls/msi/tests/db.c | 19 +++++-------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index 3462521..e4e4154 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -172,13 +172,16 @@ static UINT join_match( UINT *ldata, UIN { pairs[n*2] = ldata[i*2]; pairs[n*2+1] = rdata[j*2]; - i++; /* FIXME: assumes primary key on the right */ n++; - continue; + + if ( ldata[i*2+3] < rdata[j*2+3]) + i++; + else + j++; } /* values differ... move along */ - if (ldata[i*2+1] < rdata[j*2+1]) + else if (ldata[i*2+1] < rdata[j*2+1]) i++; else j++; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6afb307..134c12a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2206,29 +2206,20 @@ static void test_join(void) size = MAX_PATH; r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); - if (i == 2 || i == 3) todo_wine - { - ok( !lstrcmp( buf, join_res_first[i].one ), - "For (row %d, column 1) expected '%s', got %s\n", i, join_res_first[i].one, buf ); - } + ok( !lstrcmp( buf, join_res_first[i].one ), + "For (row %d, column 1) expected '%s', got %s\n", i, join_res_first[i].one, buf ); size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); - if (i == 3) todo_wine - { - ok( !lstrcmp( buf, join_res_first[i].two ), - "For (row %d, column 2) expected '%s', got %s\n", i, join_res_first[i].two, buf ); - } + ok( !lstrcmp( buf, join_res_first[i].two ), + "For (row %d, column 2) expected '%s', got %s\n", i, join_res_first[i].two, buf ); i++; MsiCloseHandle(hrec); } - todo_wine - { - ok( i == 5, "Expected 5 rows, got %d\n", i ); - } + ok( i == 5, "Expected 5 rows, got %d\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );

1 0

Mike McCormack : msi: Allow UPDATE queries without a condition.
by Alexandre Julliard Oct. 26, 2006

Oct. 26, 2006

Module: wine Branch: master Commit: 6c95dc644cf9fbcc2e842513d99e325f90b05e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c95dc644cf9fbcc2e842513d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 26 17:40:47 2006 +0900 msi: Allow UPDATE queries without a condition. --- dlls/msi/sql.y | 12 +++++++++++- dlls/msi/tests/db.c | 24 +++++++++--------------- dlls/msi/update.c | 17 +++++++++++------ 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index abffb2f..1cf3ad6 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -214,13 +214,23 @@ oneupdate: TK_UPDATE table TK_SET update_assign_list TK_WHERE expr { SQL_input* sql = (SQL_input*) info; - MSIVIEW *update = NULL; + MSIVIEW *update = NULL; UPDATE_CreateView( sql->db, &update, $2, $4, $6 ); if( !update ) YYABORT; $$ = update; } + | TK_UPDATE table TK_SET update_assign_list + { + SQL_input* sql = (SQL_input*) info; + MSIVIEW *update = NULL; + + UPDATE_CreateView( sql->db, &update, $2, $4, NULL ); + if( !update ) + YYABORT; + $$ = update; + } ; onedelete: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b9ffaa7..6afb307 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3093,17 +3093,14 @@ static void test_update(void) /* no where condition */ query = "UPDATE `Control` SET `Text` = 'this is text'"; - todo_wine - { - r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCESS, got %d\n", r); - r = MsiViewExecute(view, 0); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - r = MsiViewClose(view); - ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); - r = MsiCloseHandle(view); - ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); - } + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCESS, got %d\n", r); + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewClose(view); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(view); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); /* check the modified text */ query = "SELECT `Text` FROM `Control`"; @@ -3138,10 +3135,7 @@ static void test_update(void) size = MAX_PATH; r = MsiRecordGetString(rec, 1, result, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); - } + ok(!lstrcmp(result, "this is text"), "Expected `this is text`, got %s\n", result); MsiCloseHandle(rec); diff --git a/dlls/msi/update.c b/dlls/msi/update.c index 9c84339..502af14 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -199,14 +199,19 @@ UINT UPDATE_CreateView( MSIDATABASE *db, if( r != ERROR_SUCCESS ) return r; - /* add conditions first */ - r = WHERE_CreateView( db, &wv, tv, expr ); - if( r != ERROR_SUCCESS ) + if (expr) { - tv->ops->delete( tv ); - return r; + /* add conditions first */ + r = WHERE_CreateView( db, &wv, tv, expr ); + if( r != ERROR_SUCCESS ) + { + tv->ops->delete( tv ); + return r; + } } - + else + wv = tv; + /* then select the columns we want */ r = SELECT_CreateView( db, &sv, wv, columns ); if( r != ERROR_SUCCESS )

1 0