November 2011 - Wine-commits

Andrew Talbot : secur32: Superfluous semicolons fix.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 7f17934de2f800ea2f1c7468083ef119d77481cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f17934de2f800ea2f1c74680… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:50 2011 +0000 secur32: Superfluous semicolons fix. --- dlls/secur32/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index f865158..4c353c3 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1973,7 +1973,7 @@ static const SecPkgInfoA infoA = { #define NEGO_COMMENT { 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', ' ', \ 'P', 'a', 'c', 'k', 'a', 'g', 'e', ' ', \ - 'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'o', 'r', 0}; + 'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'o', 'r', 0} static CHAR nego_comment_A[] = NEGO_COMMENT; static WCHAR nego_comment_W[] = NEGO_COMMENT;

1 0

Alexandre Julliard : gdi32: Fix positioning of font underlines and strikeouts.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 199409a27bb405774d2837c176098f02c58fea75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199409a27bb405774d2837c17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 13:41:18 2011 +0100 gdi32: Fix positioning of font underlines and strikeouts. --- dlls/gdi32/font.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 10a7f1d..97cc2b6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2095,20 +2095,23 @@ done: { otm = HeapAlloc(GetProcessHeap(), 0, size); GetOutlineTextMetricsW(hdc, size, otm); - underlinePos = otm->otmsUnderscorePosition; - underlineWidth = otm->otmsUnderscoreSize; - strikeoutPos = otm->otmsStrikeoutPosition; - strikeoutWidth = otm->otmsStrikeoutSize; + underlinePos = abs( INTERNAL_YWSTODS( dc, otm->otmsUnderscorePosition )); + if (otm->otmsUnderscorePosition < 0) underlinePos = -underlinePos; + underlineWidth = abs( INTERNAL_YWSTODS( dc, otm->otmsUnderscoreSize )); + if (otm->otmsUnderscoreSize < 0) underlineWidth = -underlineWidth; + strikeoutPos = abs( INTERNAL_YWSTODS( dc, otm->otmsStrikeoutPosition )); + if (otm->otmsStrikeoutPosition < 0) strikeoutPos = -strikeoutPos; + strikeoutWidth = abs( INTERNAL_YWSTODS( dc, otm->otmsStrikeoutSize )); HeapFree(GetProcessHeap(), 0, otm); } if (lf.lfUnderline) { - pts[0].x = x - underlinePos * sinEsc; - pts[0].y = y - underlinePos * cosEsc; - pts[1].x = x + width.x - underlinePos * sinEsc; - pts[1].y = y + width.y - underlinePos * cosEsc; + pts[0].x = x - (underlinePos + underlineWidth / 2) * sinEsc; + pts[0].y = y - (underlinePos + underlineWidth / 2) * cosEsc; + pts[1].x = x + width.x - (underlinePos + underlineWidth / 2) * sinEsc; + pts[1].y = y + width.y - (underlinePos + underlineWidth / 2) * cosEsc; pts[2].x = pts[1].x + underlineWidth * sinEsc; pts[2].y = pts[1].y + underlineWidth * cosEsc; pts[3].x = pts[0].x + underlineWidth * sinEsc; @@ -2121,10 +2124,10 @@ done: if (lf.lfStrikeOut) { - pts[0].x = x - strikeoutPos * sinEsc; - pts[0].y = y - strikeoutPos * cosEsc; - pts[1].x = x + width.x - strikeoutPos * sinEsc; - pts[1].y = y + width.y - strikeoutPos * cosEsc; + pts[0].x = x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; + pts[0].y = y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; + pts[1].x = x + width.x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; + pts[1].y = y + width.y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; pts[2].x = pts[1].x + strikeoutWidth * sinEsc; pts[2].y = pts[1].y + strikeoutWidth * cosEsc; pts[3].x = pts[0].x + strikeoutWidth * sinEsc;

1 0

Alexandre Julliard : gdi32: Retrieve the brush pattern bits from the cache for metafiles.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 7d0b65c4d1b4f070d2c18a7adbba6c6cdec082a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0b65c4d1b4f070d2c18a7ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 22:05:16 2011 +0100 gdi32: Retrieve the brush pattern bits from the cache for metafiles. --- dlls/gdi32/brush.c | 29 +++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/mfdrv/objects.c | 76 ++++++++++--------------------------------- 3 files changed, 49 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 59d0bed..19372d1 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -90,6 +90,35 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return TRUE; } +BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) +{ + BRUSHOBJ *brush; + BOOL ret = FALSE; + + if (!(brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) return FALSE; + + if (!brush->info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); + + if (bmp) + { + store_bitmap_bits( brush, bmp ); + GDI_ReleaseObj( brush->bitmap ); + } + } + if (brush->info) + { + memcpy( info, brush->info, bitmap_info_size( brush->info, brush->usage )); + *bits = brush->bits.ptr; + *usage = brush->usage; + ret = TRUE; + } + GDI_ReleaseObj( handle ); + return ret; +} + + /*********************************************************************** * CreateBrushIndirect (GDI32.@) * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0c73a9d..52fb318 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -233,6 +233,8 @@ extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_imag extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; +extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; + /* clipping.c */ extern int get_clip_box( DC *dc, RECT *rect ) DECLSPEC_HIDDEN; extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 599f226..3745ec7 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -174,86 +174,46 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) break; } case BS_PATTERN: + case BS_DIBPATTERN: { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; - struct gdi_image_bits bits; - COLORREF cref; + DWORD info_size, image_size; + char *dst_ptr; + void *bits; + UINT usage; - if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) goto done; - if (src_info->bmiHeader.biBitCount != 1) - { - FIXME("Trying to store a colour pattern brush\n"); - if (bits.free) bits.free( &bits ); - goto done; - } + if (!get_brush_bitmap_info( hBrush, src_info, &bits, &usage )) goto done; - size = FIELD_OFFSET( METARECORD, rdParm[2] ) + - FIELD_OFFSET( BITMAPINFO, bmiColors[2] ) + src_info->bmiHeader.biSizeImage; + info_size = bitmap_info_size( src_info, usage ); + image_size = get_dib_image_size( src_info ); + size = FIELD_OFFSET( METARECORD, rdParm[2] ) + info_size + image_size; - if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) - { - if (bits.free) bits.free( &bits ); - goto done; - } + if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) goto done; mr->rdFunction = META_DIBCREATEPATTERNBRUSH; mr->rdSize = size / 2; - mr->rdParm[0] = BS_PATTERN; - mr->rdParm[1] = DIB_RGB_COLORS; + mr->rdParm[0] = logbrush.lbStyle; + mr->rdParm[1] = usage; dst_info = (BITMAPINFO *)(mr->rdParm + 2); - dst_info->bmiHeader = src_info->bmiHeader; - dst_info->bmiHeader.biClrUsed = 0; - cref = GetTextColor( dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue(cref); - dst_info->bmiColors[0].rgbGreen = GetGValue(cref); - dst_info->bmiColors[0].rgbBlue = GetBValue(cref); - dst_info->bmiColors[0].rgbReserved = 0; - cref = GetBkColor( dev->hdc ); - dst_info->bmiColors[1].rgbRed = GetRValue(cref); - dst_info->bmiColors[1].rgbGreen = GetGValue(cref); - dst_info->bmiColors[1].rgbBlue = GetBValue(cref); - dst_info->bmiColors[1].rgbReserved = 0; + memcpy( dst_info, src_info, info_size ); + if (dst_info->bmiHeader.biClrUsed == 1 << dst_info->bmiHeader.biBitCount) + dst_info->bmiHeader.biClrUsed = 0; + dst_ptr = (char *)dst_info + info_size; /* always return a bottom-up DIB */ if (dst_info->bmiHeader.biHeight < 0) { int i, width_bytes = get_dib_stride( dst_info->bmiHeader.biWidth, dst_info->bmiHeader.biBitCount ); - char *dst_ptr = (char *)&dst_info->bmiColors[2]; dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; dst_ptr += (dst_info->bmiHeader.biHeight - 1) * width_bytes; for (i = 0; i < dst_info->bmiHeader.biHeight; i++, dst_ptr -= width_bytes) - memcpy( dst_ptr, (char *)bits.ptr + i * width_bytes, width_bytes ); + memcpy( dst_ptr, (char *)bits + i * width_bytes, width_bytes ); } - else memcpy( &dst_info->bmiColors[2], bits.ptr, dst_info->bmiHeader.biSizeImage ); - if (bits.free) bits.free( &bits ); + else memcpy( dst_ptr, bits, image_size ); break; } - case BS_DIBPATTERN: - { - BITMAPINFO *info = (BITMAPINFO *)logbrush.lbHatch; - DWORD bmSize, biSize; - - if (info->bmiHeader.biCompression) - bmSize = info->bmiHeader.biSizeImage; - else - bmSize = get_dib_image_size( info ); - biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); - size = sizeof(METARECORD) + biSize + bmSize + 2; - mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!mr) - { - GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); - goto done; - } - mr->rdFunction = META_DIBCREATEPATTERNBRUSH; - mr->rdSize = size / 2; - *(mr->rdParm) = logbrush.lbStyle; - *(mr->rdParm + 1) = LOWORD(logbrush.lbColor); - memcpy(mr->rdParm + 2, info, biSize + bmSize); - break; - } default: FIXME("Unkonwn brush style %x\n", logbrush.lbStyle); return 0;

