November 2015 - Wine-commits

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

19 Nov '15

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 : d2d1: Properly free brush data buffer is created from.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 39f2ed321d87d888ac3f81e764d0e5c661db74ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f2ed321d87d888ac3f81e76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 19 15:08:40 2015 +0300 d2d1: Properly free brush data buffer is created from. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 2014f47..aa92318 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -860,8 +860,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b HeapFree(GetProcessHeap(), 0, cb_data); return E_NOTIMPL; } - cb_data += brush_sizes[brush->type]; - if (opacity_brush && !d2d_brush_fill_cb(opacity_brush, render_target, cb_data)) + if (opacity_brush && !d2d_brush_fill_cb(opacity_brush, render_target, cb_data + brush_sizes[brush->type])) { HeapFree(GetProcessHeap(), 0, cb_data); return E_NOTIMPL;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 19 Nov '15

19 Nov '15

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 : d2d1: Add a pixel shader for triangle/solid/bitmap draws.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: b5685efc80a33dfe2b7facb581432f5e94ea455b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5685efc80a33dfe2b7facb58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 22:23:22 2015 +0100 d2d1: Add a pixel shader for triangle/solid/bitmap draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 691af5a..9142bf1 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1622,6 +1622,50 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0x00000010, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; + static const DWORD ps_code_triangle_solid_bitmap[] = + { +#if 0 + float4 color; + + float3x2 transform; + float opacity; + bool ignore_alpha; + + SamplerState s; + Texture2D t; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 texcoord; + float4 ret; + + texcoord.x = position.x * transform._11 + position.y * transform._21 + transform._31; + texcoord.y = position.x * transform._12 + position.y * transform._22 + transform._32; + ret = t.Sample(s, texcoord) * opacity; + if (ignore_alpha) + ret.a = opacity; + + return color * ret.a; + } +#endif + 0x43425844, 0x2260a2ae, 0x81907b3e, 0xcaf27063, 0xccb83ef2, 0x00000001, 0x00000208, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000016c, 0x00000040, + 0x0000005b, 0x04000059, 0x00208e46, 0x00000000, 0x00000004, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800000f, 0x00100012, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000001, 0x08000000, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x0020802a, 0x00000000, 0x00000001, 0x0800000f, 0x00100042, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000002, 0x08000000, 0x00100022, 0x00000000, + 0x0010002a, 0x00000000, 0x0020802a, 0x00000000, 0x00000002, 0x09000045, 0x001000f2, 0x00000000, + 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x08000038, 0x00100012, + 0x00000000, 0x0010003a, 0x00000000, 0x0020803a, 0x00000000, 0x00000002, 0x0b000037, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000003, 0x0020803a, 0x00000000, 0x00000002, 0x0010000a, + 0x00000000, 0x08000038, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x0100003e, + }; static const DWORD ps_code_triangle_bitmap[] = { #if 0 @@ -1805,6 +1849,8 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, { {ps_code_triangle_solid, sizeof(ps_code_triangle_solid), D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_COUNT}, + {ps_code_triangle_solid_bitmap, sizeof(ps_code_triangle_solid_bitmap), + D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_BITMAP}, {ps_code_triangle_bitmap, sizeof(ps_code_triangle_bitmap), D2D_SHAPE_TYPE_TRIANGLE, D2D_BRUSH_TYPE_BITMAP, D2D_BRUSH_TYPE_COUNT}, {ps_code_triangle_bitmap_solid, sizeof(ps_code_triangle_bitmap_solid),

1 0

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

19 Nov '15

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

Henri Verbeet : d2d1: Calculate intersections in a more robust way in d2d_geometry_intersect_self ().
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 3fb1fb96162fd2a403f0ce4b8ef40dacd2c19487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb1fb96162fd2a403f0ce4b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 18 22:23:24 2015 +0100 d2d1: Calculate intersections in a more robust way in d2d_geometry_intersect_self(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 109 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 26 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ed69a1e..9fa1783 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -82,6 +82,21 @@ struct d2d_cdt const D2D1_POINT_2F *vertices; }; +struct d2d_geometry_intersection +{ + size_t figure_idx; + size_t segment_idx; + float t; + D2D1_POINT_2F p; +}; + +struct d2d_geometry_intersections +{ + struct d2d_geometry_intersection *intersections; + size_t intersections_size; + size_t intersection_count; +}; + struct d2d_fp_two_vec2 { float x[2]; @@ -1458,6 +1473,41 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge return TRUE; } +static BOOL d2d_geometry_intersections_add(struct d2d_geometry_intersections *i, + size_t figure_idx, size_t segment_idx, float t, D2D1_POINT_2F p) +{ + struct d2d_geometry_intersection *intersection; + + if (!d2d_array_reserve((void **)&i->intersections, &i->intersections_size, + i->intersection_count + 1, sizeof(*i->intersections))) + { + ERR("Failed to grow intersections array.\n"); + return FALSE; + } + + intersection = &i->intersections[i->intersection_count++]; + intersection->figure_idx = figure_idx; + intersection->segment_idx = segment_idx; + intersection->t = t; + intersection->p = p; + + return TRUE; +} + +static int d2d_geometry_intersections_compare(const void *a, const void *b) +{ + const struct d2d_geometry_intersection *i0 = a; + const struct d2d_geometry_intersection *i1 = b; + + if (i0->figure_idx != i1->figure_idx) + return i0->figure_idx - i1->figure_idx; + if (i0->segment_idx != i1->segment_idx) + return i0->segment_idx - i1->segment_idx; + if (i0->t != i1->t) + return i0->t > i1->t ? 1 : -1; + return 0; +} + /* Intersect the geometry's segments with themselves. This uses the * straightforward approach of testing everything against everything, but * there certainly exist more scalable algorithms for this. */ @@ -1465,21 +1515,21 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) { D2D1_POINT_2F p0, p1, q0, q1, v_p, v_q, v_qp, intersection; + struct d2d_geometry_intersections intersections = {0}; struct d2d_figure *figure_p, *figure_q; - size_t i, j, k, l, min_j, min_l, max_l; + size_t i, j, k, l, max_l; + BOOL ret = FALSE; float s, t, det; for (i = 0; i < geometry->u.path.figure_count; ++i) { figure_p = &geometry->u.path.figures[i]; p0 = figure_p->vertices[figure_p->vertex_count - 1]; - min_j = 0; - min_l = 0; for (k = 0; k < figure_p->vertex_count; p0 = p1, ++k) { p1 = figure_p->vertices[k]; d2d_point_subtract(&v_p, &p1, &p0); - for (j = min_j, min_j = 0, l = min_l, min_l = 0; j < i || (j == i && k); ++j, l = 0) + for (j = 0; j < i || (j == i && k); ++j) { figure_q = &geometry->u.path.figures[j]; @@ -1490,8 +1540,8 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) continue; max_l = j == i ? k - 1 : figure_q->vertex_count; - q0 = figure_q->vertices[l == 0 ? figure_q->vertex_count - 1 : l - 1]; - for (; l < max_l; q0 = q1, ++l) + q0 = figure_q->vertices[figure_q->vertex_count - 1]; + for (l = 0; l < max_l; q0 = q1, ++l) { q1 = figure_q->vertices[l]; d2d_point_subtract(&v_q, &q1, &q0); @@ -1510,31 +1560,38 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) intersection.x = p0.x + v_p.x * s; intersection.y = p0.y + v_p.y * s; - if (t > 0.0f && t < 1.0f) - { - if (!d2d_figure_insert_vertex(figure_q, l, intersection)) - return FALSE; - if (j == i) - ++k; - ++max_l; - ++l; - } - - if (s > 0.0f && s < 1.0f) - { - if (!d2d_figure_insert_vertex(figure_p, k, intersection)) - return FALSE; - min_j = j; - min_l = l+1; - p1 = intersection; - d2d_point_subtract(&v_p, &p1, &p0); - } + if (t > 0.0f && t < 1.0f + && !d2d_geometry_intersections_add(&intersections, j, l, t, intersection)) + goto done; + + if (s > 0.0f && s < 1.0f + && !d2d_geometry_intersections_add(&intersections, i, k, s, intersection)) + goto done; } } } } - return TRUE; + qsort(intersections.intersections, intersections.intersection_count, + sizeof(*intersections.intersections), d2d_geometry_intersections_compare); + for (i = 0; i < intersections.intersection_count; ++i) + { + const struct d2d_geometry_intersection *inter = &intersections.intersections[i]; + + if (!i || inter->figure_idx != intersections.intersections[i - 1].figure_idx) + j = 0; + + if (!d2d_figure_insert_vertex(&geometry->u.path.figures[inter->figure_idx], + inter->segment_idx + j, inter->p)) + goto done; + ++j; + } + + ret = TRUE; + +done: + HeapFree(GetProcessHeap(), 0, intersections.intersections); + return ret; } static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry)

