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

Henri Verbeet : wined3d: Recognise Intel Ivybridge on MacOS.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: c6231f08c4189f5d2f9eed169599bb414c5b6894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6231f08c4189f5d2f9eed169… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:02 2016 +0200 wined3d: Recognise Intel Ivybridge on MacOS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 668fd0b1941dc85f8600aa2036ee145a75d825f7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ab0095d..cb4f58f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1984,6 +1984,7 @@ cards_intel[] = {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM}, {"Ivybridge Desktop", CARD_INTEL_IVBD}, + {"HD Graphics 4000", CARD_INTEL_IVBD}, /* MacOS */ /* Sandybridge */ {"Sandybridge Server", CARD_INTEL_SNBS}, {"Sandybridge Mobile", CARD_INTEL_SNBM},

1 0

Piotr Caban : user32: Call window procedure even if we' re out of winproc handles.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: b4de8a5fbd569cb70ea82f9d30dcc39ec045e841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4de8a5fbd569cb70ea82f9d3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:37 2016 +0100 user32: Call window procedure even if we're out of winproc handles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c9ae38e4c77023eeb3e3bd49dd4506943e19d37e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/winproc.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3642109..c74fdda 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -876,6 +876,7 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, WND *wndPtr; WNDPROC func; WINDOWPROC *proc; + BOOL unicode_win; if (!(wndPtr = WIN_GetPtr( hwnd ))) return FALSE; if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; @@ -886,10 +887,9 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, } func = wndPtr->winproc; proc = handle_to_proc( wndPtr->winproc ); + unicode_win = wndPtr->flags & WIN_ISUNICODE; WIN_ReleasePtr( wndPtr ); - if (!proc) return TRUE; - if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return FALSE; thread_info->recursion_count++; @@ -897,19 +897,27 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, { if (proc == WINPROC_PROC16) WINPROC_CallProcWtoA( wow_handlers.call_window_proc, hwnd, msg, wParam, lParam, result, func ); - else if (proc->procW) + else if (proc && proc->procW) call_window_proc( hwnd, msg, wParam, lParam, result, proc->procW ); - else + else if (proc) WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procA ); + else if (unicode_win) + call_window_proc( hwnd, msg, wParam, lParam, result, func ); + else + WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, result, func ); } else { if (proc == WINPROC_PROC16) wow_handlers.call_window_proc( hwnd, msg, wParam, lParam, result, func ); - else if (proc->procA) + else if (proc && proc->procA) call_window_proc( hwnd, msg, wParam, lParam, result, proc->procA ); - else + else if (proc) WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procW, mapping ); + else if (unicode_win) + WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, result, func, mapping ); + else + call_window_proc( hwnd, msg, wParam, lParam, result, func ); } thread_info->recursion_count--; return TRUE;

1 0

Jean-Christophe Cardot : winhlp32: Fix some images not shown in certain 16-bit help files.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 87fb704898b007852284a3d3b9559c72af1a3f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fb704898b007852284a3d3b… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Fri Apr 15 12:08:03 2016 +0200 winhlp32: Fix some images not shown in certain 16-bit help files. Subfiles with bitmap images are usually prefixed with '|', but sometimes not. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 91f89b4f96674024b3436423ddb188e838d1ca54) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index ab75b2a..3669d11 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -507,6 +507,18 @@ static BOOL HLPFILE_FindSubFile(HLPFILE* hlpfile, LPCSTR name, BYTE **subbuf, BY WINE_TRACE("looking for file '%s'\n", name); ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), name, comp_FindSubFile); + if (!ptr) + { /* Subfiles with bitmap images are usually prefixed with '|', but sometimes not. + Unfortunately, there is no consensus among different pieces of unofficial + documentation. So remove leading '|' and try again. */ + CHAR c = *name++; + if (c == '|') + { + WINE_TRACE("not found. try '%s'\n", name); + ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), + name, comp_FindSubFile); + } + } if (!ptr) return FALSE; *subbuf = hlpfile->file_buffer + GET_UINT(ptr, strlen(name)+1); if (*subbuf >= hlpfile->file_buffer + hlpfile->file_buffer_size)

1 0

