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

Alex Henrie : msvcr120: Add atanh.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: 860c1578e6ed130792ff6a9c5e5431ec005472ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c1578e6ed130792ff6a9c5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:05:19 2017 +0200 msvcr120: Add atanh. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 66 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- include/config.h.in | 6 ++ 8 files changed, 88 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 199d4d8..95cfa25 100755 --- a/configure +++ b/configure @@ -17410,6 +17410,8 @@ for ac_func in \ acoshf \ asinh \ asinhf \ + atanh \ + atanhf \ cbrt \ cbrtf \ erf \ diff --git a/configure.ac b/configure.ac index 3974dd5..77b04b9 100644 --- a/configure.ac +++ b/configure.ac @@ -2598,6 +2598,8 @@ AC_CHECK_FUNCS(\ acoshf \ asinh \ asinhf \ + atanh \ + atanhf \ cbrt \ cbrtf \ erf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 5c64432..fb5c350 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -136,9 +136,9 @@ @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f @ cdecl -arch=arm,x86_64 atanf(float) ucrtbase.atanf -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) ucrtbase.atanh +@ cdecl atanhf(float) ucrtbase.atanhf +@ cdecl atanhl(double) ucrtbase.atanhl @ stub cabs @ stub cabsf @ stub cabsl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7899622..323d5f4 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2025,9 +2025,9 @@ @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) MSVCR120_atanh +@ cdecl atanhf(float) MSVCR120_atanhf +@ cdecl atanhl(double) MSVCR120_atanhl @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9a5da20..73101c7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1691,9 +1691,9 @@ @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) msvcr120.atan2f -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) msvcr120.atanh +@ cdecl atanhf(float) msvcr120.atanhf +@ cdecl atanhl(double) msvcr120.atanhl @ cdecl -private atexit(ptr) msvcr120.atexit @ cdecl atof(str) msvcr120.atof @ cdecl atoi(str) msvcr120.atoi diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 17edf47..9eed9b8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2944,6 +2944,72 @@ LDOUBLE CDECL MSVCR120_acoshl(LDOUBLE x) } /********************************************************************* + * atanh (MSVCR120.@) + */ +double CDECL MSVCR120_atanh(double x) +{ + double ret; + + if (x > 1 || x < -1) { + MSVCRT_fenv_t env; + + *MSVCRT__errno() = MSVCRT_EDOM; + + /* on Linux atanh returns -NAN in this case */ + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + +#ifdef HAVE_ATANH + ret = atanh(x); +#else + if (-1e-6 < x && x < 1e-6) ret = x + x*x*x/3; + else ret = (log(1+x) - log(1-x)) / 2; +#endif + + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * atanhf (MSVCR120.@) + */ +float CDECL MSVCR120_atanhf(float x) +{ +#ifdef HAVE_ATANHF + double ret; + + if (x > 1 || x < -1) { + MSVCRT_fenv_t env; + + *MSVCRT__errno() = MSVCRT_EDOM; + + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + + ret = atanhf(x); + + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + return MSVCR120_atanh(x); +#endif +} + +/********************************************************************* + * atanhl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) +{ + return MSVCR120_atanh(x); +} + +/********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) * scalbln (MSVCR120.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1eae072..aacf361 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2167,9 +2167,9 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) MSVCR120_atanh +@ cdecl atanhf(float) MSVCR120_atanhf +@ cdecl atanhl(double) MSVCR120_atanhl @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol diff --git a/include/config.h.in b/include/config.h.in index 4a9acca..2e909fd 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -50,6 +50,12 @@ /* Define to 1 if you have the <asm/user.h> header file. */ #undef HAVE_ASM_USER_H +/* Define to 1 if you have the `atanh' function. */ +#undef HAVE_ATANH + +/* Define to 1 if you have the `atanhf' function. */ +#undef HAVE_ATANHF + /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H

1 0

Alex Henrie : msvcr120: Add acosh.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: f1dad14807ae9650c66d83ec35fbc016b91ac471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1dad14807ae9650c66d83ec3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:05:09 2017 +0200 msvcr120: Add acosh. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 45 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- include/config.h.in | 6 +++ 8 files changed, 67 insertions(+), 12 deletions(-) diff --git a/configure b/configure index f6053f1..199d4d8 100755 --- a/configure +++ b/configure @@ -17406,6 +17406,8 @@ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi for ac_func in \ + acosh \ + acoshf \ asinh \ asinhf \ cbrt \ diff --git a/configure.ac b/configure.ac index d557df8..3974dd5 100644 --- a/configure.ac +++ b/configure.ac @@ -2594,6 +2594,8 @@ then fi AC_CHECK_FUNCS(\ + acosh \ + acoshf \ asinh \ asinhf \ cbrt \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 5d2499b..5c64432 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -124,9 +124,9 @@ @ cdecl _yn(long double) ucrtbase._yn @ cdecl acos(double) ucrtbase.acos @ cdecl -arch=arm,x86_64 acosf(float) ucrtbase.acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) ucrtbase.acosh +@ cdecl acoshf(float) ucrtbase.acoshf +@ cdecl acoshl(double) ucrtbase.acoshl @ cdecl asin(double) ucrtbase.asin @ cdecl -arch=arm,x86_64 asinf(float) ucrtbase.asinf @ cdecl asinh(double) ucrtbase.asinh diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 989a3cb..7899622 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2011,9 +2011,9 @@ @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos @ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) MSVCR120_acosh +@ cdecl acoshf(float) MSVCR120_acoshf +@ cdecl acoshl(double) MSVCR120_acoshl @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 345bb51..9a5da20 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1677,9 +1677,9 @@ @ cdecl abs(long) msvcr120.abs @ cdecl acos(double) msvcr120.acos @ cdecl -arch=arm,x86_64 acosf(float) msvcr120.acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) msvcr120.acosh +@ cdecl acoshf(float) msvcr120.acoshf +@ cdecl acoshl(double) msvcr120.acoshl @ cdecl asctime(ptr) msvcr120.asctime @ cdecl asctime_s(ptr long ptr) msvcr120.asctime_s @ cdecl asin(double) msvcr120.asin diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 387aab3..17edf47 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2899,6 +2899,51 @@ LDOUBLE CDECL MSVCR120_asinhl(LDOUBLE x) } /********************************************************************* + * acosh (MSVCR120.@) + */ +double CDECL MSVCR120_acosh(double x) +{ + if (x < 1) *MSVCRT__errno() = MSVCRT_EDOM; + +#ifdef HAVE_ACOSH + return acosh(x); +#else + if (x < 1) { + MSVCRT_fenv_t env; + + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + if (!isfinite(x*x)) return log(2) + log(x); + return log(x + sqrt(x*x-1)); +#endif +} + +/********************************************************************* + * acoshf (MSVCR120.@) + */ +float CDECL MSVCR120_acoshf(float x) +{ +#ifdef HAVE_ACOSHF + if (x < 1) *MSVCRT__errno() = MSVCRT_EDOM; + + return acoshf(x); +#else + return MSVCR120_acosh(x); +#endif +} + +/********************************************************************* + * acoshl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_acoshl(LDOUBLE x) +{ + return MSVCR120_acosh(x); +} + +/********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) * scalbln (MSVCR120.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3e7c795..1eae072 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2153,9 +2153,9 @@ @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos @ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf -@ stub acosh -@ stub acoshf -@ stub acoshl +@ cdecl acosh(double) MSVCR120_acosh +@ cdecl acoshf(float) MSVCR120_acoshf +@ cdecl acoshl(double) MSVCR120_acoshl @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin diff --git a/include/config.h.in b/include/config.h.in index c287559..4a9acca 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -10,6 +10,12 @@ /* Define to the file extension for executables. */ #undef EXEEXT +/* Define to 1 if you have the `acosh' function. */ +#undef HAVE_ACOSH + +/* Define to 1 if you have the `acoshf' function. */ +#undef HAVE_ACOSHF + /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H

1 0

Alexandre Julliard : user32: Copy the bits of child windows when the parent has a surface.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: 5b9c69b93ffa9dc9e4d71660cf076c43d4e05c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9c69b93ffa9dc9e4d71660c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:04:52 2017 +0200 user32: Copy the bits of child windows when the parent has a surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 35 +++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ dlls/user32/winpos.c | 35 +++++++++++++++++++++++++++++++---- 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 1bfb86d..3c7f220 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -811,6 +811,41 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, /*********************************************************************** + * move_window_bits_parent + * + * Move the window bits in the parent surface when a child is moved. + */ +void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ) +{ + struct window_surface *surface; + RECT dst = valid_rects[0]; + RECT src = valid_rects[1]; + WND *win; + + if (src.left == dst.left && src.top == dst.top) return; + + if (!(win = WIN_GetPtr( parent ))) return; + if (win == WND_DESKTOP || win == WND_OTHER_PROCESS) return; + if (!(surface = win->surface)) + { + WIN_ReleasePtr( win ); + return; + } + + TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); + MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), parent, (POINT *)&src, 2 ); + OffsetRect( &src, win->rectClient.left - win->visible_rect.left, + win->rectClient.top - win->visible_rect.top ); + OffsetRect( &dst, -window_rect->left, -window_rect->top ); + window_surface_add_ref( surface ); + WIN_ReleasePtr( win ); + + copy_bits_from_surface( hwnd, surface, &dst, &src ); + window_surface_release( surface ); +} + + +/*********************************************************************** * update_now * * Implementation of RDW_UPDATENOW behavior. diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a697fd9..052fdd8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -232,6 +232,8 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface, const RECT *visible_rect, const RECT *old_visible_rect, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; +extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, + const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a37ab7c..a89c60d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2060,8 +2060,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, WND *win; HWND surface_win = 0, parent = GetAncestor( hwnd, GA_PARENT ); BOOL ret, needs_update = FALSE; - int old_width; - RECT visible_rect, old_visible_rect, old_window_rect; + RECT visible_rect, old_visible_rect, old_window_rect, old_client_rect; struct window_surface *old_surface, *new_surface = NULL; if (!parent || parent == GetDesktopWindow()) @@ -2080,8 +2079,8 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (new_surface) window_surface_release( new_surface ); return FALSE; } - old_width = win->rectClient.right - win->rectClient.left; old_visible_rect = win->visible_rect; + old_client_rect = win->rectClient; old_surface = win->surface; if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */ @@ -2126,7 +2125,8 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, mirror_rect( &client, &win->visible_rect ); } /* if an RTL window is resized the children have moved */ - if (win->dwExStyle & WS_EX_LAYOUTRTL && client_rect->right - client_rect->left != old_width) + if (win->dwExStyle & WS_EX_LAYOUTRTL && + client_rect->right - client_rect->left != old_client_rect.right - old_client_rect.left) win->flags |= WIN_CHILDREN_MOVED; } } @@ -2156,6 +2156,33 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } window_surface_release( old_surface ); } + else if (surface_win && surface_win != hwnd) + { + if (!IsRectEmpty( valid_rects )) + { + RECT rects[2]; + int x_offset = old_visible_rect.left - visible_rect.left; + int y_offset = old_visible_rect.top - visible_rect.top; + + /* if all that happened is that the whole window moved, copy everything */ + if (!(swp_flags & SWP_FRAMECHANGED) && + old_visible_rect.right - visible_rect.right == x_offset && + old_visible_rect.bottom - visible_rect.bottom == y_offset && + old_client_rect.left - client_rect->left == x_offset && + old_client_rect.right - client_rect->right == x_offset && + old_client_rect.top - client_rect->top == y_offset && + old_client_rect.bottom - client_rect->bottom == y_offset && + EqualRect( &valid_rects[0], client_rect )) + { + rects[0] = visible_rect; + rects[1] = old_visible_rect; + valid_rects = rects; + } + move_window_bits_parent( hwnd, surface_win, window_rect, valid_rects ); + valid_rects = NULL; /* prevent the driver from trying to also move the bits */ + } + } + USER_Driver->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, client_rect, &visible_rect, valid_rects, new_surface ); }

