October 2015 - Wine-commits

Alex Henrie : user32: Replace release_icon_ptr with release_user_handle_ptr.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 50403fec1e93fa4053d15e79b94b671bb5d01b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50403fec1e93fa4053d15e79b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 1 21:58:05 2015 -0600 user32: Replace release_icon_ptr with release_user_handle_ptr. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/cursoricon.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f7b6bca..b5ddfcd 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -158,11 +158,6 @@ static struct cursoricon_object *get_icon_ptr( HICON handle ) return obj; } -static void release_icon_ptr( HICON handle, struct cursoricon_object *ptr ) -{ - release_user_handle_ptr( ptr ); -} - static struct cursoricon_frame *get_icon_frame( struct cursoricon_object *obj, int istep ) { struct static_cursoricon_object *req_frame; @@ -192,7 +187,7 @@ static void release_icon_frame( struct cursoricon_object *obj, int istep, struct ani_icon_data = (struct animated_cursoricon_object *) obj; frameobj = (struct cursoricon_object *) (((char *)frame) - FIELD_OFFSET(struct static_cursoricon_object, frame)); - release_icon_ptr( ani_icon_data->frames[istep], frameobj ); + release_user_handle_ptr( frameobj ); } } @@ -484,7 +479,7 @@ BOOL get_icon_size( HICON handle, SIZE *size ) size->cx = frame->width; size->cy = frame->height; release_icon_frame( info, 0, frame); - release_icon_ptr( handle, info ); + release_user_handle_ptr( info ); return TRUE; } @@ -976,7 +971,7 @@ done: info->rsrc = rsrc; list_add_head( &icon_cache, &info->entry ); } - release_icon_ptr( hObj, info ); + release_user_handle_ptr( info ); } else { @@ -1229,7 +1224,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, { FIXME_(cursor)("Completely failed to create animated cursor!\n"); ani_icon_data->num_frames = 0; - release_icon_ptr( cursor, info ); + release_user_handle_ptr( info ); free_icon_handle( cursor ); HeapFree( GetProcessHeap(), 0, frames ); return 0; @@ -1275,7 +1270,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, } HeapFree( GetProcessHeap(), 0, frames ); - release_icon_ptr( cursor, info ); + release_user_handle_ptr( info ); return cursor; } @@ -1592,14 +1587,14 @@ HICON WINAPI CopyIcon( HICON hIcon ) ptrNew->hotspot = ptrOld->hotspot; if (!(frameOld = get_icon_frame( ptrOld, 0 ))) { - release_icon_ptr( hIcon, ptrOld ); + release_user_handle_ptr( ptrOld ); SetLastError( ERROR_INVALID_CURSOR_HANDLE ); return 0; } if (!(frameNew = get_icon_frame( ptrNew, 0 ))) { release_icon_frame( ptrOld, 0, frameOld ); - release_icon_ptr( hIcon, ptrOld ); + release_user_handle_ptr( ptrOld ); SetLastError( ERROR_INVALID_CURSOR_HANDLE ); return 0; } @@ -1611,9 +1606,9 @@ HICON WINAPI CopyIcon( HICON hIcon ) frameNew->alpha = copy_bitmap( frameOld->alpha ); release_icon_frame( ptrOld, 0, frameOld ); release_icon_frame( ptrNew, 0, frameNew ); - release_icon_ptr( hNew, ptrNew ); + release_user_handle_ptr( ptrNew ); } - release_icon_ptr( hIcon, ptrOld ); + release_user_handle_ptr( ptrOld ); return hNew; } @@ -1631,7 +1626,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) if (obj) { BOOL shared = (obj->rsrc != NULL); - release_icon_ptr( hIcon, obj ); + release_user_handle_ptr( obj ); ret = (GetCursor() != hIcon); if (!shared) free_icon_handle( hIcon ); } @@ -1688,7 +1683,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu USER_Driver->pSetCursor( show_count >= 0 ? hCursor : 0 ); if (!(obj = get_icon_ptr( hOldCursor ))) return 0; - release_icon_ptr( hOldCursor, obj ); + release_user_handle_ptr( obj ); return hOldCursor; } @@ -1986,7 +1981,7 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD reserved, DWORD istep, } } - release_icon_ptr( hCursor, ptr ); + release_user_handle_ptr( ptr ); return ret; } @@ -2057,7 +2052,7 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) frame = get_icon_frame( ptr, 0 ); if (!frame) { - release_icon_ptr( icon, ptr ); + release_user_handle_ptr( ptr ); SetLastError( ERROR_INVALID_CURSOR_HANDLE ); return FALSE; } @@ -2085,7 +2080,7 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) } module = ptr->module; release_icon_frame( ptr, 0, frame ); - release_icon_ptr( icon, ptr ); + release_user_handle_ptr( ptr ); if (ret && module) GetModuleFileNameW( module, info->szModName, MAX_PATH ); return ret; } @@ -2215,7 +2210,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) info->hotspot.y = iconinfo->yHotspot; } - release_icon_ptr( hObj, info ); + release_user_handle_ptr( info ); } return hObj; } @@ -2260,19 +2255,19 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (istep >= get_icon_steps( ptr )) { TRACE_(icon)("Stepped past end of animated frames=%d\n", istep); - release_icon_ptr( hIcon, ptr ); + release_user_handle_ptr( ptr ); return FALSE; } if (!(frame = get_icon_frame( ptr, istep ))) { FIXME_(icon)("Error retrieving icon frame %d\n", istep); - release_icon_ptr( hIcon, ptr ); + release_user_handle_ptr( ptr ); return FALSE; } if (!(hMemDC = CreateCompatibleDC( hdc ))) { release_icon_frame( ptr, istep, frame ); - release_icon_ptr( hIcon, ptr ); + release_user_handle_ptr( ptr ); return FALSE; } @@ -2386,7 +2381,7 @@ done: failed: DeleteDC( hMemDC ); release_icon_frame( ptr, istep, frame ); - release_icon_ptr( hIcon, ptr ); + release_user_handle_ptr( ptr ); return result; } @@ -2908,7 +2903,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, !icon->is_icon, flags ); else res = CopyIcon( hnd ); /* FIXME: change size if necessary */ - release_icon_ptr( hnd, icon ); + release_user_handle_ptr( icon ); if (res && (flags & LR_COPYDELETEORG)) DeleteObject( hnd ); return res;

