October 2012 - Wine-commits

Józef Kucia : d3dx9/tests: Add a simple test for filling compressed textures.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 0146b5568a1ae171ef2c499c09fd717a2fa76922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0146b5568a1ae171ef2c499c0… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:30 2012 +0200 d3dx9/tests: Add a simple test for filling compressed textures. --- dlls/d3dx9_36/tests/texture.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index ba3b2c7..87be95c 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1135,6 +1135,20 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } else skip("Failed to create D3DFMT_A32B32G32R32F texture\n"); + + /* test a compressed texture */ + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_DXT1, + D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFillTexture(tex, fillfunc, NULL); + todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create D3DFMT_DXT1 texture\n"); } static void WINAPI fillfunc_cube(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord,

1 0

Frédéric Delanoy : cmd/tests: Add tests for LSS comparison operator in "if" statements.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: e3b5b6fd14d4cfa4d83b62c82dfa07b53d6a24ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b5b6fd14d4cfa4d83b62c82… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:23 2012 +0200 cmd/tests: Add tests for LSS comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 63 ++++++++++++++++++++++++++++-- programs/cmd/tests/test_builtins.cmd.exp | 44 +++++++++++++++++++-- 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index fff067c..5039484 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -607,7 +607,7 @@ if exist foo ( cd .. & rd foobar echo ------------ Testing if/else ------------ -echo if/else should work with blocks +echo --- if/else should work with blocks if 0 == 0 ( echo if seems to work ) else ( @@ -623,19 +623,22 @@ if /c==/c ( ) else ( echo parameter detection seems to be broken ) -echo Testing case sensitivity with and without /i option + +echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity if /i foo==FOO echo if /i seems to work if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken -echo Testing string comparisons + +echo --- string comparisons if abc == abc (echo equal) else echo non equal if abc =="abc" (echo equal) else echo non equal if "abc"== abc (echo equal) else echo non equal if "abc"== "abc" (echo equal) else echo non equal -echo Testing tabs handling + +echo --- tabs handling if(a)tab@1==1 echo doom if @tab(a)1==1 echo doom if 1==1 (echo doom) else(a)tab@echo quake @@ -644,6 +647,58 @@ if 1==0(a)tab@(echo doom) else echo quake if 1==0 (echo doom)@tab(a)else echo quake if 1==0 (echo doom) else(a)tab@echo quake +echo --- comparison operators +rem NT4 misevaluates conditionals in for loops so we have to use subroutines as workarounds +rem Imbricated for loops parameters are currently not expanded correctly; this prevents usage of simpler imbricated for loops in tests +echo ------ for strings +rem NT4 stops processing of the whole batch file as soon as it finds a +rem comparison operator non fully uppercased, such as lss instead of LSS, so we +rem can't test those here. +if LSS LSS LSSfoo (echo LSS string can be used as operand for LSS comparison) +if LSS LSS LSS (echo bar) +if 1.1 LSS 1.10 (echo floats are handled as strings) +if "9" LSS "10" (echo numbers in quotes recognized!) else echo numbers in quotes are handled as strings +if not "-1" LSS "1" (echo negative numbers as well) else echo NT4 +if /i foo LSS FoOc echo if /i seems to work for LSS +if /I not foo LSS FOOb echo if /I seems to be broken for LSS +set STR_PARMS=A B AB BA AA +for %%i in (%STR_PARMS%) do call :LSStest %%i A +for %%i in (%STR_PARMS%) do call :LSStest %%i B +for %%i in (%STR_PARMS%) do call :LSStest %%i AB +for %%i in (%STR_PARMS%) do call :LSStest %%i BA +for %%i in (%STR_PARMS%) do call :LSStest %%i AA +if b LSS B (echo b LSS B) else echo NT4 +if /I b LSS B echo b LSS B insensitive +if b LSS A echo b LSS A +if /I b LSS A echo b LSS A insensitive +if a LSS B (echo a LSS B) else echo NT4 +if /I a LSS B echo a LSS B insensitive +if A LSS b echo A LSS b +if /I A LSS b echo A LSS b insensitive +echo ------ for numbers +if -1 LSS 1 (echo negative numbers handled) +if not -1 LSS -10 (echo negative numbers handled) +if not 9 LSS 010 (echo octal handled) +if not -010 LSS -8 (echo also in negative form) +if 4 LSS 0x5 (echo hexa handled) +if not -1 LSS -0x1A (echo also in negative form) +if 11 LSS 101 (echo 11 LSS 101) +set INT_PARMS=0 1 10 9 +for %%i in (%INT_PARMS%) do call :LSStest %%i 0 +for %%i in (%INT_PARMS%) do call :LSStest %%i 1 +for %%i in (%INT_PARMS%) do call :LSStest %%i 10 +for %%i in (%INT_PARMS%) do call :LSStest %%i 9 +goto :endIfCompOpsSubroutines + +rem IF subroutines helpers +:LSStest +if %1 LSS %2 echo %1 LSS %2 +goto :eof + +:endIfCompOpsSubroutines +set STR_PARMS= +set INT_PARMS= + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b7e8397..04e2927 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -417,20 +417,20 @@ bar NUL @todo_wine(a)foo created ------------ Testing if/else ------------ -if/else should work with blocks +--- if/else should work with blocks if seems to work else seems to work if seems not to detect /c as parameter -Testing case sensitivity with and without /i option +--- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work -Testing string comparisons +--- string comparisons equal non equal non equal equal -Testing tabs handling +--- tabs handling doom doom doom @@ -438,6 +438,42 @@ lol quake quake quake +--- comparison operators +------ for strings +LSS string can be used as operand for LSS comparison +(a)todo_wine@floats are handled as strings +(a)todo_wine@numbers in quotes are handled as strings +(a)todo_wine@negative numbers as well(a)or_broken@NT4 +(a)todo_wine@if /i seems to work for LSS +(a)todo_wine@A LSS B +(a)todo_wine@AB LSS B +(a)todo_wine@AA LSS B +(a)todo_wine@A LSS AB +(a)todo_wine@AA LSS AB +(a)todo_wine@A LSS BA +(a)todo_wine@B LSS BA +(a)todo_wine@AB LSS BA +(a)todo_wine@AA LSS BA +(a)todo_wine@A LSS AA +(a)todo_wine@b LSS B(a)or_broken@NT4 +(a)todo_wine@a LSS B(a)or_broken@NT4 +(a)todo_wine@a LSS B insensitive +(a)todo_wine@A LSS b +(a)todo_wine@A LSS b insensitive +------ for numbers +negative numbers handled +negative numbers handled +octal handled +also in negative form +hexa handled +also in negative form +11 LSS 101 +(a)todo_wine@0 LSS 1 +(a)todo_wine@0 LSS 10 +(a)todo_wine@1 LSS 10 +(a)todo_wine@9 LSS 10 +(a)todo_wine@0 LSS 9 +(a)todo_wine@1 LSS 9 ------------ Testing for ------------ --- plain FOR A

1 0

Frédéric Delanoy : cmd/tests: Add tests for LEQ comparison operator in "if" statements.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: ac52924d44425d1cc13b1ff255550c43674f6aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac52924d44425d1cc13b1ff25… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:24 2012 +0200 cmd/tests: Add tests for LEQ comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 20 +++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 31 ++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5039484..28721c1 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -675,6 +675,19 @@ if a LSS B (echo a LSS B) else echo NT4 if /I a LSS B echo a LSS B insensitive if A LSS b echo A LSS b if /I A LSS b echo A LSS b insensitive +for %%i in (%STR_PARMS%) do call :LEQtest %%i A +for %%i in (%STR_PARMS%) do call :LEQtest %%i B +for %%i in (%STR_PARMS%) do call :LEQtest %%i AB +for %%i in (%STR_PARMS%) do call :LEQtest %%i BA +for %%i in (%STR_PARMS%) do call :LEQtest %%i AA +if b LEQ B (echo b LEQ B) else echo NT4 +if /I b LEQ B echo b LEQ B insensitive +if b LEQ A echo b LEQ A +if /I b LEQ A echo b LEQ A insensitive +if a LEQ B (echo a LEQ B) else echo NT4 +if /I a LEQ B echo a LEQ B insensitive +if A LEQ b echo A LEQ b +if /I A LEQ b echo A LEQ b insensitive echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -688,12 +701,19 @@ for %%i in (%INT_PARMS%) do call :LSStest %%i 0 for %%i in (%INT_PARMS%) do call :LSStest %%i 1 for %%i in (%INT_PARMS%) do call :LSStest %%i 10 for %%i in (%INT_PARMS%) do call :LSStest %%i 9 +for %%i in (%INT_PARMS%) do call :LEQtest %%i 0 +for %%i in (%INT_PARMS%) do call :LEQtest %%i 1 +for %%i in (%INT_PARMS%) do call :LEQtest %%i 10 +for %%i in (%INT_PARMS%) do call :LEQtest %%i 9 goto :endIfCompOpsSubroutines rem IF subroutines helpers :LSStest if %1 LSS %2 echo %1 LSS %2 goto :eof +:LEQtest +if %1 LEQ %2 echo %1 LEQ %2 +goto :eof :endIfCompOpsSubroutines set STR_PARMS= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 04e2927..53eaffd 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -460,6 +460,27 @@ LSS string can be used as operand for LSS comparison @todo_wine(a)a LSS B insensitive @todo_wine(a)A LSS b @todo_wine(a)A LSS b insensitive +(a)todo_wine@A LEQ A +(a)todo_wine@A LEQ B +(a)todo_wine@B LEQ B +(a)todo_wine@AB LEQ B +(a)todo_wine@AA LEQ B +(a)todo_wine@A LEQ AB +(a)todo_wine@AB LEQ AB +(a)todo_wine@AA LEQ AB +(a)todo_wine@A LEQ BA +(a)todo_wine@B LEQ BA +(a)todo_wine@AB LEQ BA +(a)todo_wine@BA LEQ BA +(a)todo_wine@AA LEQ BA +(a)todo_wine@A LEQ AA +(a)todo_wine@AA LEQ AA +(a)todo_wine@b LEQ B(a)or_broken@NT4 +(a)todo_wine@b LEQ B insensitive +(a)todo_wine@a LEQ B(a)or_broken@NT4 +(a)todo_wine@a LEQ B insensitive +(a)todo_wine@A LEQ b +(a)todo_wine@A LEQ b insensitive ------ for numbers negative numbers handled negative numbers handled @@ -474,6 +495,16 @@ also in negative form @todo_wine(a)9 LSS 10 @todo_wine(a)0 LSS 9 @todo_wine(a)1 LSS 9 +(a)todo_wine@0 LEQ 0 +(a)todo_wine@0 LEQ 1 +(a)todo_wine@1 LEQ 1 +(a)todo_wine@0 LEQ 10 +(a)todo_wine@1 LEQ 10 +(a)todo_wine@10 LEQ 10 +(a)todo_wine@9 LEQ 10 +(a)todo_wine@0 LEQ 9 +(a)todo_wine@1 LEQ 9 +(a)todo_wine@9 LEQ 9 ------------ Testing for ------------ --- plain FOR A

1 0

Frédéric Delanoy : cmd/tests: Add tests for EQU comparison operator in "if" statements.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: a0a61cb59200c9147be700f6051d0365640dec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a61cb59200c9147be700f60… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:25 2012 +0200 cmd/tests: Add tests for EQU comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 17 +++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 ++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 28721c1..7c83393 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -688,6 +688,12 @@ if a LEQ B (echo a LEQ B) else echo NT4 if /I a LEQ B echo a LEQ B insensitive if A LEQ b echo A LEQ b if /I A LEQ b echo A LEQ b insensitive +for %%i in (%STR_PARMS%) do call :EQUtest %%i A +for %%i in (%STR_PARMS%) do call :EQUtest %%i B +for %%i in (%STR_PARMS%) do call :EQUtest %%i AB +for %%i in (%STR_PARMS%) do call :EQUtest %%i BA +for %%i in (%STR_PARMS%) do call :EQUtest %%i AA +if /I A EQU a echo A EQU a insensitive echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -705,6 +711,14 @@ for %%i in (%INT_PARMS%) do call :LEQtest %%i 0 for %%i in (%INT_PARMS%) do call :LEQtest %%i 1 for %%i in (%INT_PARMS%) do call :LEQtest %%i 10 for %%i in (%INT_PARMS%) do call :LEQtest %%i 9 +for %%i in (%INT_PARMS%) do call :EQUtest %%i 0 +for %%i in (%INT_PARMS%) do call :EQUtest %%i 1 +for %%i in (%INT_PARMS%) do call :EQUtest %%i 10 +for %%i in (%INT_PARMS%) do call :EQUtest %%i 9 +if 011 EQU 9 (echo octal ok) +if 0xA1 EQU 161 (echo hexa ok) +if 0xA1 EQU "161" (echo hexa should be be recognized) else (echo string/hexa compare ok) +if "0xA1" EQU 161 (echo hexa should be be recognized) else (echo string/hexa compare ok) goto :endIfCompOpsSubroutines rem IF subroutines helpers @@ -714,6 +728,9 @@ goto :eof :LEQtest if %1 LEQ %2 echo %1 LEQ %2 goto :eof +:EQUtest +if %1 EQU %2 echo %1 EQU %2 +goto :eof :endIfCompOpsSubroutines set STR_PARMS= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 53eaffd..91ad55b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -481,6 +481,12 @@ LSS string can be used as operand for LSS comparison @todo_wine(a)a LEQ B insensitive @todo_wine(a)A LEQ b @todo_wine(a)A LEQ b insensitive +(a)todo_wine@A EQU A +(a)todo_wine@B EQU B +(a)todo_wine@AB EQU AB +(a)todo_wine@BA EQU BA +(a)todo_wine@AA EQU AA +(a)todo_wine@A EQU a insensitive ------ for numbers negative numbers handled negative numbers handled @@ -505,6 +511,14 @@ also in negative form @todo_wine(a)0 LEQ 9 @todo_wine(a)1 LEQ 9 @todo_wine(a)9 LEQ 9 +(a)todo_wine@0 EQU 0 +(a)todo_wine@1 EQU 1 +(a)todo_wine@10 EQU 10 +(a)todo_wine@9 EQU 9 +(a)todo_wine@octal ok +(a)todo_wine@hexa ok +(a)todo_wine@string/hexa compare ok +(a)todo_wine@string/hexa compare ok ------------ Testing for ------------ --- plain FOR A

1 0

Frédéric Delanoy : cmd/tests: Add tests for NEQ comparison operator in "if" statements.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 8e3227c82486d85ad248c5dccb84cde9e464dc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3227c82486d85ad248c5dcc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:26 2012 +0200 cmd/tests: Add tests for NEQ comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 12 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 32 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7c83393..e940b2d 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -694,6 +694,11 @@ for %%i in (%STR_PARMS%) do call :EQUtest %%i AB for %%i in (%STR_PARMS%) do call :EQUtest %%i BA for %%i in (%STR_PARMS%) do call :EQUtest %%i AA if /I A EQU a echo A EQU a insensitive +for %%i in (%STR_PARMS%) do call :NEQtest %%i A +for %%i in (%STR_PARMS%) do call :NEQtest %%i B +for %%i in (%STR_PARMS%) do call :NEQtest %%i AB +for %%i in (%STR_PARMS%) do call :NEQtest %%i BA +for %%i in (%STR_PARMS%) do call :NEQtest %%i AA echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -719,6 +724,10 @@ if 011 EQU 9 (echo octal ok) if 0xA1 EQU 161 (echo hexa ok) if 0xA1 EQU "161" (echo hexa should be be recognized) else (echo string/hexa compare ok) if "0xA1" EQU 161 (echo hexa should be be recognized) else (echo string/hexa compare ok) +for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 +for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 +for %%i in (%INT_PARMS%) do call :NEQtest %%i 10 +for %%i in (%INT_PARMS%) do call :NEQtest %%i 9 goto :endIfCompOpsSubroutines rem IF subroutines helpers @@ -731,6 +740,9 @@ goto :eof :EQUtest if %1 EQU %2 echo %1 EQU %2 goto :eof +:NEQtest +if %1 NEQ %2 echo %1 NEQ %2 +goto :eof :endIfCompOpsSubroutines set STR_PARMS= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 91ad55b..c04c775 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -487,6 +487,26 @@ LSS string can be used as operand for LSS comparison @todo_wine(a)BA EQU BA @todo_wine(a)AA EQU AA @todo_wine(a)A EQU a insensitive +(a)todo_wine@B NEQ A +(a)todo_wine@AB NEQ A +(a)todo_wine@BA NEQ A +(a)todo_wine@AA NEQ A +(a)todo_wine@A NEQ B +(a)todo_wine@AB NEQ B +(a)todo_wine@BA NEQ B +(a)todo_wine@AA NEQ B +(a)todo_wine@A NEQ AB +(a)todo_wine@B NEQ AB +(a)todo_wine@BA NEQ AB +(a)todo_wine@AA NEQ AB +(a)todo_wine@A NEQ BA +(a)todo_wine@B NEQ BA +(a)todo_wine@AB NEQ BA +(a)todo_wine@AA NEQ BA +(a)todo_wine@A NEQ AA +(a)todo_wine@B NEQ AA +(a)todo_wine@AB NEQ AA +(a)todo_wine@BA NEQ AA ------ for numbers negative numbers handled negative numbers handled @@ -519,6 +539,18 @@ also in negative form @todo_wine(a)hexa ok @todo_wine(a)string/hexa compare ok @todo_wine(a)string/hexa compare ok +(a)todo_wine@1 NEQ 0 +(a)todo_wine@10 NEQ 0 +(a)todo_wine@9 NEQ 0 +(a)todo_wine@0 NEQ 1 +(a)todo_wine@10 NEQ 1 +(a)todo_wine@9 NEQ 1 +(a)todo_wine@0 NEQ 10 +(a)todo_wine@1 NEQ 10 +(a)todo_wine@9 NEQ 10 +(a)todo_wine@0 NEQ 9 +(a)todo_wine@1 NEQ 9 +(a)todo_wine@10 NEQ 9 ------------ Testing for ------------ --- plain FOR A

1 0

André Hentschel : view: Buffer size of GetFileTitleW is in characters, not bytes (coverity).
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 0ca586120b7197a784a09836ae450018142320cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca586120b7197a784a09836a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:31:36 2012 +0200 view: Buffer size of GetFileTitleW is in characters, not bytes (coverity). --- programs/view/view.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index d32a10b..9e60824 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -260,7 +260,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM if (FileOpen(hwnd, filename, sizeof(filename)/sizeof(WCHAR))) { szFileTitle[0] = 0; - GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)); + GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); DoOpenFile(filename); UpdateWindowCaption(); } @@ -387,7 +387,7 @@ static void HandleCommandLine(LPWSTR cmdline) cmdline[lstrlenW(cmdline) - 1] = 0; } szFileTitle[0] = 0; - GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)); + GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); DoOpenFile(cmdline); UpdateWindowCaption(); }

