January 2008 - Wine-Commits

Divan Burger : comdlg32: Modernize the look of the colour boxes in the colour dialog.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: ad92cdcf551881133dbdae5effca9961403814e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad92cdcf551881133dbdae5ef… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 19:46:54 2008 +0200 comdlg32: Modernize the look of the colour boxes in the colour dialog. --- dlls/comdlg32/colordlg.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 74d3357..777b0bd 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -739,7 +739,7 @@ void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ) static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) { HWND hwnd = GetDlgItem(hDlg, 0x2d0); - RECT rect; + RECT rect, blockrect; HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; @@ -762,14 +762,17 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) hBrush = CreateSolidBrush(predefcolors[j][i]); if (hBrush) { - hBrush = SelectObject(hdc, hBrush); - Rectangle(hdc, rect.left, rect.top, - rect.left + dx - DISTANCE, rect.top + dy - DISTANCE); - rect.left = rect.left + dx; - DeleteObject(SelectObject(hdc, hBrush)) ; + blockrect.left = rect.left; + blockrect.top = rect.top; + blockrect.right = rect.left + dx - DISTANCE; + blockrect.bottom = rect.top + dy - DISTANCE; + FillRect(hdc, &blockrect, hBrush); + DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT); + DeleteObject(hBrush); } + rect.left += dx; } - rect.top = rect.top + dy; + rect.top += dy; rect.left = k; } ReleaseDC(hwnd, hdc); @@ -783,7 +786,7 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr ) { HWND hwnd = GetDlgItem(hDlg, 0x2d1); - RECT rect; + RECT rect, blockrect; HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; @@ -808,14 +811,17 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr hBrush = CreateSolidBrush(lpcr[i+j*cols]); if (hBrush) { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.left, rect.top, - rect.left + dx - DISTANCE, rect.top + dy - DISTANCE); - rect.left = rect.left + dx; - DeleteObject( SelectObject(hdc, hBrush) ) ; + blockrect.left = rect.left; + blockrect.top = rect.top; + blockrect.right = rect.left + dx - DISTANCE; + blockrect.bottom = rect.top + dy - DISTANCE; + FillRect(hdc, &blockrect, hBrush); + DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT); + DeleteObject(hBrush); } + rect.left += dx; } - rect.top = rect.top + dy; + rect.top += dy; rect.left = k; } ReleaseDC(hwnd, hdc); @@ -825,7 +831,6 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr } - /*********************************************************************** * CC_HookCallChk [internal] */

1 0

Marcus Meissner : winex11: Set last error on enumerating display settings.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 75de624377e46fdabe156074fc17a37a18c4a154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75de624377e46fdabe156074f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 9 12:57:26 2008 +0100 winex11: Set last error on enumerating display settings. --- dlls/user32/tests/sysparams.c | 11 +++++++++++ dlls/winex11.drv/settings.c | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 8ce4b93..320bd04 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2532,6 +2532,7 @@ static void test_EnumDisplaySettings(void) DEVMODE devmode; DWORD val; HDC hdc; + DWORD num; memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); @@ -2550,6 +2551,16 @@ static void test_EnumDisplaySettings(void) } ReleaseDC(0, hdc); + + num = 1; + while (1) { + SetLastError (0xdeadbeef); + if (!EnumDisplaySettings(NULL, num++, &devmode)) { + DWORD le = GetLastError(); + ok (le == ERROR_NO_MORE_FILES, "Last error on EnumDisplaySettings was %d, expected ERROR_NO_MORE_FILES\n", le); + break; + } + } } START_TEST(sysparams) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 373562b..d68b674 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -316,6 +316,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW return TRUE; } TRACE("mode %d -- not present (%s)\n", n, handler_name); + SetLastError(ERROR_NO_MORE_FILES); return FALSE; }

1 0

