January 2008 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMImplementation Interface.
by Alexandre Julliard Jan. 18, 2008

Jan. 18, 2008

Module: wine Branch: master Commit: ed5a22fb292ab2337aa199193c9f66b7c2748b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5a22fb292ab2337aa199193… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 18 20:33:03 2008 +1100 msxml3: Implement IXMLDOMImplementation Interface. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/domdoc.c | 8 ++- dlls/msxml3/domimpl.c | 188 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 56 +++++++++++++ 5 files changed, 252 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 20a7b40..1075e96 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ cdata.c \ comment.c \ domdoc.c \ + domimpl.c \ element.c \ factory.c \ main.c \ diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b294eed..6a5b7a4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -804,8 +804,12 @@ static HRESULT WINAPI domdoc_get_implementation( IXMLDOMDocument2 *iface, IXMLDOMImplementation** impl ) { - FIXME("\n"); - return E_NOTIMPL; + if(!impl) + return E_INVALIDARG; + + *impl = (IXMLDOMImplementation*)create_doc_Implementation(); + + return S_OK; } static HRESULT WINAPI domdoc_get_documentElement( diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c new file mode 100644 index 0000000..83f949b --- /dev/null +++ b/dlls/msxml3/domimpl.c @@ -0,0 +1,188 @@ +/* + * DOM Document Implementation implementation + * + * Copyright 2007 Alistair Leslie-Hughes + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "msxml2.h" + +#include "msxml_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +#ifdef HAVE_LIBXML2 + +typedef struct _domimpl +{ + const struct IXMLDOMImplementationVtbl *lpVtbl; + LONG ref; +} domimpl; + +static inline domimpl *impl_from_IXMLDOMImplementation( IXMLDOMImplementation *iface ) +{ + return (domimpl *)((char*)iface - FIELD_OFFSET(domimpl, lpVtbl)); +} + +static HRESULT WINAPI dimimpl_QueryInterface( + IXMLDOMImplementation *iface, + REFIID riid, + void** ppvObject ) +{ + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if ( IsEqualGUID( riid, &IID_IXMLDOMImplementation ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("Unsupported inteferace %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IXMLDOMImplementation_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI dimimpl_AddRef( + IXMLDOMImplementation *iface ) +{ + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI dimimpl_Release( + IXMLDOMImplementation *iface ) +{ + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + ULONG ref; + + ref = InterlockedDecrement( &This->ref ); + if ( ref == 0 ) + { + HeapFree( GetProcessHeap(), 0, This ); + } + + return ref; +} + +static HRESULT WINAPI dimimpl_GetTypeInfoCount( + IXMLDOMImplementation *iface, + UINT* pctinfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dimimpl_GetTypeInfo( + IXMLDOMImplementation *iface, + UINT iTInfo, LCID lcid, + ITypeInfo** ppTInfo ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dimimpl_GetIDsOfNames( + IXMLDOMImplementation *iface, + REFIID riid, LPOLESTR* rgszNames, + UINT cNames, LCID lcid, DISPID* rgDispId ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dimimpl_Invoke( + IXMLDOMImplementation *iface, + DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, UINT* puArgErr ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI dimimpl_hasFeature(IXMLDOMImplementation* This, BSTR feature, BSTR version, VARIANT_BOOL *hasFeature) +{ + static WCHAR bVersion[] = {'1','.','0',0}; + static WCHAR bXML[] = {'X','M','L',0}; + static WCHAR bDOM[] = {'D','O','M',0}; + static WCHAR bMSDOM[] = {'M','S','-','D','O','M',0}; + BOOL bValidFeature = FALSE; + BOOL bValidVersion = FALSE; + + TRACE("feature(%s) version (%s)\n", debugstr_w(feature), debugstr_w(version)); + + if(!feature || !hasFeature) + return E_INVALIDARG; + + *hasFeature = VARIANT_FALSE; + + if(!version || lstrcmpiW(version, bVersion) == 0) + bValidVersion = TRUE; + + if(lstrcmpiW(feature, bXML) == 0 || lstrcmpiW(feature, bDOM) == 0 || lstrcmpiW(feature, bMSDOM) == 0) + bValidFeature = TRUE; + + if(bValidVersion && bValidFeature) + *hasFeature = VARIANT_TRUE; + + return S_OK; +} + +static const struct IXMLDOMImplementationVtbl dimimpl_vtbl = +{ + dimimpl_QueryInterface, + dimimpl_AddRef, + dimimpl_Release, + dimimpl_GetTypeInfoCount, + dimimpl_GetTypeInfo, + dimimpl_GetIDsOfNames, + dimimpl_Invoke, + dimimpl_hasFeature +}; + +IUnknown* create_doc_Implementation() +{ + domimpl *This; + + This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); + if ( !This ) + return NULL; + + This->lpVtbl = &dimimpl_vtbl; + This->ref = 1; + + return (IUnknown*) &This->lpVtbl; +} + +#endif diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 70b7a60..620fba8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -44,6 +44,7 @@ extern IUnknown *create_comment( xmlNodePtr comment ); extern IUnknown *create_cdata( xmlNodePtr text ); extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ); extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ); +extern IUnknown *create_doc_Implementation(); extern HRESULT queryresult_create( xmlNodePtr, LPWSTR, IXMLDOMNodeList ** ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ca913cb..7f5f527 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1872,6 +1872,7 @@ static void test_xmlTypes(void) IXMLDOMAttribute *pAttrubute; IXMLDOMNamedNodeMap *pAttribs; IXMLDOMCDATASection *pCDataSec; + IXMLDOMImplementation *pIXMLDOMImplementation = NULL; BSTR str; IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1; /* Used for testing Siblings */ VARIANT v; @@ -1917,6 +1918,61 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("document") ), "incorrect nodeTypeString string\n"); SysFreeString(str); + /* test implementation */ + hr = IXMLDOMDocument_get_implementation(doc, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_get_implementation(doc, &pIXMLDOMImplementation); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + VARIANT_BOOL hasFeature = VARIANT_TRUE; + BSTR sEmpty = SysAllocStringLen(NULL, 0); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, NULL, sEmpty, &hasFeature); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, sEmpty, sEmpty, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, _bstr_("DOM"), sEmpty, &hasFeature); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(hasFeature == VARIANT_FALSE, "hasFeature returned false\n"); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, sEmpty, sEmpty, &hasFeature); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(hasFeature == VARIANT_FALSE, "hasFeature returned true\n"); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, _bstr_("DOM"), NULL, &hasFeature); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(hasFeature == VARIANT_TRUE, "hasFeature returned false\n"); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, _bstr_("DOM"), sEmpty, &hasFeature); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(hasFeature == VARIANT_FALSE, "hasFeature returned false\n"); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, _bstr_("DOM"), _bstr_("1.0"), &hasFeature); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(hasFeature == VARIANT_TRUE, "hasFeature returned true\n"); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, _bstr_("XML"), _bstr_("1.0"), &hasFeature); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(hasFeature == VARIANT_TRUE, "hasFeature returned true\n"); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, _bstr_("MS-DOM"), _bstr_("1.0"), &hasFeature); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(hasFeature == VARIANT_TRUE, "hasFeature returned true\n"); + + hr = IXMLDOMImplementation_hasFeature(pIXMLDOMImplementation, _bstr_("SSS"), NULL, &hasFeature); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(hasFeature == VARIANT_FALSE, "hasFeature returned false\n"); + + SysFreeString(sEmpty); + IXMLDOMImplementation_Release(pIXMLDOMImplementation); + } + + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK)

