March 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_upload_data().
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 2d4080f25d093d20123a40b3ed92b84c282a119b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4080f25d093d20123a40b3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:57:58 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index c846ec4..a4d3eb2 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -77,7 +77,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine const struct wined3d_const_bo_address *data) { const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format *format = volume->resource.format; + struct wined3d_texture *texture = volume->container; + const struct wined3d_format *format = texture->resource.format; UINT width = volume->resource.width; UINT height = volume->resource.height; UINT depth = volume->resource.depth; @@ -95,13 +96,13 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine if (data->buffer_object) ERR("Loading a converted volume from a PBO.\n"); - if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) ERR("Converting a block-based format.\n"); dst_row_pitch = width * format->conv_byte_count; dst_slice_pitch = dst_row_pitch * height; - wined3d_texture_get_pitch(volume->container, volume->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(texture, volume->texture_level, &src_row_pitch, &src_slice_pitch); converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_download_data().
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 9736c861a28f7680159b9ef0ee990dbc65b53dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9736c861a28f7680159b9ef0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:57:59 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a4d3eb2..cb27ad8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -152,8 +152,8 @@ void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD loc static void wined3d_volume_download_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_bo_address *data) { + const struct wined3d_format *format = volume->container->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_format *format = volume->resource.format; if (format->convert) {

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_load_location().
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 8e117a51f750e1a975ac0b6f112bea5fd13ff060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e117a51f750e1a975ac0b6f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:58:00 2016 +0200 wined3d: Get resource info from the texture in wined3d_volume_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index cb27ad8..f23a385 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -263,10 +263,10 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, return TRUE; } - if ((volume->resource.access_flags & required_access) != required_access) + if ((texture->resource.access_flags & required_access) != required_access) { ERR("Operation requires %#x access, but volume only has %#x.\n", - required_access, volume->resource.access_flags); + required_access, texture->resource.access_flags); return FALSE; }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.6
by Jeremy Newman 28 Mar '16

28 Mar '16

Module: website Branch: master Commit: 7126e57a7de01e381b89181ab76700f1ca6f62c2 URL: http://source.winehq.org/git/website.git/?a=commit;h=7126e57a7de01e381b8918… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Mar 25 18:25:36 2016 +0100 Polish translation for release 1.9.6 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016031801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2016031801.xml b/news/pl/2016031801.xml new file mode 100644 index 0000000..d8ae9df --- /dev/null +++ b/news/pl/2016031801.xml @@ -0,0 +1,15 @@ +<news> +<date>Marzec 18, 2016</date> +<title>Wydano Wine 1.9.6</title> +<body> + Wydanie rozwojowe Wine 1.9.6 jest już dostępne. + <a href="{$root}/announce/1.9.6">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsze wykrywanie kart graficznych na sterownikach Mesa.</li> + <li>Obsługa Modelu Cieniującego 5.</li> + <li>Lepsza obsługa wyjątków C++.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Nikolay Sivov : msxml3/mxwriter: Use 4K for internal buffer size.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 30b661ad9c85eab1972e4d2f36c6adea43e875ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b661ad9c85eab1972e4d2f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 17:23:03 2016 +0300 msxml3/mxwriter: Use 4K for internal buffer size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 4 ++-- dlls/msxml3/tests/saxreader.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 1840fa1..c1215bf 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1,7 +1,7 @@ /* * MXWriter implementation * - * Copyright 2011-2014 Nikolay Sivov for CodeWeavers + * Copyright 2011-2014, 2016 Nikolay Sivov for CodeWeavers * Copyright 2011 Thomas Mullaly * * This library is free software; you can redistribute it and/or @@ -244,7 +244,7 @@ static xml_encoding parse_encoding_name(const WCHAR *encoding) static HRESULT init_encoded_buffer(encoded_buffer *buffer) { - const int initial_len = 0x2000; + const int initial_len = 0x1000; buffer->data = heap_alloc(initial_len); if (!buffer->data) return E_OUTOFMEMORY; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 8a0b00e..27a6f99 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3305,7 +3305,6 @@ static void test_mxwriter_flush(void) pos2.QuadPart = 0; hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); EXPECT_HR(hr, S_OK); -todo_wine ok(pos2.QuadPart != 0, "unexpected stream beginning\n"); hr = IMXWriter_get_output(writer, NULL);

1 0

