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

Alexandre Julliard : makefiles: Move the main loader base address to cope with huge page alignment.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 1df3955467edb13c1cf6929ac55f29fd91b0eecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df3955467edb13c1cf6929ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 16:34:28 2016 +0900 makefiles: Move the main loader base address to cope with huge page alignment. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 22 +++++++++++----------- configure.ac | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 5d99f47..764ac45 100755 --- a/configure +++ b/configure @@ -8575,35 +8575,35 @@ $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,-Ttext-segment=0x60000000" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7bf00000" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7c000000" ;; esac 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 "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7c000400" >&5 +$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7c000400... " >&6; } +if ${ac_cv_cflags__Wl___section_start__interp_0x7c000400+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" +CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7c000400" 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___section_start__interp_0x7c000400=yes else - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no + ac_cv_cflags__Wl___section_start__interp_0x7c000400=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___section_start__interp_0x7c000400" >&5 +$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7c000400" >&6; } +if test "x$ac_cv_cflags__Wl___section_start__interp_0x7c000400" = xyes; then : case $host_os in freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7c000400" ;; esac fi # Extract the first word of "prelink", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index dd7571d..f63dd61 100644 --- a/configure.ac +++ b/configure.ac @@ -898,12 +898,12 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7bf00000" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7c000000" ;; esac], - [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], + [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7c000400], [case $host_os in freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7c000400" ;; esac]) AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) if test "x$PRELINK" = xfalse

1 0

Alexandre Julliard : kernel32: Lower the load address to accomodate the dll size.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 8f567028123cd7a3c8180f9ad2c867add34795e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f567028123cd7a3c8180f9ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 15:57:35 2016 +0900 kernel32: Lower the load address to accomodate the dll size. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index c09771d..1399859 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -3,7 +3,7 @@ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = winecrt0 ntdll EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) -EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 +EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 C_SRCS = \ actctx.c \

1 0

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

28 Mar '16

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

Thomas Faber : user32/tests: Test loading monochrome icons.
by Alexandre Julliard 28 Mar '16

28 Mar '16

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