1 0

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

19 Nov '15

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 : configure: Clean up the winmm module checks.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: be78f79eda3d7973319c9fbc34387843a090a131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be78f79eda3d7973319c9fbc3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 18 15:03:50 2015 +0100 configure: Clean up the winmm module checks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++++++-------- configure.ac | 16 +++++++--------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 67a1c3b..a35d96c 100755 --- a/configure +++ b/configure @@ -8087,6 +8087,7 @@ done COREAUDIO_LIBS="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" fi + enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} ac_save_LIBS="$LIBS" LIBS="$LIBS $COREAUDIO_LIBS" for ac_func in AUGraphAddNode @@ -8747,8 +8748,10 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } ;; esac +enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} enable_winemac_drv=${enable_winemac_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} CROSSTARGET="" @@ -12582,6 +12585,7 @@ if test -z "$PULSE_LIBS"; then : This is an error since --with-pulse was requested." "$LINENO" 5 ;; esac fi +test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} if test "x$with_gstreamer" != "xno" then @@ -12801,6 +12805,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi +test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} if test "x$with_oss" != xno then @@ -12834,6 +12839,7 @@ fi as_fn_append wine_notices "|OSS sound system found but too old (OSSv4 needed), OSS won't be supported." fi fi +test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} if test "x$with_capi" != "xno" then @@ -13927,14 +13933,7 @@ _ACEOF fi fi -test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} -test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} -test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} -test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} -test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} - -if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSE_LIBS" = "x" -a \ - "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ +if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv" = xnononono -a \ "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono then as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent." diff --git a/configure.ac b/configure.ac index 7a08154..cd97d62 100644 --- a/configure.ac +++ b/configure.ac @@ -765,6 +765,7 @@ case $host_os in dnl CoreServices needed by AudioUnit AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") fi + enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} dnl Check for the AUGraphAddNode function ac_save_LIBS="$LIBS" LIBS="$LIBS $COREAUDIO_LIBS" @@ -932,8 +933,10 @@ case $host_os in ;; esac +enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} enable_winemac_drv=${enable_winemac_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} dnl Check for cross compiler to build test programs AC_SUBST(CROSSTARGET,"") @@ -1448,6 +1451,7 @@ then fi WINE_NOTICE_WITH(pulse, [test -z "$PULSE_LIBS"], [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.]) +test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" @@ -1489,6 +1493,7 @@ then #endif]], [[snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], [ALSA_LIBS="-lasound"])]) fi +test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} dnl **** Check for OSSv4 **** if test "x$with_oss" != xno @@ -1510,6 +1515,7 @@ then WINE_NOTICE([OSS sound system found but too old (OSSv4 needed), OSS won't be supported.]) fi fi +test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} dnl **** Check for capi4linux **** if test "x$with_capi" != "xno" @@ -1678,16 +1684,8 @@ then WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])]) fi -dnl **** Disable unsupported winmm drivers **** -test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} -test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} -test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} -test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} -test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} - dnl **** Check for any sound system **** -if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSE_LIBS" = "x" -a \ - "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ +if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv" = xnononono -a \ "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono then WINE_WARNING([No sound system was found. Windows applications will be silent.])

1 0

André Hentschel : Add WWN 402
by Jeremy Newman 18 Nov '15

18 Nov '15

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

Francois Gouget : wined3d: Make surface_prepare_rb() static.
by Alexandre Julliard 18 Nov '15

18 Nov '15

Module: wine Branch: master Commit: cb2f6fbfe580b56d20dece2c0b863b3c5f973a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2f6fbfe580b56d20dece2c0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 14:59:21 2015 +0100 wined3d: Make surface_prepare_rb() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8c70f34..0a7112c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2885,7 +2885,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct context_restore(context, restore_rt); } -void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample) +static void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample) { if (multisample) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6e6635..a60919e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2467,8 +2467,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_prepare_rb(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, BOOL multisample) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN;

1 0