Francois Gouget : winecfg: Highlight spelling fixes.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 4f8b0b0e63b51e904262408f0db6158704c269c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8b0b0e63b51e904262408f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 28 03:55:27 2016 +0200 winecfg: Highlight spelling fixes. Highlight is misspelled in many SDK constants and registry settings. But we don't have to do the same for our own constants. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/resource.h | 4 ++-- programs/winecfg/theme.c | 4 ++-- programs/winecfg/winecfg.rc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 8604fb4..0c0b038 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -200,14 +200,14 @@ #define IDC_SYSPARAMS_INACTIVE_BORDER 8420 #define IDC_SYSPARAMS_BUTTON_SHADOW 8421 #define IDC_SYSPARAMS_GRAY_TEXT 8422 -#define IDC_SYSPARAMS_BUTTON_HILIGHT 8423 +#define IDC_SYSPARAMS_BUTTON_HIGHLIGHT 8423 #define IDC_SYSPARAMS_BUTTON_DARK_SHADOW 8424 #define IDC_SYSPARAMS_BUTTON_LIGHT 8425 #define IDC_SYSPARAMS_BUTTON_ALTERNATE 8426 #define IDC_SYSPARAMS_HOT_TRACKING 8427 #define IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT 8428 #define IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT 8429 -#define IDC_SYSPARAMS_MENU_HILIGHT 8430 +#define IDC_SYSPARAMS_MENU_HIGHLIGHT 8430 #define IDC_SYSPARAMS_MENUBAR 8431 /* About tab */ diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 8db457f..2b24dd9 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -532,14 +532,14 @@ static struct {-1, COLOR_INACTIVEBORDER, "InactiveBorder" }, /* IDC_SYSPARAMS_INACTIVE_BORDER */ {-1, COLOR_BTNSHADOW, "ButtonShadow" }, /* IDC_SYSPARAMS_BUTTON_SHADOW */ {-1, COLOR_GRAYTEXT, "GrayText" }, /* IDC_SYSPARAMS_GRAY_TEXT */ - {-1, COLOR_BTNHILIGHT, "ButtonHilight" }, /* IDC_SYSPARAMS_BUTTON_HILIGHT */ + {-1, COLOR_BTNHIGHLIGHT, "ButtonHilight" }, /* IDC_SYSPARAMS_BUTTON_HIGHLIGHT */ {-1, COLOR_3DDKSHADOW, "ButtonDkShadow" }, /* IDC_SYSPARAMS_BUTTON_DARK_SHADOW */ {-1, COLOR_3DLIGHT, "ButtonLight" }, /* IDC_SYSPARAMS_BUTTON_LIGHT */ {-1, COLOR_ALTERNATEBTNFACE, "ButtonAlternateFace" }, /* IDC_SYSPARAMS_BUTTON_ALTERNATE */ {-1, COLOR_HOTLIGHT, "HotTrackingColor" }, /* IDC_SYSPARAMS_HOT_TRACKING */ {-1, COLOR_GRADIENTACTIVECAPTION, "GradientActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT */ {-1, COLOR_GRADIENTINACTIVECAPTION, "GradientInactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT */ - {-1, COLOR_MENUHILIGHT, "MenuHilight" }, /* IDC_SYSPARAMS_MENU_HILIGHT */ + {-1, COLOR_MENUHILIGHT, "MenuHilight" }, /* IDC_SYSPARAMS_MENU_HIGHLIGHT */ {-1, COLOR_MENUBAR, "MenuBar" }, /* IDC_SYSPARAMS_MENUBAR */ }; diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 64d37ed..72c3e1b 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -118,14 +118,14 @@ BEGIN IDC_SYSPARAMS_INACTIVE_BORDER "Inactive Border" IDC_SYSPARAMS_BUTTON_SHADOW "Controls Shadow" IDC_SYSPARAMS_GRAY_TEXT "Gray Text" - IDC_SYSPARAMS_BUTTON_HILIGHT "Controls Highlight" + IDC_SYSPARAMS_BUTTON_HIGHLIGHT "Controls Highlight" IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Controls Dark Shadow" IDC_SYSPARAMS_BUTTON_LIGHT "Controls Light" IDC_SYSPARAMS_BUTTON_ALTERNATE "Controls Alternate Background" IDC_SYSPARAMS_HOT_TRACKING "Hot Tracked Item" IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Active Title Bar Gradient" IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactive Title Bar Gradient" - IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" + IDC_SYSPARAMS_MENU_HIGHLIGHT "Menu Highlight" IDC_SYSPARAMS_MENUBAR "Menu Bar" END

1 0

