October 2012 - Wine-Commits

James Eder : ntdll: Use build-time API detection instead of OS detection for finding the number of processors .
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 0d5f301352232d1959086090b133a82ab3e1b7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d5f301352232d1959086090b… Author: James Eder <jimportal(a)gmail.com> Date: Mon Oct 22 15:22:50 2012 -0600 ntdll: Use build-time API detection instead of OS detection for finding the number of processors. --- dlls/ntdll/nt.c | 73 +++++++++++++++++++------------------------------------ 1 files changed, 25 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3f8e772..a851542 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1012,6 +1012,31 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) */ void fill_cpu_info(void) { + long num; + +#ifdef _SC_NPROCESSORS_ONLN + num = sysconf(_SC_NPROCESSORS_ONLN); + if (num < 1) + { + num = 1; + WARN("Failed to detect the number of processors.\n"); + } +#elif defined(CTL_HW) && defined(HW_NCPU) + int mib[2]; + size_t len = sizeof(num); + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + if (sysctl(mib, 2, &num, &len, NULL, 0) != 0) + { + num = 1; + WARN("Failed to detect the number of processors.\n"); + } +#else + num = 1; + FIXME("Detecting the number of processors not suported.\n"); +#endif + NtCurrentTeb()->Peb->NumberOfProcessors = num; + memset(&cached_sci, 0, sizeof(cached_sci)); /* choose sensible defaults ... * FIXME: perhaps overridable with precompiler flags? @@ -1034,8 +1059,6 @@ void fill_cpu_info(void) cached_sci.Reserved = 0; cached_sci.FeatureSet = 0x1fff; - NtCurrentTeb()->Peb->NumberOfProcessors = 1; - /* Hmm, reasonable processor feature defaults? */ #ifdef linux @@ -1064,17 +1087,6 @@ void fill_cpu_info(void) if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "processor")) - { - /* processor number counts up... */ - unsigned int x; - - if (sscanf(value, "%d",&x)) - if (x + 1 > NtCurrentTeb()->Peb->NumberOfProcessors) - NtCurrentTeb()->Peb->NumberOfProcessors = x + 1; - - continue; - } if (!strcasecmp(line, "model")) { /* First part of Revision */ @@ -1206,11 +1218,6 @@ void fill_cpu_info(void) if (value) user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; #endif mib[0] = CTL_HW; - mib[1] = HW_NCPU; - val_len = sizeof(value); - if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) - if (value > NtCurrentTeb()->Peb->NumberOfProcessors) - NtCurrentTeb()->Peb->NumberOfProcessors = value; mib[1] = HW_MODEL; val_len = sizeof(model)-1; if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) @@ -1270,9 +1277,6 @@ void fill_cpu_info(void) } #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) { - int ret, num; - size_t len; - get_cpuinfo( &cached_sci ); /* Check for OS support of SSE -- Is this used, and should it be sse1 or sse2? */ @@ -1280,32 +1284,10 @@ void fill_cpu_info(void) ret = sysctlbyname("hw.instruction_sse", &num, &len, NULL, 0); if (!ret) user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = num;*/ - - len = sizeof(num); - ret = sysctlbyname("hw.ncpu", &num, &len, NULL, 0); - if (!ret) - NtCurrentTeb()->Peb->NumberOfProcessors = num; } #elif defined(__sun) { - int num = sysconf( _SC_NPROCESSORS_ONLN ); - - if (num == -1) num = 1; get_cpuinfo( &cached_sci ); - NtCurrentTeb()->Peb->NumberOfProcessors = num; - } -#elif defined (__OpenBSD__) - { - int mib[2], num, ret; - size_t len; - - mib[0] = CTL_HW; - mib[1] = HW_NCPU; - len = sizeof(num); - - ret = sysctl(mib, 2, &num, &len, NULL, 0); - if (!ret) - NtCurrentTeb()->Peb->NumberOfProcessors = num; } #elif defined (__APPLE__) { @@ -1322,11 +1304,6 @@ void fill_cpu_info(void) else user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = TRUE; } - valSize = sizeof(int); - if (sysctlbyname ("hw.ncpu", &value, &valSize, NULL, 0) == 0) - NtCurrentTeb()->Peb->NumberOfProcessors = value; - - /* FIXME: we don't use the "hw.activecpu" value... but the cached one */ valSize = sizeof(int); if (sysctlbyname ("hw.cputype", &cputype, &valSize, NULL, 0) == 0)

1 0

André Hentschel : wing32: Use the correct size for memcpy (coverity).
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 859bf8d9e9e66227c7f6733320189e0493ac22a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859bf8d9e9e66227c7f673332… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:56:41 2012 +0200 wing32: Use the correct size for memcpy (coverity). --- dlls/wing32/wing32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index 0c942a6..dc6dfd6 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(*bmi) ); + memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(bmi->bmiHeader) ); return ds.dsBm.bmBits; } return NULL;

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DPIXELSHADER9.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 4704e78337985b3011915c937dbed03c9777b485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4704e78337985b3011915c937… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:45 2012 +0200 d3dx9: Avoid LPDIRECT3DPIXELSHADER9. --- dlls/d3dx9_36/effect.c | 37 +++++++++++++++---------------------- dlls/d3dx9_36/tests/effect.c | 14 +++++++------- include/d3dx9effect.h | 8 ++++---- 3 files changed, 26 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4704e78337985b3011915…

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_generate_glsl_declarations().
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 81ae7f606b8e4e97c3a4d7a1c884d918b23f6083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ae7f606b8e4e97c3a4d7a1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:41 2012 +0200 wined3d: Explicitly check the shader type in shader_generate_glsl_declarations(). --- dlls/wined3d/glsl_shader.c | 107 ++++++++++++++++++++++++-------------------- 1 files changed, 59 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81ae7f606b8e4e97c3a4d…

