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

Nikolay Sivov : user32: For EnableScrollBar() always go through EnableWindow() in SB_CTL case.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: fc9e0a26bab8f0fc07b5e4074682a6f9b4b533cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9e0a26bab8f0fc07b5e4074… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 21 17:36:13 2016 +0300 user32: For EnableScrollBar() always go through EnableWindow() in SB_CTL case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9d91fce444fab9dc408f1e3834b2b0738843ec41) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/scroll.c | 2 +- dlls/user32/tests/scroll.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index be205ef..e844122 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -2040,7 +2040,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnableScrollBar( HWND hwnd, UINT nBar, UINT flags nBar = SB_HORZ; } else - bFineWithMe = TRUE; + bFineWithMe = nBar != SB_CTL; if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) return FALSE; if (bFineWithMe && infoPtr->flags == flags) return FALSE; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 691855b..1c454fb 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -114,6 +114,15 @@ static void test_EnableScrollBar(void) ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + /* disable window, try to reenable */ + ret = EnableWindow( hScroll, FALSE ); + ok( !ret, "got %d\n", ret ); + ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + + ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); + ok( ret, "got %d\n", ret ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + DestroyWindow(hScroll); DestroyWindow(mainwnd); } @@ -539,7 +548,7 @@ static void test_SetScrollInfo(void) EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); ret = IsWindowEnabled(hScroll); - ok(!ret, "scroll bar disabled\n"); + ok(!ret, "scroll bar enabled\n"); memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); @@ -551,9 +560,10 @@ static void test_SetScrollInfo(void) memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); ret = IsWindowEnabled(hScroll); - ok(!ret, "scroll bar disabled\n"); + ok(!ret, "scroll bar enabled\n"); si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; si.nMax = 100; + si.nMin = 10; si.nPos = 0; si.nPage = 100; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); @@ -564,6 +574,18 @@ static void test_SetScrollInfo(void) ret = GetScrollInfo(hScroll, SB_CTL, &si); ok(ret, "got %d\n", ret); + EnableScrollBar(hScroll, SB_CTL, ESB_ENABLE_BOTH); + ok(IsWindowEnabled(hScroll), "expected enabled scrollbar\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 10; + si.nMin = 100; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); + ok(ret, "scroll bar disabled\n"); + DestroyWindow(hScroll); DestroyWindow(mainwnd); }

1 0

Sebastian Lackner : user32: Set %ecx to address of rect in EnumDisplayMonitors callback.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: f7c6a288ce8a73c2fdfb55d3a0174480e3d235e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c6a288ce8a73c2fdfb55d3a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 05:51:41 2016 +0200 user32: Set %ecx to address of rect in EnumDisplayMonitors callback. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11f6df13eb23260331d9ca8412b9323dbe942885) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/misc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 6b1b5ed..7c53ab2 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -471,6 +471,7 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) #ifdef __i386__ /* Some apps pass a non-stdcall callback to EnumDisplayMonitors, * so we need a small assembly wrapper to call it. + * MJ's Help Diagnostic expects that %ecx contains the address to the rect. */ struct enumdisplaymonitors_lparam { @@ -491,6 +492,7 @@ __ASM_STDCALL_FUNC( enumdisplaymonitors_callback_wrapper, 16, "pushl 16(%ebp)\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" + "movl 16(%ebp),%ecx\n\t" "call *(%eax)\n\t" /* call orig->proc */ "leave\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t")

1 0

