November 2015 - Wine-Commits

Jacek Caban : kernel32: Call registry functions with full key path.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 6a7363b69432ceed1ddb8e6172272773fdd64d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7363b69432ceed1ddb8e617… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 12:53:33 2015 +0100 kernel32: Call registry functions with full key path. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/computername.c | 3 ++- dlls/kernel32/except.c | 3 ++- dlls/kernel32/locale.c | 6 +++--- dlls/kernel32/oldconfig.c | 6 +++--- dlls/kernel32/path.c | 3 ++- dlls/kernel32/process.c | 9 ++++++--- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 0c81ac0..1b5f4aa 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -50,7 +50,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(computername); /* Registry key and value names */ -static const WCHAR ComputerW[] = {'M','a','c','h','i','n','e','\\', +static const WCHAR ComputerW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 2a7dbaa..1a1521a 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -192,7 +192,8 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) BOOL ret = FALSE; char buffer[256]; - static const WCHAR AeDebugW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR AeDebugW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6dc0d05..3b632b4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -62,13 +62,13 @@ static const union cptable *mac_cptable; static const union cptable *unix_cptable; /* NULL if UTF8 */ static const WCHAR szLocaleKeyName[] = { - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + '\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','N','l','s','\\','L','o','c','a','l','e',0 }; static const WCHAR szLangGroupsKeyName[] = { - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + '\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','N','l','s','\\', 'L','a','n','g','u','a','g','e',' ','G','r','o','u','p','s',0 @@ -875,7 +875,7 @@ void LOCALE_InitRegistry(void) if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) { static const WCHAR codepageW[] = - {'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','N','l','s','\\','C','o','d','e','p','a','g','e',0}; diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 2c8bc18..6c80dc6 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -100,11 +100,11 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD HANDLE lunKey; DWORD disp; - if (create_key( 0, "Machine\\HARDWARE\\DEVICEMAP", &scsiKey, &disp )) return; + if (create_key( 0, "\\Registry\\Machine\\HARDWARE\\DEVICEMAP", &scsiKey, &disp )) return; NtClose( scsiKey ); /* Ensure there is Scsi key */ - if (create_key( 0, "Machine\\HARDWARE\\DEVICEMAP\\Scsi", &scsiKey, &disp )) return; + if (create_key( 0, "\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\Scsi", &scsiKey, &disp )) return; snprintf(buffer,sizeof(buffer),"Scsi Port %d",scsi_addr->PortNumber); if (create_key( scsiKey, buffer, &portKey, &disp )) return; @@ -398,7 +398,7 @@ void convert_old_config(void) DWORD disp; /* create some hardware keys (FIXME: should not be done here) */ - if (create_key( 0, "Machine\\HARDWARE", &key, &disp )) return; + if (create_key( 0, "\\Registry\\Machine\\HARDWARE", &key, &disp )) return; NtClose( key ); if (disp != REG_OPENED_EXISTING_KEY) create_hardware_branch(); } diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index d8977f9..ff94227 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -120,7 +120,8 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) static const WCHAR ValueName[] = {'P','e','n','d','i','n','g', 'F','i','l','e','R','e','n','a','m','e', 'O','p','e','r','a','t','i','o','n','s',0}; - static const WCHAR SessionW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR SessionW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 17ae16d..89ae5c4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -400,7 +400,8 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) */ static BOOL set_registry_environment( BOOL volatile_only ) { - static const WCHAR env_keyW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR env_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', @@ -504,7 +505,8 @@ static WCHAR *get_reg_value( HKEY hkey, const WCHAR *name ) */ static void set_additional_environment(void) { - static const WCHAR profile_keyW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR profile_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', @@ -570,7 +572,8 @@ static void set_wow64_environment(void) static const WCHAR archW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR arch6432W[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','W','6','4','3','2',0}; static const WCHAR x86W[] = {'x','8','6',0}; - static const WCHAR versionW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR versionW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\',

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: f48ba67fcefb803b5d95e0fc2ff47ef6cabe89c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48ba67fcefb803b5d95e0fc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 20:54:04 2015 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 61 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/po/ru.po b/po/ru.po index 31a5ed9..38216e9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ 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-19 08:15+0300\n" +"PO-Revision-Date: 2015-11-18 20:30+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.6\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -7458,16 +7458,12 @@ msgid "&Convert..." msgstr "&Конвертировать..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Объект" +msgstr "%1 &объект %2" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Объект" +msgstr "&Объект %1" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8581,58 +8577,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Спрятать" +msgstr "Скрыть %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Другой" +msgstr "Скрыть остальные" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Показать" +msgstr "Показать все" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Закрыть %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Выход" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Окно" +msgstr "Окно" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Свернуть" +msgstr "Свернуть" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Приблизить" +msgstr "Изменить масштаб" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Переход в полноэкранный режим" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "&На передний план" +msgstr "Все окна на передний план" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -12941,6 +12923,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Программа удаления приложений Wine\n" +"\n" +"Удаляет приложения из текущего префикса Wine.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12955,6 +12941,17 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Вызов:\n" +" uninstaller [параметры]\n" +"\n" +"Параметры:\n" +" --help\t показать эту справку.\n" +" --list\t показать список всех приложений, установленных в этом " +"префиксе.\n" +" --remove {GUID} удалить указанное приложение.\n" +"\t\t GUID установленного приложения можно получить с помощью '--list'.\n" +" [без параметров] запустить графическую версию этой программы.\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

Henri Verbeet : wined3d: Ignore "always_offscreen" for ORM_BACKBUFFER in context_create().
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: b0be9f0b93ab2a62c17f32ba98549369b7d6090e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0be9f0b93ab2a62c17f32ba9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 22:23:25 2015 +0100 wined3d: Ignore "always_offscreen" for ORM_BACKBUFFER in context_create(). ORM_BACKBUFFER uses the backbuffer for off-screen rendering. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 80a9ba7..0e8b32b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1565,7 +1565,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, * Using the same format regardless of the color/depth/stencil targets * makes it much less likely that different wined3d instances will set * conflicting pixel formats. */ - if (wined3d_settings.always_offscreen) + if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER + && wined3d_settings.always_offscreen) { color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); ds_format = wined3d_get_format(gl_info, WINED3DFMT_UNKNOWN);

1 0

Francois Gouget : msvcp120/tests: Make i386_Thrd_current() static.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 7740fa69ef375d504f6e8aa03115818b1ee87646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7740fa69ef375d504f6e8aa03… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 14:59:13 2015 +0100 msvcp120/tests: Make i386_Thrd_current() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index e69405f..12ca12d 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -150,7 +150,7 @@ static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); #ifdef __i386__ static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); -_Thrd_t __cdecl i386_Thrd_current(void) +static _Thrd_t __cdecl i386_Thrd_current(void) { union { _Thrd_t thr;

