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

Thomas Mullaly : urlmon: Improved support for opaque file URL paths.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 144ddea3f9d127374931ec7c4840a5c7c3f31ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=144ddea3f9d127374931ec7c4… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Aug 26 13:28:19 2010 -0400 urlmon: Improved support for opaque file URL paths. --- dlls/urlmon/tests/uri.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 53 ++++++++++++++++++++++++++-- 2 files changed, 137 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7a7bfb1..d6bff96 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3945,6 +3945,90 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* The '\' are still converted to '/' even though it's an opaque file URI. */ + { "file:c:\\dir\\../..\\index.html", 0, S_OK, FALSE, + Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY + |Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, FALSE, + { + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"file:c:/dir/../../index.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:/dir/../../index.html",S_OK,FALSE}, + {"c:/dir/../../index.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:c:\\dir\\../..\\index.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {0,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* '/' are still converted to '\' even though it's an opaque URI. */ + { "file:c:/dir\\../..\\index.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, + Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY + |Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, FALSE, + { + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"file:c:\\dir\\..\\..\\index.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\dir\\..\\..\\index.html",S_OK,FALSE}, + {"c:\\dir\\..\\..\\index.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:c:/dir\\../..\\index.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {0,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Forbidden characters aren't percent encoded. */ + { "file:c:\\in^|dex.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, + Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY + |Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, FALSE, + { + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"file:c:\\in^|dex.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\in^|dex.html",S_OK,FALSE}, + {"c:\\in^|dex.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:c:\\in^|dex.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {0,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; @@ -4006,7 +4090,10 @@ static const invalid_uri invalid_uri_tests[] = { {"\n\nhttp://google.com/",Uri_CREATE_NO_PRE_PROCESS_HTML_URI,FALSE}, {"file://c:\\test<test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, {"file://c:\\test>test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, - {"file://c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE} + {"file://c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, + {"file:c:\\test<test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, + {"file:c:\\test>test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, + {"file:c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3a728f5..e2bec70 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -224,6 +224,10 @@ static inline BOOL is_unc_path(const WCHAR *str) { return (str[0] == '\\' && str[0] == '\\'); } +static inline BOOL is_forbidden_dos_path_char(WCHAR val) { + return (val == '>' || val == '<' || val == '\"'); +} + /* A URI is implicitly a file path if it begins with * a drive letter (eg X:) or starts with "\\" (UNC path). */ @@ -1798,7 +1802,7 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f return FALSE; } else continue; - } else if((**ptr == '>' || **ptr == '<' || **ptr == '\"') && is_file && + } else if(is_forbidden_dos_path_char(**ptr) && is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* File schemes with USE_DOS_PATH set aren't allowed to have * a '<' or '>' or '\"' appear in them. @@ -1849,9 +1853,13 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f * NOTE: * Windows allows invalid % encoded data to appear in opaque URI paths * for unknown scheme types. + * + * File schemes with USE_DOS_PATH set aren't allowed to have '<', '>', or '\"' + * appear in them. */ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; data->path = *ptr; @@ -1863,6 +1871,11 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) return FALSE; } else continue; + } else if(is_forbidden_dos_path_char(**ptr) && is_file && + (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + *ptr = data->path; + data->path = NULL; + return FALSE; } ++(*ptr); @@ -2804,10 +2817,17 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, * * 3) '\\' are changed to '/' for known scheme types * except for mailto schemes. + * + * 4) For file schemes, if USE_DOS_PATH is set all '/' + * are converted to backslashes. + * + * 5) For file schemes, if USE_DOS_PATH isn't set all '\' + * are converted to forward slashes. */ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { const WCHAR *ptr; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; if(!data->path) { uri->path_start = -1; @@ -2846,11 +2866,36 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla uri->canon_uri[uri->canon_len] = *ptr; ++uri->canon_len; } + } else if(*ptr == '/' && is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = '\\'; + ++uri->canon_len; + } else if(*ptr == '\\' && is_file) { + if(!(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + /* Convert to a '/'. */ + if(!computeOnly) + uri->canon_uri[uri->canon_len] = '/'; + ++uri->canon_len; + } else { + /* Just copy it over. */ + if(!computeOnly) + uri->canon_uri[uri->canon_len] = *ptr; + ++uri->canon_len; + } } else if(known_scheme && !is_unreserved(*ptr) && !is_reserved(*ptr) && !(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS)) { - if(!computeOnly) - pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); - uri->canon_len += 3; + if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + /* Forbidden characters aren't percent encoded for file schemes + * with USE_DOS_PATH set. + */ + if(!computeOnly) + uri->canon_uri[uri->canon_len] = *ptr; + ++uri->canon_len; + } else { + if(!computeOnly) + pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); + uri->canon_len += 3; + } } else { if(!computeOnly) uri->canon_uri[uri->canon_len] = *ptr;

1 0

Louis Lenders : wine.inf.in: Add registry key under HKLM\%CurrentVersion%\Policies\System.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: af60f4bb26683d39c14889217aa29716c1f5acf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af60f4bb26683d39c14889217… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Aug 27 00:19:56 2010 +0200 wine.inf.in: Add registry key under HKLM\%CurrentVersion%\Policies\System. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 41c8820..df34402 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -448,7 +448,7 @@ HKLM,%CurrentVersion%\Explorer\AutoplayHandlers,,16 HKLM,%CurrentVersion%\Explorer\DriveIcons,,16 HKLM,%CurrentVersion%\Explorer\KindMap,,16 HKLM,%CurrentVersion%\Group Policy,,16 -HKLM,%CurrentVersion%\Policies,,16 +HKLM,%CurrentVersion%\Policies\System,"EnableLUA",0x10003,0 HKLM,%CurrentVersion%\PreviewHandlers,,16 HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%"

1 0

Henri Verbeet : wined3d: Cleanup some 2-space indentation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 38137d7ce2373deb729e749fee20c21936d3645d URL: http://source.winehq.org/git/wine.git/?a=commit;h=38137d7ce2373deb729e749fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 26 19:05:16 2010 +0200 wined3d: Cleanup some 2-space indentation. --- dlls/wined3d/utils.c | 754 +++++++++++++++++++++++++------------------------- 1 files changed, 384 insertions(+), 370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38137d7ce2373deb729e7…

1 0

Henri Verbeet : wined3d: Simplify wined3d_format_convert_from_float().
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 3b4d9ae112b6c8205a2b10660eeb2ccae3a7f80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4d9ae112b6c8205a2b10660… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 26 19:05:17 2010 +0200 wined3d: Simplify wined3d_format_convert_from_float(). --- dlls/wined3d/utils.c | 149 +++++++++++++++---------------------------------- 1 files changed, 46 insertions(+), 103 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cb9a510..b386db4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2557,121 +2557,64 @@ BOOL getDepthStencilBits(const struct wined3d_format_desc *format_desc, short *d return TRUE; } +/* Note: It's the caller's responsibility to ensure values can be expressed + * in the requested format. UNORM formats for example can only express values + * in the range 0.0f -> 1.0f. */ DWORD wined3d_format_convert_from_float(const struct wined3d_format_desc *format, const WINED3DCOLORVALUE *color) { - enum wined3d_format_id destfmt = format->id; - unsigned int r, g, b, a; - DWORD ret; + static const struct + { + enum wined3d_format_id format_id; + float r_mul; + float g_mul; + float b_mul; + float a_mul; + BYTE r_shift; + BYTE g_shift; + BYTE b_shift; + BYTE a_shift; + } + conv[] = + { + {WINED3DFMT_B8G8R8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, + {WINED3DFMT_B8G8R8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, + {WINED3DFMT_B8G8R8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, + {WINED3DFMT_B5G6R5_UNORM, 31.0f, 63.0f, 31.0f, 0.0f, 11, 5, 0, 0}, + {WINED3DFMT_B5G5R5A1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, + {WINED3DFMT_B5G5R5X1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, + {WINED3DFMT_A8_UNORM, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, + {WINED3DFMT_B4G4R4A4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, + {WINED3DFMT_B4G4R4X4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, + {WINED3DFMT_B2G3R3_UNORM, 7.0f, 7.0f, 3.0f, 0.0f, 5, 2, 0, 0}, + {WINED3DFMT_R8G8B8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, + {WINED3DFMT_R8G8B8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, + {WINED3DFMT_B10G10R10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 20, 10, 0, 30}, + {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, + }; + unsigned int i; TRACE("Converting color {%.8e %.8e %.8e %.8e} to format %s.\n", - color->r, color->g, color->b, color->a, debug_d3dformat(destfmt)); - - r = (DWORD)((color->r * 255.0f) + 0.5f); - g = (DWORD)((color->g * 255.0f) + 0.5f); - b = (DWORD)((color->b * 255.0f) + 0.5f); - a = (DWORD)((color->a * 255.0f) + 0.5f); + color->r, color->g, color->b, color->a, debug_d3dformat(format->id)); - switch(destfmt) + for (i = 0; i < sizeof(conv) / sizeof(*conv); ++i) { - case WINED3DFMT_B8G8R8A8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - case WINED3DFMT_B8G8R8_UNORM: - ret = b; - ret |= g << 8; - ret |= r << 16; - ret |= a << 24; - TRACE("Returning 0x%08x.\n", ret); - return ret; - + DWORD ret; - case WINED3DFMT_B5G6R5_UNORM: - if(r == 0xff && g == 0xff && b == 0xff) return 0xffff; - r = (r * 32) / 256; - g = (g * 64) / 256; - b = (b * 32) / 256; - ret = r << 11; - ret |= g << 5; - ret |= b; - TRACE("Returning %08x\n", ret); - return ret; + if (format->id != conv[i].format_id) continue; - case WINED3DFMT_B5G5R5X1_UNORM: - case WINED3DFMT_B5G5R5A1_UNORM: - a = (a * 2) / 256; - r = (r * 32) / 256; - g = (g * 32) / 256; - b = (b * 32) / 256; - ret = a << 15; - ret |= r << 10; - ret |= g << 5; - ret |= b << 0; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_A8_UNORM: - TRACE("Returning %08x\n", a); - return a; + ret = ((DWORD)((color->r * conv[i].r_mul) + 0.5f)) << conv[i].r_shift; + ret |= ((DWORD)((color->g * conv[i].g_mul) + 0.5f)) << conv[i].g_shift; + ret |= ((DWORD)((color->b * conv[i].b_mul) + 0.5f)) << conv[i].b_shift; + ret |= ((DWORD)((color->a * conv[i].a_mul) + 0.5f)) << conv[i].a_shift; - case WINED3DFMT_B4G4R4X4_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - a = (a * 16) / 256; - r = (r * 16) / 256; - g = (g * 16) / 256; - b = (b * 16) / 256; - ret = a << 12; - ret |= r << 8; - ret |= g << 4; - ret |= b << 0; - TRACE("Returning %08x\n", ret); - return ret; + TRACE("Returning 0x%08x.\n", ret); - case WINED3DFMT_B2G3R3_UNORM: - r = (r * 8) / 256; - g = (g * 8) / 256; - b = (b * 4) / 256; - ret = r << 5; - ret |= g << 2; - ret |= b << 0; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_R8G8B8X8_UNORM: - case WINED3DFMT_R8G8B8A8_UNORM: - ret = a << 24; - ret |= b << 16; - ret |= g << 8; - ret |= r << 0; - TRACE("Returning %08x\n", ret); - return ret; + return ret; + } - case WINED3DFMT_B10G10R10A2_UNORM: - a = (a * 4) / 256; - r = (r * 1024) / 256; - g = (g * 1024) / 256; - b = (b * 1024) / 256; - ret = a << 30; - ret |= r << 20; - ret |= g << 10; - ret |= b << 0; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_R10G10B10A2_UNORM: - a = (a * 4) / 256; - r = (r * 1024) / 256; - g = (g * 1024) / 256; - b = (b * 1024) / 256; - ret = a << 30; - ret |= b << 20; - ret |= g << 10; - ret |= r << 0; - TRACE("Returning %08x\n", ret); - return ret; + FIXME("Conversion for format %s not implemented.\n", debug_d3dformat(format->id)); - default: - FIXME("Add a COLORFILL conversion for format %s\n", debug_d3dformat(destfmt)); - return 0; - } + return 0; } /* DirectDraw stuff */

1 0

Henri Verbeet : d3dx9_36/tests: Cleanup / simplify test_fvf_decl_conversion ().
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 6e518a1d0693a20e8506dd9c8827d3ea932bd777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e518a1d0693a20e8506dd9c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 26 19:05:18 2010 +0200 d3dx9_36/tests: Cleanup / simplify test_fvf_decl_conversion(). --- dlls/d3dx9_36/tests/mesh.c | 556 +++++++++++++++++++------------------------- 1 files changed, 240 insertions(+), 316 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e518a1d0693a20e8506d…

1 0

Henri Verbeet : d3dx9_36/tests: Add some more FVF position handling tests.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 79e4f660904c32163d7b78928af5bfbdabaa562f URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e4f660904c32163d7b78928… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 26 19:05:19 2010 +0200 d3dx9_36/tests: Add some more FVF position handling tests. --- dlls/d3dx9_36/tests/mesh.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1853545..882323b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -679,6 +679,36 @@ static void test_fvf_decl_conversion(void) }; test_decl_to_fvf(decl, D3DFVF_NORMAL, D3D_OK, __LINE__, 0); } + /* D3DFVF_LASTBETA_UBYTE4 and D3DFVF_LASTBETA_D3DCOLOR are ignored if + * there are no blend matrices. */ + { + const D3DVERTEXELEMENT9 decl[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END(), + }; + test_fvf_to_decl(D3DFVF_XYZ | D3DFVF_LASTBETA_UBYTE4, decl, D3D_OK, __LINE__, 0); + } + { + const D3DVERTEXELEMENT9 decl[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END(), + }; + test_fvf_to_decl(D3DFVF_XYZ | D3DFVF_LASTBETA_D3DCOLOR, decl, D3D_OK, __LINE__, 0); + } + /* D3DFVF_LASTBETA_UBYTE4 takes precedence over D3DFVF_LASTBETA_D3DCOLOR. */ + { + const D3DVERTEXELEMENT9 decl[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT4, 0, D3DDECLUSAGE_BLENDWEIGHT, 0}, + {0, 28, D3DDECLTYPE_UBYTE4, 0, D3DDECLUSAGE_BLENDINDICES, 0}, + D3DDECL_END(), + }; + test_fvf_to_decl(D3DFVF_XYZB5 | D3DFVF_LASTBETA_D3DCOLOR | D3DFVF_LASTBETA_UBYTE4, + decl, D3D_OK, __LINE__, 0); + } /* These are supposed to fail, both ways. */ { const D3DVERTEXELEMENT9 decl[] = @@ -692,6 +722,16 @@ static void test_fvf_decl_conversion(void) { const D3DVERTEXELEMENT9 decl[] = { + {0, 0, D3DDECLTYPE_FLOAT4, 0, D3DDECLUSAGE_POSITION, 0}, + {0, 16, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_NORMAL, 0}, + D3DDECL_END(), + }; + test_decl_to_fvf(decl, D3DFVF_XYZW | D3DFVF_NORMAL, D3DERR_INVALIDCALL, __LINE__, 0); + test_fvf_to_decl(D3DFVF_XYZW | D3DFVF_NORMAL, decl, D3DERR_INVALIDCALL, __LINE__, 0); + } + { + const D3DVERTEXELEMENT9 decl[] = + { {0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_FLOAT4, 0, D3DDECLUSAGE_BLENDWEIGHT, 0}, {0, 28, D3DDECLTYPE_FLOAT1, 0, D3DDECLUSAGE_BLENDINDICES, 0},

1 0

Henri Verbeet : d3dx9_36: Implement D3DXDeclaratorFromFVF().
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: ff7dc445256442069f7330b7d6557479c96b8851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7dc445256442069f7330b7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 26 19:05:20 2010 +0200 d3dx9_36: Implement D3DXDeclaratorFromFVF(). --- dlls/d3dx9_36/mesh.c | 106 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 2 +- 2 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index cc22107..ed7f9a8 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -190,14 +190,114 @@ static const UINT d3dx_decltype_size[D3DDECLTYPE_UNUSED] = /* D3DDECLTYPE_FLOAT16_4 */ 4 * 2, }; +static void append_decl_element(D3DVERTEXELEMENT9 *declaration, UINT *idx, UINT *offset, + D3DDECLTYPE type, D3DDECLUSAGE usage, UINT usage_idx) +{ + declaration[*idx].Stream = 0; + declaration[*idx].Offset = *offset; + declaration[*idx].Type = type; + declaration[*idx].Method = D3DDECLMETHOD_DEFAULT; + declaration[*idx].Usage = usage; + declaration[*idx].UsageIndex = usage_idx; + + *offset += d3dx_decltype_size[type]; + ++(*idx); +} + /************************************************************************* * D3DXDeclaratorFromFVF */ -HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) +HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) { - FIXME("(%d, %p): stub\n", fvf, Declaration); + static const D3DVERTEXELEMENT9 end_element = D3DDECL_END(); + DWORD tex_count = (fvf & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT; + unsigned int offset = 0; + unsigned int idx = 0; + unsigned int i; - return E_NOTIMPL; + TRACE("fvf %#x, declaration %p.\n", fvf, declaration); + + if (fvf & D3DFVF_POSITION_MASK) + { + BOOL has_blend = (fvf & D3DFVF_XYZB5) >= D3DFVF_XYZB1; + DWORD blend_count = 1 + (((fvf & D3DFVF_XYZB5) - D3DFVF_XYZB1) >> 1); + BOOL has_blend_idx = (fvf & D3DFVF_LASTBETA_D3DCOLOR) || (fvf & D3DFVF_LASTBETA_UBYTE4); + + if (has_blend_idx) --blend_count; + + if ((fvf & D3DFVF_POSITION_MASK) == D3DFVF_XYZW + || (has_blend && blend_count > 4)) + return D3DERR_INVALIDCALL; + + if ((fvf & D3DFVF_POSITION_MASK) == D3DFVF_XYZRHW) + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT4, D3DDECLUSAGE_POSITIONT, 0); + else + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT3, D3DDECLUSAGE_POSITION, 0); + + if (has_blend) + { + switch (blend_count) + { + case 0: + break; + case 1: + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT1, D3DDECLUSAGE_BLENDWEIGHT, 0); + break; + case 2: + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT2, D3DDECLUSAGE_BLENDWEIGHT, 0); + break; + case 3: + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT3, D3DDECLUSAGE_BLENDWEIGHT, 0); + break; + case 4: + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT4, D3DDECLUSAGE_BLENDWEIGHT, 0); + break; + default: + ERR("Invalid blend count %u.\n", blend_count); + break; + } + + if (has_blend_idx) + { + if (fvf & D3DFVF_LASTBETA_UBYTE4) + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_UBYTE4, D3DDECLUSAGE_BLENDINDICES, 0); + else if (fvf & D3DFVF_LASTBETA_D3DCOLOR) + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_D3DCOLOR, D3DDECLUSAGE_BLENDINDICES, 0); + } + } + } + + if (fvf & D3DFVF_NORMAL) + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT3, D3DDECLUSAGE_NORMAL, 0); + if (fvf & D3DFVF_PSIZE) + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT1, D3DDECLUSAGE_PSIZE, 0); + if (fvf & D3DFVF_DIFFUSE) + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_D3DCOLOR, D3DDECLUSAGE_COLOR, 0); + if (fvf & D3DFVF_SPECULAR) + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_D3DCOLOR, D3DDECLUSAGE_COLOR, 1); + + for (i = 0; i < tex_count; ++i) + { + switch ((fvf >> (16 + 2 * i)) & 0x03) + { + case D3DFVF_TEXTUREFORMAT1: + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT1, D3DDECLUSAGE_TEXCOORD, i); + break; + case D3DFVF_TEXTUREFORMAT2: + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT2, D3DDECLUSAGE_TEXCOORD, i); + break; + case D3DFVF_TEXTUREFORMAT3: + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT3, D3DDECLUSAGE_TEXCOORD, i); + break; + case D3DFVF_TEXTUREFORMAT4: + append_decl_element(declaration, &idx, &offset, D3DDECLTYPE_FLOAT4, D3DDECLUSAGE_TEXCOORD, i); + break; + } + } + + declaration[idx] = end_element; + + return D3D_OK; } /************************************************************************* diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 882323b..221c81a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -469,7 +469,7 @@ static void test_fvf_to_decl(DWORD test_fvf, const D3DVERTEXELEMENT9 expected_el D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE]; hr = D3DXDeclaratorFromFVF(test_fvf, decl); - todo_wine ok(hr == expected_hr, + ok(hr == expected_hr, "Line %u, test %u: D3DXDeclaratorFromFVF returned %#x, expected %#x.\n", line, test_id, hr, expected_hr); if (SUCCEEDED(hr)) compare_elements(decl, expected_elements, line, test_id);

1 0

Amine Khaldi : mpr: Fix translations.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 59296b7f0c4006edd2c41b181ea6ec03250402ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=59296b7f0c4006edd2c41b181… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Aug 26 18:14:19 2010 +0100 mpr: Fix translations. --- dlls/mpr/mpr_Cs.rc | 4 ++-- dlls/mpr/mpr_Da.rc | 4 ++-- dlls/mpr/mpr_De.rc | 4 ++-- dlls/mpr/mpr_En.rc | 4 ++-- dlls/mpr/mpr_Eo.rc | 4 ++-- dlls/mpr/mpr_Es.rc | 4 ++-- dlls/mpr/mpr_Fr.rc | 4 ++-- dlls/mpr/mpr_Hu.rc | 4 ++-- dlls/mpr/mpr_It.rc | 4 ++-- dlls/mpr/mpr_Ja.rc | 4 ++-- dlls/mpr/mpr_Ko.rc | 4 ++-- dlls/mpr/mpr_Lt.rc | 4 ++-- dlls/mpr/mpr_Nl.rc | 4 ++-- dlls/mpr/mpr_No.rc | 4 ++-- dlls/mpr/mpr_Pl.rc | 4 ++-- dlls/mpr/mpr_Pt.rc | 4 ++-- dlls/mpr/mpr_Ro.rc | 4 ++-- dlls/mpr/mpr_Ru.rc | 4 ++-- dlls/mpr/mpr_Si.rc | 4 ++-- dlls/mpr/mpr_Sv.rc | 4 ++-- dlls/mpr/mpr_Tr.rc | 4 ++-- dlls/mpr/mpr_Uk.rc | 4 ++-- dlls/mpr/mpr_Zh.rc | 8 ++++---- 23 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59296b7f0c4006edd2c41…

1 0

Anders Jonsson : winmm: Add Swedish translation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 8ecf937c10cd6de49a6df046fdad9e48f56103e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ecf937c10cd6de49a6df046f… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu Aug 26 23:07:19 2010 +0200 winmm: Add Swedish translation. --- dlls/winmm/Makefile.in | 1 + dlls/winmm/winmm_Sv.rc | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ecf937c10cd6de49a6df…

1 0

Anders Jonsson : user32: Update Swedish translation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 876dcc96b37e3583188a7958a6bd502bb2ae4a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=876dcc96b37e3583188a7958a… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu Aug 26 23:19:58 2010 +0200 user32: Update Swedish translation. --- dlls/user32/resources/user32_Sv.rc | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/user32/resources/user32_Sv.rc b/dlls/user32/resources/user32_Sv.rc index 8cc3c6c..f851228 100644 --- a/dlls/user32/resources/user32_Sv.rc +++ b/dlls/user32/resources/user32_Sv.rc @@ -1,5 +1,6 @@ /* * Copyright 1998 Karl Backstr�m + * Copyright 2010 Anders Jonsson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,9 +38,9 @@ EDITMENU MENU { POPUP "" BEGIN - MENUITEM "&Undo", EM_UNDO + MENUITEM "&�ngra", EM_UNDO MENUITEM SEPARATOR - MENUITEM "K&lipp", WM_CUT + MENUITEM "Klipp &ut", WM_CUT MENUITEM "&Kopiera", WM_COPY MENUITEM "Klistra &in", WM_PASTE MENUITEM "&Ta bort", WM_CLEAR @@ -53,14 +54,31 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX - PUSHBUTTON "&Ok", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Avbryt", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Avbryt", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&F�rs�k igen", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Stoppa", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Retry", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ignorera", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nej", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&F�rs�k igen", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "For&ts�tt", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Hj�lp", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +MDI_MOREWINDOWS DIALOG 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "V�lj f�nster" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 120, 100, 35, 14 +END + + +STRINGTABLE +{ + IDS_ERROR "Fel" + IDS_MDI_MOREWINDOWS "&Fler f�nster..." +}

1 0