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

Stefan Dösinger : wined3d: Use FBOs when the onscreen depth stencil format isn't suitable.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: dc918d43946462ad4c04ed373cda72d1ebe9b6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc918d43946462ad4c04ed373… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 28 16:42:32 2010 +0200 wined3d: Use FBOs when the onscreen depth stencil format isn't suitable. This allows proper support of float depth buffers when rendering to onscreen surfaces. --- dlls/wined3d/context.c | 66 +++++++++++++++++++++++++++++++++++++++------- dlls/wined3d/swapchain.c | 2 +- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 738746e..e218088 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1929,6 +1929,57 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) context->draw_buffer_dirty = TRUE; } +static inline void context_set_render_offscreen(struct wined3d_context *context, const struct StateEntry *StateTable, + BOOL offscreen) +{ + if (context->render_offscreen == offscreen) return; + + Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); + Context_MarkStateDirty(context, STATE_VDECL, StateTable); + Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); + Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); + Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); + context->render_offscreen = offscreen; +} + +static BOOL match_depth_stencil_format(const struct wined3d_format_desc *existing, + const struct wined3d_format_desc *required) +{ + short existing_depth, existing_stencil, required_depth, required_stencil; + + if(existing == required) return TRUE; + if((existing->Flags & WINED3DFMT_FLAG_FLOAT) != (required->Flags & WINED3DFMT_FLAG_FLOAT)) return FALSE; + + getDepthStencilBits(existing, &existing_depth, &existing_stencil); + getDepthStencilBits(required, &required_depth, &required_stencil); + + if(existing_depth < required_depth) return FALSE; + /* If stencil bits are used the exact amount is required - otherwise wrapping + * won't work correctly */ + if(required_stencil && required_stencil != existing_stencil) return FALSE; + return TRUE; +} +/* The caller provides a context */ +static void context_validate_onscreen_formats(IWineD3DDeviceImpl *device, struct wined3d_context *context) +{ + /* Onscreen surfaces are always in a swapchain */ + IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) device->stencilBufferTarget; + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) ((IWineD3DSurfaceImpl *)context->current_rt)->container; + + if (!depth_stencil) return; + if (match_depth_stencil_format(swapchain->ds_format, depth_stencil->resource.format_desc)) return; + + /* TODO: If the requested format would satisfy the needs of the existing one(reverse match), + * or no onscreen depth buffer was created, the OpenGL drawable could be changed to the new + * format. */ + WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n"); + + /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ + IWineD3DSurface_LoadLocation(context->current_rt, SFLAG_INTEXTURE, NULL); + swapchain->render_to_fbo = TRUE; + context_set_render_offscreen(context, device->StateTable, TRUE); +} + /* Context activation is done by the caller. */ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, enum ContextUsage usage) { @@ -1939,6 +1990,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI case CTXUSAGE_CLEAR: case CTXUSAGE_DRAWPRIM: if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if (!context->render_offscreen) context_validate_onscreen_formats(device, context); ENTER_GL(); context_apply_fbo_state(context); LEAVE_GL(); @@ -1951,6 +2003,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI case CTXUSAGE_BLIT: if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if (!context->render_offscreen) context_validate_onscreen_formats(device, context); if (context->render_offscreen) { FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); @@ -2043,21 +2096,14 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurface *target) { - BOOL old_render_offscreen = context->render_offscreen; + BOOL old_render_offscreen = context->render_offscreen, render_offscreen; const struct StateEntry *StateTable = device->StateTable; if (!target) return; else if (context->current_rt == target) return; - context->render_offscreen = surface_is_offscreen(target); + render_offscreen = surface_is_offscreen(target); - if (context->render_offscreen != old_render_offscreen) - { - Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); - Context_MarkStateDirty(context, STATE_VDECL, StateTable); - Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); - Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); - } + context_set_render_offscreen(context, StateTable, render_offscreen); /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 14a741b..2daa08c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -811,7 +811,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface if (!present_parameters->EnableAutoDepthStencil || swapchain->presentParms.AutoDepthStencilFormat != WINED3DFMT_D24_UNORM_S8_UINT) { - FIXME("Add OpenGL context recreation support to SetDepthStencilSurface\n"); + FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); } swapchain->ds_format = getFormatDescEntry(WINED3DFMT_D24_UNORM_S8_UINT, gl_info); swapchain->context[0] = context_create(swapchain, (IWineD3DSurfaceImpl *)swapchain->frontBuffer,

