June 2012 - Wine-commits - list.winehq.org

Aric Stewart : usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Thaana.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 14f42cdcbcfa4afe70309982012250e05618ef70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f42cdcbcfa4afe703099820… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 4 07:44:09 2012 -0500 usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Thaana. --- dlls/usp10/shape.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index cf137bb..6592cda 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -44,6 +44,7 @@ typedef VOID (*ContextualShapingProc)(HDC, ScriptCache*, SCRIPT_ANALYSIS*, static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Hebrew(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); +static void ContextualShape_Thaana(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); @@ -398,7 +399,7 @@ static const ScriptShapeData ShapingData[] = {{ hebrew_features, 1}, NULL, 0, ContextualShape_Hebrew, NULL}, {{ syriac_features, 4}, required_syriac_features, 0, ContextualShape_Syriac, ShapeCharGlyphProp_None}, {{ arabic_features, 6}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, - {{ NULL, 0}, NULL, 0, NULL, ShapeCharGlyphProp_None}, + {{ NULL, 0}, NULL, 0, ContextualShape_Thaana, ShapeCharGlyphProp_None}, {{ standard_features, 2}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, NULL, 0, NULL, NULL}, @@ -1241,6 +1242,44 @@ right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Syriac); } +static int combining_lexical_Thaana(WCHAR c) +{ + enum {Thaana_Norm=0, Thaana_FILI}; + + switch(c) + { + case 0x7A6: + case 0x7A7: + case 0x7A8: + case 0x7A9: + case 0x7AA: + case 0x7AB: + case 0x7AC: + case 0x7AD: + case 0x7AE: + case 0x7AF: return Thaana_FILI; break; + default: return Thaana_Norm; + } +} + +static void ContextualShape_Thaana(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + INT dirL; + + if (*pcGlyphs != cChars) + { + ERR("Number of Glyphs and Chars need to match at the beginning\n"); + return; + } + + if (!psa->fLogicalOrder && psa->fRTL) + dirL = -1; + else + dirL = 1; + + mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Thaana); +} + /* * ContextualShape_Phags_pa */

1 0

