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

Roderick Colenbrander : wined3d: Use RECT instead of WINED3DRECT in more parts of BltOverride.
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: a91f844a3d1c8e4f37b9d31f0025f3d20d1bbcb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91f844a3d1c8e4f37b9d31f0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 25 23:23:12 2010 +0100 wined3d: Use RECT instead of WINED3DRECT in more parts of BltOverride. --- dlls/wined3d/surface.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b67672e..9d1e804 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3769,6 +3769,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const WINED3DRECT rect; IWineD3DSwapChainImpl *srcSwapchain = NULL, *dstSwapchain = NULL; IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; + RECT dst_rect; TRACE("(%p)->(%p,%p,%p,%08x,%p)\n", This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx); @@ -3813,6 +3814,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const rect.x2 = This->currentDesc.Width; rect.y2 = This->currentDesc.Height; } + surface_get_rect(This, DestRect, &dst_rect); /* The only case where both surfaces on a swapchain are supported is a back buffer -> front buffer blit on the same swapchain */ if(dstSwapchain && dstSwapchain == srcSwapchain && dstSwapchain->backBuffer && @@ -4108,9 +4110,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const ClientToScreen(context->win_handle, &offset); GetClientRect(context->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; - rect.x1 -= offset.x; rect.x2 -=offset.x; - rect.y1 -= offset.y; rect.y2 -=offset.y; - rect.y1 += This->currentDesc.Height - h; rect.y2 += This->currentDesc.Height - h; + dst_rect.left -= offset.x; dst_rect.right -=offset.x; + dst_rect.top -= offset.y; dst_rect.bottom -=offset.y; + dst_rect.top += This->currentDesc.Height - h; dst_rect.bottom += This->currentDesc.Height - h; } if (!is_identity_fixup(This->resource.format_desc->color_fixup)) @@ -4152,7 +4154,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const /* Draw a textured quad */ - draw_textured_quad(Src, &SourceRectangle, (RECT*)&rect, Filter); + draw_textured_quad(Src, &SourceRectangle, &dst_rect, Filter); if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { glDisable(GL_ALPHA_TEST); @@ -4205,10 +4207,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const !(This == (IWineD3DSurfaceImpl*) dstSwapchain->frontBuffer || (dstSwapchain->backBuffer && This == (IWineD3DSurfaceImpl*) dstSwapchain->backBuffer[0]))) { TRACE("Surface is higher back buffer, falling back to software\n"); - return cpu_blit.color_fill(myDevice, This, (RECT*)&rect, color); + return cpu_blit.color_fill(myDevice, This, &dst_rect, color); } - return ffp_blit.color_fill(myDevice, This, (RECT*)&rect, color); + return ffp_blit.color_fill(myDevice, This, &dst_rect, color); } }

1 0

