August 2010 - Wine-Commits - list.winehq.org

Damjan Jovanovic : winemenubuilder: Move utility functions to the top of the file.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 5f87fa5370ac637d308863e515a80a5213eb93d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f87fa5370ac637d308863e51… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Aug 24 15:03:13 2010 +0200 winemenubuilder: Move utility functions to the top of the file. --- programs/winemenubuilder/winemenubuilder.c | 255 ++++++++++++++-------------- 1 files changed, 128 insertions(+), 127 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8941cbf..6136701 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -171,6 +171,134 @@ static char *xdg_desktop_dir; static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream); +/* Utility routines */ +static unsigned short crc16(const char* string) +{ + unsigned short crc = 0; + int i, j, xor_poly; + + for (i = 0; string[i] != 0; i++) + { + char c = string[i]; + for (j = 0; j < 8; c >>= 1, j++) + { + xor_poly = (c ^ crc) & 1; + crc >>= 1; + if (xor_poly) + crc ^= 0xa001; + } + } + return crc; +} + +static char *strdupA( const char *str ) +{ + char *ret; + + if (!str) return NULL; + if ((ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ))) strcpy( ret, str ); + return ret; +} + +static char* heap_printf(const char *format, ...) +{ + va_list args; + int size = 4096; + char *buffer, *ret; + int n; + + va_start(args, format); + while (1) + { + buffer = HeapAlloc(GetProcessHeap(), 0, size); + if (buffer == NULL) + break; + n = vsnprintf(buffer, size, format, args); + if (n == -1) + size *= 2; + else if (n >= size) + size = n + 1; + else + break; + HeapFree(GetProcessHeap(), 0, buffer); + } + va_end(args); + if (!buffer) return NULL; + ret = HeapReAlloc(GetProcessHeap(), 0, buffer, strlen(buffer) + 1 ); + if (!ret) ret = buffer; + return ret; +} + +static void write_xml_text(FILE *file, const char *text) +{ + int i; + for (i = 0; text[i]; i++) + { + if (text[i] == '&') + fputs("&", file); + else if (text[i] == '<') + fputs("<", file); + else if (text[i] == '>') + fputs(">", file); + else if (text[i] == '\'') + fputs("'", file); + else if (text[i] == '"') + fputs(""", file); + else + fputc(text[i], file); + } +} + +static BOOL create_directories(char *directory) +{ + BOOL ret = TRUE; + int i; + + for (i = 0; directory[i]; i++) + { + if (i > 0 && directory[i] == '/') + { + directory[i] = 0; + mkdir(directory, 0777); + directory[i] = '/'; + } + } + if (mkdir(directory, 0777) && errno != EEXIST) + ret = FALSE; + + return ret; +} + +static char* wchars_to_utf8_chars(LPCWSTR string) +{ + char *ret; + INT size = WideCharToMultiByte(CP_UTF8, 0, string, -1, NULL, 0, NULL, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, size); + if (ret) + WideCharToMultiByte(CP_UTF8, 0, string, -1, ret, size, NULL, NULL); + return ret; +} + +static char* wchars_to_unix_chars(LPCWSTR string) +{ + char *ret; + INT size = WideCharToMultiByte(CP_UNIXCP, 0, string, -1, NULL, 0, NULL, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, size); + if (ret) + WideCharToMultiByte(CP_UNIXCP, 0, string, -1, ret, size, NULL, NULL); + return ret; +} + +static WCHAR* utf8_chars_to_wchars(LPCSTR string) +{ + WCHAR *ret; + INT size = MultiByteToWideChar(CP_UTF8, 0, string, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_UTF8, 0, string, -1, ret, size); + return ret; +} + /* Icon extraction routines * * FIXME: should use PrivateExtractIcons and friends @@ -629,133 +757,6 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt return hr; } -static unsigned short crc16(const char* string) -{ - unsigned short crc = 0; - int i, j, xor_poly; - - for (i = 0; string[i] != 0; i++) - { - char c = string[i]; - for (j = 0; j < 8; c >>= 1, j++) - { - xor_poly = (c ^ crc) & 1; - crc >>= 1; - if (xor_poly) - crc ^= 0xa001; - } - } - return crc; -} - -static char *strdupA( const char *str ) -{ - char *ret; - - if (!str) return NULL; - if ((ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ))) strcpy( ret, str ); - return ret; -} - -static char* heap_printf(const char *format, ...) -{ - va_list args; - int size = 4096; - char *buffer, *ret; - int n; - - va_start(args, format); - while (1) - { - buffer = HeapAlloc(GetProcessHeap(), 0, size); - if (buffer == NULL) - break; - n = vsnprintf(buffer, size, format, args); - if (n == -1) - size *= 2; - else if (n >= size) - size = n + 1; - else - break; - HeapFree(GetProcessHeap(), 0, buffer); - } - va_end(args); - if (!buffer) return NULL; - ret = HeapReAlloc(GetProcessHeap(), 0, buffer, strlen(buffer) + 1 ); - if (!ret) ret = buffer; - return ret; -} - -static void write_xml_text(FILE *file, const char *text) -{ - int i; - for (i = 0; text[i]; i++) - { - if (text[i] == '&') - fputs("&", file); - else if (text[i] == '<') - fputs("<", file); - else if (text[i] == '>') - fputs(">", file); - else if (text[i] == '\'') - fputs("'", file); - else if (text[i] == '"') - fputs(""", file); - else - fputc(text[i], file); - } -} - -static BOOL create_directories(char *directory) -{ - BOOL ret = TRUE; - int i; - - for (i = 0; directory[i]; i++) - { - if (i > 0 && directory[i] == '/') - { - directory[i] = 0; - mkdir(directory, 0777); - directory[i] = '/'; - } - } - if (mkdir(directory, 0777) && errno != EEXIST) - ret = FALSE; - - return ret; -} - -static char* wchars_to_utf8_chars(LPCWSTR string) -{ - char *ret; - INT size = WideCharToMultiByte(CP_UTF8, 0, string, -1, NULL, 0, NULL, NULL); - ret = HeapAlloc(GetProcessHeap(), 0, size); - if (ret) - WideCharToMultiByte(CP_UTF8, 0, string, -1, ret, size, NULL, NULL); - return ret; -} - -static char* wchars_to_unix_chars(LPCWSTR string) -{ - char *ret; - INT size = WideCharToMultiByte(CP_UNIXCP, 0, string, -1, NULL, 0, NULL, NULL); - ret = HeapAlloc(GetProcessHeap(), 0, size); - if (ret) - WideCharToMultiByte(CP_UNIXCP, 0, string, -1, ret, size, NULL, NULL); - return ret; -} - -static WCHAR* utf8_chars_to_wchars(LPCSTR string) -{ - WCHAR *ret; - INT size = MultiByteToWideChar(CP_UTF8, 0, string, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (ret) - MultiByteToWideChar(CP_UTF8, 0, string, -1, ret, size); - return ret; -} - /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BOOL bWait ) {

1 0

Henri Verbeet : d3dx9_36: Use a lookup table in D3DXGetDeclVertexSize().
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 31e8a20d880cc125b7cecd71a4152ab6141ea95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e8a20d880cc125b7cecd71a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:17 2010 +0200 d3dx9_36: Use a lookup table in D3DXGetDeclVertexSize(). --- dlls/d3dx9_36/mesh.c | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 0ff6788..788c449 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -169,6 +169,27 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWOR return D3D_OK; } +static const UINT d3dx_decltype_size[D3DDECLTYPE_UNUSED] = +{ + /* D3DDECLTYPE_FLOAT1 */ 1 * 4, + /* D3DDECLTYPE_FLOAT2 */ 2 * 4, + /* D3DDECLTYPE_FLOAT3 */ 3 * 4, + /* D3DDECLTYPE_FLOAT4 */ 4 * 4, + /* D3DDECLTYPE_D3DCOLOR */ 4 * 1, + /* D3DDECLTYPE_UBYTE4 */ 4 * 1, + /* D3DDECLTYPE_SHORT2 */ 2 * 2, + /* D3DDECLTYPE_SHORT4 */ 4 * 2, + /* D3DDECLTYPE_UBYTE4N */ 4 * 1, + /* D3DDECLTYPE_SHORT2N */ 2 * 2, + /* D3DDECLTYPE_SHORT4N */ 4 * 2, + /* D3DDECLTYPE_USHORT2N */ 2 * 2, + /* D3DDECLTYPE_USHORT4N */ 4 * 2, + /* D3DDECLTYPE_UDEC3 */ 4, /* 3 * 10 bits + 2 padding */ + /* D3DDECLTYPE_DEC3N */ 4, + /* D3DDECLTYPE_FLOAT16_2 */ 2 * 2, + /* D3DDECLTYPE_FLOAT16_4 */ 4 * 2, +}; + /************************************************************************* * D3DXDeclaratorFromFVF */ @@ -246,31 +267,13 @@ UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_id if (element->Stream != stream_idx) continue; - switch (element->Type) + if (element->Type >= sizeof(d3dx_decltype_size) / sizeof(*d3dx_decltype_size)) { - case D3DDECLTYPE_FLOAT1: type_size = 1 * 4; break; - case D3DDECLTYPE_FLOAT2: type_size = 2 * 4; break; - case D3DDECLTYPE_FLOAT3: type_size = 3 * 4; break; - case D3DDECLTYPE_FLOAT4: type_size = 4 * 4; break; - case D3DDECLTYPE_D3DCOLOR: type_size = 4 * 1; break; - case D3DDECLTYPE_UBYTE4: type_size = 4 * 1; break; - case D3DDECLTYPE_SHORT2: type_size = 2 * 2; break; - case D3DDECLTYPE_SHORT4: type_size = 4 * 2; break; - case D3DDECLTYPE_UBYTE4N: type_size = 4 * 1; break; - case D3DDECLTYPE_SHORT2N: type_size = 2 * 2; break; - case D3DDECLTYPE_SHORT4N: type_size = 4 * 2; break; - case D3DDECLTYPE_USHORT2N: type_size = 2 * 2; break; - case D3DDECLTYPE_USHORT4N: type_size = 4 * 2; break; - case D3DDECLTYPE_UDEC3: type_size = 4; break; /* 3 * 10 bits + 2 padding */ - case D3DDECLTYPE_DEC3N: type_size = 4; break; - case D3DDECLTYPE_FLOAT16_2: type_size = 2 * 2; break; - case D3DDECLTYPE_FLOAT16_4: type_size = 4 * 2; break; - default: - FIXME("Unhandled element type %#x, size will be incorrect.\n", element->Type); - type_size = 0; - break; + FIXME("Unhandled element type %#x, size will be incorrect.\n", element->Type); + continue; } + type_size = d3dx_decltype_size[element->Type]; if (element->Offset + type_size > size) size = element->Offset + type_size; }