Francois Gouget : cmd/tests: Slash spelling fix.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: f90871cbfdc7d2ca5a705b12f047539b45bb37e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90871cbfdc7d2ca5a705b12f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 28 03:55:39 2016 +0200 cmd/tests: Slash spelling fix. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 8 ++++---- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cf2559a..eac5dca 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1072,16 +1072,16 @@ call :ValidateExpected echo for /R passed echo --- Complex wildcards unix and windows slash cd .. -echo Windows slashs, valid path +echo Windows slashes, valid path for %%f in (foobar\baz\bazbaz) do echo ASIS: %%f for %%f in (foobar\baz\*) do echo WC : %%f -echo Windows slashs, invalid path +echo Windows slashes, invalid path for %%f in (foobar\jim\bazbaz) do echo ASIS: %%f for %%f in (foobar\jim\*) do echo WC : %%f -echo Unix slashs, valid path +echo Unix slashes, valid path for %%f in (foobar/baz/bazbaz) do echo ASIS: %%f for %%f in (foobar/baz/*) do echo WC : %%f -echo Unix slashs, invalid path +echo Unix slashes, invalid path for %%f in (foobar/jim/bazbaz) do echo ASIS: %%f for %%f in (foobar/jim/*) do echo WC : %%f echo Done diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7543b53..82b13f7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -714,15 +714,15 @@ With duplicates enumeration Strip missing wildcards, keep unwildcarded names for /R passed --- Complex wildcards unix and windows slash -Windows slashs, valid path +Windows slashes, valid path ASIS: foobar\baz\bazbaz WC : foobar\baz\bazbaz -Windows slashs, invalid path +Windows slashes, invalid path ASIS: foobar\jim\bazbaz -Unix slashs, valid path +Unix slashes, valid path ASIS: foobar/baz/bazbaz WC : bazbaz -Unix slashs, invalid path +Unix slashes, invalid path ASIS: foobar/jim/bazbaz Done --- for /L

1 0

Francois Gouget : gdi32: Fix the PAN_WEIGHT_INDEX constant name.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: b06d343086e18592856ae797b78f13ee3df4d6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06d343086e18592856ae797b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 28 03:55:49 2016 +0200 gdi32: Fix the PAN_WEIGHT_INDEX constant name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index c1acd25..548269e 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -895,7 +895,7 @@ typedef struct tagPANOSE #define PAN_FAMILYTYPE_INDEX 0 #define PAN_SERIFSTYLE_INDEX 1 -#define PAN_WEIGTH_INDEX 2 +#define PAN_WEIGHT_INDEX 2 #define PAN_PROPORTION_INDEX 3 #define PAN_CONTRAST_INDEX 4 #define PAN_STROKEVARIATION_INDEX 5

1 0

Alexandre Julliard : makefiles: When supported, use -Ttext-segment also for the main loader.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 36cf292048cdefb65939e6b6fe003b9cf4b79c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36cf292048cdefb65939e6b6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 16:24:37 2016 +0900 makefiles: When supported, use -Ttext-segment also for the main loader. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 52 +++++++++++++++++++++++++++------------------------- configure.ac | 17 ++++++++++------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/configure b/configure index 4d39f05..189198b 100755 --- a/configure +++ b/configure @@ -8550,61 +8550,63 @@ fi case $host_cpu in *i[3456789]86* | x86_64) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5 -$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; } -if ${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } +if ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" +CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x7bc00000" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes + ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=yes else - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no + ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5 -$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; } -if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&5 +$as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } +if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes; then : case $host_os in - freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7bf00000" ;; esac - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 -$as_echo_n "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } -if ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+:} false; then : +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5 +$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; } +if ${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x7bc00000" +CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=yes + ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes else - ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=no + ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&5 -$as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } -if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes; then : - : -else - # Extract the first word of "prelink", so it can be a program name with args. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5 +$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; } +if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then : + case $host_os in + freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + esac +fi + # Extract the first word of "prelink", so it can be a program name with args. set dummy prelink; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } diff --git a/configure.ac b/configure.ac index ddb28fa..a659b80 100644 --- a/configure.ac +++ b/configure.ac @@ -895,14 +895,17 @@ case $host_os in case $host_cpu in *i[[3456789]]86* | x86_64) - WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], + WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in - freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; - esac - ]) - WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],[:], - [AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) + freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7bf00000" ;; + esac], + [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], + [case $host_os in + freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + esac]) + AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) if test "x$PRELINK" = xfalse then WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.])

1 0

Alexandre Julliard : makefiles: Reduce the maximum page size for modules that have a base address.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: e59395208d527d1bffb2725efc85fb798aee7610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59395208d527d1bffb2725ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 15:47:19 2016 +0900 makefiles: Reduce the maximum page size for modules that have a base address. It avoid bumping into the next allocated base address on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 2 ++ tools/winegcc/winegcc.c | 2 ++ 3 files changed, 29 insertions(+) diff --git a/configure b/configure index 189198b..5d99f47 100755 --- a/configure +++ b/configure @@ -8652,6 +8652,31 @@ fi as_fn_append wine_warnings "|prelink not found and linker does not support relocation, base address of core dlls won't be set correctly." fi fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-z,max-page-size=0x1000" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-z,max-page-size=0x1000... " >&6; } +if ${ac_cv_cflags__Wl__z_max_page_size_0x1000+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-z,max-page-size=0x1000" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__z_max_page_size_0x1000=yes +else + ac_cv_cflags__Wl__z_max_page_size_0x1000=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__z_max_page_size_0x1000" >&5 +$as_echo "$ac_cv_cflags__Wl__z_max_page_size_0x1000" >&6; } +if test "x$ac_cv_cflags__Wl__z_max_page_size_0x1000" = xyes; then : + LDEXECFLAGS="$LDEXECFLAGS -Wl,-z,max-page-size=0x1000" +fi ;; esac diff --git a/configure.ac b/configure.ac index a659b80..dd7571d 100644 --- a/configure.ac +++ b/configure.ac @@ -910,6 +910,8 @@ case $host_os in then WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.]) fi]) + WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], + [LDEXECFLAGS="$LDEXECFLAGS -Wl,-z,max-page-size=0x1000"]) ;; esac diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 8b69053..1ddafc6 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1135,6 +1135,8 @@ static void build(struct options* opts) default: if (opts->image_base) { + if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) + strarray_add(link_args, "-Wl,-z,max-page-size=0x1000"); if (!try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base))) strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)); else

1 0