Caron Wills : wined3d: Add Nvidia GeForce GT 730M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 80027df9fa6de4919f405d25d02e59c1c6948cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80027df9fa6de4919f405d25d… Author: Caron Wills <caron(a)codeweavers.com> Date: Fri May 27 19:56:05 2016 +0000 wined3d: Add Nvidia GeForce GT 730M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit abd26b9d4468f968d10115d3cf31b4ca58b457ef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2f85b08..ab0095d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1269,6 +1269,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1764,6 +1765,7 @@ cards_nvidia_binary[] = {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ + {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 18cdcd4..7183195 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1614,6 +1614,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380,

1 0

Henri Verbeet : wined3d: Sanitise map flags in wined3d_surface_map().
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: bf1a2f63d30f3acb32d77f3d4978047a6d2efb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1a2f63d30f3acb32d77f3d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 15:51:14 2016 +0100 wined3d: Sanitise map flags in wined3d_surface_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c5d47bd6fe0ab6d6d9f47ea85b245b586270d7c2) Conflicts: dlls/wined3d/surface.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 201a0c4..6f3ad01 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2524,6 +2524,8 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } } + flags = wined3d_resource_sanitize_map_flags(&surface->resource, flags); + surface_prepare_map_memory(surface); if (flags & WINED3D_MAP_DISCARD) {

1 0

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

16 Jun '16

Module: wine Branch: stable Commit: 5cbb78fdf54bb14159c7b0e5801fecf3a112bff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbb78fdf54bb14159c7b0e58… 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> (cherry picked from commit e1fc8dcdee1fec9a67e5f10de7ed1a6952261ba7) Signed-off-by: Michael Stefaniuc <mstefani(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 4f73a3a..974222d 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -300,7 +300,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++; } @@ -314,7 +314,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) { @@ -372,7 +372,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

Piotr Caban : msvcrt: Dump exception information in x86_64 __CxxFrameHandler.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 8d69049c0dfef130e0897624abbaaf7fbd2ea426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d69049c0dfef130e0897624a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 21 18:23:34 2016 +0100 msvcrt: Dump exception information in x86_64 __CxxFrameHandler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3350364d8b7f44e328c9e8f564a836ad23b4104f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 157 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 156 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 27d0a15..7b62c4d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -61,6 +61,160 @@ typedef struct _DISPATCHER_CONTEXT ULONG ScopeIndex; } DISPATCHER_CONTEXT; +typedef struct +{ + int prev; + UINT handler; +} unwind_info; + +typedef struct +{ + UINT flags; + UINT type_info; + int offset; + UINT handler; +} catchblock_info; + +typedef struct +{ + int start_level; + int end_level; + int catch_level; + int catchblock_count; + UINT catchblock; +} tryblock_info; + +typedef struct __cxx_function_descr +{ + UINT magic; + UINT unwind_count; + UINT unwind_table; + UINT tryblock_count; + UINT tryblock; + UINT ipmap_count; + UINT ipmap; + UINT unwind_help; + UINT expect_list; + UINT flags; +} cxx_function_descr; + +static inline void* rva_to_ptr(UINT rva, ULONG64 base) +{ + return rva ? (void*)(base+rva) : NULL; +} + +static inline void dump_type(UINT type_rva, ULONG64 base) +{ + const cxx_type_info *type = rva_to_ptr(type_rva, base); + + TRACE("flags %x type %x %s offsets %d,%d,%d size %d copy ctor %x(%p)\n", + type->flags, type->type_info, dbgstr_type_info(rva_to_ptr(type->type_info, base)), + type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, + type->size, type->copy_ctor, rva_to_ptr(type->copy_ctor, base)); +} + +static void dump_exception_type(const cxx_exception_type *type, ULONG64 base) +{ + const cxx_type_info_table *type_info_table = rva_to_ptr(type->type_info_table, base); + UINT i; + + TRACE("flags %x destr %x(%p) handler %x(%p) type info %x(%p)\n", + type->flags, type->destructor, rva_to_ptr(type->destructor, base), + type->custom_handler, rva_to_ptr(type->custom_handler, base), + type->type_info_table, type_info_table); + for (i = 0; i < type_info_table->count; i++) + { + TRACE(" %d: ", i); + dump_type(type_info_table->info[i], base); + } +} + +static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_base) +{ + unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, image_base); + tryblock_info *tryblock = rva_to_ptr(descr->tryblock, image_base); + UINT i, j; + + TRACE("magic %x\n", descr->magic); + TRACE("unwind table: %x(%p) %d\n", descr->unwind_table, unwind_table, descr->unwind_count); + for (i=0; i<descr->unwind_count; i++) + { + TRACE(" %d: prev %d func %x(%p)\n", i, unwind_table[i].prev, + unwind_table[i].handler, rva_to_ptr(unwind_table[i].handler, image_base)); + } + TRACE("try table: %x(%p) %d\n", descr->tryblock, tryblock, descr->tryblock_count); + for (i=0; i<descr->tryblock_count; i++) + { + catchblock_info *catchblock = rva_to_ptr(tryblock[i].catchblock, image_base); + + TRACE(" %d: start %d end %d catchlevel %d catch%x(%p) %d\n", i, + tryblock[i].start_level, tryblock[i].end_level, + tryblock[i].catch_level, tryblock[i].catchblock, + catchblock, tryblock[i].catchblock_count); + for (j=0; j<tryblock[i].catchblock_count; j++) + { + TRACE(" %d: flags %x offset %d handler %x(%p) type %x %s\n", + j, catchblock->flags, catchblock->offset, catchblock->handler, + rva_to_ptr(catchblock->handler, image_base), catchblock->type_info, + dbgstr_type_info(rva_to_ptr(catchblock->type_info, image_base))); + } + } + TRACE("unwind_help %d\n", descr->unwind_help); + TRACE("expect list: %x\n", descr->expect_list); + TRACE("flags: %08x\n", descr->flags); +} + +static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, + CONTEXT *context, DISPATCHER_CONTEXT *dispatch, + const cxx_function_descr *descr) +{ + cxx_exception_type *exc_type; + + if (descr->magic != CXX_FRAME_MAGIC_VC8) + { + FIXME("unhandled frame magic %x\n", descr->magic); + return ExceptionContinueSearch; + } + + if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) + return ExceptionContinueSearch; + if (!descr->tryblock_count) return ExceptionContinueSearch; + + if (rec->ExceptionCode == CXX_EXCEPTION && + rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) + { + *rec = *msvcrt_get_thread_data()->exc_record; + rec->ExceptionFlags &= ~EH_UNWINDING; + if (TRACE_ON(seh)) { + TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + if (rec->ExceptionCode == CXX_EXCEPTION) + TRACE("re-propage: obj: %lx, type: %lx\n", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + } + } + + if (rec->ExceptionCode == CXX_EXCEPTION) + { + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; + + if (TRACE_ON(seh)) + { + TRACE("handling C++ exception rec %p frame %lx unwind_help %d descr %p\n", + rec, frame, *((INT*)(frame+descr->unwind_help)), descr); + dump_exception_type(exc_type, rec->ExceptionInformation[3]); + dump_function_descr(descr, dispatch->ImageBase); + } + } + else + { + exc_type = NULL; + TRACE("handling C exception code %x rec %p frame %lx unwind_help %d descr %p\n", + rec->ExceptionCode, rec, frame, *((INT*)(frame+descr->unwind_help)), descr); + } + + return ExceptionContinueSearch; +} + /********************************************************************* * __CxxExceptionFilter (MSVCRT.@) */ @@ -78,7 +232,8 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { FIXME( "%p %lx %p %p: not implemented\n", rec, frame, context, dispatch ); - return ExceptionContinueSearch; + return cxx_frame_handler( rec, frame, context, dispatch, + rva_to_ptr(*(UINT*)dispatch->HandlerData, dispatch->ImageBase) ); }

