wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Francois Gouget : kernel32/tests: Declare childPrintf() as a printf-style function.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: aea94f5134742567697289ffc44a8de13eff81c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea94f5134742567697289ffc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 13 12:43:04 2016 +0100 kernel32/tests: Declare childPrintf() as a printf-style function. And fix the corresponding warnings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index df0f2ec..23ade38 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -275,7 +275,7 @@ static void get_file_name(char* buf) * static void childPrintf * */ -static void childPrintf(HANDLE h, const char* fmt, ...) +static void WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { va_list valist; char buffer[1024+4*MAX_LISTED_ENV_VAR]; @@ -312,10 +312,10 @@ static void doChild(const char* file, const char* option) /* output of startup info (Ansi) */ GetStartupInfoA(&siA); childPrintf(hFile, - "[StartupInfoA]\ncb=%08ld\nlpDesktop=%s\nlpTitle=%s\n" - "dwX=%lu\ndwY=%lu\ndwXSize=%lu\ndwYSize=%lu\n" - "dwXCountChars=%lu\ndwYCountChars=%lu\ndwFillAttribute=%lu\n" - "dwFlags=%lu\nwShowWindow=%u\n" + "[StartupInfoA]\ncb=%08u\nlpDesktop=%s\nlpTitle=%s\n" + "dwX=%u\ndwY=%u\ndwXSize=%u\ndwYSize=%u\n" + "dwXCountChars=%u\ndwYCountChars=%u\ndwFillAttribute=%u\n" + "dwFlags=%u\nwShowWindow=%u\n" "hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", siA.cb, encodeA(siA.lpDesktop), encodeA(siA.lpTitle), siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize, @@ -339,10 +339,10 @@ static void doChild(const char* file, const char* option) memset(&siW, 0, sizeof(siW)); GetStartupInfoW(&siW); childPrintf(hFile, - "[StartupInfoW]\ncb=%08ld\nlpDesktop=%s\nlpTitle=%s\n" - "dwX=%lu\ndwY=%lu\ndwXSize=%lu\ndwYSize=%lu\n" - "dwXCountChars=%lu\ndwYCountChars=%lu\ndwFillAttribute=%lu\n" - "dwFlags=%lu\nwShowWindow=%u\n" + "[StartupInfoW]\ncb=%08u\nlpDesktop=%s\nlpTitle=%s\n" + "dwX=%u\ndwY=%u\ndwXSize=%u\ndwYSize=%u\n" + "dwXCountChars=%u\ndwYCountChars=%u\ndwFillAttribute=%u\n" + "dwFlags=%u\nwShowWindow=%u\n" "hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", siW.cb, encodeW(siW.lpDesktop), encodeW(siW.lpTitle), siW.dwX, siW.dwY, siW.dwXSize, siW.dwYSize, @@ -445,9 +445,9 @@ static void doChild(const char* file, const char* option) childPrintf(hFile, "InputCP=%d\nOutputCP=%d\n", GetConsoleCP(), GetConsoleOutputCP()); if (GetConsoleMode(hConIn, &modeIn)) - childPrintf(hFile, "InputMode=%ld\n", modeIn); + childPrintf(hFile, "InputMode=%u\n", modeIn); if (GetConsoleMode(hConOut, &modeOut)) - childPrintf(hFile, "OutputMode=%ld\n", modeOut); + childPrintf(hFile, "OutputMode=%u\n", modeOut); /* now that we have written all relevant information, let's change it */ SetLastError(0xdeadbeef);

1 0

Francois Gouget : kernel32/tests: Help the tests portably declare printf() -syle functions.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: f6dc7c88bac10b4f44cc195bc60407b03c861a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dc7c88bac10b4f44cc195bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 13 12:42:54 2016 +0100 kernel32/tests: Help the tests portably declare printf()-syle functions. To do so they can now use the WINETEST_PRINTF_ATTR() macro. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 8 +------- include/wine/test.h | 21 ++++++++------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 326a903..73320c6 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -30,12 +30,6 @@ #define STATUS_DEBUGGER_INACTIVE ((NTSTATUS) 0xC0000354) #endif -#ifdef __GNUC__ -#define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) -#else -#define PRINTF_ATTR(fmt,args) -#endif - #define child_ok (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_child_ok static int myARGC; @@ -49,7 +43,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static LONG child_failures; -static void PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) +static void WINETEST_PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) { va_list valist; diff --git a/include/wine/test.h b/include/wine/test.h index a5b67a0..bed44f9 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -98,20 +98,15 @@ extern int winetest_vok( int condition, const char *msg, __winetest_va_list ap ) extern void winetest_vskip( const char *msg, __winetest_va_list ap ); #ifdef __GNUC__ +# define WINETEST_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +# define WINETEST_PRINTF_ATTR(fmt,args) +#endif -extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); -extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); - -#else /* __GNUC__ */ - -extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ); -extern void __winetest_cdecl winetest_skip( const char *msg, ... ); -extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ); -extern void __winetest_cdecl winetest_trace( const char *msg, ... ); - -#endif /* __GNUC__ */ +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) WINETEST_PRINTF_ATTR(2,3); +extern void __winetest_cdecl winetest_skip( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); +extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); +extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); #define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok #define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip

1 0

Francois Gouget : tests: Use plain printf() calls instead of fprintf( stdout).
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 4a983e31187b754c29bf852dd4412be95d62d1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a983e31187b754c29bf852dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 13 12:41:42 2016 +0100 tests: Use plain printf() calls instead of fprintf(stdout). The fprintf() calls are a left-over from when errors were reported to stderr. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 65 +++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 567229a..a5b67a0 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -310,9 +310,9 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - fprintf( stdout, "%s:%d: Test succeeded inside todo block: ", - data->current_file, data->current_line ); - vfprintf(stdout, msg, args); + printf( "%s:%d: Test succeeded inside todo block: ", + data->current_file, data->current_line ); + vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; } @@ -320,9 +320,9 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - fprintf( stdout, "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); - vfprintf(stdout, msg, args); + printf( "%s:%d: Test marked todo: ", + data->current_file, data->current_line ); + vprintf(msg, args); } InterlockedIncrement(&todo_successes); return 1; @@ -332,17 +332,17 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - fprintf( stdout, "%s:%d: Test failed: ", - data->current_file, data->current_line ); - vfprintf(stdout, msg, args); + printf( "%s:%d: Test failed: ", + data->current_file, data->current_line ); + vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { if (report_success) - fprintf( stdout, "%s:%d: Test succeeded\n", - data->current_file, data->current_line); + printf( "%s:%d: Test succeeded\n", + data->current_file, data->current_line); InterlockedIncrement(&successes); return 1; } @@ -365,9 +365,9 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_debug > 0) { - fprintf( stdout, "%s:%d: ", data->current_file, data->current_line ); + printf( "%s:%d: ", data->current_file, data->current_line ); __winetest_va_start(valist, msg); - vfprintf(stdout, msg, valist); + vprintf(msg, valist); __winetest_va_end(valist); } } @@ -376,8 +376,8 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); - fprintf( stdout, "%s:%d: Tests skipped: ", data->current_file, data->current_line ); - vfprintf(stdout, msg, args); + printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + vprintf(msg, args); skipped++; } @@ -447,7 +447,7 @@ void winetest_wait_child_process( HANDLE process ) DWORD exit_code = 1; if (WaitForSingleObject( process, 30000 )) - fprintf( stdout, "%s: child process wait failed\n", current_test->name ); + printf( "%s: child process wait failed\n", current_test->name ); else GetExitCodeProcess( process, &exit_code ); @@ -455,13 +455,13 @@ void winetest_wait_child_process( HANDLE process ) { if (exit_code > 255) { - fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + printf( "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); InterlockedIncrement( &failures ); } else { - fprintf( stdout, "%s: %u failures in child process\n", - current_test->name, exit_code ); + printf( "%s: %u failures in child process\n", + current_test->name, exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -562,8 +562,9 @@ static void list_tests(void) { const struct test *test; - fprintf( stdout, "Valid test names:\n" ); - for (test = winetest_testlist; test->name; test++) fprintf( stdout, " %s\n", test->name ); + printf( "Valid test names:\n" ); + for (test = winetest_testlist; test->name; test++) + printf( " %s\n", test->name ); } @@ -575,7 +576,7 @@ static int run_test( const char *name ) if (!(test = find_test( name ))) { - fprintf( stdout, "Fatal: test '%s' does not exist.\n", name ); + printf( "Fatal: test '%s' does not exist.\n", name ); exit_process(1); } successes = failures = todo_successes = todo_failures = 0; @@ -585,11 +586,11 @@ static int run_test( const char *name ) if (winetest_debug) { - fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - test->name, successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", - skipped ); + printf( "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + test->name, successes + failures + todo_successes + todo_failures, + todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", + skipped ); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status; @@ -599,7 +600,7 @@ static int run_test( const char *name ) /* Display usage and exit */ static void usage( const char *argv0 ) { - fprintf( stdout, "Usage: %s test_name\n\n", argv0 ); + printf( "Usage: %s test_name\n\n", argv0 ); list_tests(); exit_process(1); } @@ -610,10 +611,10 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) tls_data *data = get_tls_data(); if (data->current_file) - fprintf( stdout, "%s:%d: this is the last test seen before the exception\n", - data->current_file, data->current_line ); - fprintf( stdout, "%s: unhandled exception %08x at %p\n", current_test->name, - ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); + printf( "%s:%d: this is the last test seen before the exception\n", + data->current_file, data->current_line ); + printf( "%s: unhandled exception %08x at %p\n", current_test->name, + ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); return EXCEPTION_EXECUTE_HANDLER; }

1 0

Thomas Faller : dde: Fix use-after-free.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 4e7a7d01ffd1bbbb07acfe08ebf74046ad1f9d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7a7d01ffd1bbbb07acfe08e… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Jan 12 22:06:30 2016 +0100 dde: Fix use-after-free. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dde_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 633331d..989131c 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -778,7 +778,7 @@ static WDML_QUEUE_STATE WDML_HandlePokeReply(WDML_CONV* pConv, MSG* msg, WDML_XA GlobalDeleteAtom(uiHi); if (ack) *ack = uiLo; - GlobalFree(pXAct->hMem); + pXAct->hMem = GlobalFree(pXAct->hMem); pXAct->hDdeData = (HDDEDATA)TRUE; return TRUE;

1 0

Nikolay Sivov : dwrite: Fix strikethrough baseline origin.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 18b0ca3fe3325d9666186a7c87d9b10b301a01b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b0ca3fe3325d9666186a7c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:09 2016 +0300 dwrite: Fix strikethrough baseline origin. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6d62b82..daa56e9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3002,8 +3002,8 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, LIST_FOR_EACH_ENTRY(s, &This->strikethrough, struct layout_strikethrough, entry) { IDWriteTextRenderer_DrawStrikethrough(renderer, context, - s->run->origin_x, - SNAP_COORD(s->run->origin_y), + s->run->origin_x + run->align_dx + origin_x, + SNAP_COORD(s->run->origin_y + origin_y), &s->s, s->run->effect); }

1 0

Nikolay Sivov : dwrite: Pass drawing effect to renderer in DrawStrikethrough().
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 1a8e957b194c53f5058e3b76dd058aaf5561ce5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a8e957b194c53f5058e3b76d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:08 2016 +0300 dwrite: Pass drawing effect to renderer in DrawStrikethrough(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 09dbcfb..6d62b82 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3005,7 +3005,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, s->run->origin_x, SNAP_COORD(s->run->origin_y), &s->s, - NULL); + s->run->effect); } #undef SNAP_COORD

1 0

Nikolay Sivov : dwrite: Pass drawing effect to renderer in DrawGlyphRun().
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 2b5928b2287fbe5b77beaa798353c731969b1bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5928b2287fbe5b77beaa798… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:07 2016 +0300 dwrite: Pass drawing effect to renderer in DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 +++- dlls/dwrite/tests/layout.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 344523c..09dbcfb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -184,6 +184,7 @@ struct layout_effective_run { UINT32 start; /* relative text position, 0 means first text position of a nominal run */ UINT32 length; /* length in codepoints that this run covers */ UINT32 glyphcount; /* total glyph count in this run */ + IUnknown *effect; /* original reference is kept only at range level */ FLOAT origin_x; /* baseline X position */ FLOAT origin_y; /* baseline Y position */ FLOAT align_dx; /* adjustment from text alignment */ @@ -1106,6 +1107,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const for (i = 0; i < length; i++) run->clustermap[i] = r->u.regular.clustermap[start + i] - r->u.regular.clustermap[start]; + run->effect = params->effect; list_add_tail(&layout->eruns, &run->entry); /* Strikethrough style is guaranteed to be consistent within effective run, @@ -2979,7 +2981,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, This->measuringmode, &glyph_run, &descr, - NULL); + run->effect); } /* 2. Inline objects */ diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index bb5963f..07829bd 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2998,7 +2998,7 @@ static void test_SetDrawingEffect(void) flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draweffect2_seq, "effect draw test 2", TRUE); + ok_sequence(sequences, RENDERER_ID, draweffect2_seq, "effect draw test 2", FALSE); IDWriteTextLayout_Release(layout); /* Inline object - effect set for same range */

1 0

Nikolay Sivov : dwrite: Keep underlines in separate list.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: c0fb6f436baa74e9c60d7adf7acb135bc8c51bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fb6f436baa74e9c60d7adf7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:06 2016 +0300 dwrite: Keep underlines in separate list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 097adee..344523c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -102,6 +102,7 @@ struct layout_range_attr_value { enum layout_range_kind { LAYOUT_RANGE_REGULAR, + LAYOUT_RANGE_UNDERLINE, LAYOUT_RANGE_STRIKETHROUGH, LAYOUT_RANGE_EFFECT, LAYOUT_RANGE_SPACING, @@ -121,7 +122,6 @@ struct layout_range { FLOAT fontsize; DWRITE_FONT_STRETCH stretch; IDWriteInlineObject *object; - BOOL underline; BOOL pair_kerning; IDWriteFontCollection *collection; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; @@ -234,6 +234,7 @@ struct dwrite_textlayout { UINT32 len; struct dwrite_textformat_data format; struct list strike_ranges; + struct list underline_ranges; struct list typographies; struct list effects; struct list spacing; @@ -1627,7 +1628,7 @@ static BOOL is_same_layout_attrvalue(struct layout_range_header const *h, enum l case LAYOUT_RANGE_ATTR_EFFECT: return range_iface->iface == value->u.effect; case LAYOUT_RANGE_ATTR_UNDERLINE: - return range->underline == value->u.underline; + return range_bool->value == value->u.underline; case LAYOUT_RANGE_ATTR_STRIKETHROUGH: return range_bool->value == value->u.strikethrough; case LAYOUT_RANGE_ATTR_PAIR_KERNING: @@ -1664,12 +1665,12 @@ static inline BOOL is_same_layout_attributes(struct layout_range_header const *h left->stretch == right->stretch && left->fontsize == right->fontsize && left->object == right->object && - left->underline == right->underline && left->pair_kerning == right->pair_kerning && left->collection == right->collection && !strcmpiW(left->locale, right->locale) && !strcmpW(left->fontfamily, right->fontfamily); } + case LAYOUT_RANGE_UNDERLINE: case LAYOUT_RANGE_STRIKETHROUGH: { struct layout_range_bool const *left = (struct layout_range_bool const*)hleft; @@ -1722,7 +1723,6 @@ static struct layout_range_header *alloc_layout_range(struct dwrite_textlayout * range->stretch = layout->format.stretch; range->fontsize = layout->format.fontsize; range->object = NULL; - range->underline = FALSE; range->pair_kerning = FALSE; range->fontfamily = heap_strdupW(layout->format.family_name); @@ -1739,6 +1739,7 @@ static struct layout_range_header *alloc_layout_range(struct dwrite_textlayout * h = &range->h; break; } + case LAYOUT_RANGE_UNDERLINE: case LAYOUT_RANGE_STRIKETHROUGH: { struct layout_range_bool *range; @@ -1813,6 +1814,7 @@ static struct layout_range_header *alloc_layout_range_from(struct layout_range_h ret = &range->h; break; } + case LAYOUT_RANGE_UNDERLINE: case LAYOUT_RANGE_STRIKETHROUGH: { struct layout_range_bool *strike = heap_alloc(sizeof(*strike)); @@ -1894,6 +1896,11 @@ static void free_layout_ranges_list(struct dwrite_textlayout *layout) free_layout_range(cur); } + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->underline_ranges, struct layout_range_header, entry) { + list_remove(&cur->entry); + free_layout_range(cur); + } + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->strike_ranges, struct layout_range_header, entry) { list_remove(&cur->entry); free_layout_range(cur); @@ -1993,8 +2000,8 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: - changed = dest->underline != value->u.underline; - dest->underline = value->u.underline; + changed = dest_bool->value != value->u.underline; + dest_bool->value = value->u.underline; break; case LAYOUT_RANGE_ATTR_STRIKETHROUGH: changed = dest_bool->value != value->u.strikethrough; @@ -2069,13 +2076,15 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo case LAYOUT_RANGE_ATTR_STRETCH: case LAYOUT_RANGE_ATTR_FONTSIZE: case LAYOUT_RANGE_ATTR_INLINE: - case LAYOUT_RANGE_ATTR_UNDERLINE: case LAYOUT_RANGE_ATTR_PAIR_KERNING: case LAYOUT_RANGE_ATTR_FONTCOLL: case LAYOUT_RANGE_ATTR_LOCALE: case LAYOUT_RANGE_ATTR_FONTFAMILY: ranges = &layout->ranges; break; + case LAYOUT_RANGE_ATTR_UNDERLINE: + ranges = &layout->underline_ranges; + break; case LAYOUT_RANGE_ATTR_STRIKETHROUGH: ranges = &layout->strike_ranges; break; @@ -2778,15 +2787,12 @@ static HRESULT WINAPI dwritetextlayout_GetUnderline(IDWriteTextLayout2 *iface, UINT32 position, BOOL *underline, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range *range; + struct layout_range_bool *range; TRACE("(%p)->(%u %p %p)\n", This, position, underline, r); - if (position >= This->len) - return S_OK; - - range = get_layout_range_by_pos(This, position); - *underline = range->underline; + range = (struct layout_range_bool*)get_layout_range_header_by_pos(&This->underline_ranges, position); + *underline = range->value; return return_range(&range->h, r); } @@ -4032,7 +4038,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) { - struct layout_range_header *range, *strike, *effect, *spacing, *typography; + struct layout_range_header *range, *strike, *underline, *effect, *spacing, *typography; static const DWRITE_TEXT_RANGE r = { 0, ~0u }; HRESULT hr; @@ -4057,6 +4063,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * list_init(&layout->runs); list_init(&layout->ranges); list_init(&layout->strike_ranges); + list_init(&layout->underline_ranges); list_init(&layout->effects); list_init(&layout->spacing); list_init(&layout->typographies); @@ -4081,12 +4088,14 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * range = alloc_layout_range(layout, &r, LAYOUT_RANGE_REGULAR); strike = alloc_layout_range(layout, &r, LAYOUT_RANGE_STRIKETHROUGH); + underline = alloc_layout_range(layout, &r, LAYOUT_RANGE_UNDERLINE); effect = alloc_layout_range(layout, &r, LAYOUT_RANGE_EFFECT); spacing = alloc_layout_range(layout, &r, LAYOUT_RANGE_SPACING); typography = alloc_layout_range(layout, &r, LAYOUT_RANGE_TYPOGRAPHY); - if (!range || !strike || !effect || !spacing || !typography) { + if (!range || !strike || !effect || !spacing || !typography || !underline) { free_layout_range(range); free_layout_range(strike); + free_layout_range(underline); free_layout_range(effect); free_layout_range(spacing); free_layout_range(typography); @@ -4096,6 +4105,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * list_add_head(&layout->ranges, &range->entry); list_add_head(&layout->strike_ranges, &strike->entry); + list_add_head(&layout->underline_ranges, &underline->entry); list_add_head(&layout->effects, &effect->entry); list_add_head(&layout->spacing, &spacing->entry); list_add_head(&layout->typographies, &typography->entry);

1 0

Nikolay Sivov : dwrite: Start new effective run on strikethrough, underline or effect change.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: a4562cca50d9587b7eafacd4f99b0b9ecd08f6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4562cca50d9587b7eafacd4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:05 2016 +0300 dwrite: Start new effective run on strikethrough, underline or effect change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 63 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 02772ff..097adee 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -986,10 +986,47 @@ static inline BOOL layout_is_erun_rtl(const struct layout_effective_run *erun) return erun->run->u.regular.run.bidiLevel & 1; } +/* A set of parameters that additionally slits resulting runs. It happens after shaping and all text processing, + no glyph changes are possible. It's understandable for effects, because DrawGlyphRun() will report them, + but it also happens for decorations, so every effective run has uniform underline/strikethough/effect tuple. */ +struct layout_final_splitting_params { + BOOL strikethrough; + BOOL underline; + IUnknown *effect; +}; + +static inline BOOL layout_get_strikethrough_from_pos(struct dwrite_textlayout *layout, UINT32 pos) +{ + struct layout_range_header *h = get_layout_range_header_by_pos(&layout->strike_ranges, pos); + return ((struct layout_range_bool*)h)->value; +} + +static inline BOOL layout_get_underline_from_pos(struct dwrite_textlayout *layout, UINT32 pos) +{ + struct layout_range_header *h = get_layout_range_header_by_pos(&layout->ranges, pos); + return ((struct layout_range_bool*)h)->value; +} + +static void layout_splitting_params_from_pos(struct dwrite_textlayout *layout, UINT32 pos, + struct layout_final_splitting_params *params) +{ + params->strikethrough = layout_get_strikethrough_from_pos(layout, pos); + params->underline = layout_get_underline_from_pos(layout, pos); + params->effect = layout_get_effect_from_pos(layout, pos); +} + +static BOOL is_same_splitting_params(const struct layout_final_splitting_params *left, + const struct layout_final_splitting_params *right) +{ + return left->strikethrough == right->strikethrough && + left->underline == right->underline && + left->effect == right->effect; +} + /* Effective run is built from consecutive clusters of a single nominal run, 'first_cluster' is 0 based cluster index, 'cluster_count' indicates how many clusters to add, including first one. */ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 first_cluster, - UINT32 cluster_count, UINT32 line, FLOAT origin_x, BOOL strikethrough) + UINT32 cluster_count, UINT32 line, FLOAT origin_x, struct layout_final_splitting_params *params) { BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; UINT32 i, start, length, last_cluster; @@ -1073,7 +1110,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const /* Strikethrough style is guaranteed to be consistent within effective run, it's width equals to run width, thikness and offset are derived from font metrics, rest of the values are from layout or run itself */ - if (strikethrough) { + if (params->strikethrough) { DWRITE_FONT_METRICS metrics = { 0 }; struct layout_strikethrough *s; @@ -1132,11 +1169,6 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ return S_OK; } -static inline BOOL layout_get_strikethrough_from_pos(struct dwrite_textlayout *layout, UINT32 pos) -{ - struct layout_range_header *h = get_layout_range_header_by_pos(&layout->strike_ranges, pos); - return ((struct layout_range_bool*)h)->value; -} static inline struct layout_effective_run *layout_get_next_erun(struct dwrite_textlayout *layout, const struct layout_effective_run *cur) @@ -1390,9 +1422,11 @@ static void layout_apply_par_alignment(struct dwrite_textlayout *layout) } } + static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) { BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; + struct layout_final_splitting_params prev_params, params; struct layout_effective_inline *inrun; struct layout_effective_run *erun; const struct layout_run *run; @@ -1400,7 +1434,6 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) FLOAT width, origin_x, origin_y; UINT32 i, start, line, textpos; HRESULT hr; - BOOL s[2]; if (!(layout->recompute & RECOMPUTE_EFFECTIVE_RUNS)) return S_OK; @@ -1414,17 +1447,19 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) line = 0; run = layout->clusters[0].run; memset(&metrics, 0, sizeof(metrics)); - s[0] = s[1] = layout_get_strikethrough_from_pos(layout, 0); + + layout_splitting_params_from_pos(layout, 0, &params); + prev_params = params; for (i = 0, start = 0, textpos = 0, width = 0.0f; i < layout->cluster_count; i++) { BOOL overflow; - s[1] = layout_get_strikethrough_from_pos(layout, textpos); + layout_splitting_params_from_pos(layout, textpos, &params); /* switched to next nominal run, at this point all previous pending clusters are already checked for layout line overflow, so new effective run will fit in current line */ - if (run != layout->clusters[i].run || s[0] != s[1]) { - hr = layout_add_effective_run(layout, run, start, i - start, line, origin_x, s[0]); + if (run != layout->clusters[i].run || !is_same_splitting_params(&prev_params, &params)) { + hr = layout_add_effective_run(layout, run, start, i - start, line, origin_x, &prev_params); if (FAILED(hr)) return hr; origin_x += is_rtl ? -get_cluster_range_width(layout, start, i) : @@ -1452,7 +1487,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) last_cluster = i ? i - 1 : i; if (i >= start) { - hr = layout_add_effective_run(layout, run, start, last_cluster - start + 1, line, origin_x, s[0]); + hr = layout_add_effective_run(layout, run, start, last_cluster - start + 1, line, origin_x, &prev_params); if (FAILED(hr)) return hr; /* we don't need to update origin for next run as we're going to wrap */ @@ -1524,7 +1559,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) width += layout->clustermetrics[i].width; } - s[0] = s[1]; + prev_params = params; textpos += layout->clustermetrics[i].length; }

1 0

Andrew Eikum : xaudio2_0: Use shared source.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: a6126ea2844748b00bd5e931deb3819898b8df42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6126ea2844748b00bd5e931d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 13:31:26 2016 -0600 xaudio2_0: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xaudio2_0/Makefile.in | 7 ++++- dlls/xaudio2_0/xaudio2_0.spec | 2 +- dlls/xaudio2_0/xaudio_classes.idl | 42 ------------------------------ dlls/xaudio2_0/xaudio_dll.c | 54 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 23 +++++++++++++++++ 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/configure b/configure index 09869ac..339a734 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_0=${enable_xaudio2_0:-no} enable_xaudio2_1=${enable_xaudio2_1:-no} enable_xaudio2_2=${enable_xaudio2_2:-no} enable_xaudio2_3=${enable_xaudio2_3:-no} diff --git a/configure.ac b/configure.ac index cb3de07..3712906 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_0=${enable_xaudio2_0:-no} enable_xaudio2_1=${enable_xaudio2_1:-no} enable_xaudio2_2=${enable_xaudio2_2:-no} enable_xaudio2_3=${enable_xaudio2_3:-no} diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in index cc9d161..c0e31e3 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -1,7 +1,12 @@ +EXTRADEFS = -DXAUDIO2_VER=0 MODULE = xaudio2_0.dll -IMPORTS = ole32 +IMPORTS = advapi32 kernel32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 C_SRCS = \ + compat.c \ + xapofx.c \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_0/xaudio2_0.spec b/dlls/xaudio2_0/xaudio2_0.spec index cb263d4..b16365d 100644 --- a/dlls/xaudio2_0/xaudio2_0.spec +++ b/dlls/xaudio2_0/xaudio2_0.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_0/xaudio_classes.idl b/dlls/xaudio2_0/xaudio_classes.idl deleted file mode 100644 index 08693fc..0000000 --- a/dlls/xaudio2_0/xaudio_classes.idl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * COM Classes for xaudio - * - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * 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 - */ - -#pragma makedep register - -[ - helpstring("XAudio2.0 Class"), - threading(both), - uuid(fac23f48-31f5-45a8-b49b-5225d61401aa) -] -coclass XAudio20 { interface IXAudio20; } - -[ - helpstring("XAudio2.0 AudioReverb Class"), - threading(both), - uuid(6f6ea3a9-2cf5-41cf-91c1-2170b1540063) -] -coclass AudioReverb20 { interface IXAPO; } - -[ - helpstring("XAudio2.0 AudioVolumeMeter Class"), - threading(both), - uuid(c0c56f46-29b1-44e9-9939-a32ce86867e2) -] -coclass AudioVolumeMeter20 { interface IXAPO; } diff --git a/dlls/xaudio2_0/xaudio_dll.c b/dlls/xaudio2_0/xaudio_dll.c deleted file mode 100644 index e55861c..0000000 --- a/dlls/xaudio2_0/xaudio_dll.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015 Andrew Eikum for CodeWeavers - * - * 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinstance; - DisableThreadLibraryCalls(hinstance); - break; - } - return TRUE; -} - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources(instance); -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources(instance); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 6e460ac..28c8667 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -257,3 +257,26 @@ coclass AudioReverb21 { interface IXAPO; } ] coclass AudioVolumeMeter21 { interface IXAPO; } #endif /* XAUDIO2_VER == 1 */ + +#if XAUDIO2_VER == 0 +[ + helpstring("XAudio2.0 Class"), + threading(both), + uuid(fac23f48-31f5-45a8-b49b-5225d61401aa) +] +coclass XAudio20 { interface IXAudio20; } + +[ + helpstring("XAudio2.0 AudioReverb Class"), + threading(both), + uuid(6f6ea3a9-2cf5-41cf-91c1-2170b1540063) +] +coclass AudioReverb20 { interface IXAPO; } + +[ + helpstring("XAudio2.0 AudioVolumeMeter Class"), + threading(both), + uuid(c0c56f46-29b1-44e9-9939-a32ce86867e2) +] +coclass AudioVolumeMeter20 { interface IXAPO; } +#endif /* XAUDIO2_VER == 0 */

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
63
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 January 2016