Roderick Colenbrander : wined3d: Add a helper function for getting a valid rectangle.
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: 682c969e9afb33edfb4e215737cef213a036ea79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682c969e9afb33edfb4e21573… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 25 23:00:42 2010 +0100 wined3d: Add a helper function for getting a valid rectangle. --- dlls/wined3d/surface.c | 46 ++++++++++++++++------------------------------ 1 files changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7bb983f..b67672e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -273,6 +273,19 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, } } +static inline void surface_get_rect(IWineD3DSurfaceImpl *This, const RECT *rect_in, RECT *rect_out) +{ + if (rect_in) + *rect_out = *rect_in; + else + { + rect_out->left = 0; + rect_out->top = 0; + rect_out->right = This->currentDesc.Width; + rect_out->bottom = This->currentDesc.Height; + } +} + /* GL locking and context activation is done by the caller */ static void draw_textured_quad(IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) { @@ -4027,17 +4040,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const TRACE("Blt from surface %p to rendertarget %p\n", Src, This); - if(SrcRect) { - SourceRectangle.left = SrcRect->left; - SourceRectangle.right = SrcRect->right; - SourceRectangle.top = SrcRect->top; - SourceRectangle.bottom = SrcRect->bottom; - } else { - SourceRectangle.left = 0; - SourceRectangle.right = Src->currentDesc.Width; - SourceRectangle.top = 0; - SourceRectangle.bottom = Src->currentDesc.Height; - } + surface_get_rect(Src, SrcRect, &SourceRectangle); /* When blitting from an offscreen surface to a rendertarget, the source * surface is not required to have a palette. Our rendering / conversion @@ -4324,17 +4327,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD RECT SrcRect, DstRect; DWORD Flags=0; - if(rsrc) { - SrcRect.left = rsrc->left; - SrcRect.top= rsrc->top; - SrcRect.bottom = rsrc->bottom; - SrcRect.right = rsrc->right; - } else { - SrcRect.left = 0; - SrcRect.top = 0; - SrcRect.right = srcImpl->currentDesc.Width; - SrcRect.bottom = srcImpl->currentDesc.Height; - } + surface_get_rect(srcImpl, rsrc, &SrcRect); DstRect.left = dstx; DstRect.top=dsty; @@ -4755,14 +4748,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT struct wined3d_context *context; RECT src_rect, dst_rect; - if(rect_in) { - src_rect = *rect_in; - } else { - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = This->currentDesc.Width; - src_rect.bottom = This->currentDesc.Height; - } + surface_get_rect(This, rect_in, &src_rect); context = context_acquire(device, (IWineD3DSurface*)This, CTXUSAGE_BLIT); if (context->render_offscreen)

1 0

Roderick Colenbrander : d3d9: Add source/ destination and backbuffer tests for StretchRect.
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: 342c6c6de57d8e757991cf99278134b60e54c64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=342c6c6de57d8e757991cf992… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 29 13:32:56 2010 +0200 d3d9: Add source/destination and backbuffer tests for StretchRect. --- dlls/d3d9/tests/visual.c | 159 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=342c6c6de57d8e757991c…

1 0

Roderick Colenbrander : ddraw: Add some DirectDraw Blt tests.
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: 2930f849617600b5e070f7ba65d9a4b25c01f560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2930f849617600b5e070f7ba6… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Mar 27 18:16:44 2010 +0100 ddraw: Add some DirectDraw Blt tests. --- dlls/ddraw/tests/visual.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 221e6d1..290cb76 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -558,6 +558,113 @@ static void fog_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "Turning off fog calculations returned %08x\n", hr); } +static void blt_test(IDirect3DDevice7 *device) +{ + IDirectDrawSurface7 *backbuffer = NULL, *offscreen = NULL; + DDSURFACEDESC2 ddsd; + HRESULT hr; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + ddsd.dwWidth = 640; + ddsd.dwHeight = 480; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE; + hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &offscreen, NULL); + ok(hr == D3D_OK, "Creating the offscreen render target failed, hr = %08x\n", hr); + + /* Offscreen blits with the same source as destination */ + if(SUCCEEDED(hr)) + { + RECT src_rect, dst_rect; + + /* Blit the whole surface to itself */ + hr = IDirectDrawSurface_Blt(offscreen, NULL, offscreen, NULL, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + /* Overlapped blit */ + dst_rect.left = 0; dst_rect.right = 480; + dst_rect.top = 0; dst_rect.bottom = 480; + src_rect.left = 160; src_rect.right = 640; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, offscreen, &src_rect, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + /* Overlapped blit, flip-y through source rectangle (not allowed) */ + dst_rect.left = 0; dst_rect.right = 480; + dst_rect.top = 0; dst_rect.bottom = 480; + src_rect.left = 160; src_rect.right = 640; + src_rect.top = 480; src_rect.bottom = 0; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, offscreen, &src_rect, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + /* Overlapped blit, with shrinking in x */ + dst_rect.left = 0; dst_rect.right = 480; + dst_rect.top = 0; dst_rect.bottom = 480; + src_rect.left = 160; src_rect.right = 480; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, offscreen, &src_rect, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &backbuffer); + ok(hr == D3D_OK, "Unable to obtain a surface pointer to the backbuffer, hr = %08x\n", hr); + + /* backbuffer ==> texture blits */ + if(SUCCEEDED(hr) && offscreen) + { + RECT src_rect, dst_rect; + + /* backbuffer ==> texture, src_rect=NULL, dst_rect=NULL, no scaling */ + hr = IDirectDrawSurface_Blt(offscreen, NULL, backbuffer, NULL, 0, NULL); + ok(hr == DD_OK, "fullscreen Blt from backbuffer => texture failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, full surface blits, no scaling */ + dst_rect.left = 0; dst_rect.right = 640; + dst_rect.top = 0; dst_rect.bottom = 480; + src_rect.left = 0; src_rect.right = 640; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DD_OK, "fullscreen Blt from backbuffer => texture failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, flip in y-direction through source rectangle, no scaling (allowed) */ + dst_rect.left = 0; dst_rect.right = 640; + dst_rect.top = 480; dst_rect.top = 0; + src_rect.left = 0; src_rect.right = 640; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DD_OK, "backbuffer => texture flip-y src_rect failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, flip in x-direction through source rectangle, no scaling (not allowed) */ + dst_rect.left = 640; dst_rect.right = 0; + dst_rect.top = 0; dst_rect.top = 480; + src_rect.left = 0; src_rect.right = 640; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "backbuffer => texture flip-x src_rect failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, flip in y-direction through destination rectangle (not allowed) */ + dst_rect.left = 0; dst_rect.right = 640; + dst_rect.top = 0; dst_rect.top = 480; + src_rect.left = 0; src_rect.right = 640; + src_rect.top = 480; src_rect.bottom = 0; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "backbuffer => texture flip-y dst_rect failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, flip in x-direction through destination rectangle, no scaling (not allowed) */ + dst_rect.left = 0; dst_rect.right = 640; + dst_rect.top = 0; dst_rect.top = 480; + src_rect.left = 640; src_rect.right = 0; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "backbuffer => texture flip-x dst_rect failed with hr = %08x\n", hr); + } + + if(offscreen) IDirectDrawSurface7_Release(offscreen); + if(backbuffer) IDirectDrawSurface7_Release(backbuffer); +} + static void offscreen_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -2853,6 +2960,7 @@ START_TEST(visual) } /* Now run the tests */ + blt_test(Direct3DDevice); depth_clamp_test(Direct3DDevice); lighting_test(Direct3DDevice); clear_test(Direct3DDevice);

1 0

Roderick Colenbrander : wined3d: Move argb_to_fmt to utils. c as a helper function to be used in more places.
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: f724843f14f1c2fa094103760be382c4350c7d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f724843f14f1c2fa094103760… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 25 16:30:13 2010 +0100 wined3d: Move argb_to_fmt to utils.c as a helper function to be used in more places. --- dlls/wined3d/device.c | 112 +--------------------------------------- dlls/wined3d/utils.c | 109 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 + 3 files changed, 114 insertions(+), 110 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b63dd0..cba1447 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5525,114 +5525,6 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, context_release(context); } -static inline DWORD argb_to_fmt(DWORD color, WINED3DFORMAT destfmt) { - unsigned int r, g, b, a; - DWORD ret; - - if (destfmt == WINED3DFMT_B8G8R8A8_UNORM - || destfmt == WINED3DFMT_B8G8R8X8_UNORM - || destfmt == WINED3DFMT_B8G8R8_UNORM) - return color; - - TRACE("Converting color %08x to format %s\n", color, debug_d3dformat(destfmt)); - - a = (color & 0xff000000) >> 24; - r = (color & 0x00ff0000) >> 16; - g = (color & 0x0000ff00) >> 8; - b = (color & 0x000000ff) >> 0; - - switch(destfmt) - { - case WINED3DFMT_B5G6R5_UNORM: - if(r == 0xff && g == 0xff && b == 0xff) return 0xffff; - r = (r * 32) / 256; - g = (g * 64) / 256; - b = (b * 32) / 256; - ret = r << 11; - ret |= g << 5; - ret |= b; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_B5G5R5X1_UNORM: - case WINED3DFMT_B5G5R5A1_UNORM: - a = (a * 2) / 256; - r = (r * 32) / 256; - g = (g * 32) / 256; - b = (b * 32) / 256; - ret = a << 15; - ret |= r << 10; - ret |= g << 5; - ret |= b << 0; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_A8_UNORM: - TRACE("Returning %08x\n", a); - return a; - - case WINED3DFMT_B4G4R4X4_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - a = (a * 16) / 256; - r = (r * 16) / 256; - g = (g * 16) / 256; - b = (b * 16) / 256; - ret = a << 12; - ret |= r << 8; - ret |= g << 4; - ret |= b << 0; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_B2G3R3_UNORM: - r = (r * 8) / 256; - g = (g * 8) / 256; - b = (b * 4) / 256; - ret = r << 5; - ret |= g << 2; - ret |= b << 0; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_R8G8B8X8_UNORM: - case WINED3DFMT_R8G8B8A8_UNORM: - ret = a << 24; - ret |= b << 16; - ret |= g << 8; - ret |= r << 0; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_B10G10R10A2_UNORM: - a = (a * 4) / 256; - r = (r * 1024) / 256; - g = (g * 1024) / 256; - b = (b * 1024) / 256; - ret = a << 30; - ret |= r << 20; - ret |= g << 10; - ret |= b << 0; - TRACE("Returning %08x\n", ret); - return ret; - - case WINED3DFMT_R10G10B10A2_UNORM: - a = (a * 4) / 256; - r = (r * 1024) / 256; - g = (g * 1024) / 256; - b = (b * 1024) / 256; - ret = a << 30; - ret |= b << 20; - ret |= g << 10; - ret |= r << 0; - TRACE("Returning %08x\n", ret); - return ret; - - default: - FIXME("Add a COLORFILL conversion for format %s\n", debug_d3dformat(destfmt)); - return 0; - } -} - static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, const WINED3DRECT *pRect, WINED3DCOLOR color) { @@ -5654,7 +5546,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, /* Just forward this to the DirectDraw blitting engine */ memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = argb_to_fmt(color, surface->resource.format_desc->format); + BltFx.u5.dwFillColor = color_convert_argb_to_fmt(color, surface->resource.format_desc->format); return IWineD3DSurface_Blt(pSurface, (const RECT *)pRect, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); } @@ -5702,7 +5594,7 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac /* Just forward this to the DirectDraw blitting engine */ memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = argb_to_fmt(c, ((IWineD3DSurfaceImpl *)surface)->resource.format_desc->format); + BltFx.u5.dwFillColor = color_convert_argb_to_fmt(c, ((IWineD3DSurfaceImpl *)surface)->resource.format_desc->format); hr = IWineD3DSurface_Blt(surface, NULL, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); if (FAILED(hr)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e2e888d..46252eb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2202,6 +2202,115 @@ BOOL getDepthStencilBits(const struct wined3d_format_desc *format_desc, short *d return TRUE; } +DWORD color_convert_argb_to_fmt(DWORD color, WINED3DFORMAT destfmt) +{ + unsigned int r, g, b, a; + DWORD ret; + + if (destfmt == WINED3DFMT_B8G8R8A8_UNORM + || destfmt == WINED3DFMT_B8G8R8X8_UNORM + || destfmt == WINED3DFMT_B8G8R8_UNORM) + return color; + + TRACE("Converting color %08x to format %s\n", color, debug_d3dformat(destfmt)); + + a = (color & 0xff000000) >> 24; + r = (color & 0x00ff0000) >> 16; + g = (color & 0x0000ff00) >> 8; + b = (color & 0x000000ff) >> 0; + + switch(destfmt) + { + case WINED3DFMT_B5G6R5_UNORM: + if(r == 0xff && g == 0xff && b == 0xff) return 0xffff; + r = (r * 32) / 256; + g = (g * 64) / 256; + b = (b * 32) / 256; + ret = r << 11; + ret |= g << 5; + ret |= b; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_B5G5R5X1_UNORM: + case WINED3DFMT_B5G5R5A1_UNORM: + a = (a * 2) / 256; + r = (r * 32) / 256; + g = (g * 32) / 256; + b = (b * 32) / 256; + ret = a << 15; + ret |= r << 10; + ret |= g << 5; + ret |= b << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_A8_UNORM: + TRACE("Returning %08x\n", a); + return a; + + case WINED3DFMT_B4G4R4X4_UNORM: + case WINED3DFMT_B4G4R4A4_UNORM: + a = (a * 16) / 256; + r = (r * 16) / 256; + g = (g * 16) / 256; + b = (b * 16) / 256; + ret = a << 12; + ret |= r << 8; + ret |= g << 4; + ret |= b << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_B2G3R3_UNORM: + r = (r * 8) / 256; + g = (g * 8) / 256; + b = (b * 4) / 256; + ret = r << 5; + ret |= g << 2; + ret |= b << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_R8G8B8X8_UNORM: + case WINED3DFMT_R8G8B8A8_UNORM: + ret = a << 24; + ret |= b << 16; + ret |= g << 8; + ret |= r << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_B10G10R10A2_UNORM: + a = (a * 4) / 256; + r = (r * 1024) / 256; + g = (g * 1024) / 256; + b = (b * 1024) / 256; + ret = a << 30; + ret |= r << 20; + ret |= g << 10; + ret |= b << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_R10G10B10A2_UNORM: + a = (a * 4) / 256; + r = (r * 1024) / 256; + g = (g * 1024) / 256; + b = (b * 1024) / 256; + ret = a << 30; + ret |= b << 20; + ret |= g << 10; + ret |= r << 0; + TRACE("Returning %08x\n", ret); + return ret; + + default: + FIXME("Add a COLORFILL conversion for format %s\n", debug_d3dformat(destfmt)); + return 0; + } +} + /* DirectDraw stuff */ WINED3DFORMAT pixelformat_for_depth(DWORD depth) { switch(depth) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4237f04..0f134d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2626,6 +2626,9 @@ const char *debug_d3dtop(WINED3DTEXTUREOP d3dtop) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN; +/* Color conversion routines */ +DWORD color_convert_argb_to_fmt(DWORD color, WINED3DFORMAT destfmt) DECLSPEC_HIDDEN; + /* Routines for GL <-> D3D values */ GLenum StencilOp(DWORD op) DECLSPEC_HIDDEN; GLenum CompareFunc(DWORD func) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : configure: Create a few symlinks needed for running in Wow64 mode inside the build tree .
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: e5c585e4a4d2162f4c45a0e6f909bf8524e2610c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c585e4a4d2162f4c45a0e6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 17:54:55 2010 +0200 configure: Create a few symlinks needed for running in Wow64 mode inside the build tree. --- configure | 12 ++++++++++++ configure.ac | 13 +++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/configure b/configure index b02fe65..f133705 100755 --- a/configure +++ b/configure @@ -14713,6 +14713,18 @@ ac_config_commands="$ac_config_commands Makefile" ac_config_files="$ac_config_files Make.tmp:Makefile.in" + +if test -n "$with_wine64" +then +wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine32 +fonts server: + \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ +$with_wine64/loader/wine32: + \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine32 \$@ +clean:: + \$(RM) fonts server $with_wine64/loader/wine32" +fi + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)" diff --git a/configure.ac b/configure.ac index 25a1313..349a25a 100644 --- a/configure.ac +++ b/configure.ac @@ -2713,6 +2713,19 @@ _WINE_EOF AC_CONFIG_FILES([Make.tmp:Makefile.in]) dnl Some final makefile rules + +if test -n "$with_wine64" +then +WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], +[all: fonts server $with_wine64/loader/wine32 +fonts server: + \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] +$with_wine64/loader/wine32: + \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine32 \$[@] +clean:: + \$(RM) fonts server $with_wine64/loader/wine32]) +fi + WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], [uninstall:: -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)])

