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

Alexandre Julliard : kernel32: Move activation context functions to kernelbase.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 5b5c5df676f53e7afadb364e3e772aa1d295478b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b5c5df676f53e7afadb364e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 16:07:20 2019 +0200 kernel32: Move activation context functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/actctx.c | 186 ---------------------------------------- dlls/kernel32/kernel32.spec | 22 ++--- dlls/kernelbase/kernelbase.spec | 22 ++--- dlls/kernelbase/loader.c | 130 ++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b5c5df676f53e7afadb…

1 0

Alexandre Julliard : d3dcompiler: Copy the C preprocessor source into d3dcompiler_43.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 011b2eca46fba3091a1ce8bcd0d88f0d0b9cf9fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=011b2eca46fba3091a1ce8bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 13:26:27 2019 +0200 d3dcompiler: Copy the C preprocessor source into d3dcompiler_43. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 8 +- dlls/d3dcompiler_34/Makefile.in | 8 +- dlls/d3dcompiler_35/Makefile.in | 8 +- dlls/d3dcompiler_36/Makefile.in | 8 +- dlls/d3dcompiler_37/Makefile.in | 8 +- dlls/d3dcompiler_38/Makefile.in | 8 +- dlls/d3dcompiler_39/Makefile.in | 8 +- dlls/d3dcompiler_40/Makefile.in | 8 +- dlls/d3dcompiler_41/Makefile.in | 8 +- dlls/d3dcompiler_42/Makefile.in | 8 +- dlls/d3dcompiler_43/Makefile.in | 8 +- dlls/d3dcompiler_43/compiler.c | 219 +++++- dlls/d3dcompiler_43/ppl.l | 1560 +++++++++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/ppy.y | 690 ++++++++++++++++ dlls/d3dcompiler_43/preproc.c | 453 +++++++++++ dlls/d3dcompiler_43/wpp_private.h | 250 ++++++ dlls/d3dcompiler_46/Makefile.in | 8 +- dlls/d3dcompiler_47/Makefile.in | 8 +- 18 files changed, 3210 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=011b2eca46fba3091a1c…

1 0

Alexandre Julliard : ddraw: Build with msvcrt.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 0d48c2e796d3b09d3b70eb0958bdffc1621843d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d48c2e796d3b09d3b70eb09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 09:56:16 2019 +0200 ddraw: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/Makefile.in | 2 ++ dlls/ddraw/clipper.c | 3 --- dlls/ddraw/ddraw.c | 3 --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 3 --- dlls/ddraw/executebuffer.c | 3 --- dlls/ddraw/light.c | 3 --- dlls/ddraw/main.c | 3 --- dlls/ddraw/material.c | 3 --- dlls/ddraw/palette.c | 3 --- dlls/ddraw/surface.c | 3 --- dlls/ddraw/utils.c | 3 --- dlls/ddraw/vertexbuffer.c | 3 --- dlls/ddraw/viewport.c | 3 --- 14 files changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 5106834..7f51fd3 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -2,6 +2,8 @@ MODULE = ddraw.dll IMPORTLIB = ddraw IMPORTS = dxguid uuid wined3d user32 gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ clipper.c \ ddraw.c \ diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 68a0a7f..760b22d 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8dce5ce..076289b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" #include "ddrawi.h" #include "d3dhal.h" diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b228f3e..11861f2 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -21,6 +21,7 @@ #include <assert.h> #include <limits.h> +#include <math.h> #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index fb33372..690332d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -27,9 +27,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index d5de513..80dbdfd 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 9c624f1..a8c3a93 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index ac4d3f7..5236b39 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define DDRAW_INIT_GUID #include "ddraw_private.h" #include "rpcproxy.h" diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 1fbf093..01c93e8 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 87aec96..980c62b 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4e2faef..cf3b31f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index b0a028d..2aa4cc2 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 07c0d28..9df386d 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 556783a..5fc7a4b 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