Nikolay Sivov : fontsub: Improve CreateFontPackage() stub for TTFCFP_SUBSET case.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: f484af42fe2bd711cbacb2ce203f49b3a2e991d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f484af42fe2bd711cbacb2ce2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 28 20:44:22 2016 +0300 fontsub: Improve CreateFontPackage() stub for TTFCFP_SUBSET case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f99785160009df9d043ec691699216d9c5be517a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/fontsub/main.c | 13 ++++++++++++- include/fontsub.h | 26 ++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index b78bd58..a0a6032 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -50,5 +50,16 @@ ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, u written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, reallocproc, freeproc, reserved); - return ERR_GENERIC; + if (format != TTFCFP_SUBSET) + return ERR_GENERIC; + + *dest = allocproc(src_len); + if (!*dest) + return ERR_MEM; + + memcpy(*dest, src, src_len); + *dest_len = src_len; + *written = src_len; + + return NO_ERROR; } diff --git a/include/fontsub.h b/include/fontsub.h index 6fc7793..aa83f03 100644 --- a/include/fontsub.h +++ b/include/fontsub.h @@ -27,14 +27,36 @@ typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); typedef void (__cdecl *CFP_FREEPROC)(void *); +#define TTFCFP_SUBSET 0 +#define TTFCFP_SUBSET1 1 +#define TTFCFP_DELTA 2 + +#define TTFCFP_UNICODE_PLATFORMID 0 +#define TTFCFP_APPLE_PLATFORMID 1 +#define TTFCFP_ISO_PLATFORMID 2 +#define TTFCFP_MS_PLATFORMID 3 + +#define TTFCFP_STD_MAC_CHAR_SET 0 +#define TTFCFP_SYMBOL_CHAR_SET 0 +#define TTFCFP_UNICODE_CHAR_SET 1 +#define TTFCFP_DONT_CARE 0xffff + +#define TTFCFP_LANG_KEEP_ALL 0 + +#define TTFCFP_FLAGS_SUBSET 0x0001 +#define TTFCFP_FLAGS_COMPRESS 0x0002 +#define TTFCFP_FLAGS_TTC 0x0004 +#define TTFCFP_FLAGS_GLYPHLIST 0x0008 + +#define ERR_GENERIC 1000 +#define ERR_MEM 1005 + 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

1 0

Piotr Caban : msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value.
by Alexandre Julliard June 16, 2016

June 16, 2016

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

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

June 16, 2016

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