1 0

André Hentschel : winedbg: Buffer size includes the quotes (coverity).
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 8392a850844b30496ece3f06623099ee1171cf08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8392a850844b30496ece3f066… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:42:49 2012 +0200 winedbg: Buffer size includes the quotes (coverity). --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 6c60831..4620030 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -862,7 +862,7 @@ enum dbg_start dbg_active_minidump(int argc, char* argv[]) HANDLE hFile; enum dbg_start ds = start_error_parse; const char* file = NULL; - char tmp[8 + 1 + MAX_PATH]; /* minidump <file> */ + char tmp[8 + 1 + 2 + MAX_PATH]; /* minidump "<file>" */ dbg_houtput = GetStdHandle(STD_ERROR_HANDLE); DBG_IVAR(BreakOnDllLoad) = 0;

1 0

Christian Costa : d3drm: Fix child leak.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 5e1d854ee50a9ad885ebd9a15f7728afa2cb0447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1d854ee50a9ad885ebd9a15… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:51:25 2012 +0200 d3drm: Fix child leak. --- dlls/d3drm/meshbuilder.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 79b5d74..180a8a9 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1260,6 +1260,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (FAILED(hr)) { hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + IDirectXFileObject_Release(child); if (FAILED(hr)) goto end; @@ -1268,6 +1269,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (FAILED(hr)) goto end; } + else + { + IDirectXFileObject_Release(child); + } hr = Direct3DRMMaterial_create(&material); if (FAILED(hr)) @@ -1357,9 +1362,14 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) i++; } if (hr == S_OK) + { + IDirectXFileObject_Release(child); WARN("Found more sub-objects than expected\n"); + } else if (hr != DXFILEERR_NOMOREOBJECTS) + { goto end; + } hr = S_OK; } else