1 0

Alex Henrie : user32: Remove unused variable ani_icon_data from release_icon_frame.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: a66f4e521c766edf78074dbff6c7ed4488d85007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66f4e521c766edf78074dbff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 1 21:58:06 2015 -0600 user32: Remove unused variable ani_icon_data from release_icon_frame. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/cursoricon.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index b5ddfcd..5594909 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -182,10 +182,8 @@ static void release_icon_frame( struct cursoricon_object *obj, int istep, struct { if (obj->is_ani) { - struct animated_cursoricon_object *ani_icon_data; struct cursoricon_object *frameobj; - ani_icon_data = (struct animated_cursoricon_object *) obj; frameobj = (struct cursoricon_object *) (((char *)frame) - FIELD_OFFSET(struct static_cursoricon_object, frame)); release_user_handle_ptr( frameobj ); }

1 0

André Hentschel : rsaenh/tests: Adjust length value to pass on Win 10.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 86b1e74f5c2aabc5d4ed004737d9c2c45af9e3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b1e74f5c2aabc5d4ed00473… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 1 00:04:20 2015 +0200 rsaenh/tests: Adjust length value to pass on Win 10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/rsaenh/tests/rsaenh.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index da74ffb..439d253 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1971,8 +1971,7 @@ static void test_import_private(void) * actual buffer. The private exponent can be omitted, its length is * inferred from the passed-in length parameter. */ - dwLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + - rsaPubKey->bitlen / 8 + 5 * rsaPubKey->bitlen / 16; + dwLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + rsaPubKey->bitlen / 2; for (; dwLen < sizeof(abPlainPrivateKey); dwLen++) { result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey);

1 0

Alexandre Julliard : patches: Add support for new bug statuses in regression page.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: tools Branch: master Commit: e1b5ff7e49bff9e0746663a5dfc8cde2ca9a2aeb URL: http://source.winehq.org/git/tools.git/?a=commit;h=e1b5ff7e49bff9e0746663a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 17:53:26 2015 +0900 patches: Add support for new bug statuses in regression page. --- patches/update-regressions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/update-regressions b/patches/update-regressions index 0502878..65eb263 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -44,7 +44,7 @@ sub read_bugs() { my $csv = Text::CSV::Encoded->new({ binary => 1 }); - open LIST, "-|", "wget", "-qO-", "http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bu…" or die "cannot query bug list"; + open LIST, "-|", "wget", "-qO-", "http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bu…" or die "cannot query bug list"; <LIST>; # skip header line while (<LIST>)

1 0

Alexandre Julliard : Update bug lists for new bug statuses.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: bugzilla Branch: master Commit: 9e9048fbdff7fa2ca5eb5f20ccd64c0fdc872109 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=9e9048fbdff7fa2ca5eb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 17:45:49 2015 +0900 Update bug lists for new bug statuses. --- template/en/default/global/sidebar.html.tmpl | 12 +++++------- template/en/default/index.html.tmpl | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 54e9b79..d00bf4c 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,9 +23,9 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] [% IF user.id %] @@ -90,11 +90,9 @@ bt = 'Bug Lists' %] <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=REOPENED&cmdtype=doit&order=Bug+Number" class=menuItem>Available</a></li> - <li><a href="buglist.cgi?bug_status=UNCONFIRMED" class=menuItem>Unconfirmed</a></li> - <li><a href="buglist.cgi?bug_status=NEW" class=menuItem>New</a></li> <li><a href="buglist.cgi?bug_status=ASSIGNED" class=menuItem>Assigned</a></li> + <li><a href="buglist.cgi?bug_status=NEEDINFO" class=menuItem>NeedInfo</a></li> + <li><a href="buglist.cgi?bug_status=STAGED" class=menuItem>Staged</a></li> <li><a href="buglist.cgi?bug_status=RESOLVED" class=menuItem>Resolved</a></li> - <li><a href="buglist.cgi?bug_status=VERIFIED" class=menuItem>Verified</a></li> - <li><a href="buglist.cgi?bug_status=CLOSED" class=menuItem>Closed</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index a099e31..5d5b1b8 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,15 +150,15 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a> These bugs are scheduled to be fixed before Wine 1.8 is released. </li> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a> Bugs introduced as result of a regression. </li> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a> Bugs in downloadable Applications. </li>