1 0

Paul Vriens : d3d9/tests: Initialize a variable (Coverity).
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: cc20a0da59797ca15de20079668e545548b5fa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc20a0da59797ca15de200796… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 31 10:54:37 2010 +0200 d3d9/tests: Initialize a variable (Coverity). --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d73a469..2695b46 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2220,7 +2220,7 @@ static void stretchrect_test(IDirect3DDevice9 *device) IDirect3DSurface9 *surf_offscreen32 = NULL, *surf_offscreen64 = NULL, *surf_offscreen_dest64 = NULL; IDirect3DSurface9 *surf_temp32 = NULL, *surf_temp64 = NULL; IDirect3DSurface9 *orig_rt = NULL; - IDirect3DSurface9 *backbuffer; + IDirect3DSurface9 *backbuffer = NULL; DWORD color; RECT src_rect64 = {0, 0, 64, 64};

1 0

Henri Verbeet : wined3d: Cleanup variable naming in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 61ca407151649dc763950414e076ea7c640afee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ca407151649dc763950414e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:28:56 2010 +0200 wined3d: Cleanup variable naming in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 126 ++++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61ca407151649dc763950…

1 0

Roderick Colenbrander : wined3d: Remove some unneeded source rectangle calculations from BltOverride.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: c6f0ddcb1a43aa1ef40566fc0f5a03f4fcfaee7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f0ddcb1a43aa1ef40566fc0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 30 22:19:02 2010 +0200 wined3d: Remove some unneeded source rectangle calculations from BltOverride. --- dlls/wined3d/surface.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e57a6c7..94880a0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3817,24 +3817,17 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const /* Check rects - IWineD3DDevice_Present doesn't handle them */ while(1) { - RECT mySrcRect; TRACE("Looking if a Present can be done...\n"); /* Source Rectangle must be full surface */ - if( SrcRect ) { - if(SrcRect->left != 0 || SrcRect->top != 0 || - SrcRect->right != Src->currentDesc.Width || SrcRect->bottom != Src->currentDesc.Height) { - TRACE("No, Source rectangle doesn't match\n"); - break; - } + if(src_rect.left != 0 || src_rect.top != 0 || + src_rect.right != Src->currentDesc.Width || src_rect.bottom != Src->currentDesc.Height) { + TRACE("No, Source rectangle doesn't match\n"); + break; } - mySrcRect.left = 0; - mySrcRect.top = 0; - mySrcRect.right = Src->currentDesc.Width; - mySrcRect.bottom = Src->currentDesc.Height; /* No stretching may occur */ - if(mySrcRect.right != dst_rect.right - dst_rect.left || - mySrcRect.bottom != dst_rect.bottom - dst_rect.top) { + if(src_rect.right != dst_rect.right - dst_rect.left || + src_rect.bottom != dst_rect.bottom - dst_rect.top) { TRACE("No, stretching is done\n"); break; }

1 0

Roderick Colenbrander : wined3d: Remove the last use of the WINED3DRECT destination rectangle in BltOverride .
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 87b5b2f7381ef740988985effd2ca7cc44e26e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b5b2f7381ef740988985eff… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 30 22:19:01 2010 +0200 wined3d: Remove the last use of the WINED3DRECT destination rectangle in BltOverride. --- dlls/wined3d/surface.c | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4fcede1..e57a6c7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3766,7 +3766,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *myDevice = This->resource.device; - WINED3DRECT rect; IWineD3DSwapChainImpl *srcSwapchain = NULL, *dstSwapchain = NULL; IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; RECT dst_rect, src_rect; @@ -3803,17 +3802,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const return WINED3DERR_INVALIDCALL; } - if (DestRect) { - rect.x1 = DestRect->left; - rect.y1 = DestRect->top; - rect.x2 = DestRect->right; - rect.y2 = DestRect->bottom; - } else { - rect.x1 = 0; - rect.y1 = 0; - rect.x2 = This->currentDesc.Width; - rect.y2 = This->currentDesc.Height; - } surface_get_rect(This, DestRect, &dst_rect); if(Src) surface_get_rect(Src, SrcRect, &src_rect); @@ -3845,8 +3833,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const mySrcRect.bottom = Src->currentDesc.Height; /* No stretching may occur */ - if(mySrcRect.right != rect.x2 - rect.x1 || - mySrcRect.bottom != rect.y2 - rect.y1) { + if(mySrcRect.right != dst_rect.right - dst_rect.left || + mySrcRect.bottom != dst_rect.bottom - dst_rect.top) { TRACE("No, stretching is done\n"); break; } @@ -3857,10 +3845,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const RECT cliprect; POINT pos[2]; GetClientRect(((IWineD3DClipperImpl *) This->clipper)->hWnd, &cliprect); - pos[0].x = rect.x1; - pos[0].y = rect.y1; - pos[1].x = rect.x2; - pos[1].y = rect.y2; + pos[0].x = dst_rect.left; + pos[0].y = dst_rect.top; + pos[1].x = dst_rect.right; + pos[1].y = dst_rect.bottom; MapWindowPoints(GetDesktopWindow(), ((IWineD3DClipperImpl *) This->clipper)->hWnd, pos, 2); @@ -3868,15 +3856,15 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const pos[1].x != cliprect.right || pos[1].y != cliprect.bottom) { TRACE("No, dest rectangle doesn't match(clipper)\n"); - TRACE("Clip rect at (%d,%d)-(%d,%d)\n", cliprect.left, cliprect.top, cliprect.right, cliprect.bottom); - TRACE("Blt dest: (%d,%d)-(%d,%d)\n", rect.x1, rect.y1, rect.x2, rect.y2); + TRACE("Clip rect at %s\n", wine_dbgstr_rect(&cliprect)); + TRACE("Blt dest: %s\n", wine_dbgstr_rect(&dst_rect)); break; } } else { - if(rect.x1 != 0 || rect.y1 != 0 || - rect.x2 != This->currentDesc.Width || rect.y2 != This->currentDesc.Height) { + if(dst_rect.left != 0 || dst_rect.top != 0 || + dst_rect.right != This->currentDesc.Width || dst_rect.bottom != This->currentDesc.Height) { TRACE("No, dest rectangle doesn't match(surface size)\n"); break; }

1 0

Roderick Colenbrander : wined3d: Use RECT instead of WINED3DRECT in fb_copy_to_texture_hwstretch.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 40f3f0b0417f953663b313fbf01dfbd3a7c5f01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f3f0b0417f953663b313fbf… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 30 22:19:00 2010 +0200 wined3d: Use RECT instead of WINED3DRECT in fb_copy_to_texture_hwstretch. --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f028d10..4fcede1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3504,7 +3504,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* Uses the hardware to stretch and flip the image */ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, - IWineD3DSwapChainImpl *swapchain, const WINED3DRECT *srect, const WINED3DRECT *drect, + IWineD3DSwapChainImpl *swapchain, const RECT *src_rect, const RECT *dst_rect, BOOL upsidedown, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *myDevice = This->resource.device; @@ -3606,7 +3606,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine glBindTexture(GL_TEXTURE_2D, src); checkGLcall("glBindTexture(GL_TEXTURE_2D, src)"); - /* TODO: Only copy the part that will be read. Use srect->x1, srect->y2 as origin, but with the width watch + /* TODO: Only copy the part that will be read. Use src_rect->left, src_rect->bottom as origin, but with the width watch * out for power of 2 sizes */ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, Src->pow2Width, Src->pow2Height, 0, @@ -3634,15 +3634,15 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine } checkGLcall("glEnd and previous"); - left = srect->x1; - right = srect->x2; + left = src_rect->left; + right = src_rect->right; if(upsidedown) { - top = Src->currentDesc.Height - srect->y1; - bottom = Src->currentDesc.Height - srect->y2; + top = Src->currentDesc.Height - src_rect->top; + bottom = Src->currentDesc.Height - src_rect->bottom; } else { - top = Src->currentDesc.Height - srect->y2; - bottom = Src->currentDesc.Height - srect->y1; + top = Src->currentDesc.Height - src_rect->bottom; + bottom = Src->currentDesc.Height - src_rect->top; } if(Src->Flags & SFLAG_NORMCOORD) { @@ -3666,15 +3666,15 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine /* top left */ glTexCoord2f(left, top); - glVertex2i(0, fbheight - drect->y2 - drect->y1); + glVertex2i(0, fbheight - dst_rect->bottom - dst_rect->top); /* top right */ glTexCoord2f(right, top); - glVertex2i(drect->x2 - drect->x1, fbheight - drect->y2 - drect->y1); + glVertex2i(dst_rect->right - dst_rect->left, fbheight - dst_rect->bottom - dst_rect->top); /* bottom right */ glTexCoord2f(right, bottom); - glVertex2i(drect->x2 - drect->x1, fbheight); + glVertex2i(dst_rect->right - dst_rect->left, fbheight); glEnd(); checkGLcall("glEnd and previous"); @@ -3690,9 +3690,9 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine checkGLcall("glBindTexture"); glCopyTexSubImage2D(texture_target, 0, - drect->x1, drect->y1, /* xoffset, yoffset */ + dst_rect->left, dst_rect->top, /* xoffset, yoffset */ 0, 0, /* We blitted the image to the origin */ - drect->x2 - drect->x1, drect->y2 - drect->y1); + dst_rect->right - dst_rect->left, dst_rect->bottom - dst_rect->top); checkGLcall("glCopyTexSubImage2D"); if(drawBuffer == GL_BACK) { @@ -3997,7 +3997,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, upsideDown, Filter); } else { TRACE("Using hardware stretching to flip / stretch the texture\n"); - fb_copy_to_texture_hwstretch(This, SrcSurface, srcSwapchain, (WINED3DRECT*)&src_rect, (WINED3DRECT*)&dst_rect, upsideDown, Filter); + fb_copy_to_texture_hwstretch(This, SrcSurface, srcSwapchain, &src_rect, &dst_rect, upsideDown, Filter); } /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */

1 0

Roderick Colenbrander : wined3d: Use RECT instead of WINED3DRECT in stretch_rect_fbo.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: ae26d9defde31bafa23b17bc97318fa25aeb8d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae26d9defde31bafa23b17bc9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 30 22:18:58 2010 +0200 wined3d: Use RECT instead of WINED3DRECT in stretch_rect_fbo. --- dlls/wined3d/device.c | 44 ++++++++++++++++++++----------------- dlls/wined3d/surface.c | 47 +++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 41 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae26d9defde31bafa23b1…

1 0

Alexandre Julliard : ntdll/tests: Don't free a string that wasn't allocated .
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 71ce9dae679d66abbab0e98e30501305adf9a31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ce9dae679d66abbab0e98e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 14:20:19 2010 +0200 ntdll/tests: Don't free a string that wasn't allocated. --- dlls/ntdll/tests/file.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3d28d80..7540d78 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -247,7 +247,6 @@ static void create_file_test(void) todo_wine ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); - pRtlFreeUnicodeString( &nameW ); } static void open_file_test(void)

