May 2013 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdiplus: Implement GdipEnumerateMetafileDestPoint and GdipEnumerateMetafileDestPointI .
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 4c4c661bc0cb999a7c112f10bbb238792d8394c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4c661bc0cb999a7c112f10b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 12:09:24 2013 +0900 gdiplus: Implement GdipEnumerateMetafileDestPoint and GdipEnumerateMetafileDestPointI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/metafile.c | 30 ++++++++++++++++++++++++++++++ include/gdiplusflat.h | 4 ++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2fa1771..4f30ed1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -190,8 +190,8 @@ 190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) 192 stdcall GdipEndContainer(ptr ptr) -193 stub GdipEnumerateMetafileDestPoint -194 stub GdipEnumerateMetafileDestPointI +193 stdcall GdipEnumerateMetafileDestPoint(ptr ptr ptr ptr ptr ptr) +194 stdcall GdipEnumerateMetafileDestPointI(ptr ptr ptr ptr ptr ptr) 195 stub GdipEnumerateMetafileDestPoints 196 stub GdipEnumerateMetafileDestPointsI 197 stdcall GdipEnumerateMetafileDestRect(ptr ptr ptr ptr ptr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 893fe6b..bcb5be7 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -584,6 +584,36 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics *graphics, return GdipEnumerateMetafileDestRect(graphics, metafile, &destf, callback, cb_data, attrs); } +GpStatus WINGDIPAPI GdipEnumerateMetafileDestPoint(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpPointF *dest, + EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpRectF destf; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + destf.X = dest->X; + destf.Y = dest->Y; + destf.Width = units_to_pixels(metafile->bounds.Width, metafile->unit, metafile->image.xres); + destf.Height = units_to_pixels(metafile->bounds.Height, metafile->unit, metafile->image.yres); + + return GdipEnumerateMetafileDestRect(graphics, metafile, &destf, callback, cb_data, attrs); +} + +GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpPoint *dest, + EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpPointF ptf; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + ptf.X = dest->X; + ptf.Y = dest->Y; + + return GdipEnumerateMetafileDestPoint(graphics, metafile, &ptf, callback, cb_data, attrs); +} + static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, int nObj, LPARAM lpData) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8e720f1..c622431 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -206,6 +206,10 @@ GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*, GDIPCONST GpBrush*); +GpStatus WINGDIPAPI GdipEnumerateMetafileDestPoint(GpGraphics*,GDIPCONST GpMetafile*, + GDIPCONST GpPointF*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); +GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics*,GDIPCONST GpMetafile*, + GDIPCONST GpPoint*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics*,GDIPCONST GpMetafile*, GDIPCONST GpRectF*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics*,GDIPCONST GpMetafile*,

1 0

Hans Leidekker : fusion: Fix alignment in parse_clr_metadata.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: aca88c2f80719bd6b5b3487b02c35de075cb49ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca88c2f80719bd6b5b3487b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 6 10:07:00 2013 +0200 fusion: Fix alignment in parse_clr_metadata. --- dlls/fusion/assembly.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 920d8db..c2f98ec 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -595,8 +595,7 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly) else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) assembly->blobs = assembly_data_offset(assembly, ofs); - ptr += lstrlenA(stream) + 1; - ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ + ptr += ((lstrlenA(stream) + 1) + 3) & ~3; /* align on DWORD boundary */ } return S_OK;

1 0