1 0

Alexandre Julliard : d3d8: Build with msvcrt.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: d2521ce33fc2697d7a0b849be5058af45ab6196e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2521ce33fc2697d7a0b849b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 09:55:37 2019 +0200 d3d8: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/Makefile.in | 2 ++ dlls/d3d8/buffer.c | 2 -- dlls/d3d8/d3d8_main.c | 2 -- dlls/d3d8/device.c | 3 --- dlls/d3d8/directx.c | 4 ---- dlls/d3d8/shader.c | 2 -- dlls/d3d8/surface.c | 2 -- dlls/d3d8/swapchain.c | 2 -- dlls/d3d8/texture.c | 2 -- dlls/d3d8/vertexdeclaration.c | 2 -- dlls/d3d8/volume.c | 2 -- 11 files changed, 2 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in index 542a052..436a3fb 100644 --- a/dlls/d3d8/Makefile.in +++ b/dlls/d3d8/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3d8.dll IMPORTLIB = d3d8 IMPORTS = dxguid uuid wined3d +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ d3d8_main.c \ diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 8598766..9eb98bf 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 62e8d31..faad5f4 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -19,8 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "initguid.h" #include "d3d8_private.h" #include "wine/debug.h" diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e57e01e..36197e3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <math.h> #include <stdarg.h> diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index f78ff3e..c523984 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "windef.h" @@ -30,7 +27,6 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "d3d8_private.h" diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 6c16633..d88f4b9 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 2edc51d..bbd7e38 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 186e3cd..f08a19c 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 5ca6921..e34ae8a 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index c2d0b9f..a43fb26 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 26e0617..9dc68e8 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8);

1 0

Alexandre Julliard : include: Avoid depending on wine/port.h.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 629f2709f13641ea72cc5d980a96af885514842d URL: https://source.winehq.org/git/wine.git/?a=commit;h=629f2709f13641ea72cc5d98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 09:55:08 2019 +0200 include: Avoid depending on wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wined3d.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0..9a698bc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -26,10 +26,6 @@ #ifndef __WINE_WINED3D_H #define __WINE_WINED3D_H -#ifndef __WINE_WINE_PORT_H -# error You must include wine/port.h to use this header -#endif - #include "wine/list.h" #define WINED3D_OK S_OK @@ -2761,7 +2757,7 @@ HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_ /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) { -#ifdef HAVE___BUILTIN_CLZ +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) return __builtin_clz(x) ^ 0x1f; #else static const unsigned int l[] = @@ -2791,7 +2787,13 @@ static inline unsigned int wined3d_log2i(unsigned int x) static inline int wined3d_bit_scan(unsigned int *x) { - int bit_offset = ffs(*x) - 1; + int bit_offset; +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) + bit_offset = __builtin_ffs(*x) - 1; +#else + for (bit_offset = 0; bit_offset < 32; bit_offset++) + if (*x & (1u << bit_offset)) break; +#endif *x ^= 1u << bit_offset; return bit_offset; }

1 0

Dmitry Timoshkov : msvcrt: Add '-norelay' flag for _vsnprintf().
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: c28af247e98a9eeb9b43e951772b14d410ff6790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c28af247e98a9eeb9b43e951… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 2 14:26:10 2019 +0800 msvcrt: Add '-norelay' flag for _vsnprintf(). Otherwise for instance +relay,+msi log has msi: traces completely messed up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3dddf8a..ed1e72c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1062,7 +1062,7 @@ @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f9d36a9..b3bea65 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1188,7 +1188,7 @@ @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll @ cdecl _utime(str ptr) msvcrt._utime -@ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl _waccess(wstr long) msvcrt._waccess @ cdecl _wasctime(ptr) msvcrt._wasctime diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f0269e7..a8ca862 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1253,7 +1253,7 @@ @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll @ cdecl _utime(str ptr) msvcrt._utime -@ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl _waccess(wstr long) msvcrt._waccess @ cdecl _wasctime(ptr) msvcrt._wasctime

