February 2016 - Wine-Commits

Henri Verbeet : wined3d: Introduce wined3d_texture_get_sub_resource_desc() .
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 0287d75ce76c845507b5a9d811d762e22fe4759e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0287d75ce76c845507b5a9d81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:25 2016 +0100 wined3d: Introduce wined3d_texture_get_sub_resource_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 15 +++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 76cdc72..ea19a2d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1553,6 +1553,37 @@ void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *textu texture->sub_resources[sub_resource_idx].resource->parent = parent; } +HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + const struct wined3d_resource *resource; + unsigned int level_idx; + + TRACE("texture %p, sub_resource_idx %u, desc %p.\n", texture, sub_resource_idx, desc); + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return WINED3DERR_INVALIDCALL; + } + + resource = &texture->resource; + desc->format = resource->format->id; + desc->multisample_type = resource->multisample_type; + desc->multisample_quality = resource->multisample_quality; + desc->usage = resource->usage; + desc->pool = resource->pool; + + level_idx = sub_resource_idx % texture->level_count; + desc->width = max(1, resource->width >> level_idx); + desc->height = max(1, resource->height >> level_idx); + desc->depth = max(1, resource->depth >> level_idx); + desc->size = texture->sub_resources[sub_resource_idx].resource->size; + + return WINED3D_OK; +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0d6ce42..5e2e426 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -251,6 +251,7 @@ @ cdecl wined3d_texture_get_pitch(ptr long ptr ptr) @ cdecl wined3d_texture_get_resource(ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) +@ cdecl wined3d_texture_get_sub_resource_desc(ptr long ptr) @ cdecl wined3d_texture_get_sub_resource_parent(ptr long) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b892102..1af0d52 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1635,6 +1635,19 @@ struct wined3d_resource_desc UINT size; }; +struct wined3d_sub_resource_desc +{ + enum wined3d_format_id format; + enum wined3d_multisample_type multisample_type; + UINT multisample_quality; + DWORD usage; + enum wined3d_pool pool; + UINT width; + UINT height; + UINT depth; + UINT size; +}; + struct wined3d_clip_status { DWORD clip_union; @@ -2447,6 +2460,8 @@ void __cdecl wined3d_texture_get_pitch(const struct wined3d_texture *texture, struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx); +HRESULT __cdecl wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); void * __cdecl wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture);

1 0

Charles Davis : winebuild: Specify an object format to windres.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 77960ab755833f9e2eac01d3132c2206882d2698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77960ab755833f9e2eac01d31… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:49:58 2016 -0700 winebuild: Specify an object format to windres. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/res32.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index d459a5f..c59fa19 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -623,6 +623,7 @@ void output_res_o_file( DLLSPEC *spec ) { unsigned int i; char *res_file = NULL; + const char *format; int fd; struct strarray *args; @@ -681,7 +682,21 @@ void output_res_o_file( DLLSPEC *spec ) free( output_buffer ); args = find_tool( "windres", NULL ); + switch (target_cpu) + { + case CPU_x86: + format = "pe-i386"; + break; + case CPU_x86_64: + format = "pe-x86-64"; + break; + default: + format = NULL; + break; + } strarray_add( args, "-i", res_file, "-o", output_file_name, NULL ); + if (format) + strarray_add( args, "-F", format, NULL ); spawn( args ); strarray_free( args );

1 0

Charles Davis : configure: Check for __builtin_ms_va_list on all x86_64 platforms.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 7d295d381c003eb2e43e781b818e5eaeb8a27f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d295d381c003eb2e43e781b8… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:43:17 2016 -0700 configure: Check for __builtin_ms_va_list on all x86_64 platforms. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 +++++++++++---------------------- configure.ac | 31 +++++++++++-------------------- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/configure b/configure index be1e2f1..7bf9178 100755 --- a/configure +++ b/configure @@ -4965,25 +4965,15 @@ fi case $host in *-darwin*) - if test "x$enable_win64" = "xyes" - then - CC="$CC -m64" - CXX="$CXX -m64" - host_cpu="x86_64" - notice_platform="64-bit " - TARGETFLAGS="-m64" - - else - CC="$CC -m32" - CXX="$CXX -m32" - host_cpu="i386" - notice_platform="32-bit " - TARGETFLAGS="-m32" - - enable_win16=${enable_win16:-yes} - fi with_fontconfig=${with_fontconfig:-no} ;; + *-mingw32*|*-cygwin*) + enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" + ;; +esac + +case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then @@ -5040,11 +5030,14 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need gcc >= 4.4 to build Wine as 64-bit." "$LINENO" 5 + as_fn_error $? "You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + CC="$CC -m64" + CXX="$CXX -m64" host_cpu="x86_64" + notice_platform="64-bit " TARGETFLAGS="-m64" fi @@ -5077,10 +5070,6 @@ rm -f core conftest.err conftest.$ac_objext \ TARGETFLAGS="-marm" ;; - *-mingw32*|*-cygwin*) - enable_win16=${enable_win16:-no} - CFLAGS="$CFLAGS -D_WIN32" - ;; i[3456789]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/configure.ac b/configure.ac index e20cbe7..19abd08 100644 --- a/configure.ac +++ b/configure.ac @@ -127,23 +127,15 @@ AC_CHECK_TOOL(LD,ld) case $host in *-darwin*) - if test "x$enable_win64" = "xyes" - then - CC="$CC -m64" - CXX="$CXX -m64" - host_cpu="x86_64" - notice_platform="64-bit " - AC_SUBST(TARGETFLAGS,"-m64") - else - CC="$CC -m32" - CXX="$CXX -m32" - host_cpu="i386" - notice_platform="32-bit " - AC_SUBST(TARGETFLAGS,"-m32") - enable_win16=${enable_win16:-yes} - fi with_fontconfig=${with_fontconfig:-no} ;; + *-mingw32*|*-cygwin*) + enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" + ;; +esac + +case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then @@ -164,9 +156,12 @@ case $host in AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])]) + AC_MSG_ERROR([You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit.])]) fi + CC="$CC -m64" + CXX="$CXX -m64" host_cpu="x86_64" + notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") fi ;; @@ -179,10 +174,6 @@ case $host in CFLAGS="$CFLAGS -marm" AC_SUBST(TARGETFLAGS,"-marm") ;; - *-mingw32*|*-cygwin*) - enable_win16=${enable_win16:-no} - CFLAGS="$CFLAGS -D_WIN32" - ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;;

