February 2014 - Wine-commits

Jacek Caban : wmp: Added IWMPPlayer4 stub implementation.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: b0b6728cf1ce323aa0198473e5210c2ec442a788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b6728cf1ce323aa0198473e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 19 17:51:52 2014 +0100 wmp: Added IWMPPlayer4 stub implementation. --- dlls/wmp/Makefile.in | 1 + dlls/wmp/oleobj.c | 26 ++-- dlls/wmp/player.c | 406 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 15 ++ 4 files changed, 436 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0b6728cf1ce323aa0198…

1 0

Alexandre Julliard : kernel32: Fix build on older Mac OS X.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: a0d6c8c2499c63c8a3ca18a01214a078ecee3053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d6c8c2499c63c8a3ca18a01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 19 11:35:16 2014 +0100 kernel32: Fix build on older Mac OS X. --- dlls/kernel32/heap.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 1c38ae5..8b38119 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1164,14 +1164,6 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #ifdef VM_SWAPUSAGE struct xsw_usage swap; #endif -#ifdef HAVE_MACH_MACH_H - host_name_port_t host; - mach_msg_type_number_t count; - kern_return_t kr; - host_basic_info_data_t info; - vm_statistics64_data_t vm_stat; - vm_size_t page_size; -#endif #elif defined(sun) unsigned long pagesize,maxpages,freepages,swapspace,swapfree; struct anoninfo swapinf; @@ -1238,6 +1230,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) total = 0; + lpmemex->ullAvailPhys = 0; mib[0] = CTL_HW; #ifdef HW_MEMSIZE @@ -1248,22 +1241,29 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #endif #ifdef HAVE_MACH_MACH_H - host = mach_host_self(); - - if (!total) { - count = HOST_BASIC_INFO_COUNT; - kr = host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count); - if (kr == KERN_SUCCESS) - total = info.max_mem; - } + host_name_port_t host = mach_host_self(); + mach_msg_type_number_t count; - count = HOST_VM_INFO64_COUNT; - kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count); - if (kr == KERN_SUCCESS) - kr = host_page_size(host, &page_size); +#ifdef HOST_VM_INFO64_COUNT + vm_size_t page_size; + vm_statistics64_data_t vm_stat; + + count = HOST_VM_INFO64_COUNT; + if (host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count) == KERN_SUCCESS && + host_page_size(host, &page_size == KERN_SUCCESS)) + lpmemex->ullAvailPhys = (vm_stat.free_count + vm_stat.inactive_count) * (DWORDLONG)page_size; +#endif + if (!total) + { + host_basic_info_data_t info; + count = HOST_BASIC_INFO_COUNT; + if (host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count) == KERN_SUCCESS) + total = info.max_mem; + } - mach_port_deallocate(mach_task_self(), host); + mach_port_deallocate(mach_task_self(), host); + } #endif if (!total) @@ -1277,13 +1277,6 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) if (total) lpmemex->ullTotalPhys = total; - lpmemex->ullAvailPhys = 0; - -#ifdef HAVE_MACH_MACH_H - if (kr == KERN_SUCCESS) - lpmemex->ullAvailPhys = (vm_stat.free_count + vm_stat.inactive_count) * (DWORDLONG)page_size; -#endif - if (!lpmemex->ullAvailPhys) { mib[1] = HW_USERMEM;

1 0

Frédéric Delanoy : mscoree: Use BOOL type where appropriate.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 8cdcf470016f0655dfc8810f9d4d2f2d7a7d1b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cdcf470016f0655dfc8810f9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 19 00:41:53 2014 +0100 mscoree: Use BOOL type where appropriate. --- dlls/mscoree/metahost.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6386122..61bd89e 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -718,7 +718,7 @@ static void find_runtimes(void) if (GetFileAttributesW(lib_path) != INVALID_FILE_ATTRIBUTES) { - runtimes[i].found = 1; + runtimes[i].found = TRUE; strcpyW(runtimes[i].mono_path, mono_path); strcpyW(runtimes[i].mscorlib_path, lib_path); @@ -733,7 +733,7 @@ static void find_runtimes(void) /* Report all runtimes are available if Mono isn't installed. * FIXME: Remove this when Mono is properly packaged. */ for (i=0; i<NUM_RUNTIMES; i++) - runtimes[i].found = 1; + runtimes[i].found = TRUE; } runtimes_initialized = TRUE; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f76dd78..a451344 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -64,7 +64,7 @@ typedef struct CLRRuntimeInfo DWORD major; DWORD minor; DWORD build; - int found; + BOOL found; WCHAR mono_path[MAX_PATH]; WCHAR mscorlib_path[MAX_PATH]; struct RuntimeHost *loaded_runtime;