1 0

Henri Verbeet : d3dx9_36/tests: Use the proper D3DFVF_PSIZE constant in test_fvf_decl_conversion().
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 5655c6f0bba9f747029db8274e26a6c8876d9125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5655c6f0bba9f747029db8274… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:19 2010 +0200 d3dx9_36/tests: Use the proper D3DFVF_PSIZE constant in test_fvf_decl_conversion(). --- dlls/d3dx9_36/tests/mesh.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 502382a..8d0f227 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -503,8 +503,6 @@ static void test_decl_to_fvf(const D3DVERTEXELEMENT9 test_decl[], DWORD expected } } -#define D3DFVF_RESERVED1 0x020 /* in d3dtypes.h */ - static void test_fvf_decl_conversion(void) { int i; @@ -538,7 +536,7 @@ static void test_fvf_decl_conversion(void) { CONST D3DVERTEXELEMENT9 test_buffer[] = { { 0, 0, D3DDECLTYPE_FLOAT1, 0, D3DDECLUSAGE_PSIZE, 0 }, D3DDECL_END() }; - test_decl_to_fvf(test_buffer, D3DFVF_RESERVED1, D3D_OK, TRUE, __LINE__); + test_decl_to_fvf(test_buffer, D3DFVF_PSIZE, D3D_OK, TRUE, __LINE__); } { CONST D3DVERTEXELEMENT9 test_buffer[] =