Iván Matellanes : msvcirt: Avoid superfluous comparison in some compilers.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 34c41218cf0fb0f4101e8322b38d7c9f95c7c631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c41218cf0fb0f4101e8322b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Mar 28 11:19:08 2016 +0100 msvcirt: Avoid superfluous comparison in some compilers. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 885273414601caf68bea4415604f02d1f7aca0bb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 09f488a..19c26fd 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1383,7 +1383,7 @@ streampos __thiscall strstreambuf_seekoff(strstreambuf *this, streamoff offset, TRACE("(%p %d %d %d)\n", this, offset, dir, mode); - if (dir < SEEKDIR_beg || dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) + if ((unsigned int)dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) return EOF; /* read buffer */ if (mode & OPENMODE_in) {

1 0

Austin English : include: Fix GetCurrentConsoleFontEx/ SetCurrentConsoleFontEx definition.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 8e39abb560dc0f88e06b67c88376de5f8a3146c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e39abb560dc0f88e06b67c88… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 21 23:20:12 2016 -0500 include: Fix GetCurrentConsoleFontEx/SetCurrentConsoleFontEx definition. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 96ab323cf94db458343553f180dd8cbb8440e3cf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wincon.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/wincon.h b/include/wincon.h index 94fb0f8..8f4d54c 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -125,6 +125,9 @@ typedef struct _CONSOLE_FONT_INFOEX UINT FontWeight; WCHAR FaceName[LF_FACESIZE]; } CONSOLE_FONT_INFOEX,*LPCONSOLE_FONT_INFOEX; + +WINBASEAPI BOOL WINAPI GetCurrentConsoleFontEx(HANDLE,BOOL,LPCONSOLE_FONT_INFOEX); +WINBASEAPI BOOL WINAPI SetCurrentConsoleFontEx(HANDLE,BOOL,LPCONSOLE_FONT_INFOEX); #endif typedef struct tagCONSOLE_HISTORY_INFO @@ -347,7 +350,6 @@ WINBASEAPI DWORD WINAPI GetConsoleTitleW(LPWSTR,DWORD); #define GetConsoleTitle WINELIB_NAME_AW(GetConsoleTitle) WINBASEAPI HWND WINAPI GetConsoleWindow(void); WINBASEAPI BOOL WINAPI GetCurrentConsoleFont(HANDLE,BOOL,LPCONSOLE_FONT_INFO); -WINBASEAPI BOOL WINAPI GetCurrentConsoleFontEx(HANDLE,BOOL,LPCONSOLE_FONT_INFOEX); WINBASEAPI BOOL WINAPI GetNumberOfConsoleInputEvents( HANDLE,LPDWORD); WINBASEAPI BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD); WINBASEAPI BOOL WINAPI PeekConsoleInputA( HANDLE,PINPUT_RECORD,DWORD,LPDWORD); @@ -385,7 +387,6 @@ WINBASEAPI BOOL WINAPI SetConsoleTitleA(LPCSTR); WINBASEAPI BOOL WINAPI SetConsoleTitleW(LPCWSTR); #define SetConsoleTitle WINELIB_NAME_AW(SetConsoleTitle) WINBASEAPI BOOL WINAPI SetConsoleWindowInfo( HANDLE,BOOL,LPSMALL_RECT); -WINBASEAPI BOOL WINAPI SetCurrentConsoleFontEx(HANDLE,BOOL,LPCONSOLE_FONT_INFOEX); WINBASEAPI BOOL WINAPI WriteConsoleA(HANDLE,const void *,DWORD,LPDWORD,void *); WINBASEAPI BOOL WINAPI WriteConsoleW(HANDLE,const void *,DWORD,LPDWORD,void *); #define WriteConsole WINELIB_NAME_AW(WriteConsole)

1 0

André Hentschel : shell32: Provide helper function a buffer of correct size.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 19d469305d7e9f04859a1a4da402fc6082c5a288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d469305d7e9f04859a1a4da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 23 20:25:12 2016 +0100 shell32: Provide helper function a buffer of correct size. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1010372778978a30fb7f9d36d51c0cdacfb1c2c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlexec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ba83a57..23891d8 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1087,6 +1087,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR { UINT_PTR retval = SE_ERR_NOASSOC; WCHAR old_dir[1024]; + WCHAR res[MAX_PATH]; TRACE("File %s, Dir %s\n", debugstr_w(lpFile), debugstr_w(lpDirectory)); @@ -1100,7 +1101,10 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR SetCurrentDirectoryW(lpDirectory); } - retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, lpResult, MAX_PATH, NULL, NULL, NULL, NULL); + retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, res, MAX_PATH, NULL, NULL, NULL, NULL); + + if (retval > 32) + strcpyW(lpResult, res); TRACE("returning %s\n", debugstr_w(lpResult)); if (lpDirectory)

1 0

Alistair Leslie-Hughes : wined3d: Add detection for NVIDIA GTX TITAN Series.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 50433e7f3ad7dcaae4e9671fccd2982132755113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50433e7f3ad7dcaae4e9671fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 22 09:16:19 2016 +0000 wined3d: Add detection for NVIDIA GTX TITAN Series. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1bb1824e7e82df1d12a93444dc19573e84050e4f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++++++++-- dlls/wined3d/wined3d_private.h | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b1ccc0..2f85b08 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1278,7 +1278,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANB, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANX, "NVIDIA GeForce GTX TITAN X", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANZ, "NVIDIA GeForce GTX TITAN Z", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1736,6 +1739,7 @@ cards_nvidia_binary[] = {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ + {"GTX TITAN X", CARD_NVIDIA_GEFORCE_GTXTITANX}, /* Geforce 900 - highend */ {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ @@ -1749,7 +1753,9 @@ cards_nvidia_binary[] = {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ - {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ + {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITANB}, /* Geforce 700 - highend */ + {"GTX TITAN Z", CARD_NVIDIA_GEFORCE_GTXTITANZ}, /* Geforce 700 - highend */ + {"GTX TITAN", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ddbb355..18cdcd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1623,7 +1623,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, - CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, + CARD_NVIDIA_GEFORCE_GTXTITAN = 0x1005, + CARD_NVIDIA_GEFORCE_GTXTITANB = 0x100c, + CARD_NVIDIA_GEFORCE_GTXTITANX = 0x17c2, + CARD_NVIDIA_GEFORCE_GTXTITANZ = 0x1001, CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341,

1 0