August 2015 - Wine-Commits - list.winehq.org

Bruno Jesus : msvidc32: Improve trace messages from CRAM_DecompressQuery.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 59222af9c5d3c89a5dc2ab8f652b57f5847bc227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59222af9c5d3c89a5dc2ab8f6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 23 20:48:54 2015 +0800 msvidc32: Improve trace messages from CRAM_DecompressQuery. --- dlls/msvidc32/msvideo1.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 49f9700..61baa9e 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -299,16 +299,19 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) return ICERR_BADPARAM; - TRACE("planes = %d\n", in->bmiHeader.biPlanes ); - TRACE("bpp = %d\n", in->bmiHeader.biBitCount ); - TRACE("height = %d\n", in->bmiHeader.biHeight ); - TRACE("width = %d\n", in->bmiHeader.biWidth ); - TRACE("compr = %x\n", in->bmiHeader.biCompression ); + TRACE("in->planes = %d\n", in->bmiHeader.biPlanes ); + TRACE("in->bpp = %d\n", in->bmiHeader.biBitCount ); + TRACE("in->height = %d\n", in->bmiHeader.biHeight ); + TRACE("in->width = %d\n", in->bmiHeader.biWidth ); + TRACE("in->compr = 0x%x\n", in->bmiHeader.biCompression ); if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) && ( in->bmiHeader.biCompression != WHAM_MAGIC ) ) + { + TRACE("can't do 0x%x compression\n", in->bmiHeader.biCompression); return ICERR_BADFORMAT; + } if( ( in->bmiHeader.biBitCount != 16 ) && ( in->bmiHeader.biBitCount != 8 ) ) @@ -320,18 +323,21 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) /* output must be same dimensions as input */ if( out ) { - if( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) - return ICERR_BADFORMAT; - if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) - return ICERR_BADFORMAT; - if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) - return ICERR_BADFORMAT; - if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) + TRACE("out->planes = %d\n", out->bmiHeader.biPlanes ); + TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount ); + TRACE("out->height = %d\n", out->bmiHeader.biHeight ); + TRACE("out->width = %d\n", out->bmiHeader.biWidth ); + if(( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) || + ( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) || + ( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) || + ( in->bmiHeader.biWidth != out->bmiHeader.biWidth )) + { + TRACE("incompatible output requested\n"); return ICERR_BADFORMAT; + } } TRACE("OK!\n"); - return ICERR_OK; }

1 0

Nikolay Sivov : dwrite: Use proper pixel format when accessing dib memory directly.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: f52ef006cdae2e83d392aee0e0f8e3c547c79221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52ef006cdae2e83d392aee0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 24 12:01:06 2015 +0300 dwrite: Use proper pixel format when accessing dib memory directly. --- dlls/dwrite/gdiinterop.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 8ef38e2..ea745c5 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -299,6 +299,11 @@ static void blit_subpixel_888(struct dib_data *dib, int dib_width, const BYTE *s } } +static inline DWORD colorref_to_pixel_888(COLORREF color) +{ + return (((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000)); +} + static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *iface, FLOAT originX, FLOAT originY, DWRITE_MEASURING_MODE measuring_mode, DWRITE_GLYPH_RUN const *run, IDWriteRenderingParams *params, COLORREF color, @@ -412,6 +417,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac UINT32 size = (target.right - target.left) * (target.bottom - target.top); BYTE *bitmap; + color = colorref_to_pixel_888(color); if (texturetype == DWRITE_TEXTURE_CLEARTYPE_3x1) size *= 3; bitmap = heap_alloc_zero(size);

1 0

Nikolay Sivov : user32/tests: Fix a test failure on Win8/Win10.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 873e12c87b65fcccbe3172d9295e4db3bc60bc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=873e12c87b65fcccbe3172d92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 22 12:19:56 2015 +0300 user32/tests: Fix a test failure on Win8/Win10. --- dlls/user32/tests/win.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9f6c224..10aa545 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6436,10 +6436,12 @@ static void test_layered_window(void) ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" ); sz.cx--; + SetLastError(0); ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( !ret, "UpdateLayeredWindowIndirect should fail\n" ); - ok( GetLastError() == ERROR_INCORRECT_SIZE || broken(GetLastError() == ERROR_MR_MID_NOT_FOUND), - "wrong error %u\n", GetLastError() ); + /* particular error code differs from version to version, could be ERROR_INCORRECT_SIZE, + ERROR_MR_MID_NOT_FOUND or ERROR_GEN_FAILURE (Win8/Win10) */ + ok( GetLastError() != 0, "wrong error %u\n", GetLastError() ); info.dwFlags = ULW_OPAQUE; ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" );

1 0

Andrew Eikum : xaudio2: Stub IXAudio2SubmixVoice.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 8027a5268eb6038e24b795adc97905cceea01f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8027a5268eb6038e24b795adc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 21 11:22:03 2015 -0500 xaudio2: Stub IXAudio2SubmixVoice. --- dlls/xaudio2_7/xaudio_dll.c | 242 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8027a5268eb6038e24b79…

