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

Andrew Nguyen : ole32: Validate pointer parameters in MkParseDisplayName.
by Alexandre Julliard 21 May '10

21 May '10

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

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

21 May '10

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

Andrew Nguyen : urlmon: Validate parameters in MkParseDisplayNameEx.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: c6e5e39460549f7f255a978b71fd2ac5e4b0305c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e5e39460549f7f255a978b7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu May 20 10:36:32 2010 -0500 urlmon: Validate parameters in MkParseDisplayNameEx. --- dlls/urlmon/tests/misc.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/umon.c | 3 +++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 66d2c7e..7681b5c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1418,8 +1418,50 @@ static void test_MkParseDisplayNameEx(void) '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8', '-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; + const struct + { + LPBC *ppbc; + LPCWSTR szDisplayName; + ULONG *pchEaten; + LPMONIKER *ppmk; + } invalid_parameters[] = + { + {NULL, NULL, NULL, NULL}, + {NULL, NULL, NULL, &mon}, + {NULL, NULL, &eaten, NULL}, + {NULL, NULL, &eaten, &mon}, + {NULL, wszEmpty, NULL, NULL}, + {NULL, wszEmpty, NULL, &mon}, + {NULL, wszEmpty, &eaten, NULL}, + {NULL, wszEmpty, &eaten, &mon}, + {&bctx, NULL, NULL, NULL}, + {&bctx, NULL, NULL, &mon}, + {&bctx, NULL, &eaten, NULL}, + {&bctx, NULL, &eaten, &mon}, + {&bctx, wszEmpty, NULL, NULL}, + {&bctx, wszEmpty, NULL, &mon}, + {&bctx, wszEmpty, &eaten, NULL}, + {&bctx, wszEmpty, &eaten, &mon}, + }; + + int i; + CreateBindCtx(0, &bctx); + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + eaten = 0xdeadbeef; + mon = (IMoniker *)0xdeadbeef; + hres = MkParseDisplayNameEx(invalid_parameters[i].ppbc ? *invalid_parameters[i].ppbc : NULL, + invalid_parameters[i].szDisplayName, + invalid_parameters[i].pchEaten, + invalid_parameters[i].ppmk); + ok(hres == E_INVALIDARG, + "[%d] Expected MkParseDisplayNameEx to return E_INVALIDARG, got %08x\n", i, hres); + ok(eaten == 0xdeadbeef, "[%d] Expected eaten to be 0xdeadbeef, got %u\n", i, eaten); + ok(mon == (IMoniker *)0xdeadbeef, "[%d] Expected mon to be 0xdeadbeef, got %p\n", i, mon); + } + hres = MkParseDisplayNameEx(bctx, url9, &eaten, &mon); ok(hres == S_OK, "MkParseDisplayNameEx failed: %08x\n", hres); ok(eaten == sizeof(url9)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 92e902f..7ce22cc 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -625,6 +625,9 @@ HRESULT WINAPI MkParseDisplayNameEx(IBindCtx *pbc, LPCWSTR szDisplayName, ULONG { TRACE("(%p %s %p %p)\n", pbc, debugstr_w(szDisplayName), pchEaten, ppmk); + if (!pbc || !szDisplayName || !*szDisplayName || !pchEaten || !ppmk) + return E_INVALIDARG; + if(is_registered_protocol(szDisplayName)) { HRESULT hres;

1 0

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

21 May '10

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

Matej Špindler : winedbg: Add Slovenian translation.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: db043526dbc391e378542a66eaa93490ba2040de URL: http://source.winehq.org/git/wine.git/?a=commit;h=db043526dbc391e378542a66e… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 21 18:03:37 2010 +0200 winedbg: Add Slovenian translation. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/rsrc_Si.rc | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index c2ddc7a..a087b8e 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -44,6 +44,7 @@ RC_SRCS = \ rsrc_No.rc \ rsrc_Pt.rc \ rsrc_Ru.rc \ + rsrc_Si.rc \ rsrc_Sv.rc LEX_SRCS = debug.l diff --git a/programs/winedbg/rsrc_Si.rc b/programs/winedbg/rsrc_Si.rc new file mode 100644 index 0000000..f502f20 --- /dev/null +++ b/programs/winedbg/rsrc_Si.rc @@ -0,0 +1,57 @@ +/* + * Slovenian Language Support + * + * Copyright 2010 Matej Spindler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Debug", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Napaka v programu" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Program %s je naletel na resno napako in se mora \ + zapreti. Žal nam je za nevšečnosti.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Napako lahko povzroči problem v pogramu ali pomankljivost v Wine. \ + Poglejte na http://appdb.winehq.org za nasvete glede poganjanja\ + te aplikacije.\n\n\ + Če ta težava ni prisotna na Windows sistemu in še ni bila prijavljena \ + na http://bugs.winehq.org, prosim napišite prijavo.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Zapri", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Program Wine je naletel na napako" + IDS_INVALID_PARAMS "Interne napake - prejeti nepravilni parametri" + IDS_UNIDENTIFIED "(nedefinirano)" +END

1 0

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

21 May '10

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 21 May '10

21 May '10

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 21 May '10

21 May '10

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

