April 2017 - Wine-Commits - list.winehq.org

Daniel Lehman : msvcrt: Add _iswctype_l.
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: bda232de94d784e4cfaf5e252f76034722f8f58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda232de94d784e4cfaf5e252… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 3 11:52:18 2017 -0700 msvcrt: Add _iswctype_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/tests/misc.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 4b08bc6..fe3ae54 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -25,7 +25,7 @@ @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l -@ stub _iswctype_l +@ cdecl _iswctype_l(long long ptr) ucrtbase._iswctype_l @ cdecl _iswdigit_l(long ptr) ucrtbase._iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 45eb181..2c0f3c9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1021,7 +1021,7 @@ @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l -@ stub _iswctype_l +@ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 25fb21b..dcaa089 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1367,7 +1367,7 @@ @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l -@ stub _iswctype_l +@ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c779528..1701c4a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1373,7 +1373,7 @@ @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l -@ stub _iswctype_l +@ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 8ca6c5f..023aa00 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1238,7 +1238,7 @@ @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l -@ stub _iswctype_l +@ cdecl _iswctype_l(long long ptr) msvcr120._iswctype_l @ cdecl _iswdigit_l(long ptr) msvcr120._iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4b51ae1..de945d5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -693,7 +693,7 @@ @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l -@ stub _iswctype_l +@ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9e9f73b..8b4a77c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -671,7 +671,7 @@ @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l -@ stub _iswctype_l +@ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ecef9b8..1a887d3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -636,7 +636,7 @@ # stub _iswalnum_l(long ptr) @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l # stub _iswcntrl_l(long ptr) -# stub _iswctype_l(long long ptr) +@ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l # stub _iswgraph_l(long ptr) # stub _iswlower_l(long ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index bd7cc20..89c4152 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1858,6 +1858,14 @@ INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswctype_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) +{ + return (get_char_typeW(wc) & 0xffff) & type; +} + +/********************************************************************* * wcscpy_s (MSVCRT.@) */ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 910a0f9..5a1f8dc 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -89,6 +89,7 @@ static MSVCRT_lldiv_t (CDECL *p_lldiv)(LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); +static int (CDECL *p__iswctype_l)(int,int,_locale_t); static void test__initialize_onexit_table(void) { @@ -386,6 +387,7 @@ static BOOL init(void) p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); + p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); return TRUE; } @@ -484,6 +486,19 @@ static void test_isblank(void) ok(!p__isblank_l(c, NULL), "%d shouldn't be blank\n", c); } } + + for(c = 0; c <= 0xffff; c++) { + if(c == '\t' || c == ' ' || c == 0x3000 || c == 0xfeff) { + if(c == '\t') + todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); + else + ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); + } else { + todo_wine_if(c == 0xa0) { + ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + } + } + } } START_TEST(misc) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8f1284c..9c0b807 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -512,7 +512,7 @@ @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l -@ stub _iswctype_l +@ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l

1 0