1 0

Nikolay Sivov : kernel32/tests: Fix GetGeoInfo() test failure on Win10.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: cc2bc84d146d9cf8239fd63b1fa14ef5ba8cfab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2bc84d146d9cf8239fd63b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 22 09:18:58 2015 +0300 kernel32/tests: Fix GetGeoInfo() test failure on Win10. --- dlls/kernel32/tests/locale.c | 2 +- include/winnls.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 061e331..86adcdb 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4242,7 +4242,7 @@ static void test_GetGeoInfo(void) /* try invalid type value */ SetLastError(0xdeadbeef); - ret = pGetGeoInfoA(203, GEO_PARENT + 1, NULL, 0, 0); + ret = pGetGeoInfoA(203, GEO_CURRENCYSYMBOL + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %d\n", GetLastError()); } diff --git a/include/winnls.h b/include/winnls.h index bf5431f..0f68c81 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -807,7 +807,10 @@ enum SYSGEOTYPE GEO_TIMEZONES, GEO_OFFICIALLANGUAGES, GEO_ISO_UN_NUMBER, - GEO_PARENT + GEO_PARENT, + GEO_DIALINGCODE, + GEO_CURRENCYCODE, + GEO_CURRENCYSYMBOL }; enum SYSGEOCLASS

1 0

Nikolay Sivov : usp10/tests: Fix some tests failures caused by Tahoma changes (Win10).
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: f01bab5be1485b59cfca6947e921fb18f6ba3a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01bab5be1485b59cfca6947e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 22 12:05:43 2015 +0300 usp10/tests: Fix some tests failures caused by Tahoma changes (Win10). --- dlls/usp10/tests/usp10.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f9b43d1..b5d43f7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -928,6 +928,7 @@ static void test_ScriptShapeOpenType(HDC hdc) int nb, outnItems; HFONT hfont, hfont_orig; int test_valid; + shapeTest_glyph glyph_test[4]; static const WCHAR test1[] = {'w', 'i', 'n', 'e',0}; static const shapeTest_char t1_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}}}; @@ -1186,7 +1187,16 @@ static void test_ScriptShapeOpenType(HDC hdc) ScriptFreeCache(&sc); test_shape_ok(hdc, test1, 4, &Control, &State, 0, 4, t1_c, t1_g); - test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, t2_g); + + /* newer Tahoma has zerowidth space glyphs for 0x202b and 0x202c */ + memcpy(glyph_test, t2_g, sizeof(glyph_test)); + GetGlyphIndicesW(hdc, test2, 4, glyphs, 0); + if (glyphs[0] != 0) + glyph_test[0].Glyph = 1; + if (glyphs[3] != 0) + glyph_test[3].Glyph = 1; + + test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, glyph_test); test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 11, test_hebrew[0], &hfont, &hfont_orig); if (hfont != NULL) @@ -1331,7 +1341,7 @@ static void test_ScriptShape(HDC hdc) static const WCHAR test2[] = {0x202B, 'i', 'n', 0x202C,0}; HRESULT hr; SCRIPT_CACHE sc = NULL; - WORD glyphs[4], glyphs2[4], logclust[4]; + WORD glyphs[4], glyphs2[4], logclust[4], glyphs3[4]; SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[2]; int nb, i, j; @@ -1392,13 +1402,17 @@ static void test_ScriptShape(HDC hdc) sc = NULL; memset(glyphs2,-1,sizeof(glyphs2)); + memset(glyphs3,-1,sizeof(glyphs3)); memset(logclust,-1,sizeof(logclust)); memset(attrs,-1,sizeof(attrs)); + + GetGlyphIndicesW(hdc, test2, 4, glyphs3, 0); + hr = ScriptShape(hdc, &sc, test2, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); ok(nb == 4, "Wrong number of items\n"); - ok(glyphs2[0] == 0 || broken(glyphs2[0] == 0x80), "Incorrect glyph for 0x202B\n"); - ok(glyphs2[3] == 0 || broken(glyphs2[3] == 0x80), "Incorrect glyph for 0x202C\n"); + ok(glyphs2[0] == glyphs3[0], "Incorrect glyph for 0x202B\n"); + ok(glyphs2[3] == glyphs3[3], "Incorrect glyph for 0x202C\n"); ok(logclust[0] == 0, "clusters out of order\n"); ok(logclust[1] == 1, "clusters out of order\n"); ok(logclust[2] == 2, "clusters out of order\n"); @@ -1812,13 +1826,19 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); + /* ScriptGetCMap returns whatever font defines, no special treatment for control chars */ cInChars = cChars = 4; + GetGlyphIndicesW(hdc, TestItem2, cInChars, pwOutGlyphs2, 0); + hr = ScriptGetCMap(hdc, &psc, TestItem2, cInChars, dwFlags, pwOutGlyphs3); - ok (hr == S_FALSE, "ScriptGetCMap should return S_FALSE not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok(pwOutGlyphs3[0] == 0 || broken(pwOutGlyphs3[0] == 0x80), "Glyph 0 should be default glyph\n"); - ok(pwOutGlyphs3[3] == 0 || broken(pwOutGlyphs3[0] == 0x80), "Glyph 0 should be default glyph\n"); + if (pwOutGlyphs3[0] == 0 || pwOutGlyphs3[3] == 0) + ok(hr == S_FALSE, "ScriptGetCMap should return S_FALSE not (%08x)\n", hr); + else + ok(hr == S_OK, "ScriptGetCMap should return S_OK not (%08x)\n", hr); + ok(psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok(pwOutGlyphs3[0] == pwOutGlyphs2[0], "expected glyph %d, got %d\n", pwOutGlyphs2[0], pwOutGlyphs3[0]); + ok(pwOutGlyphs3[3] == pwOutGlyphs2[3], "expected glyph %d, got %d\n", pwOutGlyphs2[3], pwOutGlyphs3[3]); cInChars = cChars = 9; hr = ScriptGetCMap(hdc, &psc, TestItem3b, cInChars, dwFlags, pwOutGlyphs2);

1 0

Nikolay Sivov : dwrite: Handle QI failure (Coverity).
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 4a1e6227ed5ddd6446006e5ebf53feb92ca40844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1e6227ed5ddd6446006e5eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 22 21:07:17 2015 +0300 dwrite: Handle QI failure (Coverity). --- dlls/dwrite/font.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a0596ea..f86a908 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3597,8 +3597,13 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW BOOL is_rtl, nohint; FLOAT origin_x; UINT32 i, size; + HRESULT hr; - IDWriteFontFace_QueryInterface(analysis->run.fontFace, &IID_IDWriteFontFace2, (void**)&fontface2); + hr = IDWriteFontFace_QueryInterface(analysis->run.fontFace, &IID_IDWriteFontFace2, (void**)&fontface2); + if (FAILED(hr)) { + WARN("failed to get IDWriteFontFace2, 0x%08x\n", hr); + return; + } nohint = analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL || analysis->rendering_mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC;

1 0

Nikolay Sivov : dwrite: Handle failure when getting texture bounds ( Coverity).
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 3ffe6ab0bb23cdcb2e1915ffd1629bcb288dd61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ffe6ab0bb23cdcb2e1915ffd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 22 21:06:29 2015 +0300 dwrite: Handle failure when getting texture bounds (Coverity). --- dlls/dwrite/gdiinterop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 6f96656..8ef38e2 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -401,6 +401,10 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &bounds); if (FAILED(hr) || IsRectEmpty(&bounds)) { hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &bounds); + if (FAILED(hr)) { + WARN("GetAlphaTextureBounds() failed, 0x%08x\n", hr); + return hr; + } texturetype = DWRITE_TEXTURE_CLEARTYPE_3x1; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 1684a0b6bd1ca59a8d9a97c47198693ebeb6165a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1684a0b6bd1ca59a8d9a97c47… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Aug 21 22:21:31 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/po/lt.po b/po/lt.po index ff4abbe..0b2e215 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-08-18 20:53+0300\n" +"PO-Revision-Date: 2015-08-21 22:21+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12883,6 +12883,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine programų šalinimo programa\n" +"\n" +"Šalinkite programas iš dabartinio Wine prefikso.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12897,6 +12901,16 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Naudojimas:\n" +" uninstaller [parametrai]\n" +"\n" +"Parametrai:\n" +" --help\t Parodo šią informaciją.\n" +" --list\t Parodo visas įdiegtas programas šiame Wine prefikse.\n" +" --remove {GUID} Pašalina nurodytą programą.\n" +"\t\t Naudokite „--list“ programos GUID nustatyti.\n" +" [be parametrų] Paleidžia šios programos grafinę versiją.\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

YongHao Hu : include: Add definition of CreateHardLink.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: aa7360d47e0e5192f47638362b3ca18183dfbd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7360d47e0e5192f47638362… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Wed Aug 19 01:28:03 2015 +0800 include: Add definition of CreateHardLink. --- include/winbase.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index a1859b0..b42bc0d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1791,6 +1791,9 @@ WINBASEAPI HANDLE WINAPI CreateSemaphoreExW(SECURITY_ATTRIBUTES*,LONG,LONG, WINBASEAPI BOOL WINAPI CreateSymbolicLinkA(LPCSTR,LPCSTR,DWORD); WINBASEAPI BOOL WINAPI CreateSymbolicLinkW(LPCWSTR,LPCWSTR,DWORD); #define CreateSymbolicLink WINELIB_NAME_AW(CreateSymbolicLink) +WINBASEAPI BOOL WINAPI CreateHardLinkA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES); +WINBASEAPI BOOL WINAPI CreateHardLinkW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES); +#define CreateHardLink WINELIB_NAME_AW(CreateHardLink) WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateTimerQueue(void);

1 0