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

Alexandre Julliard : makefiles: Reduce the maximum page size for modules that have a base address.
by Alexandre Julliard March 28, 2016

March 28, 2016

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

Francois Gouget : cmd/tests: Slash spelling fix.
by Alexandre Julliard March 28, 2016

March 28, 2016

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

Nikolay Sivov : msxml3/mxwriter: Use 4K for internal buffer size.
by Alexandre Julliard March 28, 2016

March 28, 2016

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

Nikolay Sivov : dwrite: Update to IDWriteFactory3.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: d04a54857cc84f881393e4bc794185650a302084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04a54857cc84f881393e4bc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 13:33:57 2016 +0300 dwrite: Update to IDWriteFactory3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/dwrite_private.h | 16 +-- dlls/dwrite/font.c | 36 +++--- dlls/dwrite/gdiinterop.c | 14 +- dlls/dwrite/layout.c | 18 +-- dlls/dwrite/main.c | 297 +++++++++++++++++++++++++++++-------------- dlls/dwrite/tests/font.c | 3 +- 7 files changed, 253 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d04a54857cc84f881393e…

1 0

Thomas Faber : user32/tests: Test loading monochrome icons.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 6e4b649862f7f6f49948d48bbfea9e6f23ffb147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4b649862f7f6f49948d48bb… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Mar 27 15:38:49 2016 +0200 user32/tests: Test loading monochrome icons. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 118 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 4b6b792..dc8d227 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2484,6 +2484,123 @@ static void test_DestroyCursor(void) ok(cursor2 != cursor, "cursor == %p, cursor2 == %p\n", cursor, cursor2); } +static void test_monochrome_icon(void) +{ + HANDLE handle; + BOOL ret; + DWORD bytes_written; + CURSORICONFILEDIR *icon_data; + CURSORICONFILEDIRENTRY *icon_entry; + BITMAPINFO *bitmap_info; + BITMAPCOREINFO *core_info; + ICONINFO icon_info; + ULONG icon_size; + BOOL monochrome, use_core_info; + + icon_data = HeapAlloc(GetProcessHeap(), 0, sizeof(CURSORICONFILEDIR) + sizeof(BITMAPINFOHEADER) + + 2 * sizeof(RGBQUAD) + sizeof(ULONG)); + + for (monochrome = FALSE; monochrome <= TRUE; monochrome++) + for (use_core_info = FALSE; use_core_info <= TRUE; use_core_info++) + { + trace("%s, %s\n", + monochrome ? "monochrome" : "colored", + use_core_info ? "core info" : "bitmap info"); + + icon_size = sizeof(CURSORICONFILEDIR) + + (use_core_info ? sizeof(BITMAPCOREHEADER) : sizeof(BITMAPINFOHEADER)) + + /* 2 * sizeof(RGBTRIPLE) + padding comes out the same */ + 2 * sizeof(RGBQUAD) + + sizeof(ULONG); + ZeroMemory(icon_data, icon_size); + icon_data->idReserved = 0; + icon_data->idType = 1; + icon_data->idCount = 1; + + icon_entry = icon_data->idEntries; + icon_entry->bWidth = 1; + icon_entry->bHeight = 1; + icon_entry->bColorCount = 0; + icon_entry->bReserved = 0; + icon_entry->xHotspot = 0; + icon_entry->yHotspot = 0; + icon_entry->dwDIBSize = icon_size - sizeof(CURSORICONFILEDIR); + icon_entry->dwDIBOffset = sizeof(CURSORICONFILEDIR); + + if (use_core_info) + { + core_info = (BITMAPCOREINFO *) ((BYTE *) icon_data + icon_entry->dwDIBOffset); + core_info->bmciHeader.bcSize = sizeof(BITMAPCOREHEADER); + core_info->bmciHeader.bcWidth = 1; + core_info->bmciHeader.bcHeight = 2; + core_info->bmciHeader.bcPlanes = 1; + core_info->bmciHeader.bcBitCount = 1; + core_info->bmciColors[0].rgbtBlue = monochrome ? 0x00 : 0xff; + core_info->bmciColors[0].rgbtGreen = 0x00; + core_info->bmciColors[0].rgbtRed = 0x00; + core_info->bmciColors[1].rgbtBlue = 0xff; + core_info->bmciColors[1].rgbtGreen = 0xff; + core_info->bmciColors[1].rgbtRed = 0xff; + } + else + { + bitmap_info = (BITMAPINFO *) ((BYTE *) icon_data + icon_entry->dwDIBOffset); + bitmap_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmap_info->bmiHeader.biWidth = 1; + bitmap_info->bmiHeader.biHeight = 2; + bitmap_info->bmiHeader.biPlanes = 1; + bitmap_info->bmiHeader.biBitCount = 1; + bitmap_info->bmiHeader.biSizeImage = 0; /* Uncompressed bitmap. */ + bitmap_info->bmiColors[0].rgbBlue = monochrome ? 0x00 : 0xff; + bitmap_info->bmiColors[0].rgbGreen = 0x00; + bitmap_info->bmiColors[0].rgbRed = 0x00; + bitmap_info->bmiColors[1].rgbBlue = 0xff; + bitmap_info->bmiColors[1].rgbGreen = 0xff; + bitmap_info->bmiColors[1].rgbRed = 0xff; + } + + handle = CreateFileA("icon.ico", GENERIC_WRITE, 0, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); + ret = WriteFile(handle, icon_data, icon_size, &bytes_written, NULL); + ok(ret && bytes_written == icon_size, "icon.ico created improperly.\n"); + CloseHandle(handle); + + handle = LoadImageA(NULL, "icon.ico", IMAGE_ICON, 0, 0, LR_LOADFROMFILE); +todo_wine_if(use_core_info) + ok(handle != NULL, "LoadImage() failed with %u.\n", GetLastError()); + if (handle == NULL) + { + skip("Icon failed to load: %s, %s\n", + monochrome ? "monochrome" : "colored", + use_core_info ? "core info" : "bitmap info"); + DeleteFileA("icon.ico"); + continue; + } + + ret = GetIconInfo(handle, &icon_info); + ok(ret, "GetIconInfo() failed with %u.\n", GetLastError()); + if (ret) + { + ok(icon_info.fIcon == TRUE, "fIcon is %u.\n", icon_info.fIcon); + ok(icon_info.xHotspot == 0, "xHotspot is %u.\n", icon_info.xHotspot); + ok(icon_info.yHotspot == 0, "yHotspot is %u.\n", icon_info.yHotspot); +todo_wine_if(monochrome && use_core_info) + if (monochrome) + ok(icon_info.hbmColor == NULL, "Got hbmColor %p!\n", icon_info.hbmColor); + else + ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); + } + + ret = DestroyIcon(handle); + ok(ret, "DestroyIcon() failed with %u.\n", GetLastError()); + DeleteFileA("icon.ico"); + } + + HeapFree(GetProcessHeap(), 0, icon_data); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -2522,6 +2639,7 @@ START_TEST(cursoricon) test_SetCursor(); test_ShowCursor(); test_DestroyCursor(); + test_monochrome_icon(); do_parent(); test_child_process(); finish_child_process();

