wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Alex Henrie : libport: Fix typo in rintf.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: a7841d4c71de034adf062a9979eb8ddeb6d45b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7841d4c71de034adf062a99… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 13 14:16:48 2017 -0700 libport: Fix typo in rintf. Spotted by Joris Huizer. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef104c3a336661b72a7485adb3d98477e755f6c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/port/rint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/rint.c b/libs/port/rint.c index a99c00b..2c0d222 100644 --- a/libs/port/rint.c +++ b/libs/port/rint.c @@ -33,7 +33,7 @@ double rint(double x) #ifndef HAVE_RINTF float rintf(float x) { - return rintf(x); + return rint(x); } #endif

1 0

Michael Stefaniuc : make_announce: Don't hardcode the 'stable' branch.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0a05fe63974c47780e7720c2eb23178585e0429c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a05fe63974c47780e7720c2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 20 23:45:44 2018 +0100 make_announce: Don't hardcode the 'stable' branch. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_announce b/tools/make_announce index 9e44a13..b38b7b0 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -70,7 +70,7 @@ sub get_bugs($) { my %bugs; - open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . "..stable" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . ".." or die "cannot query bug list"; while (<QUERY>) {

1 0

Alexandre Julliard : configure: Check the positive form of the warning options.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: c37e880709880d30cfdb79883a4c81acbcc77fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37e880709880d30cfdb7988… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 13:37:15 2018 +0100 configure: Check the positive form of the warning options. Checking the -Wno- form doesn't fail and causes warnings on gcc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8cf375de353dc16d834f6447b2765b2d9c2d9ddb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 36 ++++++++++++++++++------------------ configure.ac | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure b/configure index c6e876b..b77245f 100755 --- a/configure +++ b/configure @@ -14427,54 +14427,54 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-packed-not-aligned" >&5 -$as_echo_n "checking whether the compiler supports -Wno-packed-not-aligned... " >&6; } -if ${ac_cv_cflags__Wno_packed_not_aligned+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpacked-not-aligned" >&5 +$as_echo_n "checking whether the compiler supports -Wpacked-not-aligned... " >&6; } +if ${ac_cv_cflags__Wpacked_not_aligned+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-packed-not-aligned" +CFLAGS="$CFLAGS -Wpacked-not-aligned" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_packed_not_aligned=yes + ac_cv_cflags__Wpacked_not_aligned=yes else - ac_cv_cflags__Wno_packed_not_aligned=no + ac_cv_cflags__Wpacked_not_aligned=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_packed_not_aligned" >&5 -$as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } -if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wpacked_not_aligned" >&5 +$as_echo "$ac_cv_cflags__Wpacked_not_aligned" >&6; } +if test "x$ac_cv_cflags__Wpacked_not_aligned" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-pragma-pack" >&5 -$as_echo_n "checking whether the compiler supports -Wno-pragma-pack... " >&6; } -if ${ac_cv_cflags__Wno_pragma_pack+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpragma-pack" >&5 +$as_echo_n "checking whether the compiler supports -Wpragma-pack... " >&6; } +if ${ac_cv_cflags__Wpragma_pack+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-pragma-pack" +CFLAGS="$CFLAGS -Wpragma-pack" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_pragma_pack=yes + ac_cv_cflags__Wpragma_pack=yes else - ac_cv_cflags__Wno_pragma_pack=no + ac_cv_cflags__Wpragma_pack=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_pragma_pack" >&5 -$as_echo "$ac_cv_cflags__Wno_pragma_pack" >&6; } -if test "x$ac_cv_cflags__Wno_pragma_pack" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wpragma_pack" >&5 +$as_echo "$ac_cv_cflags__Wpragma_pack" >&6; } +if test "x$ac_cv_cflags__Wpragma_pack" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 diff --git a/configure.ac b/configure.ac index b768d05..9b75b4f 100644 --- a/configure.ac +++ b/configure.ac @@ -1767,8 +1767,8 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) - WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) - WINE_TRY_CFLAGS([-Wno-pragma-pack]) + WINE_TRY_CFLAGS([-Wpacked-not-aligned],[EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned"]) + WINE_TRY_CFLAGS([-Wpragma-pack],[EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack"]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Martin Storsjo : configure: Check for -Wno-pragma-pack.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: a31315fe07e90711fec794b64991728db11a30cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31315fe07e90711fec794b6… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:05:35 2018 +0200 configure: Check for -Wno-pragma-pack. Recent clang versions warn if an include file changes the pragma pack level without restoring it before the end of the include file. This avoids warnings for each include of pshpack*.h/poppack.h. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51e2966b4b00cd128c44b413803d8e430a15d021) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index 848e4c2..c6e876b 100755 --- a/configure +++ b/configure @@ -14452,6 +14452,31 @@ $as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-pragma-pack" >&5 +$as_echo_n "checking whether the compiler supports -Wno-pragma-pack... " >&6; } +if ${ac_cv_cflags__Wno_pragma_pack+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-pragma-pack" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_pragma_pack=yes +else + ac_cv_cflags__Wno_pragma_pack=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_pragma_pack" >&5 +$as_echo "$ac_cv_cflags__Wno_pragma_pack" >&6; } +if test "x$ac_cv_cflags__Wno_pragma_pack" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 $as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : diff --git a/configure.ac b/configure.ac index 62f5aa9..b768d05 100644 --- a/configure.ac +++ b/configure.ac @@ -1768,6 +1768,7 @@ then WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) + WINE_TRY_CFLAGS([-Wno-pragma-pack]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Gerald Pfeifer : configure: Use the -Wno-packed-not-aligned compiler option if available.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0c505f3e3e6d1053ae8e30b6604dade32f56b20b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c505f3e3e6d1053ae8e30b6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 4 20:06:07 2017 +0100 configure: Use the -Wno-packed-not-aligned compiler option if available. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6864803f1ab70f9f9e90903b13e67da40973d12a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index caa68be..848e4c2 100755 --- a/configure +++ b/configure @@ -14427,6 +14427,31 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-packed-not-aligned" >&5 +$as_echo_n "checking whether the compiler supports -Wno-packed-not-aligned... " >&6; } +if ${ac_cv_cflags__Wno_packed_not_aligned+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-packed-not-aligned" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_packed_not_aligned=yes +else + ac_cv_cflags__Wno_packed_not_aligned=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_packed_not_aligned" >&5 +$as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } +if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 $as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : diff --git a/configure.ac b/configure.ac index c507d7d..62f5aa9 100644 --- a/configure.ac +++ b/configure.ac @@ -1767,6 +1767,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Henri Verbeet : wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: ab74b3c012bbf38675228e81fd6a245ac5152c9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab74b3c012bbf38675228e81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:06:55 2018 +0100 wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE. This fixes a performance issue exposed by commit afb2aa2512d4c5ffa7256ce5137bc2c142a5d065. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 63ed42ac39440cc914397c70ed0c43aa747ceb4e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/resource.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 611c61f..6534b94 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -328,17 +328,19 @@ static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource * return 0; } } - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); - return 0; - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) - && !(resource->usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return 0; + } + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_NOOVERWRITE used with WINED3D_MAP_DISCARD, ignoring WINED3D_MAP_DISCARD.\n"); + flags &= ~WINED3D_MAP_DISCARD; + } } return flags;

1 0

Henri Verbeet : wined3d: Try to avoid stalling on dynamic buffer maps.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 77a1b76ee6a9686a2184e6372fa69525e30bd7c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a1b76ee6a9686a2184e637… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:40 2017 +0100 wined3d: Try to avoid stalling on dynamic buffer maps. Particularly for applications that use dynamic buffers without WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit afb2aa2512d4c5ffa7256ce5137bc2c142a5d065) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f87c4b3..d7eada7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1102,7 +1102,8 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI dirty_size = 0; } - if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (!(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_READONLY)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) {

1 0

Henri Verbeet : wined3d: Rename WINED3D_BUFFER_DOUBLEBUFFER to WINED3D_BUFFER_PIN_SYSMEM.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: c5684b5e8a94ecbc773e5a592b6f844aac42b071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5684b5e8a94ecbc773e5a59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 27 11:36:33 2017 +0100 wined3d: Rename WINED3D_BUFFER_DOUBLEBUFFER to WINED3D_BUFFER_PIN_SYSMEM. For consistency with the texture code. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a70c55615731a99e1a834f6fcc62766a9d228d3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/buffer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7d0552b..f87c4b3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ -#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ +#define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep a system memory copy for this buffer. */ #define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ #define WINED3D_BUFFER_SYNC 0x10 /* There has been at least one synchronized map since the last preload. */ #define WINED3D_BUFFER_MAP 0x20 /* There has been at least one map since the last preload. */ @@ -251,7 +251,7 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi buffer->buffer_object_usage = gl_usage; - if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { buffer_invalidate_bo_range(buffer, 0, 0); } @@ -608,7 +608,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); - buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; break; case WINED3D_LOCATION_BUFFER: @@ -671,8 +671,8 @@ static void buffer_unload(struct wined3d_resource *resource) /* Download the buffer, but don't permanently enable double buffering. */ wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - if (!(flags & WINED3D_BUFFER_DOUBLEBUFFER)) - buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; + if (!(flags & WINED3D_BUFFER_PIN_SYSMEM)) + buffer->flags &= ~WINED3D_BUFFER_PIN_SYSMEM; wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); buffer_destroy_buffer_object(buffer, context); @@ -1051,7 +1051,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * TRACE("No conversion needed.\n"); /* Nothing to do because heap memory exists if the buffer is double buffer or has no BO at all. */ - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) + if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM)) return; buffer_direct_upload(buffer, context, flags); @@ -1102,7 +1102,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI dirty_size = 0; } - if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) { @@ -1212,7 +1212,7 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) return; } - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) && buffer->buffer_object) + if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) && buffer->buffer_object) { struct wined3d_device *device = buffer->resource.device; const struct wined3d_gl_info *gl_info; @@ -1483,7 +1483,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * maps and retain data in DISCARD maps. Keep a system memory copy of * the buffer to provide the same behavior to the application. */ TRACE("Using doublebuffer mode.\n"); - buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } /* Observations show that draw_primitive_immediate_mode() is faster on

1 0

Zebediah Figura : winedbg/gdbproxy: Replace memory read over a breakpoint with the real value.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: e46cfd0fbec434a7258f56c7780016f6b3123567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e46cfd0fbec434a7258f56c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 14 19:01:15 2018 -0600 winedbg/gdbproxy: Replace memory read over a breakpoint with the real value. Normally, when we hit a breakpoint, we remove it before stopping and add it after continuing. gdb, however, reads the process memory before requesting that the breakpoint be removed, and apparently caches it until the `stepi` instruction is executed; as a result, it thinks that the interrupt byte that is present in the code is an actual interrupt and not a breakpoint, and so tries to step over it as one byte instead of executing the real instruction at that location. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eb63a5f3c3c1851f212bd14f91da329bf3166e42) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/gdbproxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index f94fef5..400f6de 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1499,6 +1499,28 @@ static enum packet_return packet_thread(struct gdb_context* gdbctx) } } +static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SIZE_T blk_len, SIZE_T *r) +{ + /* Wrapper around process_io->read() that replaces values displaced by breakpoints. */ + + BOOL ret; + + ret = gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, r); + if (ret) + { + struct gdb_ctx_Xpoint *xpt; + + for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) + { + char *xpt_addr = xpt->addr; + + if (xpt->type != -1 && xpt_addr >= addr && xpt_addr < addr + blk_len) + buffer[xpt_addr - addr] = xpt->val; + } + } + return ret; +} + static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; @@ -1515,8 +1537,7 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) for (nread = 0; nread < len; nread += r, addr += r) { blk_len = min(sizeof(buffer), len - nread); - if (!gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, &r) || - r == 0) + if (!read_memory(gdbctx, addr, buffer, blk_len, &r) || r == 0) { /* fail at first address, return error */ if (nread == 0) return packet_reply_error(gdbctx, EFAULT);

1 0

Thomas Faber : ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity).
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 806438fb4fad28533d22910d1b8c1b46eda20ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=806438fb4fad28533d22910d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jan 16 19:19:34 2018 +0100 ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity). Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 42f742e1be8a4f3b26ed3d1a343f17fe55cbf322) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/actctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 323ee68..b978438 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1453,8 +1453,11 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) if (progids->allocated == progids->num) { + WCHAR **new_progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, + 2 * progids->allocated * sizeof(WCHAR*)); + if (!new_progids) return FALSE; progids->allocated *= 2; - progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + progids->progids = new_progids; } if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE;

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018