1 0

Frédéric Delanoy : mscoree/tests: Use BOOL type where appropriate.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 77c191786aa56ce10774ec01f11a1739611ca6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c191786aa56ce10774ec01f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 19 00:41:54 2014 +0100 mscoree/tests: Use BOOL type where appropriate. --- dlls/mscoree/tests/mscoree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 852944f..fcea603 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -34,7 +34,7 @@ static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); static HRESULT (WINAPI *pCreateConfigStream)(LPCWSTR, IStream**); static HRESULT (WINAPI *pCreateInterface)(REFCLSID, REFIID, VOID**); -static int no_legacy_runtimes; +static BOOL no_legacy_runtimes; static BOOL init_functionpointers(void) { @@ -87,7 +87,7 @@ static void test_versioninfo(void) hr = pGetCORVersion(version, 1, &size); if (hr == CLR_E_SHIM_RUNTIME) { - no_legacy_runtimes = 1; + no_legacy_runtimes = TRUE; win_skip("No legacy .NET runtimes are installed\n"); return; }

1 0

Jacek Caban : d3d10_1.idl: Added D3D10CreateDevice1 declaration.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 64e11e0f981108b7bd16c8f8d4a7e13692cefd0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e11e0f981108b7bd16c8f8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 19 11:14:59 2014 +0100 d3d10_1.idl: Added D3D10CreateDevice1 declaration. --- include/d3d10_1.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index 3b6e624..bfae754 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -124,3 +124,6 @@ interface ID3D10Device1 : ID3D10Device } const UINT D3D10_1_SDK_VERSION = 0x20; + +cpp_quote("HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter*,D3D10_DRIVER_TYPE,") +cpp_quote(" HMODULE,UINT,D3D10_FEATURE_LEVEL1,UINT,ID3D10Device1**);")

1 0

Jacek Caban : d3d9.h: Added Direct3DCreate9Ex declaration.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 46923014b6288f548131cba39a11592c05efadad URL: http://source.winehq.org/git/wine.git/?a=commit;h=46923014b6288f548131cba39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 19 11:15:08 2014 +0100 d3d9.h: Added Direct3DCreate9Ex declaration. --- include/d3d9.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/d3d9.h b/include/d3d9.h index 20625b0..d5107db 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -2196,6 +2196,7 @@ void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name); /* Define the main entrypoint as well */ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion); +HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**); #ifdef __cplusplus } /* extern "C" */

1 0

Jacek Caban : dxgi.idl: Added CreateDXGIFactory1 declaration.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 800edfb869ce1aec7bacde9c8e949dd8de1182d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800edfb869ce1aec7bacde9c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 19 11:15:17 2014 +0100 dxgi.idl: Added CreateDXGIFactory1 declaration. --- include/dxgi.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index a4326a7..bb12283 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -382,6 +382,7 @@ interface IDXGIFactory : IDXGIObject } [local] HRESULT __stdcall CreateDXGIFactory(REFIID riid, void **factory); +[local] HRESULT __stdcall CreateDXGIFactory1(REFIID riid, void **factory); [ object,

1 0

Akihiro Sagawa : gdi32/tests: Mark Win2k result as broken.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: feaf554778f4de6d6e0daa465a29a5ca7e9d9ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=feaf554778f4de6d6e0daa465… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 21:02:00 2014 +0900 gdi32/tests: Mark Win2k result as broken. --- dlls/gdi32/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7e93f9d..210aeb4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5299,7 +5299,8 @@ static void check_vertical_metrics(const char *face) vgm.gmptGlyphOrigin.x, rgm.gmptGlyphOrigin.x, vgm.gmCellIncX, otm.otmDescent); } - ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent, + ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent || + broken(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB - otm.otmTextMetrics.tmDescent) /* win2k */, "got %d, expected abcA(%d) + abcB(%u) + descent(%d)\n", (INT)vgm.gmptGlyphOrigin.y, abc.abcA, abc.abcB, otm.otmDescent);

1 0