1 0

Alexandre Julliard : user32: Add a helper function for copying bits from a window surface.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: 4e13c06f3bc043b454d931ba161b8bf0bfa400ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e13c06f3bc043b454d931ba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:03:44 2017 +0200 user32: Add a helper function for copying bits from a window surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 50 ++++++++++++++++++++++++++++------------------ dlls/user32/user_private.h | 2 +- dlls/user32/winpos.c | 2 +- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 7a6b0dc..1bfb86d 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -760,6 +760,32 @@ void erase_now( HWND hwnd, UINT rdw_flags ) /*********************************************************************** + * copy_bits_from_surface + * + * Copy bits from a window surface; helper for move_window_bits and move_window_bits_parent. + */ +static void copy_bits_from_surface( HWND hwnd, struct window_surface *surface, + const RECT *dst, const RECT *src ) +{ + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + void *bits; + UINT flags = UPDATE_NOCHILDREN; + HRGN rgn = get_update_region( hwnd, &flags, NULL ); + HDC hdc = GetDCEx( hwnd, rgn, DCX_CACHE | DCX_WINDOW | DCX_EXCLUDERGN ); + + bits = surface->funcs->get_info( surface, info ); + surface->funcs->lock( surface ); + SetDIBitsToDevice( hdc, dst->left, dst->top, dst->right - dst->left, dst->bottom - dst->top, + src->left - surface->rect.left, surface->rect.bottom - src->bottom, + 0, surface->rect.bottom - surface->rect.top, + bits, info, DIB_RGB_COLORS ); + surface->funcs->unlock( surface ); + ReleaseDC( hwnd, hdc ); +} + + +/*********************************************************************** * move_window_bits * * Move the window bits when a window is resized or its surface recreated. @@ -767,7 +793,7 @@ void erase_now( HWND hwnd, UINT rdw_flags ) void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface, const RECT *visible_rect, const RECT *old_visible_rect, - const RECT *client_rect, const RECT *valid_rects ) + const RECT *window_rect, const RECT *valid_rects ) { RECT dst = valid_rects[0]; RECT src = valid_rects[1]; @@ -776,24 +802,10 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, src.left - old_visible_rect->left != dst.left - visible_rect->left || src.top - old_visible_rect->top != dst.top - visible_rect->top) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; - void *bits; - UINT flags = UPDATE_NOCHILDREN; - HRGN rgn = get_update_region( hwnd, &flags, NULL ); - HDC hdc = GetDCEx( hwnd, rgn, DCX_CACHE | DCX_EXCLUDERGN ); - - OffsetRect( &dst, -client_rect->left, -client_rect->top ); - TRACE( "copying %s -> %s\n", wine_dbgstr_rect(&src), wine_dbgstr_rect(&dst) ); - bits = old_surface->funcs->get_info( old_surface, info ); - old_surface->funcs->lock( old_surface ); - SetDIBitsToDevice( hdc, dst.left, dst.top, dst.right - dst.left, dst.bottom - dst.top, - src.left - old_visible_rect->left - old_surface->rect.left, - old_surface->rect.bottom - (src.bottom - old_visible_rect->top), - 0, old_surface->rect.bottom - old_surface->rect.top, - bits, info, DIB_RGB_COLORS ); - old_surface->funcs->unlock( old_surface ); - ReleaseDC( hwnd, hdc ); + TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); + OffsetRect( &src, -old_visible_rect->left, -old_visible_rect->top ); + OffsetRect( &dst, -window_rect->left, -window_rect->top ); + copy_bits_from_surface( hwnd, old_surface, &dst, &src ); } } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index b4a756c..a697fd9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -231,7 +231,7 @@ extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface, const RECT *visible_rect, const RECT *old_visible_rect, - const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; + const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 87f8deb..a37ab7c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2151,7 +2151,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (!IsRectEmpty( valid_rects )) { move_window_bits( hwnd, old_surface, new_surface, &visible_rect, - &old_visible_rect, client_rect, valid_rects ); + &old_visible_rect, window_rect, valid_rects ); valid_rects = NULL; /* prevent the driver from trying to also move the bits */ } window_surface_release( old_surface );

