wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Andrew Eikum : winmm: Don' t mask out SND_ALIAS_ID or SND_FILENAME in sndPlaySound.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: b1d9d43af7fad7308b26cc62a23483a96e4547bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d9d43af7fad7308b26cc62a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 4 11:41:10 2012 -0600 winmm: Don't mask out SND_ALIAS_ID or SND_FILENAME in sndPlaySound. --- dlls/winmm/playsound.c | 4 ++-- dlls/winmm/tests/wave.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0d32274..64db333 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -560,7 +560,7 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSoundW, HMODULE hmod, DWORD fdwSound) */ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) { - uFlags &= SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSoundA, 0, uFlags, FALSE); } @@ -569,7 +569,7 @@ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) */ BOOL WINAPI sndPlaySoundW(LPCWSTR pszSound, UINT uFlags) { - uFlags &= SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSound, 0, uFlags, TRUE); } diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 28b4145..97849f5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1443,8 +1443,41 @@ static void wave_out_tests(void) wave_out_test_device(WAVE_MAPPER); } +static void test_sndPlaySound(void) +{ + BOOL br; + + static const WCHAR not_existW[] = {'C',':','\\','n','o','t','_','e','x','i','s','t','.','w','a','v',0}; + static const WCHAR SystemAsteriskW[] = {'S','y','s','t','e','m','A','s','t','e','r','i','s','k',0}; + + br = sndPlaySoundA((LPCSTR)SND_ALIAS_SYSTEMASTERISK, SND_ALIAS_ID|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundW((LPCWSTR)SND_ALIAS_SYSTEMASTERISK, SND_ALIAS_ID|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundA((LPCSTR)sndAlias('X','Y'), SND_ALIAS_ID|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundW((LPCWSTR)sndAlias('X','Y'), SND_ALIAS_ID|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundA("SystemAsterisk", SND_ALIAS|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundW(SystemAsteriskW, SND_ALIAS|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundA("C:\not_exist.wav", SND_FILENAME|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); + + br = sndPlaySoundW(not_existW, SND_FILENAME|SND_SYNC); + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); +} + START_TEST(wave) { test_multiple_waveopens(); wave_out_tests(); + test_sndPlaySound(); }

1 0

Vincent Povirk : gdiplus: Add a test for drawing to HDC' s backed by 32-bit alpha dibs.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 2ddb3b7d9326d639d608e513dcef67855f23390b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddb3b7d9326d639d608e513d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 3 16:00:36 2012 -0600 gdiplus: Add a test for drawing to HDC's backed by 32-bit alpha dibs. --- dlls/gdiplus/tests/graphics.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5fc1626..553e77f 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4083,6 +4083,55 @@ static void test_measured_extra_space(void) GdipDeleteStringFormat(format); } +static void test_alpha_hdc(void) +{ + GpStatus status; + HDC hdc; + HBITMAP hbm, old_hbm; + GpGraphics *graphics; + ULONG *bits; + BITMAPINFO bmi; + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = 5; + bmi.bmiHeader.biWidth = 5; + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biClrUsed = 0; + + hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + old_hbm = SelectObject(hdc, hbm); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + bits[0] = 0xdeadbeef; + + status = GdipGraphicsClear(graphics, 0xffaaaaaa); + expect(Ok, status); + + todo_wine expect(0xffaaaaaa, bits[0]); + + SelectObject(hdc, old_hbm); + + bits[0] = 0xdeadbeef; + + status = GdipGraphicsClear(graphics, 0xffbbbbbb); + expect(Ok, status); + + todo_wine expect(0xffbbbbbb, bits[0]); + + GdipDeleteGraphics(graphics); + + DeleteObject(hbm); + DeleteDC(hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4149,6 +4198,7 @@ START_TEST(graphics) test_get_set_interpolation(); test_get_set_textrenderinghint(); test_getdc_scaled(); + test_alpha_hdc(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Alexandre Julliard : gdi32: Store and return ABC metrics from get_glyph_outline.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: e8b6701fe126702004e66b404962bbf38a52c233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b6701fe126702004e66b404… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 4 18:14:56 2012 +0100 gdi32: Store and return ABC metrics from get_glyph_outline. --- dlls/gdi32/freetype.c | 85 +++++++++++++++--------------------------------- 1 files changed, 27 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 98c66a0..c5543e1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -288,10 +288,8 @@ typedef struct tagFamily { typedef struct { GLYPHMETRICS gm; - INT adv; /* These three hold to widths of the unrotated chars */ - INT lsb; - INT bbx; - BOOL init; + ABC abc; /* metrics of the unrotated char */ + BOOL init; } GM; typedef struct { @@ -5852,7 +5850,7 @@ static inline BYTE get_max_level( UINT format ) static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, - LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, + LPGLYPHMETRICS lpgm, ABC *abc, DWORD buflen, LPVOID buf, const MAT2* lpmat) { static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; @@ -5862,7 +5860,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, DWORD width, height, pitch, needed = 0; FT_Bitmap ft_bitmap; FT_Error err; - INT left, right, top = 0, bottom = 0, adv, lsb, bbx; + INT left, right, top = 0, bottom = 0, adv; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; double widthRatio = 1.0; @@ -5907,6 +5905,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FONT_GM(font,original_index)->init && is_identity_MAT2(lpmat)) { *lpgm = FONT_GM(font,original_index)->gm; + *abc = FONT_GM(font,original_index)->abc; TRACE("cached: %u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, wine_dbgstr_point(&lpgm->gmptGlyphOrigin), lpgm->gmCellIncX, lpgm->gmCellIncY); @@ -6059,12 +6058,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, adv = (vec.x+63) >> 6; } - lsb = left >> 6; - bbx = (right - left) >> 6; lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; lpgm->gmptGlyphOrigin.x = left >> 6; lpgm->gmptGlyphOrigin.y = top >> 6; + abc->abcA = left >> 6; + abc->abcB = (right - left) >> 6; + abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, wine_dbgstr_point(&lpgm->gmptGlyphOrigin), @@ -6074,9 +6074,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, is_identity_MAT2(lpmat)) /* don't cache custom transforms */ { FONT_GM(font,original_index)->gm = *lpgm; - FONT_GM(font,original_index)->adv = adv; - FONT_GM(font,original_index)->lsb = lsb; - FONT_GM(font,original_index)->bbx = bbx; + FONT_GM(font,original_index)->abc = *abc; FONT_GM(font,original_index)->init = TRUE; } @@ -7058,6 +7056,7 @@ static DWORD freetype_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, { struct freetype_physdev *physdev = get_freetype_dev( dev ); DWORD ret; + ABC abc; if (!physdev->font) { @@ -7067,7 +7066,7 @@ static DWORD freetype_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = get_glyph_outline( physdev->font, glyph, format, lpgm, buflen, buf, lpmat ); + ret = get_glyph_outline( physdev->font, glyph, format, lpgm, &abc, buflen, buf, lpmat ); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7197,8 +7196,7 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; + ABC abc; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7212,10 +7210,8 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar] = FONT_GM(linked_font,glyph_index)->adv; + get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, &abc, 0, NULL, &identity ); + buffer[c - firstChar] = abc.abcA + abc.abcB + abc.abcC; } LeaveCriticalSection( &freetype_cs ); return TRUE; @@ -7229,8 +7225,6 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7244,15 +7238,9 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar].abcA = FONT_GM(linked_font,glyph_index)->lsb; - buffer[c - firstChar].abcB = FONT_GM(linked_font,glyph_index)->bbx; - buffer[c - firstChar].abcC = FONT_GM(linked_font,glyph_index)->adv - FONT_GM(linked_font,glyph_index)->lsb - - FONT_GM(linked_font,glyph_index)->bbx; - } + for(c = firstChar; c <= lastChar; c++, buffer++) + get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, buffer, 0, NULL, &identity ); + LeaveCriticalSection( &freetype_cs ); return TRUE; } @@ -7265,8 +7253,6 @@ static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7281,25 +7267,9 @@ static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - get_glyph_index_linked(physdev->font, 'a', &linked_font, &glyph_index); - if (!pgi) - for(c = firstChar; c < firstChar+count; c++) { - get_glyph_outline(linked_font, c, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar].abcA = FONT_GM(linked_font,c)->lsb; - buffer[c - firstChar].abcB = FONT_GM(linked_font,c)->bbx; - buffer[c - firstChar].abcC = FONT_GM(linked_font,c)->adv - FONT_GM(linked_font,c)->lsb - - FONT_GM(linked_font,c)->bbx; - } - else - for(c = 0; c < count; c++) { - get_glyph_outline(linked_font, pgi[c], GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c].abcA = FONT_GM(linked_font,pgi[c])->lsb; - buffer[c].abcB = FONT_GM(linked_font,pgi[c])->bbx; - buffer[c].abcC = FONT_GM(linked_font,pgi[c])->adv - - FONT_GM(linked_font,pgi[c])->lsb - FONT_GM(linked_font,pgi[c])->bbx; - } + for(c = 0; c < count; c++, buffer++) + get_glyph_outline( physdev->font, pgi ? pgi[c] : firstChar + c, GGO_METRICS | GGO_GLYPH_INDEX, + &gm, buffer, 0, NULL, &identity ); LeaveCriticalSection( &freetype_cs ); return TRUE; @@ -7314,10 +7284,9 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; + ABC abc; GLYPHMETRICS gm; TEXTMETRICW tm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7336,10 +7305,8 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_index_linked( physdev->font, wstr[idx], &linked_font, &glyph_index ); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - size->cx += FONT_GM(linked_font,glyph_index)->adv; + get_glyph_outline( physdev->font, wstr[idx], GGO_METRICS, &gm, &abc, 0, NULL, &identity ); + size->cx += abc.abcA + abc.abcB + abc.abcC; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit; @@ -7365,6 +7332,7 @@ static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, IN static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; + ABC abc; GLYPHMETRICS gm; TEXTMETRICW tm; struct freetype_physdev *physdev = get_freetype_dev( dev ); @@ -7385,8 +7353,9 @@ static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, IN size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_outline(physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); - size->cx += FONT_GM(physdev->font,indices[idx])->adv; + get_glyph_outline( physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, + &gm, &abc, 0, NULL, &identity ); + size->cx += abc.abcA + abc.abcB + abc.abcC; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit;

1 0

Jacek Caban : winedump: Added MSFT support.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 0dfa1ae223b73a155bede7e836b83c6fad66837d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dfa1ae223b73a155bede7e83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 13:08:53 2012 +0100 winedump: Added MSFT support. --- tools/winedump/Makefile.in | 3 +- tools/winedump/dump.c | 1 + tools/winedump/tlb.c | 735 ++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 6 +- 4 files changed, 743 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dfa1ae223b73a155bede…

1 0

Jacek Caban : msxml3: Moved XMLHTTPRequest tests to separated file.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: d6d0a27fe84bb0abdd6411f1b50c38a1f67f6713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d0a27fe84bb0abdd6411f1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 16:05:22 2012 +0100 msxml3: Moved XMLHTTPRequest tests to separated file. --- dlls/msxml3/tests/Makefile.in | 1 + dlls/msxml3/tests/domdoc.c | 1636 ++------------------------------------- dlls/msxml3/tests/httpreq.c | 1701 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1772 insertions(+), 1566 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6d0a27fe84bb0abdd641…

1 0

Jacek Caban : mshtml: Added support for converting (some) argument types in builtin function calls using script engine.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 61ec3ae27b85d15cc433790fc858718df0549520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ec3ae27b85d15cc433790fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 15:06:37 2012 +0100 mshtml: Added support for converting (some) argument types in builtin function calls using script engine. --- dlls/mshtml/dispex.c | 346 ++++++++++++++++++++++++++++------------- dlls/mshtml/tests/jstest.html | 8 + 2 files changed, 248 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61ec3ae27b85d15cc4337…

1 0

Nikolay Sivov : xmllite: Initial support for attribute list.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 0dce2e6d9a8d15c0059bd0e774347eb80ca852f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dce2e6d9a8d15c0059bd0e77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 13:31:25 2012 +0400 xmllite: Initial support for attribute list. --- dlls/xmllite/reader.c | 88 ++++++++++++++++++++++++++++++++++++++----- dlls/xmllite/tests/reader.c | 12 ++++- 2 files changed, 87 insertions(+), 13 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 11b5eb8..0d33296 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -29,6 +29,7 @@ #include "xmllite_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xmllite); @@ -88,6 +89,19 @@ typedef struct _xmlreaderinput input_buffer *buffer; } xmlreaderinput; +typedef struct +{ + const WCHAR *str; + UINT len; +} strval; + +struct attribute +{ + struct list entry; + strval localname; + strval value; +}; + typedef struct _xmlreader { IXmlReader IXmlReader_iface; @@ -98,6 +112,8 @@ typedef struct _xmlreader XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ + struct list attrs; /* attributes list for current node */ + UINT attr_count; } xmlreader; struct input_buffer @@ -184,6 +200,34 @@ static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str return ret; } +static void reader_clear_attrs(xmlreader *reader) +{ + struct attribute *attr, *attr2; + LIST_FOR_EACH_ENTRY_SAFE(attr, attr2, &reader->attrs, struct attribute, entry) + { + reader_free(reader, attr); + } + list_init(&reader->attrs); + reader->attr_count = 0; +} + +/* attribute data holds pointers to buffer data, so buffer shrink is not possible + while we are on a node with attributes */ +static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *value) +{ + struct attribute *attr; + + attr = reader_alloc(reader, sizeof(*attr)); + if (!attr) return E_OUTOFMEMORY; + + attr->localname = *localname; + attr->value = *value; + list_add_tail(&reader->attrs, &attr->entry); + reader->attr_count++; + + return S_OK; +} + static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) { const int initial_len = 0x2000; @@ -495,7 +539,7 @@ static int reader_skipspaces(xmlreader *reader) } /* [26] VersionNum ::= '1.' [0-9]+ */ -static HRESULT reader_parse_versionnum(xmlreader *reader) +static HRESULT reader_parse_versionnum(xmlreader *reader, strval *val) { const WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); static const WCHAR onedotW[] = {'1','.',0}; @@ -510,6 +554,8 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) if (ptr2 == ptr) return WC_E_DIGIT; TRACE("version=%s\n", debugstr_wn(start, ptr-start)); + val->str = start; + val->len = ptr-start; reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -530,11 +576,14 @@ static HRESULT reader_parse_eq(xmlreader *reader) static HRESULT reader_parse_versioninfo(xmlreader *reader) { static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + strval val, name; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; + name.str = reader_get_cur(reader); + name.len = 7; /* skip 'version' */ reader_skipn(reader, 7); @@ -546,7 +595,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - hr = reader_parse_versionnum(reader); + hr = reader_parse_versionnum(reader, &val); if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) @@ -555,7 +604,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return S_OK; + return reader_add_attr(reader, &name, &val); } /* ([A-Za-z0-9._] | '-') */ @@ -569,7 +618,7 @@ static inline int is_wchar_encname(WCHAR ch) } /* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ -static HRESULT reader_parse_encname(xmlreader *reader) +static HRESULT reader_parse_encname(xmlreader *reader, strval *val) { const WCHAR *start = reader_get_cur(reader), *ptr; xml_encoding enc; @@ -585,6 +634,8 @@ static HRESULT reader_parse_encname(xmlreader *reader) len = ptr - start; enc = parse_encoding_name(start, len); TRACE("encoding name %s\n", debugstr_wn(start, len)); + val->str = start; + val->len = len; if (enc == XmlEncoding_Unknown) return WC_E_ENCNAME; @@ -598,11 +649,14 @@ static HRESULT reader_parse_encname(xmlreader *reader) static HRESULT reader_parse_encdecl(xmlreader *reader) { static const WCHAR encodingW[] = {'e','n','c','o','d','i','n','g',0}; + strval name, val; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, encodingW)) return S_FALSE; + name.str = reader_get_cur(reader); + name.len = 8; /* skip 'encoding' */ reader_skipn(reader, 8); @@ -614,7 +668,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - hr = reader_parse_encname(reader); + hr = reader_parse_encname(reader, &val); if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) @@ -623,7 +677,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return S_OK; + return reader_add_attr(reader, &name, &val); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -633,11 +687,14 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; const WCHAR *start, *ptr; + strval name, val; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, standaloneW)) return S_FALSE; + name.str = reader_get_cur(reader); + name.len = 10; /* skip 'standalone' */ reader_skipn(reader, 10); @@ -657,13 +714,15 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) reader_skipn(reader, reader_cmp(reader, yesW) ? 2 : 3); ptr = reader_get_cur(reader); TRACE("standalone=%s\n", debugstr_wn(start, ptr-start)); + val.str = start; + val.len = ptr-start; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; /* skip "'"|'"' */ reader_skipn(reader, 1); - return S_OK; + return reader_add_attr(reader, &name, &val); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -737,6 +796,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); + reader_clear_attrs(This); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -1000,10 +1060,16 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *linePos return S_OK; } -static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *attributeCount) +static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count) { - FIXME("(%p %p): stub\n", iface, attributeCount); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p)\n", This, count); + + if (!count) return E_INVALIDARG; + + *count = This->attr_count; + return S_OK; } static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) @@ -1134,6 +1200,8 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); reader->nodetype = XmlNodeType_None; + list_init(&reader->attrs); + reader->attr_count = 0; *obj = &reader->IXmlReader_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index af0ea62..c44816c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -607,6 +607,10 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "got %08x\n", hr); + ok(count == 0, "got %d\n", count); + ok_pos(reader, 0, 0, -1, -1, FALSE); type = -1; @@ -627,11 +631,13 @@ static void test_read_xmldeclaration(void) todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); + hr = IXmlReader_GetAttributeCount(reader, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + hr = IXmlReader_GetAttributeCount(reader, &count); -todo_wine { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok(count == 3, "Expected 3, got %d\n", count); -} + hr = IXmlReader_GetDepth(reader, &count); todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Alexandre Julliard : configure: Building the tools requires include/config. h.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: bd1e261b063fe1624fe94cb56a5e17f2679c6793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1e261b063fe1624fe94cb56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 4 15:58:47 2012 +0100 configure: Building the tools requires include/config.h. --- aclocal.m4 | 2 ++ configure | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 0062982..14cf916 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -179,6 +179,8 @@ wine_fn_all_dir_rules () then dnl makedep is in tools so tools makefile cannot depend on it ac_alldeps="$[2] $ac_makedep" + else + ac_alldeps="$[2] include/config.h" fi case $[2] in *.in) ac_input=$ac_input:$[2] ;; diff --git a/configure b/configure index 99efc84..2da5477 100755 --- a/configure +++ b/configure @@ -14842,6 +14842,8 @@ wine_fn_all_dir_rules () if test $ac_dir != tools then ac_alldeps="$2 $ac_makedep" + else + ac_alldeps="$2 include/config.h" fi case $2 in *.in) ac_input=$ac_input:$2 ;;

1 0

Hans Leidekker : kernel32: Implement SetFileValidData.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: c019083240e70b52fb119dad469bb8c6cfda4ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=c019083240e70b52fb119dad4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 10:40:16 2012 +0100 kernel32: Implement SetFileValidData. --- configure | 1 + configure.ac | 1 + dlls/kernel32/file.c | 12 +++- dlls/kernel32/tests/file.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 31 ++++++++++ include/config.h.in | 3 + include/ddk/ntddk.h | 5 ++ include/winbase.h | 1 + 8 files changed, 188 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c019083240e70b52fb119…

1 0

Stefan Dösinger : ddraw: Create a dynamic buffer if DDLOCK_DISCARDCONTENTS is used.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 67230fc013da08965df156216b8d4553f289b088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67230fc013da08965df156216… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 4 09:36:16 2012 +0100 ddraw: Create a dynamic buffer if DDLOCK_DISCARDCONTENTS is used. --- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/vertexbuffer.c | 51 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 3a35c47..85f6ca3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -527,6 +527,8 @@ struct d3d_vertex_buffer /*** Storage for D3D7 specific things ***/ DWORD Caps; DWORD fvf; + DWORD size; + BOOL dynamic; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 39a977f..1b5d7af 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -185,6 +185,27 @@ static ULONG WINAPI d3d_vertex_buffer1_Release(IDirect3DVertexBuffer *iface) * IDirect3DVertexBuffer Methods *****************************************************************************/ +static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer *buffer, BOOL dynamic, + struct wined3d_buffer **wined3d_buffer) +{ + DWORD usage = WINED3DUSAGE_STATICDECL; + enum wined3d_pool pool; + + if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) + pool = WINED3D_POOL_SYSTEM_MEM; + else + pool = WINED3D_POOL_DEFAULT; + + if (buffer->Caps & D3DVBCAPS_WRITEONLY) + usage |= WINED3DUSAGE_WRITEONLY; + if (dynamic) + usage |= WINED3DUSAGE_DYNAMIC; + + return wined3d_buffer_create_vb(buffer->ddraw->wined3d_device, + buffer->size, usage, pool, buffer, &ddraw_null_wined3d_parent_ops, + wined3d_buffer); +} + /***************************************************************************** * IDirect3DVertexBuffer7::Lock * @@ -225,8 +246,28 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, if (flags & DDLOCK_NOOVERWRITE) wined3d_flags |= WINED3D_MAP_NOOVERWRITE; if (flags & DDLOCK_DISCARDCONTENTS) + { wined3d_flags |= WINED3D_MAP_DISCARD; + if (!buffer->dynamic) + { + struct wined3d_buffer *new_buffer; + wined3d_mutex_lock(); + hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, TRUE, &new_buffer); + if (SUCCEEDED(hr)) + { + buffer->dynamic = TRUE; + wined3d_buffer_decref(buffer->wineD3DVertexBuffer); + buffer->wineD3DVertexBuffer = new_buffer; + } + else + { + WARN("Failed to create a dynamic buffer\n"); + } + wined3d_mutex_unlock(); + } + } + wined3d_mutex_lock(); if (data_size) { @@ -534,7 +575,6 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, struct ddraw *ddraw, D3DVERTEXBUFFERDESC *desc) { struct d3d_vertex_buffer *buffer; - DWORD usage; HRESULT hr = D3D_OK; TRACE("Vertex buffer description:\n"); @@ -554,16 +594,11 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, buffer->ddraw = ddraw; buffer->Caps = desc->dwCaps; buffer->fvf = desc->dwFVF; - - usage = desc->dwCaps & D3DVBCAPS_WRITEONLY ? WINED3DUSAGE_WRITEONLY : 0; - usage |= WINED3DUSAGE_STATICDECL; + buffer->size = get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices; wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(ddraw->wined3d_device, - get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices, - usage, desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3D_POOL_SYSTEM_MEM : WINED3D_POOL_DEFAULT, - buffer, &ddraw_null_wined3d_parent_ops, &buffer->wineD3DVertexBuffer); + hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wineD3DVertexBuffer); if (FAILED(hr)) { WARN("Failed to create wined3d vertex buffer, hr %#x.\n", hr);

1 0

← Newer
1
...
47
48
49
50
51
52
53
54
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012