1 0

Alistair Leslie-Hughes : configure: Correctly detect OpenAL.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 8454e2352970463f65f3aebef32f6352198e62b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8454e2352970463f65f3aebef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 19 17:47:59 2015 +1100 configure: Correctly detect OpenAL. Older OpenAL alext.h doesn't include al.h/alc.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a35d96c..291966b 100755 --- a/configure +++ b/configure @@ -13694,6 +13694,8 @@ if ${ac_cv_have_openalsoft+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include <AL/al.h> +#include <AL/alc.h> #include <AL/alext.h> LPALCRENDERSAMPLESSOFT x; int diff --git a/configure.ac b/configure.ac index cd97d62..bd3db26 100644 --- a/configure.ac +++ b/configure.ac @@ -1650,7 +1650,9 @@ if test "x$ac_cv_lib_openal" = xyes then AC_CACHE_CHECK([for openal-soft], ac_cv_have_openalsoft, AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <AL/alext.h> + [[#include <AL/al.h> +#include <AL/alc.h> +#include <AL/alext.h> LPALCRENDERSAMPLESSOFT x;]])],[ac_cv_have_openalsoft=yes],[ac_cv_have_openalsoft=no])) fi if test "x$ac_cv_have_openalsoft" != xyes

1 0

Piotr Caban : msxml3/tests: Add tests for sub-nodes whitespaces trimming while getting node text.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 80df8c03e23a2831bd7154a595341d41028e386c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80df8c03e23a2831bd7154a59… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:38 2015 +0100 msxml3/tests: Add tests for sub-nodes whitespaces trimming while getting node text. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5518494..835ddd5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description. <bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4171,7 +4171,7 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const } else { - helper_expect_bstr_and_release(bstr, "This is a description."); + todo_wine helper_expect_bstr_and_release(bstr, "This is a description."); } IXMLDOMNode_Release(node1);

