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

Henri Verbeet : wined3d: Add an extensionless STATE_INDEXBUFFER handler.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: wine Branch: master Commit: 3f79ba301936db0e4d90f957704bc1e33f808153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f79ba301936db0e4d90f9577… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 7 21:04:45 2010 +0200 wined3d: Add an extensionless STATE_INDEXBUFFER handler. --- dlls/wined3d/state.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5d7b935..3a966d2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -60,6 +60,11 @@ static void state_undefined(DWORD state, IWineD3DStateBlockImpl *stateblock, str ERR("Undefined state.\n"); } +static void state_nop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + TRACE("%s: nop in current pipe config.\n", debug_d3dstate(state)); +} + static void state_fillmode(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { WINED3DFILLMODE Value = stateblock->renderState[WINED3DRS_FILLMODE]; @@ -4923,6 +4928,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, + { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_ANTIALIAS), { STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_ZENABLE), { STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }, WINED3D_GL_EXT_NONE },

1 0

Alexandre Julliard : patches: Add a "needs test" patch rejection cause.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: tools Branch: master Commit: f8771f2d3222addad093f4cb90e5a3140b5e9127 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f8771f2d3222addad093f4cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 16:45:16 2010 +0200 patches: Add a "needs test" patch rejection cause. --- patches/expire | 1 + patches/index.cgi | 2 ++ patches/patches.css | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/patches/expire b/patches/expire index 275dd90..0b3ac8c 100755 --- a/patches/expire +++ b/patches/expire @@ -35,6 +35,7 @@ my %status_expiry = "split" => 7, "depend" => 7, "superseded" => 1, + "testcase" => 7, "testfail" => 7, ); diff --git a/patches/index.cgi b/patches/index.cgi index 36826f8..54da3ff 100755 --- a/patches/index.cgi +++ b/patches/index.cgi @@ -37,6 +37,7 @@ my %status_descr = "split" => "Needs splitting", "depend" => "Dependency", "superseded" => "Superseded", + "testcase" => "Needs tests", "testfail" => "Test failure", ); @@ -50,6 +51,7 @@ my @legend = [ "depend", "<ul><li>The patch is part of a series in which a previous patch hasn't been applied. Resend when the dependent patch is fixed.</li></ul>" ], [ "superseded", "<ul><li>An updated version of the patch has been submitted.</li>" . "<li>Someone else fixed the problem already.</li></ul>" ], + [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" . diff --git a/patches/patches.css b/patches/patches.css index 58980c5..c763c98 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -49,6 +49,7 @@ tr.odd { background-color: #f8e8e8; } .committed, .committed :link, .committed :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } .superseded, .superseded :link, .superseded :visited { color: #e08000; } +.testcase, .testcase :link, .testcase :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } .buildfail, .buildfail :link, .buildfail :visited { color: red; }

1 0

Alexandre Julliard : winetest: Reject all truncated reports.
by Alexandre Julliard April 8, 2010

April 8, 2010

Module: tools Branch: master Commit: 36e92e279a19eac3c9788ccf6a9d033218221e3a URL: http://source.winehq.org/git/tools.git/?a=commit;h=36e92e279a19eac3c9788ccf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 21:00:53 2010 +0200 winetest: Reject all truncated reports. --- winetest/dissect | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 16cc118..83254fe 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -272,7 +272,6 @@ while (<IN>) { } else { $result = "$total $todo $failed $skipped"; } - FINISH: print SUM "- $dll $unit $result $source $rev\n"; $dll = undef; $total = $todo = $failed = $skipped = 0; @@ -299,14 +298,11 @@ while (<IN>) { } if (defined $dll) { # Either winetest crashed or the report file was cut off - $_=""; if ($filesize == $maxfilesize) { - $result = "failed filelimit - -"; - $testbox->{data} .= "<div class=\"test end\">test failed: file limit exceeded</div>\n"; + mydie "report reached file limit (runaway test?)\n"; } else { mydie "report truncated (winetest crash?)\n"; } - goto FINISH; } close SUM or mydie "error writing to '$tmpdir/summary.txt': $!\n"; close IN;

1 0

Jeremy Newman : adding language override for rss feeds
by Jeremy Newman April 8, 2010

April 8, 2010

Module: website Branch: master Commit: 424f0eceb6d18c2d15e4b26bafae95ce17f9066e URL: http://source.winehq.org/git/website.git/?a=commit;h=424f0eceb6d18c2d15e4b2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 8 10:43:19 2010 -0500 adding language override for rss feeds --- include/plugins/news.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index b1d7703..f910a70 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -9,6 +9,10 @@ // import globals global $html, $config; +// language override +if ($_GET['lang'] and in_array($_GET['lang'], $config->languages)) + $html->lang = $_GET['lang']; + // display news based on page params switch (true) {

1 0

Roderick Colenbrander : wined3d: Turn blit_shader color_fixup_supported into blit_supported.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: e7a71e15b56d709c4623a472b0dc44ae6b336e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a71e15b56d709c4623a472b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Apr 6 22:20:42 2010 +0200 wined3d: Turn blit_shader color_fixup_supported into blit_supported. --- dlls/wined3d/arb_program_shader.c | 35 +++++++++++++----- dlls/wined3d/directx.c | 4 ++- dlls/wined3d/surface.c | 72 ++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 9 ++++- 4 files changed, 84 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7a71e15b56d709c4623a…

1 0

Christian Costa : d3dx9_36: Fix indentation.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 83680cd094c869ce0d8d04aaccfe89861a11c1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83680cd094c869ce0d8d04aac… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 6 21:45:02 2010 +0200 d3dx9_36: Fix indentation. --- dlls/d3dx9_36/mesh.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f2dc4d4..d5a1b2b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -57,13 +57,13 @@ done we've got an intersection of the ray with the box. div = 1.0f / praydirection->x; if ( div >= 0.0f ) { - tmin = ( pmin->x - prayposition->x ) * div; - tmax = ( pmax->x - prayposition->x ) * div; + tmin = ( pmin->x - prayposition->x ) * div; + tmax = ( pmax->x - prayposition->x ) * div; } else { - tmin = ( pmax->x - prayposition->x ) * div; - tmax = ( pmin->x - prayposition->x ) * div; + tmin = ( pmax->x - prayposition->x ) * div; + tmax = ( pmin->x - prayposition->x ) * div; } if ( tmax < 0.0f ) return FALSE; @@ -71,13 +71,13 @@ done we've got an intersection of the ray with the box. div = 1.0f / praydirection->y; if ( div >= 0.0f ) { - tymin = ( pmin->y - prayposition->y ) * div; - tymax = ( pmax->y - prayposition->y ) * div; + tymin = ( pmin->y - prayposition->y ) * div; + tymax = ( pmax->y - prayposition->y ) * div; } else { - tymin = ( pmax->y - prayposition->y ) * div; - tymax = ( pmin->y - prayposition->y ) * div; + tymin = ( pmax->y - prayposition->y ) * div; + tymax = ( pmin->y - prayposition->y ) * div; } if ( ( tymax < 0.0f ) || ( tmin > tymax ) || ( tymin > tmax ) ) return FALSE; @@ -88,13 +88,13 @@ done we've got an intersection of the ray with the box. div = 1.0f / praydirection->z; if ( div >= 0.0f ) { - tzmin = ( pmin->z - prayposition->z ) * div; - tzmax = ( pmax->z - prayposition->z ) * div; + tzmin = ( pmin->z - prayposition->z ) * div; + tzmax = ( pmax->z - prayposition->z ) * div; } else { - tzmin = ( pmax->z - prayposition->z ) * div; - tzmax = ( pmin->z - prayposition->z ) * div; + tzmin = ( pmax->z - prayposition->z ) * div; + tzmax = ( pmin->z - prayposition->z ) * div; } if ( (tzmax < 0.0f ) || ( tmin > tzmax ) || ( tzmin > tmax ) ) return FALSE; @@ -180,7 +180,7 @@ UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF) UINT i; UINT numTextures = (FVF & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT; - if (FVF & D3DFVF_NORMAL) size += sizeof(D3DXVECTOR3); + if (FVF & D3DFVF_NORMAL) size += sizeof(D3DXVECTOR3); if (FVF & D3DFVF_DIFFUSE) size += sizeof(DWORD); if (FVF & D3DFVF_SPECULAR) size += sizeof(DWORD); if (FVF & D3DFVF_PSIZE) size += sizeof(DWORD);

1 0

Johan Gill : ddraw/tests: Added todo_wine test to verify resizing of fullscreen windows.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 15b959fba772426d56ab50d7ad400c293a53c588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b959fba772426d56ab50d7a… Author: Johan Gill <johan.gill(a)gmail.com> Date: Wed Apr 7 12:24:15 2010 +0200 ddraw/tests: Added todo_wine test to verify resizing of fullscreen windows. --- dlls/ddraw/tests/ddrawmodes.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index aa72731..59f668b 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -388,6 +388,9 @@ static void enumdisplaymodes(void) static void setdisplaymode(int i) { HRESULT rc; + RECT orig_rect; + + SetRect(&orig_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_ALLOWMODEX | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); @@ -402,14 +405,21 @@ static void setdisplaymode(int i) ok(DD_OK==rc || DDERR_UNSUPPORTED==rc,"SetDisplayMode returned: %x\n",rc); if (rc == DD_OK) { - RECT r, scrn, virt; + RECT r, scrn, test, virt; SetRect(&virt, 0, 0, GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)); OffsetRect(&virt, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN)); SetRect(&scrn, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); trace("Mode (%dx%d) [%dx%d] (%d %d)x(%d %d)\n", modes[i].dwWidth, modes[i].dwHeight, scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom); - + if (!EqualRect(&scrn, &orig_rect)) + { + /* Check that the client rect was resized */ + rc = GetClientRect(hwnd, &test); + ok(rc!=0, "GetClientRect returned %x\n", rc); + rc = EqualRect(&scrn, &test); + todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); + } ok(GetClipCursor(&r), "GetClipCursor() failed\n"); /* ddraw sets clip rect here to the screen size, even for multiple monitors */

