August 2014 - Wine-commits - list.winehq.org

Jeremy Newman : issue numbered wrong
by Jeremy Newman 29 Aug '14

29 Aug '14

Module: website Branch: master Commit: 537e5b75a1ce3b4c098e0717beb132a9927e193c URL: http://source.winehq.org/git/website.git/?a=commit;h=537e5b75a1ce3b4c098e07… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 29 20:20:28 2014 -0500 issue numbered wrong --- wwn/en/{wn20140829_373.xml => wn20140829_374.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/wwn/en/wn20140829_373.xml b/wwn/en/wn20140829_374.xml similarity index 100% rename from wwn/en/wn20140829_373.xml rename to wwn/en/wn20140829_374.xml

1 0

André Hentschel : Add WWN 374
by Jeremy Newman 29 Aug '14

29 Aug '14

Module: website Branch: master Commit: 0405f2b7979d456b315382816c2289f1058ae107 URL: http://source.winehq.org/git/website.git/?a=commit;h=0405f2b7979d456b315382… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 29 19:21:57 2014 +0200 Add WWN 374 --- news/de/2014082901.xml | 10 ++ news/en/2014082901.xml | 10 ++ wwn/en/wn20140829_373.xml | 407 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 427 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0405f2b7979d456b31…

1 0

Jeremy Newman : fix typo on issue number
by Jeremy Newman 29 Aug '14

29 Aug '14

Module: website Branch: master Commit: c0a0f6776d5abd993d4c851f9faddee2e1a22f18 URL: http://source.winehq.org/git/website.git/?a=commit;h=c0a0f6776d5abd993d4c85… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 29 20:17:17 2014 -0500 fix typo on issue number --- news/de/2014082901.xml | 6 +++--- news/en/2014082901.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/news/de/2014082901.xml b/news/de/2014082901.xml index 1af9566..83057ad 100644 --- a/news/de/2014082901.xml +++ b/news/de/2014082901.xml @@ -1,10 +1,10 @@ <news> <date>15. August 2014</date> - <title>World Wine News Ausgabe 374</title> + <title>World Wine News Ausgabe 373</title> <body> -<a href="{$root}/wwn/374">WWN Ausgabe 374 (en)</a> wurde heute veröffentlicht. +<a href="{$root}/wwn/373">WWN Ausgabe 373 (en)</a> wurde heute veröffentlicht. <ul> -<li><a href="{$root}/wwn/374#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> +<li><a href="{$root}/wwn/373#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> </ul> </body> </news> diff --git a/news/en/2014082901.xml b/news/en/2014082901.xml index 1fa05c0..7de2a53 100644 --- a/news/en/2014082901.xml +++ b/news/en/2014082901.xml @@ -1,10 +1,10 @@ <news> <date>August 29, 2014</date> - <title>World Wine News Issue 374</title> + <title>World Wine News Issue 373</title> <body> -<a href="{$root}/wwn/374">WWN Issue 374</a> was released today. +<a href="{$root}/wwn/373">WWN Issue 373</a> was released today. <ul> -<li><a href="{$root}/wwn/374#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Status Changes</a></li> +<li><a href="{$root}/wwn/373#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Status Changes</a></li> </ul> </body> </news>

1 0

Jeremy Newman : Revert "fix typo on issue number"
by Jeremy Newman 29 Aug '14

29 Aug '14

Module: website Branch: master Commit: 666e944aa13b22f42214ac50dc481360ae93fbc4 URL: http://source.winehq.org/git/website.git/?a=commit;h=666e944aa13b22f42214ac… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 29 20:19:50 2014 -0500 Revert "fix typo on issue number" This reverts commit c0a0f6776d5abd993d4c851f9faddee2e1a22f18. --- news/de/2014082901.xml | 6 +++--- news/en/2014082901.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/news/de/2014082901.xml b/news/de/2014082901.xml index 83057ad..1af9566 100644 --- a/news/de/2014082901.xml +++ b/news/de/2014082901.xml @@ -1,10 +1,10 @@ <news> <date>15. August 2014</date> - <title>World Wine News Ausgabe 373</title> + <title>World Wine News Ausgabe 374</title> <body> -<a href="{$root}/wwn/373">WWN Ausgabe 373 (en)</a> wurde heute veröffentlicht. +<a href="{$root}/wwn/374">WWN Ausgabe 374 (en)</a> wurde heute veröffentlicht. <ul> -<li><a href="{$root}/wwn/373#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> +<li><a href="{$root}/wwn/374#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> </ul> </body> </news> diff --git a/news/en/2014082901.xml b/news/en/2014082901.xml index 7de2a53..1fa05c0 100644 --- a/news/en/2014082901.xml +++ b/news/en/2014082901.xml @@ -1,10 +1,10 @@ <news> <date>August 29, 2014</date> - <title>World Wine News Issue 373</title> + <title>World Wine News Issue 374</title> <body> -<a href="{$root}/wwn/373">WWN Issue 373</a> was released today. +<a href="{$root}/wwn/374">WWN Issue 374</a> was released today. <ul> -<li><a href="{$root}/wwn/373#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Status Changes</a></li> +<li><a href="{$root}/wwn/374#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Status Changes</a></li> </ul> </body> </news>