1 0

Nikolay Sivov : dwrite: Remove unused functions.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 5a33f86ec97d504bc3fd294b8bd858470d9cece2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a33f86ec97d504bc3fd294b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 2 09:00:28 2019 +0300 dwrite: Remove unused functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 8 -------- dlls/dwrite/font.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 679e1ed..8e58e61 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1394,14 +1394,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite return hr; } -static inline FLOAT get_cluster_advance(const FLOAT *advances, UINT32 start, UINT32 end) -{ - FLOAT advance = 0.0f; - for (; start < end; start++) - advance += advances[start]; - return advance; -} - static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spacing, float min_advance_width, unsigned int start, unsigned int end, float const *advances, DWRITE_GLYPH_OFFSET const *offsets, DWRITE_SHAPING_GLYPH_PROPERTIES const *glyph_props, float *modified_advances, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5f4abc7..3f11b1d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5123,11 +5123,6 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return S_OK; } -static inline int get_dib_stride( int width, int bpp ) -{ - return ((width * bpp + 31) >> 3) & ~3; -} - static inline BYTE *get_pixel_ptr(BYTE *ptr, DWRITE_TEXTURE_TYPE type, const RECT *runbounds, const RECT *bounds) { if (type == DWRITE_TEXTURE_CLEARTYPE_3x1)

1 0

Zebediah Figura : strmbase: Split RenderEvent into separate events for advising and flushing.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 881f9380676887668d9be8018d7b5e0df8d15f42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881f9380676887668d9be801… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 22:49:48 2019 -0500 strmbase: Split RenderEvent into separate events for advising and flushing. While it's certainly possible to use one event for both purposes, it's a little less clear, and it makes it a little more difficult to do other waits that need to be interrupted by flushing. For example, the video renderer should block in Receive() after rendering the sample until the filter is run. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/videorenderer.c | 2 +- dlls/strmbase/renderer.c | 20 ++++++++++++-------- include/wine/strmbase.h | 27 ++++++++++++++++----------- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0a69a5c..f74b673 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -736,7 +736,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) This->renderer.filter.state = State_Paused; ResetEvent(This->blocked); - ResetEvent(This->renderer.RenderEvent); + ResetEvent(This->renderer.flush_event); } LeaveCriticalSection(&This->renderer.csRenderLock); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ba512a2..2a18015 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -679,7 +679,7 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) VideoRenderer_AutoShowWindow(This); } - ResetEvent(This->renderer.RenderEvent); + ResetEvent(This->renderer.flush_event); This->renderer.filter.state = State_Paused; } LeaveCriticalSection(&This->renderer.csRenderLock); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1ba975d..06adbe7 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -267,7 +267,8 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb InitializeCriticalSection(&filter->csRenderLock); filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); - filter->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->pMediaSample = NULL; QualityControlImpl_Create(&filter->sink.pin.IPin_iface, &filter->filter.IBaseFilter_iface, &filter->qcimpl); @@ -291,7 +292,8 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) BaseRendererImpl_ClearPendingSample(filter); CloseHandle(filter->state_event); - CloseHandle(filter->RenderEvent); + CloseHandle(filter->advise_event); + CloseHandle(filter->flush_event); QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); } @@ -366,12 +368,14 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp if (now - This->filter.rtStreamStart - start <= -10000) { + HANDLE handles[2] = {This->advise_event, This->flush_event}; + IReferenceClock_AdviseTime(This->filter.pClock, This->filter.rtStreamStart, - start, (HEVENT)This->RenderEvent, &cookie); + start, (HEVENT)This->advise_event, &cookie); LeaveCriticalSection(&This->csRenderLock); - WaitForSingleObject(This->RenderEvent, INFINITE); + WaitForMultipleObjects(2, handles, FALSE, INFINITE); IReferenceClock_Unadvise(This->filter.pClock, cookie); EnterCriticalSection(&This->csRenderLock); @@ -418,7 +422,7 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->state_event); - SetEvent(This->RenderEvent); + SetEvent(This->flush_event); } LeaveCriticalSection(&This->csRenderLock); @@ -489,7 +493,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); - ResetEvent(This->RenderEvent); + ResetEvent(This->flush_event); This->filter.state = State_Paused; } } @@ -555,7 +559,7 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->RenderEvent); + SetEvent(iface->flush_event); return S_OK; } @@ -564,7 +568,7 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) TRACE("(%p)\n", iface); QualityControlRender_Start(iface->qcimpl, iface->filter.rtStreamStart); RendererPosPassThru_ResetMediaTime(iface->pPosition); - ResetEvent(iface->RenderEvent); + ResetEvent(iface->flush_event); return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 4ea45cf..22d65f8 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -535,21 +535,26 @@ HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); /* BaseRenderer Filter */ typedef struct BaseRendererTag { - BaseFilter filter; + BaseFilter filter; - BaseInputPin sink; - IUnknown *pPosition; - CRITICAL_SECTION csRenderLock; + BaseInputPin sink; + IUnknown *pPosition; + CRITICAL_SECTION csRenderLock; /* Signaled when the filter has completed a state change. The filter waits * for this event in IBaseFilter::GetState(). */ - HANDLE state_event; - HANDLE RenderEvent; - IMediaSample *pMediaSample; - - IQualityControl *pQSink; - struct QualityControlImpl *qcimpl; + HANDLE state_event; + /* Signaled when the sample presentation time occurs. The streaming thread + * waits for this event in Receive() if applicable. */ + HANDLE advise_event; + /* Signaled when a flush or state change occurs, i.e. anything that needs + * to immediately unblock the streaming thread. */ + HANDLE flush_event; + IMediaSample *pMediaSample; + + IQualityControl *pQSink; + struct QualityControlImpl *qcimpl; - const struct BaseRendererFuncTable * pFuncsTable; + const struct BaseRendererFuncTable *pFuncsTable; } BaseRenderer; typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(BaseRenderer *This, const AM_MEDIA_TYPE *pmt);