1 0

Piotr Caban : msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: da9963112dfbc35eac3e333b29346ce96222e951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9963112dfbc35eac3e333b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 20:12:18 2016 +0200 msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 953d6c88d1235548eaa54f1b450f5bba938c4f91) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7b62c4d..3d03136 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -160,7 +160,9 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b } } TRACE("unwind_help %d\n", descr->unwind_help); + if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; TRACE("expect list: %x\n", descr->expect_list); + if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; TRACE("flags: %08x\n", descr->flags); } @@ -170,7 +172,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, { cxx_exception_type *exc_type; - if (descr->magic != CXX_FRAME_MAGIC_VC8) + if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8) { FIXME("unhandled frame magic %x\n", descr->magic); return ExceptionContinueSearch;

1 0

Austin English : oleaut32: Add OleLoadPictureFile stub.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 21d3ec418d072e2e02a506085ff437aaa1b6f63a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d3ec418d072e2e02a506085… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 14:06:45 2016 -0500 oleaut32: Add OleLoadPictureFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5989664e0f23327fe788c3b44991e70b29e07619) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/olepicture.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index f5ad0ef..97aec54 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -390,7 +390,7 @@ 419 stdcall OleCreatePictureIndirect(ptr ptr long ptr) 420 stdcall OleCreateFontIndirect(ptr ptr ptr) 421 stdcall OleTranslateColor(long long long) -422 stub OleLoadPictureFile +422 stdcall OleLoadPictureFile(int128 ptr) 423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) 425 stdcall VarUI4FromI8(int64 ptr) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 44157de..b67563d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2316,6 +2316,15 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, } /*********************************************************************** + * OleLoadPictureFile (OLEAUT32.422) + */ +HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) +{ + FIXME("(%s %p): stub\n", wine_dbgstr_variant(&file), picture); + return E_NOTIMPL; +} + +/*********************************************************************** * OleSavePictureFile (OLEAUT32.423) */ HRESULT WINAPI OleSavePictureFile(IDispatch *picture, BSTR filename)

