May 2011 - Wine-Commits - list.winehq.org

Aric Stewart : usp10/test: Add Thaana shaping test.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 42274ed8ab5c3c7a4d8fdc808e6e83199d51f3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42274ed8ab5c3c7a4d8fdc808… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:23 2011 -0500 usp10/test: Add Thaana shaping test. --- dlls/usp10/tests/usp10.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d086b19..33469d5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -585,6 +585,24 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Thaana */ + static const WCHAR test_thaana[] = {0x078a, 0x07ae, 0x0792, 0x07b0, 0x0020, 0x0796, 0x07aa, 0x0789, 0x07b0, 0x0795, 0x07ac, 0x0791, 0x07b0}; + static const shapeTest_char thaana_c[] = {{12,{0,0}},{12,{0,0}},{10,{0,0}},{10,{0,0}},{8,{1,0}},{7,{0,0}},{7,{0,0}},{5,{0,0}},{5,{0,0}},{3,{0,0}},{3,{0,0}},{1,{0,0}},{1,{0,0}}}; + static const shapeTest_glyph thaana_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -649,6 +667,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "MV Boli", 72, test_thaana[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_thaana, 13, &Control, &State, 0, 13, thaana_c, thaana_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Syriac shaping test.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 2d8955429c152a6df26ca6731f9880fc32222f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8955429c152a6df26ca6731… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:18 2011 -0500 usp10/tests: Add Syriac shaping test. --- dlls/usp10/tests/usp10.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 9efe463..d086b19 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -574,6 +574,17 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}}; + /* Syriac */ + static const WCHAR test_syriac[] = {0x0710, 0x0710, 0x0710, 0x0728, 0x0718, 0x0723,0}; + static const shapeTest_char syriac_c[] = {{5,{0,0}},{4,{0,0}},{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const shapeTest_glyph syriac_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -630,6 +641,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Estrangelo Edessa", 71, test_syriac[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_syriac, 6, &Control, &State, 0, 6, syriac_c, syriac_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10: Add Thai shaping test.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: ee450d5041ef63feee18b7bc697c5929d90952f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee450d5041ef63feee18b7bc6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:12 2011 -0500 usp10: Add Thai shaping test. --- dlls/usp10/tests/usp10.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ccc2630..9efe463 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -559,6 +559,21 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_ARABIC_NORMAL,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_ARABIC_SEEN,1,0,0,0,0},0}} }; + /* Thai */ + static const WCHAR test_thai[] = {0x0e2a, 0x0e04, 0x0e23, 0x0e34, 0x0e1b, 0x0e15, 0x0e4c, 0x0e44, 0x0e17, 0x0e22,}; + static const shapeTest_char thai_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{2,{0,0}},{4,{0,0}},{5,{0,0}},{5,{0,0}},{7,{0,0}},{8,{0,0}},{9,{0,0}}}; + static const shapeTest_glyph thai_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,0,1,1,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}}; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -607,6 +622,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 24, test_thai[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_thai, 10, &Control, &State, 0, 10, thai_c, thai_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10: Add Hebrew shaping test.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 670f27104a89972bc4df901e1d2cfaebb8c5c318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670f27104a89972bc4df901e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:00 2011 -0500 usp10: Add Hebrew shaping test. --- dlls/usp10/tests/usp10.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index adc63bb..faa457c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -542,6 +542,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {0,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + /* Hebrew */ + static const WCHAR test_hebrew[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd,0}; + static const shapeTest_char hebrew_c[] = {{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const shapeTest_glyph hebrew_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { @@ -575,6 +583,13 @@ static void test_ScriptShapeOpenType(HDC hdc) test_shape_ok(hdc, test1, 4, &Control, &State, 0, 4, t1_c, t1_g); test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, t2_g); + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 11, test_hebrew[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_hebrew, 4, &Control, &State, 0, 4, hebrew_c, hebrew_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10: Add Arabic shaping test.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 0d324b1fab33d04d26f2a0329821e9e32b0bae79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d324b1fab33d04d26f2a0329… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:43:06 2011 -0500 usp10: Add Arabic shaping test. --- dlls/usp10/tests/usp10.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index faa457c..ccc2630 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -551,6 +551,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + /* Arabic */ + static const WCHAR test_arabic[] = {0x0633,0x0644,0x0627,0x0645,0}; + static const shapeTest_char arabic_c[] = {{2,{0,0}},{1,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const shapeTest_glyph arabic_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_ARABIC_NORMAL,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_ARABIC_SEEN,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -583,6 +591,7 @@ static void test_ScriptShapeOpenType(HDC hdc) test_shape_ok(hdc, test1, 4, &Control, &State, 0, 4, t1_c, t1_g); test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, t2_g); + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 11, test_hebrew[0], &hfont, &hfont_orig); if (hfont != NULL) { @@ -590,6 +599,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 13, test_arabic[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_arabic, 4, &Control, &State, 0, 3, arabic_c, arabic_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Update test_ScriptShapeOpenType framework to shape in a given font.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 50a1ed1b94a6d6dcc446b5e2f09150ce0289c468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a1ed1b94a6d6dcc446b5e2f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 09:41:59 2011 -0500 usp10/tests: Update test_ScriptShapeOpenType framework to shape in a given font. --- dlls/usp10/tests/usp10.c | 182 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 165 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50a1ed1b94a6d6dcc446b…

1 0

Dan Kegel : cmd: del /a: move parsing of attributes to helper function, use bitmasks.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 65b27c9ecd2c80aa91fa0c5425ddfb2f9f2cb37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b27c9ecd2c80aa91fa0c542… Author: Dan Kegel <dank(a)kegel.com> Date: Sun May 22 07:59:22 2011 -0700 cmd: del /a: move parsing of attributes to helper function, use bitmasks. --- programs/cmd/builtins.c | 111 +++++++++++++++++++++++------------------------ 1 files changed, 54 insertions(+), 57 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 944a997..7a6ae72 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -532,6 +532,53 @@ void WCMD_create_dir (void) { if (!create_full_path(param1)) WCMD_print_error (); } +/* Parse the /A options given by the user on the commandline + * into a bitmask of wanted attributes (*wantSet), + * and a bitmask of unwanted attributes (*wantClear). + */ +static void WCMD_delete_parse_attributes(DWORD *wantSet, DWORD *wantClear) { + static const WCHAR parmA[] = {'/','A','\0'}; + WCHAR *p; + + /* both are strictly 'out' parameters */ + *wantSet=0; + *wantClear=0; + + /* For each /A argument */ + for (p=strstrW(quals, parmA); p != NULL; p=strstrW(p, parmA)) { + /* Skip /A itself */ + p += 2; + + /* Skip optional : */ + if (*p == ':') p++; + + /* For each of the attribute specifier chars to this /A option */ + for (; *p != 0 && *p != '/'; p++) { + BOOL negate = FALSE; + DWORD mask = 0; + + if (*p == '-') { + negate=TRUE; + p++; + } + + /* Convert the attribute specifier to a bit in one of the masks */ + switch (*p) { + case 'R': mask = FILE_ATTRIBUTE_READONLY; break; + case 'H': mask = FILE_ATTRIBUTE_HIDDEN; break; + case 'S': mask = FILE_ATTRIBUTE_SYSTEM; break; + case 'A': mask = FILE_ATTRIBUTE_ARCHIVE; break; + default: + WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + } + if (negate) + *wantClear |= mask; + else + *wantSet |= mask; + } + } +} + /**************************************************************************** * WCMD_delete * @@ -551,11 +598,14 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { int argsProcessed = 0; WCHAR *argN = command; BOOL foundAny = FALSE; - static const WCHAR parmA[] = {'/','A','\0'}; static const WCHAR parmQ[] = {'/','Q','\0'}; static const WCHAR parmP[] = {'/','P','\0'}; static const WCHAR parmS[] = {'/','S','\0'}; static const WCHAR parmF[] = {'/','F','\0'}; + DWORD wanted_attrs; + DWORD unwanted_attrs; + + WCMD_delete_parse_attributes(&wanted_attrs, &unwanted_attrs); /* If not recursing, clear error flag */ if (expectDir) errorlevel = 0; @@ -644,64 +694,11 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { } else strcpyW (fpath, fd.cFileName); if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - BOOL ok = TRUE; - WCHAR *nextA = strstrW (quals, parmA); + BOOL ok; /* Handle attribute matching (/A) */ - if (nextA != NULL) { - ok = FALSE; - while (nextA != NULL && !ok) { - - WCHAR *thisA = (nextA+2); - BOOL stillOK = TRUE; - - /* Skip optional : */ - if (*thisA == ':') thisA++; - - /* Parse each of the /A[:]xxx in turn */ - while (*thisA && *thisA != '/') { - BOOL negate = FALSE; - BOOL attribute = FALSE; - - /* Match negation of attribute first */ - if (*thisA == '-') { - negate=TRUE; - thisA++; - } - - /* Match attribute */ - switch (*thisA) { - case 'R': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY); - break; - case 'H': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN); - break; - case 'S': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM); - break; - case 'A': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE); - break; - default: - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); - } - - /* Now check result, keeping a running boolean about whether it - matches all parsed attributes so far */ - if (attribute && !negate) { - stillOK = stillOK; - } else if (!attribute && negate) { - stillOK = stillOK; - } else { - stillOK = FALSE; - } - thisA++; - } - - /* Save the running total as the final result */ - ok = stillOK; - - /* Step on to next /A set */ - nextA = strstrW (nextA+1, parmA); - } - } + ok = ((fd.dwFileAttributes & wanted_attrs) == wanted_attrs) + && ((fd.dwFileAttributes & unwanted_attrs) == 0); /* /P means prompt for each file */ if (ok && strstrW (quals, parmP) != NULL) {

1 0

Stefan Dösinger : d3d9: Drop the fixed function varying test.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: e7c55939c4234f793dcfe52d34896a6cd2a2545c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c55939c4234f793dcfe52d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 18:18:54 2011 +0200 d3d9: Drop the fixed function varying test. Windows drivers return different values, some don't even draw. I don't know any app that depends on this. --- dlls/d3d9/tests/visual.c | 74 ++-------------------------------------------- 1 files changed, 3 insertions(+), 71 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e5c8745..5a2286d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5593,7 +5593,7 @@ struct hugeVertex DWORD diffuse, specular; }; -static void fixed_function_varying_test(IDirect3DDevice9 *device) { +static void pretransformed_varying_test(IDirect3DDevice9 *device) { /* dcl_position: fails to compile */ const DWORD blendweight_code[] = { 0xffff0300, /* ps_3_0 */ @@ -5675,20 +5675,6 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { }; /* Declare a monster vertex type :-) */ static const D3DVERTEXELEMENT9 decl_elements[] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 16, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, - {0, 32, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDINDICES, 0}, - {0, 48, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, - {0, 64, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_FOG, 0}, - {0, 80, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - {0, 96, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TANGENT, 0}, - {0, 112, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BINORMAL, 0}, - {0, 128, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_DEPTH, 0}, - {0, 144, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, - {0, 148, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 1}, - D3DDECL_END() - }; - static const D3DVERTEXELEMENT9 decl_elements2[] = { {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITIONT, 0}, {0, 16, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, {0, 32, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDINDICES, 0}, @@ -5758,11 +5744,9 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { }; struct hugeVertex data2[4]; IDirect3DVertexDeclaration9 *decl; - IDirect3DVertexDeclaration9 *decl2; HRESULT hr; unsigned int i; DWORD color, r, g, b, r_e, g_e, b_e; - BOOL drawok; memcpy(data2, data, sizeof(data2)); data2[0].pos_x = 0; data2[0].pos_y = 0; @@ -5772,8 +5756,6 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements2, &decl2); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); @@ -5784,56 +5766,7 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { tests[i].name, hr); } - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) - { - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); - - IDirect3DDevice9_SetPixelShader(device, tests[i].shader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - drawok = FALSE; - if(SUCCEEDED(hr)) - { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, data, sizeof(data[0])); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "DrawPrimitiveUP failed (%08x)\n", hr); - drawok = SUCCEEDED(hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } - - /* Some drivers reject the combination of ps_3_0 and fixed function vertex processing. Accept - * the failure and do not check the color if it failed - */ - if(!drawok) { - continue; - } - - color = getPixelColor(device, 360, 240); - r = color & 0x00ff0000 >> 16; - g = color & 0x0000ff00 >> 8; - b = color & 0x000000ff; - r_e = tests[i].color & 0x00ff0000 >> 16; - g_e = tests[i].color & 0x0000ff00 >> 8; - b_e = tests[i].color & 0x000000ff; - - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - - if(tests[i].todo) { - todo_wine ok(abs(r - r_e) <= 1 && abs(g - g_e) <= 1 && abs(b - b_e) <= 1, - "Test %s returned color 0x%08x, expected 0x%08x(todo)\n", - tests[i].name, color, tests[i].color); - } else { - ok(abs(r - r_e) <= 1 && abs(g - g_e) <= 1 && abs(b - b_e) <= 1, - "Test %s returned color 0x%08x, expected 0x%08x\n", - tests[i].name, color, tests[i].color); - } - } - - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl2); + hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { @@ -5883,7 +5816,6 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { IDirect3DPixelShader9_Release(tests[i].shader); } - IDirect3DVertexDeclaration9_Release(decl2); IDirect3DVertexDeclaration9_Release(decl); } @@ -12175,7 +12107,7 @@ START_TEST(visual) dp2add_ps_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { nested_loop_test(device_ptr); - fixed_function_varying_test(device_ptr); + pretransformed_varying_test(device_ptr); vFace_register_test(device_ptr); vpos_register_test(device_ptr); multiple_rendertargets_test(device_ptr);

1 0

Francois Gouget : include: Add some __RPC_XXX macros to help compile code using midl-generated headers .
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 96f33b94bdf61b20e78f99529689e8d6fa66a749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f33b94bdf61b20e78f99529… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 24 13:10:09 2011 +0200 include: Add some __RPC_XXX macros to help compile code using midl-generated headers. --- include/Makefile.in | 1 + include/rpcndr.h | 1 + include/rpcsal.h | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 9a11ff1..1db5e81 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -447,6 +447,7 @@ SRCDIR_INCLUDES = \ rpcndr.h \ rpcnterr.h \ rpcproxy.h \ + rpcsal.h \ rstbas.idl \ rstinf.idl \ rstloc.idl \ diff --git a/include/rpcndr.h b/include/rpcndr.h index cd93d8e..1754f5e 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -24,6 +24,7 @@ #define __WINE_RPCNDR_H #include <basetsd.h> +#include <rpcsal.h> #ifdef __cplusplus extern "C" { diff --git a/include/rpcsal.h b/include/rpcsal.h new file mode 100644 index 0000000..ffa114a --- /dev/null +++ b/include/rpcsal.h @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2011 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#ifndef __RPCSAL_H_VERSION__ +# define __RPCSAL_H_VERSION__ 100 +#endif + +#define __RPC__deref_in +#define __RPC__deref_in_opt +#define __RPC__deref_in_string +#define __RPC__deref_in_opt_string +#define __RPC__deref_in_ecount(size) +#define __RPC__deref_in_ecount_opt(size) +#define __RPC__deref_in_ecount_opt_string(size) +#define __RPC__deref_in_ecount_full(size) +#define __RPC__deref_in_ecount_full_opt(size) +#define __RPC__deref_in_ecount_full_string(size) +#define __RPC__deref_in_ecount_full_opt_string(size) +#define __RPC__deref_in_ecount_part(size, length) +#define __RPC__deref_in_ecount_part_opt(size, length) +#define __RPC__deref_in_xcount(size) +#define __RPC__deref_in_xcount_opt(size) +#define __RPC__deref_in_xcount_opt_string(size) +#define __RPC__deref_in_xcount_full(size) +#define __RPC__deref_in_xcount_full_opt(size) +#define __RPC__deref_in_xcount_full_string(size) +#define __RPC__deref_in_xcount_full_opt_string(size) +#define __RPC__deref_in_xcount_part(size, length) +#define __RPC__deref_in_xcount_part_opt(size, length) + +#define __RPC__deref_inout +#define __RPC__deref_inout_opt +#define __RPC__deref_inout_string +#define __RPC__deref_inout_opt_string +#define __RPC__deref_inout_ecount_opt(size) +#define __RPC__deref_inout_ecount_full(size) +#define __RPC__deref_inout_ecount_full_opt(size) +#define __RPC__deref_inout_ecount_full_string(size) +#define __RPC__deref_inout_ecount_full_opt_string(size) +#define __RPC__deref_inout_ecount_part_opt(size, length) +#define __RPC__deref_inout_xcount_opt(size) +#define __RPC__deref_inout_xcount_full(size) +#define __RPC__deref_inout_xcount_full_opt(size) +#define __RPC__deref_inout_xcount_full_string(size) +#define __RPC__deref_inout_xcount_full_opt_string(size) +#define __RPC__deref_inout_xcount_part_opt(size, length) + +#define __RPC__deref_out +#define __RPC__deref_out_opt +#define __RPC__deref_out_string +#define __RPC__deref_out_opt_string +#define __RPC__deref_out_ecount(size) +#define __RPC__deref_out_ecount_opt(size) +#define __RPC__deref_out_ecount_full(size) +#define __RPC__deref_out_ecount_full_opt(size) +#define __RPC__deref_out_ecount_full_string(size) +#define __RPC__deref_out_ecount_full_opt_string(size) +#define __RPC__deref_out_ecount_part(size, length) +#define __RPC__deref_out_ecount_part_opt(size, length) +#define __RPC__deref_out_xcount(size) +#define __RPC__deref_out_xcount_opt(size) +#define __RPC__deref_out_xcount_full(size) +#define __RPC__deref_out_xcount_full_opt(size) +#define __RPC__deref_out_xcount_full_string(size) +#define __RPC__deref_out_xcount_full_opt_string(size) +#define __RPC__deref_out_xcount_part(size, length) +#define __RPC__deref_out_xcount_part_opt(size, length) + +#define __RPC__deref_opt_in +#define __RPC__deref_opt_in_opt +#define __RPC__deref_opt_in_string +#define __RPC__deref_opt_in_opt_string + +#define __RPC__deref_opt_inout +#define __RPC__deref_opt_inout_opt +#define __RPC__deref_opt_inout_string +#define __RPC__deref_opt_inout_opt_string +#define __RPC__deref_opt_inout_ecount(size) +#define __RPC__deref_opt_inout_ecount_opt(size) +#define __RPC__deref_opt_inout_ecount_full(size) +#define __RPC__deref_opt_inout_ecount_full_opt(size) +#define __RPC__deref_opt_inout_ecount_full_string(size) +#define __RPC__deref_opt_inout_ecount_full_opt_string(size) +#define __RPC__deref_opt_inout_ecount_part(size, length) +#define __RPC__deref_opt_inout_ecount_part_opt(size, length) +#define __RPC__deref_opt_inout_xcount(size) +#define __RPC__deref_opt_inout_xcount_opt(size) +#define __RPC__deref_opt_inout_xcount_full(size) +#define __RPC__deref_opt_inout_xcount_full_opt(size) +#define __RPC__deref_opt_inout_xcount_full_string(size) +#define __RPC__deref_opt_inout_xcount_full_opt_string(size) +#define __RPC__deref_opt_inout_xcount_part(size, length) +#define __RPC__deref_opt_inout_xcount_part_opt(size, length) + +#define __RPC__in +#define __RPC__in_opt +#define __RPC__in_string +#define __RPC__in_opt_string +#define __RPC__in_ecount(size) +#define __RPC__in_ecount_opt(size) +#define __RPC__in_ecount_full(size) +#define __RPC__in_ecount_full_opt(size) +#define __RPC__in_ecount_full_string(size) +#define __RPC__in_ecount_full_opt_string(size) +#define __RPC__in_ecount_part(size, length) +#define __RPC__in_ecount_part_opt(size, length) +#define __RPC__in_xcount(size) +#define __RPC__in_xcount_opt(size) +#define __RPC__in_xcount_full(size) +#define __RPC__in_xcount_full_opt(size) +#define __RPC__in_xcount_full_string(size) +#define __RPC__in_xcount_full_opt_string(size) +#define __RPC__in_xcount_part(size, length) +#define __RPC__in_xcount_part_opt(size, length) + +#define __RPC__inout +#define __RPC__inout_opt +#define __RPC__inout_string +#define __RPC__inout_opt_string +#define __RPC__opt_inout +#define __RPC__inout_ecount(size) +#define __RPC__inout_ecount_opt(size) +#define __RPC__inout_ecount_full(size) +#define __RPC__inout_ecount_full_opt(size) +#define __RPC__inout_ecount_full_string(size) +#define __RPC__inout_ecount_full_opt_string(size) +#define __RPC__inout_ecount_part(size, length) +#define __RPC__inout_ecount_part_opt(size, length) +#define __RPC__inout_xcount(size) +#define __RPC__inout_xcount_opt(size) +#define __RPC__inout_xcount_full(size) +#define __RPC__inout_xcount_full_opt(size) +#define __RPC__inout_xcount_full_string(size) +#define __RPC__inout_xcount_full_opt_string(size) +#define __RPC__inout_xcount_part(size, length) +#define __RPC__inout_xcount_part_opt(size, length) + +#define __RPC__out +#define __RPC__out_ecount(size) +#define __RPC__out_ecount_full(size) +#define __RPC__out_ecount_full_string(size) +#define __RPC__out_ecount_part(size, length) +#define __RPC__out_xcount(size) +#define __RPC__out_xcount_full(size) +#define __RPC__out_xcount_full_string(size) +#define __RPC__out_xcount_part(size, length) + +#define __RPC_full_pointer +#define __RPC_ref_pointer +#define __RPC_string +#define __RPC_unique_pointer

1 0

Francois Gouget : include: Add a set of parameter documentation macros to help compile windows applications .
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 37978baa4a61f0339caadd739712e230f2a861b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37978baa4a61f0339caadd739… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 24 13:09:59 2011 +0200 include: Add a set of parameter documentation macros to help compile windows applications. --- include/dbghelp.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/imagehlp.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 0 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 34805f4..483ef29 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -21,6 +21,66 @@ #ifndef __WINE_DBGHELP_H #define __WINE_DBGHELP_H +/* A set of documentation macros (see also imagehlp.h) */ +#ifndef __deref_out +# define __deref_out +#endif +#ifndef __deref_out_opt +# define __deref_out_opt +#endif +#ifndef __deref_opt_out +# define __deref_opt_out +#endif +#ifndef __in +# define __in +#endif +#ifndef __in_opt +# define __in_opt +#endif +#ifndef __in_bcount +# define __in_bcount(x) +#endif +#ifndef __in_bcount_opt +# define __in_bcount_opt(x) +#endif +#ifndef __in_ecount +# define __in_ecount(x) +#endif +#ifndef __inout +# define __inout +#endif +#ifndef __inout_opt +# define __inout_opt +#endif +#ifndef __inout_bcount +# define __inout_bcount(x) +#endif +#ifndef __inout_ecount +# define __inout_ecount(x) +#endif +#ifndef __out +# define __out +#endif +#ifndef __out_opt +# define __out_opt +#endif +#ifndef __out_bcount +# define __out_bcount(x) +#endif +#ifndef __out_bcount_opt +# define __out_bcount_opt(x) +#endif +#ifndef __out_ecount +# define __out_ecount(x) +#endif +#ifndef __out_ecount_opt +# define __out_ecount_opt(x) +#endif +#ifndef __out_xcount +# define __out_xcount(x) +#endif + + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ diff --git a/include/imagehlp.h b/include/imagehlp.h index f72f1ce..8c8250d 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -23,6 +23,66 @@ #include <wintrust.h> +/* A set of documentation macros (see also dbghelp.h) */ +#ifndef __deref_out +# define __deref_out +#endif +#ifndef __deref_out_opt +# define __deref_out_opt +#endif +#ifndef __deref_opt_out +# define __deref_opt_out +#endif +#ifndef __in +# define __in +#endif +#ifndef __in_opt +# define __in_opt +#endif +#ifndef __in_bcount +# define __in_bcount(x) +#endif +#ifndef __in_bcount_opt +# define __in_bcount_opt(x) +#endif +#ifndef __in_ecount +# define __in_ecount(x) +#endif +#ifndef __inout +# define __inout +#endif +#ifndef __inout_opt +# define __inout_opt +#endif +#ifndef __inout_bcount +# define __inout_bcount(x) +#endif +#ifndef __inout_ecount +# define __inout_ecount(x) +#endif +#ifndef __out +# define __out +#endif +#ifndef __out_opt +# define __out_opt +#endif +#ifndef __out_bcount +# define __out_bcount(x) +#endif +#ifndef __out_bcount_opt +# define __out_bcount_opt(x) +#endif +#ifndef __out_ecount +# define __out_ecount(x) +#endif +#ifndef __out_ecount_opt +# define __out_ecount_opt(x) +#endif +#ifndef __out_xcount +# define __out_xcount(x) +#endif + + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */

1 0