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

Roderick Colenbrander : wined3d: Move palette uploading code over to arbfp blit_shader.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 3b6aea5934ee910e4ab679571b128a92775e1e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6aea5934ee910e4ab679571… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:13 2010 +0200 wined3d: Move palette uploading code over to arbfp blit_shader. --- dlls/wined3d/arb_program_shader.c | 49 ++++++++++++++++++++++++++++++++---- dlls/wined3d/surface.c | 45 +++++++-------------------------- dlls/wined3d/swapchain.c | 4 +-- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 56 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b6aea5934ee910e4ab67…

1 0

Qingchuan Wang : amstream: Expose also IMultiMediaStream which is the base interface of IAMMultiMediaStream .
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 33f41d15382d3c3102a153d4bbb342d4de20aab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f41d15382d3c3102a153d4b… Author: Qingchuan Wang <rainy6144(a)gmail.com> Date: Mon Apr 5 20:30:09 2010 +0200 amstream: Expose also IMultiMediaStream which is the base interface of IAMMultiMediaStream. --- dlls/amstream/amstream.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index f8ae2a6..6bf515b 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -79,6 +79,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMultiMediaStream) || IsEqualGUID(riid, &IID_IAMMultiMediaStream)) { IClassFactory_AddRef(iface);

1 0

Roderick Colenbrander : wined3d: Due to code rewrites is_color_fixup_supported is not needed anymore in RealizePalette .
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: e6ae272efee51dffa62ca75d4f909c8855edf950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ae272efee51dffa62ca75d4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:18 2010 +0200 wined3d: Due to code rewrites is_color_fixup_supported is not needed anymore in RealizePalette. The code in question should be executed in all cases. This also fixes palette refresh issues when shaders / paletted textures aren't around. --- dlls/wined3d/surface.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6ced082..f0bd431 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4276,18 +4276,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) if (This->resource.format_desc->format == WINED3DFMT_P8_UINT || This->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) { - IWineD3DDeviceImpl *device = This->resource.device; - if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && - device->blitter->color_fixup_supported(&device->adapter->gl_info, This->resource.format_desc->color_fixup)) + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); /* We want to force a palette refresh, so mark the drawable as not being up to date */ IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); - - /* Force a palette refresh by re-uploading to the drawable */ - IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL); } else { if(!(This->Flags & SFLAG_INSYSMEM)) { TRACE("Palette changed with surface that does not have an up to date system memory copy\n");

1 0

Roderick Colenbrander : wined3d: Disable paletted texture support. It was only offered on a few cards, so can be missed.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 9fec1a02b9e13969f929a3eed249e67773286033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fec1a02b9e13969f929a3eed… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:15 2010 +0200 wined3d: Disable paletted texture support. It was only offered on a few cards, so can be missed. --- dlls/wined3d/directx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 581d6c7..5501899 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3404,12 +3404,12 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, return FALSE; /***** - * supported: Palettized + * Not supported: Palettized + * Only some Geforce/Voodoo3/G400 cards offer 8-bit textures in case of <=Direct3D7. + * Since it is not widely available, don't offer it. Further no Windows driver offers + * WINED3DFMT_P8_UINT_A8_NORM, so don't offer it either. */ case WINED3DFMT_P8_UINT: - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - /* No Windows driver offers WINED3DFMT_P8_UINT_A8_UNORM, so don't offer it either */ case WINED3DFMT_P8_UINT_A8_UNORM: return FALSE;

1 0

Christian Costa : amstream: Fix AddRef calls.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 01624ea6c203cebca51c471391e9649fb2dae14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=01624ea6c203cebca51c47139… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 5 20:30:15 2010 +0200 amstream: Fix AddRef calls. --- dlls/amstream/amstream.c | 2 +- dlls/amstream/mediastream.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 6bf515b..50a29c6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -82,7 +82,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream IsEqualGUID(riid, &IID_IMultiMediaStream) || IsEqualGUID(riid, &IID_IAMMultiMediaStream)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index dc4ec64..39c28c9 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -89,9 +89,9 @@ static HRESULT WINAPI IMediaStreamImpl_QueryInterface(IMediaStream* iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IMediaStream)) { - IClassFactory_AddRef(iface); - *ppvObject = This; - return S_OK; + IUnknown_AddRef(iface); + *ppvObject = This; + return S_OK; } ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); @@ -229,9 +229,9 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMedia IsEqualGUID(riid, &IID_IMediaStream) || IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) { - IClassFactory_AddRef(iface); - *ppvObject = This; - return S_OK; + IUnknown_AddRef(iface); + *ppvObject = This; + return S_OK; } ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject);

1 0