Thomas Faber : user32: Handle BITMAPCOREINFO when loading icons.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 6ad5cfbebd2e891e0dc88238a6bc3524d12614ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad5cfbebd2e891e0dc88238a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Mar 27 15:41:33 2016 +0200 user32: Handle BITMAPCOREINFO when loading icons. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 50 ++++++++++++++++++++++++++++-------------- dlls/user32/tests/cursoricon.c | 1 - 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7d8d620..4f62635 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -676,10 +676,19 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, return FALSE; entry = &filedir->idEntries[n]; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); - if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; + if (info->biSize != sizeof(BITMAPCOREHEADER)) + { + if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; + *bits = info->biBitCount; + } + else + { + const BITMAPCOREHEADER *coreinfo = (const BITMAPCOREHEADER *)((const char *)dir + entry->dwDIBOffset); + if ((const char *)(coreinfo + 1) - (const char *)dir > size) return FALSE; + *bits = coreinfo->bcBitCount; + } *width = entry->bWidth; *height = entry->bHeight; - *bits = info->biBitCount; return TRUE; } @@ -805,6 +814,9 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE BOOL do_stretch; HICON hObj = 0; HDC hdc = 0; + LONG bmi_width, bmi_height; + WORD bpp; + DWORD compr; /* Check bitmap header */ @@ -828,9 +840,10 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } size = bitmap_info_size( bmi, DIB_RGB_COLORS ); - color_size = get_dib_image_size( bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight / 2, - bmi->bmiHeader.biBitCount ); - mask_size = get_dib_image_size( bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight / 2, 1 ); + DIB_GetBitmapInfo(&bmi->bmiHeader, &bmi_width, &bmi_height, &bpp, &compr); + color_size = get_dib_image_size( bmi_width, bmi_height / 2, + bpp ); + mask_size = get_dib_image_size( bmi_width, bmi_height / 2, 1 ); if (size > maxsize || color_size > maxsize - size) { WARN( "truncated file %u < %u+%u+%u\n", maxsize, size, color_size, mask_size ); @@ -845,11 +858,11 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } else { - if (!width) width = bmi->bmiHeader.biWidth; - if (!height) height = bmi->bmiHeader.biHeight/2; + if (!width) width = bmi_width; + if (!height) height = bmi_height/2; } - do_stretch = (bmi->bmiHeader.biHeight/2 != height) || - (bmi->bmiHeader.biWidth != width); + do_stretch = (bmi_height/2 != height) || + (bmi_width != width); /* Scale the hotspot */ if (bIcon) @@ -859,8 +872,8 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } else if (do_stretch) { - hotspot.x = (hotspot.x * width) / bmi->bmiHeader.biWidth; - hotspot.y = (hotspot.y * height) / (bmi->bmiHeader.biHeight / 2); + hotspot.x = (hotspot.x * width) / bmi_width; + hotspot.y = (hotspot.y * height) / (bmi_height / 2); } if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); @@ -871,7 +884,11 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE if (!(hdc = CreateCompatibleDC( 0 ))) goto done; memcpy( bmi_copy, bmi, size ); - bmi_copy->bmiHeader.biHeight /= 2; + if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + bmi_copy->bmiHeader.biHeight /= 2; + else + ((BITMAPCOREINFO *)bmi_copy)->bmciHeader.bcHeight /= 2; + bmi_height /= 2; color_bits = (const char*)bmi + size; mask_bits = (const char*)color_bits + color_size; @@ -885,7 +902,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE /* copy color data into second half of mask bitmap */ SelectObject( hdc, mask ); StretchDIBits( hdc, 0, height, width, height, - 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, + 0, 0, bmi_width, bmi_height, color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } else @@ -899,18 +916,18 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } SelectObject( hdc, color ); StretchDIBits( hdc, 0, 0, width, height, - 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, + 0, 0, bmi_width, bmi_height, color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); if (bmi_has_alpha( bmi_copy, color_bits )) alpha = create_alpha_bitmap( color, bmi_copy, color_bits ); /* convert info to monochrome to copy the mask */ - bmi_copy->bmiHeader.biBitCount = 1; if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) { RGBQUAD *rgb = bmi_copy->bmiColors; + bmi_copy->bmiHeader.biBitCount = 1; bmi_copy->bmiHeader.biClrUsed = bmi_copy->bmiHeader.biClrImportant = 2; rgb[0].rgbBlue = rgb[0].rgbGreen = rgb[0].rgbRed = 0x00; rgb[1].rgbBlue = rgb[1].rgbGreen = rgb[1].rgbRed = 0xff; @@ -920,6 +937,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE { RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)bmi_copy) + 1); + ((BITMAPCOREINFO *)bmi_copy)->bmciHeader.bcBitCount = 1; rgb[0].rgbtBlue = rgb[0].rgbtGreen = rgb[0].rgbtRed = 0x00; rgb[1].rgbtBlue = rgb[1].rgbtGreen = rgb[1].rgbtRed = 0xff; } @@ -929,7 +947,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE { SelectObject( hdc, mask ); StretchDIBits( hdc, 0, 0, width, height, - 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, + 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } ret = TRUE; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index dc8d227..232a02e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2567,7 +2567,6 @@ static void test_monochrome_icon(void) 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) {

1 0

Mark Jansen : user32: Correctly determine bit count for BITMAPCOREINFO in is_dib_monochrome.
by Alexandre Julliard 28 Mar '16

28 Mar '16

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

Sebastian Lackner : ntdll: Fix off-by-one errors in __wine_set_signal_handler.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: d4ab672cf599e0d04d2c8943f0969f9cd77c1b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ab672cf599e0d04d2c8943f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 28 07:20:08 2016 +0200 ntdll: Fix off-by-one errors in __wine_set_signal_handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5ee9f45..cb5f67d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -860,7 +860,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 3a41c84..14c5260 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -732,7 +732,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 886da86..507490a 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -940,7 +940,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1e88df3..a79fd6e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2762,7 +2762,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0;

1 0

Sebastian Lackner : quartz: Fix use of CONTAINING_RECORD in impl_from_TransformFilter.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: f9663af1f442e715d736011fe73f3d5433fda7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9663af1f442e715d736011fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 28 07:27:49 2016 +0200 quartz: Fix use of CONTAINING_RECORD in impl_from_TransformFilter. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index d9a94a9..3c1c7cf 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -55,7 +55,7 @@ static const IBaseFilterVtbl ACMWrapper_Vtbl; static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface ) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf); } static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 1a58844..eb9b223 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -54,7 +54,7 @@ static const IBaseFilterVtbl AVIDec_Vtbl; static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) { - return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); + return CONTAINING_RECORD(iface, AVIDecImpl, tf); } static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter)

