wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Matteo Bruni : d3d8/tests: Allow more alternative results in the ATI1N test.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: d49d2a5d470e6a3c0bb2ba0dd1c1bcab798be6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49d2a5d470e6a3c0bb2ba0dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:46 2015 +0100 d3d8/tests: Allow more alternative results in the ATI1N test. --- dlls/d3d8/tests/visual.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c095463..85b3fad 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5130,15 +5130,17 @@ static void test_3dc_formats(void) static const struct { struct vec2 position; - D3DCOLOR amd; - D3DCOLOR nvidia; + D3DCOLOR amd_r500; + D3DCOLOR amd_r600; + D3DCOLOR nvidia_old; + D3DCOLOR nvidia_new; } expected_colors[] = { - {{ 80, 240}, 0x003f3f3f, 0x007f0000}, - {{240, 240}, 0x003f3f3f, 0x007f0000}, - {{400, 240}, 0x00007fff, 0x00007fff}, - {{560, 240}, 0x007f00ff, 0x007f00ff}, + {{ 80, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{240, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{400, 240}, 0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}, + {{560, 240}, 0x007f00ff, 0x007f00ff, 0x007f00ff, 0x007f00ff}, }; IDirect3D8 *d3d; IDirect3DDevice8 *device; @@ -5236,9 +5238,11 @@ static void test_3dc_formats(void) for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); - ok (color_match(color, expected_colors[i].amd, 1) || color_match(color, expected_colors[i].nvidia, 1), - "Expected color 0x%08x or 0x%08x, got 0x%08x, case %u.\n", - expected_colors[i].amd, expected_colors[i].nvidia, color, i); + ok (color_match(color, expected_colors[i].amd_r500, 1) + || color_match(color, expected_colors[i].amd_r600, 1) + || color_match(color, expected_colors[i].nvidia_old, 1) + || color_match(color, expected_colors[i].nvidia_new, 1), + "Got unexpected color 0x%08x, case %u.\n", color, i); } hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Matteo Bruni : d3d9/tests: Allow more alternative results in the ATI1N test.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 2aed2c3a15ab6ccb14612661f462827338ce3926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aed2c3a15ab6ccb14612661f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:45 2015 +0100 d3d9/tests: Allow more alternative results in the ATI1N test. --- dlls/d3d9/tests/visual.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a8cf55f..5f64ec3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16728,15 +16728,17 @@ static void test_3dc_formats(void) static const struct { struct vec2 position; - D3DCOLOR amd; - D3DCOLOR nvidia; + D3DCOLOR amd_r500; + D3DCOLOR amd_r600; + D3DCOLOR nvidia_old; + D3DCOLOR nvidia_new; } expected_colors[] = { - {{ 80, 240}, 0x003f3f3f, 0x007f0000}, - {{240, 240}, 0x003f3f3f, 0x007f0000}, - {{400, 240}, 0x00007fff, 0x00007fff}, - {{560, 240}, 0x007f00ff, 0x007f00ff}, + {{ 80, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{240, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{400, 240}, 0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}, + {{560, 240}, 0x007f00ff, 0x007f00ff, 0x007f00ff, 0x007f00ff}, }; IDirect3D9 *d3d; IDirect3DDevice9 *device; @@ -16835,9 +16837,11 @@ static void test_3dc_formats(void) for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); - ok (color_match(color, expected_colors[i].amd, 1) || color_match(color, expected_colors[i].nvidia, 1), - "Expected color 0x%08x or 0x%08x, got 0x%08x, case %u.\n", - expected_colors[i].amd, expected_colors[i].nvidia, color, i); + ok (color_match(color, expected_colors[i].amd_r500, 1) + || color_match(color, expected_colors[i].amd_r600, 1) + || color_match(color, expected_colors[i].nvidia_old, 1) + || color_match(color, expected_colors[i].nvidia_new, 1), + "Got unexpected color 0x%08x, case %u.\n", color, i); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Nikolay Sivov : dwrite: Set facename field of a LOGFONT in ConvertFontFaceToLOGFONT().
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 5a318c3e8badda11b2a00884e6de2c0367616525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a318c3e8badda11b2a00884e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 19 11:43:15 2015 +0300 dwrite: Set facename field of a LOGFONT in ConvertFontFaceToLOGFONT(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 59 ++++++++++-------------------------------- dlls/dwrite/gdiinterop.c | 61 +++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 1 - 4 files changed, 75 insertions(+), 47 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 674e9f0..9a27a5e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -121,6 +121,7 @@ extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; extern BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE) DECLSPEC_HIDDEN; +extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 527fa5d..2092576 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -773,45 +773,22 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) +HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, + IDWriteLocalizedStrings **names) { - DWRITE_FONT_SIMULATIONS simulations; - DWRITE_FONT_FACE_TYPE face_type; - IDWriteFontFileStream *stream; - DWRITE_FONT_STRETCH stretch; - DWRITE_FONT_STYLE style; - DWRITE_FONT_WEIGHT weight; - IDWriteFontFile *file = NULL; - UINT32 index; - HRESULT hr; - - memset(logfont, 0, sizeof(*logfont)); - - index = 1; - hr = IDWriteFontFace_GetFiles(face, &index, &file); - if (FAILED(hr) || !file) - return hr; + const void *name_table = NULL; + void *name_context; + HRESULT hr = S_OK; - hr = get_filestream_from_file(file, &stream); - if (FAILED(hr)) { - IDWriteFontFile_Release(file); - return hr; + opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + if (name_table) { + hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, names); + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); } + else + names = NULL; - index = IDWriteFontFace_GetIndex(face); - face_type = IDWriteFontFace_GetType(face); - opentype_get_font_properties(stream, face_type, index, &stretch, &weight, &style); - IDWriteFontFileStream_Release(stream); - - simulations = IDWriteFontFace_GetSimulations(face); - - logfont->lfCharSet = DEFAULT_CHARSET; - logfont->lfWeight = weight; - logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE); - logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; - /* TODO: set facename */ - - return S_OK; + return hr; } static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) @@ -1730,8 +1707,6 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat for (i = 0; i < face_count; i++) { IDWriteLocalizedStrings *family_name = NULL; struct dwrite_font_data *font_data; - const void *name_table; - void *name_context; IDWriteFontFileStream *stream; WCHAR buffer[255]; UINT32 index; @@ -1742,15 +1717,9 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat break; /* get family name from font file */ - name_table = NULL; - opentype_get_font_table(stream, face_type, i, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); - if (name_table) { - hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &family_name); - IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); - } + hr = get_family_names_from_stream(stream, i, face_type, &family_name); IDWriteFontFileStream_Release(stream); - - if (FAILED(hr) || !family_name) { + if (FAILED(hr)) { WARN("unable to get family name from font\n"); release_font_data(font_data); continue; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index bead01d..8f91ded 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -406,9 +406,68 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface, IDWriteFontFace *fontface, LOGFONTW *logfont) { + static const WCHAR enusW[] = {'e','n','-','u','s',0}; struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + IDWriteLocalizedStrings *familynames; + DWRITE_FONT_SIMULATIONS simulations; + DWRITE_FONT_FACE_TYPE face_type; + IDWriteFontFileStream *stream; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_STYLE style; + DWRITE_FONT_WEIGHT weight; + IDWriteFontFile *file = NULL; + UINT32 index; + BOOL exists; + HRESULT hr; + TRACE("(%p)->(%p %p)\n", This, fontface, logfont); - return convert_fontface_to_logfont(fontface, logfont); + + memset(logfont, 0, sizeof(*logfont)); + + index = 1; + hr = IDWriteFontFace_GetFiles(fontface, &index, &file); + if (FAILED(hr) || !file) + return hr; + + hr = get_filestream_from_file(file, &stream); + if (FAILED(hr)) { + IDWriteFontFile_Release(file); + return hr; + } + + index = IDWriteFontFace_GetIndex(fontface); + face_type = IDWriteFontFace_GetType(fontface); + opentype_get_font_properties(stream, face_type, index, &stretch, &weight, &style); + hr = get_family_names_from_stream(stream, index, face_type, &familynames); + IDWriteFontFile_Release(file); + IDWriteFontFileStream_Release(stream); + if (FAILED(hr)) + return hr; + + simulations = IDWriteFontFace_GetSimulations(fontface); + + logfont->lfCharSet = DEFAULT_CHARSET; + logfont->lfWeight = weight; + logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE); + logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; + logfont->lfFaceName[0] = 0; + + exists = FALSE; + hr = IDWriteLocalizedStrings_FindLocaleName(familynames, enusW, &index, &exists); + if (FAILED(hr) || !exists) { + /* fallback to 0 index */ + if (IDWriteLocalizedStrings_GetCount(familynames) > 0) + index = 0; + else { + IDWriteLocalizedStrings_Release(familynames); + return E_FAIL; + } + } + + hr = IDWriteLocalizedStrings_GetString(familynames, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); + IDWriteLocalizedStrings_Release(familynames); + + return hr; } static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e00e788..d171411 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1467,7 +1467,6 @@ if (0) /* crashes on native */ ok(logfont.lfItalic == 1, "got %d\n", logfont.lfItalic); ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); -todo_wine ok(!lstrcmpW(logfont.lfFaceName, tahomaW), "got %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteGdiInterop_Release(interop);

1 0

Nikolay Sivov : dwrite: Fix error code returned by GetFontFromFontFace().
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 5196be7706ae4189edb3b67cf441d7a1077539ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=5196be7706ae4189edb3b67cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 22:46:10 2015 +0300 dwrite: Fix error code returned by GetFontFromFontFace(). --- dlls/dwrite/font.c | 2 +- dlls/dwrite/tests/font.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e3480ec..527fa5d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1514,7 +1514,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec } if (!found_font) - return E_INVALIDARG; + return DWRITE_E_NOFONT; hr = create_fontfamily(found_family, iface, &family); if (FAILED(hr)) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ca31f29..e00e788 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2028,6 +2028,7 @@ static void test_GetFontFromFontFace(void) IDWriteFont *font, *font2, *font3; IDWriteFontFamily *family; IDWriteFactory *factory; + IDWriteFontFile *file; HRESULT hr; factory = create_factory(); @@ -2064,14 +2065,32 @@ static void test_GetFontFromFontFace(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); IDWriteFontFace_Release(fontface2); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font3); + IDWriteFactory_Release(factory); + + /* fontface that wasn't created from this collection */ + factory = create_factory(); + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font3); + ok(hr == DWRITE_E_NOFONT, "got 0x%08x\n", hr); + ok(font3 == NULL, "got %p\n", font3); + IDWriteFontFace_Release(fontface); IDWriteFont_Release(font); IDWriteFont_Release(font2); - IDWriteFont_Release(font3); - IDWriteFontFace_Release(fontface); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection); IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); } static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style)

