wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Henri Verbeet : wined3d: Explicitly load and modify the surface in color_fill_fbo().
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 84913109f6396c6aa6cd18e17cca089e04d90687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84913109f6396c6aa6cd18e17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:24 2010 +0100 wined3d: Explicitly load and modify the surface in color_fill_fbo(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b5db14..79be3a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5387,6 +5387,9 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct wined3d_context *context; + if (rect) IWineD3DSurface_LoadLocation(surface, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_ModifyLocation(surface, SFLAG_INDRAWABLE, TRUE); + if (!surface_is_offscreen(surface)) { TRACE("Surface %p is onscreen\n", surface);

1 0

Henri Verbeet : wined3d: Do not depend on context_attach_surface_fbo() to load the surface in stretch_rect_fbo().
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 5f3dccddb46c3521572d0dfc3a54e9dbbdf8bf86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3dccddb46c3521572d0dfc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:23 2010 +0100 wined3d: Do not depend on context_attach_surface_fbo() to load the surface in stretch_rect_fbo(). --- dlls/wined3d/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f915d1b..1b5db14 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5791,6 +5791,12 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED break; } + /* Make sure the drawables are up-to-date. Note that loading the + * destination surface isn't strictly required if we overwrite the + * entire surface. */ + IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); + /* Attach src surface to src fbo */ src_swapchain = get_swapchain(src_surface); dst_swapchain = get_swapchain(dst_surface); @@ -5806,9 +5812,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED GLenum buffer = surface_get_gl_buffer(src_surface); TRACE("Source surface %p is onscreen\n", src_surface); - /* Make sure the drawable is up to date. In the offscreen case - * attach_surface_fbo() implicitly takes care of this. */ - IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); if(buffer == GL_FRONT) { RECT windowsize; @@ -5845,9 +5848,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED GLenum buffer = surface_get_gl_buffer(dst_surface); TRACE("Destination surface %p is onscreen\n", dst_surface); - /* Make sure the drawable is up to date. In the offscreen case - * attach_surface_fbo() implicitly takes care of this. */ - IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); if(buffer == GL_FRONT) { RECT windowsize;

1 0

Henri Verbeet : wined3d: Update the stream info before applying states.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 040452ad90927aa8839b1f31a510b1b8a1afac1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=040452ad90927aa8839b1f31a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:22 2010 +0100 wined3d: Update the stream info before applying states. --- dlls/wined3d/context.c | 2 + dlls/wined3d/device.c | 72 +++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 84 ++-------------------------------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 78 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=040452ad90927aa8839b1…

1 0

Henri Verbeet : wined3d: Preload textures before applying states.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 31d51fb1754d02514e28f2b8db6fbe8206834f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d51fb1754d02514e28f2b8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:21 2010 +0100 wined3d: Preload textures before applying states. --- dlls/wined3d/context.c | 1 + dlls/wined3d/device.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 1 - dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a3da14a..ffc105e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2214,6 +2214,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI } IWineD3DDeviceImpl_FindTexUnitMap(device); + device_preload_textures(device); ENTER_GL(); for (i = 0; i < context->numDirtyEntries; ++i) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bf5ad3c..0652172 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -370,6 +370,50 @@ void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info, } } +static void device_preload_texture(IWineD3DStateBlockImpl *stateblock, unsigned int idx) +{ + IWineD3DBaseTextureImpl *texture; + enum WINED3DSRGB srgb; + + if (!(texture = (IWineD3DBaseTextureImpl *)stateblock->textures[idx])) return; + srgb = stateblock->samplerState[idx][WINED3DSAMP_SRGBTEXTURE] ? SRGB_SRGB : SRGB_RGB; + texture->baseTexture.internal_preload((IWineD3DBaseTexture *)texture, srgb); +} + +void device_preload_textures(IWineD3DDeviceImpl *device) +{ + IWineD3DStateBlockImpl *stateblock = device->stateBlock; + unsigned int i; + + if (use_vs(stateblock)) + { + for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + { + if (((IWineD3DBaseShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.sampler_type[i]) + device_preload_texture(stateblock, MAX_FRAGMENT_SAMPLERS + i); + } + } + + if (use_ps(stateblock)) + { + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (((IWineD3DBaseShaderImpl *)stateblock->pixelShader)->baseShader.reg_maps.sampler_type[i]) + device_preload_texture(stateblock, i); + } + } + else + { + WORD ffu_map = device->fixed_function_usage_map; + + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (ffu_map & 1) + device_preload_texture(stateblock, i); + } + } +} + /********************************************************** * IUnknown parts follows **********************************************************/ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5384f3e..81f5386 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3527,7 +3527,6 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wine if(stateblock->textures[sampler]) { BOOL srgb = stateblock->samplerState[sampler][WINED3DSAMP_SRGBTEXTURE]; IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *) stateblock->textures[sampler]; - tex_impl->baseTexture.internal_preload(stateblock->textures[sampler], srgb ? SRGB_SRGB : SRGB_RGB); IWineD3DBaseTexture_BindTexture(stateblock->textures[sampler], srgb); basetexture_apply_state_changes(stateblock->textures[sampler], stateblock->textureState[sampler], stateblock->samplerState[sampler], gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index afc4511..17e2733 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1620,6 +1620,7 @@ struct IWineD3DDeviceImpl HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, IUnknown *parent, IWineD3DDeviceParent *device_parent) DECLSPEC_HIDDEN; +void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Select the blitter during adapter initialization.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 7ff576bbabae44e97d7d38a56eef57acd8736997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff576bbabae44e97d7d38a56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:20 2010 +0100 wined3d: Select the blitter during adapter initialization. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 17 +++++++++++++---- dlls/wined3d/utils.c | 11 ----------- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 56e970d..bf5ad3c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6948,7 +6948,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, return hr; } - device->blitter = select_blit_implementation(adapter, device_type); + device->blitter = adapter->blitter; return WINED3D_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c9d3f90..e259375 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1655,6 +1655,17 @@ static const shader_backend_t *select_shader_backend(struct wined3d_adapter *ada return &none_shader_backend; } +static const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter) +{ + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + int vs_selected_mode, ps_selected_mode; + + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); + if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) + && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_blit; + else return &ffp_blit; +} + /* Context activation is done by the caller. */ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { @@ -2095,6 +2106,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) adapter->fragment_pipe = select_fragment_implementation(adapter); adapter->shader_backend = select_shader_backend(adapter); + adapter->blitter = select_blit_implementation(adapter); /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment @@ -3231,8 +3243,6 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, const struct GlPixelFormatDesc *adapter_format_desc, WINED3DDEVTYPE DeviceType, const struct GlPixelFormatDesc *check_format_desc, WINED3DSURFTYPE SurfaceType) { - const struct blit_shader *blitter; - if(SurfaceType == SURFACE_GDI) { switch(check_format_desc->format) { @@ -3268,8 +3278,7 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, const struct if (CheckDepthStencilCapability(adapter, adapter_format_desc, check_format_desc)) return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ - blitter = select_blit_implementation(adapter, DeviceType); - if (blitter->color_fixup_supported(check_format_desc->color_fixup)) + if (adapter->blitter->color_fixup_supported(check_format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5e6da24..55872df 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2840,14 +2840,3 @@ void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, else if (gl_info->supported[ATI_FRAGMENT_SHADER]) *ps_selected = SHADER_ATI; else *ps_selected = SHADER_NONE; } - -const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE device_type) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int vs_selected_mode, ps_selected_mode; - - select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); - if ((ps_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_GLSL) - && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_blit; - else return &ffp_blit; -} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fca1a9a..afc4511 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1365,6 +1365,7 @@ struct wined3d_adapter const struct fragment_pipeline *fragment_pipe; const shader_backend_t *shader_backend; + const struct blit_shader *blitter; }; BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; @@ -2569,8 +2570,6 @@ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; -const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, - WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected, int *vs_selected) DECLSPEC_HIDDEN; typedef struct local_constant {

1 0

Alexandre Julliard : user: Add icon handle mapping in the Get/SetClassWord/ Long functions.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 6806451db38e2b656e4dc959900070a409f8ca7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6806451db38e2b656e4dc9599… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 12:18:30 2010 +0100 user: Add icon handle mapping in the Get/SetClassWord/Long functions. --- dlls/user.exe16/window.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index b617c4d..e81d9ac 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -747,6 +747,16 @@ void WINAPI ValidateRgn16( HWND16 hwnd, HRGN16 hrgn ) */ WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset ) { + HICON icon; + + switch (offset) + { + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + icon = (HICON)GetClassLongPtrW( WIN_Handle32(hwnd), offset ); + return get_icon_16( icon ); + } return GetClassWord( WIN_Handle32(hwnd), offset ); } @@ -756,6 +766,16 @@ WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset ) */ WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval ) { + HICON icon; + + switch (offset) + { + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + icon = (HICON)SetClassLongPtrW( WIN_Handle32(hwnd), offset, (ULONG_PTR)get_icon_32(newval) ); + return get_icon_16( icon ); + } return SetClassWord( WIN_Handle32(hwnd), offset, newval ); } @@ -773,6 +793,10 @@ LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset ) return (LONG_PTR)WINPROC_GetProc16( (WNDPROC)ret, FALSE ); case GCLP_MENUNAME: return MapLS( (void *)ret ); /* leak */ + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + return get_icon_16( (HICON)ret ); default: return ret; } @@ -784,8 +808,15 @@ LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset ) */ LONG WINAPI SetClassLong16( HWND16 hwnd16, INT16 offset, LONG newval ) { + HICON icon; + switch( offset ) { + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + icon = (HICON)SetClassLongPtrW( WIN_Handle32(hwnd16), offset, (ULONG_PTR)get_icon_32(newval) ); + return get_icon_16( icon ); case GCLP_WNDPROC: { WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval );

1 0

Alexandre Julliard : user32: Add a safety check in release_user_handle_ptr.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 48c8c8d7bd399a62d7c8072da2f785de54b11556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c8c8d7bd399a62d7c8072da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 12:18:47 2010 +0100 user32: Add a safety check in release_user_handle_ptr. --- dlls/user32/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index acf70a3..3953f09 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -143,6 +143,7 @@ void *get_user_handle_ptr( HANDLE handle, enum user_obj_type type ) */ void release_user_handle_ptr( void *ptr ) { + assert( ptr && ptr != OBJ_OTHER_PROCESS ); USER_Unlock(); }

1 0

Alexandre Julliard : configure: Create a symlink for generic.ppd.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: a632052692d033820805e1d3910bad6ccd90eb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a632052692d033820805e1d39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:14:03 2010 +0100 configure: Create a symlink for generic.ppd. --- configure | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 25ea483..2cd384d 100755 --- a/configure +++ b/configure @@ -13685,6 +13685,9 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + dlls/wineps.drv/generic.ppd" ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/marlett.ttf" @@ -19619,6 +19622,7 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; diff --git a/configure.ac b/configure.ac index f6c4d34..8016dd7 100644 --- a/configure.ac +++ b/configure.ac @@ -2114,6 +2114,7 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) WINE_CONFIG_SYMLINK(fonts/marlett.ttf) WINE_CONFIG_SYMLINK(fonts/symbol.ttf) WINE_CONFIG_SYMLINK(fonts/tahoma.ttf)

1 0

Alexandre Julliard : makefiles: Create the fonts symlinks from configure.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: ce12296ce1544e665194488577b7e52a1df01006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce12296ce1544e66519448857… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:13:16 2010 +0100 makefiles: Create the fonts symlinks from configure. --- configure | 16 ++++++++++++++++ configure.ac | 4 ++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5aac1cf..25ea483 100755 --- a/configure +++ b/configure @@ -13685,6 +13685,18 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/marlett.ttf" +ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/symbol.ttf" +ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/tahoma.ttf" +ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/tahomabd.ttf" ac_config_links="$ac_config_links wine:tools/winewrapper" ALL_SYMLINKS="$ALL_SYMLINKS \\ wine" @@ -19607,6 +19619,10 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; + "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; + "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; + "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; diff --git a/configure.ac b/configure.ac index 733c028..f6c4d34 100644 --- a/configure.ac +++ b/configure.ac @@ -2114,6 +2114,10 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(fonts/marlett.ttf) +WINE_CONFIG_SYMLINK(fonts/symbol.ttf) +WINE_CONFIG_SYMLINK(fonts/tahoma.ttf) +WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)

1 0

Alexandre Julliard : makefiles: Create the wine symlink from configure.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 7d020c9f088af3e2d8d6e75c2d088f430fcf4af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d020c9f088af3e2d8d6e75c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:12:12 2010 +0100 makefiles: Create the wine symlink from configure. --- Make.rules.in | 1 - Makefile.in | 12 ++++-------- aclocal.m4 | 8 ++++++++ configure | 46 +++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 3 +++ tools/make_makefiles | 1 + 6 files changed, 61 insertions(+), 10 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index e155d88..6a52a01 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -65,7 +65,6 @@ TARGETFLAGS = @TARGETFLAGS@ WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check -WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper C2MAN = $(TOPSRCDIR)/tools/c2man.pl RUNTEST = $(TOPSRCDIR)/tools/runtest WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) diff --git a/Makefile.in b/Makefile.in index 9dd1bd9..08349b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,7 +26,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none -PROGRAMS = wine # Sub-directories to run make depend/clean into SUBDIRS = \ @@ -46,7 +45,7 @@ INSTALLSUBDIRS = @ALL_TOP_DIRS@ # Sub-directories to run make test into TESTSUBDIRS = dlls -all: Make.rules $(PROGRAMS) +all: wine @echo "Wine build complete." WINAPI_CHECK_EXTRA_FLAGS = --global @@ -68,9 +67,6 @@ include/config.h: include/stamp-h include/stamp-h: include/config.h.in config.status @./config.status include/config.h include/stamp-h -wine: $(WINEWRAPPER) - $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ - # Installation rules uninstall:: @@ -138,10 +134,10 @@ distclean:: clean # Makefile rules -ALL_MAKERULES = @ALL_MAKERULES@ ALL_MAKEFILES = @ALL_MAKEFILES@ +ALL_CONFIGS = Makefile $(ALL_MAKEFILES) @ALL_MAKERULES@ @ALL_SYMLINKS@ -Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES): +$(ALL_CONFIGS): @./config.status $@ .INIT: Makefile .BEGIN: Makefile @@ -150,6 +146,6 @@ Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES): $(RECURSE_TARGETS) $(MAKEDEP): $(ALL_MAKEFILES) distclean:: - $(RM) Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES) + $(RM) $(ALL_CONFIGS) @ALL_MAKEFILE_DEPENDS@ diff --git a/aclocal.m4 b/aclocal.m4 index 76af863..3240435 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -142,6 +142,14 @@ dnl AC_DEFUN([WINE_CONFIG_EXTRA_DIR], [AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])]) +dnl **** Create symlinks from config.status **** +dnl +dnl Usage: WINE_CONFIG_SYMLINK(name,target) +dnl +AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl +ALL_SYMLINKS="$ALL_SYMLINKS \\ + $1"]) + dnl **** Create a make rules file from config.status **** dnl dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps) diff --git a/configure b/configure index 0e68b55..5aac1cf 100755 --- a/configure +++ b/configure @@ -608,6 +608,7 @@ ALL_IMPLIB_DIRS ALL_DLL_DIRS ALL_TOP_DIRS ALL_MAKEFILE_DEPENDS +ALL_SYMLINKS ALL_MAKEFILES ALL_MAKERULES DEPENDENCIES @@ -13653,6 +13654,8 @@ ALL_MAKERULES="" ALL_MAKEFILES="" +ALL_SYMLINKS="" + ALL_MAKEFILE_DEPENDS="# Makefile dependencies" @@ -13682,6 +13685,10 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links wine:tools/winewrapper" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + wine" + ac_config_commands="$ac_config_commands dlls/gdi32/enhmfdrv" ac_config_commands="$ac_config_commands dlls/gdi32/mfdrv" @@ -19438,6 +19445,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" +config_links="$ac_config_links" config_commands="$ac_config_commands" _ACEOF @@ -19468,6 +19476,9 @@ $config_files Configuration headers: $config_headers +Configuration links: +$config_links + Configuration commands: $config_commands @@ -19596,6 +19607,7 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;; @@ -20159,6 +20171,7 @@ done if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -20480,7 +20493,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_HEADERS" -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -20721,7 +20734,38 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} || as_fn_error "could not create -" "$LINENO" 5 fi ;; + :L) + # + # CONFIG_LINK + # + + if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then + : + else + # Prefer the file from the source tree if names are identical. + if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then + ac_source=$srcdir/$ac_source + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 +$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} + + if test ! -r "$ac_source"; then + as_fn_error "$ac_source: file not found" "$LINENO" 5 + fi + rm -f "$ac_file" + # Try a relative symlink, then a hard link, then a copy. + case $srcdir in + [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; + *) ac_rel_source=$ac_top_build_prefix$ac_source ;; + esac + ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || + ln "$ac_source" "$ac_file" 2>/dev/null || + cp -p "$ac_source" "$ac_file" || + as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 + fi + ;; :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; diff --git a/configure.ac b/configure.ac index b8b04c2..733c028 100644 --- a/configure.ac +++ b/configure.ac @@ -2096,6 +2096,7 @@ Makefile: dummy AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_MAKEFILES,"") +AC_SUBST(ALL_SYMLINKS,"") AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_TOP_DIRS,"") @@ -2113,6 +2114,8 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(wine,tools/winewrapper) + WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls) diff --git a/tools/make_makefiles b/tools/make_makefiles index fec44f6..2a05442 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -86,6 +86,7 @@ my @ignores = ( "/configure.lineno", "/TAGS", "/tags", + "/wine", "Makefile", "dlldata.c", "dlls/*/*.def",

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010