Alexandre Julliard : mountmgr.sys: Implemented IOCTL_DISK_GET_DRIVE_GEOMETRY and IOCTL_STORAGE_GET_DEVICE_NUMBER .
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: d1796650353a8094d2496eb102ef873ec47071ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1796650353a8094d2496eb10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 9 13:02:01 2008 +0100 mountmgr.sys: Implemented IOCTL_DISK_GET_DRIVE_GEOMETRY and IOCTL_STORAGE_GET_DEVICE_NUMBER. --- dlls/mountmgr.sys/mountmgr.c | 52 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1ea73e4..98bed94 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -31,6 +31,8 @@ #include "winternl.h" #include "winioctl.h" #include "winreg.h" +#include "ntddstor.h" +#include "ntddcdrm.h" #include "ddk/wdm.h" #include "ddk/mountmgr.h" #include "wine/library.h" @@ -45,7 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); /* extra info for disk devices, stored in DeviceExtension */ struct disk_device_info { - UNICODE_STRING name; /* device name */ + UNICODE_STRING name; /* device name */ + STORAGE_DEVICE_NUMBER devnum; /* device number info */ }; struct mount_point @@ -134,6 +137,25 @@ static NTSTATUS create_disk_device( DRIVER_OBJECT *driver, DWORD type, DEVICE_OB { info = (*dev_obj)->DeviceExtension; info->name = name; + switch(type) + { + case DRIVE_REMOVABLE: + info->devnum.DeviceType = FILE_DEVICE_DISK; + info->devnum.DeviceNumber = i; + info->devnum.PartitionNumber = 0; + break; + case DRIVE_CDROM: + info->devnum.DeviceType = FILE_DEVICE_CD_ROM; + info->devnum.DeviceNumber = i; + info->devnum.PartitionNumber = 0; + break; + case DRIVE_FIXED: + default: /* FIXME */ + info->devnum.DeviceType = FILE_DEVICE_DISK; + info->devnum.DeviceNumber = 1; + info->devnum.PartitionNumber = i; + break; + } } else { @@ -338,6 +360,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation; + struct disk_device_info *disk_info = device->DeviceExtension; TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -346,6 +369,33 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) switch(irpsp->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_DISK_GET_DRIVE_GEOMETRY: + { + DISK_GEOMETRY info; + DWORD len = min( sizeof(info), irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + info.Cylinders.QuadPart = 10000; + info.MediaType = (disk_info->devnum.DeviceType == FILE_DEVICE_DISK) ? FixedMedia : RemovableMedia; + info.TracksPerCylinder = 255; + info.SectorsPerTrack = 63; + info.BytesPerSector = 512; + memcpy( irp->MdlAddress->StartVa, &info, len ); + irp->IoStatus.Information = len; + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } + case IOCTL_STORAGE_GET_DEVICE_NUMBER: + { + DWORD len = min( sizeof(disk_info->devnum), irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + memcpy( irp->MdlAddress->StartVa, &disk_info->devnum, len ); + irp->IoStatus.Information = len; + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } + case IOCTL_CDROM_READ_TOC: + irp->IoStatus.u.Status = STATUS_INVALID_DEVICE_REQUEST; + break; default: FIXME( "unsupported ioctl %x\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;

1 0