1 0

Austin English : xapofx1_4: Add stub dll.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 0135a59658848dc85af1797cef8679e3c75ec5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0135a59658848dc85af1797ce… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 18 14:02:33 2015 -0600 xapofx1_4: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_4/Makefile.in | 4 ++++ dlls/xapofx1_4/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/xapofx1_4/xapofx1_4.spec | 1 + 5 files changed, 45 insertions(+) diff --git a/configure b/configure index 0deacd1..fd639fc 100755 --- a/configure +++ b/configure @@ -1325,6 +1325,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_4 enable_xapofx1_5 enable_xaudio2_7 enable_xinput1_1 @@ -17676,6 +17677,7 @@ wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_7 enable_xaudio2_7 wine_fn_config_dll xinput1_1 enable_xinput1_1 diff --git a/configure.ac b/configure.ac index 11a3b78..97ae4e2 100644 --- a/configure.ac +++ b/configure.ac @@ -3386,6 +3386,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_7) WINE_CONFIG_DLL(xinput1_1) diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in new file mode 100644 index 0000000..12978d8 --- /dev/null +++ b/dlls/xapofx1_4/Makefile.in @@ -0,0 +1,4 @@ +MODULE = xapofx1_4.dll + +C_SRCS = \ + main.c diff --git a/dlls/xapofx1_4/main.c b/dlls/xapofx1_4/main.c new file mode 100644 index 0000000..1b223ad --- /dev/null +++ b/dlls/xapofx1_4/main.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/xapofx1_4/xapofx1_4.spec b/dlls/xapofx1_4/xapofx1_4.spec new file mode 100644 index 0000000..33269e3 --- /dev/null +++ b/dlls/xapofx1_4/xapofx1_4.spec @@ -0,0 +1 @@ +@ stub CreateFX