Akihiro Sagawa : gdi32/tests: Improve the font search method for test_EnumFontFamiliesEx_default_charset.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: efe7a9763f22abbd181b1edd1a34e1dda14b1b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe7a9763f22abbd181b1edd1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 21:02:02 2014 +0900 gdi32/tests: Improve the font search method for test_EnumFontFamiliesEx_default_charset. --- dlls/gdi32/tests/font.c | 56 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 210aeb4..9e1d2d1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2945,6 +2945,27 @@ else ReleaseDC(0, hdc); } +static INT CALLBACK enum_multi_charset_font_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) +{ + const NEWTEXTMETRICEXA *ntm = (const NEWTEXTMETRICEXA *)tm; + LOGFONTA *target = (LOGFONTA *)lParam; + const DWORD valid_bits = 0x003f01ff; + CHARSETINFO csi; + DWORD fs; + + if (type != TRUETYPE_FONTTYPE) return TRUE; + + if (TranslateCharsetInfo(ULongToPtr(target->lfCharSet), &csi, TCI_SRCCHARSET)) { + fs = ntm->ntmFontSig.fsCsb[0] & valid_bits; + if ((fs & csi.fs.fsCsb[0]) && (fs & ~csi.fs.fsCsb[0])) { + *target = *lf; + return FALSE; + } + } + + return TRUE; +} + static INT CALLBACK enum_font_data_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { struct enum_font_data *efd = (struct enum_font_data *)lParam; @@ -2976,33 +2997,44 @@ static INT CALLBACK enum_fullname_data_proc(const LOGFONTA *lf, const TEXTMETRIC static void test_EnumFontFamiliesEx_default_charset(void) { struct enum_font_data efd; - LOGFONTA gui_font, enum_font; + LOGFONTA target, enum_font; DWORD ret; HDC hdc; + CHARSETINFO csi; - ret = GetObjectA(GetStockObject(DEFAULT_GUI_FONT), sizeof(gui_font), &gui_font); - ok(ret, "GetObject failed.\n"); - if (!ret) + ret = GetACP(); + if (!TranslateCharsetInfo(ULongToPtr(ret), &csi, TCI_SRCCODEPAGE)) { + skip("TranslateCharsetInfo failed for code page %d.\n", ret); return; - - efd.total = 0; + } hdc = GetDC(0); memset(&enum_font, 0, sizeof(enum_font)); - strcpy(enum_font.lfFaceName, gui_font.lfFaceName); + enum_font.lfCharSet = csi.ciCharset; + target.lfFaceName[0] = '\0'; + target.lfCharSet = csi.ciCharset; + EnumFontFamiliesExA(hdc, &enum_font, enum_multi_charset_font_proc, (LPARAM)&target, 0); + if (target.lfFaceName[0] == '\0') { + skip("suitable font isn't found for charset %d.\n", enum_font.lfCharSet); + return; + } + + efd.total = 0; + memset(&enum_font, 0, sizeof(enum_font)); + strcpy(enum_font.lfFaceName, target.lfFaceName); enum_font.lfCharSet = DEFAULT_CHARSET; EnumFontFamiliesExA(hdc, &enum_font, enum_font_data_proc, (LPARAM)&efd, 0); ReleaseDC(0, hdc); - if (efd.total == 0) { - skip("'%s' is not found or not a TrueType font.\n", gui_font.lfFaceName); + trace("'%s' has %d charsets.\n", target.lfFaceName, efd.total); + if (efd.total < 2) { + ok(0, "EnumFontFamilies is broken. Expected >= 2, got %d.\n", efd.total); return; } - trace("'%s' has %d charsets.\n", gui_font.lfFaceName, efd.total); - ok(efd.lf[0].lfCharSet == gui_font.lfCharSet || broken(system_lang_id == LANG_ARABIC), + ok(efd.lf[0].lfCharSet == target.lfCharSet, "(%s) got charset %d expected %d\n", - efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet); + efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); return; }

1 0

Akihiro Sagawa : gdi32/tests: Avoid using GetGlyphIndices directly.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 1e7116ca9f0ae50ca59cd4102cfb85087d4e41b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7116ca9f0ae50ca59cd4102… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 19 21:02:04 2014 +0900 gdi32/tests: Avoid using GetGlyphIndices directly. --- dlls/gdi32/tests/font.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9e1d2d1..daa160c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5303,26 +5303,32 @@ static void check_vertical_metrics(const char *face) otm.otmSize = sizeof(otm); ret = GetOutlineTextMetricsA(hdc, sizeof(otm), &otm); ok(ret != 0, "GetOutlineTextMetricsA failed\n"); - ret = GetGlyphIndicesW(hdc, (LPCWSTR)&code, 1, &idx, 0); - ok(ret != 0, "GetGlyphIndicesW failed\n"); if (GetFontData(hdc, MS_MAKE_TAG('v','h','e','a'), sizeof(SHORT) * 17, &numOfLongVerMetrics, sizeof(numOfLongVerMetrics)) != GDI_ERROR) { int offset; SHORT topSideBearing; - numOfLongVerMetrics = GET_BE_WORD(numOfLongVerMetrics); - if (numOfLongVerMetrics > idx) - offset = idx * 2 + 1; - else - offset = numOfLongVerMetrics * 2 + (idx - numOfLongVerMetrics); - ret = GetFontData(hdc, MS_MAKE_TAG('v','m','t','x'), offset * sizeof(SHORT), - &topSideBearing, sizeof(SHORT)); - ok(ret != GDI_ERROR, "GetFontData(vmtx) failed\n"); - topSideBearing = GET_BE_WORD(topSideBearing); - ok(match_off_by_1(vgm.gmptGlyphOrigin.x, - MulDiv(topSideBearing, height, otm.otmEMSquare), FALSE), - "expected %d, got %d\n", - MulDiv(topSideBearing, height, otm.otmEMSquare), vgm.gmptGlyphOrigin.x); + + if (!pGetGlyphIndicesW) { + win_skip("GetGlyphIndices is not available on this platform\n"); + } + else { + ret = pGetGlyphIndicesW(hdc, (LPCWSTR)&code, 1, &idx, 0); + ok(ret != 0, "GetGlyphIndicesW failed\n"); + numOfLongVerMetrics = GET_BE_WORD(numOfLongVerMetrics); + if (numOfLongVerMetrics > idx) + offset = idx * 2 + 1; + else + offset = numOfLongVerMetrics * 2 + (idx - numOfLongVerMetrics); + ret = GetFontData(hdc, MS_MAKE_TAG('v','m','t','x'), offset * sizeof(SHORT), + &topSideBearing, sizeof(SHORT)); + ok(ret != GDI_ERROR, "GetFontData(vmtx) failed\n"); + topSideBearing = GET_BE_WORD(topSideBearing); + ok(match_off_by_1(vgm.gmptGlyphOrigin.x, + MulDiv(topSideBearing, height, otm.otmEMSquare), FALSE), + "expected %d, got %d\n", + MulDiv(topSideBearing, height, otm.otmEMSquare), vgm.gmptGlyphOrigin.x); + } } else { @@ -5879,6 +5885,11 @@ static void test_bitmap_font_glyph_index(void) CHARSETINFO ci; BYTE chr = '\xA9'; + if (!pGetGlyphIndicesW || !pGetGlyphIndicesA) { + win_skip("GetGlyphIndices is unavailable\n"); + return; + } + hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -5923,7 +5934,7 @@ static void test_bitmap_font_glyph_index(void) { int len = lstrlenW(text); LPWORD indices = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WORD)); - ret = GetGlyphIndicesW(hdc, text, len, indices, 0); + ret = pGetGlyphIndicesW(hdc, text, len, indices, 0); ok(ret, "GetGlyphIndices failed\n"); ok(memcmp(indices, text, sizeof(WORD) * len) == 0, "Glyph indices and text are different for %s:%d\n", lf.lfFaceName, tm.tmCharSet); @@ -5959,7 +5970,7 @@ static void test_bitmap_font_glyph_index(void) ret = ExtTextOutA(hdc, 100, 0, 0, NULL, (LPCSTR)&chr, 1, NULL); break; case 1: - ret = GetGlyphIndicesA(hdc, (LPCSTR)&chr, 1, &code, 0); + ret = pGetGlyphIndicesA(hdc, (LPCSTR)&chr, 1, &code, 0); ok(ret, "GetGlyphIndices failed\n"); ok(code == chr, "expected %02x, got %02x (%s:%d)\n", chr, code, lf.lfFaceName, tm.tmCharSet); ret = ExtTextOutA(hdc, 100, 0, ETO_GLYPH_INDEX, NULL, (LPCSTR)&code, 1, NULL);

1 0