1 0

Aric Stewart : usp10/tests: Catch case where enumerated font name is too long.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 0072188b69df43460d213f12efe06bb17720de93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0072188b69df43460d213f12e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 25 10:11:26 2015 -0500 usp10/tests: Catch case where enumerated font name is too long. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0db98d9..92b17c5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1993,6 +1993,11 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { + if (strlen((char *)efnd.elf[i].elfFullName) >= LF_FACESIZE) + { + trace("Font name to long to test: %s\n",(char *)efnd.elf[i].elfFullName); + continue; + } lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); @@ -2034,6 +2039,11 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { + if (strlen((char *)efnd.elf[i].elfFullName) >= LF_FACESIZE) + { + trace("Font name to long to test: %s\n",(char *)efnd.elf[i].elfFullName); + continue; + } lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font);

1 0

Vincent Povirk : setupapi/tests: Add tests for dirid values.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: f0009e17e44e8832ec44dce5c00ccc5c237ee981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0009e17e44e8832ec44dce5c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Sep 26 12:39:39 2015 -0500 setupapi/tests: Add tests for dirid values. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/setupapi/tests/install.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index a98cbec..10161f0 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -720,6 +720,55 @@ static void test_inffilelist(void) RemoveDirectoryA(dirA); } +static const char dirid_inf[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "AddReg=Add.Settings\n" + "[Add.Settings]\n" + "HKCU,Software\\Wine\\setupapitest,dirid,,%%%i%%\n"; + +static void check_dirid(int dirid, LPCSTR expected) +{ + char buffer[sizeof(dirid_inf)+11]; + char path[MAX_PATH], actual[MAX_PATH]; + LONG ret; + DWORD size; + + sprintf(buffer, dirid_inf, dirid); + + create_inf_file(inffile, buffer); + + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); + + size = sizeof(actual); + ret = RegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", "dirid", + RRF_RT_REG_SZ|RRF_ZEROONFAILURE, NULL, &actual, &size); + ok(ret == ERROR_SUCCESS, "Failed getting value for dirid %i, err=%d\n", dirid, ret); + ok(!strcmp(actual, expected), "Expected path for dirid %i was \"%s\", got \"%s\"\n", dirid, expected, actual); + + ok_registry(TRUE); + ret = DeleteFileA(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); +} + +/* Test dirid values */ +static void test_dirid(void) +{ + char expected[MAX_PATH]; + + check_dirid(DIRID_NULL, ""); + + GetWindowsDirectoryA(expected, MAX_PATH); + check_dirid(DIRID_WINDOWS, expected); + + GetSystemDirectoryA(expected, MAX_PATH); + check_dirid(DIRID_SYSTEM, expected); + + strcat(expected, "\\unknown"); + check_dirid(40, expected); +} + START_TEST(install) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -770,6 +819,7 @@ START_TEST(install) test_registry(); test_install_svc_from(); test_driver_install(); + test_dirid(); UnhookWindowsHookEx(hhook);

1 0