1 0

Alexandre Julliard : gdi32: Retrieve the brush pattern bits from the cache for enhanced metafiles.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 03e0d96b9e95629ff26e78d79288ef9d7b7acc44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e0d96b9e95629ff26e78d79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 22:06:23 2011 +0100 gdi32: Retrieve the brush pattern bits from the cache for enhanced metafiles. --- dlls/gdi32/enhmfdrv/objects.c | 106 ++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 69 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 52e9cb4..027b6a3 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -132,86 +132,54 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) index = 0; } break; - case BS_DIBPATTERN: - { - EMRCREATEDIBPATTERNBRUSHPT *emr; - DWORD bmSize, biSize, size; - BITMAPINFO *info = (BITMAPINFO *)logbrush.lbHatch; - - if (info->bmiHeader.biCompression) - bmSize = info->bmiHeader.biSizeImage; - else - bmSize = get_dib_image_size( info ); - biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); - size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize + bmSize; - emr = HeapAlloc( GetProcessHeap(), 0, size ); - if(!emr) break; - emr->emr.iType = EMR_CREATEDIBPATTERNBRUSHPT; - emr->emr.nSize = size; - emr->ihBrush = index = EMFDRV_AddHandle( dev, hBrush ); - emr->iUsage = LOWORD(logbrush.lbColor); - emr->offBmi = sizeof(EMRCREATEDIBPATTERNBRUSHPT); - emr->cbBmi = biSize; - emr->offBits = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize; - emr->cbBits = bmSize; - memcpy((char *)emr + sizeof(EMRCREATEDIBPATTERNBRUSHPT), info, - biSize + bmSize ); - - if(!EMFDRV_WriteRecord( dev, &emr->emr )) - index = 0; - HeapFree( GetProcessHeap(), 0, emr ); - } - break; - case BS_PATTERN: + case BS_DIBPATTERN: { EMRCREATEDIBPATTERNBRUSHPT *emr; char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; - struct gdi_image_bits bits; - DWORD size; + BITMAPINFO *info = (BITMAPINFO *)buffer; + DWORD info_size, image_size; + void *bits; + UINT usage; - if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) break; - if (src_info->bmiHeader.biBitCount != 1) - { - FIXME("Trying to create a color pattern brush\n"); - if (bits.free) bits.free( &bits ); - break; - } + if (!get_brush_bitmap_info( hBrush, info, &bits, &usage )) break; + info_size = bitmap_info_size( info, usage ); + image_size = get_dib_image_size( info ); - /* FIXME: There is an extra DWORD written by native before the BMI. - * Not sure what its meant to contain. - */ - size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD) + - sizeof(BITMAPINFOHEADER) + src_info->bmiHeader.biSizeImage; + emr = HeapAlloc( GetProcessHeap(), 0, sizeof(EMRCREATEDIBPATTERNBRUSHPT)+info_size+image_size ); + if(!emr) break; - emr = HeapAlloc( GetProcessHeap(), 0, size ); - if(!emr) + if (logbrush.lbStyle == BS_PATTERN && info->bmiHeader.biBitCount == 1) { - if (bits.free) bits.free( &bits ); - break; + /* Presumably to reduce the size of the written EMF, MS supports an + * undocumented iUsage value of 2, indicating a mono bitmap without the + * 8 byte 2 entry black/white palette. Stupidly, they could have saved + * over 20 bytes more by also ignoring the BITMAPINFO fields that are + * irrelevant/constant for monochrome bitmaps. + * FIXME: It may be that the DIB functions themselves accept this value. + */ + emr->emr.iType = EMR_CREATEMONOBRUSH; + usage = DIB_PAL_MONO; + /* FIXME: There is an extra DWORD written by native before the BMI. + * Not sure what its meant to contain. + */ + emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ) + sizeof(DWORD); + emr->cbBmi = sizeof( BITMAPINFOHEADER ); } - - dst_info = (BITMAPINFO *)((LPBYTE)(emr + 1) + sizeof(DWORD)); - dst_info->bmiHeader = src_info->bmiHeader; - memcpy( &dst_info->bmiHeader + 1, bits.ptr, dst_info->bmiHeader.biSizeImage ); - if (bits.free) bits.free( &bits ); - - emr->emr.iType = EMR_CREATEMONOBRUSH; - emr->emr.nSize = size; + else + { + emr->emr.iType = EMR_CREATEDIBPATTERNBRUSHPT; + emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ); + emr->cbBmi = info_size; + } + emr->emr.nSize = emr->offBits + emr->cbBits; emr->ihBrush = index = EMFDRV_AddHandle( dev, hBrush ); - /* Presumably to reduce the size of the written EMF, MS supports an - * undocumented iUsage value of 2, indicating a mono bitmap without the - * 8 byte 2 entry black/white palette. Stupidly, they could have saved - * over 20 bytes more by also ignoring the BITMAPINFO fields that are - * irrelevant/constant for monochrome bitmaps. - * FIXME: It may be that the DIB functions themselves accept this value. - */ - emr->iUsage = DIB_PAL_MONO; - emr->offBmi = (LPBYTE)dst_info - (LPBYTE)emr; - emr->cbBmi = sizeof( BITMAPINFOHEADER ); + emr->iUsage = usage; emr->offBits = emr->offBmi + emr->cbBmi; - emr->cbBits = dst_info->bmiHeader.biSizeImage; + emr->cbBits = image_size; + + memcpy( (BYTE *)emr + emr->offBmi, info, emr->cbBmi ); + memcpy( (BYTE *)emr + emr->offBits, bits, emr->cbBits ); if(!EMFDRV_WriteRecord( dev, &emr->emr )) index = 0;