1 0

Alistair Leslie-Hughes : msxml3: Attribute nodes are not typed.
by Alexandre Julliard Jan. 18, 2008

Jan. 18, 2008

Module: wine Branch: master Commit: 8c3dd87fa8c045e67652f102731c28cd19588c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3dd87fa8c045e67652f1027… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 18 13:06:31 2008 +1100 msxml3: Attribute nodes are not typed. --- dlls/msxml3/node.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 2fb6f86..dc53078 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -821,16 +821,13 @@ static HRESULT WINAPI xmlnode_get_dataType( if(!dataTypeName) return E_INVALIDARG; - /* CDATA Section, Comment, Document, Document Fragment, + /* Attribute, CDATA Section, Comment, Document, Document Fragment, Entity, Notation, PI, and Text Node are non-typed. */ V_BSTR(dataTypeName) = NULL; V_VT(dataTypeName) = VT_NULL; switch ( This->node->type ) { - case XML_ATTRIBUTE_NODE: - FIXME("NODE_ATTRIBUTE_NODE should return a valid value.\n"); - break; case XML_ELEMENT_NODE: pVal = xmlGetNsProp(This->node, (xmlChar*)"dt", (xmlChar*)"urn:schemas-microsoft-com:datatypes");

1 0

Rob Shearman : kernel32: Initialise the top 16-bit stack frame to zero.
by Alexandre Julliard Jan. 18, 2008

Jan. 18, 2008

Module: wine Branch: master Commit: 71e0e1ca6396a85138378b29aefbf9b5f0dbb920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e0e1ca6396a85138378b29a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 17 19:07:06 2008 +0000 kernel32: Initialise the top 16-bit stack frame to zero. --- dlls/kernel32/kernel_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 504e6f0..86e4a39 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -57,6 +57,7 @@ static void thread_attach(void) kernel_get_thread_data()->stack_sel = GlobalHandleToSel16( hstack ); NtCurrentTeb()->WOW32Reserved = (void *)MAKESEGPTR( kernel_get_thread_data()->stack_sel, 0x10000 - sizeof(STACK16FRAME) ); + memset( (char *)GlobalLock16(hstack) + 0x10000 - sizeof(STACK16FRAME), 0, sizeof(STACK16FRAME) ); }

1 0

Francois Gouget : advapi32/tests: Actually test strings that expand to something bigger than their original size .
by Alexandre Julliard Jan. 18, 2008

Jan. 18, 2008

Module: wine Branch: master Commit: 520054f60cc164250cf8f67f9067b50ab99b96e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520054f60cc164250cf8f67f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 17 18:45:36 2008 +0100 advapi32/tests: Actually test strings that expand to something bigger than their original size. --- dlls/advapi32/tests/registry.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 11ec71d..6797b1b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -594,6 +594,7 @@ static void test_get_value(void) DWORD dw, qw[2]; CHAR buf[80]; CHAR expanded[] = "bar\\subdir1"; + CHAR expanded2[] = "ImARatherLongButIndeedNeededString\\subdir1"; if(!pRegGetValueA) { @@ -711,11 +712,11 @@ static void test_get_value(void) /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ and no buffer (ok, expands) */ size = 0; - ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_SZ, NULL, NULL, &size); + ret = pRegGetValueA(hkey_main, NULL, "TP2_EXP_SZ", RRF_RT_REG_SZ, NULL, NULL, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); - /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath1 length + 1 here. */ - ok((size == strlen(expanded)+1) || (size == strlen(sTestpath1)+1), - "strlen(expanded)=%d, strlen(sTestpath1)=%d, size=%d\n", lstrlenA(expanded), lstrlenA(sTestpath1), size); + /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath2 length + 1 here. */ + ok((size == strlen(expanded2)+1) || (size == strlen(sTestpath2)+1), + "strlen(expanded2)=%d, strlen(sTestpath2)=%d, size=%d\n", lstrlenA(expanded2), lstrlenA(sTestpath2), size); /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ (ok, expands) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); @@ -726,7 +727,17 @@ static void test_get_value(void) "strlen(expanded)=%d, strlen(sTestpath1)=%d, size=%d\n", lstrlenA(expanded), lstrlenA(sTestpath1), size); ok(type == REG_SZ, "type=%d\n", type); ok(!strcmp(expanded, buf), "expanded=\"%s\" buf=\"%s\"\n", expanded, buf); - + + /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ (ok, expands a lot) */ + buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); + ret = pRegGetValueA(hkey_main, NULL, "TP2_EXP_SZ", RRF_RT_REG_SZ, &type, buf, &size); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath2 length + 1 here. */ + ok((size == strlen(expanded2)+1) || (size == strlen(sTestpath2)+1), + "strlen(expanded2)=%d, strlen(sTestpath1)=%d, size=%d\n", lstrlenA(expanded2), lstrlenA(sTestpath2), size); + ok(type == REG_SZ, "type=%d\n", type); + ok(!strcmp(expanded2, buf), "expanded2=\"%s\" buf=\"%s\"\n", expanded2, buf); + /* Query REG_EXPAND_SZ using RRF_RT_REG_EXPAND_SZ|RRF_NOEXPAND (ok, doesn't expand) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_EXPAND_SZ|RRF_NOEXPAND, &type, buf, &size);

1 0

Alexandre Julliard : winex11.drv: Moved initialization of screen_width/ height to xinerama_init to do it inside the x11 lock.
by Alexandre Julliard Jan. 18, 2008

Jan. 18, 2008

Module: wine Branch: master Commit: c5a95025cf9efedfe182637d79b7add2740bb72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a95025cf9efedfe182637d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 17 19:59:22 2008 +0100 winex11.drv: Moved initialization of screen_width/height to xinerama_init to do it inside the x11 lock. --- dlls/winex11.drv/desktop.c | 4 +--- dlls/winex11.drv/winpos.c | 4 +--- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 5 +---- dlls/winex11.drv/xinerama.c | 4 ++-- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 1ec6a5d..23a6675 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -110,9 +110,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) root_window = win; max_width = screen_width; max_height = screen_height; - screen_width = width; - screen_height = height; - xinerama_init(); + xinerama_init( width, height ); /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 39ac43a..ba91e8b 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -884,9 +884,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) SetRect( &resize_data.old_screen_rect, 0, 0, screen_width, screen_height ); resize_data.old_virtual_rect = virtual_screen_rect; - screen_width = width; - screen_height = height; - xinerama_init(); + xinerama_init( width, height ); ClipCursor(NULL); if (!(data = X11DRV_get_win_data( hwnd ))) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6f71b75..d74dd59 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -731,7 +731,7 @@ extern void X11DRV_sync_window_position( Display *display, struct x11drv_win_dat extern BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, const RECT *rectClient, UINT swp_flags, const RECT *validRects ); extern void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ); -extern void xinerama_init(void); +extern void xinerama_init( unsigned int width, unsigned int height ); extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ); extern void X11DRV_resize_desktop(unsigned int width, unsigned int height); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 11cd33a..a84c65b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -528,10 +528,7 @@ static BOOL process_attach(void) if (TRACE_ON(synchronous)) XSynchronize( display, True ); - screen_width = WidthOfScreen( screen ); - screen_height = HeightOfScreen( screen ); - - xinerama_init(); + xinerama_init( WidthOfScreen(screen), HeightOfScreen(screen) ); X11DRV_Settings_Init(); #ifdef HAVE_LIBXXF86VM diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 75b905a..8602151 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -134,14 +134,14 @@ static inline int query_screens(void) #endif /* SONAME_LIBXINERAMA */ -void xinerama_init(void) +void xinerama_init( unsigned int width, unsigned int height ) { MONITORINFOEXW *primary; int i; wine_tsx11_lock(); - SetRect( &virtual_screen_rect, 0, 0, screen_width, screen_height ); + SetRect( &virtual_screen_rect, 0, 0, width, height ); if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) {

1 0

Alexandre Julliard : winex11.drv: Don' t create a win_data structure for the desktop window, except in the process that owns it.
by Alexandre Julliard Jan. 18, 2008

Jan. 18, 2008

Module: wine Branch: master Commit: c19af910ebafa9b1928b0f67bee68f6b0b237e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19af910ebafa9b1928b0f67b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 17 19:53:59 2008 +0100 winex11.drv: Don't create a win_data structure for the desktop window, except in the process that owns it. Handle desktop size changes by sending a message to the desktop owner. --- dlls/winex11.drv/desktop.c | 35 -------------- dlls/winex11.drv/event.c | 3 + dlls/winex11.drv/window.c | 106 ++++++++++++++++++++++++------------------- dlls/winex11.drv/winpos.c | 28 +++++++----- dlls/winex11.drv/x11drv.h | 5 +- dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xvidmode.c | 3 +- 7 files changed, 85 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19af910ebafa9b1928b0…

1 0

Alexander Nicolaysen Sørnes : Use CSS instead of JavaScript for menu items
by Chris Morgan Jan. 17, 2008

Jan. 17, 2008

Module: appdb Branch: master Commit: 6808c187ebfd4c485b71d2eaf8ef02636966ab56 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6808c187ebfd4c485b71d2ea… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jan 17 23:13:04 2008 +0100 Use CSS instead of JavaScript for menu items --- apidb.css | 5 +++-- include/menu.php | 27 ++++++--------------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/apidb.css b/apidb.css index 67ca444..485cfb3 100644 --- a/apidb.css +++ b/apidb.css @@ -63,8 +63,9 @@ p.indent { padding-left: 1em; padding-right: 1em;} .menuTitle { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } .menuTitle:visited { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } .menuTitle:hover { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } -.menuLink { font-size: 11px; color: #ffffff; font-weight: bold; } -.menuItem { font-size: 11px; color: #000000; } +.menuLink { padding-left: 4px; padding-top: 5px; padding-bottom: 5px; background-color: #ffffff; font-size: 11px; width: 140px; display: block; } +.menulink:hover { background-color: #e0e6ff; } +.menuItem { padding-left: 4px; padding-top: 5px; padding-bottom: 5px; background-color: #ffffff; font-size: 11px; width: 140px; display: block; } .menuItem:visited { font-size: 11px; color: #000000; } .menuItem:hover { font-size: 11px; color: #A50D0D; } diff --git a/include/menu.php b/include/menu.php index 66d8403..4f5b30a 100644 --- a/include/menu.php +++ b/include/menu.php @@ -31,7 +31,7 @@ class htmlmenu { <td> <table width="155" border="0" cellspacing="0" cellpadding="1"> <tr class="topMenu"><td> - <table width="100%" border="0" cellspacing="0" cellpadding="5"> + <table width="100%" border="0" cellspacing="0" cellpadding="5"><tr><td class="sidemenu"> '; } @@ -43,38 +43,23 @@ class htmlmenu { if($shUrl) { - $oTableCell = new TableCell("<span class=MenuItem> <u>". - "<a href=\"$shUrl\">$sName</a></u></span>"); - - $oHighlightColor = new Color(0xe0, 0xe6, 0xff); - $oInactiveColor = new Color(0xff, 0xff, 0xff); - $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor); - - $oTableRowClick = new TableRowClick($shUrl); - $oTableRowClick->SetHighlight($oTableRowHighlight); - - $oTableRow->SetRowClick($oTableRowClick); + echo "<a href=\"$shUrl\" class=\"menuLink\">$sName</a>"; } else { - $oTableCell = new TableCell("<span class=menuItem> $sName</span></td></tr>"); + echo "<div class=\"menuItem\">$sName</div>"; } - $oTableCell->SetAlign($sAlign); - $oTableCell->SetWidth("100%"); - - $oTableRow->SetClass("sidemenu"); - $oTableRow->AddCell($oTableCell); - - echo $oTableRow->GetString(); } function addmisc($sStuff, $sAlign = "left") { - echo " <tr class=sideMenu><td width='100%' align=$sAlign><span class=menuItem> $sStuff</span></td></tr>\n"; + echo "<div align=\"$sAlign\" class=\"menuItem\">$sStuff</div>\n"; } function done($form = null) { echo ' + </td> + </tr> </table> </td></tr> </table>

1 0

Alexander Nicolaysen Sørnes : maintainer notifications: Only check data for accepted versions
by Chris Morgan Jan. 17, 2008

Jan. 17, 2008

Module: appdb Branch: master Commit: 0f41ee390c12b3188c14cfd8f68c312da6ed1010 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0f41ee390c12b3188c14cfd8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jan 17 16:08:32 2008 +0100 maintainer notifications: Only check data for accepted versions --- include/maintainer.php | 2 +- unit_test/test_maintainer_notify.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index d0dc50c..ec151f5 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -73,7 +73,7 @@ class queuedEntries if($oVersion->objectGetState() == 'queued') { $this->aVersions[] = $oVersion->objectGetId(); - } else // version isn't queued + } else if($oVersion->objectGetState() == 'accepted') // version isn't queued { // add the unqueued version to the list of versions to check for queued data $aVersionsToCheck[] = $oVersion->iVersionId; diff --git a/unit_test/test_maintainer_notify.php b/unit_test/test_maintainer_notify.php index 0f46bf8..d7feabc 100644 --- a/unit_test/test_maintainer_notify.php +++ b/unit_test/test_maintainer_notify.php @@ -121,8 +121,8 @@ class notifyContainer // and will skip over queued entries that depend on this version if(!$bTestAsMaintainer) { - $sVersionUnqueue = "update appVersion set queued='?' where versionId = '?'"; - $hResult = query_parameters($sVersionUnqueue, 'false', $this->iVersionId); + $sVersionUnqueue = "update appVersion set state='?' where versionId = '?'"; + $hResult = query_parameters($sVersionUnqueue, 'accepted', $this->iVersionId); } // debug printing

1 0

Alexander Nicolaysen Sørnes : Minor improvements to maintainer notification mails
by Chris Morgan Jan. 17, 2008

Jan. 17, 2008

Module: appdb Branch: master Commit: 351e54255cbdbaf912c61ce50a869bb5c81ad20f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=351e54255cbdbaf912c61ce5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jan 17 15:25:20 2008 +0100 Minor improvements to maintainer notification mails --- include/maintainer.php | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index f81a338..d0dc50c 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -1122,7 +1122,7 @@ class maintainer { // FIXME: should use a function to generate these urls and use it here and // in sidebar_maintainer.php and sidebar_admin.php - $sMsg = 'Please visit the test data queue ('.APPDB_ROOT."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=". + $sMsg = 'Please visit the version queue ('.APPDB_ROOT."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=". 'Version%20Queue) to process queued versions for applications you maintain.'."\n"; } @@ -1192,18 +1192,23 @@ class maintainer if($iOldestQueuedEntryTime < $iMaintainerSignupTime) $iOldestQueuedEntryTime = $iMaintainerSignupTime; - + $iScreenshotCount = count($oQueuedEntries->aScreenshotIds); // if we found any queued screenshots add the screenshot queue processing link // to the email - if(count($oQueuedEntries->aScreenshotIds) != 0) + if($iScreenshotCount != 0) { + if($iScreenshotCount == 1) + $sMsg.= 'There is one queued screenshot waiting to be processed. '; + else + $sMsg.= "There are $iScreenshotCount screenshots waiting to be processed. "; + // FIXME: should use a function to generate these urls and use it here and // in sidebar_maintainer.php and sidebar_admin.php $sMsg.= 'Please visit the screenshot queue('; $sMsg.= APPDB_ROOT.'objectManager.php?sClass=screenshot&bIsQueue=true&sTitle=Screenshot%20Queue) '; $sMsg.= 'to process queued screenshots for versions you maintain.'."\n"; } - + // queued screenshots //////////////////////

1 0

Rob Shearman : rpcrt4: Only initialise the context handle to NULL in NdrContextHandleUnmarshall if it is an out-only or return one .
by Alexandre Julliard Jan. 17, 2008

Jan. 17, 2008

Module: wine Branch: master Commit: a4b18699ac6739caf0e089167e3e6d247a44f781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b18699ac6739caf0e089167… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 17 12:26:42 2008 +0000 rpcrt4: Only initialise the context handle to NULL in NdrContextHandleUnmarshall if it is an out-only or return one. Fix the indentation and add tracing of the context handle flags. --- dlls/rpcrt4/ndr_marshall.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0f415b0..888b150 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6207,6 +6207,7 @@ static unsigned char *WINAPI NdrContextHandleMarshall( ERR("invalid format type %x\n", *pFormat); RpcRaiseException(RPC_S_INTERNAL_ERROR); } + TRACE("flags: 0x%02x\n", pFormat[1]); if (pFormat[1] & 0x80) NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); @@ -6225,16 +6226,22 @@ static unsigned char *WINAPI NdrContextHandleUnmarshall( PFORMAT_STRING pFormat, unsigned char fMustAlloc) { + TRACE("pStubMsg %p, ppMemory %p, pFormat %p, fMustAlloc %s\n", pStubMsg, + ppMemory, pFormat, fMustAlloc ? "TRUE": "FALSE"); + if (*pFormat != RPC_FC_BIND_CONTEXT) { ERR("invalid format type %x\n", *pFormat); RpcRaiseException(RPC_S_INTERNAL_ERROR); } + TRACE("flags: 0x%02x\n", pFormat[1]); - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + /* [out]-only or [ret] param */ + if ((pFormat[1] & 0x60) == 0x20) + **(NDR_CCONTEXT **)ppMemory = NULL; + NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); - return NULL; + return NULL; } /***********************************************************************

1 0