Roderick Colenbrander : wined3d: Move the arbfp p8 fixup to the format table and get rid of the d3dfmt_get_conv override .
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 1f2976a302336eda5cb0782946d0444cbded8d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2976a302336eda5cb078294… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:17 2010 +0200 wined3d: Move the arbfp p8 fixup to the format table and get rid of the d3dfmt_get_conv override. --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/utils.c | 2 +- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a863372..6ced082 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2166,14 +2166,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *convert = CONVERT_PALETTED; } } - /* TODO: this check is evil and should die (it basically checks which blitter backend is used) */ - else if (!gl_info->supported[EXT_PALETTED_TEXTURE] && device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup)) - { - *format = GL_ALPHA; - *type = GL_UNSIGNED_BYTE; - *target_bpp = 1; - } - break; case WINED3DFMT_B2G3R3_UNORM: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 65f4761..45d4760 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -336,7 +336,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_FLOAT}, /* Palettized formats */ {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, - GL_RGBA, GL_UNSIGNED_BYTE, + GL_ALPHA, GL_UNSIGNED_BYTE, 0, ARB_FRAGMENT_PROGRAM}, {WINED3DFMT_P8_UINT, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0,

1 0

Roderick Colenbrander : wined3d: Disable framebuffer to texture blitting.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: a5a4be4fc54bb4bfb860bdfd98cd241785027797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a4be4fc54bb4bfb860bdfd9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 5 20:05:16 2010 +0200 wined3d: Disable framebuffer to texture blitting. The current code doesn't work for this at all and causes major rendering issues in e.g. C&C. I don't think we should fix this code either since it isn't worth the effort and requires evil things like paletteOverride. --- dlls/wined3d/surface.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95889e4..a863372 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3894,7 +3894,14 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const if((srcSwapchain || SrcSurface == myDevice->render_targets[0]) && !dstSwapchain) { /* Blit from render target to texture */ BOOL stretchx; - BOOL paletteOverride = FALSE; + + /* P8 read back is not implemented */ + if (Src->resource.format_desc->format == WINED3DFMT_P8_UINT || + This->resource.format_desc->format == WINED3DFMT_P8_UINT) + { + TRACE("P8 read back not supported by frame buffer to texture blit\n"); + return WINED3DERR_INVALIDCALL; + } if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { TRACE("Color keying not supported by frame buffer to texture blit\n"); @@ -3908,15 +3915,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const stretchx = FALSE; } - /* When blitting from a render target a texture, the texture isn't required to have a palette. - * In this case grab the palette from the render target. */ - if (This->resource.format_desc->format == WINED3DFMT_P8_UINT && !This->palette) - { - paletteOverride = TRUE; - TRACE("Source surface (%p) lacks palette, overriding palette with palette %p of destination surface (%p)\n", Src, This->palette, This); - This->palette = Src->palette; - } - /* Blt is a pretty powerful call, while glCopyTexSubImage2D is not. glCopyTexSubImage cannot * flip the image nor scale it. * @@ -3947,10 +3945,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const fb_copy_to_texture_hwstretch(This, SrcSurface, &src_rect, &dst_rect, Filter); } - /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ - if(paletteOverride) - This->palette = NULL; - if(!(This->Flags & SFLAG_DONOTFREE)) { HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL;

1 0

Alexandre Julliard : tools: Improve error handling in the buildicon script.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: 513c77655a963a70d74d3fd3fa27cbd49f52a0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513c77655a963a70d74d3fd3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 13:24:04 2010 +0200 tools: Improve error handling in the buildicon script. --- tools/buildicon | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/tools/buildicon b/tools/buildicon index 2f91f4b..4c6a088 100755 --- a/tools/buildicon +++ b/tools/buildicon @@ -36,12 +36,27 @@ my $icoName = $1; my @pngFiles; # Get the programs from the environment variables -my $convert = $ENV{"CONVERT"}; -$convert = "convert" if $convert eq ""; -my $rsvg = $ENV{"RSVG"}; -$rsvg = "rsvg" if $rsvg eq ""; -my $icotool = $ENV{"ICOTOOL"}; -$icotool = "icotool" if $icotool eq ""; +my $convert = $ENV{"CONVERT"} || "convert"; +my $rsvg = $ENV{"RSVG"} || "rsvg"; +my $icotool = $ENV{"ICOTOOL"} || "icotool"; + +sub cleanup() +{ + unlink $renderedSVGFileName; + unlink $_ foreach(@pngFiles); +} + +$SIG{"INT"} = "cleanup"; +$SIG{"HUP"} = "cleanup"; +$SIG{"TERM"} = "cleanup"; +$SIG{"__DIE__"} = "cleanup"; + +# run a shell command and die on error +sub shell(@) +{ + my @args = @_; + system(@args) == 0 or die "@args failed: $?"; +} sub svg_element_start { @@ -67,7 +82,7 @@ sub svg_element_start if(defined($x) and defined($x)) { if($x =~ /\d*/ and $y =~ /\d*/) { - system "$convert $renderedSVGFileName -crop '$size x$size+$x+$y' $pngFileName"; + shell $convert, $renderedSVGFileName, "-crop", "${size}x${size}+$x+$y", $pngFileName; } } @@ -96,7 +111,7 @@ sub resize_image # Use ImageMagick to stretch the image my($size) = @_; my $pngFileName = "$icoName-$size.png"; - system "$convert $renderedSVGFileName -resize '$size x$size' $pngFileName"; + shell $convert, $renderedSVGFileName, "-resize", "${size}x${size}", $pngFileName; push(@pngFiles, $pngFileName); } @@ -108,7 +123,7 @@ sub fallback_render } # Render the SVG image -system 'rsvg', $svgFileName, $renderedSVGFileName; +shell 'rsvg', $svgFileName, $renderedSVGFileName; # Render the images in the SVG my $parser = new XML::Parser( @@ -120,9 +135,7 @@ $parser->parsefile("$svgFileName"); fallback_render unless(@pngFiles); # Combine them into an ICO file -my $icotoolCommand = "$icotool -c -o $icoFileName"; -$icotoolCommand .= " $_" foreach(@pngFiles); -system $icotoolCommand; +shell $icotool, "-c", "-o", $icoFileName, @pngFiles; # Delete the intermediate images unlink $renderedSVGFileName;