Divan Burger : comdlg32: Clamp hue and saturation when clicking in colour graph in colour dialog.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 8a0dab38c8fd0779ec26661ddc511cc41149cfe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0dab38c8fd0779ec26661dd… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 18:44:10 2008 +0200 comdlg32: Clamp hue and saturation when clicking in colour graph in colour dialog. --- dlls/comdlg32/colordlg.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index a955650..aa7bca4 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -337,24 +337,29 @@ static int CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *vert ClientToScreen(hDlg, &point); hwnd = GetDlgItem( hDlg, dlgitem ); GetWindowRect(hwnd, &rect); - if (PtInRect(&rect, point)) - { - GetClientRect(hwnd, &rect); - ScreenToClient(hwnd, &point); - x = (long) point.x * MAXHORI; - x /= rect.right; - y = (long) (rect.bottom - point.y) * MAXVERT; - y /= rect.bottom; - - if (hori) - *hori = x; - if (vert) - *vert = y; - return 1; - } - else + if (!PtInRect(&rect, point)) return 0; + + GetClientRect(hwnd, &rect); + ScreenToClient(hwnd, &point); + + x = (long) point.x * MAXHORI; + x /= rect.right; + y = (long) (rect.bottom - point.y) * MAXVERT; + y /= rect.bottom; + + if (x < 0) x = 0; + if (y < 0) y = 0; + if (x > MAXHORI) x = MAXHORI; + if (y > MAXVERT) y = MAXVERT; + + if (hori) + *hori = x; + if (vert) + *vert = y; + + return 1; } /*********************************************************************** * CC_MouseCheckResultWindow [internal]

1 0

Divan Burger : comdlg32: Modernize the look of the luminance bar in the colour dialog.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 155d320ae6fd231b3d634fca9c8981d4acfe9d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155d320ae6fd231b3d634fca9… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 18:54:07 2008 +0200 comdlg32: Modernize the look of the luminance bar in the colour dialog. --- dlls/comdlg32/colordlg.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index aa7bca4..4abcd75 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -463,7 +463,7 @@ void CC_PaintTriangle( HWND hDlg, int y) { HDC hDC; long temp; - int w = LOWORD(GetDialogBaseUnits()); + int w = LOWORD(GetDialogBaseUnits()) / 2; POINT points[3]; int height; int oben; @@ -484,6 +484,7 @@ void CC_PaintTriangle( HWND hDlg, int y) oben = points[0].y; /* | \ | */ /* | \| */ temp = (long)height * (long)y; + points[0].x += 1; points[0].y = oben + height - temp / (long)MAXVERT; points[1].y = points[0].y + w; points[2].y = points[0].y - w; @@ -496,7 +497,11 @@ void CC_PaintTriangle( HWND hDlg, int y) lpp->old3angle.right = points[1].x + 1; lpp->old3angle.top = points[2].y - 1; lpp->old3angle.bottom= points[1].y + 1; + + hbr = SelectObject(hDC, GetStockObject(BLACK_BRUSH)); Polygon(hDC, points, 3); + SelectObject(hDC, hbr); + ReleaseDC(hDlg, hDC); } } @@ -647,7 +652,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) rect.bottom = rect.top; } GetClientRect(hwnd, &rect); - FrameRect(hDC, &rect, GetStockObject(BLACK_BRUSH) ); + DrawEdge(hDC, &rect, BDR_SUNKENOUTER, BF_RECT); ReleaseDC(hwnd, hDC); } }

1 0

Divan Burger : comdlg32: Fix bug where the colour graph' s cross is not painted.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 19ed5849035457f8d6bc607ac2a577efd9137db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ed5849035457f8d6bc607ac… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 18:08:07 2008 +0200 comdlg32: Fix bug where the colour graph's cross is not painted. --- dlls/comdlg32/colordlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index aa56ebf..a955650 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -1075,10 +1075,10 @@ LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) CC_PaintPredefColorArray(hDlg, 6, 8); CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); CC_PaintLumBar(hDlg, lpp->h, lpp->s); - CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); CC_PaintColorGraph(hDlg); + CC_PaintCross(hDlg, lpp->h, lpp->s); EndPaint(hDlg, &ps); return TRUE;

1 0