1 0

Alexandre Julliard : loader: Rename the 32-bit loader in the build tree too when doing a Wow64 build.
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: 50c6ac83249a4de062f9e362a926dee2ce108046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c6ac83249a4de062f9e362a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 17:53:30 2010 +0200 loader: Rename the 32-bit loader in the build tree too when doing a Wow64 build. --- .gitignore | 1 + loader/Makefile.in | 5 +++-- tools/winewrapper | 25 +++++++++---------------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 6ea657d..264e2de 100644 --- a/.gitignore +++ b/.gitignore @@ -229,6 +229,7 @@ loader/wine-preloader loader/wine.de.man loader/wine.fr.man loader/wine.man +loader/wine32 programs/Makeprog.rules programs/rpcss/epm.h programs/rpcss/epm_s.c diff --git a/loader/Makefile.in b/loader/Makefile.in index c314c9b..6e08066 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -13,6 +13,7 @@ EXTRA_BINARIES = @EXTRA_BINARIES@ PROGRAMS = \ wine \ + wine32 \ wine-installed \ wine-preloader @@ -27,7 +28,7 @@ INSTALLDIRS = \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) -all: wine wine-installed $(EXTRA_BINARIES) $(MANPAGES) +all: $(MAIN_BINARY) wine-installed $(EXTRA_BINARIES) $(MANPAGES) @MAKE_RULES@ @@ -37,7 +38,7 @@ LDEXECFLAGS = @LDEXECFLAGS@ wine-preloader: preloader.o Makefile.in $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) -wine: main.o Makefile.in +$(MAIN_BINARY): main.o Makefile.in $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) wine-installed: main.o Makefile.in diff --git a/tools/winewrapper b/tools/winewrapper index 13be936..c664142 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -81,7 +81,14 @@ else export LD_LIBRARY_PATH fi -WINELOADER="$topdir/loader/wine" +if [ -x "$topdir/loader/wine" ] +then WINELOADER="$topdir/loader/wine" +elif [ -x "$topdir/loader/wine32" ] +then WINELOADER="$topdir/loader/wine32" +else + echo "$0: could not find the wine loader in $topdir" + exit 1 +fi export WINELOADER # any local settings ? @@ -92,18 +99,4 @@ fi # and run the application -case "$0" in - wine|*/wine) - exec "$WINELOADER" "$@" - ;; - */*) - [ -f "$0.exe.so" ] && exec "$WINELOADER" "$0.exe.so" "$@" - echo "$0: cannot find corresponding application" - exit 1 - ;; - *) - [ -f "$appdir/$0.exe.so" ] && exec "$WINELOADER" "$appdir/$0.exe.so" "$@" - echo "$0: cannot find corresponding application" - exit 1 - ;; -esac +exec "$WINELOADER" "$@"

