June 2013 - Wine-Commits - list.winehq.org

André Hentschel : winemaker: Don' t add -mno-cygwin to CXXEXTRA per default.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: b4b2656bc800c4c3b93c48444c8f002d8330b3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b2656bc800c4c3b93c48444… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 11 19:54:00 2013 +0200 winemaker: Don't add -mno-cygwin to CXXEXTRA per default. --- tools/winemaker | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 9c5c6a0..c3921a1 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1121,7 +1121,6 @@ sub source_scan_project_file($$$) if ((@$project_settings[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$project_settings[$T_CEXTRA]},"-mno-cygwin"; - push @{@$project_settings[$T_CXXEXTRA]},"-mno-cygwin"; if ($opt_arch != $OPT_ARCH_DEFAULT) { push @{@$project_settings[$T_CEXTRA]},"-m$opt_arch"; push @{@$project_settings[$T_CXXEXTRA]},"-m$opt_arch"; @@ -1681,7 +1680,6 @@ sub source_scan_directory($$$$) if ((@$project_settings[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$project_settings[$T_CEXTRA]},"-mno-cygwin"; - push @{@$project_settings[$T_CXXEXTRA]},"-mno-cygwin"; if ($opt_arch != $OPT_ARCH_DEFAULT) { push @{@$project_settings[$T_CEXTRA]},"-m$opt_arch"; push @{@$project_settings[$T_CXXEXTRA]},"-m$opt_arch";

1 0

Hans Leidekker : msi/tests: Move some more tests and remove a useless test.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: edee379d8190f4c492b63b5f1cdcfc0e93c09252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edee379d8190f4c492b63b5f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 11 15:21:50 2013 +0200 msi/tests: Move some more tests and remove a useless test. --- dlls/msi/tests/install.c | 193 ----------------------------------------- dlls/msi/tests/msi.c | 213 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 197 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edee379d8190f4c492b63…

1 0

Tatyana Fokina : kernel32: Check the size of the string in CompareStringA.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: aaed0e81d51678cbb43cdd4c1b774eaf1e4be71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaed0e81d51678cbb43cdd4c1… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Tue Jun 11 17:41:16 2013 +0400 kernel32: Check the size of the string in CompareStringA. --- dlls/kernel32/locale.c | 6 +++--- dlls/kernel32/tests/locale.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 86720ff..9ddf078 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2979,7 +2979,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, WCHAR *buf1W = NtCurrentTeb()->StaticUnicodeBuffer; WCHAR *buf2W = buf1W + 130; LPWSTR str1W, str2W; - INT len1W, len2W, ret; + INT len1W = 0, len2W = 0, ret; UINT locale_cp = CP_ACP; if (!str1 || !str2) @@ -2994,7 +2994,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, if (len1) { - len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); + if (len1 <= 130) len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); if (len1W) str1W = buf1W; else @@ -3017,7 +3017,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, if (len2) { - len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); + if (len2 <= 130) len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); if (len2W) str2W = buf2W; else diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b6198d1..772d13b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1466,7 +1466,6 @@ static void test_CompareStringA(void) memset(a, 'a', sizeof(a)); SetLastError(0xdeadbeef); ret = CompareStringA(lcid, 0, a, sizeof(a), a, sizeof(a)); - todo_wine ok (GetLastError() == 0xdeadbeef && ret == CSTR_EQUAL, "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); }

1 0

Alexandre Julliard : wineboot: Don' t print an error when failing to delete a file.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: 849ea3d6515dd2a64991a0d8dc580b7a074427f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849ea3d6515dd2a64991a0d8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 13:50:05 2013 +0200 wineboot: Don't print an error when failing to delete a file. --- programs/wineboot/wineboot.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 7b68747..b8512e3 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -545,21 +545,7 @@ static BOOL pendingRename(void) } else { /* Delete the file or directory */ - if( (res=GetFileAttributesW(src))!=INVALID_FILE_ATTRIBUTES ) - { - if( (res&FILE_ATTRIBUTE_DIRECTORY)==0 ) - { - /* It's a file */ - DeleteFileW(src); - } else - { - /* It's a directory */ - RemoveDirectoryW(src); - } - } else - { - WINE_ERR("couldn't get file attributes (%d)\n", GetLastError() ); - } + if (!RemoveDirectoryW( src ) && GetLastError() == ERROR_DIRECTORY) DeleteFileW( src ); } }

1 0

Alistair Leslie-Hughes : dbs.idl: Add DBPROPVAL defines.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: 6fd87c4053fb063b84ecfbca8d8491d64f561197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd87c4053fb063b84ecfbca8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 5 09:26:02 2013 +1000 dbs.idl: Add DBPROPVAL defines. --- include/dbs.idl | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index ee8eacf..46deb6a 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -482,6 +482,32 @@ cpp_quote("#define DBPROMPT_COMPLETE 0x02") cpp_quote("#define DBPROMPT_COMPLETEREQUIRED 0x03") cpp_quote("#define DBPROMPT_NOPROMPT 0x04") +cpp_quote("#define DBPROPVAL_STGM_READ OF_READ") +cpp_quote("#define DBPROPVAL_STGM_WRITE OF_WRITE") +cpp_quote("#define DBPROPVAL_STGM_READWRITE OF_READWRITE") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_NONE OF_SHARE_DENY_NONE") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_READ OF_SHARE_DENY_READ") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_WRITE OF_SHARE_DENY_WRITE)") +cpp_quote("#define DBPROPVAL_STGM_SHARE_EXCLUSIVE OF_SHARE_EXCLUSIVE") +cpp_quote("#define DBPROPVAL_STGM_DIRECT 0x00010000") +cpp_quote("#define DBPROPVAL_STGM_TRANSACTED 0x00020000") +cpp_quote("#define DBPROPVAL_STGM_CREATE OF_CREATE") +cpp_quote("#define DBPROPVAL_STGM_CONVERT 0x00040000") +cpp_quote("#define DBPROPVAL_STGM_FAILIFTHERE 0x00080000") +cpp_quote("#define DBPROPVAL_STGM_PRIORITY 0x00100000") +cpp_quote("#define DBPROPVAL_STGM_DELETEONRELEASE 0x00200000") +cpp_quote("#define DBPROPVAL_GB_COLLATE __MSABI_LONG(0x00000010)") +cpp_quote("#define DBPROPVAL_CS_UNINITIALIZED __MSABI_LONG(0x00000000)") +cpp_quote("#define DBPROPVAL_CS_INITIALIZED __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_CS_COMMUNICATIONFAILURE __MSABI_LONG(0x00000002)") + +cpp_quote("#define DBPROPVAL_RD_RESETALL __MSABI_LONG(0xffffffff)") +cpp_quote("#define DBPROPVAL_OS_RESOURCEPOOLING __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_OS_TXNENLISTMENT __MSABI_LONG(0x00000002)") +cpp_quote("#define DBPROPVAL_OS_CLIENTCURSOR __MSABI_LONG(0x00000004)") +cpp_quote("#define DBPROPVAL_OS_ENABLEALL __MSABI_LONG(0xffffffff)") +cpp_quote("#define DBPROPVAL_BI_CROSSROWSET __MSABI_LONG(0x00000001)") + typedef struct tagDBCOLUMNACCESS {

1 0

Aric Stewart : gdi32: Update Arabic font defaults.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: f5ec65ad8ebe9f25e360bbc272b1d3b4d4efb609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ec65ad8ebe9f25e360bbc27… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 11 09:15:38 2013 -0500 gdi32: Update Arabic font defaults. With help from Mosaab Alzoubi <moceap(a)hotmail.com>. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f884307..62e1608 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3406,7 +3406,7 @@ static const struct nls_update_font_list /* Arabic */ { 1256, 720, "vgaoem.fon", "vgaf1256.fon", "vgas1256.fon", "coue1256.fon", "sere1256.fon", "smae1256.fon", "ssee1256.fon", "ssef1256.fon", - "Tahoma","Times New Roman", /* FIXME unverified */ + "Microsoft Sans Serif","Times New Roman", "Fixedsys,178", "System,178", "Courier New,178", "MS Serif,178", "Small Fonts,178", "MS Sans Serif,178", "MS Sans Serif,178", "MS Serif,178",

1 0

Tatyana Fokina : kernel32/tests: Add test with a large string for CompareStringA.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: 28951a0922fecbc10e1043dd32dd5241b074684e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28951a0922fecbc10e1043dd3… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Tue Jun 11 17:35:19 2013 +0400 kernel32/tests: Add test with a large string for CompareStringA. --- dlls/kernel32/tests/locale.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f1c66e2..b6198d1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1328,6 +1328,7 @@ static const struct comparestringa_entry comparestringa_data[] = { static void test_CompareStringA(void) { int ret, i; + char a[256]; LCID lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); for (i = 0; i < sizeof(comparestringa_data)/sizeof(struct comparestringa_entry); i++) @@ -1461,6 +1462,13 @@ static void test_CompareStringA(void) todo_wine ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be greater than \'a\'\n"); ret = CompareStringA(lcid, 0, "\xB9", 1, "b", 1); ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be smaller than \'b\'\n"); + + memset(a, 'a', sizeof(a)); + SetLastError(0xdeadbeef); + ret = CompareStringA(lcid, 0, a, sizeof(a), a, sizeof(a)); + todo_wine + ok (GetLastError() == 0xdeadbeef && ret == CSTR_EQUAL, + "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); } static void test_LCMapStringA(void)

1 0

Christian Costa : d3dxof: Add test for standard templates.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: f054431c637078e20fbdacb87ac574d6314df519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f054431c637078e20fbdacb87… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 10 09:19:19 2013 +0200 d3dxof: Add test for standard templates. --- dlls/d3dxof/tests/d3dxof.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 8d322ad..3a92ce9 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -24,6 +24,7 @@ #include "wine/test.h" #include "initguid.h" #include "dxfile.h" +#include "rmxftmpl.h" #define I2(x) x,0 #define I4(x) x,0,0,0 @@ -1014,6 +1015,32 @@ static void test_complex_object(void) IDirectXFileEnumObject_Release(enum_object); IDirectXFile_Release(dxfile); } + +static void test_standard_templates(void) +{ + HRESULT ret; + IDirectXFile *dxfile = NULL; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + ret = pDirectXFileCreate(&dxfile); + ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + ret = IDirectXFile_RegisterTemplates(dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); + ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + + IDirectXFile_Release(dxfile); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -1199,6 +1226,7 @@ START_TEST(d3dxof) test_syntax(); test_syntax_semicolon_comma(); test_complex_object(); + test_standard_templates(); test_dump(); FreeLibrary(hd3dxof);

1 0

André Hentschel : oleaut32/tests: Add tests for VarDecCmpR8 (gcov).
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: b3f7de8fecbaf15179bcf2cbf972590c4d5d7e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f7de8fecbaf15179bcf2cbf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 23:27:24 2013 +0200 oleaut32/tests: Add tests for VarDecCmpR8 (gcov). --- dlls/oleaut32/tests/vartype.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4411d7d..345a822 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -482,6 +482,7 @@ static HRESULT (WINAPI *pVarDecSub)(const DECIMAL*,const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarDecMul)(const DECIMAL*,const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarDecDiv)(const DECIMAL*,const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarDecCmp)(const DECIMAL*,const DECIMAL*); +static HRESULT (WINAPI *pVarDecCmpR8)(const DECIMAL*,double); static HRESULT (WINAPI *pVarDecNeg)(const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarBoolFromUI1)(BYTE,VARIANT_BOOL*); @@ -4258,6 +4259,8 @@ static void test_VarDecFromCy(void) #define MATH1(func) hres = p##func(&l, &out) #undef MATH2 #define MATH2(func) hres = p##func(&l, &r, &out) +#undef MATH3 +#define MATH3(func) hres = p##func(&l, r) static void test_VarDecAbs(void) { @@ -4554,6 +4557,36 @@ static void test_VarDecCmp(void) } +static void test_VarDecCmpR8(void) +{ + HRESULT hres; + DECIMAL l; + double r; + + CHECKPTR(VarDecCmpR8); + + SETDEC(l,0,0,0,1); r = 0.0; MATH3(VarDecCmpR8); EXPECT_GT; + SETDEC(l,0,0,0,1); r = 0.1; MATH3(VarDecCmpR8); EXPECT_GT; + SETDEC(l,0,0,0,1); r = -0.1; MATH3(VarDecCmpR8); EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,0,1); r = 0.0; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); r = 0.1; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); r = -0.1; MATH3(VarDecCmpR8); EXPECT_LT; + + SETDEC(l,0,0,0,0); r = 0.0; MATH3(VarDecCmpR8); EXPECT_EQ; + SETDEC(l,0,0,0,0); r = 0.1; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,0,0,0); r = -0.1; MATH3(VarDecCmpR8); EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,0,0); r = 0.0; MATH3(VarDecCmpR8); EXPECT_EQ; + SETDEC(l,0,DECIMAL_NEG,0,0); r = 0.1; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,0); r = -0.1; MATH3(VarDecCmpR8); EXPECT_GT; + + SETDEC(l,0,0,0,1); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,0); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,0,-1,-1); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_GT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_LT; +} + /* * VT_BOOL */ @@ -6358,6 +6391,7 @@ START_TEST(vartype) test_VarDecAdd(); test_VarDecSub(); test_VarDecCmp(); + test_VarDecCmpR8(); test_VarDecMul(); test_VarDecDiv();

1 0

Henri Verbeet : wined3d: Introduce a helper function for printing floats in GLSL shaders.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: e0494afa007a1d1ba2f4b649beedca27cb20808e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0494afa007a1d1ba2f4b649b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 10:21:28 2013 +0200 wined3d: Introduce a helper function for printing floats in GLSL shaders. --- dlls/wined3d/arb_program_shader.c | 7 ++ dlls/wined3d/glsl_shader.c | 120 ++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 7 -- 3 files changed, 105 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ef75a2f..fd2df68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -39,6 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d); +/* sRGB correction constants */ +static const float srgb_cmp = 0.0031308f; +static const float srgb_mul_low = 12.92f; +static const float srgb_pow = 0.41666f; +static const float srgb_mul_high = 1.055f; +static const float srgb_sub_high = 0.055f; + static BOOL shader_is_pshader_version(enum wined3d_shader_type type) { return type == WINED3D_SHADER_TYPE_PIXEL; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0379729..ffe4d25 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -47,6 +47,9 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_GLSL_SAMPLE_LOD 0x4 #define WINED3D_GLSL_SAMPLE_GRAD 0x8 +static const float srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; /* pow, mul_high, sub_high, mul_low */ +static const float srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; /* cmp */ + struct glsl_dst_param { char reg_name[150]; @@ -242,6 +245,64 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } +/* This should be equivalent to using the %.8e format specifier, but always + * using '.' as decimal separator. This doesn't handle +/-INF or NAN, since + * the GLSL parser wouldn't be able to handle those anyway. */ +static void shader_glsl_ftoa(float value, char *s) +{ + int x, frac, exponent; + const char *sign = ""; + double d; + + d = value; + if (copysignf(1.0f, value) < 0.0f) + { + d = -d; + sign = "-"; + } + + if (d == 0.0f) + { + x = 0; + frac = 0; + exponent = 0; + } + else + { + double t, diff; + + exponent = floorf(log10f(d)); + d /= pow(10.0, exponent); + + x = d; + t = (d - x) * 100000000; + frac = t; + diff = t - frac; + + if ((diff > 0.5) || (diff == 0.5 && (frac & 1))) + { + if (++frac >= 100000000) + { + frac = 0; + ++x; + } + } + } + + sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); +} + +static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) +{ + char str[4][16]; + + shader_glsl_ftoa(values[0], str[0]); + shader_glsl_ftoa(values[1], str[1]); + shader_glsl_ftoa(values[2], str[2]); + shader_glsl_ftoa(values[3], str[3]); + shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); +} + /* Extract a line from the info log. * Note that this modifies the source string. */ static char *get_info_log_line(char **ptr) @@ -1206,10 +1267,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (ps_args->srgb_correction) { - shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", - srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", - srgb_cmp); + shader_addline(buffer, "const vec4 srgb_const0 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_addline(buffer, ";\n"); + shader_addline(buffer, "const vec4 srgb_const1 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) { @@ -1221,13 +1284,21 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } else { - /* This happens because we do not have proper tracking of the constant registers that are - * actually used, only the max limit of the shader version - */ + float ycorrection[] = + { + context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, + context->render_offscreen ? 1.0f : -1.0f, + 0.0f, + 0.0f, + }; + + /* This happens because we do not have proper tracking of the + * constant registers that are actually used, only the max + * limit of the shader version. */ FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", - context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, - context->render_offscreen ? 1.0f : -1.0f); + shader_addline(buffer, "const vec4 ycorrection = "); + shader_glsl_append_imm_vec4(buffer, ycorrection); + shader_addline(buffer, ";\n"); } shader_addline(buffer, "vec4 vpos;\n"); } @@ -1261,10 +1332,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { - const float *value; - value = (const float *)lconst->value; - shader_addline(buffer, "const vec4 %s_lc%u = vec4(%.8e, %.8e, %.8e, %.8e);\n", - prefix, lconst->idx, value[0], value[1], value[2], value[3]); + shader_addline(buffer, "const vec4 %s_lc%u = ", prefix, lconst->idx); + shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value); + shader_addline(buffer, ";\n"); } } @@ -1388,6 +1458,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; + char imm_str[4][16]; if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); @@ -1583,7 +1654,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + shader_glsl_ftoa(*(const float *)reg->immconst_data, register_name); break; case WINED3D_DATA_INT: sprintf(register_name, "%#x", reg->immconst_data[0]); @@ -1603,9 +1674,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], - *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); + sprintf(register_name, "vec4(%s, %s, %s, %s)", + imm_str[0], imm_str[1], imm_str[2], imm_str[3]); break; case WINED3D_DATA_INT: sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", @@ -5399,10 +5473,12 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf if (settings->sRGB_write) { - shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", - srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", - srgb_cmp); + shader_addline(buffer, "const vec4 srgb_const0 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_addline(buffer, ";\n"); + shader_addline(buffer, "const vec4 srgb_const1 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_addline(buffer, ";\n"); } shader_addline(buffer, "void main()\n{\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6539548..4ac9098 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2854,13 +2854,6 @@ struct ps_np2fixup_info { WORD num_consts; }; -/* sRGB correction constants */ -static const float srgb_cmp = 0.0031308f; -static const float srgb_mul_low = 12.92f; -static const float srgb_pow = 0.41666f; -static const float srgb_mul_high = 1.055f; -static const float srgb_sub_high = 0.055f; - struct wined3d_palette { LONG ref;

1 0