1 0

Roderick Colenbrander : wined3d: Remove redundant gl format/ type code from d3dfmt_get_conv since it is already in the table.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: edcdbc2a760286cfe82f0a5e9bf24c69ee0f5120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edcdbc2a760286cfe82f0a5e9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 7 13:19:06 2010 +0200 wined3d: Remove redundant gl format/type code from d3dfmt_get_conv since it is already in the table. --- dlls/wined3d/surface.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 79046f2..e880854 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2225,8 +2225,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R8G8_SNORM: if (gl_info->supported[NV_TEXTURE_SHADER]) break; *convert = CONVERT_V8U8; - *format = GL_BGR; - *type = GL_UNSIGNED_BYTE; *target_bpp = 3; break; @@ -2264,16 +2262,12 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R8G8B8A8_SNORM: if (gl_info->supported[NV_TEXTURE_SHADER]) break; *convert = CONVERT_Q8W8V8U8; - *format = GL_BGRA; - *type = GL_UNSIGNED_BYTE; *target_bpp = 4; break; case WINED3DFMT_R16G16_SNORM: if (gl_info->supported[NV_TEXTURE_SHADER]) break; *convert = CONVERT_V16U16; - *format = GL_BGR; - *type = GL_UNSIGNED_SHORT; *target_bpp = 6; break; @@ -2283,15 +2277,11 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ * with A4L4 internal, but A8L8 format+type */ *convert = CONVERT_A4L4; - *format = GL_LUMINANCE_ALPHA; - *type = GL_UNSIGNED_BYTE; *target_bpp = 2; break; case WINED3DFMT_R16G16_UNORM: *convert = CONVERT_G16R16; - *format = GL_RGB; - *type = GL_UNSIGNED_SHORT; *target_bpp = 6; break;