1 0

Henri Verbeet : wined3d: Check the GLSL info log for all shaders.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 2af746b96e4131f1b2cb353922839ccf0bbd20a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af746b96e4131f1b2cb35392… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:21 2010 +0200 wined3d: Check the GLSL info log for all shaders. --- dlls/wined3d/glsl_shader.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index da90288..9642686 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -255,6 +255,17 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA } /* GL locking is done by the caller. */ +static void shader_glsl_compile(const struct wined3d_gl_info *gl_info, GLhandleARB shader, const char *src) +{ + TRACE("Compiling shader object %u.\n", shader); + GL_EXTCALL(glShaderSourceARB(shader, 1, &src, NULL)); + checkGLcall("glShaderSourceARB"); + GL_EXTCALL(glCompileShaderARB(shader)); + checkGLcall("glCompileShaderARB"); + print_glsl_info_log(gl_info, shader); +} + +/* GL locking is done by the caller. */ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_info, GLhandleARB program) { GLint i, object_count, source_size = -1; @@ -3911,10 +3922,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer ret = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); checkGLcall("glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)"); - GL_EXTCALL(glShaderSourceARB(ret, 1, (const char**)&buffer->buffer, NULL)); - checkGLcall("glShaderSourceARB(ret, 1, &buffer->buffer, NULL)"); - GL_EXTCALL(glCompileShaderARB(ret)); - checkGLcall("glCompileShaderARB(ret)"); + shader_glsl_compile(gl_info, ret, buffer->buffer); return ret; } @@ -4035,9 +4043,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "}\n"); TRACE("Compiling shader object %u\n", shader_obj); - GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer->buffer, NULL)); - GL_EXTCALL(glCompileShaderARB(shader_obj)); - print_glsl_info_log(gl_info, shader_obj); + shader_glsl_compile(gl_info, shader_obj, buffer->buffer); /* Store the shader object */ return shader_obj; @@ -4110,9 +4116,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "}\n"); TRACE("Compiling shader object %u\n", shader_obj); - GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer->buffer, NULL)); - GL_EXTCALL(glCompileShaderARB(shader_obj)); - print_glsl_info_log(gl_info, shader_obj); + shader_glsl_compile(gl_info, shader_obj, buffer->buffer); return shader_obj; } @@ -4546,12 +4550,10 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, } vshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); - GL_EXTCALL(glShaderSourceARB(vshader_id, 1, &blt_vshader, NULL)); - GL_EXTCALL(glCompileShaderARB(vshader_id)); + shader_glsl_compile(gl_info, vshader_id, blt_vshader); pshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); - GL_EXTCALL(glShaderSourceARB(pshader_id, 1, &blt_pshader, NULL)); - GL_EXTCALL(glCompileShaderARB(pshader_id)); + shader_glsl_compile(gl_info, pshader_id, blt_pshader); program_id = GL_EXTCALL(glCreateProgramObjectARB()); GL_EXTCALL(glAttachObjectARB(program_id, vshader_id));