1 0

Sebastian Lackner : oleaut32: Set DebugInfo for static CRITICAL_SECTION structure.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: f2e48c253603740cb7b0d5d81963c5c8c572181a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e48c253603740cb7b0d5d81… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 27 02:09:55 2016 +0100 oleaut32: Set DebugInfo for static CRITICAL_SECTION structure. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b31e8bc..6fbb320 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -45,6 +45,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); +static CRITICAL_SECTION cache_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cache_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } +}; +static CRITICAL_SECTION cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARIANTARG* ps, VARTYPE vt) @@ -1490,7 +1499,6 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; - static CRITICAL_SECTION csLastChars = { NULL, -1, 0, 0, 0, 0 }; static VARIANT_NUMBER_CHARS lastChars; static LCID lastLcid = -1; static DWORD lastFlags = 0; @@ -1498,14 +1506,14 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID WCHAR buff[4]; /* To make caching thread-safe, a critical section is needed */ - EnterCriticalSection(&csLastChars); + EnterCriticalSection(&cache_cs); /* Asking for default locale entries is very expensive: It is a registry server call. So cache one locally, as Microsoft does it too */ if(lcid == lastLcid && dwFlags == lastFlags) { memcpy(lpChars, &lastChars, sizeof(defaultChars)); - LeaveCriticalSection(&csLastChars); + LeaveCriticalSection(&cache_cs); return; } @@ -1532,7 +1540,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID memcpy(&lastChars, lpChars, sizeof(defaultChars)); lastLcid = lcid; lastFlags = dwFlags; - LeaveCriticalSection(&csLastChars); + LeaveCriticalSection(&cache_cs); } /* Number Parsing States */

1 0