1 0

Zebediah Figura : strmbase: Do not set RenderEvent in IBaseFilter::Run().
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: f834e4a459d79a438c472aa0eff4637ddf787087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f834e4a459d79a438c472aa0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 22:49:47 2019 -0500 strmbase: Do not set RenderEvent in IBaseFilter::Run(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 2c71024..1ba975d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -460,7 +460,6 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) This->pFuncsTable->pfnOnStartStreaming(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); - SetEvent(This->RenderEvent); This->filter.state = State_Running; } out:

1 0

Zebediah Figura : strmbase: Wait for the presentation time in BaseRendererImpl_Receive().
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: c0712a97a684ef23bbdfb6c1353c4220094e78a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0712a97a684ef23bbdfb6c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 22:49:46 2019 -0500 strmbase: Wait for the presentation time in BaseRendererImpl_Receive(). Try to make the quality control object more clearly responsible for calculating quality after the fact, and only that. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 65 ++++++++++++++-------------------------- dlls/strmbase/renderer.c | 26 ++++++++++++---- dlls/strmbase/strmbase_private.h | 3 +- 3 files changed, 44 insertions(+), 50 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index d6a91a7..139c4df 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -171,46 +171,6 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME return FALSE; } -HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev) -{ - REFERENCE_TIME start = -1, stop = -1, jitter = 0; - - TRACE("%p %p %p\n", This, sample, ev); - - This->current_rstart = This->current_rstop = -1; - This->current_jitter = 0; - if (!This->clock || FAILED(IMediaSample_GetTime(sample, &start, &stop))) - return S_OK; - - if (start >= 0) { - REFERENCE_TIME now; - IReferenceClock_GetTime(This->clock, &now); - now -= This->clockstart; - - jitter = now - start; - if (jitter <= -10000) { - DWORD_PTR cookie; - IReferenceClock_AdviseTime(This->clock, This->clockstart, start, (HEVENT)ev, &cookie); - WaitForSingleObject(ev, INFINITE); - IReferenceClock_Unadvise(This->clock, cookie); - } - } - else - start = stop = -1; - This->current_rstart = start; - This->current_rstop = stop > start ? stop : start; - This->current_jitter = jitter; - This->is_dropped = QualityControlRender_IsLate(This, jitter, start, stop); - TRACE("Dropped: %i %i %i %i\n", This->is_dropped, (int)(start/10000), (int)(stop/10000), (int)(jitter / 10000)); - if (This->is_dropped) { - This->dropped++; - if (!This->qos_handled) - return S_FALSE; - } else - This->rendered++; - return S_OK; -} - void QualityControlRender_DoQOS(QualityControlImpl *priv) { REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; @@ -324,12 +284,31 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) } -void QualityControlRender_BeginRender(QualityControlImpl *This) +void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop) { - TRACE("%p\n", This); - This->start = -1; + This->current_rstart = start; + This->current_rstop = max(stop, start); + + if (start >= 0) + { + REFERENCE_TIME now; + IReferenceClock_GetTime(This->clock, &now); + This->current_jitter = (now - This->clockstart) - start; + } + else + This->current_jitter = 0; + + /* FIXME: This isn't correct; we don't drop samples, nor should. */ + This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); + TRACE("Dropped: %i %i %i %i\n", This->is_dropped, (int)(start/10000), + (int)(stop/10000), (int)(This->current_jitter / 10000)); + if (This->is_dropped) + This->dropped++; + else + This->rendered++; + if (!This->clock) return; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1af601a..2c71024 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -345,7 +345,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } /* Wait for render Time */ - if (SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) + if (This->filter.pClock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) { hr = S_FALSE; RendererPosPassThru_RegisterMediaTime(This->pPosition, start); @@ -356,12 +356,26 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp ;/* Do not wait: drop through */ else if (hr == S_FALSE) { + REFERENCE_TIME now; + DWORD_PTR cookie; + if (This->pFuncsTable->pfnOnWaitStart) This->pFuncsTable->pfnOnWaitStart(This); - LeaveCriticalSection(&This->csRenderLock); - hr = QualityControlRender_WaitFor(This->qcimpl, pSample, This->RenderEvent); - EnterCriticalSection(&This->csRenderLock); + IReferenceClock_GetTime(This->filter.pClock, &now); + + if (now - This->filter.rtStreamStart - start <= -10000) + { + IReferenceClock_AdviseTime(This->filter.pClock, This->filter.rtStreamStart, + start, (HEVENT)This->RenderEvent, &cookie); + + LeaveCriticalSection(&This->csRenderLock); + + WaitForSingleObject(This->RenderEvent, INFINITE); + IReferenceClock_Unadvise(This->filter.pClock, cookie); + + EnterCriticalSection(&This->csRenderLock); + } if (This->pFuncsTable->pfnOnWaitEnd) This->pFuncsTable->pfnOnWaitEnd(This); @@ -373,10 +387,12 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp return S_OK; } } + else + start = stop = -1; if (SUCCEEDED(hr)) { - QualityControlRender_BeginRender(This->qcimpl); + QualityControlRender_BeginRender(This->qcimpl, start, stop); hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); QualityControlRender_EndRender(This->qcimpl); } diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 769c8f2..439ab9a 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -59,9 +59,8 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart); void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock); -HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev); void QualityControlRender_DoQOS(QualityControlImpl *priv); -void QualityControlRender_BeginRender(QualityControlImpl *This); +void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop); void QualityControlRender_EndRender(QualityControlImpl *This); HRESULT enum_pins_create(BaseFilter *base, IEnumPins **enum_pins);

1 0