1 0

Alexandre Julliard : server: Return the top surface window even when not using OpenGL.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: 4f88a57ce72d72ca17a9b281f4cfefaa86729e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f88a57ce72d72ca17a9b281f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 10:59:38 2017 +0200 server: Return the top surface window even when not using OpenGL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 5 +++-- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 3 ++- server/request.h | 1 + server/trace.c | 1 + server/window.c | 7 ++++--- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a9f3d9e..87f8deb 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2059,7 +2059,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { WND *win; HWND surface_win = 0, parent = GetAncestor( hwnd, GA_PARENT ); - BOOL ret; + BOOL ret, needs_update = FALSE; int old_width; RECT visible_rect, old_visible_rect, old_window_rect; struct window_surface *old_surface, *new_surface = NULL; @@ -2116,6 +2116,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->visible_rect = visible_rect; win->surface = new_surface; surface_win = wine_server_ptr_handle( reply->surface_win ); + needs_update = reply->needs_update; if (GetWindowLongW( win->parent, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) { RECT client; @@ -2133,7 +2134,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { - if (surface_win) update_surface_region( surface_win ); + if (needs_update) update_surface_region( surface_win ); if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) invalidate_dce( win, &old_window_rect ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d31579c..261391a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3591,7 +3591,7 @@ struct set_window_pos_reply unsigned int new_style; unsigned int new_ex_style; user_handle_t surface_win; - char __pad_20[4]; + int needs_update; }; #define SET_WINPOS_PAINT_SURFACE 0x01 #define SET_WINPOS_PIXEL_FORMAT 0x02 @@ -6419,6 +6419,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 533 +#define SERVER_PROTOCOL_VERSION 534 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 1f88c6a..b834c89 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2592,7 +2592,8 @@ enum message_type @REPLY unsigned int new_style; /* new window style */ unsigned int new_ex_style; /* new window extended style */ - user_handle_t surface_win; /* window that needs a surface update */ + user_handle_t surface_win; /* parent window that holds the surface */ + int needs_update; /* whether the surface region needs an update */ @END #define SET_WINPOS_PAINT_SURFACE 0x01 /* window has a paintable surface */ #define SET_WINPOS_PIXEL_FORMAT 0x02 /* window has a custom pixel format */ diff --git a/server/request.h b/server/request.h index 30d2234..f76f668 100644 --- a/server/request.h +++ b/server/request.h @@ -1726,6 +1726,7 @@ C_ASSERT( sizeof(struct set_window_pos_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, new_style) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, new_ex_style) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, surface_win) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_window_pos_reply, needs_update) == 20 ); C_ASSERT( sizeof(struct set_window_pos_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, relative) == 16 ); diff --git a/server/trace.c b/server/trace.c index 7a4b4b2..ac0f8b0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3146,6 +3146,7 @@ static void dump_set_window_pos_reply( const struct set_window_pos_reply *req ) fprintf( stderr, " new_style=%08x", req->new_style ); fprintf( stderr, ", new_ex_style=%08x", req->new_ex_style ); fprintf( stderr, ", surface_win=%08x", req->surface_win ); + fprintf( stderr, ", needs_update=%d", req->needs_update ); } static void dump_get_window_rectangles_request( const struct get_window_rectangles_request *req ) diff --git a/server/window.c b/server/window.c index f35d6f6..463c4f2 100644 --- a/server/window.c +++ b/server/window.c @@ -2298,10 +2298,11 @@ DECL_HANDLER(set_window_pos) reply->new_ex_style = win->ex_style; top = get_top_clipping_window( win ); - if (is_visible( top ) && - (top->paint_flags & PAINT_HAS_SURFACE) && - (top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD))) + if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE)) + { reply->surface_win = top->handle; + reply->needs_update = !!(top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD)); + } }

1 0

Piotr Caban : msvcr120: Add fallback implementation of asinh.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: 4df7ced7b08f3b2b9c73e4be16d4c07967c13038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df7ced7b08f3b2b9c73e4be1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 12 18:05:03 2017 +0200 msvcr120: Add fallback implementation of asinh. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 04f09ac..387aab3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2873,8 +2873,8 @@ double CDECL MSVCR120_asinh(double x) #ifdef HAVE_ASINH return asinh(x); #else - FIXME( "not implemented\n" ); - return 0.0; + if (!isfinite(x*x+1)) return log(2) + log(x); + return log(x + sqrt(x*x+1)); #endif } @@ -2886,8 +2886,7 @@ float CDECL MSVCR120_asinhf(float x) #ifdef HAVE_ASINHF return asinhf(x); #else - FIXME( "not implemented\n" ); - return 0.0f; + return MSVCR120_asinh(x); #endif }

1 0

Józef Kucia : wined3d: Implement SM5 swapc instruction.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: af80b7afdd51c89fd7423a687dd7213f32a1f87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af80b7afdd51c89fd7423a687… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 13 00:35:46 2017 +0200 wined3d: Implement SM5 swapc instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 54 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1bd3a66..650f8ad 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4353,6 +4353,58 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_swapc(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct wined3d_shader_dst_param dst[2]; + struct glsl_src_param src[3]; + unsigned int i, j, k; + char mask_char[6]; + DWORD write_mask; + BOOL tmp_dst[2]; + + for (i = 0; i < ins->dst_count; ++i) + { + tmp_dst[i] = FALSE; + for (j = 0; j < ins->src_count; ++j) + { + if (ins->dst[i].reg.idx[0].offset == ins->src[j].reg.idx[0].offset + && ins->dst[i].reg.type == ins->src[j].reg.type) + tmp_dst[i] = TRUE; + } + } + + dst[0] = ins->dst[0]; + dst[1] = ins->dst[1]; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < ARRAY_SIZE(dst); ++j) + { + dst[j].write_mask = ins->dst[j].write_mask & (WINED3DSP_WRITEMASK_0 << i); + if (tmp_dst[j] && (write_mask = shader_glsl_get_write_mask(&dst[j], mask_char))) + shader_addline(buffer, "tmp%u%s = (", j, mask_char); + else if (!(write_mask = shader_glsl_append_dst_ext(buffer, ins, &dst[j], dst[j].reg.data_type))) + continue; + + for (k = 0; k < ARRAY_SIZE(src); ++k) + shader_glsl_add_src_param(ins, &ins->src[k], write_mask, &src[k]); + + shader_addline(buffer, "%sbool(%s) ? %s : %s);\n", !j ? "!" : "", + src[0].param_str, src[1].param_str, src[2].param_str); + } + } + + for (i = 0; i < ARRAY_SIZE(tmp_dst); ++i) + { + if (tmp_dst[i]) + { + shader_glsl_get_write_mask(&ins->dst[i], mask_char); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[i], ins->dst[i].reg.data_type); + shader_addline(ins->ctx->buffer, "tmp%u%s);\n", i, mask_char); + } + } +} + static void shader_glsl_conditional_move(const struct wined3d_shader_instruction *ins) { const char *condition_prefix, *condition_suffix; @@ -10805,7 +10857,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_raw_structured, /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, - /* WINED3DSIH_SWAPC */ NULL, + /* WINED3DSIH_SWAPC */ shader_glsl_swapc, /* WINED3DSIH_SWITCH */ shader_glsl_switch, /* WINED3DSIH_SYNC */ shader_glsl_sync, /* WINED3DSIH_TEX */ shader_glsl_tex,

1 0

Sebastian Lackner : wined3d: Return hr result in wined3d_event_query_create.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: c683372bca9a36fb55ad18c0d7d668de6aa0c95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c683372bca9a36fb55ad18c0d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 12 15:03:02 2017 +0200 wined3d: Return hr result in wined3d_event_query_create. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 7d726d0..f1e7803 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -945,7 +945,7 @@ static HRESULT wined3d_event_query_create(struct wined3d_device *device, { WARN("Event queries not supported.\n"); HeapFree(GetProcessHeap(), 0, object); - return WINED3DERR_NOTAVAILABLE; + return hr; } wined3d_query_init(&object->query, device, type, &object->signalled,

1 0

Alex Henrie : msvcr120: If erff is not available, fall back to erf.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: ddff85a361a28d3b1d13689738d90395aa46ce06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddff85a361a28d3b1d1368973… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:04:40 2017 +0200 msvcr120: If erff is not available, fall back to erf. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ffb83a6..c5228aa 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2733,28 +2733,27 @@ short CDECL MSVCR120__ldtest(LDOUBLE *x) } /********************************************************************* - * erff (MSVCR120.@) + * erf (MSVCR120.@) */ -float CDECL MSVCR120_erff(float x) +double CDECL MSVCR120_erf(double x) { -#ifdef HAVE_ERFF - return erff(x); +#ifdef HAVE_ERF + return erf(x); #else FIXME( "not implemented\n" ); - return 0.0f; + return 0.0; #endif } /********************************************************************* - * erf (MSVCR120.@) + * erff (MSVCR120.@) */ -double CDECL MSVCR120_erf(double x) +float CDECL MSVCR120_erff(float x) { -#ifdef HAVE_ERF - return erf(x); +#ifdef HAVE_ERFF + return erff(x); #else - FIXME( "not implemented\n" ); - return 0.0; + return MSVCR120_erf(x); #endif }

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard July 13, 2017

July 13, 2017

Module: wine Branch: master Commit: a826fb6f0ad8b38ddc7550571da89cc3058f1275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a826fb6f0ad8b38ddc7550571… Author: Can Taşan <betax34(a)hotmail.com> Date: Thu Jul 13 10:57:34 2017 +0200 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 298 +++++++++++++++++++++++---------------------------------------- 1 file changed, 109 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a826fb6f0ad8b38ddc755…

1 0