Tony Wasserka : include: Add d3dx9core.h.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 5da83f03e2fd24638abe68996b5f3abb3edb648c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da83f03e2fd24638abe68996… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Jan 8 16:42:36 2008 +0100 include: Add d3dx9core.h. --- include/Makefile.in | 1 + include/d3dx9.h | 1 + include/d3dx9core.h | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 733f9bd..cde66cc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -116,6 +116,7 @@ SRCDIR_INCLUDES = \ d3dx8math.h \ d3dx8math.inl \ d3dx9.h \ + d3dx9core.h \ d3dx9math.h \ d3dx9math.inl \ dbghelp.h \ diff --git a/include/d3dx9.h b/include/d3dx9.h index f1f2228..62319ec 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -22,6 +22,7 @@ #include <limits.h> #include "d3d9.h" +#include "d3dx9core.h" #include "d3dx9math.h" #endif diff --git a/include/d3dx9core.h b/include/d3dx9core.h new file mode 100644 index 0000000..31b2e23 --- /dev/null +++ b/include/d3dx9core.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2007 Tony Wasserka + * + * 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 + */ + +#ifndef __WINE_D3DX9CORE_H +#define __WINE_D3DX9CORE_H + +#include <d3dx9.h> + +#define D3DX_VERSION 0x0900 +#define D3DX_SDK_VERSION 9 + +#endif

1 0

Alistair Leslie-Hughes : msxml3: Suppress IID_IRunnableObject FIXME since its not supported.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 3c94fb72de1c2a63858731799fa5065fdda055f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c94fb72de1c2a63858731799… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 9 12:26:51 2008 +1100 msxml3: Suppress IID_IRunnableObject FIXME since its not supported. --- dlls/msxml3/domdoc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 60a65d0..856fcb0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -345,6 +345,8 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + *ppvObject = NULL; + if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IXMLDOMDocument ) || IsEqualGUID( riid, &IID_IXMLDOMDocument2 ) ) @@ -360,6 +362,11 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); } + else if(IsEqualGUID(&IID_IRunnableObject, riid)) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid));

1 0

Alistair Leslie-Hughes : msxml3: get_attributes not supported for Attribute , CData, Comment, Doc, Doc Frag, Entity and Text Nodes.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: e906b136eb17eb42b42313fd5ffd575c870cabcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e906b136eb17eb42b42313fd5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 8 12:43:34 2008 +1100 msxml3: get_attributes not supported for Attribute, CData, Comment, Doc, Doc Frag, Entity and Text Nodes. --- dlls/msxml3/node.c | 22 ++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 03d96f5..2a93ab8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -408,8 +408,26 @@ static HRESULT WINAPI xmlnode_get_attributes( { xmlnode *This = impl_from_IXMLDOMNode( iface ); TRACE("%p\n", This); - *attributeMap = create_nodemap( iface ); - return S_OK; + + if (!attributeMap) + return E_INVALIDARG; + + switch( This->node->type ) + { + /* Attribute, CDataSection, Comment, Documents, Documents Fragments, + Entity and Text Nodes does not support get_attributes */ + case XML_ATTRIBUTE_NODE: + case XML_COMMENT_NODE: + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_ENTITY_NODE: + case XML_TEXT_NODE: + *attributeMap = NULL; + return S_FALSE; + default: + *attributeMap = create_nodemap( iface ); + return S_OK; + } } static HRESULT WINAPI xmlnode_insertBefore( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3418ebb..3038858 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -512,6 +512,8 @@ static void test_domdoc( void ) ok( r == S_OK, "returns %08x\n", r ); if(nodetext) { + IXMLDOMNamedNodeMap *pAttribs; + /* Text Last Child Checks */ r = IXMLDOMText_get_lastChild(nodetext, NULL); ok(r == E_INVALIDARG, "ret %08x\n", r ); @@ -520,6 +522,15 @@ static void test_domdoc( void ) r = IXMLDOMText_get_lastChild(nodetext, &nodeChild); ok(r == S_FALSE, "ret %08x\n", r ); ok(nodeChild == NULL, "nodeChild not NULL\n"); + + /* test get_attributes */ + r = IXMLDOMText_get_attributes( nodetext, NULL ); + ok( r == E_INVALIDARG, "get_attributes returned wrong code\n"); + + pAttribs = (IXMLDOMNamedNodeMap*)0x1; + r = IXMLDOMText_get_attributes( nodetext, &pAttribs); + ok(r == S_FALSE, "ret %08x\n", r ); + ok( pAttribs == NULL, "pAttribs not NULL\n"); } IXMLDOMText_Release( nodetext ); SysFreeString( str ); @@ -1838,6 +1849,15 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pNextChild not NULL\n"); + /* test get_attributes */ + hr = IXMLDOMDocument_get_attributes( doc, NULL ); + ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n"); + + pAttribs = (IXMLDOMNamedNodeMap*)0x1; + hr = IXMLDOMDocument_get_attributes( doc, &pAttribs); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( pAttribs == NULL, "pAttribs not NULL\n"); + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) @@ -1851,6 +1871,15 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { + /* test get_attributes */ + hr = IXMLDOMComment_get_attributes( pComment, NULL ); + ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n"); + + pAttribs = (IXMLDOMNamedNodeMap*)0x1; + hr = IXMLDOMComment_get_attributes( pComment, &pAttribs); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( pAttribs == NULL, "pAttribs not NULL\n"); + hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pComment, NULL); ok(hr == S_OK, "ret %08x\n", hr ); @@ -1909,6 +1938,15 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pNextChild not NULL\n"); + /* test get_attributes */ + hr = IXMLDOMAttribute_get_attributes( pAttrubute, NULL ); + ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n"); + + pAttribs = (IXMLDOMNamedNodeMap*)0x1; + hr = IXMLDOMAttribute_get_attributes( pAttrubute, &pAttribs); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( pAttribs == NULL, "pAttribs not NULL\n"); + hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); ok(hr == E_FAIL, "ret %08x\n", hr ); ok(pNewChild == NULL, "pNewChild not NULL\n");