1 0

Alexandre Julliard : ntdll/tests: Port functions use the 64-bit structure on Wow64.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 9608085bf613eec350fc3d7f4c35dd44ca114f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9608085bf613eec350fc3d7f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 14:20:09 2010 +0200 ntdll/tests: Port functions use the 64-bit structure on Wow64. --- dlls/ntdll/tests/port.c | 188 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 137 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9608085bf613eec350fc3…

1 0

Alexandre Julliard : configure: Don' t build rpcss or winemenubuilder for Wow64.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 2f375cc6ea45c00b235bf34ce563e01f43d4ecc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f375cc6ea45c00b235bf34ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 12:53:12 2010 +0200 configure: Don't build rpcss or winemenubuilder for Wow64. --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f133705..6725765 100755 --- a/configure +++ b/configure @@ -4119,10 +4119,12 @@ then enable_fonts=${enable_fonts:-no} enable_include=${enable_include:-no} + enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} enable_wineboot=${enable_wineboot:-no} enable_winedbg=${enable_winedbg:-no} + enable_winemenubuilder=${enable_winemenubuilder:-no} test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" fi diff --git a/configure.ac b/configure.ac index 349a25a..835a128 100644 --- a/configure.ac +++ b/configure.ac @@ -191,10 +191,12 @@ then AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} enable_include=${enable_include:-no} + enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} enable_wineboot=${enable_wineboot:-no} enable_winedbg=${enable_winedbg:-no} + enable_winemenubuilder=${enable_winemenubuilder:-no} test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" fi

1 0