1 0

Jacek Caban : mshtml: Use constant instead of define for REDIRECT_* flags.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 1f310395eb699df247c006143da2f25700ed6eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f310395eb699df247c006143… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 18 18:00:26 2015 +0100 mshtml: Use constant instead of define for REDIRECT_* flags. --- dlls/mshtml/nsiface.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 9ba7c05..d7ced56 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -711,9 +711,9 @@ interface nsIAsyncVerifyRedirectCallback : nsISupports ] interface nsIChannelEventSink : nsISupports { - cpp_quote("#define REDIRECT_TEMPORARY 1") - cpp_quote("#define REDIRECT_PERMANENT 2") - cpp_quote("#define REDIRECT_INTERNAL 4") + const UINT REDIRECT_TEMPORARY = 1; + const UINT REDIRECT_PERMANENT = 2; + const UINT REDIRECT_INTERNAL = 4; nsresult AsyncOnChannelRedirect(nsIChannel *oldChannel, nsIChannel *newChannel, uint32_t flags, nsIAsyncVerifyRedirectCallback *callback);

1 0

Bruno Jesus : rsaenh/tests: Fix a copy & paste issue.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 4d43d364e80326fa0bb571b6f0bb7ccb7e1a1a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d43d364e80326fa0bb571b6f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 18 12:25:21 2015 -0200 rsaenh/tests: Fix a copy & paste issue. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 072f08a..da74ffb 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1728,7 +1728,7 @@ static void test_rc4(void) dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - if (BASE_PROV || STRONG_PROV || nt4) + if (BASE_PROV || STRONG_PROV) ok(dwLen == 11, "expected salt length 11, got %d\n", dwLen); else ok(dwLen == 0 || broken(nt4 && dwLen == 11), "expected salt length 0, got %d\n", dwLen);

1 0

Nikolay Sivov : dwrite: Use vertical variants in GetGlyphs() when appropriate.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 980c65f1266d4f87166d2199d302d178cc6e651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=980c65f1266d4f87166d2199d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 15:50:41 2015 +0300 dwrite: Use vertical variants in GetGlyphs() when appropriate. --- dlls/dwrite/analyzer.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index b9caefd..62a6b15 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -864,8 +864,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, const struct dwritescript_properties *scriptprops; struct scriptshaping_context context; struct scriptshaping_cache *cache = NULL; + BOOL update_cluster, need_vertical; + IDWriteFontFace1 *fontface1; WCHAR *string; - BOOL update_cluster; UINT32 i, g; HRESULT hr = S_OK; UINT16 script; @@ -909,6 +910,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (!string) return E_OUTOFMEMORY; + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (FAILED(hr)) + WARN("failed to get IDWriteFontFace1\n"); + + need_vertical = is_sideways && fontface1 && IDWriteFontFace1_HasVerticalGlyphVariants(fontface1); + for (i = 0, g = 0, update_cluster = FALSE; i < length; i++) { UINT32 codepoint; @@ -928,6 +935,14 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, if (FAILED(hr)) goto done; + if (need_vertical) { + UINT16 vertical; + + hr = IDWriteFontFace1_GetVerticalGlyphVariants(fontface1, 1, &glyph_indices[g], &vertical); + if (hr == S_OK) + glyph_indices[g] = vertical; + } + g++; } else { @@ -969,6 +984,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); done: + if (fontface1) + IDWriteFontFace1_Release(fontface1); release_scriptshaping_cache(cache); heap_free(string);

1 0

Henri Verbeet : wined3d: Apply modifiers after floatBitsToInt()/ floatBitsToUint() in shader_glsl_add_src_param().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 3fa8f4ece38da2ee75b3b5f639a3cce64523b0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa8f4ece38da2ee75b3b5f63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:32 2015 +0100 wined3d: Apply modifiers after floatBitsToInt()/floatBitsToUint() in shader_glsl_add_src_param(). --- dlls/wined3d/glsl_shader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0017e45..0804997 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1758,28 +1758,28 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i } else { - char param_str[200]; - - shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, param_str); + char reg_name[200]; switch (wined3d_src->reg.data_type) { case WINED3D_DATA_FLOAT: - sprintf(glsl_src->param_str, "%s", param_str); + sprintf(reg_name, "%s", glsl_src->reg_name); break; case WINED3D_DATA_INT: - sprintf(glsl_src->param_str, "floatBitsToInt(%s)", param_str); + sprintf(reg_name, "floatBitsToInt(%s)", glsl_src->reg_name); break; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(glsl_src->param_str, "floatBitsToUint(%s)", param_str); + sprintf(reg_name, "floatBitsToUint(%s)", glsl_src->reg_name); break; default: FIXME("Unhandled data type %#x.\n", wined3d_src->reg.data_type); - sprintf(glsl_src->param_str, "%s", param_str); + sprintf(reg_name, "%s", glsl_src->reg_name); break; } + + shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name, swizzle_str, glsl_src->param_str); } }

1 0

Henri Verbeet : d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateTexture2D().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: e46bdc28f68a8d8d585376027e8072bb449c74bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46bdc28f68a8d8d585376027… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:31 2015 +0100 d3d10core: Get rid of the "partial stub" FIXME in d3d10_device_CreateTexture2D(). --- dlls/d3d10core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7b811a6..7f41360 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1418,7 +1418,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa struct d3d10_texture2d *object; HRESULT hr; - FIXME("iface %p, desc %p, data %p, texture %p partial stub!\n", iface, desc, data, texture); + TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object)

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015