1 0

Alistair Leslie-Hughes : msxml3: previousSibling not supported for Attribute, Document and Document Fragment Nodes.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 2896c462450a144ad122953e6ac76b25de0c4bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2896c462450a144ad122953e6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 8 11:34:29 2008 +1100 msxml3: previousSibling not supported for Attribute, Document and Document Fragment Nodes. --- dlls/msxml3/node.c | 18 +++++++++++++++++- dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index dae9130..03d96f5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -359,7 +359,23 @@ static HRESULT WINAPI xmlnode_get_previousSibling( IXMLDOMNode** previousSibling) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - return get_node( This, "previous", This->node->prev, previousSibling ); + + TRACE("%p\n", This ); + + if (!previousSibling) + return E_INVALIDARG; + + switch( This->node->type ) + { + /* Attribute, Document and Document Fragment Nodes do not support previousSibling */ + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_ATTRIBUTE_NODE: + *previousSibling = NULL; + return S_FALSE; + default: + return get_node( This, "previous", This->node->prev, previousSibling ); + } } static HRESULT WINAPI xmlnode_get_nextSibling( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 910c044..3418ebb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1829,6 +1829,15 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pDocChild not NULL\n"); + /* test previous Sibling */ + hr = IXMLDOMDocument_get_previousSibling(doc, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + pNextChild = (IXMLDOMNode *)0x1; + hr = IXMLDOMDocument_get_previousSibling(doc, &pNextChild); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(pNextChild == NULL, "pNextChild not NULL\n"); + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) @@ -1891,6 +1900,15 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pNextChild not NULL\n"); + /* test Previous Sibling*/ + hr = IXMLDOMAttribute_get_previousSibling(pAttrubute, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + pNextChild = (IXMLDOMNode *)0x1; + hr = IXMLDOMAttribute_get_previousSibling(pAttrubute, &pNextChild); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(pNextChild == NULL, "pNextChild not NULL\n"); + hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); ok(hr == E_FAIL, "ret %08x\n", hr ); ok(pNewChild == NULL, "pNewChild not NULL\n");

1 0