1 0

Aric Stewart : dwrite: Initialize realloc'ed memory to zero.
by Alexandre Julliard 29 Aug '14

29 Aug '14

Module: wine Branch: master Commit: bfaacf80da120b904c8be184df9d9dc8a4401cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfaacf80da120b904c8be184d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 29 10:49:41 2014 -0500 dwrite: Initialize realloc'ed memory to zero. --- dlls/dwrite/dwrite_private.h | 5 +++++ dlls/dwrite/main.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0f386ce..8fda71e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -34,6 +34,11 @@ static inline void *heap_realloc(void *mem, size_t len) return HeapReAlloc(GetProcessHeap(), 0, mem, len); } +static inline void *heap_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 59d9d64..83f705b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -468,7 +468,7 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory int new_count = 0; new_count = This->loader_count * 2; - new_list = heap_realloc(This->loaders, new_count * sizeof(*This->loaders)); + new_list = heap_realloc_zero(This->loaders, new_count * sizeof(*This->loaders)); if (!new_list) return E_OUTOFMEMORY; @@ -603,7 +603,7 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface int new_count = 0; new_count = This->file_loader_count * 2; - new_list = heap_realloc(This->file_loaders, new_count * sizeof(*This->file_loaders)); + new_list = heap_realloc_zero(This->file_loaders, new_count * sizeof(*This->file_loaders)); if (!new_list) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : msvcrt: Implement llabs().
by Alexandre Julliard 29 Aug '14

29 Aug '14

Module: wine Branch: master Commit: 60de49770c09223a5282e3f21705c497e5468663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60de49770c09223a5282e3f21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 29 20:31:18 2014 +0400 msvcrt: Implement llabs(). --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcrt/math.c | 8 ++++++++ dlls/msvcrt/msvcrt.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index aee50c0..7135638 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1726,7 +1726,7 @@ @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv -@ stub llabs +@ cdecl -ret64 llabs(int64) MSVCRT_llabs @ stub lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2f9ad70..39ad037 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2085,7 +2085,7 @@ @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv -@ stub llabs +@ cdecl -ret64 llabs(int64) MSVCRT_llabs @ stub lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3a1aa1d..d67b2e8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -766,6 +766,14 @@ MSVCRT_long CDECL MSVCRT_labs( MSVCRT_long n ) } /********************************************************************* + * llabs (MSVCRT.@) + */ +MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* * _abs64 (MSVCRT.@) */ __int64 CDECL _abs64( __int64 n ) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3349c9f..6c4e763 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -67,6 +67,7 @@ typedef unsigned short MSVCRT__ino_t; typedef unsigned int MSVCRT__fsize_t; typedef int MSVCRT_long; typedef unsigned int MSVCRT_ulong; +typedef __int64 MSVCRT_longlong; #ifdef _WIN64 typedef unsigned __int64 MSVCRT_size_t; typedef __int64 MSVCRT_intptr_t;

1 0

Nikolay Sivov : usp10/tests: Test for S_OK return value in a clean way.
by Alexandre Julliard 29 Aug '14

29 Aug '14

Module: wine Branch: master Commit: 5f52333d34f141c49d47872fbd2302708674e5f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f52333d34f141c49d47872fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 28 23:44:24 2014 +0400 usp10/tests: Test for S_OK return value in a clean way. --- dlls/usp10/tests/usp10.c | 98 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f52333d34f141c49d478…

1 0

Nikolay Sivov : advapi32: Switch to heap helpers in the rest of the code.
by Alexandre Julliard 29 Aug '14

29 Aug '14

Module: wine Branch: master Commit: ae1d5912fee72f748b2179a06d077cb877cff389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1d5912fee72f748b2179a06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 29 10:45:26 2014 +0400 advapi32: Switch to heap helpers in the rest of the code. --- dlls/advapi32/advapi.c | 4 +- dlls/advapi32/cred.c | 126 ++++++++++++++++++++++++----------------------- dlls/advapi32/eventlog.c | 20 ++++---- 3 files changed, 75 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae1d5912fee72f748b217…

1 0

Austin English : include: Add EncryptedFileRaw functions and defines.
by Alexandre Julliard 29 Aug '14

29 Aug '14