1 0

Alexandre Julliard : kernel32: Add support for starting binaries in 32/ 64-bit mode from the other mode.
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: 808c29b908db64723ff37147b0a5dea5c95988ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=808c29b908db64723ff37147b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 17:57:02 2010 +0200 kernel32: Add support for starting binaries in 32/64-bit mode from the other mode. --- dlls/kernel32/process.c | 62 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 30e7ca4..0a404bc 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -75,6 +75,7 @@ static UINT process_error_mode; static DWORD shutdown_flags = 0; static DWORD shutdown_priority = 0x280; static BOOL is_wow64; +static const int is_win64 = (sizeof(void *) > sizeof(int)); HMODULE kernel32_handle = 0; @@ -868,9 +869,7 @@ static void init_windows_dirs(void) ERR( "directory %s could not be created, error %u\n", debugstr_w(DIR_System), GetLastError() ); -#ifndef _WIN64 /* SysWow64 is always defined on 64-bit */ - if (is_wow64) -#endif + if (is_win64 || is_wow64) /* SysWow64 is always defined on 64-bit */ { len = strlenW( DIR_Windows ); buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_syswow64W) ); @@ -1581,6 +1580,49 @@ done: return info; } +/*********************************************************************** + * get_alternate_loader + * + * Get the name of the alternate (32 or 64 bit) Wine loader. + */ +static const char *get_alternate_loader( char **ret_env ) +{ + char *env; + const char *loader = NULL; + const char *loader_env = getenv( "WINELOADER" ); + + *ret_env = NULL; + + if (wine_get_build_dir()) loader = is_win64 ? "loader/wine32" : "server/../loader/wine"; + + if (loader_env) + { + int len = strlen( loader_env ); + if (is_win64) + { + if (!(env = HeapAlloc( GetProcessHeap(), 0, sizeof("WINELOADER=") + len + 2 ))) return NULL; + strcpy( env, "WINELOADER=" ); + strcat( env, loader_env ); + strcat( env, "32" ); + } + else + { + if (!(env = HeapAlloc( GetProcessHeap(), 0, sizeof("WINELOADER=") + len ))) return NULL; + strcpy( env, "WINELOADER=" ); + strcat( env, loader_env ); + len += sizeof("WINELOADER=") - 1; + if (!strcmp( env + len - 2, "32" )) env[len - 2] = 0; + } + if (!loader) + { + if ((loader = strrchr( env, '/' ))) loader++; + else loader = env; + } + } + if (!loader) loader = is_win64 ? "wine32" : "wine"; + *ret_env = env; + return loader; +} /*********************************************************************** * create_process @@ -1598,6 +1640,8 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW HANDLE process_info; WCHAR *env_end; char *winedebug = NULL; + char *wineloader = NULL; + const char *loader = NULL; char **argv; startup_info_t *startup_info; DWORD startup_info_size; @@ -1605,7 +1649,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW pid_t pid; int err; - if (sizeof(void *) == sizeof(int) && !is_wow64 && (binary_info->flags & BINARY_FLAG_64BIT)) + if (!is_win64 && !is_wow64 && (binary_info->flags & BINARY_FLAG_64BIT)) { ERR( "starting 64-bit process %s not supported on this platform\n", debugstr_w(filename) ); SetLastError( ERROR_BAD_EXE_FORMAT ); @@ -1698,6 +1742,9 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW /* create the child process */ argv = build_argv( cmd_line, 1 ); + if (!is_win64 ^ !(binary_info->flags & BINARY_FLAG_64BIT)) + loader = get_alternate_loader( &wineloader ); + if (exec_only || !(pid = fork())) /* child */ { char preloader_reserve[64], socket_env[64]; @@ -1738,9 +1785,10 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW putenv( preloader_reserve ); putenv( socket_env ); if (winedebug) putenv( winedebug ); + if (wineloader) putenv( wineloader ); if (unixdir) chdir(unixdir); - if (argv) wine_exec_wine_binary( NULL, argv, getenv("WINELOADER") ); + if (argv) wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); _exit(1); } @@ -1751,6 +1799,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW close( socketfd[0] ); HeapFree( GetProcessHeap(), 0, argv ); HeapFree( GetProcessHeap(), 0, winedebug ); + HeapFree( GetProcessHeap(), 0, wineloader ); if (pid == -1) { FILE_SetDosError(); @@ -2072,7 +2121,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; case BINARY_UNIX_LIB: - TRACE( "starting %s as Winelib app\n", debugstr_w(name) ); + TRACE( "starting %s as %d-bit Winelib app\n", + debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32 ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break;

1 0

Alexandre Julliard : kernel32: Fix processing of spaces in command line for builtin exes.
by Alexandre Julliard March 30, 2010

March 30, 2010

Module: wine Branch: master Commit: be0db98a232f208e8b011d86ad15f4b9b8eacbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0db98a232f208e8b011d86a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 19:37:35 2010 +0200 kernel32: Fix processing of spaces in command line for builtin exes. --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0a404bc..541c794 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1967,8 +1967,8 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, ret = cmdline; break; } - if (!(*pos++ = *p++)) break; if (!first_space) first_space = pos; + if (!(*pos++ = *p++)) break; } if (!ret)

1 0

Henri Verbeet : wined3d: GL errors aren't FIXMEs.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: f69d0fa00de9d662eeaef1ab237c3a540920c574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69d0fa00de9d662eeaef1ab2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 29 13:31:11 2010 +0200 wined3d: GL errors aren't FIXMEs. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a580a84..4237f04 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -789,7 +789,7 @@ do { \ TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ \ } else do { \ - FIXME(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ + ERR(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ debug_glerror(err), err, A, __FILE__, __LINE__); \ err = glGetError(); \ } while (err != GL_NO_ERROR); \

1 0