January 2014 - Wine-Commits

Akihiro Sagawa : gdi32: Relax vertical face requirements.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: ebccff822576cbff2b4401c74d83912d637a7026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebccff822576cbff2b4401c74… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 9 21:07:45 2014 +0900 gdi32: Relax vertical face requirements. --- dlls/gdi32/freetype.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fda54aa..4be2978 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2148,6 +2148,9 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ #endif /* HAVE_CARBON_CARBON_H */ do { + const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; + FONTSIGNATURE fs; + ft_face = new_ft_face( file, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); if (!ft_face) return 0; @@ -2161,7 +2164,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags); ++ret; - if (FT_HAS_VERTICAL(ft_face)) + get_fontsig(ft_face, &fs); + if (fs.fsCsb[0] & FS_DBCS_MASK) { AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags | ADDFONT_VERTICAL_FONT);

1 0

Akihiro Sagawa : gdi32: Fix DBCS mask value in GetFontLanguageInfo.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 142a0f7af0585223251d533f4b5b061831c85a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142a0f7af0585223251d533f4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 9 21:07:43 2014 +0900 gdi32: Fix DBCS mask value in GetFontLanguageInfo. --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fcb024b..0dfd5b1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3023,7 +3023,7 @@ BOOL WINAPI TranslateCharsetInfo( DWORD WINAPI GetFontLanguageInfo(HDC hdc) { FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=FS_THAI|FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, + static const DWORD GCP_DBCS_MASK=FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, GCP_DIACRITIC_MASK=0x00000000, FLI_GLYPHS_MASK=0x00000000, GCP_GLYPHSHAPE_MASK=FS_ARABIC,

1 0

Akihiro Sagawa : gdi32: Use defined names in GetFontLanguageInfo.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: ab32c657ed769ba7af399d9da934991891945acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab32c657ed769ba7af399d9da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 9 21:07:41 2014 +0900 gdi32: Use defined names in GetFontLanguageInfo. --- dlls/gdi32/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a025d17..fcb024b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3023,14 +3023,14 @@ BOOL WINAPI TranslateCharsetInfo( DWORD WINAPI GetFontLanguageInfo(HDC hdc) { FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=0x003F0000, + static const DWORD GCP_DBCS_MASK=FS_THAI|FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, GCP_DIACRITIC_MASK=0x00000000, FLI_GLYPHS_MASK=0x00000000, - GCP_GLYPHSHAPE_MASK=0x00000040, + GCP_GLYPHSHAPE_MASK=FS_ARABIC, GCP_KASHIDA_MASK=0x00000000, GCP_LIGATE_MASK=0x00000000, GCP_USEKERNING_MASK=0x00000000, - GCP_REORDER_MASK=0x00000060; + GCP_REORDER_MASK=FS_HEBREW|FS_ARABIC; DWORD result=0;

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 91f2435469fb812bc3cf14f9612756c11c8c248d URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f2435469fb812bc3cf14f96… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 9 15:02:45 2014 +0100 Assorted spelling fixes. --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/lsa.c | 2 +- dlls/crypt32/tests/encode.c | 4 ++-- dlls/d3d10core/inputlayout.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/dbghelp/storage.c | 2 +- dlls/gdi32/freetype.c | 2 +- dlls/kernel32/tests/file.c | 18 +++++++++--------- dlls/localspl/provider.c | 4 ++-- dlls/msxml3/tests/domdoc.c | 4 ++-- dlls/shell32/shellole.c | 2 +- dlls/version/version.c | 2 +- dlls/wined3d/surface.c | 4 ++-- tools/winedump/lnk.c | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91f2435469fb812bc3cf1…

1 0

Erich E. Hoover : ddraw: Make DirectDrawEnumerateEx only enumerate secondary display devices when requested.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 639f9335c2405832b9962a4bc5b95b053bf596a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639f9335c2405832b9962a4bc… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Jan 8 15:02:28 2014 -0700 ddraw: Make DirectDrawEnumerateEx only enumerate secondary display devices when requested. --- dlls/ddraw/main.c | 61 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e613126..2e61b0c 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -59,6 +59,36 @@ static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *drive return info->callback(guid, description, driver_name, info->context); } +static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMCALLBACKEXA callback, + void *context) +{ + static CHAR driver_desc[] = "DirectDraw HAL"; + struct wined3d_adapter_identifier adapter_id; + BOOL cont_enum = TRUE; + HRESULT hr = S_OK; + UINT adapter = 0; + + for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) + { + char DriverName[512] = ""; + + /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the + * Driver Name, so obtain the DeviceName and GUID from D3D. */ + memset(&adapter_id, 0x0, sizeof(adapter_id)); + adapter_id.device_name = DriverName; + adapter_id.device_name_size = sizeof(DriverName); + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); + wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); + cont_enum = callback(&adapter_id.device_identifier, driver_desc, adapter_id.device_name, + context, 0); + } + } +} + /* Handle table functions */ BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size) { @@ -373,8 +403,8 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex DDENUM_NONDISPLAYDEVICES)) return DDERR_INVALIDPARAMS; - if (flags) - FIXME("flags 0x%08x not handled\n", flags); + if (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES) + FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES); TRACE("Enumerating ddraw interfaces\n"); if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) @@ -393,33 +423,14 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex /* QuickTime expects the description "DirectDraw HAL" */ static CHAR driver_desc[] = "DirectDraw HAL", driver_name[] = "display"; - struct wined3d_adapter_identifier adapter_id; - HRESULT hr = S_OK; - UINT adapter = 0; BOOL cont_enum; - /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ TRACE("Default interface: DirectDraw HAL\n"); cont_enum = callback(NULL, driver_desc, driver_name, context, 0); - for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) - { - char DriverName[512] = ""; - - /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the - * Driver Name, so obtain the DeviceName and GUID from D3D. */ - memset(&adapter_id, 0x0, sizeof(adapter_id)); - adapter_id.device_name = DriverName; - adapter_id.device_name_size = sizeof(DriverName); - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); - wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); - cont_enum = callback(&adapter_id.device_identifier, driver_desc, - adapter_id.device_name, context, 0); - } - } + + /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ + if (cont_enum && (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES)) + ddraw_enumerate_secondary_devices(wined3d, callback, context); } __EXCEPT_PAGE_FAULT {

1 0

Dmitry Timoshkov : cabarc: Fix printing of a not recognized compression type argument.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: dcc057c686dce5b1cc492825091bfbaddeff3f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc057c686dce5b1cc4928250… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 9 22:32:44 2014 +0900 cabarc: Fix printing of a not recognized compression type argument. --- programs/cabarc/cabarc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 032aab2..c49796d 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -666,7 +666,8 @@ int wmain( int argc, WCHAR *argv[] ) else if (!strcmpiW( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else { - WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", optarg ); + char *arg = strdupWtoA( CP_ACP, argv[1] ); + WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", arg); return 1; } break;

1 0

Alexandre Julliard : gdi32/tests: Don't test unreliable palette entries.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: eba26475fb49fc59f05562bbe4993097c70cd8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba26475fb49fc59f05562bbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 16:02:14 2014 +0100 gdi32/tests: Don't test unreliable palette entries. --- dlls/gdi32/tests/palette.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 71da6f9..f95c0d3 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -162,10 +162,10 @@ static void test_halftone_palette(void) ok( count == 256 || broken(count <= 20), /* nt 4 */ "wrong size %u\n", count ); - /* first and last 10 match the default palette */ + /* first and last 8 match the default palette */ if (count >= 20) { - for (i = 0; i < 10; i++) + for (i = 0; i < 8; i++) { ok( entries[i].peRed == defpal[i].peRed && entries[i].peGreen == defpal[i].peGreen && @@ -175,7 +175,7 @@ static void test_halftone_palette(void) entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); } - for (i = count - 10; i < count; i++) + for (i = count - 8; i < count; i++) { int idx = i - count + 20; ok( entries[i].peRed == defpal[idx].peRed &&

1 0

Piotr Caban : msvcrt/tests: Fix crash in mbstowcs tests.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 1d4ac6dc1e2e5d6b26a3ff31c32ba9fbcbc0c3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4ac6dc1e2e5d6b26a3ff31c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 9 17:34:05 2014 +0100 msvcrt/tests: Fix crash in mbstowcs tests. --- dlls/msvcrt/tests/string.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 800a06b..71b6815 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1635,10 +1635,13 @@ static void test_mbstowcs(void) wOut[4] = '!'; wOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0'; - errno = 0xdeadbeef; - ret = mbstowcs(wOut, NULL, 4); - ok(ret == -1, "mbstowcs did not return -1\n"); - ok(errno == EINVAL, "errno = %d\n", errno); + if(pmbstowcs_s) { + /* crashes on some systems */ + errno = 0xdeadbeef; + ret = mbstowcs(wOut, NULL, 4); + ok(ret == -1, "mbstowcs did not return -1\n"); + ok(errno == EINVAL, "errno = %d\n", errno); + } ret = mbstowcs(NULL, mSimple, 0); ok(ret == 4, "mbstowcs did not return 4\n");

1 0

Alexandre Julliard : ntdll/tests: Fix a test that fails on Win2k.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: 406587898f4bc077d4e2e353ab73998bf2baadaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=406587898f4bc077d4e2e353a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 9 16:01:59 2014 +0100 ntdll/tests: Fix a test that fails on Win2k. --- dlls/ntdll/tests/string.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 7b56691..56b7584 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1281,12 +1281,15 @@ static void test__snprintf(void) int res; res = p__snprintf(NULL, 0, teststring); - ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); - - res = p__snprintf(NULL, 1, teststring); - ok(res == lstrlenA(teststring) /* WinXP */ || res < 0 /* Vista and greater */, - "_snprintf returned %d, expected %d or < 0.\n", res, lstrlenA(teststring)); + ok(res == lstrlenA(teststring) || broken(res == -1) /* <= w2k */, + "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + if (res != -1) + { + res = p__snprintf(NULL, 1, teststring); + ok(res == lstrlenA(teststring) /* WinXP */ || res < 0 /* Vista and greater */, + "_snprintf returned %d, expected %d or < 0.\n", res, lstrlenA(teststring)); + } res = p__snprintf(buffer, strlen(teststring) - 1, teststring); ok(res < 0, "_snprintf returned %d, expected < 0.\n", res);

1 0

Erich E. Hoover : ddraw: Make DirectDrawEnumerateEx report the driver description.
by Alexandre Julliard Jan. 9, 2014

Jan. 9, 2014

Module: wine Branch: master Commit: eba5132bfa351b52fdec513a532450497306b09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba5132bfa351b52fdec513a5… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Jan 8 15:02:47 2014 -0700 ddraw: Make DirectDrawEnumerateEx report the driver description. --- dlls/ddraw/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2e61b0c..2dd0393 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -62,7 +62,6 @@ static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *drive static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMCALLBACKEXA callback, void *context) { - static CHAR driver_desc[] = "DirectDraw HAL"; struct wined3d_adapter_identifier adapter_id; BOOL cont_enum = TRUE; HRESULT hr = S_OK; @@ -70,21 +69,23 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) { - char DriverName[512] = ""; + char DriverName[512] = "", DriverDescription[512] = ""; /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the * Driver Name, so obtain the DeviceName and GUID from D3D. */ memset(&adapter_id, 0x0, sizeof(adapter_id)); adapter_id.device_name = DriverName; adapter_id.device_name_size = sizeof(DriverName); + adapter_id.description = DriverDescription; + adapter_id.description_size = sizeof(DriverDescription); wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) { TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); - cont_enum = callback(&adapter_id.device_identifier, driver_desc, adapter_id.device_name, - context, 0); + cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, + adapter_id.device_name, context, 0); } } }

1 0