1 0

Nikolay Sivov : t2embed: Implement TTGetEmbeddingType().
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 293586ba3b8c37e02feb9a2c3d76482b1188537a URL: http://source.winehq.org/git/wine.git/?a=commit;h=293586ba3b8c37e02feb9a2c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 13:00:26 2016 +0300 t2embed: Implement TTGetEmbeddingType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 12fbfe838c2e6f41ead7445decc447b41921474a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/t2embed/Makefile.in | 2 ++ dlls/t2embed/main.c | 28 +++++++++++++-- dlls/t2embed/tests/Makefile.in | 5 +++ dlls/t2embed/tests/t2embed.c | 82 ++++++++++++++++++++++++++++++++++++++++++ include/t2embapi.h | 4 +++ 7 files changed, 122 insertions(+), 5 deletions(-) diff --git a/configure b/configure index f1ecbfb..b33909a 100755 --- a/configure +++ b/configure @@ -17870,7 +17870,8 @@ wine_fn_config_dll svrapi enable_svrapi wine_fn_config_dll sxs enable_sxs implib wine_fn_config_test dlls/sxs/tests sxs_test wine_fn_config_dll system.drv16 enable_win16 -wine_fn_config_dll t2embed enable_t2embed +wine_fn_config_dll t2embed enable_t2embed implib +wine_fn_config_test dlls/t2embed/tests t2embed_test wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean wine_fn_config_test dlls/taskschd/tests taskschd_test diff --git a/configure.ac b/configure.ac index 3d5d4ad..aabaecd 100644 --- a/configure.ac +++ b/configure.ac @@ -3212,7 +3212,8 @@ WINE_CONFIG_DLL(svrapi) WINE_CONFIG_DLL(sxs,,[implib]) WINE_CONFIG_TEST(dlls/sxs/tests) WINE_CONFIG_DLL(system.drv16,enable_win16) -WINE_CONFIG_DLL(t2embed) +WINE_CONFIG_DLL(t2embed,,[implib]) +WINE_CONFIG_TEST(dlls/t2embed/tests) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_TEST(dlls/taskschd/tests) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index d123846..e585fe2 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -1,4 +1,6 @@ MODULE = t2embed.dll +IMPORTLIB = t2embed +IMPORTS = gdi32 C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e1a880d..2794f0f 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "t2embapi.h" #include "wine/debug.h" @@ -73,9 +74,30 @@ LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivS LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { - FIXME("(%p %p) stub\n", hDC, status); - if (status) *status = EMBED_NOEMBEDDING; - return E_API_NOTIMPL; + OUTLINETEXTMETRICW otm; + + TRACE("(%p %p)\n", hDC, status); + + if (!hDC) + return E_HDCINVALID; + + otm.otmSize = sizeof(otm); + if (!GetOutlineTextMetricsW(hDC, otm.otmSize, &otm)) + return E_NOTATRUETYPEFONT; + + if (!status) + return E_PERMISSIONSINVALID; + + if (otm.otmfsType == LICENSE_INSTALLABLE) + *status = EMBED_INSTALLABLE; + else if (otm.otmfsType & LICENSE_NOEMBEDDING) + *status = EMBED_NOEMBEDDING; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; + else if (otm.otmfsType & LICENSE_EDITABLE) + *status = EMBED_EDITABLE; + + return E_NONE; } LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in new file mode 100644 index 0000000..f7a5809 --- /dev/null +++ b/dlls/t2embed/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = t2embed.dll +IMPORTS = gdi32 t2embed + +C_SRCS = \ + t2embed.c diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c new file mode 100644 index 0000000..cdc2f49 --- /dev/null +++ b/dlls/t2embed/tests/t2embed.c @@ -0,0 +1,82 @@ +/* + * Copyright 2016 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "wingdi.h" +#include "t2embapi.h" +#include "wine/test.h" + +static void test_TTGetEmbeddingType(void) +{ + HFONT hfont, old_font; + LOGFONTA logfont; + ULONG status; + LONG ret; + HDC hdc; + + ret = TTGetEmbeddingType(NULL, NULL); + ok(ret == E_HDCINVALID, "got %d\n", ret); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType(NULL, &status); + ok(ret == E_HDCINVALID, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType((HDC)0xdeadbeef, &status); + ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + hdc = CreateCompatibleDC(0); + + ret = TTGetEmbeddingType(hdc, NULL); + ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&logfont); + ok(hfont != NULL, "got %p\n", hfont); + + old_font = SelectObject(hdc, hfont); + + status = 0; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NONE, "got %#x\n", ret); + ok(status != 0, "got %u\n", status); + + ret = TTGetEmbeddingType(hdc, NULL); + ok(ret == E_PERMISSIONSINVALID, "got %#x\n", ret); + + SelectObject(hdc, old_font); + DeleteObject(hfont); + DeleteDC(hdc); +} + +START_TEST(t2embed) +{ + test_TTGetEmbeddingType(); +} diff --git a/include/t2embapi.h b/include/t2embapi.h index 16d68f3..60fda64 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -39,6 +39,10 @@ extern "C" { /* Possible return values. */ #define E_NONE __MSABI_LONG(0x0000) #define E_API_NOTIMPL __MSABI_LONG(0x0001) +#define E_HDCINVALID __MSABI_LONG(0x0006) +#define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a) +#define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c) +#define E_PERMISSIONSINVALID __MSABI_LONG(0x0117) typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG);