Nikolay Sivov : gdi32/freetype: Handle fonts with broken usWinDescent values.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: af5884ffe5a8ba50630cf8e180ddb4d700d8117a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5884ffe5a8ba50630cf8e18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 27 22:52:56 2015 +0300 gdi32/freetype: Handle fonts with broken usWinDescent values. --- dlls/gdi32/freetype.c | 20 +++++++++++++++----- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 60ffc45..8e89cc5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4185,6 +4185,13 @@ BOOL WineEngInit(void) return TRUE; } +/* Some fonts have large usWinDescent values, as a result of storing signed short + in unsigned field. That's probably caused by sTypoDescent vs usWinDescent confusion in + some font generation tools. */ +static inline USHORT get_fixed_windescent(USHORT windescent) +{ + return abs((SHORT)windescent); +} static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) { @@ -4214,12 +4221,13 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) */ if(height > 0) { - if(pOS2->usWinAscent + pOS2->usWinDescent == 0) + USHORT windescent = get_fixed_windescent(pOS2->usWinDescent); + if(pOS2->usWinAscent + windescent == 0) ppem = MulDiv(ft_face->units_per_EM, height, pHori->Ascender - pHori->Descender); else ppem = MulDiv(ft_face->units_per_EM, height, - pOS2->usWinAscent + pOS2->usWinDescent); + pOS2->usWinAscent + windescent); if(ppem > MAX_PPEM) { WARN("Ignoring too large height %d, ppem %d\n", height, ppem); ppem = 1; @@ -7340,6 +7348,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) WCHAR *family_nameW, *style_nameW, *face_nameW, *full_nameW; char *cp; INT ascent, descent; + USHORT windescent; TRACE("font=%p\n", font); @@ -7408,7 +7417,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) pPost = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_post); /* we can live with this failing */ - TRACE("OS/2 winA = %d winD = %d typoA = %d typoD = %d typoLG = %d avgW %d FT_Face a = %d, d = %d, h = %d: HORZ a = %d, d = %d lg = %d maxY = %ld minY = %ld\n", + TRACE("OS/2 winA = %u winD = %u typoA = %d typoD = %d typoLG = %d avgW %d FT_Face a = %d, d = %d, h = %d: HORZ a = %d, d = %d lg = %d maxY = %ld minY = %ld\n", pOS2->usWinAscent, pOS2->usWinDescent, pOS2->sTypoAscender, pOS2->sTypoDescender, pOS2->sTypoLineGap, pOS2->xAvgCharWidth, @@ -7421,12 +7430,13 @@ static BOOL get_outline_text_metrics(GdiFont *font) #define TM font->potm->otmTextMetrics - if(pOS2->usWinAscent + pOS2->usWinDescent == 0) { + windescent = get_fixed_windescent(pOS2->usWinDescent); + if(pOS2->usWinAscent + windescent == 0) { ascent = pHori->Ascender; descent = -pHori->Descender; } else { ascent = pOS2->usWinAscent; - descent = pOS2->usWinDescent; + descent = windescent; } font->ntmCellHeight = ascent + descent; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cdc7726..e04ee1e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3718,7 +3718,7 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) TEXTMETRICW tmW; ascent = GET_BE_WORD(tt_os2.usWinAscent); - descent = GET_BE_WORD(tt_os2.usWinDescent); + descent = abs((SHORT)GET_BE_WORD(tt_os2.usWinDescent)); cell_height = ascent + descent; ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", font_name, ntm->ntmCellHeight, cell_height, ascent, descent);

1 0

Nikolay Sivov : dwrite: Handle fonts with broken usWinDescent values.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 5cb954aa6aa60464a364b645227a3d00d2295740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb954aa6aa60464a364b6452… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 27 22:53:42 2015 +0300 dwrite: Handle fonts with broken usWinDescent values. --- dlls/dwrite/opentype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fd471ef..82e0a9c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -960,7 +960,9 @@ void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_T USHORT version = GET_BE_WORD(tt_os2->version); metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); - metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); + /* Some fonts have usWinDescent value stored as signed short, which could be wrongly + interpreted as large unsigned value. */ + metrics->descent = abs((SHORT)GET_BE_WORD(tt_os2->usWinDescent)); /* line gap is estimated using two sets of ascender/descender values and 'hhea' line gap */ if (tt_hhea) {

1 0

Andrew Eikum : xaudio2: Implement IXAudio2MasteringVoice::GetVoiceDetails.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: b28b4cc18d412697aeedfa955b7cba0c15f2deb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28b4cc18d412697aeedfa955… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:55:53 2015 -0500 xaudio2: Implement IXAudio2MasteringVoice::GetVoiceDetails. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 8b41cbb..673f53d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1132,6 +1132,9 @@ static void WINAPI XA2M_GetVoiceDetails(IXAudio2MasteringVoice *iface, { IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pVoiceDetails); + pVoiceDetails->CreationFlags = 0; + pVoiceDetails->InputChannels = This->fmt.Format.nChannels; + pVoiceDetails->InputSampleRate = This->fmt.Format.nSamplesPerSec; } static HRESULT WINAPI XA2M_SetOutputVoices(IXAudio2MasteringVoice *iface,

1 0