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

Aric Stewart : usp10: Correct Left and Right confusions for Arabic joining and shaping.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: e276fbc22284135019c15bba055ad943328a4b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e276fbc22284135019c15bba0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 10:08:30 2010 -0500 usp10: Correct Left and Right confusions for Arabic joining and shaping. --- dlls/usp10/shape.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bccb1fd..71022ef 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -51,8 +51,8 @@ enum joining_types { enum joined_forms { Xn=0, - Xl, Xr, + Xl, Xm }; @@ -448,12 +448,12 @@ static CHAR neighbour_joining_type(int i, int delta, const CHAR* context_type, I static inline BOOL right_join_causing(CHAR joining_type) { - return (joining_type == jtR || joining_type == jtD || joining_type == jtC); + return (joining_type == jtL || joining_type == jtD || joining_type == jtC); } static inline BOOL left_join_causing(CHAR joining_type) { - return (joining_type == jtL || joining_type == jtD || joining_type == jtC); + return (joining_type == jtR || joining_type == jtD || joining_type == jtC); } /* SHAPE_ShapeArabicGlyphs @@ -470,13 +470,13 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC if (!psa->fLogicalOrder && psa->fRTL) { - dirR = -1; - dirL = 1; + dirR = 1; + dirL = -1; } else { - dirR = 1; - dirL = -1; + dirR = -1; + dirL = 1; } if (!psc->GSUB_Table)

1 0

Austin English : ntdll: Add stub for NtRaiseHardError.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: c4ea80cf9becae4a63f74ab818df26b69c55d911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ea80cf9becae4a63f74ab81… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 20 12:30:46 2010 -0500 ntdll: Add stub for NtRaiseHardError. --- dlls/ntdll/error.c | 11 +++++++++++ dlls/ntdll/ntdll.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 4c7d5a7..5537c87 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -128,6 +128,17 @@ DWORD WINAPI RtlGetLastWin32Error(void) return NtCurrentTeb()->LastErrorValue; } +/********************************************************************** + * NtRaiseHardError (NTDLL.@) + */ +NTSTATUS WINAPI NtRaiseHardError( NTSTATUS ErrorStatus, ULONG NumberOfParameters, + PUNICODE_STRING UnicodeStringParameterMask, PVOID *Paramaters, + HARDERROR_RESPONSE_OPTION ResponseOption, PHARDERROR_RESPONSE Response ) +{ + FIXME(": stub. Errorstatus was %08x\n", ErrorStatus); + return STATUS_NOT_IMPLEMENTED; +} + /*********************************************************************** * RtlSetLastWin32Error (NTDLL.@) * RtlRestoreLastWin32Error (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 241f3d8..37e0cca 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -275,7 +275,7 @@ @ stdcall NtQueryVolumeInformationFile(long ptr ptr long long) @ stdcall NtQueueApcThread(long ptr long long long) @ stdcall NtRaiseException(ptr ptr long) -@ stub NtRaiseHardError +@ stdcall NtRaiseHardError(long long ptr ptr long long) @ stdcall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) @ stub NtReadRequestData

1 0

Andrew Nguyen : ole32: Validate pointer parameters in MkParseDisplayName.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 7bdf023e69331c63eaa15c3808c97888e6d9c2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdf023e69331c63eaa15c380… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu May 20 10:35:27 2010 -0500 ole32: Validate pointer parameters in MkParseDisplayName. --- dlls/ole32/moniker.c | 8 +++++++- dlls/ole32/tests/moniker.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 2fb03ae..b0030de 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1109,7 +1109,13 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szDisplayName, TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(szDisplayName), pchEaten, ppmk); - if (!(IsValidInterface((LPUNKNOWN) pbc))) + if (!pbc || !IsValidInterface((LPUNKNOWN) pbc)) + return E_INVALIDARG; + + if (!szDisplayName || !*szDisplayName) + return E_INVALIDARG; + + if (!pchEaten || !ppmk) return E_INVALIDARG; *pchEaten = 0; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b4e3e2f..4432f99 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -814,12 +814,53 @@ static void test_MkParseDisplayName(void) static const WCHAR wszDisplayNameProgId1[] = {'S','t','d','F','o','n','t',':',0}; static const WCHAR wszDisplayNameProgId2[] = {'@','S','t','d','F','o','n','t',0}; static const WCHAR wszDisplayNameProgIdFail[] = {'S','t','d','F','o','n','t',0}; + static const WCHAR wszEmpty[] = {0}; char szDisplayNameFile[256]; WCHAR wszDisplayNameFile[256]; + int i; + + const struct + { + LPBC *ppbc; + LPCOLESTR szDisplayName; + LPDWORD pchEaten; + LPMONIKER *ppmk; + } invalid_parameters[] = + { + {NULL, NULL, NULL, NULL}, + {NULL, NULL, NULL, &pmk}, + {NULL, NULL, &eaten, NULL}, + {NULL, NULL, &eaten, &pmk}, + {NULL, wszEmpty, NULL, NULL}, + {NULL, wszEmpty, NULL, &pmk}, + {NULL, wszEmpty, &eaten, NULL}, + {NULL, wszEmpty, &eaten, &pmk}, + {&pbc, NULL, NULL, NULL}, + {&pbc, NULL, NULL, &pmk}, + {&pbc, NULL, &eaten, NULL}, + {&pbc, NULL, &eaten, &pmk}, + {&pbc, wszEmpty, NULL, NULL}, + {&pbc, wszEmpty, NULL, &pmk}, + {&pbc, wszEmpty, &eaten, NULL}, + {&pbc, wszEmpty, &eaten, &pmk}, + }; hr = CreateBindCtx(0, &pbc); ok_ole_success(hr, CreateBindCtx); + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + eaten = 0xdeadbeef; + pmk = (IMoniker *)0xdeadbeef; + hr = MkParseDisplayName(invalid_parameters[i].ppbc ? *invalid_parameters[i].ppbc : NULL, + invalid_parameters[i].szDisplayName, + invalid_parameters[i].pchEaten, + invalid_parameters[i].ppmk); + ok(hr == E_INVALIDARG, "[%d] MkParseDisplayName should have failed with E_INVALIDARG instead of 0x%08x\n", i, hr); + ok(eaten == 0xdeadbeef, "[%d] Processed character count should have been 0xdeadbeef instead of %u\n", i, eaten); + ok(pmk == (IMoniker *)0xdeadbeef, "[%d] Output moniker pointer should have been 0xdeadbeef instead of %p\n", i, pmk); + } + hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr);

1 0

Marcus Meissner : msvcrt: Check locale for NULL before freeing.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 27a28bf29fabcaf3ef5c62cd746b6b16e67cc034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a28bf29fabcaf3ef5c62cd7… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 20 16:20:29 2010 +0200 msvcrt: Check locale for NULL before freeing. --- dlls/msvcrt/locale.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 30cd5b5..a347962 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -576,6 +576,9 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) { int i; + if (!locale) + return; + for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) { MSVCRT_free(locale->locinfo->lc_category[i].locale); MSVCRT_free(locale->locinfo->lc_category[i].refcount);

1 0

Andrew Nguyen : ole32/tests: Add tests for output parameters in MkParseDisplayName.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 07325c7d7cba3383cb1bd070263cc3b9a9679597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07325c7d7cba3383cb1bd0702… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 19 22:26:10 2010 -0500 ole32/tests: Add tests for output parameters in MkParseDisplayName. --- dlls/ole32/tests/moniker.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 4432f99..876d034 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -817,7 +817,7 @@ static void test_MkParseDisplayName(void) static const WCHAR wszEmpty[] = {0}; char szDisplayNameFile[256]; WCHAR wszDisplayNameFile[256]; - int i; + int i, len; const struct { @@ -861,15 +861,23 @@ static void test_MkParseDisplayName(void) ok(pmk == (IMoniker *)0xdeadbeef, "[%d] Output moniker pointer should have been 0xdeadbeef instead of %p\n", i, pmk); } + eaten = 0xdeadbeef; + pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); + ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); + ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); /* no special handling of "clsid:" without the string form of the clsid * following */ + eaten = 0xdeadbeef; + pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk); ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); + ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); + ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); /* shows clsid has higher precedence than a running object */ hr = CreateFileMoniker(wszDisplayName, &pmk); @@ -882,6 +890,8 @@ static void test_MkParseDisplayName(void) pmk = NULL; hr = MkParseDisplayName(pbc, wszDisplayName, &eaten, &pmk); ok_ole_success(hr, MkParseDisplayName); + ok(eaten == sizeof(wszDisplayName)/sizeof(WCHAR) - 1, + "Processed character count should have been 43 instead of %u\n", eaten); if (pmk) { IMoniker_IsSystemMoniker(pmk, &moniker_type); @@ -902,6 +912,8 @@ static void test_MkParseDisplayName(void) pmk = NULL; hr = MkParseDisplayName(pbc, wszDisplayNameRunning, &eaten, &pmk); ok_ole_success(hr, MkParseDisplayName); + ok(eaten == sizeof(wszDisplayNameRunning)/sizeof(WCHAR) - 1, + "Processed character count should have been 15 instead of %u\n", eaten); if (pmk) { IMoniker_IsSystemMoniker(pmk, &moniker_type); @@ -918,6 +930,8 @@ static void test_MkParseDisplayName(void) expected_display_name = wszDisplayNameProgId1; hr = MkParseDisplayName(pbc, wszDisplayNameProgId1, &eaten, &pmk); ok_ole_success(hr, MkParseDisplayName); + ok(eaten == sizeof(wszDisplayNameProgId1)/sizeof(WCHAR) - 1, + "Processed character count should have been 8 instead of %u\n", eaten); if (pmk) { IMoniker_IsSystemMoniker(pmk, &moniker_type); @@ -928,6 +942,8 @@ static void test_MkParseDisplayName(void) expected_display_name = wszDisplayNameProgId2; hr = MkParseDisplayName(pbc, wszDisplayNameProgId2, &eaten, &pmk); ok_ole_success(hr, MkParseDisplayName); + ok(eaten == sizeof(wszDisplayNameProgId2)/sizeof(WCHAR) - 1, + "Processed character count should have been 8 instead of %u\n", eaten); if (pmk) { IMoniker_IsSystemMoniker(pmk, &moniker_type); @@ -935,18 +951,23 @@ static void test_MkParseDisplayName(void) IMoniker_Release(pmk); } + eaten = 0xdeadbeef; + pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk); ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, "MkParseDisplayName with ProgId without marker should fail with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); + ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); + ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); hr = CoRevokeClassObject(pdwReg1); ok_ole_success(hr, CoRevokeClassObject); GetSystemDirectoryA(szDisplayNameFile, sizeof(szDisplayNameFile)); strcat(szDisplayNameFile, "\\kernel32.dll"); - MultiByteToWideChar(CP_ACP, 0, szDisplayNameFile, -1, wszDisplayNameFile, sizeof(wszDisplayNameFile)/sizeof(wszDisplayNameFile[0])); + len = MultiByteToWideChar(CP_ACP, 0, szDisplayNameFile, -1, wszDisplayNameFile, sizeof(wszDisplayNameFile)/sizeof(wszDisplayNameFile[0])); hr = MkParseDisplayName(pbc, wszDisplayNameFile, &eaten, &pmk); ok_ole_success(hr, MkParseDisplayName); + ok(eaten == len - 1, "Processed character count should have been %d instead of %u\n", len - 1, eaten); if (pmk) { IMoniker_IsSystemMoniker(pmk, &moniker_type); @@ -956,6 +977,7 @@ static void test_MkParseDisplayName(void) hr = MkParseDisplayName(pbc, wszDisplayName, &eaten, &pmk); ok_ole_success(hr, MkParseDisplayName); + ok(eaten == sizeof(wszDisplayName)/sizeof(WCHAR) - 1, "Processed character count should have been 43 instead of %u\n", eaten); if (pmk) {

1 0

Matteo Bruni : d3dx9: Check for oCx register number.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 961db7964d89e7650a5618a53c5a3cf94b28515a URL: http://source.winehq.org/git/wine.git/?a=commit;h=961db7964d89e7650a5618a53… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri May 21 15:53:44 2010 +0200 d3dx9: Check for oCx register number. --- dlls/d3dx9_36/asmparser.c | 2 +- dlls/d3dx9_36/tests/asm.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 3062639..dfd0936 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -259,7 +259,7 @@ static const struct allowed_reg_type ps_3_reg_allowed[] = { { BWRITERSPR_MISCTYPE, 2 }, /* vPos and vFace */ { BWRITERSPR_LOOP, 1 }, { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_COLOROUT, ~0U }, + { BWRITERSPR_COLOROUT, 4 }, { BWRITERSPR_DEPTHOUT, 1 }, { ~0U, 0 } /* End tag */ }; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 79c6c07..0b8cd3e 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1146,6 +1146,11 @@ static void ps_3_0_test(void) { "texkill v0\n", {0xffff0300, 0x01000041, 0x900f0000, 0x0000ffff} }, + { /* shader 11 */ + "ps_3_0\n" + "add oC3, r0, r1\n", + {0xffff0300, 0x03000002, 0x800f0803, 0x80e40000, 0x80e40001, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1236,6 +1241,12 @@ static void failure_test(void) { /* shader 25: _x4 instruction modified not allowed in > ps_1_x */ "ps_3_0\n" "add_x4 r0, r0, r1\n", + /* shader 26: there aren't oCx registers in ps_1_x */ + "ps_1_3\n" + "add oC0, r0, r1\n", + /* shader 27: oC3 is the max in >= ps_2_0 */ + "ps_3_0\n" + "add oC4, r0, r1\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Add missing texkill instruction parsing.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 1d3f462fefb687b8719d1ffcab71073dbf772ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3f462fefb687b8719d1ffca… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 20 01:21:40 2010 +0200 d3dx9: Add missing texkill instruction parsing. --- dlls/d3dx9_36/asmshader.y | 9 ++++++--- dlls/d3dx9_36/tests/asm.c | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 06a6825..0949ee3 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -705,6 +705,11 @@ instruction: INSTR_ADD omods dreg ',' sregs TRACE("DP2ADD\n"); asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_DP2ADD, $2.mod, $2.shift, 0, &$3, &$5, 3); } + | INSTR_TEXKILL dreg + { + TRACE("TEXKILL\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEXKILL, 0, 0, 0, &$2, 0, 0); + } | INSTR_TEXLD omods dreg ',' sregs { TRACE("TEXLD\n"); @@ -769,9 +774,7 @@ dreg_name: REG_TEMP } | REG_INPUT { - asmparser_message(&asm_ctx, "Line %u: Register v%u is not a valid destination register\n", - asm_ctx.line_no, $1); - set_parse_status(&asm_ctx, PARSE_WARN); + $$.regnum = $1; $$.type = BWRITERSPR_INPUT; } | REG_CONSTFLOAT { diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 54894df..79c6c07 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1141,6 +1141,11 @@ static void ps_3_0_test(void) { {0xffff0300, 0x0500005d, 0x802f0000, 0x80e40001, 0x80e40002, 0x80e40003, 0x80e40004, 0x0000ffff} }, + { /* shader 10 */ + "ps_3_0\n" + "texkill v0\n", + {0xffff0300, 0x01000041, 0x900f0000, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Stefan Dösinger : wined3d: Order the helper constants a bit better.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: a0143e142badc610582250023e7cd7c6296cbf1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0143e142badc610582250023… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 12 22:35:23 2010 +0200 wined3d: Order the helper constants a bit better. --- dlls/wined3d/arb_program_shader.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0235652..54b361b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -140,10 +140,10 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar { switch (value) { - case ARB_ZERO: return "ps_helper_const.y"; - case ARB_ONE: return "ps_helper_const.x"; + case ARB_ZERO: return "ps_helper_const.x"; + case ARB_ONE: return "ps_helper_const.y"; case ARB_TWO: return "coefmul.x"; - case ARB_0001: return "helper_const.yyyx"; + case ARB_0001: return "helper_const.xxxy"; default: break; } } @@ -151,11 +151,11 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar { switch (value) { - case ARB_ZERO: return "helper_const.w"; + case ARB_ZERO: return "helper_const.x"; case ARB_ONE: return "helper_const.y"; - case ARB_TWO: return "helper_const.x"; - case ARB_0001: return "helper_const.wwwy"; - case ARB_VS_REL_OFFSET: return "helper_const.z"; + case ARB_TWO: return "helper_const.z"; + case ARB_0001: return "helper_const.xxxy"; + case ARB_VS_REL_OFFSET: return "helper_const.w"; } } FIXME("Unmanaged %s shader helper constant requested: %u\n", @@ -3550,7 +3550,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct if(dcl_td) shader_addline(buffer, "TEMP TD;\n"); /* Used for sRGB writing */ shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n"); shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n"); - shader_addline(buffer, "PARAM ps_helper_const = { 1.0, 0.0, 0.0, 0.0 };\n"); + shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, 0.0, 0.0 };\n"); if (reg_maps->shader_version.major < 2) { @@ -4046,7 +4046,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct shader_addline(buffer, "TEMP TMP_OUT;\n"); if(need_helper_const(gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 2.0, 1.0, %d.0, 0.0 };\n", This->rel_offset); + shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %d.0 };\n", This->rel_offset); } if(need_mova_const((IWineD3DBaseShader *) This, gl_info)) { shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n");

1 0

Stefan Dösinger : wined3d: Make the mova constant more generic for relative addressing.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: ed74fcefc891ac92851b8936ed0a053c09499bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed74fcefc891ac92851b8936e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 12 22:51:24 2010 +0200 wined3d: Make the mova constant more generic for relative addressing. --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 54b361b..ed74eaf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -81,10 +81,13 @@ static void shader_arb_dump_program_source(const char *source) } /* GL locking for state handlers is done by the caller. */ -static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_rel_addr_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) shader; - if(!This->baseShader.reg_maps.usesmova) return FALSE; + if (shader->baseShader.reg_maps.shader_version.type == WINED3D_SHADER_TYPE_VERTEX) + { + if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) return TRUE; + } + if (!shader->baseShader.reg_maps.usesmova) return FALSE; return !gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]; } @@ -95,26 +98,24 @@ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) && !(gl_info->quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); } -static BOOL need_helper_const(const struct wined3d_gl_info *gl_info) +static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - if (!gl_info->supported[NV_VERTEX_PROGRAM] /* Need to init colors. */ - || gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT /* Load the immval offset. */ - || gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W /* Have to init texcoords. */ - || (!use_nv_clip(gl_info)) /* Init the clip texcoord */) - { - return TRUE; - } + if (need_rel_addr_const(shader, gl_info)) return TRUE; + if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ + if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ + if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ + if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ return FALSE; } -static unsigned int reserved_vs_const(IWineD3DBaseShader *shader, const struct wined3d_gl_info *gl_info) +static unsigned int reserved_vs_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) { unsigned int ret = 1; /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader */ - if(need_helper_const(gl_info)) ret++; - if(need_mova_const(shader, gl_info)) ret++; + if(need_helper_const(shader, gl_info)) ret++; + if(need_rel_addr_const(shader, gl_info)) ret++; return ret; } @@ -155,7 +156,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ONE: return "helper_const.y"; case ARB_TWO: return "helper_const.z"; case ARB_0001: return "helper_const.xxxy"; - case ARB_VS_REL_OFFSET: return "helper_const.w"; + case ARB_VS_REL_OFFSET: return "rel_addr_const.y"; } } FIXME("Unmanaged %s shader helper constant requested: %u\n", @@ -739,7 +740,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF -= reserved_vs_const(iface, gl_info); + max_constantsF -= reserved_vs_const(This, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -1738,6 +1739,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; BOOL pshader = shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; + const char *zero = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_ZERO); + const char *one = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_ONE); + const char *two = arb_get_helper_value(shader->baseShader.reg_maps.shader_version.type, ARB_TWO); struct wined3d_shader_buffer *buffer = ins->ctx->buffer; char src0_param[256]; @@ -1763,11 +1767,11 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * The ARL is performed when A0 is used - the requested component is read from A0_SHADOW into * A0.x. We can use the overwritten component of A0_shadow as temporary storage for the sign. */ - shader_addline(buffer, "SGE A0_SHADOW%s, %s, mova_const.y;\n", write_mask, src0_param); - shader_addline(buffer, "MAD A0_SHADOW%s, A0_SHADOW, mova_const.z, -mova_const.w;\n", write_mask); + shader_addline(buffer, "SGE A0_SHADOW%s, %s, %s;\n", write_mask, src0_param, zero); + shader_addline(buffer, "MAD A0_SHADOW%s, A0_SHADOW, %s, -%s;\n", write_mask, two, one); shader_addline(buffer, "ABS TA%s, %s;\n", write_mask, src0_param); - shader_addline(buffer, "ADD TA%s, TA, mova_const.x;\n", write_mask); + shader_addline(buffer, "ADD TA%s, TA, rel_addr_const.x;\n", write_mask); shader_addline(buffer, "FLR TA%s, TA;\n", write_mask); if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { @@ -3103,7 +3107,7 @@ static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_sh /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */ - if(need_helper_const(gl_info)) { + if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { const char *two = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_TWO); shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, %s, -TMP_OUT.w;\n", two); } else { @@ -4045,11 +4049,11 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct } shader_addline(buffer, "TEMP TMP_OUT;\n"); - if(need_helper_const(gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %d.0 };\n", This->rel_offset); + if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { + shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, 0.0 };\n"); } - if(need_mova_const((IWineD3DBaseShader *) This, gl_info)) { - shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); + if(need_rel_addr_const((IWineD3DBaseShaderImpl *) This, gl_info)) { + shader_addline(buffer, "PARAM rel_addr_const = { 0.5, %d.0, 0.0, 0.0 };\n", This->rel_offset); shader_addline(buffer, "TEMP A0_SHADOW;\n"); }

1 0

Stefan Dösinger : wined3d: Handle length zero vectors in ARB's NRM.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: c80b5d6afc016c55ae51a3fcd0ce425c970a116a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80b5d6afc016c55ae51a3fcd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 19 12:30:03 2010 +0200 wined3d: Handle length zero vectors in ARB's NRM. --- dlls/wined3d/arb_program_shader.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ed74eaf..2920b43 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -104,6 +104,7 @@ static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ + if (shader->baseShader.reg_maps.usesnrm) return TRUE; /* 0.0 */ if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ return FALSE; } @@ -2446,16 +2447,39 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 1 /* Use TB */, src_name); + /* In D3D, NRM of a vector with length zero returns zero. Catch this situation, as + * otherwise NRM or RSQ would return NaN */ if(pshader && priv->target_version >= NV3) { + /* GL_NV_fragment_program2's NRM needs protection against length zero vectors too + * + * TODO: Find out if DP3+NRM+MOV is really faster than DP3+RSQ+MUL + */ + shader_addline(buffer, "DP3C TA, %s, %s;\n", src_name, src_name); shader_addline(buffer, "NRM%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name); + shader_addline(buffer, "MOV %s (EQ), %s;\n", dst_name, zero); + } + else if(priv->target_version >= NV2) + { + shader_addline(buffer, "DP3C TA.x, %s, %s;\n", src_name, src_name); + shader_addline(buffer, "RSQ TA.x (NE), TA.x;\n"); + shader_addline(buffer, "MUL%s %s, %s, TA.x;\n", shader_arb_get_modifier(ins), dst_name, + src_name); } else { - shader_addline(buffer, "DP3 TA, %s, %s;\n", src_name, src_name); - shader_addline(buffer, "RSQ TA, TA.x;\n"); + const char *one = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ONE); + + shader_addline(buffer, "DP3 TA.x, %s, %s;\n", src_name, src_name); + /* Pass any non-zero value to RSQ if the input vector has a length of zero. The + * RSQ result doesn't matter, as long as multiplying it by 0 returns 0. + */ + shader_addline(buffer, "SGE TA.y, -TA.x, %s;\n", zero); + shader_addline(buffer, "MAD TA.x, %s, TA.y, TA.x;\n", one); + + shader_addline(buffer, "RSQ TA.x, TA.x;\n"); /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ - shader_addline(buffer, "MUL%s %s, %s, TA;\n", shader_arb_get_modifier(ins), dst_name, + shader_addline(buffer, "MUL%s %s, %s, TA.x;\n", shader_arb_get_modifier(ins), dst_name, src_name); } }

1 0