1 0

Aric Stewart : usp10: Add Lao script.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 68ab5e2689b2417c00b5c6a21497fd72d4bbf145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ab5e2689b2417c00b5c6a21… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:41 2010 -0500 usp10: Add Lao script. --- dlls/usp10/shape.c | 2 ++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9272c70..70722c2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -341,6 +341,8 @@ static const ScriptShapeData ShapingData[] = {{ tibetan_features, 2}, "phag", ContextualShape_Phags_pa}, {{ thai_features, 1}, "thai", NULL}, {{ thai_features, 1}, "thai", NULL}, + {{ thai_features, 1}, "lao", NULL}, + {{ thai_features, 1}, "lao", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0bffd27..29ec1e8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -81,6 +81,8 @@ static const scriptRange scriptRanges[] = { { Script_Sinhala, 0xd80, 0xdff, 0, 0}, /* Thai: U+0E00–U+0E7F */ { Script_Thai, 0xe00, 0xe7f, Script_Thai_Numeric, 0}, + /* Lao: U+0E80–U+0EFF */ + { Script_Lao, 0xe80, 0xeff, Script_Lao_Numeric, 0}, /* Tibetan: U+0F00–U+0FFF */ { Script_Tibetan, 0xf00, 0xfff, Script_Tibetan_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ @@ -170,6 +172,10 @@ static const scriptData scriptInformation[] = { {LANG_THAI, 0, 1, 1, 1, THAI_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 1}}, {{Script_Thai_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_THAI, 1, 1, 0, 0, THAI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Lao, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_LAO, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 0}}, + {{Script_Lao_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_LAO, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -184,7 +190,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[14].props, &scriptInformation[15].props, &scriptInformation[16].props, &scriptInformation[17].props, &scriptInformation[18].props, &scriptInformation[19].props, - &scriptInformation[20].props, &scriptInformation[21].props + &scriptInformation[20].props, &scriptInformation[21].props, + &scriptInformation[22].props, &scriptInformation[23].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 815d2e2..7e5b5ba 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -42,6 +42,8 @@ /* Unicode Chapter 11 */ #define Script_Thai 20 #define Script_Thai_Numeric 21 +#define Script_Lao 22 +#define Script_Lao_Numeric 23 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Vincent Povirk : windowscodecs: Always check TIFF sample count and planar configuration.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 73d539e65703236dac2d57ca1addd038d08aec3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d539e65703236dac2d57ca1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 10:58:05 2010 -0500 windowscodecs: Always check TIFF sample count and planar configuration. This more closely matches the TIFF spec. These values are valid for all photometric interpretations. --- dlls/windowscodecs/tiffformat.c | 48 +++++++++++++++++++++++++++----------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index c92a2f2..58515c5 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -202,6 +202,7 @@ typedef struct { int bps; int samples; int bpp; + int planar; int indexed; int reverse_bgr; UINT width, height; @@ -224,7 +225,7 @@ static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl; static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { - uint16 photometric, bps, samples=1, planar; + uint16 photometric, bps, samples, planar; int ret; decode_info->indexed = 0; @@ -239,12 +240,35 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) ret = pTIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bps); if (!ret) bps = 1; - decode_info->bps = bps; + ret = pTIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samples); + if (!ret) samples = 1; + decode_info->samples = samples; + + if (samples == 1) + planar = 1; + else + { + ret = pTIFFGetField(tiff, TIFFTAG_PLANARCONFIG, &planar); + if (!ret) planar = 1; + if (planar != 1) + { + FIXME("unhandled planar configuration %u\n", planar); + return E_FAIL; + } + } + decode_info->planar = planar; + switch(photometric) { case 1: /* BlackIsZero */ + if (samples != 1) + { + FIXME("unhandled grayscale sample count %u\n", samples); + return E_FAIL; + } + decode_info->bpp = bps; switch (bps) { @@ -263,22 +287,14 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 2: /* RGB */ - ret = pTIFFGetField(tiff, TIFFTAG_PLANARCONFIG, &planar); - if (!ret) planar = 1; - if (planar != 1) - { - FIXME("unhandled planar configuration %u\n", planar); - return E_FAIL; - } - ret = pTIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samples); + decode_info->bpp = bps * samples; + if (samples != 3) { FIXME("unhandled RGB sample count %u\n", samples); return E_FAIL; } - decode_info->bpp = bps * samples; - switch(bps) { case 8: @@ -294,6 +310,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 3: /* RGB Palette */ + if (samples != 1) + { + FIXME("unhandled indexed sample count %u\n", samples); + return E_FAIL; + } + decode_info->indexed = 1; decode_info->bpp = bps; switch (bps) @@ -319,8 +341,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } - decode_info->samples = samples; - ret = pTIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &decode_info->width); if (!ret) {

1 0

Aric Stewart : usp10: Add Thai Script.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 331c8cdef6fd66316a90914bea45d6b74448fbe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331c8cdef6fd66316a90914be… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:33 2010 -0500 usp10: Add Thai Script. --- dlls/usp10/shape.c | 7 +++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 3 +++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3f3513d..9272c70 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -305,6 +305,11 @@ static OPENTYPE_FEATURE_RECORD tibetan_features[] = { 0x73776c62 /*blws*/, 1}, }; +static OPENTYPE_FEATURE_RECORD thai_features[] = +{ + { 0x706d6363 /*ccmp*/, 1}, +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; CHAR otTag[5]; @@ -334,6 +339,8 @@ static const ScriptShapeData ShapingData[] = {{ tibetan_features, 2}, "tibt", NULL}, {{ tibetan_features, 2}, "tibt", NULL}, {{ tibetan_features, 2}, "phag", ContextualShape_Phags_pa}, + {{ thai_features, 1}, "thai", NULL}, + {{ thai_features, 1}, "thai", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c18c532..0bffd27 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -79,6 +79,8 @@ static const scriptRange scriptRanges[] = { { Script_Thaana, 0x780, 0x7bf, 0, 0}, /* Sinhala: U+0D80–U+0DFF */ { Script_Sinhala, 0xd80, 0xdff, 0, 0}, + /* Thai: U+0E00–U+0E7F */ + { Script_Thai, 0xe00, 0xe7f, Script_Thai_Numeric, 0}, /* Tibetan: U+0F00–U+0FFF */ { Script_Tibetan, 0xf00, 0xfff, Script_Tibetan_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ @@ -164,6 +166,10 @@ static const scriptData scriptInformation[] = { {LANG_TIBETAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {{Script_Phags_pa, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_MONGOLIAN, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Thai, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_THAI, 0, 1, 1, 1, THAI_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 1}}, + {{Script_Thai_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_THAI, 1, 1, 0, 0, THAI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -177,7 +183,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[12].props, &scriptInformation[13].props, &scriptInformation[14].props, &scriptInformation[15].props, &scriptInformation[16].props, &scriptInformation[17].props, - &scriptInformation[18].props, &scriptInformation[19].props + &scriptInformation[18].props, &scriptInformation[19].props, + &scriptInformation[20].props, &scriptInformation[21].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index bfde66d..815d2e2 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -39,6 +39,9 @@ #define Script_Tibetan 17 #define Script_Tibetan_Numeric 18 #define Script_Phags_pa 19 +/* Unicode Chapter 11 */ +#define Script_Thai 20 +#define Script_Thai_Numeric 21 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Phags-pa Script.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 57053fa51efbfb0ff2e101ce1d22fffd3d9c1812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57053fa51efbfb0ff2e101ce1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:27 2010 -0500 usp10: Add Phags-pa Script. --- dlls/usp10/shape.c | 87 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 6 ++- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index cea9415..3f3513d 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -42,6 +42,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_Syriac(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); extern const unsigned short wine_shaping_table[]; extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; @@ -332,6 +333,7 @@ static const ScriptShapeData ShapingData[] = {{ sinhala_features, 7}, "sinh", NULL}, {{ tibetan_features, 2}, "tibt", NULL}, {{ tibetan_features, 2}, "tibt", NULL}, + {{ tibetan_features, 2}, "phag", ContextualShape_Phags_pa}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -1173,6 +1175,91 @@ right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) HeapFree(GetProcessHeap(),0,context_type); } +/* + * ContextualShape_Phags_pa + */ + +#define phags_pa_CANDRABINDU 0xA873 +#define phags_pa_START 0xA840 +#define phags_pa_END 0xA87F + +static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + INT *context_shape; + INT dirR, dirL; + int i; + + if (*pcGlyphs != cChars) + { + ERR("Number of Glyphs and Chars need to match at the beginning\n"); + return; + } + + if (!psa->fLogicalOrder && psa->fRTL) + { + dirR = 1; + dirL = -1; + } + else + { + dirR = -1; + dirL = 1; + } + + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + + if (!psc->GSUB_Table) + return; + + context_shape = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * cChars); + + for (i = 0; i < cChars; i++) + { + if (pwcChars[i] >= phags_pa_START && pwcChars[i] <= phags_pa_END) + { + WCHAR rchar = neighbour_char(i,dirR,pwcChars,cChars); + WCHAR lchar = neighbour_char(i,dirL,pwcChars,cChars); + BOOL jrchar = (rchar != phags_pa_CANDRABINDU && rchar >= phags_pa_START && rchar <= phags_pa_END); + BOOL jlchar = (lchar != phags_pa_CANDRABINDU && lchar >= phags_pa_START && lchar <= phags_pa_END); + + if (jrchar && jlchar) + context_shape[i] = Xm; + else if (jrchar) + context_shape[i] = Xr; + else if (jlchar) + context_shape[i] = Xl; + else + context_shape[i] = Xn; + } + else + context_shape[i] = -1; + } + + /* Contextual Shaping */ + i = 0; + while(i < *pcGlyphs) + { + if (context_shape[i] >= 0) + { + INT nextIndex; + INT prevCount = *pcGlyphs; + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + if (nextIndex > GSUB_E_NOGLYPH) + { + UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + i = nextIndex; + } + else + i++; + } + else + i++; + } + + HeapFree(GetProcessHeap(),0,context_shape); +} + void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) { if (ShapingData[psa->eScript].contextProc) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 23695cd..c18c532 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -100,6 +100,8 @@ static const scriptRange scriptRanges[] = { /* Modifier Tone Letters: U+A700–U+A71F */ /* Latin Extended-D: U+A720–U+A7FF */ { Script_Latin, 0xa700, 0xa7ff, 0, 0}, + /* Phags-pa: U+A840–U+A87F */ + { Script_Phags_pa, 0xa840, 0xa87f, 0, 0}, /* Latin Ligatures: U+FB00–U+FB06 */ { Script_Latin, 0xfb00, 0xfb06, 0, 0}, /* Armenian ligatures U+FB13..U+FB17 */ @@ -160,6 +162,8 @@ static const scriptData scriptInformation[] = { {LANG_TIBETAN, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 0}}, {{Script_Tibetan_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_TIBETAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Phags_pa, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_MONGOLIAN, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -173,7 +177,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[12].props, &scriptInformation[13].props, &scriptInformation[14].props, &scriptInformation[15].props, &scriptInformation[16].props, &scriptInformation[17].props, - &scriptInformation[18].props + &scriptInformation[18].props, &scriptInformation[19].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index bc3fd57..bfde66d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -38,6 +38,7 @@ #define Script_Sinhala 16 #define Script_Tibetan 17 #define Script_Tibetan_Numeric 18 +#define Script_Phags_pa 19 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Tibetan Script.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 29d896e40a4c21e486a5099097b9116b2ff0709f URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d896e40a4c21e486a509909… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:18 2010 -0500 usp10: Add Tibetan Script. --- dlls/usp10/shape.c | 8 ++++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 2 ++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 81809af..cea9415 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -298,6 +298,12 @@ static OPENTYPE_FEATURE_RECORD sinhala_features[] = { 0x73747370 /*psts*/, 1}, }; +static OPENTYPE_FEATURE_RECORD tibetan_features[] = +{ + { 0x73766261 /*abvs*/, 1}, + { 0x73776c62 /*blws*/, 1}, +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; CHAR otTag[5]; @@ -324,6 +330,8 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, "armn", NULL}, {{ standard_features, 2}, "geor", NULL}, {{ sinhala_features, 7}, "sinh", NULL}, + {{ tibetan_features, 2}, "tibt", NULL}, + {{ tibetan_features, 2}, "tibt", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 235bb8a..23695cd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -79,6 +79,8 @@ static const scriptRange scriptRanges[] = { { Script_Thaana, 0x780, 0x7bf, 0, 0}, /* Sinhala: U+0D80–U+0DFF */ { Script_Sinhala, 0xd80, 0xdff, 0, 0}, + /* Tibetan: U+0F00–U+0FFF */ + { Script_Tibetan, 0xf00, 0xfff, Script_Tibetan_Numeric, 0}, /* Georgian: U+10A0–U+10FF */ { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ @@ -154,6 +156,10 @@ static const scriptData scriptInformation[] = { {LANG_GEORGIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, {{Script_Sinhala, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_SINHALESE, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Tibetan, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_TIBETAN, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 1, 0, 1, 0, 0, 0, 0}}, + {{Script_Tibetan_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_TIBETAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -166,7 +172,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[10].props, &scriptInformation[11].props, &scriptInformation[12].props, &scriptInformation[13].props, &scriptInformation[14].props, &scriptInformation[15].props, - &scriptInformation[16].props + &scriptInformation[16].props, &scriptInformation[17].props, + &scriptInformation[18].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index b41de7d..bc3fd57 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -36,6 +36,8 @@ #define Script_Georgian 15 /* Unicode Chapter 10 */ #define Script_Sinhala 16 +#define Script_Tibetan 17 +#define Script_Tibetan_Numeric 18 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Henri Verbeet : d3dx9_36/tests: Remove a (mostly) redundant test.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: bcd452ab82b8c386bd0912bdd108595111fd458a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd452ab82b8c386bd0912bdd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:18 2010 +0200 d3dx9_36/tests: Remove a (mostly) redundant test. --- dlls/d3dx9_36/tests/mesh.c | 98 -------------------------------------------- 1 files changed, 0 insertions(+), 98 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index beb22ad..502382a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -413,103 +413,6 @@ static void D3DXComputeBoundingSphereTest(void) ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); } -static void D3DXDeclaratorFromFVFTest(void) -{ - D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE]; - HRESULT hr; - int i, size; - - static const D3DVERTEXELEMENT9 exp1[6] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 0xC, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, - {0, 0x18, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, - {0, 0x1C, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 1}, - {0, 0x20, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT,D3DDECLUSAGE_TEXCOORD, 0}, - D3DDECL_END(), }; - - static const D3DVERTEXELEMENT9 exp2[3] = { - {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITIONT, 0}, - {0, 0x10, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_PSIZE, 0}, - D3DDECL_END(), }; - - static const D3DVERTEXELEMENT9 exp3[4] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 0xC, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, - {0, 0x1C, D3DDECLTYPE_UBYTE4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDINDICES, 0}, - D3DDECL_END(), }; - - /* Note: passing NULL as declaration segfaults */ - todo_wine - { - hr = D3DXDeclaratorFromFVF(0, decl); - ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); - ok(decl[0].Stream == 0xFF, "D3DXDeclaratorFromFVF returned an incorrect vertex declaration\n"); /* end element */ - - hr = D3DXDeclaratorFromFVF(D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1, decl); - ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); - - if (hr == D3D_OK) - { - size = sizeof(exp1)/sizeof(exp1[0]); - for (i=0; i<size-1; i++) - { - ok(decl[i].Stream == exp1[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp1[i].Stream); - ok(decl[i].Type == exp1[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp1[i].Type); - ok(decl[i].Method == exp1[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp1[i].Method); - ok(decl[i].Usage == exp1[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp1[i].Usage); - ok(decl[i].UsageIndex == exp1[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp1[i].UsageIndex); - ok(decl[i].Offset == exp1[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp1[i].Offset); - } - ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ - } - } - - todo_wine - { - hr = D3DXDeclaratorFromFVF(D3DFVF_XYZRHW | D3DFVF_PSIZE, decl); - ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); - - if (hr == D3D_OK) - { - size = sizeof(exp2)/sizeof(exp2[0]); - for (i=0; i<size-1; i++) - { - ok(decl[i].Stream == exp2[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp2[i].Stream); - ok(decl[i].Type == exp2[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp1[i].Type); - ok(decl[i].Method == exp2[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp2[i].Method); - ok(decl[i].Usage == exp2[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp2[i].Usage); - ok(decl[i].UsageIndex == exp2[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp2[i].UsageIndex); - ok(decl[i].Offset == exp2[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp2[i].Offset); - } - ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ - } - } - - todo_wine - { - hr = D3DXDeclaratorFromFVF(D3DFVF_XYZB5, decl); - ok(hr == D3DERR_INVALIDCALL, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - - hr = D3DXDeclaratorFromFVF(D3DFVF_XYZB5 | D3DFVF_LASTBETA_UBYTE4, decl); - ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); - - if (hr == D3D_OK) - { - size = sizeof(exp3)/sizeof(exp3[0]); - for (i=0; i<size-1; i++) - { - ok(decl[i].Stream == exp3[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp3[i].Stream); - ok(decl[i].Type == exp3[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp3[i].Type); - ok(decl[i].Method == exp3[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp3[i].Method); - ok(decl[i].Usage == exp3[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp3[i].Usage); - ok(decl[i].UsageIndex == exp3[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp3[i].UsageIndex); - ok(decl[i].Offset == exp3[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp3[i].Offset); - } - ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ - } - } -} - static inline void print_elements(const D3DVERTEXELEMENT9 *elements) { D3DVERTEXELEMENT9 last = D3DDECL_END(); @@ -1565,7 +1468,6 @@ START_TEST(mesh) D3DXBoundProbeTest(); D3DXComputeBoundingBoxTest(); D3DXComputeBoundingSphereTest(); - D3DXDeclaratorFromFVFTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); D3DXCreateMeshTest();

1 0