1 0

Christian Costa : d3drm: Enum all materials even if only the first one is handled.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 466c244d1833f6644abae540030ef662a187984d URL: http://source.winehq.org/git/wine.git/?a=commit;h=466c244d1833f6644abae5400… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:51:32 2012 +0200 d3drm: Enum all materials even if only the first one is handled. --- dlls/d3drm/meshbuilder.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 180a8a9..22efb00 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1244,10 +1244,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) WARN("Returned size %u does not match expected one %u\n", size, data_size); if (nb_materials > 1) - { FIXME("Only one material per mesh supported, first one applies to all faces\n"); - nb_materials = 1; - } while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(pData2, &child)) && (i < nb_materials)) { @@ -1256,6 +1253,14 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) LPDIRECT3DRMMATERIAL2 material; LPDIRECTXFILEOBJECT material_child; + if (i >= 1) + { + /* FIXME: Only handle first material but enum all of them */ + IDirectXFileObject_Release(child); + i++; + continue; + } + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) {

1 0

Christian Costa : d3drm: Fix normals computation and add according tests.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: cb131bf03032663fa9712bcdd83012b4eb487d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb131bf03032663fa9712bcdd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 18:11:03 2012 +0200 d3drm: Fix normals computation and add according tests. --- dlls/d3drm/meshbuilder.c | 2 +- dlls/d3drm/tests/d3drm.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 22efb00..4ba29cc 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1419,7 +1419,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) D3DVECTOR a, b; D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[2]], &This->pVertices[faces_vertex_idx_ptr[1]]); - D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[1]], &This->pVertices[faces_vertex_idx_ptr[0]]); + D3DRMVectorSubtract(&b, &This->pVertices[faces_vertex_idx_ptr[0]], &This->pVertices[faces_vertex_idx_ptr[1]]); D3DRMVectorCrossProduct(&face_normal, &a, &b); D3DRMVectorNormalize(&face_normal); } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a257aea..0d600c5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -64,6 +64,11 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static BOOL match_float(float a, float b) +{ + return (a - b) < 0.000001f; +} + static D3DRMMATRIX4D identity = { { 1.0f, 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f, 0.0f }, @@ -186,7 +191,7 @@ static void test_MeshBuilder(void) DWORD val1, val2, val3; D3DVALUE valu, valv; D3DVECTOR v[3]; - D3DVECTOR n[3]; + D3DVECTOR n[4]; DWORD f[8]; char name[10]; DWORD size; @@ -259,6 +264,22 @@ static void test_MeshBuilder(void) ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + /* Check that Load method generated default normals */ + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(match_float(U1(n[0]).x, 0.577350f), "Wrong component n[0].x = %f (expected %f)\n", U1(n[0]).x, 0.577350f); + ok(match_float(U2(n[0]).y, 0.577350f), "Wrong component n[0].y = %f (expected %f)\n", U2(n[0]).y, 0.577350f); + ok(match_float(U3(n[0]).z, 0.577350f), "Wrong component n[0].z = %f (expected %f)\n", U3(n[0]).z, 0.577350f); + ok(match_float(U1(n[1]).x, -0.229416f), "Wrong component n[1].x = %f (expected %f)\n", U1(n[1]).x, -0.229416f); + ok(match_float(U2(n[1]).y, 0.688247f), "Wrong component n[1].y = %f (expected %f)\n", U2(n[1]).y, 0.688247f); + ok(match_float(U3(n[1]).z, 0.688247f), "Wrong component n[1].z = %f (expected %f)\n", U3(n[1]).z, 0.688247f); + ok(match_float(U1(n[2]).x, -0.229416f), "Wrong component n[2].x = %f (expected %f)\n", U1(n[2]).x, -0.229416f); + ok(match_float(U2(n[2]).y, 0.688247f), "Wrong component n[2].y = %f (expected %f)\n", U2(n[2]).y, 0.688247f); + ok(match_float(U3(n[2]).z, 0.688247f), "Wrong component n[2].z = %f (expected %f)\n", U3(n[2]).z, 0.688247f); + ok(match_float(U1(n[3]).x, -0.577350f), "Wrong component n[3].x = %f (expected %f)\n", U1(n[3]).x, -0.577350f); + ok(match_float(U2(n[3]).y, 0.577350f), "Wrong component n[3].y = %f (expected %f)\n", U2(n[3]).y, 0.577350f); + ok(match_float(U3(n[3]).z, 0.577350f), "Wrong component n[3].z = %f (expected %f)\n", U3(n[3]).z, 0.577350f); + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ valu = 1.23f; valv = 3.21f;

1 0