February 2018 - Wine-Commits

Alex Henrie : d3dx9: Correctly round constants in D3DXSHMultiply3 implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 00a352a3765223f9d37e111c13bcab8efa577318 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00a352a3765223f9d37e111c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 5 20:47:08 2018 -0700 d3dx9: Correctly round constants in D3DXSHMultiply3 implementation. The correct constants are given to approximately 64-bit precision in "Code Generation and Factoring for Fast Evaluation of Low-order Spherical Harmonic Products and Squares" (2006) by John Snyder. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 8f5f5b2..856e987 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2573,27 +2573,27 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) out[0] = 0.28209479f * a[0] * b[0]; - ta = 0.28209479f * a[0] - 0.12615662f * a[6] - 0.21850968f * a[8]; - tb = 0.28209479f * b[0] - 0.12615662f * b[6] - 0.21850968f * b[8]; + ta = 0.28209479f * a[0] - 0.12615663f * a[6] - 0.21850969f * a[8]; + tb = 0.28209479f * b[0] - 0.12615663f * b[6] - 0.21850969f * b[8]; out[1] = ta * b[1] + tb * a[1]; t = a[1] * b[1]; out[0] += 0.28209479f * t; - out[6] = -0.12615662f * t; - out[8] = -0.21850968f * t; + out[6] = -0.12615663f * t; + out[8] = -0.21850969f * t; - ta = 0.21850968f * a[5]; - tb = 0.21850968f * b[5]; + ta = 0.21850969f * a[5]; + tb = 0.21850969f * b[5]; out[1] += ta * b[2] + tb * a[2]; out[2] = ta * b[1] + tb * a[1]; t = a[1] * b[2] +a[2] * b[1]; - out[5] = 0.21850968f * t; + out[5] = 0.21850969f * t; - ta = 0.21850968f * a[4]; - tb = 0.21850968f * b[4]; + ta = 0.21850969f * a[4]; + tb = 0.21850969f * b[4]; out[1] += ta * b[3] + tb * a[3]; out[3] = ta * b[1] + tb * a[1]; t = a[1] * b[3] + a[3] * b[1]; - out[4] = 0.21850968f * t; + out[4] = 0.21850969f * t; ta = 0.28209480f * a[0] + 0.25231326f * a[6]; tb = 0.28209480f * b[0] + 0.25231326f * b[6]; @@ -2629,14 +2629,14 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) out[4] += ta * b[5] + tb * a[5]; out[5] += ta * b[4] + tb * a[4]; t = a[4] * b[5] + a[5] * b[4]; - out[7] += 0.15607834f * t; + out[7] += 0.15607835f * t; - ta = 0.28209479f * a[0] + 0.09011186f * a[6] - 0.15607835f * a[8]; - tb = 0.28209479f * b[0] + 0.09011186f * b[6] - 0.15607835f * b[8]; + ta = 0.28209479f * a[0] + 0.09011188f * a[6] - 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011188f * b[6] - 0.15607835f * b[8]; out[5] += ta * b[5] + tb * a[5]; t = a[5] * b[5]; out[0] += 0.28209479f * t; - out[6] += 0.09011186f * t; + out[6] += 0.09011188f * t; out[8] -= 0.15607835f * t; ta = 0.28209480f * a[0]; @@ -2646,12 +2646,12 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) out[0] += 0.28209480f * t; out[6] += 0.18022376f * t; - ta = 0.28209479f * a[0] + 0.09011186f * a[6] + 0.15607835f * a[8]; - tb = 0.28209479f * b[0] + 0.09011186f * b[6] + 0.15607835f * b[8]; + ta = 0.28209479f * a[0] + 0.09011188f * a[6] + 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011188f * b[6] + 0.15607835f * b[8]; out[7] += ta * b[7] + tb * a[7]; t = a[7] * b[7]; out[0] += 0.28209479f * t; - out[6] += 0.09011186f * t; + out[6] += 0.09011188f * t; out[8] += 0.15607835f * t; ta = 0.28209479f * a[0] - 0.18022375f * a[6];

1 0

Alexandre Julliard : kernel32/tests: Add some tests for image flags and CLR images.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: b6ca8fd25dab76708b56150468278e4bde5f9264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ca8fd25dab76708b561504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 20:08:49 2018 +0100 kernel32/tests: Add some tests for image flags and CLR images. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 316 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 268 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6ca8fd25dab76708b56…

1 0