1 0

Alexandre Julliard : wineconsole: If necessary, fallback to a font without the right properties instead of failing.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: e1fc8dcdee1fec9a67e5f10de7ed1a6952261ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1fc8dcdee1fec9a67e5f10de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 18:18:11 2016 +0900 wineconsole: If necessary, fallback to a font without the right properties instead of failing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/dialog.c | 6 ++-- programs/wineconsole/user.c | 65 ++++++++++++++++++++++++------------- programs/wineconsole/winecon_user.h | 4 +-- 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index cae02cb..04edfd1 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -303,7 +303,7 @@ static int CALLBACK font_enum_size2(const LOGFONTW* lf, const TEXTMETRICW* tm, struct dialog_info* di = (struct dialog_info*)lParam; WCUSER_DumpTextMetric(tm, FontType); - if (WCUSER_ValidateFontMetric(di->data, tm, FontType, TRUE)) + if (WCUSER_ValidateFontMetric(di->data, tm, FontType, 0)) { di->nFont++; } @@ -317,7 +317,7 @@ static int CALLBACK font_enum(const LOGFONTW* lf, const TEXTMETRICW* tm, struct dialog_info* di = (struct dialog_info*)lParam; WCUSER_DumpLogFont("DlgFamily: ", lf, FontType); - if (WCUSER_ValidateFont(di->data, lf)) + if (WCUSER_ValidateFont(di->data, lf, 0)) { if (FontType & RASTER_FONTTYPE) { @@ -375,7 +375,7 @@ static int CALLBACK font_enum_size(const LOGFONTW* lf, const TEXTMETRICW* tm, return 0; } - if (WCUSER_ValidateFontMetric(di->data, tm, FontType, TRUE)) + if (WCUSER_ValidateFontMetric(di->data, tm, FontType, 0)) { int idx = 0; diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index e723745..40a0757 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -333,7 +333,7 @@ static BOOL WCUSER_AreFontsEqual(const struct config_data* config, const LOGFONT struct font_chooser { struct inner_data* data; - BOOL check_screen_size; + int pass; BOOL done; }; @@ -343,15 +343,26 @@ struct font_chooser * Returns true if the font described in tm is usable as a font for the renderer */ BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* tm, - DWORD type, BOOL check_screen_size) + DWORD type, int pass) { - BOOL ret = TRUE; - - if (check_screen_size && (type & RASTER_FONTTYPE)) - ret = (tm->tmMaxCharWidth * data->curcfg.win_width < GetSystemMetrics(SM_CXSCREEN) && - tm->tmHeight * data->curcfg.win_height < GetSystemMetrics(SM_CYSCREEN)); - return ret && !tm->tmItalic && !tm->tmUnderlined && !tm->tmStruckOut && - (tm->tmCharSet == DEFAULT_CHARSET || tm->tmCharSet == g_uiDefaultCharset); + switch (pass) /* we get increasingly lenient in later passes */ + { + case 0: + if (type & RASTER_FONTTYPE) + { + if (tm->tmMaxCharWidth * data->curcfg.win_width >= GetSystemMetrics(SM_CXSCREEN) || + tm->tmHeight * data->curcfg.win_height >= GetSystemMetrics(SM_CYSCREEN)) + return FALSE; + } + /* fall through */ + case 1: + if (tm->tmCharSet != DEFAULT_CHARSET && tm->tmCharSet != g_uiDefaultCharset) return FALSE; + /* fall through */ + case 2: + if (tm->tmItalic || tm->tmUnderlined || tm->tmStruckOut) return FALSE; + break; + } + return TRUE; } /****************************************************************** @@ -359,12 +370,22 @@ BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* * * Returns true if the font family described in lf is usable as a font for the renderer */ -BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf) +BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf, int pass) { - return (lf->lfPitchAndFamily & 3) == FIXED_PITCH && - /* (lf->lfPitchAndFamily & 0xF0) == FF_MODERN && */ - lf->lfFaceName[0] != '@' && - (lf->lfCharSet == DEFAULT_CHARSET || lf->lfCharSet == g_uiDefaultCharset); + switch (pass) /* we get increasingly lenient in later passes */ + { + case 0: + case 1: + if (lf->lfCharSet != DEFAULT_CHARSET && lf->lfCharSet != g_uiDefaultCharset) return FALSE; + /* fall through */ + case 2: + if ((lf->lfPitchAndFamily & 3) != FIXED_PITCH) return FALSE; + /* fall through */ + case 3: + if (lf->lfFaceName[0] == '@') return FALSE; + break; + } + return TRUE; } /****************************************************************** @@ -379,7 +400,7 @@ static int CALLBACK get_first_font_enum_2(const LOGFONTW* lf, const TEXTMETRICW* struct font_chooser* fc = (struct font_chooser*)lParam; WCUSER_DumpTextMetric(tm, FontType); - if (WCUSER_ValidateFontMetric(fc->data, tm, FontType, fc->check_screen_size)) + if (WCUSER_ValidateFontMetric(fc->data, tm, FontType, fc->pass)) { LOGFONTW mlf = *lf; @@ -417,7 +438,7 @@ static int CALLBACK get_first_font_enum(const LOGFONTW* lf, const TEXTMETRICW* t struct font_chooser* fc = (struct font_chooser*)lParam; WCUSER_DumpLogFont("InitFamily: ", lf, FontType); - if (WCUSER_ValidateFont(fc->data, lf)) + if (WCUSER_ValidateFont(fc->data, lf, fc->pass)) { EnumFontFamiliesW(PRIVATE(fc->data)->hMemDC, lf->lfFaceName, get_first_font_enum_2, lParam); @@ -537,13 +558,13 @@ static void WCUSER_SetFontPmt(struct inner_data* data, const WCHAR* font, /* try to find an acceptable font */ WINE_WARN("Couldn't match the font from registry... trying to find one\n"); fc.data = data; - fc.check_screen_size = TRUE; fc.done = FALSE; - EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); - if (fc.done) return; - fc.check_screen_size = FALSE; - EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); - if (!fc.done) WINECON_Fatal("Couldn't find a decent font, aborting\n"); + for (fc.pass = 0; fc.pass <= 4; fc.pass++) + { + EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); + if (fc.done) return; + } + WINECON_Fatal("Couldn't find a decent font, aborting\n"); } /****************************************************************** diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index 7c5174f..bd026ef 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -45,9 +45,9 @@ struct inner_data_user { /* from user.c */ extern const COLORREF WCUSER_ColorMap[16]; extern BOOL WCUSER_GetProperties(struct inner_data*, BOOL); -extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf); +extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf, int pass); extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* tm, - DWORD type, BOOL check_screen_size); + DWORD type, int pass); extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, LONG* el); extern void WCUSER_FillLogFont(LOGFONTW* lf, const WCHAR* name,

1 0

Alexandre Julliard : makefiles: When supported, use -Ttext-segment also for the main loader.
by Alexandre Julliard March 28, 2016

March 28, 2016

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

Francois Gouget : gdi32: Fix the PAN_WEIGHT_INDEX constant name.
by Alexandre Julliard March 28, 2016

March 28, 2016

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

Mark Jansen : user32: Correctly determine bit count for BITMAPCOREINFO in is_dib_monochrome.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: e1f1a60f875873882a9d1ce28ba5726c3059d3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f1a60f875873882a9d1ce28… Author: Mark Jansen <learn0more(a)gmail.com> Date: Sun Mar 27 15:44:32 2016 +0200 user32: Correctly determine bit count for BITMAPCOREINFO in is_dib_monochrome. Signed-off-by: Mark Jansen <learn0more(a)gmail.com> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 6 ++++-- dlls/user32/tests/cursoricon.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4f62635..4de6b28 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -397,12 +397,12 @@ static HBITMAP copy_bitmap( HBITMAP bitmap ) */ static BOOL is_dib_monochrome( const BITMAPINFO* info ) { - if (info->bmiHeader.biBitCount != 1) return FALSE; - if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { const RGBTRIPLE *rgb = ((const BITMAPCOREINFO*)info)->bmciColors; + if (((const BITMAPCOREINFO*)info)->bmciHeader.bcBitCount != 1) return FALSE; + /* Check if the first color is black */ if ((rgb->rgbtRed == 0) && (rgb->rgbtGreen == 0) && (rgb->rgbtBlue == 0)) { @@ -418,6 +418,8 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info ) { const RGBQUAD *rgb = info->bmiColors; + if (info->bmiHeader.biBitCount != 1) return FALSE; + /* Check if the first color is black */ if ((rgb->rgbRed == 0) && (rgb->rgbGreen == 0) && (rgb->rgbBlue == 0) && (rgb->rgbReserved == 0)) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 232a02e..6648ede 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2584,7 +2584,6 @@ static void test_monochrome_icon(void) ok(icon_info.fIcon == TRUE, "fIcon is %u.\n", icon_info.fIcon); ok(icon_info.xHotspot == 0, "xHotspot is %u.\n", icon_info.xHotspot); ok(icon_info.yHotspot == 0, "yHotspot is %u.\n", icon_info.yHotspot); -todo_wine_if(monochrome && use_core_info) if (monochrome) ok(icon_info.hbmColor == NULL, "Got hbmColor %p!\n", icon_info.hbmColor); else

1 0

Francois Gouget : winecfg: Highlight spelling fixes.
by Alexandre Julliard March 28, 2016

March 28, 2016

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