Ken Thomases : winemac: Send Help key presses directly to the window, bypassing -[NSApplication sendEvent:].
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: 4b8c0d8784593d2830f66407a51e88934ad7adb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8c0d8784593d2830f66407a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 3 20:57:14 2017 -0500 winemac: Send Help key presses directly to the window, bypassing -[NSApplication sendEvent:]. -[NSApplication sendEvent:] seems to consume the event and doesn't pass it along to the window. Mac keyboards haven't included a Help key for a long time, but users with PC keyboards can use the Insert key, which is in the same position. The Mac driver translates either one to VK_INSERT. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 27ebdc4..6d1473a 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1973,6 +1973,17 @@ static NSString* WineLocalizedString(unsigned int stringID) [self handleScrollWheel:anEvent]; ret = mouseCaptureWindow != nil; } + else if (type == NSKeyDown) + { + // -[NSApplication sendEvent:] seems to consume presses of the Help + // key (Insert key on PC keyboards), so we have to bypass it and + // send the event directly to the window. + if (anEvent.keyCode == kVK_Help) + { + [anEvent.window sendEvent:anEvent]; + ret = TRUE; + } + } else if (type == NSKeyUp) { uint16_t keyCode = [anEvent keyCode];

1 0

Henri Verbeet : wined3d: Reduce indentation in the colour blit case in wined3d_surface_blt().
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: ce5b25b8bcb1940c5da72de8826723f1bfb050b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5b25b8bcb1940c5da72de88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 09:07:44 2017 +0200 wined3d: Reduce indentation in the colour blit case in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 173 ++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce5b25b8bcb1940c5da72…

1 0

Henri Verbeet : wined3d: Get rid of wined3d_select_blitter().
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: cad4badbcf25992e0c61521aa15e639c2611f5d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad4badbcf25992e0c61521aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 09:07:43 2017 +0200 wined3d: Get rid of wined3d_select_blitter(). Instead, chain the blitters themselves. This also fixes the issue that currently only a single blitter can store extra data in the "blit_priv" field of struct wined3d_device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 141 ++++++++++------ dlls/wined3d/device.c | 27 +-- dlls/wined3d/directx.c | 12 -- dlls/wined3d/surface.c | 335 ++++++++++++++++++++++---------------- dlls/wined3d/swapchain.c | 14 +- dlls/wined3d/utils.c | 31 ---- dlls/wined3d/wined3d_private.h | 40 +++-- 7 files changed, 313 insertions(+), 287 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cad4badbcf25992e0c615…

1 0

Daniel Lehman : ucrtbase: Add _isblank_l.
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: 724a09abb573d902913b76a610de03da68e19229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724a09abb573d902913b76a61… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 3 09:24:40 2017 -0700 ucrtbase: Add _isblank_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/ctype.c | 16 +++++++++++++ dlls/ucrtbase/tests/misc.c | 27 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 6 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 0095feb..4b08bc6 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -7,7 +7,7 @@ @ stub __wcsncnt @ cdecl _isalnum_l(long ptr) ucrtbase._isalnum_l @ cdecl _isalpha_l(long ptr) ucrtbase._isalpha_l -@ stub _isblank_l +@ cdecl _isblank_l(long ptr) ucrtbase._isblank_l @ cdecl _iscntrl_l(long ptr) ucrtbase._iscntrl_l @ cdecl _isctype(long long) ucrtbase._isctype @ cdecl _isctype_l(long long ptr) ucrtbase._isctype_l @@ -100,7 +100,7 @@ @ cdecl is_wctype(long long) ucrtbase.is_wctype @ cdecl isalnum(long) ucrtbase.isalnum @ cdecl isalpha(long) ucrtbase.isalpha -@ stub isblank +@ cdecl isblank(long) ucrtbase.isblank @ cdecl iscntrl(long) ucrtbase.iscntrl @ cdecl isdigit(long) ucrtbase.isdigit @ cdecl isgraph(long) ucrtbase.isgraph diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index bb14b78..c779528 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1291,7 +1291,7 @@ @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l @ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l @ cdecl _isatty(long) MSVCRT__isatty -@ stub _isblank_l +@ cdecl _isblank_l(long ptr) MSVCRT__isblank_l @ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l @ cdecl _isctype(long long) MSVCRT__isctype @ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l @@ -2215,7 +2215,7 @@ @ cdecl is_wctype(long long) ntdll.iswctype @ cdecl isalnum(long) MSVCRT_isalnum @ cdecl isalpha(long) MSVCRT_isalpha -@ stub isblank +@ cdecl isblank(long) MSVCRT_isblank @ cdecl iscntrl(long) MSVCRT_iscntrl @ cdecl isdigit(long) MSVCRT_isdigit @ cdecl isgraph(long) MSVCRT_isgraph diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 060438d..8ca6c5f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1194,7 +1194,7 @@ @ cdecl _isalnum_l(long ptr) msvcr120._isalnum_l @ cdecl _isalpha_l(long ptr) msvcr120._isalpha_l @ cdecl _isatty(long) msvcr120._isatty -@ stub _isblank_l +@ cdecl _isblank_l(long ptr) msvcr120._isblank_l @ cdecl _iscntrl_l(long ptr) msvcr120._iscntrl_l @ cdecl _isctype(long long) msvcr120._isctype @ cdecl _isctype_l(long long ptr) msvcr120._isctype_l @@ -1878,7 +1878,7 @@ @ stub imaxdiv @ cdecl isalnum(long) msvcr120.isalnum @ cdecl isalpha(long) msvcr120.isalpha -@ stub isblank +@ cdecl isblank(long) msvcr120.isblank @ cdecl iscntrl(long) msvcr120.iscntrl @ cdecl isdigit(long) msvcr120.isdigit @ cdecl isgraph(long) msvcr120.isgraph diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 8b9d14c..eb9891a 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -293,6 +293,22 @@ int CDECL MSVCRT_isxdigit(int c) } /********************************************************************* + * _isblank_l (MSVCRT.@) + */ +int CDECL MSVCRT__isblank_l(int c, MSVCRT__locale_t locale) +{ + return c == '\t' || MSVCRT__isctype_l( c, MSVCRT__BLANK, locale ); +} + +/********************************************************************* + * isblank (MSVCRT.@) + */ +int CDECL MSVCRT_isblank(int c) +{ + return c == '\t' || MSVCRT__isctype( c, MSVCRT__BLANK ); +} + +/********************************************************************* * __isascii (MSVCRT.@) */ int CDECL MSVCRT___isascii(int c) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 5f1d2a1..910a0f9 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -86,6 +86,9 @@ static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); static MSVCRT_lldiv_t (CDECL *p_lldiv)(LONGLONG,LONGLONG); +static int (CDECL *p__isctype)(int,int); +static int (CDECL *p_isblank)(int); +static int (CDECL *p__isblank_l)(int,_locale_t); static void test__initialize_onexit_table(void) { @@ -380,6 +383,9 @@ static BOOL init(void) p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); p_lldiv = (void*)GetProcAddress(module, "lldiv"); + p__isctype = (void*)GetProcAddress(module, "_isctype"); + p_isblank = (void*)GetProcAddress(module, "isblank"); + p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); return TRUE; } @@ -460,6 +466,26 @@ static void test_lldiv(void) ok(r.rem == 0x222, "rem = %x%08x\n", (INT32)(r.rem >> 32), (UINT32)r.rem); } +static void test_isblank(void) +{ + int c; + + for(c = 0; c <= 0xff; c++) { + if(c == '\t' || c == ' ') { + if(c == '\t') + ok(!p__isctype(c, _BLANK), "tab shouldn't be blank\n"); + else + ok(p__isctype(c, _BLANK), "space should be blank\n"); + ok(p_isblank(c), "%d should be blank\n", c); + ok(p__isblank_l(c, NULL), "%d should be blank\n", c); + } else { + ok(!p__isctype(c, _BLANK), "%d shouldn't be blank\n", c); + ok(!p_isblank(c), "%d shouldn't be blank\n", c); + ok(!p__isblank_l(c, NULL), "%d shouldn't be blank\n", c); + } + } +} + START_TEST(misc) { int arg_c; @@ -483,4 +509,5 @@ START_TEST(misc) test__sopen_dispatch(); test__sopen_s(); test_lldiv(); + test_isblank(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d4f3d7e..8f1284c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -430,7 +430,7 @@ @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l @ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l @ cdecl _isatty(long) MSVCRT__isatty -@ stub _isblank_l +@ cdecl _isblank_l(long ptr) MSVCRT__isblank_l @ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l @ cdecl _isctype(long long) MSVCRT__isctype @ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l @@ -2349,7 +2349,7 @@ @ cdecl is_wctype(long long) ntdll.iswctype @ cdecl isalnum(long) MSVCRT_isalnum @ cdecl isalpha(long) MSVCRT_isalpha -@ stub isblank +@ cdecl isblank(long) MSVCRT_isblank @ cdecl iscntrl(long) MSVCRT_iscntrl @ cdecl isdigit(long) MSVCRT_isdigit @ cdecl isgraph(long) MSVCRT_isgraph

1 0

Henri Verbeet : wined3d: Use the blitter interface in wined3d_cs_exec_clear().
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: b98ece0d38ca3ec401370ccf95eb08946533850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98ece0d38ca3ec401370ccf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 09:07:47 2017 +0200 wined3d: Use the blitter interface in wined3d_cs_exec_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 ++-- dlls/wined3d/cs.c | 5 ++-- dlls/wined3d/device.c | 4 +-- dlls/wined3d/surface.c | 61 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index db07d76..4eb603f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7877,14 +7877,14 @@ static void arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli } static void arbfp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next; if ((next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, - clear_rect, draw_rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); } static const struct wined3d_blitter_ops arbfp_blitter_ops = diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 423650c..841ceca 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -420,9 +420,8 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) device = cs->device; wined3d_get_draw_rect(state, &draw_rect); - device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - state->fb, op->rect_count, op->rects, &draw_rect, op->flags, - &op->color, op->depth, op->stencil); + device->blitter->ops->blitter_clear(device->blitter, device, device->adapter->gl_info.limits.buffers, + state->fb, op->rect_count, op->rects, &draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1197755..11a56f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4190,13 +4190,13 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi { struct wined3d_fb_state fb = {&view, NULL}; device->blitter->ops->blitter_clear(device->blitter, device, 1, &fb, - rect, &draw_rect, flags, color, depth, stencil); + 1, rect, &draw_rect, flags, color, depth, stencil); } else { struct wined3d_fb_state fb = {NULL, view}; device->blitter->ops->blitter_clear(device->blitter, device, 0, &fb, - rect, &draw_rect, flags, color, depth, stencil); + 1, rect, &draw_rect, flags, color, depth, stencil); } return WINED3D_OK; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b8f10ae..cc5444b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2449,14 +2449,14 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ } static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next; if ((next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, - clear_rect, draw_rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); } static void fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, @@ -2586,7 +2586,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_rendertarget_view *view; @@ -2627,14 +2627,14 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de goto next; } - device_clear_render_targets(device, rt_count, fb, 1, - clear_rect, draw_rect, flags, colour, depth, stencil); + device_clear_render_targets(device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); return; next: if ((next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, - clear_rect, draw_rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); } static void ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, @@ -3425,35 +3425,44 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, } static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f}; struct wined3d_rendertarget_view *view; struct wined3d_box box; - unsigned int i; - - box.left = max(clear_rect->left, draw_rect->left); - box.top = max(clear_rect->top, draw_rect->top); - box.right = min(clear_rect->right, draw_rect->right); - box.bottom = min(clear_rect->bottom, draw_rect->bottom); - box.front = 0; - box.back = 1; + unsigned int i, j; - if (box.left >= box.right || box.top >= box.bottom) - return; + if (!rect_count) + { + rect_count = 1; + clear_rects = draw_rect; + } - if (flags & WINED3DCLEAR_TARGET) + for (i = 0; i < rect_count; ++i) { - for (i = 0; i < rt_count; ++i) + box.left = max(clear_rects[i].left, draw_rect->left); + box.top = max(clear_rects[i].top, draw_rect->top); + box.right = min(clear_rects[i].right, draw_rect->right); + box.bottom = min(clear_rects[i].bottom, draw_rect->bottom); + box.front = 0; + box.back = 1; + + if (box.left >= box.right || box.top >= box.bottom) + continue; + + if (flags & WINED3DCLEAR_TARGET) { - if ((view = fb->render_targets[i])) - surface_cpu_blt_colour_fill(view, &box, colour); + for (j = 0; j < rt_count; ++j) + { + if ((view = fb->render_targets[j])) + surface_cpu_blt_colour_fill(view, &box, colour); + } } - } - if ((flags & WINED3DCLEAR_ZBUFFER) && (view = fb->depth_stencil)) - surface_cpu_blt_colour_fill(view, &box, &c); + if ((flags & WINED3DCLEAR_ZBUFFER) && (view = fb->depth_stencil)) + surface_cpu_blt_colour_fill(view, &box, &c); + } if (flags & ~(WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER)) FIXME("flags %#x not implemented.\n", flags); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ee25862..0211d8e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1877,7 +1877,7 @@ struct wined3d_blitter_ops { void (*blitter_destroy)(struct wined3d_blitter *blitter, struct wined3d_context *context); void (*blitter_clear)(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil); void (*blitter_blit)(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect,

1 0

Henri Verbeet : wined3d: Pass the draw rectangle to wined3d_blitter_ops.blitter_clear().
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: 52979b6b29b72ad2999fca73694fb6db8f6b90e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52979b6b29b72ad2999fca736… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 09:07:46 2017 +0200 wined3d: Pass the draw rectangle to wined3d_blitter_ops.blitter_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 7 ++++--- dlls/wined3d/device.c | 9 ++++++--- dlls/wined3d/surface.c | 36 ++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 139cd18..db07d76 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7877,13 +7877,14 @@ static void arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli } static void arbfp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, - DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next; if ((next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, + clear_rect, draw_rect, flags, colour, depth, stencil); } static const struct wined3d_blitter_ops arbfp_blitter_ops = diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4016b74..1197755 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4148,7 +4148,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi const struct wined3d_color *color, float depth, DWORD stencil) { struct wined3d_resource *resource; - RECT r; + RECT draw_rect, r; TRACE("device %p, view %p, rect %s, flags %#x, color %s, depth %.8e, stencil %u.\n", device, view, wine_dbgstr_rect(rect), flags, debug_color(color), depth, stencil); @@ -4185,15 +4185,18 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return hr; } + SetRect(&draw_rect, 0, 0, view->width, view->height); if (flags == WINED3DCLEAR_TARGET) { struct wined3d_fb_state fb = {&view, NULL}; - device->blitter->ops->blitter_clear(device->blitter, device, 1, &fb, rect, flags, color, depth, stencil); + device->blitter->ops->blitter_clear(device->blitter, device, 1, &fb, + rect, &draw_rect, flags, color, depth, stencil); } else { struct wined3d_fb_state fb = {NULL, view}; - device->blitter->ops->blitter_clear(device->blitter, device, 0, &fb, rect, flags, color, depth, stencil); + device->blitter->ops->blitter_clear(device->blitter, device, 0, &fb, + rect, &draw_rect, flags, color, depth, stencil); } return WINED3D_OK; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ac67149..b8f10ae 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2449,13 +2449,14 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ } static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, - DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next; if ((next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, + clear_rect, draw_rect, flags, colour, depth, stencil); } static void fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, @@ -2585,11 +2586,10 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, - DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { - struct wined3d_rendertarget_view *view = rt_count ? fb->render_targets[0] : fb->depth_stencil; - const RECT draw_rect = {0, 0, view->width, view->height}; + struct wined3d_rendertarget_view *view; struct wined3d_resource *resource; struct wined3d_blitter *next; unsigned int i; @@ -2627,12 +2627,14 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de goto next; } - device_clear_render_targets(device, rt_count, fb, 1, rect, &draw_rect, flags, colour, depth, stencil); + device_clear_render_targets(device, rt_count, fb, 1, + clear_rect, draw_rect, flags, colour, depth, stencil); return; next: if ((next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, + clear_rect, draw_rect, flags, colour, depth, stencil); } static void ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, @@ -3423,14 +3425,24 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, } static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, - DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { - const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f}; struct wined3d_rendertarget_view *view; + struct wined3d_box box; unsigned int i; + box.left = max(clear_rect->left, draw_rect->left); + box.top = max(clear_rect->top, draw_rect->top); + box.right = min(clear_rect->right, draw_rect->right); + box.bottom = min(clear_rect->bottom, draw_rect->bottom); + box.front = 0; + box.back = 1; + + if (box.left >= box.right || box.top >= box.bottom) + return; + if (flags & WINED3DCLEAR_TARGET) { for (i = 0; i < rt_count; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17239e5..ee25862 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1877,8 +1877,8 @@ struct wined3d_blitter_ops { void (*blitter_destroy)(struct wined3d_blitter *blitter, struct wined3d_context *context); void (*blitter_clear)(struct wined3d_blitter *blitter, struct wined3d_device *device, - unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, - DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil); + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *clear_rect, + const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil); void (*blitter_blit)(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect,

1 0

Henri Verbeet : wined3d: Pass a wined3d_fb_state structure to wined3d_blitter_ops.blitter_clear().
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: d8f9b6b7f7c3b704323d34aa744b9a0036ad93c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f9b6b7f7c3b704323d34aa7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 09:07:45 2017 +0200 wined3d: Pass a wined3d_fb_state structure to wined3d_blitter_ops.blitter_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 +-- dlls/wined3d/device.c | 11 ++++- dlls/wined3d/surface.c | 84 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 63 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 995900f..139cd18 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7877,13 +7877,13 @@ static void arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli } static void arbfp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, - const struct wined3d_color *colour, float depth, DWORD stencil) + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, + DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next; if ((next = blitter->next)) - next->ops->blitter_clear(next, device, view, rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, rect, flags, colour, depth, stencil); } static const struct wined3d_blitter_ops arbfp_blitter_ops = diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59d9769..4016b74 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4185,7 +4185,16 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return hr; } - device->blitter->ops->blitter_clear(device->blitter, device, view, rect, flags, color, depth, stencil); + if (flags == WINED3DCLEAR_TARGET) + { + struct wined3d_fb_state fb = {&view, NULL}; + device->blitter->ops->blitter_clear(device->blitter, device, 1, &fb, rect, flags, color, depth, stencil); + } + else + { + struct wined3d_fb_state fb = {NULL, view}; + device->blitter->ops->blitter_clear(device->blitter, device, 0, &fb, rect, flags, color, depth, stencil); + } return WINED3D_OK; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 09d291c..ac67149 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2449,13 +2449,13 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ } static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, - const struct wined3d_color *colour, float depth, DWORD stencil) + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, + DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_blitter *next; if ((next = blitter->next)) - next->ops->blitter_clear(next, device, view, rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, rect, flags, colour, depth, stencil); } static void fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, @@ -2585,45 +2585,54 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, - const struct wined3d_color *colour, float depth, DWORD stencil) + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, + DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { + struct wined3d_rendertarget_view *view = rt_count ? fb->render_targets[0] : fb->depth_stencil; const RECT draw_rect = {0, 0, view->width, view->height}; - struct wined3d_resource *resource = view->resource; - struct wined3d_fb_state fb = {&view, NULL}; + struct wined3d_resource *resource; struct wined3d_blitter *next; + unsigned int i; - if (resource->pool == WINED3D_POOL_SYSTEM_MEM) - goto next; - - if (flags != WINED3DCLEAR_TARGET) + if (flags & WINED3DCLEAR_TARGET) { - struct wined3d_fb_state fb = {NULL, view}; + for (i = 0; i < rt_count; ++i) + { + if (!(view = fb->render_targets[i])) + continue; - device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, flags, NULL, depth, stencil); - return; + resource = view->resource; + if (resource->pool == WINED3D_POOL_SYSTEM_MEM) + goto next; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (!((view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) + || (resource->usage & WINED3DUSAGE_RENDERTARGET))) + goto next; + } + else if (!(resource->usage & WINED3DUSAGE_RENDERTARGET)) + { + goto next; + } + + /* FIXME: We should reject colour fills on formats with fixups, + * but this would break P8 colour fills for example. */ + } } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - if (!((view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (resource->usage & WINED3DUSAGE_RENDERTARGET))) + if (fb->depth_stencil && fb->depth_stencil->resource->pool == WINED3D_POOL_SYSTEM_MEM) goto next; } - else if (!(resource->usage & WINED3DUSAGE_RENDERTARGET)) - { - goto next; - } - /* FIXME: We should reject colour fills on formats with fixups, but this - * would break P8 colour fills for example. */ - - device_clear_render_targets(device, 1, &fb, 1, rect, &draw_rect, flags, colour, 0.0f, 0); + device_clear_render_targets(device, rt_count, fb, 1, rect, &draw_rect, flags, colour, depth, stencil); return; next: if ((next = blitter->next)) - next->ops->blitter_clear(next, device, view, rect, flags, colour, depth, stencil); + next->ops->blitter_clear(next, device, rt_count, fb, rect, flags, colour, depth, stencil); } static void ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, @@ -3414,25 +3423,28 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, } static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, - const struct wined3d_color *colour, float depth, DWORD stencil) + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, + DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f}; + struct wined3d_rendertarget_view *view; + unsigned int i; - if (flags == WINED3DCLEAR_TARGET) + if (flags & WINED3DCLEAR_TARGET) { - surface_cpu_blt_colour_fill(view, &box, colour); - return; + for (i = 0; i < rt_count; ++i) + { + if ((view = fb->render_targets[i])) + surface_cpu_blt_colour_fill(view, &box, colour); + } } - if (flags == WINED3DCLEAR_ZBUFFER) - { + if ((flags & WINED3DCLEAR_ZBUFFER) && (view = fb->depth_stencil)) surface_cpu_blt_colour_fill(view, &box, &c); - return; - } - FIXME("flags %#x not implemented.\n", flags); + if (flags & ~(WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER)) + FIXME("flags %#x not implemented.\n", flags); } static void cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 799f63b..17239e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1877,8 +1877,8 @@ struct wined3d_blitter_ops { void (*blitter_destroy)(struct wined3d_blitter *blitter, struct wined3d_context *context); void (*blitter_clear)(struct wined3d_blitter *blitter, struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, - const struct wined3d_color *colour, float depth, DWORD stencil); + unsigned int rt_count, const struct wined3d_fb_state *fb, const RECT *rect, + DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil); void (*blitter_blit)(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect,

1 0

Daniel Lehman : msvcrt: Fix build warnings.
by Alexandre Julliard April 4, 2017

April 4, 2017

Module: wine Branch: master Commit: 21d6e97d8dea514c9fe147cfc190e92b411828dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d6e97d8dea514c9fe147cfc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 3 14:08:28 2017 -0700 msvcrt: Fix build warnings. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 4f07bb3..a02d99d 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -471,7 +471,7 @@ unsigned int __thiscall SchedulerPolicy_SetPolicyValue(SchedulerPolicy *this, throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, 0, "MinConcurrency"); if (policy == MaxConcurrency) throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, 0, "MaxConcurrency"); - if (policy < SchedulerKind || policy >= last_policy_id) + if (policy >= last_policy_id) throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, 0, "Invalid policy"); switch(policy) { @@ -531,7 +531,7 @@ unsigned int __thiscall SchedulerPolicy_GetPolicyValue( { TRACE("(%p %d)\n", this, policy); - if (policy < SchedulerKind || policy >= last_policy_id) + if (policy >= last_policy_id) throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, 0, "Invalid policy"); return this->policy_container->policies[policy]; }

1 0

Nikolay Sivov : usp10: Handle invalid arguments in ScriptIsComplex().
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 04e5466e12d0ae8088e83ef7a9b9d28d92e6a203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e5466e12d0ae8088e83ef7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 1 18:16:10 2017 +0300 usp10: Handle invalid arguments in ScriptIsComplex(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 3 +++ 2 files changed, 67 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1b2ba6f..d302714 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3911,6 +3911,68 @@ static void test_ScriptGetLogicalWidths(void) } } +static void test_ScriptIsComplex(void) +{ + static const WCHAR testW[] = {0x202a,'1',0x202c,0}; + static const WCHAR test2W[] = {'1',0}; + static const struct complex_test + { + const WCHAR *text; + DWORD flags; + HRESULT hr; + BOOL todo; + } complex_tests[] = + { + { test2W, SIC_ASCIIDIGIT, S_OK }, + { test2W, SIC_COMPLEX, S_FALSE }, + { test2W, SIC_COMPLEX | SIC_ASCIIDIGIT, S_OK }, + { testW, SIC_NEUTRAL | SIC_COMPLEX, S_OK }, + { testW, SIC_NEUTRAL, S_FALSE, TRUE }, + { testW, SIC_COMPLEX, S_OK }, + { testW, 0, S_FALSE }, + }; + unsigned int i; + HRESULT hr; + + hr = ScriptIsComplex(NULL, 0, 0); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* winxp/vista */, "got 0x%08x\n", hr); + + if (hr == E_INVALIDARG) + { + hr = ScriptIsComplex(NULL, 1, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + } + + hr = ScriptIsComplex(test2W, -1, SIC_ASCIIDIGIT); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* winxp/vista */, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(test2W, 0, SIC_ASCIIDIGIT); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + for (i = 0; i < sizeof(complex_tests)/sizeof(complex_tests[0]); i++) + { + hr = ScriptIsComplex(complex_tests[i].text, lstrlenW(complex_tests[i].text), complex_tests[i].flags); + todo_wine_if(complex_tests[i].todo) + ok(hr == complex_tests[i].hr, "%u: got %#x, expected %#x, flags %#x\n", i, hr, complex_tests[i].hr, + complex_tests[i].flags); + } + + hr = ScriptIsComplex(test2W, 1, ~0u); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, 0); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, SIC_NEUTRAL | SIC_COMPLEX); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(testW, 3, SIC_COMPLEX); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ScriptIsComplex(test2W, 1, SIC_COMPLEX); + ok(hr == S_FALSE, "got 0x%08x\n", hr); +} + START_TEST(usp10) { HWND hwnd; @@ -3966,6 +4028,8 @@ START_TEST(usp10) test_ScriptGetFontFunctions(hdc); test_ScriptGetLogicalWidths(); + test_ScriptIsComplex(); + ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2df27be..c1d9c1c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3019,6 +3019,9 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); + if (!chars || len < 0) + return E_INVALIDARG; + for (i = 0; i < len; i+=consumed) { if (i >= len)

1 0