Matteo Bruni : wined3d: Introduce a WINED3DFMT_FLAG_GEN_MIPMAP flag.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 882742e17aabed5d68c7ec554063b8b95299a7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=882742e17aabed5d68c7ec55… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 15:54:13 2018 +0100 wined3d: Introduce a WINED3DFMT_FLAG_GEN_MIPMAP flag. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++------ dlls/wined3d/texture.c | 5 ++--- dlls/wined3d/utils.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c8f42fe..924cc72 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5296,7 +5296,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *adapter_format, *format; enum wined3d_gl_resource_type gl_type, gl_type_end; - BOOL mipmap_autogen_supported; + BOOL mipmap_autogen_supported = TRUE; DWORD format_flags = 0; DWORD allowed_usage; @@ -5410,7 +5410,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - mipmap_autogen_supported = gl_info->supported[SGIS_GENERATE_MIPMAP]; for (; gl_type <= gl_type_end; ++gl_type) { if ((format->flags[gl_type] & format_flags) != format_flags) @@ -5440,11 +5439,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if ((format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) - != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) - { + if (!(format->flags[gl_type] & WINED3DFMT_FLAG_GEN_MIPMAP)) mipmap_autogen_supported = FALSE; - } } if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_autogen_supported) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3806103..c9210cb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -386,8 +386,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_DISCARD; if (flags & WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS) { - if (~format->flags[WINED3D_GL_RES_TYPE_TEX_2D] - & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + if (!(texture->resource.format_flags & WINED3DFMT_FLAG_GEN_MIPMAP)) WARN("Format doesn't support mipmaps generation, " "ignoring WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag.\n"); else @@ -2684,7 +2683,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->resource.map_binding = WINED3D_LOCATION_BUFFER; } - /* Generate all the surfaces. */ + /* Generate all the sub resources. */ for (i = 0; i < texture->level_count; ++i) { struct wined3d_texture_sub_resource *sub_resource; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6f7740d..960909f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3595,6 +3595,23 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) return TRUE; } +static void init_format_gen_mipmap_info(struct wined3d_gl_info *gl_info) +{ + unsigned int i, j; + + if (!gl_info->supported[SGIS_GENERATE_MIPMAP] && !gl_info->fbo_ops.glGenerateMipmap) + return; + + for (i = 0; i < gl_info->format_count; ++i) + { + struct wined3d_format *format = &gl_info->formats[i]; + + for (j = 0; j < ARRAY_SIZE(format->flags); ++j) + if (!(~format->flags[j] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) + format->flags[j] |= WINED3DFMT_FLAG_GEN_MIPMAP; + } +} + BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) { static const struct wined3d_color red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -3783,6 +3800,7 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi init_format_fbo_compat_info(ctx); init_format_filter_info(gl_info, adapter->driver_info.vendor); if (!init_typeless_formats(gl_info)) goto fail; + init_format_gen_mipmap_info(gl_info); init_format_depth_bias_scale(ctx, &adapter->d3d_info); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1f7530..8201536 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4205,6 +4205,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_TEXTURE 0x00080000 #define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 #define WINED3DFMT_FLAG_INTEGER 0x00200000 +#define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 struct wined3d_rational {

1 0

Nikolay Sivov : comctl32/button: Use messages to get control text.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 65f23a745ad44dee50d451f063943ca80598e3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f23a745ad44dee50d451f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 16:19:57 2018 +0300 comctl32/button: Use messages to get control text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2f5a5b3..dccddf9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -223,9 +223,10 @@ static inline void paint_button( HWND hwnd, LONG style, UINT action ) /* retrieve the button text; returned buffer must be freed by caller */ static inline WCHAR *get_button_text( HWND hwnd ) { - static const INT len = 512; + INT len = GetWindowTextLengthW( hwnd ); WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (buffer) InternalGetWindowText( hwnd, buffer, len + 1 ); + if (buffer) + GetWindowTextW( hwnd, buffer, len + 1 ); return buffer; }

1 0

Alexandre Julliard : include: Add definitions for SECTION_IMAGE_INFORMATION flags.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 1e036633e8fe54b69cf862794b012c98737c3ea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e036633e8fe54b69cf86279… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 10:37:28 2018 +0100 include: Add definitions for SECTION_IMAGE_INFORMATION flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- include/wine/server_protocol.h | 5 +++++ include/winternl.h | 14 +++++++++++++- server/protocol.def | 5 +++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 426af01..8e764f7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3228,7 +3228,7 @@ NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, info->DllCharacteristics = image_info.dll_charact; info->Machine = image_info.machine; info->ImageContainsCode = image_info.contains_code; - info->ImageFlags = image_info.image_flags; + info->u.ImageFlags = image_info.image_flags; info->LoaderFlags = image_info.loader_flags; info->ImageFileSize = image_info.file_size; info->CheckSum = image_info.checksum; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ba9f66f..602fc77 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -701,6 +701,11 @@ typedef struct unsigned int file_size; unsigned int checksum; } pe_image_info_t; +#define IMAGE_FLAGS_ComPlusNativeReady 0x01 +#define IMAGE_FLAGS_ComPlusILOnly 0x02 +#define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 +#define IMAGE_FLAGS_ImageMappedFlat 0x08 +#define IMAGE_FLAGS_BaseBelow4gb 0x10 struct rawinput_device { diff --git a/include/winternl.h b/include/winternl.h index 2911ff6..ec6850a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1965,7 +1965,19 @@ typedef struct _SECTION_IMAGE_INFORMATION { USHORT DllCharacteristics; USHORT Machine; BOOLEAN ImageContainsCode; - UCHAR ImageFlags; + union + { + UCHAR ImageFlags; + struct + { + UCHAR ComPlusNativeReady : 1; + UCHAR ComPlusILOnly : 1; + UCHAR ImageDynamicallyRelocated : 1; + UCHAR ImageMappedFlat : 1; + UCHAR BaseBelow4gb : 1; + UCHAR Reserved : 3; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; ULONG LoaderFlags; ULONG ImageFileSize; ULONG CheckSum; diff --git a/server/protocol.def b/server/protocol.def index a21d694..35824ae 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -717,6 +717,11 @@ typedef struct unsigned int file_size; unsigned int checksum; } pe_image_info_t; +#define IMAGE_FLAGS_ComPlusNativeReady 0x01 +#define IMAGE_FLAGS_ComPlusILOnly 0x02 +#define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 +#define IMAGE_FLAGS_ImageMappedFlat 0x08 +#define IMAGE_FLAGS_BaseBelow4gb 0x10 struct rawinput_device {