1 0

Dmitry Timoshkov : gdiplus: Test also lf.lfEscapement and lf. lfOrientation returned by GdipGetLogFont.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 5e65f95542cba1aa99be94785feae874dd957e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e65f95542cba1aa99be94785… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 23 17:27:48 2012 +0900 gdiplus: Test also lf.lfEscapement and lf.lfOrientation returned by GdipGetLogFont. --- dlls/gdiplus/tests/font.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 568f9b7..fade7d3 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -857,6 +857,8 @@ static void test_font_transform(void) expect(Ok, status); expect(-100, lf.lfHeight); expect(0, lf.lfWidth); + expect(0, lf.lfEscapement); + expect(0, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -905,6 +907,8 @@ todo_wine todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); + expect(0, lf.lfEscapement); + expect(0, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -953,6 +957,10 @@ todo_wine todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); +todo_wine + expect(3151, lf.lfEscapement); +todo_wine + expect(3151, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -1002,6 +1010,10 @@ todo_wine todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); +todo_wine + expect(3099, lf.lfEscapement); +todo_wine + expect(3099, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -1051,6 +1063,10 @@ todo_wine todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); +todo_wine + expect(3099, lf.lfEscapement); +todo_wine + expect(3099, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height);

1 0

André Hentschel : gdiplus/tests: Fix out-of-bounds access (coverity).
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

Module: wine Branch: master Commit: 9e5936b36c75a417c2e5801049877d06e93fd417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5936b36c75a417c2e580104… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 23:52:55 2012 +0200 gdiplus/tests: Fix out-of-bounds access (coverity). --- dlls/gdiplus/tests/graphics.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 475f7d6..4ed13ea 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2948,7 +2948,7 @@ static void test_string_functions(void) GpRegion *regions[4]; BOOL region_isempty[4]; int i; - PointF position; + PointF positions[8]; GpMatrix *identity; ok(hdc != NULL, "Expected HDC to be initialized\n"); @@ -3186,24 +3186,22 @@ static void test_string_functions(void) status = GdipCreateMatrix(&identity); expect(Ok, status); - position.X = 0; - position.Y = 0; - rc.X = 0; rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(NULL, teststring, 6, font, &position, + memset(positions, 0, sizeof(positions)); + status = GdipMeasureDriverString(NULL, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, NULL, 6, font, &position, + status = GdipMeasureDriverString(graphics, NULL, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, teststring, 6, NULL, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, NULL, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); @@ -3213,16 +3211,16 @@ static void test_string_functions(void) identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, 0x100, identity, &rc); expect(Ok, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL, &rc); expect(Ok, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, NULL); expect(InvalidParameter, status); @@ -3231,7 +3229,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status); @@ -3248,7 +3246,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring, 4, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 4, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status); @@ -3262,7 +3260,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring2, 1, font, &position, + status = GdipMeasureDriverString(graphics, teststring2, 1, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status);

1 0

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

Oct. 23, 2012

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

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

Oct. 23, 2012

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 EQU comparison operator in "if" statements.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

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 LEQ comparison operator in "if" statements.
by Alexandre Julliard Oct. 23, 2012

Oct. 23, 2012

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