1 0

Nikolay Sivov : fontsub: Added CreateFontPackage() stub.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 4c45d35c3ded1928bbd66bcc01e1ff73259f9ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c45d35c3ded1928bbd66bcc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 16:27:19 2016 +0300 fontsub: Added CreateFontPackage() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72da5888e9e96e9cfc09c4d5a0e4ab0ecea8f64d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/fontsub/fontsub.spec | 2 +- dlls/fontsub/main.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/fontsub.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/fontsub/fontsub.spec b/dlls/fontsub/fontsub.spec index dfb47fb..61b7fd3 100644 --- a/dlls/fontsub/fontsub.spec +++ b/dlls/fontsub/fontsub.spec @@ -1,2 +1,2 @@ -@ stub CreateFontPackage +@ cdecl CreateFontPackage(ptr long ptr ptr ptr long long long long long long ptr long ptr ptr ptr ptr) @ stub MergeFontPackage diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index 515c2d3..b78bd58 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "fontsub.h" #include "wine/debug.h" @@ -38,3 +39,16 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, + ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, + const unsigned short format, const unsigned short lang, const unsigned short platform, const unsigned short encoding, + const unsigned short *keep_list, const unsigned short keep_len, CFP_ALLOCPROC allocproc, + CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved) +{ + FIXME("(%p %u %p %p %p %#x %u %u %u %u %u %p %u %p %p %p %p): stub\n", src, src_len, dest, dest_len, + written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, + reallocproc, freeproc, reserved); + + return ERR_GENERIC; +} diff --git a/include/Makefile.in b/include/Makefile.in index ea0e3fd..0151c12 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -348,6 +348,7 @@ HEADER_SRCS = \ fdi.h \ fileapi.h \ fltdefs.h \ + fontsub.h \ gdiplus.h \ gdipluscolor.h \ gdipluscolormatrix.h \ diff --git a/include/fontsub.h b/include/fontsub.h new file mode 100644 index 0000000..6fc7793 --- /dev/null +++ b/include/fontsub.h @@ -0,0 +1,42 @@ +/* + * Copyright 2016 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FONTSUB_H +#define __WINE_FONTSUB_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); +typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); +typedef void (__cdecl *CFP_FREEPROC)(void *); + +ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, + ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, + const unsigned short format, const unsigned short lang, const unsigned short platform, + const unsigned short encoding, const unsigned short *keep_list, const unsigned short keep_len, + CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved); + +#define ERR_GENERIC 1000 + +#ifdef __cplusplus +} +#endif + +#endif

1 0