1 0

Nikolay Sivov : comctl32/button: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 9d897b73a877e5eaae26df87930c951ff8273c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d897b73a877e5eaae26df87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 16:19:58 2018 +0300 comctl32/button: Use the global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index dccddf9..7184d19 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -67,6 +67,7 @@ #include "uxtheme.h" #include "vssym32.h" #include "wine/debug.h" +#include "wine/heap.h" #include "comctl32.h" @@ -224,7 +225,7 @@ static inline void paint_button( HWND hwnd, LONG style, UINT action ) static inline WCHAR *get_button_text( HWND hwnd ) { INT len = GetWindowTextLengthW( hwnd ); - WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); + WCHAR *buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ); if (buffer) GetWindowTextW( hwnd, buffer, len + 1 ); return buffer; @@ -732,14 +733,14 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) if (!(text = get_button_text( hwnd ))) goto empty_rect; if (!text[0]) { - HeapFree( GetProcessHeap(), 0, text ); + heap_free( text ); goto empty_rect; } if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont ); DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); if (hPrevFont) SelectObject( hdc, hPrevFont ); - HeapFree( GetProcessHeap(), 0, text ); + heap_free( text ); break; } @@ -873,7 +874,7 @@ static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc) DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, flags); - HeapFree( GetProcessHeap(), 0, text ); + heap_free( text ); } /********************************************************************** @@ -1278,7 +1279,7 @@ static void PB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta if (text) { DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); - HeapFree(GetProcessHeap(), 0, text); + heap_free(text); } if (focused) @@ -1378,7 +1379,7 @@ static void CB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta DrawFocusRect( hDC, &focusRect ); } - HeapFree(GetProcessHeap(), 0, text); + heap_free(text); } if (created_font) DeleteObject(font); @@ -1438,7 +1439,7 @@ static void GB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta { InflateRect(&textRect, -2, 0); DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); - HeapFree(GetProcessHeap(), 0, text); + heap_free(text); } if (created_font) DeleteObject(font);

1 0