Stefan Dösinger : wined3d: Catch RCP 0.0 in ARB.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: b5da1185311a3d772e75b6a8056d7d45bf20e42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5da1185311a3d772e75b6a80… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 21 14:05:46 2010 +0200 wined3d: Catch RCP 0.0 in ARB. --- dlls/wined3d/arb_program_shader.c | 51 ++++++++++++++++++++++++++++++++++--- dlls/wined3d/shader.c | 1 + dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2920b43..3045f4a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -104,8 +104,9 @@ 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 */ + if (shader->baseShader.reg_maps.usesnrm) return TRUE; /* 0.0 */ + if (shader->baseShader.reg_maps.usesrcp) return TRUE; /* EPS */ return FALSE; } @@ -126,6 +127,7 @@ enum arb_helper_value ARB_ONE, ARB_TWO, ARB_0001, + ARB_EPS, ARB_VS_REL_OFFSET }; @@ -146,6 +148,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ONE: return "ps_helper_const.y"; case ARB_TWO: return "coefmul.x"; case ARB_0001: return "helper_const.xxxy"; + case ARB_EPS: return "ps_helper_const.z"; default: break; } } @@ -156,6 +159,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ZERO: return "helper_const.x"; case ARB_ONE: return "helper_const.y"; case ARB_TWO: return "helper_const.z"; + case ARB_EPS: return "helper_const.w"; case ARB_0001: return "helper_const.xxxy"; case ARB_VS_REL_OFFSET: return "rel_addr_const.y"; } @@ -168,6 +172,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar case ARB_ONE: return "1.0"; case ARB_TWO: return "2.0"; case ARB_0001: return "{0.0, 0.0, 0.0, 1.0}"; + case ARB_EPS: return "1e-8"; default: return "bad"; } } @@ -2403,6 +2408,44 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } +static void shader_hw_rcp(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + const char *flt_eps = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_EPS); + + char dst[50]; + char src[50]; + + shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ + shader_arb_get_src_param(ins, &ins->src[0], 0, src); + if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) + { + /* Dx sdk says .x is used if no swizzle is given, but our test shows that + * .w is used + */ + strcat(src, ".w"); + } + + /* TODO: If the destination is readable, and not the same as the source, the destination + * can be used instead of TA + */ + if (priv->target_version >= NV2) + { + shader_addline(buffer, "MOVC TA.x, %s;\n", src); + shader_addline(buffer, "MOV TA.x (EQ.x), %s;\n", flt_eps); + shader_addline(buffer, "RCP%s %s, TA.x;\n", shader_arb_get_modifier(ins), dst); + } + else + { + const char *zero = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ZERO); + shader_addline(buffer, "ABS TA.x, %s;\n", src); + shader_addline(buffer, "SGE TA.y, -TA.x, %s;\n", zero); + shader_addline(buffer, "MAD TA.x, TA.y, %s, %s;\n", flt_eps, src); + shader_addline(buffer, "RCP%s %s, TA.x;\n", shader_arb_get_modifier(ins), dst); + } +} + static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; @@ -3578,7 +3621,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 = { 0.0, 1.0, 0.0, 0.0 };\n"); + shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, %1.10f, 0.0 };\n", eps); if (reg_maps->shader_version.major < 2) { @@ -4074,7 +4117,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct shader_addline(buffer, "TEMP TMP_OUT;\n"); if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { - shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, 0.0 };\n"); + shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); } 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); @@ -4949,7 +4992,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, /* WINED3DSIH_POW */ shader_hw_log_pow, - /* WINED3DSIH_RCP */ shader_hw_scalar_op, + /* WINED3DSIH_RCP */ shader_hw_rcp, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a8340d3..f26122a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -721,6 +721,7 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct else if (ins.handler_idx == WINED3DSIH_MOVA) reg_maps->usesmova = 1; else if (ins.handler_idx == WINED3DSIH_IFC) reg_maps->usesifc = 1; else if (ins.handler_idx == WINED3DSIH_CALL) reg_maps->usescall = 1; + else if (ins.handler_idx == WINED3DSIH_RCP) reg_maps->usesrcp = 1; limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 001312d..045d068 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -541,7 +541,8 @@ typedef struct shader_reg_maps WORD usestexldl : 1; WORD usesifc : 1; WORD usescall : 1; - WORD padding : 4; + WORD usesrcp : 1; + WORD padding : 3; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

Austin English : include: Rename structs to fix compile with recent gcc.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: f403816081bcd4a5b77bc9e43dee6147f5fcd38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f403816081bcd4a5b77bc9e43… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 20 17:49:51 2010 -0500 include: Rename structs to fix compile with recent gcc. --- include/winnt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index d8fbbfd..eb3ab2c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1047,7 +1047,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PM128A Xmm13; PM128A Xmm14; PM128A Xmm15; - } DUMMYSTRUCTNAME; + } DUMMYSTRUCTNAME1; } DUMMYUNIONNAME1; union @@ -1071,7 +1071,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PULONG64 R13; PULONG64 R14; PULONG64 R15; - } DUMMYSTRUCTNAME; + } DUMMYSTRUCTNAME2; } DUMMYUNIONNAME2; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS;

1 0