Piotr Caban : msvcp60: Export basic_streambuf::pubseekoff function.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: a73c69700c9e3a179f5492edb1e0e1b710993053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73c69700c9e3a179f5492edb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 6 11:16:54 2013 +0200 msvcp60: Export basic_streambuf::pubseekoff function. --- dlls/msvcp60/ios.c | 14 ++++++++++++-- dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index a5f573d..7e87607 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1277,7 +1277,12 @@ fpos_int* __thiscall basic_streambuf_char_seekoff(basic_streambuf_char *this, /* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ -static fpos_int* basic_streambuf_char_pubseekoff(basic_streambuf_char *this, +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_char_pubseekoff, 20) +fpos_int* __thiscall basic_streambuf_char_pubseekoff(basic_streambuf_char *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); @@ -2006,7 +2011,12 @@ fpos_int* __thiscall basic_streambuf_wchar_seekoff(basic_streambuf_wchar *this, /* ?pubseekoff@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ -static fpos_int* basic_streambuf_wchar_pubseekoff(basic_streambuf_wchar *this, +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ioos_base(a)2@H(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_pubseekoff, 20) +fpos_int* __thiscall basic_streambuf_wchar_pubseekoff(basic_streambuf_wchar *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e15d43c..4e5a28e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3645,14 +3645,14 @@ @ cdecl -arch=win64 ?pubimbue@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z(ptr ptr ptr) basic_streambuf_char_pubimbue @ thiscall -arch=win32 ?pubimbue@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z(ptr ptr ptr) basic_streambuf_wchar_pubimbue @ cdecl -arch=win64 ?pubimbue@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z(ptr ptr ptr) basic_streambuf_wchar_pubimbue -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff @ stub -arch=win32 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)V32@F(a)Z @ stub -arch=win64 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)V32@F(a)Z @ thiscall -arch=win32 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr long long int64 long long long) basic_streambuf_char_pubseekpos

1 0

Christian Costa : d3dx9_36: Add stub for DisassembleEffect.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: bdc5c3211cd3f5330ca90da09a1158885ce3be8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc5c3211cd3f5330ca90da09… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 5 20:44:14 2013 +0200 d3dx9_36: Add stub for DisassembleEffect. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/effect.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9b83135..b2511e8 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -119,7 +119,7 @@ @ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) -@ stub D3DXDisassembleEffect(ptr long ptr) +@ stdcall D3DXDisassembleEffect(ptr long ptr) @ stub D3DXDisassembleShader(ptr long ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c4afbe5..be80ede 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6196,3 +6196,10 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC return D3DXERR_INVALIDDATA; } + +HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly) +{ + FIXME("(%p, %u, %p): stub\n", effect, enable_color_code, disassembly); + + return D3DXERR_INVALIDDATA; +}

1 0

Nikolay Sivov : oledb32: Use shared convert instance, use a single skip.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: ff8fa96bb24c51fe1072fad773ca256849ea035e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8fa96bb24c51fe1072fad77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 5 09:20:02 2013 +0400 oledb32: Use shared convert instance, use a single skip. --- dlls/oledb32/tests/convert.c | 191 ++++-------------------------------------- 1 files changed, 16 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff8fa96bb24c51fe1072f…

1 0

Nikolay Sivov : msxml3: Fix ignorable whitespace detection.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 0403f34b78ef1f663f0703784e089e8396fb338c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0403f34b78ef1f663f0703784… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 5 15:44:06 2013 +0400 msxml3: Fix ignorable whitespace detection. --- dlls/msxml3/domdoc.c | 14 ++++++++- dlls/msxml3/tests/domdoc.c | 64 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 67902bd..b607997 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -416,10 +416,20 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) if (ctxt->node) { - /* during domdoc_loadXML() the xmlDocPtr->_private data is not available */ + /* Characters are reported with multiple calls, for example each charref is reported with a separate + call and then parser appends it to a single text node or creates a new node if not created. + It's not possible to tell if it's ignorable data or not just looking at data itself cause it could be + a space chars that separate charrefs or similar case. We only need to skip leading and trailing spaces, + or whole node if it has nothing but space chars, so to detect leading space node->last is checked that + contains text node pointer if already created, trailing spaces are detected directly looking at parser input + for next '<' opening bracket - similar logic is used by libxml2 itself. + + Note that during domdoc_loadXML() the xmlDocPtr->_private data is not available. */ if (!This->properties->preserving && !is_preserving_whitespace(ctxt->node) && - strn_isspace(ch, len)) + strn_isspace(ch, len) && + (!ctxt->node->last || + ((ctxt->node->last && (*ctxt->input->cur) == '<')))) return; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d5f2413..cc79d4b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -435,6 +435,13 @@ static const char szExampleXML[] = " </elem>\n" "</root>\n"; +static const char charrefsxml[] = +"<?xml version='1.0'?>" +"<a>" +"<b1> Text A end </b1>" +"<b2>AB C </b2>" +"</a>"; + static const CHAR szNodeTypesXML[] = "<?xml version='1.0'?>" "" @@ -4154,10 +4161,58 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con IXMLDOMNode_Release(node2); } -static void test_whitespace(void) +static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) { + static const WCHAR b1_p[] = {' ','T','e','x','t',' ','A',' ','e','n','d',' ',0}; + static const WCHAR b1_i[] = {'T','e','x','t',' ','A',' ','e','n','d',0}; + static const WCHAR b2_p[] = {'A','B',' ','C',' ',0}; + static const WCHAR b2_i[] = {'A','B',' ','C',0}; + IXMLDOMNodeList *list; + IXMLDOMElement *root; + IXMLDOMNode *node; + const WCHAR *text; VARIANT_BOOL b; + HRESULT hr; + BSTR s; + + hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc, preserve); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(charrefsxml), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_get_documentElement(doc, &root); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_get_childNodes(root, &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMElement_Release(root); + + text = preserve == VARIANT_TRUE ? b1_p : b1_i; + hr = IXMLDOMNodeList_get_item(list, 0, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_text(node, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, text), "0x%x, got %s\n", preserve, wine_dbgstr_w(s)); + SysFreeString(s); + IXMLDOMNode_Release(node); + + text = preserve == VARIANT_TRUE ? b2_p : b2_i; + hr = IXMLDOMNodeList_get_item(list, 1, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_text(node, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, text), "0x%x, got %s\n", preserve, wine_dbgstr_w(s)); + SysFreeString(s); + IXMLDOMNode_Release(node); + + IXMLDOMNodeList_Release(list); +} + +static void test_whitespace(void) +{ IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + VARIANT_BOOL b; doc1 = create_document(&IID_IXMLDOMDocument2); doc2 = create_document(&IID_IXMLDOMDocument2); @@ -4224,10 +4279,15 @@ static void test_whitespace(void) check_ws_preserved(doc3, NULL); check_ws_ignored(doc4, NULL); - IXMLDOMDocument2_Release(doc1); IXMLDOMDocument2_Release(doc2); IXMLDOMDocument2_Release(doc3); IXMLDOMDocument2_Release(doc4); + + /* text with char references */ + test_preserve_charref(doc1, VARIANT_TRUE); + test_preserve_charref(doc1, VARIANT_FALSE); + IXMLDOMDocument2_Release(doc1); + free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Always return False for nodes that can' t have children.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 6cc0e706dd7f5afa340470a77ef9488896e4e213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc0e706dd7f5afa340470a77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 16:03:06 2013 +0400 msxml3: Always return False for nodes that can't have children. --- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/msxml_private.h | 9 +++++++++ dlls/msxml3/text.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 7fd4a37..61c0ce2 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -333,7 +333,7 @@ static HRESULT WINAPI domcdata_hasChildNodes( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domcdata_get_ownerDocument( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index be49e71..879ca48 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -332,7 +332,7 @@ static HRESULT WINAPI domcomment_hasChildNodes( { domcomment *This = impl_from_IXMLDOMComment( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domcomment_get_ownerDocument( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 6c24119..17e19a7 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -475,6 +475,15 @@ static inline HRESULT return_null_bstr(BSTR *p) return S_FALSE; } +static inline HRESULT return_var_false(VARIANT_BOOL *p) +{ + if(!p) + return E_INVALIDARG; + + *p = VARIANT_FALSE; + return S_FALSE; +} + extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, LONG line, LONG linepos, LONG filepos ) DECLSPEC_HIDDEN; extern HRESULT DOMDocument_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index e9c64c1..fd8e33a 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -330,7 +330,7 @@ static HRESULT WINAPI domtext_hasChildNodes( { domtext *This = impl_from_IXMLDOMText( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domtext_get_ownerDocument(

1 0

Ken Thomases : winemac: Change some run-time asserts to compile-time.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 3964f805cc19260f0d3054cf296a9db2a593fbc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3964f805cc19260f0d3054cf2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 3 23:05:08 2013 -0500 winemac: Change some run-time asserts to compile-time. --- dlls/winemac.drv/macdrv_main.c | 4 ++-- dlls/winemac.drv/opengl.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index f4cb7be..501b7d5 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); #define kCFCoreFoundationVersionNumber10_7 635.00 #endif +C_ASSERT(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); + DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -96,8 +98,6 @@ static BOOL process_attach(void) SessionAttributeBits attributes; OSStatus status; - assert(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); - status = SessionGetInfo(callerSecuritySession, NULL, &attributes); if (status != noErr || !(attributes & sessionHasGraphicAccess)) return FALSE; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 5f269fc..b1d2c1e 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -231,6 +231,7 @@ typedef union pixel_format format; UInt64 code; } pixel_format_or_code; +C_ASSERT(sizeof(((pixel_format_or_code*)0)->format) <= sizeof(((pixel_format_or_code*)0)->code)); static pixel_format *pixel_formats; @@ -1080,8 +1081,6 @@ static BOOL init_pixel_formats(void) TRACE("()\n"); - assert(sizeof(((pixel_format_or_code*)0)->format) <= sizeof(((pixel_format_or_code*)0)->code)); - err = CGLQueryRendererInfo(CGDisplayIDToOpenGLDisplayMask(CGMainDisplayID()), &renderer_info, &rendererCount); if (err) {

1 0

Francois Gouget : fusion/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 2767aca7bba4faed88f7fd02b02d70be85e6265b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2767aca7bba4faed88f7fd02b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 4 09:26:05 2013 +0200 fusion/tests: Fix compilation on systems that don't support nameless unions. --- dlls/fusion/tests/asmcache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 320a938..da39505 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -822,11 +822,11 @@ static void create_assembly(LPCSTR file) assembly.tableshdr.MaskValid.u.LowPart = 0x00000005; assembly.tableshdr.MaskSorted.u.HighPart = 0x1600; assembly.tableshdr.MaskSorted.u.LowPart = 0x3301FA00; - U1(assembly.labelres).Name = 0x10; + U(assembly.labelres).Name = 0x10; U2(assembly.labelres).OffsetToData = 0x80000018; - U1(assembly.label11res).Name = 0x1; + U(assembly.label11res).Name = 0x1; U2(assembly.label11res).OffsetToData = 0x80000030; - U1(assembly.label10res).Name = 0x0; + U(assembly.label10res).Name = 0x0; U2(assembly.label10res).OffsetToData = 0x48; hfile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

Francois Gouget : dmsynth/tests: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: b8a787fd436c0a73df3e930f91ba42ec51537178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a787fd436c0a73df3e930f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 4 09:30:49 2013 +0200 dmsynth/tests: Fix compilation on systems that don't support nameless structs or unions. --- dlls/dmsynth/tests/dmsynth.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 83a0bca..ba094a1 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -56,30 +56,30 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); - property.Id = 0; - property.Flags = KSPROPERTY_TYPE_GET; + S(U(property)).Id = 0; + S(U(property)).Flags = KSPROPERTY_TYPE_GET; - property.Set = GUID_DMUS_PROP_INSTRUMENT2; + S(U(property)).Set = GUID_DMUS_PROP_INSTRUMENT2; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); ok(value == TRUE, "Return value: %u, should be 1\n", value); - property.Set = GUID_DMUS_PROP_DLS2; + S(U(property)).Set = GUID_DMUS_PROP_DLS2; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); ok(value == TRUE, "Return value: %u, should be 1\n", value); - property.Set = GUID_DMUS_PROP_GM_Hardware; + S(U(property)).Set = GUID_DMUS_PROP_GM_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); ok(value == FALSE, "Return value: %u, should be 0\n", value); - property.Set = GUID_DMUS_PROP_GS_Hardware; + S(U(property)).Set = GUID_DMUS_PROP_GS_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); ok(value == FALSE, "Return value: %u, should be 0\n", value); - property.Set = GUID_DMUS_PROP_XG_Hardware; + S(U(property)).Set = GUID_DMUS_PROP_XG_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); @@ -88,7 +88,7 @@ static void test_dmsynth(void) hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr); - property.Set = GUID_DMUS_PROP_SinkUsesDSound; + S(U(property)).Set = GUID_DMUS_PROP_SinkUsesDSound; hr = IKsControl_KsProperty(control_sink, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes);

1 0