Module: wine Branch: master Commit: 62e7c3885904d1ec50bb624cb88f2ade5c7f6dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e7c3885904d1ec50bb624cb… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 27 17:33:31 2014 -0500 include: Add EncryptedFileRaw functions and defines. --- include/winbase.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 3cbddc6..dd5e816 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -704,6 +704,14 @@ typedef struct _TIME_ZONE_INFORMATION{ #define FILE_READ_ONLY 8 #define FILE_DIR_DISALOWED 9 +typedef DWORD (WINAPI *PFE_EXPORT_FUNC)(PBYTE,PVOID,ULONG); +typedef DWORD (WINAPI *PFE_IMPORT_FUNC)(PBYTE,PVOID,ULONG); + +#define CREATE_FOR_IMPORT (1) +#define CREATE_FOR_DIR (2) +#define OVERWRITE_HIDDEN (4) +#define EFSRPC_SECURE_ONLY (8) + /* File creation flags */ #define FILE_FLAG_WRITE_THROUGH 0x80000000 @@ -1584,6 +1592,7 @@ WINBASEAPI BOOL WINAPI ChangeTimerQueueTimer(HANDLE,HANDLE,ULONG,ULONG); WINADVAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL); WINBASEAPI BOOL WINAPI ClearCommBreak(HANDLE); WINBASEAPI BOOL WINAPI ClearCommError(HANDLE,LPDWORD,LPCOMSTAT); +WINADVAPI VOID WINAPI CloseEncryptedFileRaw(PVOID); WINADVAPI BOOL WINAPI ClearEventLogA(HANDLE,LPCSTR); WINADVAPI BOOL WINAPI ClearEventLogW(HANDLE,LPCWSTR); #define ClearEventLog WINELIB_NAME_AW(ClearEventLog) @@ -2204,6 +2213,9 @@ WINADVAPI BOOL WINAPI ObjectPrivilegeAuditAlarmW(LPCWSTR,LPVOID,HANDLE,D WINADVAPI HANDLE WINAPI OpenBackupEventLogA(LPCSTR,LPCSTR); WINADVAPI HANDLE WINAPI OpenBackupEventLogW(LPCWSTR,LPCWSTR); #define OpenBackupEventLog WINELIB_NAME_AW(OpenBackupEventLog) +WINADVAPI DWORD WINAPI OpenEncryptedFileRawA(LPCSTR,ULONG,PVOID*); +WINADVAPI DWORD WINAPI OpenEncryptedFileRawW(LPCWSTR,ULONG,PVOID*); +#define OpenEncryptedFileRaw WINELIB_NAME_AW(OpenEncryptedFileRaw) WINBASEAPI HANDLE WINAPI OpenEventA(DWORD,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI OpenEventW(DWORD,BOOL,LPCWSTR); #define OpenEvent WINELIB_NAME_AW(OpenEvent) @@ -2262,6 +2274,7 @@ WINADVAPI BOOL WINAPI ReadEventLogA(HANDLE,DWORD,DWORD,LPVOID,DWORD,DWOR WINADVAPI BOOL WINAPI ReadEventLogW(HANDLE,DWORD,DWORD,LPVOID,DWORD,DWORD *,DWORD *); #define ReadEventLog WINELIB_NAME_AW(ReadEventLog) WINBASEAPI BOOL WINAPI ReadDirectoryChangesW(HANDLE,LPVOID,DWORD,BOOL,DWORD,LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); +WINADVAPI DWORD WINAPI ReadEncryptedFileRaw(PFE_EXPORT_FUNC,PVOID,PVOID); WINBASEAPI BOOL WINAPI ReadFile(HANDLE,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI ReadFileEx(HANDLE,LPVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); WINBASEAPI BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); @@ -2446,6 +2459,7 @@ WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); WINBASEAPI BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); +WINADVAPI DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC,PVOID,PVOID); WINBASEAPI BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); WINBASEAPI BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED);

1 0

Nikolay Sivov : dwrite/tests: Initial tests for SetLineBreakpoints().
by Alexandre Julliard 29 Aug '14

29 Aug '14

Module: wine Branch: master Commit: 0dad47ea36eff40a5a35464315bbf2e317bbe22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dad47ea36eff40a5a3546431… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 29 14:29:27 2014 +0400 dwrite/tests: Initial tests for SetLineBreakpoints(). --- dlls/dwrite/tests/analyzer.c | 108 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 95 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 3b8a074..d4a6a91 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1,7 +1,7 @@ /* * Text analyzing tests * - * Copyright 2012 Nikolay Sivov for CodeWeavers + * Copyright 2012-2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -167,16 +167,10 @@ static void ok_sequence_(struct call_sequence **seq, int sequence_index, switch (actual->kind) { case ScriptAnalysis: - { - const struct script_analysis *sa_act = &actual->sa; - const struct script_analysis *sa_exp = &expected->sa; - - test_uint(sa_act->pos, sa_exp->pos, "position", &ctxt); - test_uint(sa_act->len, sa_exp->len, "length", &ctxt); - test_uint(sa_act->shapes, sa_exp->shapes, "shapes", &ctxt); - + test_uint(actual->sa.pos, expected->sa.pos, "position", &ctxt); + test_uint(actual->sa.len, expected->sa.len, "length", &ctxt); + test_uint(actual->sa.shapes, expected->sa.shapes, "shapes", &ctxt); break; - } default: ok(0, "%s: callback not handled, %s\n", context, get_analysis_kind_name(actual->kind)); } @@ -271,13 +265,20 @@ static HRESULT WINAPI analysissink_SetScriptAnalysis(IDWriteTextAnalysisSink *if return S_OK; } +#define BREAKPOINT_COUNT 20 +static DWRITE_LINE_BREAKPOINT g_actual_bp[BREAKPOINT_COUNT]; + static HRESULT WINAPI analysissink_SetLineBreakpoints(IDWriteTextAnalysisSink *iface, UINT32 position, UINT32 length, DWRITE_LINE_BREAKPOINT const* breakpoints) { - ok(0, "unexpected\n"); - return E_NOTIMPL; + if (position + length > BREAKPOINT_COUNT) { + ok(0, "SetLineBreakpoints: reported pos=%u, len=%u overflows expected length %d\n", position, length, BREAKPOINT_COUNT); + return E_FAIL; + } + memcpy(&g_actual_bp[position], breakpoints, length*sizeof(DWRITE_LINE_BREAKPOINT)); + return S_OK; } static HRESULT WINAPI analysissink_SetBidiLevel(IDWriteTextAnalysisSink *iface, @@ -794,7 +795,9 @@ static void init_expected_sa(struct call_sequence **seq, const struct sa_test *t struct call_entry call; call.kind = ScriptAnalysis; - call.sa = test->sa[i]; + call.sa.pos = test->sa[i].pos; + call.sa.len = test->sa[i].len; + call.sa.shapes = test->sa[i].shapes; add_call(seq, 0, &call); } @@ -825,6 +828,84 @@ static void test_AnalyzeScript(void) IDWriteTextAnalyzer_Release(analyzer); } +struct linebreaks_test { + const WCHAR text[BREAKPOINT_COUNT+1]; + DWRITE_LINE_BREAKPOINT bp[BREAKPOINT_COUNT]; +}; + +static struct linebreaks_test linebreaks_tests[] = { + { {'A','-','B',' ',0xad,'C',0x58a,'D',0x2010,'E',0x2012,'F',0x2013,'\t',0}, + { + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, TRUE, FALSE }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, FALSE, TRUE }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, FALSE, FALSE }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, TRUE, FALSE } + } + }, + { { 0 } } +}; + +static void compare_breakpoints(const struct linebreaks_test *test, DWRITE_LINE_BREAKPOINT *actual) +{ + const WCHAR *text = test->text; + int cmp = memcmp(test->bp, actual, sizeof(*actual)*BREAKPOINT_COUNT); + ok(!cmp, "%s: got wrong breakpoint data\n", wine_dbgstr_w(test->text)); + if (cmp) { + int i = 0; + while (*text) { + ok(!memcmp(&test->bp[i], &actual[i], sizeof(*actual)), + "%s: got (%d, %d, %d, %d), expected (%d, %d, %d, %d)\n", + wine_dbgstr_wn(&test->text[i], 1), + g_actual_bp[i].breakConditionBefore, + g_actual_bp[i].breakConditionAfter, + g_actual_bp[i].isWhitespace, + g_actual_bp[i].isSoftHyphen, + test->bp[i].breakConditionBefore, + test->bp[i].breakConditionAfter, + test->bp[i].isWhitespace, + test->bp[i].isSoftHyphen); + text++; + i++; + } + } +} + +static void test_SetLineBreakpoints(void) +{ + const struct linebreaks_test *ptr = linebreaks_tests; + IDWriteTextAnalyzer *analyzer; + HRESULT hr; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + while (*ptr->text) + { + g_source = ptr->text; + + memset(g_actual_bp, 0, sizeof(g_actual_bp)); + hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource, 0, lstrlenW(g_source), &analysissink); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + compare_breakpoints(ptr, g_actual_bp); + + ptr++; + } + + IDWriteTextAnalyzer_Release(analyzer); +} + START_TEST(analyzer) { HRESULT hr; @@ -841,6 +922,7 @@ START_TEST(analyzer) init_call_sequences(expected_seq, 1); test_AnalyzeScript(); + test_SetLineBreakpoints(); IDWriteFactory_Release(factory); }

1 0