1 0

Henri Verbeet : d2d1: Take the recommended rendering mode into account in d2d_d3d_render_target_DrawGlyphRun ().
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: 55d403deb91ddaaf7ff49d3f9219922bc21e4b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d403deb91ddaaf7ff49d3f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 22:23:23 2015 +0100 d2d1: Take the recommended rendering mode into account in d2d_d3d_render_target_DrawGlyphRun(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 272 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 223 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55d403deb91ddaaf7ff49…

1 0

Piotr Caban : msxml3/tests: Add CDATA block to whitespace trimming tests.
by Alexandre Julliard Nov. 19, 2015

Nov. 19, 2015

Module: wine Branch: master Commit: ef127caef2206a6a1935a4b7335bc43dfe1a8e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef127caef2206a6a1935a4b73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:56:01 2015 +0100 msxml3/tests: Add CDATA block to whitespace trimming tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 10e5d55..c894361 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description<dot>. </dot><bar:x/>\n" +" <![CDATA[]]> This is a description<dot>. </dot><bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4163,7 +4163,9 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); + helper_expect_list_and_release(list, + "[4]1.E1.E5.E1.E2.D1 T2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 " + "E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1 E6.E1.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4171,7 +4173,7 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const } else { - todo_wine helper_expect_bstr_and_release(bstr, "This is a description."); + todo_wine helper_expect_bstr_and_release(bstr, " This is a description."); } IXMLDOMNode_Release(node1); @@ -4196,7 +4198,10 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 E5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); + helper_expect_list_and_release(list, + "T1.E2.E10.E2.E2.D1 [4]2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 " + "E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 " + "E7.E2.E10.E2.E2.D1 E8.E2.E10.E2.E2.D1 T9.E2.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4204,7 +4209,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con } else { - todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1); @@ -4311,8 +4316,8 @@ static void test_whitespace(void) ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE)); /* the trailing "\n " isn't there, because it was ws-only node */ - check_ws_ignored(doc1, "\n This is a description. "); - check_ws_preserved(doc2, "This is a description."); + check_ws_ignored(doc1, " This is a description. "); + check_ws_preserved(doc2, " This is a description."); /* it takes effect on reload */ ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); @@ -4602,7 +4607,7 @@ if (0) ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - expect_list_and_release(list, "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); + expect_list_and_release(list, "E6.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -6894,7 +6899,7 @@ static const xslpattern_test_t xslpattern_test[] = { static const xslpattern_test_t xslpattern_test_no_ns[] = { /* prefixes don't need to be registered, you may use them as they are in the doc */ - { "//bar:x", "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, + { "//bar:x", "E6.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, /* prefixes must be explicitly specified in the name */ { "//foo:elem", "" }, { "//foo:c", "E3.E4.E2.D1" },

1 0

André Hentschel : Add WWN 402
by Jeremy Newman Nov. 18, 2015

Nov. 18, 2015

Module: website Branch: master Commit: b06fcffab8f574bdedf4367954cd9d0736ab8308 URL: http://source.winehq.org/git/website.git/?a=commit;h=b06fcffab8f574bdedf436… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 18 22:24:08 2015 +0100 Add WWN 402 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015111801.xml | 11 + news/en/2015111801.xml | 11 + wwn/en/wn20151118_402.xml | 1014 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1036 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=b06fcffab8f574bded…

1 0

Henri Verbeet : d2d1/tests: Add some tests for opacity brushes.
by Alexandre Julliard Nov. 18, 2015

Nov. 18, 2015

Module: wine Branch: master Commit: ff6225c16da250d0332871e2d3205de3c28ad433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6225c16da250d0332871e2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 16:10:24 2015 +0100 d2d1/tests: Add some tests for opacity brushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 183 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 67901b6..b721c26 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2246,6 +2246,188 @@ static void test_bitmap_updates(void) DestroyWindow(window); } +static void test_opacity_brush(void) +{ + ID2D1BitmapBrush *bitmap_brush, *opacity_brush; + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1RectangleGeometry *geometry; + ID2D1SolidColorBrush *color_brush; + IDXGISwapChain *swapchain; + D2D1_MATRIX_3X2_F matrix; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Factory *factory; + ID2D1Bitmap *bitmap; + D2D1_COLOR_F color; + D2D1_RECT_F rect; + D2D1_SIZE_U size; + ULONG refcount; + HWND window; + HRESULT hr; + BOOL match; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0x40ffff00, 0x4000ff00, 0xff00ffff, + 0x7f0000ff, 0x00ff00ff, 0x00000000, 0x7f7f7f7f, + 0x7fffffff, 0x00ffffff, 0x00ffffff, 0x7f000000, + 0xffffffff, 0x40000000, 0x40000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + ID2D1RenderTarget_GetFactory(rt, &factory); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + set_color(&color, 0.0f, 1.0f, 0.0f, 0.8f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &color_brush); + ok(SUCCEEDED(hr), "Failed to create color brush, hr %#x.\n", hr); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &opacity_brush); + ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr); + ID2D1BitmapBrush_SetInterpolationMode(opacity_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + refcount = ID2D1Bitmap_Release(bitmap); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + set_size_u(&size, 1, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, &bitmap_data[2], sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &bitmap_brush); + ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr); + ID2D1BitmapBrush_SetInterpolationMode(bitmap_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + refcount = ID2D1Bitmap_Release(bitmap); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + set_rect(&rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 120.0f, 120.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 120.0f, 120.0f, 200.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)opacity_brush); + + set_rect(&rect, 200.0f, 120.0f, 280.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 360.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 40.0f, 360.0f, 120.0f, 600.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)opacity_brush, (ID2D1Brush *)color_brush); + ID2D1RectangleGeometry_Release(geometry); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 120.0f, 360.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 120.0f, 360.0f, 200.0f, 600.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)color_brush, (ID2D1Brush *)opacity_brush); + ID2D1RectangleGeometry_Release(geometry); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 360.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 200.0f, 360.0f, 280.0f, 600.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)bitmap_brush, (ID2D1Brush *)opacity_brush); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == D2DERR_INCOMPATIBLE_BRUSH_TYPES, "Got unexpected hr %#x.\n", hr); + match = compare_surface(surface, "7141c6c7b3decb91196428efb1856bcbf9872935"); + ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_BeginDraw(rt); + + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)bitmap_brush, (ID2D1Brush *)opacity_brush); + ID2D1RectangleGeometry_Release(geometry); + + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.5f); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 600.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 40.0f, 600.0f, 120.0f, 840.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)opacity_brush, (ID2D1Brush *)color_brush); + ID2D1RectangleGeometry_Release(geometry); + + ID2D1BitmapBrush_SetOpacity(opacity_brush, 0.8f); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 120.0f, 600.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 120.0f, 600.0f, 200.0f, 840.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)opacity_brush, (ID2D1Brush *)bitmap_brush); + ID2D1RectangleGeometry_Release(geometry); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 600.0f); + scale_matrix(&matrix, 20.0f, 60.0f); + ID2D1BitmapBrush_SetTransform(opacity_brush, &matrix); + set_rect(&rect, 200.0f, 600.0f, 280.0f, 840.0f); + ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, + (ID2D1Brush *)bitmap_brush, (ID2D1Brush *)opacity_brush); + ID2D1RectangleGeometry_Release(geometry); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "c3a5802d1750efa3e9122c1a92f6064df3872732"); + ok(match, "Surface does not match.\n"); + + ID2D1BitmapBrush_Release(bitmap_brush); + ID2D1BitmapBrush_Release(opacity_brush); + ID2D1SolidColorBrush_Release(color_brush); + ID2D1RenderTarget_Release(rt); + refcount = ID2D1Factory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -2257,4 +2439,5 @@ START_TEST(d2d1) test_alpha_mode(); test_shared_bitmap(); test_bitmap_updates(); + test_opacity_brush(); }

1 0