1 0

Nikolay Sivov : msxml3: Fix IDispatch support for IXMLDocument.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: c32db174175c3d4add62a3d8a9435887e00d0b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32db174175c3d4add62a3d8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 11:46:45 2011 +0300 msxml3: Fix IDispatch support for IXMLDocument. --- dlls/msxml3/dispex.c | 129 ++++++++++++++++++++++++++----------------- dlls/msxml3/tests/xmldoc.c | 62 ++++++++++++--------- dlls/msxml3/xmldoc.c | 21 +++---- 3 files changed, 122 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c32db174175c3d4add62a…

1 0

Nikolay Sivov : msxml3: Support IDispatch in IXMLElement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 5ea259e8e45b050a80264c5568875a4d1d7db84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea259e8e45b050a80264c556… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 12:11:36 2011 +0300 msxml3: Support IDispatch in IXMLElement. --- dlls/msxml3/tests/xmldoc.c | 26 ++++++++++++++++++++++---- dlls/msxml3/xmlelem.c | 3 ++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index d2828db..615d48c 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -852,8 +852,10 @@ static void test_xmlelem(void) IXMLElementCollection *children; VARIANT vType, vName; VARIANT vIndex, vValue; - BSTR str, val; + BSTR str, val, name; LONG type, num_child; + IDispatch *disp; + ITypeInfo *ti; static const WCHAR propName[] = {'p','r','o','p',0}; static const WCHAR propVal[] = {'v','a','l',0}; @@ -864,17 +866,33 @@ static void test_xmlelem(void) hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); - ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + EXPECT_HR(hr, S_OK); V_VT(&vType) = VT_I4; V_I4(&vType) = XMLELEMTYPE_ELEMENT; V_VT(&vName) = VT_NULL; hr = IXMLDocument_createElement(doc, vType, vName, &element); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + EXPECT_HR(hr, S_OK); ok(element != NULL, "Expected non-NULL element\n"); + /* test for IDispatch */ + disp = NULL; + hr = IXMLElement_QueryInterface(element, &IID_IDispatch, (void**)&disp); + EXPECT_HR(hr, S_OK); + + hr = IDispatch_GetTypeInfo(disp, 0, 0, &ti); + EXPECT_HR(hr, S_OK); + + name = NULL; + hr = ITypeInfo_GetDocumentation(ti, DISPID_XMLELEMENT_TAGNAME, &name, NULL, NULL, NULL); + EXPECT_HR(hr, S_OK); + SysFreeString(name); + + ITypeInfo_Release(ti); + IDispatch_Release(disp); + hr = IXMLElement_get_tagName(element, &str); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + EXPECT_HR(hr, S_OK); ok(lstrlenW(str) == 0, "Expected empty tag name\n"); SysFreeString(str); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 86fa51d..679e159 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -67,7 +67,8 @@ static HRESULT WINAPI xmlelem_QueryInterface(IXMLElement *iface, REFIID riid, vo TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - if (IsEqualGUID(riid, &IID_IUnknown) || + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IXMLElement)) { *ppvObject = iface;

1 0

Nikolay Sivov : msxml3: Add IDispatchEx support for IXMLDOMNamedNodeMap.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 70e0290dcf2e261dc3b7629b64586662cae3a292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e0290dcf2e261dc3b7629b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 18:59:05 2011 +0300 msxml3: Add IDispatchEx support for IXMLDOMNamedNodeMap. --- dlls/msxml3/dispex.c | 11 ++--- dlls/msxml3/msxml_private.h | 3 - dlls/msxml3/nodemap.c | 94 ++++++++++++++++++++++++++++++++++++++---- dlls/msxml3/selection.c | 8 +++- dlls/msxml3/tests/domdoc.c | 60 +++++++++++++++++++++++++++- 5 files changed, 154 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70e0290dcf2e261dc3b76…

1 0

Nikolay Sivov : msxml3: Fix collection index based support for IXMLDOMSelection.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 2ce0f8fd735650f230b6118b6795258e58c85c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0f8fd735650f230b6118b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 19:00:47 2011 +0300 msxml3: Fix collection index based support for IXMLDOMSelection. --- dlls/msxml3/selection.c | 9 +-------- dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 274e239..18b82bb 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -185,13 +185,10 @@ static HRESULT WINAPI domselection_GetTypeInfo( ITypeInfo** ppTInfo ) { domselection *This = impl_from_IXMLDOMSelection( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLDOMSelection_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMSelection_tid, ppTInfo); } static HRESULT WINAPI domselection_GetIDsOfNames( @@ -606,7 +603,6 @@ static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknow static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) { - domselection *This = impl_from_IXMLDOMSelection( (IXMLDOMSelection*)iface ); WCHAR *ptr; int idx = 0; @@ -615,9 +611,6 @@ static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, if(*ptr) return DISP_E_UNKNOWNNAME; - if(idx >= xmlXPathNodeSetGetLength(This->result->nodesetval)) - return DISP_E_UNKNOWNNAME; - *dispid = DISPID_DOM_COLLECTION_BASE + idx; TRACE("ret %x\n", *dispid); return S_OK; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index efd8ccc..a883da0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9999,10 +9999,12 @@ static void test_selection(void) IEnumVARIANT *enum1, *enum2, *enum3; IXMLDOMNodeList *list; IXMLDOMDocument *doc; + IDispatchEx *dispex; IXMLDOMNode *node; IDispatch *disp; VARIANT_BOOL b; HRESULT hr; + DISPID did; VARIANT v; BSTR name; ULONG ret; @@ -10020,6 +10022,22 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); IXMLDOMSelection_Release(selection); + /* collection disp id */ + hr = IXMLDOMSelection_QueryInterface(selection, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + did = 0; + hr = IDispatchEx_GetDispID(dispex, _bstr_("0"), 0, &did); + EXPECT_HR(hr, S_OK); + ok(did == DISPID_DOM_COLLECTION_BASE, "got %d\n", did); + len = 0; + hr = IXMLDOMSelection_get_length(selection, &len); + EXPECT_HR(hr, S_OK); + ok(len == 1, "got %d\n", len); + hr = IDispatchEx_GetDispID(dispex, _bstr_("10"), 0, &did); + EXPECT_HR(hr, S_OK); + ok(did == DISPID_DOM_COLLECTION_BASE+10, "got %d\n", did); + IDispatchEx_Release(dispex); + /* IEnumVARIANT tests */ enum1 = NULL; hr = IXMLDOMSelection_QueryInterface(selection, &IID_IEnumVARIANT, (void**)&enum1);

1 0

Rafał Mużyło : configure: Fix a typo.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 78f717bff2b22eb0477b0d146e47509c57860df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f717bff2b22eb0477b0d146… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Fri Nov 4 23:20:30 2011 +0100 configure: Fix a typo. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 887fef9..e7767ad 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -220,7 +220,7 @@ $ac_dir/msg.pot: tools/wmc include" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir/rsrc.pot: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) rsrc.pot -$ac_dir/srsrc.pot: tools/wrc include" +$ac_dir/rsrc.pot: tools/wrc include" fi } diff --git a/configure b/configure index 9350761..9251e6f 100755 --- a/configure +++ b/configure @@ -14324,7 +14324,7 @@ $ac_dir/msg.pot: tools/wmc include" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir/rsrc.pot: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) rsrc.pot -$ac_dir/srsrc.pot: tools/wrc include" +$ac_dir/rsrc.pot: tools/wrc include" fi }

1 0

Octavian Voicu : makefiles: Add manual dependencies also for testlist cross object.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 24a1fc376648da8f64f44e6f9d93db46f4b315b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a1fc376648da8f64f44e6f9… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Sat Nov 5 07:55:06 2011 +0200 makefiles: Add manual dependencies also for testlist cross object. --- Maketest.rules.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index b60986c..4833f5a 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -45,7 +45,7 @@ $(WINETEST_RES): $(WINETEST_EXE) testlist.c: Makefile.in $(MAKECTESTS) $(MAKECTESTS) -o $@ $(C_SRCS) -testlist.o: testlist.c $(top_srcdir)/include/wine/test.h +testlist.o testlist.cross.o: testlist.c $(top_srcdir)/include/wine/test.h # Rules for testing

1 0