1 0

Sebastian Lackner : jscript: Fix off-by-one error in decode_dword.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 19777292a31ee95a9774d8a675704be871afd467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19777292a31ee95a9774d8a67… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 28 07:21:12 2016 +0200 jscript: Fix off-by-one error in decode_dword. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/decode.c b/dlls/jscript/decode.c index 2c39453..d402d7c 100644 --- a/dlls/jscript/decode.c +++ b/dlls/jscript/decode.c @@ -91,7 +91,7 @@ static BOOL decode_dword(const WCHAR *p, DWORD *ret) DWORD i; for(i=0; i<6; i++) { - if(p[i] > sizeof(digits)/sizeof(*digits) || digits[p[i]] == 0xff) + if(p[i] >= sizeof(digits)/sizeof(*digits) || digits[p[i]] == 0xff) return FALSE; } if(p[6] != '=' || p[7] != '=')

1 0

Nikolay Sivov : dwrite: Use regular QI way to return interface client asked for.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 7c6dcab73f9b34ae6dba662a2eb374298098a4f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6dcab73f9b34ae6dba662a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 13:33:56 2016 +0300 dwrite: Use regular QI way to return interface client asked for. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 22 +++++++--------------- dlls/dwrite/tests/font.c | 9 +++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index e081e11..b82a4b0 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1313,21 +1313,14 @@ static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYP HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnknown **ret) { struct dwritefactory *factory; + HRESULT hr; TRACE("(%d, %s, %p)\n", type, debugstr_guid(riid), ret); *ret = NULL; - if (!IsEqualIID(riid, &IID_IDWriteFactory) && - !IsEqualIID(riid, &IID_IDWriteFactory1) && - !IsEqualIID(riid, &IID_IDWriteFactory2)) - return E_FAIL; - - if (type == DWRITE_FACTORY_TYPE_SHARED && shared_factory) { - *ret = (IUnknown*)shared_factory; - IDWriteFactory2_AddRef(shared_factory); - return S_OK; - } + if (type == DWRITE_FACTORY_TYPE_SHARED && shared_factory) + return IDWriteFactory2_QueryInterface(shared_factory, riid, (void**)ret); factory = heap_alloc(sizeof(struct dwritefactory)); if (!factory) return E_OUTOFMEMORY; @@ -1337,11 +1330,10 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno if (type == DWRITE_FACTORY_TYPE_SHARED) if (InterlockedCompareExchangePointer((void**)&shared_factory, &factory->IDWriteFactory2_iface, NULL)) { release_shared_factory(&factory->IDWriteFactory2_iface); - *ret = (IUnknown*)shared_factory; - IDWriteFactory2_AddRef(shared_factory); - return S_OK; + return IDWriteFactory2_QueryInterface(shared_factory, riid, (void**)ret); } - *ret = (IUnknown*)&factory->IDWriteFactory2_iface; - return S_OK; + hr = IDWriteFactory2_QueryInterface(&factory->IDWriteFactory2_iface, riid, (void**)ret); + IDWriteFactory2_Release(&factory->IDWriteFactory2_iface); + return hr; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7c19f00..766df39 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2312,6 +2312,11 @@ static void test_shared_isolated(void) hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown**)&shared2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(shared == shared2, "got %p, and %p\n", shared, shared2); + IDWriteFactory_Release(shared2); + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IUnknown, (IUnknown**)&shared2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(shared == shared2, "got %p, and %p\n", shared, shared2); IDWriteFactory_Release(shared); IDWriteFactory_Release(shared2); @@ -2330,6 +2335,10 @@ static void test_shared_isolated(void) ok(isolated != isolated2, "got %p, and %p\n", isolated, isolated2); IDWriteFactory_Release(isolated2); + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IUnknown, (IUnknown**)&isolated2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFactory_Release(isolated2); + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED+1, &IID_IDWriteFactory, (IUnknown**)&isolated2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(shared != isolated2, "got %p, and %p\n", shared, isolated2);

1 0