Michael Müller : include: Add run level information enum and structure to winnt.h.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 0a7d627ca3d4bb864a33d093edceea08ffbce05d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a7d627ca3d4bb864a33d093… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 13 02:58:12 2018 +0000 include: Add run level information enum and structure to winnt.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 04f00a6..855d2a8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5763,16 +5763,33 @@ typedef struct _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION { } ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION, *PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION; #endif +typedef enum { + ACTCTX_RUN_LEVEL_UNSPECIFIED = 0, + ACTCTX_RUN_LEVEL_AS_INVOKER, + ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE, + ACTCTX_RUN_LEVEL_REQUIRE_ADMIN, + ACTCTX_RUN_LEVEL_NUMBERS +} ACTCTX_REQUESTED_RUN_LEVEL; + +typedef struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION { + DWORD ulFlags; + ACTCTX_REQUESTED_RUN_LEVEL RunLevel; + DWORD UiAccess; +} ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION, *PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; + +typedef const struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION *PCACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; + typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { ActivationContextBasicInformation = 1, ActivationContextDetailedInformation = 2, AssemblyDetailedInformationInActivationContext = 3, FileInformationInAssemblyOfAssemblyInActivationContext = 4, + RunlevelInformationInActivationContext = 5, CompatibilityInformationInActivationContext = 6, + ActivationContextManifestResourceName = 7, MaxActivationContextInfoClass, - - AssemblyDetailedInformationInActivationContxt = 3, - FileInformationInAssemblyOfAssemblyInActivationContxt = 4 + AssemblyDetailedInformationInActivationContxt = AssemblyDetailedInformationInActivationContext, + FileInformationInAssemblyOfAssemblyInActivationContxt = FileInformationInAssemblyOfAssemblyInActivationContext } ACTIVATION_CONTEXT_INFO_CLASS; #define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1

1 0

Józef Kucia : wined3d: Avoid raw blits when resolving multisample textures.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 53ddba5305b9eb4280214227d8a23703cef77f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ddba5305b9eb4280214227… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:18 2018 +0100 wined3d: Avoid raw blits when resolving multisample textures. 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/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df0481f..00bc4e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3778,7 +3778,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst DWORD src_ds_flags, dst_ds_flags; struct wined3d_context *context; enum wined3d_blit_op blit_op; - BOOL scale, convert; + BOOL scale, convert, resolve; static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE @@ -3844,6 +3844,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst scale = src_rect->right - src_rect->left != dst_rect->right - dst_rect->left || src_rect->bottom - src_rect->top != dst_rect->bottom - dst_rect->top; convert = src_texture->resource.format->id != dst_texture->resource.format->id; + resolve = src_texture->resource.multisample_type != dst_texture->resource.multisample_type; dst_ds_flags = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -3954,7 +3955,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINED3D_OK; } - else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert)) + else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) { blit_op = WINED3D_BLIT_OP_RAW_BLIT; }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_ResolveSubresource().
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 410ffa37f2418a96988ac4f76b39b9a6424630be URL: https://source.winehq.org/git/wine.git/?a=commit;h=410ffa37f2418a96988ac4f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:20 2018 +0100 d3d11: Implement d3d11_immediate_context_ResolveSubresource(). 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/d3d11/device.c | 21 +++++++++++++++++---- dlls/d3d11/tests/d3d11.c | 3 --- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f9db15f..5873be6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1179,10 +1179,23 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D ID3D11Resource *src_resource, UINT src_subresource_idx, DXGI_FORMAT format) { - FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, src_resource %p, src_subresource_idx %u, " - "format %s stub!\n", - iface, dst_resource, dst_subresource_idx, src_resource, src_subresource_idx, - debug_dxgi_format(format)); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + enum wined3d_format_id wined3d_format; + + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, " + "src_resource %p, src_subresource_idx %u, format %s.\n", + iface, dst_resource, dst_subresource_idx, + src_resource, src_subresource_idx, debug_dxgi_format(format)); + + wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); + wined3d_format = wined3dformat_from_dxgi_format(format); + wined3d_mutex_lock(); + wined3d_device_resolve_sub_resource(device->wined3d_device, + wined3d_dst_resource, dst_subresource_idx, + wined3d_src_resource, src_subresource_idx, wined3d_format); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 93184ad..e0769a7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -24999,13 +24999,10 @@ static void test_alpha_to_coverage(void) get_texture_readback(readback_texture, 0, &rb); SetRect(&rect, 0, 0, 200, 200); - todo_wine check_readback_data_color(&rb, &rect, expected_color, 1); SetRect(&rect, 200, 0, 640, 200); - todo_wine check_readback_data_color(&rb, &rect, 0xffffffff, 1); SetRect(&rect, 0, 200, 640, 480); - todo_wine check_readback_data_color(&rb, &rect, 0xffffffff, 1); release_resource_readback(&rb); }

1 0

Henri Verbeet : d3d9: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 5ceaf934de5e9241e8466a074ac3cab3aaad6dae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ceaf934de5e9241e8466a07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 13 13:20:44 2018 +0330 d3d9: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/d3d9/texture.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3bd23b6..c955764 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1273,7 +1273,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = width; desc.height = height; desc.depth = 1; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 6b7a30c..5abf2d0 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1222,7 +1222,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = width; desc.height = height; desc.depth = 1; @@ -1277,7 +1277,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = edge_length; desc.height = edge_length; desc.depth = 1;

1 0