1 0

Alexandre Julliard : user32/tests: Fix a test that was incorrectly skipped on non-Win9x platforms.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: c4dec77064ac3b471fb59d40c6f5ab20bc3989b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4dec77064ac3b471fb59d40c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 6 12:07:48 2010 +0200 user32/tests: Fix a test that was incorrectly skipped on non-Win9x platforms. --- dlls/user32/tests/win.c | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 96033a2..e3bebe7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3295,8 +3295,6 @@ static void test_SetParent(void) BOOL ret; HWND desktop = GetDesktopWindow(); HMENU hMenu; - /* FIXME: This detection is not correct as it also covers (all?) XP+ */ - BOOL is_win9x = GetWindowLongPtrW(desktop, GWLP_WNDPROC) == 0; HWND parent, child1, child2, child3, child4, sibling; parent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, @@ -3342,19 +3340,41 @@ static void test_SetParent(void) if (!is_win9x) /* Win9x doesn't survive this test */ { + HWND ret; + ok(!SetParent(parent, child1), "SetParent should fail\n"); ok(!SetParent(child2, child3), "SetParent should fail\n"); ok(SetParent(child1, parent) != 0, "SetParent should not fail\n"); - ok(SetParent(parent, child2) != 0, "SetParent should not fail\n"); - ok(SetParent(parent, child3) != 0, "SetParent should not fail\n"); - ok(!SetParent(child2, parent), "SetParent should fail\n"); - ok(SetParent(parent, child4) != 0, "SetParent should not fail\n"); - - check_parents(parent, child4, child4, 0, 0, child4, parent); - check_parents(child1, parent, parent, parent, 0, child4, parent); - check_parents(child2, desktop, parent, parent, parent, child2, parent); - check_parents(child3, child2, child2, child2, 0, child2, parent); - check_parents(child4, desktop, child2, child2, child2, child4, parent); + ret = SetParent(parent, child2); + todo_wine ok( !ret || broken( ret != 0 ), "SetParent should fail\n"); + if (ret) /* nt4, win2k */ + { + ret = SetParent(parent, child3); + ok(ret != 0, "SetParent should not fail\n"); + ret = SetParent(child2, parent); + ok(!ret, "SetParent should fail\n"); + ret = SetParent(parent, child4); + ok(ret != 0, "SetParent should not fail\n"); + check_parents(parent, child4, child4, 0, 0, child4, parent); + check_parents(child1, parent, parent, parent, 0, child4, parent); + check_parents(child2, desktop, parent, parent, parent, child2, parent); + check_parents(child3, child2, child2, child2, 0, child2, parent); + check_parents(child4, desktop, child2, child2, child2, child4, parent); + } + else + { + ret = SetParent(parent, child3); + ok(ret != 0, "SetParent should not fail\n"); + ret = SetParent(child2, parent); + ok(!ret, "SetParent should fail\n"); + ret = SetParent(parent, child4); + ok(!ret, "SetParent should fail\n"); + check_parents(parent, child3, child3, 0, 0, child2, parent); + check_parents(child1, parent, parent, parent, 0, child2, parent); + check_parents(child2, desktop, parent, parent, parent, child2, parent); + check_parents(child3, child2, child2, child2, 0, child2, parent); + check_parents(child4, desktop, child2, child2, child2, child4, parent); + } } else skip("Win9x/WinMe crash\n");

1 0

Vincent Povirk : mscoree: Use the mono embedding api instead of invoking mono.exe.
by Alexandre Julliard April 6, 2010

April 6, 2010

Module: wine Branch: master Commit: f8ecefe6bf8485f6dc79fab9f7a5adad73dd4404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ecefe6bf8485f6dc79fab9f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 2 15:33:12 2010 -0500 mscoree: Use the mono embedding api instead of invoking mono.exe. --- dlls/mscoree/Makefile.in | 2 +- dlls/mscoree/mscoree_main.c | 230 +++++++++++++++++++++++++++++----------- dlls/mscoree/mscoree_private.h | 13 +++ 3 files changed, 183 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8ecefe6bf8485f6dc79f…

1 0