1 0

Roderick Colenbrander : wined3d: Only apply float R16G16F/ R32G32F fixup when ARB_texture_rg isn't around and remove redundant code.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 2c5eee25caae3eb8facc96d6e00a679013d62d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5eee25caae3eb8facc96d6e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 7 13:21:14 2010 +0200 wined3d: Only apply float R16G16F/R32G32F fixup when ARB_texture_rg isn't around and remove redundant code. --- dlls/wined3d/surface.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e880854..bc44070 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2286,16 +2286,14 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ break; case WINED3DFMT_R16G16_FLOAT: + if (gl_info->supported[ARB_TEXTURE_RG]) break; *convert = CONVERT_R16G16F; - *format = GL_RGB; - *type = GL_HALF_FLOAT_ARB; *target_bpp = 6; break; case WINED3DFMT_R32G32_FLOAT: + if (gl_info->supported[ARB_TEXTURE_RG]) break; *convert = CONVERT_R32G32F; - *format = GL_RGB; - *type = GL_FLOAT; *target_bpp = 12; break;

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCreateTextureFromFileA.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 5046858528f3a080fdd06f47df0394b05aeafd37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5046858528f3a080fdd06f47d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 6 21:44:22 2010 +0200 d3dx9_36: Add stub for D3DXCreateTextureFromFileA. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 5c5a1a6..0151f00 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -93,7 +93,7 @@ @ stub D3DXCreateTextA @ stub D3DXCreateTextW @ stdcall D3DXCreateTexture(ptr long long long long long long ptr) -@ stub D3DXCreateTextureFromFileA +@ stdcall D3DXCreateTextureFromFileA(ptr ptr ptr) @ stub D3DXCreateTextureFromFileExA @ stdcall D3DXCreateTextureFromFileExW(ptr ptr long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateTextureFromFileInMemory diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2b1b468..9454615 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -107,3 +107,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device, return hr; } + +HRESULT WINAPI D3DXCreateTextureFromFileA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + LPDIRECT3DTEXTURE9 *texture) +{ + FIXME("(%p, %s, %p): stub\n", device, debugstr_a(srcfile), texture); + + return E_NOTIMPL; +}

1 0