Aric Stewart : usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Thai.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 28854b452e5789d0ec5d695cd097cb20fbc47e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28854b452e5789d0ec5d695cd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 4 07:44:12 2012 -0500 usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Thai. --- dlls/usp10/shape.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 6592cda..67c8153 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -46,6 +46,7 @@ static void ContextualShape_Hebrew(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Thaana(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); +static void ContextualShape_Thai(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); @@ -408,8 +409,8 @@ static const ScriptShapeData ShapingData[] = {{ tibetan_features, 2}, NULL, 0, NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, 0, NULL, ShapeCharGlyphProp_Tibet}, {{ phags_features, 3}, NULL, 0, ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, 0, NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, 0, NULL, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, @@ -469,7 +470,7 @@ static const ScriptShapeData ShapingData[] = {{ NULL, 0}, NULL, 0, NULL, NULL}, {{ hebrew_features, 1}, NULL, 0, ContextualShape_Hebrew, NULL}, {{ latin_features, 2}, NULL, 0, NULL, NULL}, - {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, }; extern scriptData scriptInformation[]; @@ -1365,6 +1366,51 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS HeapFree(GetProcessHeap(),0,context_shape); } +static int combining_lexical_Thai(WCHAR c) +{ + enum {Thai_Norm=0, Thai_ABOVE1, Thai_ABOVE2, Thai_ABOVE3, Thai_ABOVE4, Thai_BELOW1, Thai_BELOW2, Thai_AM}; + + switch(c) + { + case 0xE31: + case 0xE34: + case 0xE35: + case 0xE36: + case 0xE37: return Thai_ABOVE1; break; + case 0xE47: + case 0xE4D: return Thai_ABOVE2; break; + case 0xE48: + case 0xE49: + case 0xE4A: + case 0xE4B: return Thai_ABOVE3; break; + case 0xE4C: + case 0xE4E: return Thai_ABOVE4; break; + case 0xE38: + case 0xE39: return Thai_BELOW1; break; + case 0xE3A: return Thai_BELOW2; break; + case 0xE33: return Thai_AM; break; + default: return Thai_Norm; + } +} + +static void ContextualShape_Thai(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + INT dirL; + + if (*pcGlyphs != cChars) + { + ERR("Number of Glyphs and Chars need to match at the beginning\n"); + return; + } + + if (!psa->fLogicalOrder && psa->fRTL) + dirL = -1; + else + dirL = 1; + + mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Thai); +} + static void ReplaceInsertChars(HDC hdc, INT cWalk, INT* pcChars, WCHAR *pwOutChars, const WCHAR *replacements) { int i;

1 0

Aric Stewart : usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Lao.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 4f7ea5737a6b83bd9013ae25db748902cb6a09c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f7ea5737a6b83bd9013ae25d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 4 07:44:14 2012 -0500 usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Lao. --- dlls/usp10/shape.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 67c8153..f2b41b1 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -47,6 +47,7 @@ static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p static void ContextualShape_Thaana(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Thai(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); +static void ContextualShape_Lao(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); @@ -411,8 +412,8 @@ static const ScriptShapeData ShapingData[] = {{ phags_features, 3}, NULL, 0, ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, required_lao_features, 0, NULL, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, required_lao_features, 0, NULL, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, @@ -1411,6 +1412,50 @@ static void ContextualShape_Thai(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Thai); } +static int combining_lexical_Lao(WCHAR c) +{ + enum {Lao_Norm=0, Lao_ABOVE1, Lao_ABOVE2, Lao_BELOW1, Lao_BELOW2, Lao_AM}; + + switch(c) + { + case 0xEB1: + case 0xEB4: + case 0xEB5: + case 0xEB6: + case 0xEB7: + case 0xEBB: + case 0xECD: return Lao_ABOVE1; break; + case 0xEC8: + case 0xEC9: + case 0xECA: + case 0xECB: + case 0xECC: return Lao_ABOVE2; break; + case 0xEBC: return Lao_BELOW1; break; + case 0xEB8: + case 0xEB9: return Lao_BELOW2; break; + case 0xEB3: return Lao_AM; break; + default: return Lao_Norm; + } +} + +static void ContextualShape_Lao(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + INT dirL; + + if (*pcGlyphs != cChars) + { + ERR("Number of Glyphs and Chars need to match at the beginning\n"); + return; + } + + if (!psa->fLogicalOrder && psa->fRTL) + dirL = -1; + else + dirL = 1; + + mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Lao); +} + static void ReplaceInsertChars(HDC hdc, INT cWalk, INT* pcChars, WCHAR *pwOutChars, const WCHAR *replacements) { int i;

1 0

Michael Stefaniuc : user32/tests: Fix the expected values in some ok() messages.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 824974cee41bcf1a1f6d41e28dad381243d0ea19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=824974cee41bcf1a1f6d41e28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 4 17:26:24 2012 +0200 user32/tests: Fix the expected values in some ok() messages. --- dlls/user32/tests/monitor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e31019f..b509860 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -177,7 +177,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmDriverExtra = 1; res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't reset dmDriverExtra to 0\n"); memset(&dmW, 0, sizeof(dmW)); @@ -201,7 +201,7 @@ static void test_ChangeDisplaySettingsEx(void) if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't reset dmDriverExtra to 0\n"); }

1 0

Józef Kucia : d3dx9/tests: Add tests for DDS header handling.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: cbb9002aa65a2e923015d8073d2d07b9585d97c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb9002aa65a2e923015d8073… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jun 1 18:04:48 2012 +0200 d3dx9/tests: Add tests for DDS header handling. --- dlls/d3dx9_36/tests/surface.c | 189 +++++++++++++++++++++++++++++++++-------- 1 files changed, 154 insertions(+), 35 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 78ec0ca..3b8ed6e 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#include <assert.h> #include "wine/test.h" #include "d3dx9tex.h" #include "resources.h" @@ -138,13 +139,18 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons return D3DERR_INVALIDCALL; } +/* dds_header.flags */ #define DDS_CAPS 0x00000001 #define DDS_HEIGHT 0x00000002 #define DDS_WIDTH 0x00000004 +#define DDS_PITCH 0x00000008 #define DDS_PIXELFORMAT 0x00001000 +#define DDS_LINEARSIZE 0x00080000 +/* dds_header.caps */ #define DDS_CAPS_TEXTURE 0x00001000 +/* dds_pixel_format.flags */ #define DDS_PF_ALPHA 0x00000001 #define DDS_PF_ALPHA_ONLY 0x00000002 #define DDS_PF_FOURCC 0x00000004 @@ -152,6 +158,57 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_PF_LUMINANCE 0x00020000 #define DDS_PF_BUMPDUDV 0x00080000 +struct dds_pixel_format +{ + DWORD size; + DWORD flags; + DWORD fourcc; + DWORD bpp; + DWORD rmask; + DWORD gmask; + DWORD bmask; + DWORD amask; +}; + +struct dds_header +{ + DWORD magic; + DWORD size; + DWORD flags; + DWORD height; + DWORD width; + DWORD pitch_or_linear_size; + DWORD depth; + DWORD miplevels; + DWORD reserved[11]; + struct dds_pixel_format pixel_format; + DWORD caps; + DWORD caps2; + DWORD reserved2[3]; +}; + +/* fills dds_header with reasonable default values */ +static void fill_dds_header(struct dds_header *header) +{ + memset(header, 0, sizeof(*header)); + + header->magic = MAKEFOURCC('D','D','S',' '); + header->size = sizeof(*header); + header->flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; + header->height = 4; + header->width = 4; + header->pixel_format.size = sizeof(header->pixel_format); + /* X8R8G8B8 */ + header->pixel_format.flags = DDS_PF_RGB; + header->pixel_format.fourcc = 0; + header->pixel_format.bpp = 32; + header->pixel_format.rmask = 0xff0000; + header->pixel_format.gmask = 0x00ff00; + header->pixel_format.bmask = 0x0000ff; + header->pixel_format.amask = 0; + header->caps = DDS_CAPS_TEXTURE; +} + static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, D3DFORMAT expected_format) @@ -160,44 +217,19 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, D3DXIMAGE_INFO info; struct { - DWORD magic; - DWORD size; - DWORD flags; - DWORD height; - DWORD width; - DWORD padding[14]; - struct - { - DWORD size; - DWORD flags; - DWORD fourcc; - DWORD bpp; - DWORD rmask; - DWORD gmask; - DWORD bmask; - DWORD amask; - } pixel_format; - DWORD caps; - DWORD padding2[4]; + struct dds_header header; BYTE data[256]; } dds; - memset(&dds, 0, sizeof(dds)); - - dds.magic = MAKEFOURCC('D','D','S',' '); - dds.size = 124; - dds.flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; - dds.height = 4; - dds.width = 4; - dds.pixel_format.size = sizeof(dds.pixel_format); - dds.pixel_format.flags = flags; - dds.pixel_format.fourcc = fourcc; - dds.pixel_format.bpp = bpp; - dds.pixel_format.rmask = rmask; - dds.pixel_format.gmask = gmask; - dds.pixel_format.bmask = bmask; - dds.pixel_format.amask = amask; - dds.caps = DDS_CAPS_TEXTURE; + fill_dds_header(&dds.header); + dds.header.pixel_format.flags = flags; + dds.header.pixel_format.fourcc = fourcc; + dds.header.pixel_format.bpp = bpp; + dds.header.pixel_format.rmask = rmask; + dds.header.pixel_format.gmask = gmask; + dds.header.pixel_format.bmask = bmask; + dds.header.pixel_format.amask = amask; + memset(dds.data, 0, sizeof(dds.data)); hr = D3DXGetImageInfoFromFileInMemory(&dds, sizeof(dds), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", hr, expected_format, D3D_OK); @@ -205,6 +237,91 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, ok(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n", info.Format, expected_format); } +static void test_dds_header_handling(void) +{ + int i; + HRESULT hr; + D3DXIMAGE_INFO info; + struct + { + struct dds_header header; + BYTE data[256]; + } dds; + + struct + { + struct dds_pixel_format pixel_format; + DWORD flags; + DWORD width; + DWORD height; + DWORD pitch; + DWORD pixel_data_size; + HRESULT expected_result; + } tests[] = { + /* pitch is ignored */ + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, 0, 4, 4, 0, + 63 /* pixel data size */, D3DXERR_INVALIDDATA }, + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, 0 /* pitch */, + 64, D3D_OK }, + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, 1 /* pitch */, + 64, D3D_OK }, + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, 2 /* pitch */, + 64, D3D_OK }, + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, 3 /* pitch */, + 64, D3D_OK }, + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, 4 /* pitch */, + 64, D3D_OK }, + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, 16 /* pitch */, + 64, D3D_OK }, + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, 1024 /* pitch */, + 64, D3D_OK }, + { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, -1 /* pitch */, + 64, D3D_OK }, + /* linear size is ignored */ + { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, 0, 4, 4, 0, + 7 /* pixel data size */, D3DXERR_INVALIDDATA }, + { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 0 /* linear size */, + 8, D3D_OK }, + { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 1 /* linear size */, + 8, D3D_OK }, + { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 2 /* linear size */, + 8, D3D_OK }, + { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 9 /* linear size */, + 8, D3D_OK }, + { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 16 /* linear size */, + 8, D3D_OK }, + { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, -1 /* linear size */, + 8, D3D_OK }, + /* integer overflows */ + { { 32, DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0 }, 0, 0x80000000, 0x80000000 /* 0x80000000 * 0x80000000 * 4 = 0 */, 0, + 64, D3D_OK }, + { { 32, DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0 }, 0, 0x8000100, 0x800100 /* 0x8000100 * 0x800100 * 4 = 262144 */, 0, + 64, D3DXERR_INVALIDDATA }, + { { 32, DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0 }, 0, 0x80000001, 0x80000001 /* 0x80000001 * 0x80000001 * 4 = 4 */, 0, + 4, D3D_OK }, + { { 32, DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0 }, 0, 0x80000001, 0x80000001 /* 0x80000001 * 0x80000001 * 4 = 4 */, 0, + 3 /* pixel data size */, D3DXERR_INVALIDDATA } + }; + + memset(&dds, 0, sizeof(dds)); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + DWORD file_size = sizeof(dds.header) + tests[i].pixel_data_size; + assert(file_size <= sizeof(dds)); + + fill_dds_header(&dds.header); + dds.header.flags |= tests[i].flags; + dds.header.width = tests[i].width; + dds.header.height = tests[i].height; + dds.header.pitch_or_linear_size = tests[i].pitch; + memcpy(&dds.header.pixel_format, &tests[i].pixel_format, sizeof(struct dds_pixel_format)); + + hr = D3DXGetImageInfoFromFileInMemory(&dds, file_size, &info); + ok(hr == tests[i].expected_result, "%d: D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", i, hr, tests[i].expected_result); + } +} + static void test_D3DXGetImageInfo(void) { HRESULT hr; @@ -404,6 +521,8 @@ static void test_D3DXGetImageInfo(void) check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0, 0, D3DFMT_V8U8); check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_V16U16); + test_dds_header_handling(); + hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);

1 0

Daniel Jelinski : regedit: Make key names editable also with native comctl32.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 14d4702c1b1062466674e1dbe9a9c34ffc1b7b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d4702c1b1062466674e1dbe… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jun 2 07:13:28 2012 +0200 regedit: Make key names editable also with native comctl32. --- programs/regedit/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 2257fdd..7c5e76d 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -681,7 +681,7 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, TreeView, - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, ULongToHandle(id), hInst, NULL); SendMessageW(hwndTV, TVM_SETUNICODEFORMAT, TRUE, 0);

1 0

Daniel Jelinski : regedit: Adding new subkey to a key with no subkeys now works with native comctl32.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1565def7b9ae5feacfd93de4d2456ecc39eb705c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1565def7b9ae5feacfd93de4d… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jun 2 08:46:40 2012 +0200 regedit: Adding new subkey to a key with no subkeys now works with native comctl32. --- programs/regedit/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 7c5e76d..97a0bf2 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -483,7 +483,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) if (!hItem) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); if (!hItem) return FALSE; - if (SendMessageW(hwndTV, TVM_GETITEMSTATE, (WPARAM)hItem, TVIS_EXPANDEDONCE)) { + if (SendMessageW(hwndTV, TVM_GETITEMSTATE, (WPARAM)hItem, TVIS_EXPANDEDONCE) & TVIS_EXPANDEDONCE) { hNewItem = AddEntryToTree(hwndTV, hItem, name, 0, 0); } else { item.mask = TVIF_CHILDREN | TVIF_HANDLE;

1 0

Dmitry Timoshkov : gdi32: Fix parameters of some GDI stock fonts.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: cca41207c161250d709ae3f8e0b002ac5c794de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca41207c161250d709ae3f8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 4 12:05:25 2012 +0900 gdi32: Fix parameters of some GDI stock fonts. --- dlls/gdi32/gdiobj.c | 140 +++++++++++++++++++++++----------------------- dlls/gdi32/tests/font.c | 81 +++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cca41207c161250d709ae…

1 0

Francois Gouget : wineqtdecoder: Fix the spelling of a QTSplitter_loading_thread() variable.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 457f7228697cf7a27d2866300012ddec5d3c3847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457f7228697cf7a27d2866300… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 2 10:35:29 2012 +0200 wineqtdecoder: Fix the spelling of a QTSplitter_loading_thread() variable. --- dlls/wineqtdecoder/qtdatahandler.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index f09014c..be003c3 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -443,12 +443,12 @@ static pascal ComponentResult myDataHGetFileSizeAsync ( DataHandler dh, wide *fi Handle storage = GetComponentInstanceStorage(dh); DHData *data = (DHData*)*storage; LONGLONG total; - LONGLONG avaliable; + LONGLONG available; SInt64 total64; TRACE("%p\n",dh); - IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + IAsyncReader_Length(data->dataRef.pReader,&total,&available); total64 = total; *fileSize = SInt64ToWide(total64);

1 0

Francois Gouget : msvcp90: Add a trailing '\n' to a TRACE() message.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: fd84b7d0af2da4adce98b48f2c5349a3bab37004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd84b7d0af2da4adce98b48f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 2 10:35:35 2012 +0200 msvcp90: Add a trailing '\n' to a TRACE() message. --- dlls/msvcp90/ios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a436abf..c903acf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2418,7 +2418,7 @@ void __thiscall basic_ios_char_dtor(basic_ios_char *this) DEFINE_THISCALL_WRAPPER(MSVCP_basic_ios_char_vector_dtor, 8) basic_ios_char* __thiscall MSVCP_basic_ios_char_vector_dtor(basic_ios_char *this, unsigned int flags) { - TRACE("(%p %x)", this, flags); + TRACE("(%p %x)\n", this, flags); if(flags & 2) { /* we have an array, with the number of elements stored before the first object */ int i, *ptr = (int *)this-1;

1 0