Stefan Dösinger : d3d10core/tests: Test swapchain buffer cycling.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 402ffb9c6060fd6362389916ffb84d54ff571a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402ffb9c6060fd6362389916f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:11 2016 +0000 d3d10core/tests: Test swapchain buffer cycling. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 344 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 316 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=402ffb9c6060fd6362389…

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_device_CopyRects().
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 96120332853af77148c1958029ec17725d1342ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=96120332853af77148c195802… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:27 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_device_CopyRects(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 13de8ec..0c19b3f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1035,8 +1035,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, struct d3d8_surface *src = unsafe_impl_from_IDirect3DSurface8(src_surface); struct d3d8_surface *dst = unsafe_impl_from_IDirect3DSurface8(dst_surface); enum wined3d_format_id src_format, dst_format; - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_sub_resource_desc wined3d_desc; UINT src_w, src_h; TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", @@ -1046,8 +1045,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, * destination texture is in WINED3D_POOL_DEFAULT. */ wined3d_mutex_lock(); - wined3d_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &wined3d_desc); if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", src_surface); @@ -1058,8 +1056,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, src_w = wined3d_desc.width; src_h = wined3d_desc.height; - wined3d_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &wined3d_desc); if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { WARN("Destination %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", dst_surface);

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_set_sub_resource_parent ().
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 5c1976c43b05c4ba8c83acd4ff53bebe3c4acfb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1976c43b05c4ba8c83acd4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:21 2016 +0100 wined3d: Introduce wined3d_texture_set_sub_resource_parent(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 +++--- dlls/wined3d/texture.c | 16 ++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a5b18a2..78d3b11 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1266,7 +1266,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); + wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); if (src_impl->sub_resource_idx) @@ -1297,7 +1297,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); + wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; @@ -1314,7 +1314,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, tmp_rtv, FALSE); wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(texture, 0), src_impl); + wined3d_texture_set_sub_resource_parent(texture, 0, src_impl); wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0533f99..76cdc72 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1537,6 +1537,22 @@ void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *tex return texture->sub_resources[sub_resource_idx].resource->parent; } +void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + + TRACE("texture %p, sub_resource_idx %u, parent %p.\n", texture, sub_resource_idx, parent); + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return; + } + + texture->sub_resources[sub_resource_idx].resource->parent = parent; +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c31ad7b..0d6ce42 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) +@ cdecl wined3d_texture_set_sub_resource_parent(ptr long ptr) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 44b54e0..b892102 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2458,6 +2458,8 @@ HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y); +void __cdecl wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality,

1 0

Henri Verbeet : ddraw: Get the texture format from the texture in d3d_device3_SetRenderState().
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 3c54eefaca85ae422e98c3f18c62018b7f57a81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c54eefaca85ae422e98c3f18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:23 2016 +0100 ddraw: Get the texture format from the texture in d3d_device3_SetRenderState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9c88d43..a5b8445 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2797,17 +2797,13 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) { - struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; - if ((sub_resource = wined3d_texture_get_sub_resource(tex, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(sub_resource, &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; - } + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; } if (tex_alpha)

1 0

Henri Verbeet : ddraw: Get the texture format from the texture in d3d_device3_GetRenderState().
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 8c93a90f78582c4e88caccf1c8c5ff64bae99698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c93a90f78582c4e88caccf1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:22 2016 +0100 ddraw: Get the texture format from the texture in d3d_device3_GetRenderState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c460658..9c88d43 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2500,17 +2500,13 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) { - struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; - if ((sub_resource = wined3d_texture_get_sub_resource(tex, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(sub_resource, &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; - } + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; } if (!(colorop == WINED3D_TOP_MODULATE

1 0

Frédéric Delanoy : dxgi/tests: Use todo_wine_if( ) in tests.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: d00254842b6af321a6e999b5b2ad789c0fabd634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00254842b6af321a6e999b5b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 27 14:44:21 2016 +0100 dxgi/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index dd5da83..7b052d3 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -478,19 +478,13 @@ static void test_createswapchain(void) hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - if (refresh_list[i].numerator_should_pass) + todo_wine_if (!refresh_list[i].numerator_should_pass) ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); - else - todo_wine ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, - "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); - if (refresh_list[i].denominator_should_pass) + todo_wine_if (!refresh_list[i].denominator_should_pass) ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, "Denominator %u is %u.\n", i ,result_desc.BufferDesc.RefreshRate.Denominator); - else - todo_wine ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, - "Denominator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Denominator); IDXGISwapChain_Release(swapchain); } @@ -508,19 +502,13 @@ static void test_createswapchain(void) hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - if (refresh_list[i].numerator_should_pass) + todo_wine_if (!refresh_list[i].numerator_should_pass) ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); - else - todo_wine ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, - "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); - if (refresh_list[i].denominator_should_pass) + todo_wine_if (!refresh_list[i].denominator_should_pass) ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, "Denominator %u is %u.\n", i ,result_desc.BufferDesc.RefreshRate.Denominator); - else - todo_wine ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, - "Denominator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Denominator); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);

1 0