April 2016 - Wine-commits - list.winehq.org

Francois Gouget : shell32: Fix a spelling error in an ERR() message.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 7657845b1b20c2db4609631667a631910de0d1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7657845b1b20c2db460963166… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:48:25 2016 +0200 shell32: Fix a spelling error in an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index be1ba81..309c941 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -668,7 +668,7 @@ static HRESULT UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, LPBC pbc, const WCHA szCompletePath[cPathLen-1] = '\0'; if ((szCompletePath[0] != '/') || (pNextPathElement[0] != '/')) { - ERR("szCompletePath: %s, pNextPathElment: %s\n", szCompletePath, pNextPathElement); + ERR("szCompletePath: %s, pNextPathElement: %s\n", szCompletePath, pNextPathElement); return E_FAIL; }

1 0

Francois Gouget : schannel: Add declarations for SECPKG version 7.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 57271ca1869067f1556ca0c2bc3e45884bb013a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57271ca1869067f1556ca0c2b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 24 12:32:34 2016 +0200 schannel: Add declarations for SECPKG version 7. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/lsamode.c | 4 +++- dlls/schannel/tests/main.c | 6 +++++- include/ntsecpkg.h | 12 +++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index f43150e..96ca240 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -115,6 +115,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -151,6 +152,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ } }; @@ -162,7 +164,7 @@ NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_6; + *PackageVersion = SECPKG_INTERFACE_VERSION_7; *pcTables = 2; *ppTables = secPkgFunctionTable; diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index d8ade9a..4240dd7 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -43,7 +43,9 @@ QueryMetaData) #define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ ValidateTargetInfo) -#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_6 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + PostLogonUser) +#define SECPKG_FUNCTION_TABLE_SIZE_7 sizeof(SECPKG_FUNCTION_TABLE) #define LSA_BASE_CAPS ( \ SECPKG_FLAG_INTEGRITY | \ @@ -152,6 +154,8 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, size = SECPKG_FUNCTION_TABLE_SIZE_5; else if (Version == SECPKG_INTERFACE_VERSION_6) size = SECPKG_FUNCTION_TABLE_SIZE_6; + else if (Version == SECPKG_INTERFACE_VERSION_7) + size = SECPKG_FUNCTION_TABLE_SIZE_7; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL; diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index b83d364..0df345d 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -37,6 +37,7 @@ extern "C" { #define SECPKG_INTERFACE_VERSION_4 0x80000 #define SECPKG_INTERFACE_VERSION_5 0x100000 #define SECPKG_INTERFACE_VERSION_6 0x200000 +#define SECPKG_INTERFACE_VERSION_7 0x400000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -147,11 +148,17 @@ typedef struct _SECPKG_EXTENDED_INFORMATION { } Info; } SECPKG_EXTENDED_INFORMATION, *PSECPKG_EXTENDED_INFORMATION; -typedef struct _SECPKG_TARGETINFO { +typedef struct _SECPKG_TARGETINFO { PSID DomainSid; PCWSTR ComputerName; } SECPKG_TARGETINFO, *PSECPKG_TARGETINFO; +typedef struct _SECPKG_POST_LOGON_USER_INFO { + ULONG Flags; + LUID LogonId; + LUID LinkedLogonId; +} SECPKG_POST_LOGON_USER_INFO, *PSECPKG_POST_LOGON_USER_INFO; + /* callbacks implemented by SSP/AP dlls and called by the LSA */ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, PSecBuffer); @@ -365,6 +372,7 @@ typedef NTSTATUS (NTAPI SpUpdateCredentialsFn)(LSA_SEC_HANDLE, GUID *, ULONG, PUCHAR); typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PSECPKG_TARGETINFO); +typedef NTSTATUS (NTAPI LSA_AP_POST_LOGON_USER)(PSECPKG_POST_LOGON_USER_INFO); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -435,6 +443,8 @@ typedef struct SECPKG_FUNCTION_TABLE { /* Packages with version SECPKG_INTERFACE_VERSION_5 end here */ SpValidateTargetInfoFn *ValidateTargetInfo; /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ + LSA_AP_POST_LOGON_USER* PostLogonUser; + /* Packages with version SECPKG_INTERFACE_VERSION_7 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE;

1 0

Nikolay Sivov : comctl32: Improve DrawShadowText().
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 2771fd9758b71b64a43773f22f09c5ec304cc751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2771fd9758b71b64a43773f22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 24 16:24:35 2016 +0300 comctl32: Improve DrawShadowText(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/commctrl.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c12a214..2a4cd42 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1592,12 +1592,33 @@ LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet) * * Draw text with shadow. */ -int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD dwFlags, - COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) +int WINAPI DrawShadowText(HDC hdc, LPCWSTR text, UINT length, RECT *rect, DWORD flags, + COLORREF crText, COLORREF crShadow, int offset_x, int offset_y) { - FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags, - crText, crShadow, ixOffset, iyOffset); - return DrawTextW(hdc, pszText, cch, rect, DT_LEFT); + int bkmode, ret; + COLORREF clr; + RECT r; + + FIXME("(%p, %s, %d, %p, 0x%08x, 0x%08x, 0x%08x, %d, %d): semi-stub\n", hdc, debugstr_w(text), + length, rect, flags, crText, crShadow, offset_x, offset_y); + + bkmode = SetBkMode(hdc, TRANSPARENT); + clr = SetTextColor(hdc, crShadow); + + /* FIXME: for shadow we need to render normally, blur it, and blend with current background. */ + r = *rect; + OffsetRect(&r, 1, 1); + DrawTextW(hdc, text, length, &r, flags); + + SetTextColor(hdc, crText); + + /* with text color on top of a shadow */ + ret = DrawTextW(hdc, text, length, rect, flags); + + SetTextColor(hdc, clr); + SetBkMode(hdc, bkmode); + + return ret; } /***********************************************************************

1 0

Francois Gouget : include: Remove duplicate Web Services declarations.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 881fd6a565e0b94e1482c522174f457c6d0af2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=881fd6a565e0b94e1482c5221… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 24 04:08:44 2016 +0200 include: Remove duplicate Web Services declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index 6217105..6e30f50 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -49,10 +49,7 @@ typedef struct _WS_ENDPOINT_ADDRESS WS_ENDPOINT_ADDRESS; typedef struct _WS_ENDPOINT_IDENTITY WS_ENDPOINT_IDENTITY; typedef struct _WS_ENUM_DESCRIPTION WS_ENUM_DESCRIPTION; typedef struct _WS_ENUM_VALUE WS_ENUM_VALUE; -typedef struct _WS_OPERATION_DESCRIPTION WS_OPERATION_DESCRIPTION; typedef struct _WS_HTTP_POLICY_DESCRIPTION WS_HTTP_POLICY_DESCRIPTION; -typedef struct _WS_MESSAGE_PROPERTY WS_MESSAGE_PROPERTY; -typedef struct _WS_MESSAGE_PROPERTIES WS_MESSAGE_PROPERTIES; typedef struct _WS_MESSAGE WS_MESSAGE; typedef struct _WS_MESSAGE_DESCRIPTION WS_MESSAGE_DESCRIPTION; typedef struct _WS_OPERATION_DESCRIPTION WS_OPERATION_DESCRIPTION;

1 0

Francois Gouget : testbot/TestAgent: Better report the netcat errors.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: tools Branch: master Commit: 1317e3173c43c358376cb4593f37e2f65441ebc1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1317e3173c43c358376cb459… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 25 04:10:26 2016 +0200 testbot/TestAgent: Better report the netcat errors. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 82ca97f..da10672 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -220,7 +220,16 @@ sub _SetError($$$) }; $ncerr = $rc if (!$ncerr); $ncerr = "the \"$self->{nc}\" command returned $ncerr"; - $self->{err} = $self->{agentversion} ? "$self->{err}\n$ncerr" : $ncerr; + if ($self->{agentversion}) + { + $self->{err} .= "\n$ncerr"; + } + else + { + # The real issue is that we failed to connect so + # ignore the _RecvString('AgentVersion') error message + $self->{err} = "$ncerr ($self->{rpc})"; + } } } $self->Disconnect(); @@ -231,7 +240,7 @@ sub _SetError($$$) # We did not even manage to connect but record the error anyway $self->{err} = $Msg; } - debug($self->{rpc} || "norpc", ": $self->{err}\n"); + debug("$self->{err}\n"); } sub GetLastError($)

1 0

Józef Kucia : wined3d: Accept multiple instruction modifiers in SM4+ shaders.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 807c4514d05223266916ae58cc41ed18f998683b URL: http://source.winehq.org/git/wine.git/?a=commit;h=807c4514d05223266916ae58c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:44 2016 +0200 wined3d: Accept multiple instruction modifiers in SM4+ shaders. 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/shader_sm4.c | 66 +++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5933626..35e6659 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1146,11 +1146,42 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD return TRUE; } +static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) +{ + static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER + | WINED3D_SM4_MODIFIER_AOFFIMMI + | WINED3D_SM4_AOFFIMMI_U_MASK + | WINED3D_SM4_AOFFIMMI_V_MASK + | WINED3D_SM4_AOFFIMMI_W_MASK; + + if (modifier & ~recognized_bits) + { + FIXME("Unhandled modifier 0x%08x.\n", modifier); + } + else + { + /* Bit fields are used for sign extension */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } + aoffimmi; + aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; + aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; + aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + } +} + static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins) { const struct wined3d_sm4_opcode_info *opcode_info; + DWORD opcode_token, opcode, previous_token; struct wined3d_sm4_data *priv = data; - DWORD opcode_token, opcode; unsigned int i, len; const DWORD *p; @@ -1195,36 +1226,9 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi p = *ptr; *ptr += len; - if (opcode_token & WINED3D_SM4_INSTRUCTION_MODIFIER) - { - static const DWORD recognized_bits = WINED3D_SM4_MODIFIER_AOFFIMMI - | WINED3D_SM4_AOFFIMMI_U_MASK - | WINED3D_SM4_AOFFIMMI_V_MASK - | WINED3D_SM4_AOFFIMMI_W_MASK; - DWORD modifier = *p++; - /* Bit fields are used for sign extension */ - struct - { - int u : 4; - int v : 4; - int w : 4; - } - aoffimmi; - - if (modifier & ~recognized_bits) - { - FIXME("Skipping modifier 0x%08x.\n", modifier); - } - else - { - aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; - } - } + previous_token = opcode_token; + while (previous_token & WINED3D_SM4_INSTRUCTION_MODIFIER) + shader_sm4_read_instruction_modifier(previous_token = *p++, ins); if (opcode_info->read_opcode_func) {

1 0

Józef Kucia : wined3d: Add few missing enum values to debug_fbostatus().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 4e38c3988e30b9b6ff08332133e4a079d081a644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e38c3988e30b9b6ff0833213… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:45 2016 +0200 wined3d: Add few missing enum values to debug_fbostatus(). 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/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 341e12b..c7bf5bb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4099,6 +4099,8 @@ const char *debug_fbostatus(GLenum status) { FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNSUPPORTED); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNDEFINED); #undef FBOSTATUS_TO_STR

1 0

Józef Kucia : wined3d: Implement readback from 2D array textures using glGet[Compressed]TexImage ().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: b5dad41e36d96d4124730219f26c38a09d2d486e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5dad41e36d96d4124730219f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:46 2016 +0200 wined3d: Implement readback from 2D array textures using glGet[Compressed]TexImage(). 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 | 74 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 367bd95..7b8f5eb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -758,11 +758,14 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { + unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; const struct wined3d_format *format = texture->resource.format; + struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; unsigned int src_row_pitch, src_slice_pitch; struct wined3d_bo_address data; + BYTE *temporary_mem = NULL; void *mem; /* Only support read back of converted P8 surfaces. */ @@ -772,7 +775,28 @@ static void surface_download_data(struct wined3d_surface *surface, const struct return; } - wined3d_texture_get_memory(texture, surface_get_sub_resource_idx(surface), &data, dst_location); + sub_resource = &texture->sub_resources[sub_resource_idx]; + + if (surface->texture_target == GL_TEXTURE_2D_ARRAY) + { + /* We don't expect to ever need to emulate NP2 textures when we have EXT_texture_array. */ + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + { + FIXME("Cannot download surface %p, level %u, layer %u.\n", + surface, surface->texture_level, surface->texture_layer); + return; + } + + WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n"); + + if (!(temporary_mem = HeapAlloc(GetProcessHeap(), 0, texture->layer_count * sub_resource->size))) + { + ERR("Out of memory.\n"); + return; + } + } + + wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { @@ -781,22 +805,31 @@ static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_texture_get_level_pow2_width(texture, surface->texture_level), wined3d_texture_get_level_pow2_height(texture, surface->texture_level), &src_row_pitch, &src_slice_pitch); - mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); + if (!(temporary_mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch))) + { + ERR("Out of memory.\n"); + return; + } if (data.buffer_object) ERR("NP2 emulated texture uses PBO unexpectedly.\n"); if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) ERR("Unexpected compressed format for NP2 emulated texture.\n"); } - else + + if (temporary_mem) { - mem = data.addr; + mem = temporary_mem; } - - if (data.buffer_object) + else if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); checkGLcall("glBindBuffer"); + mem = data.addr; + } + else + { + mem = data.addr; } if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) @@ -817,12 +850,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct checkGLcall("glGetTexImage"); } - if (data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; @@ -883,9 +910,30 @@ static void surface_download_data(struct wined3d_surface *surface, const struct src_data += src_row_pitch; dst_data += dst_row_pitch; } + } + else if (temporary_mem) + { + void *src_data = temporary_mem + surface->texture_layer * sub_resource->size; + if (data.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); + checkGLcall("glBindBuffer"); + GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, 0, sub_resource->size, src_data)); + checkGLcall("glBufferSubData"); + } + else + { + memcpy(data.addr, src_data, sub_resource->size); + } + } - HeapFree(GetProcessHeap(), 0, mem); + if (data.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); } + + HeapFree(GetProcessHeap(), 0, temporary_mem); } /* This call just uploads data, the caller is responsible for binding the

1 0

Józef Kucia : wined3d: Handle 2D array textures in context_dump_fbo_attachment().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 0f1729c5f47b162e083866e2047dd06f9b4b5286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1729c5f47b162e083866e20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:47 2016 +0200 wined3d: Handle 2D array textures in context_dump_fbo_attachment(). 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/context.c | 58 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6cda974..e741969 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -219,6 +219,20 @@ static void context_attach_surface_fbo(struct wined3d_context *context, static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, GLenum target, GLenum attachment) { + static const struct + { + GLenum target; + GLenum binding; + const char *str; + enum wined3d_gl_extension extension; + } + texture_type[] = + { + {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D, "2d", WINED3D_GL_EXT_NONE}, + {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE}, + {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY, "2d-array", EXT_TEXTURE_ARRAY}, + }; + GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, @@ -262,29 +276,30 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } else { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_texture); - while (gl_info->gl_ops.gl.p_glGetError()); + unsigned int i; - glBindTexture(GL_TEXTURE_2D, name); - if (!gl_info->gl_ops.gl.p_glGetError()) - { - tex_target = GL_TEXTURE_2D; - tex_type_str = "2d"; - } - else + tex_type_str = NULL; + for (i = 0; i < sizeof(texture_type) / sizeof(*texture_type); ++i) { - glBindTexture(GL_TEXTURE_2D, old_texture); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_texture); + if (!gl_info->supported[texture_type[i].extension]) + continue; - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, name); - if (gl_info->gl_ops.gl.p_glGetError()) + gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); + while (gl_info->gl_ops.gl.p_glGetError()); + + glBindTexture(texture_type[i].target, name); + if (!gl_info->gl_ops.gl.p_glGetError()) { - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, old_texture); - FIXME("Cannot find type of texture %d.\n", name); - return; + tex_target = texture_type[i].target; + tex_type_str = texture_type[i].str; + break; } - tex_target = GL_TEXTURE_RECTANGLE_ARB; - tex_type_str = "rectangle"; + glBindTexture(texture_type[i].target, old_texture); + } + if (!tex_type_str) + { + FIXME("Cannot find type of texture %d.\n", name); + return; } glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); @@ -296,13 +311,16 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G tex_type_str, name, width, height, fmt); glBindTexture(tex_target, old_texture); + checkGLcall("Guess texture type"); } else if (type == GL_NONE) { - FIXME("\t%s: NONE.\n", debug_fboattachment(attachment)); + FIXME(" %s: NONE.\n", debug_fboattachment(attachment)); } else - ERR("\t%s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type); + { + ERR(" %s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type); + } } /* Context activation is done by the caller. */

1 0

Józef Kucia : d3d11: Add ID3D11ClassLinkage interface stub.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: ecc577312e203484d757056ef3bdf548679b81ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc577312e203484d757056ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:48 2016 +0200 d3d11: Add ID3D11ClassLinkage interface stub. 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/d3d11_private.h | 12 ++++ dlls/d3d11/device.c | 13 ++++- dlls/d3d11/shader.c | 142 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 17e9f9f..cfc50a8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -315,6 +315,18 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; +/* ID3D11ClassLinkage */ +struct d3d11_class_linkage +{ + ID3D11ClassLinkage ID3D11ClassLinkage_iface; + LONG refcount; + + struct wined3d_private_store private_store; +}; + +HRESULT d3d11_class_linkage_create(struct d3d_device *device, + struct d3d11_class_linkage **class_linkage) DECLSPEC_HIDDEN; + /* ID3D11BlendState, ID3D10BlendState1 */ struct d3d_blend_state { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fd88ac1..7fb28ac 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2241,9 +2241,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device * static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device *iface, ID3D11ClassLinkage **class_linkage) { - FIXME("iface %p, class_linkage %p stub!\n", iface, class_linkage); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d11_class_linkage *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, class_linkage %p.\n", iface, class_linkage); + + if (FAILED(hr = d3d11_class_linkage_create(device, &object))) + return hr; + + *class_linkage = &object->ID3D11ClassLinkage_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index bf6bb32..0b6b29e 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1507,3 +1507,145 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i return impl_from_ID3D10PixelShader(iface); } + +/* ID3D11ClassLinkage methods */ + +static inline struct d3d11_class_linkage *impl_from_ID3D11ClassLinkage(ID3D11ClassLinkage *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_class_linkage, ID3D11ClassLinkage_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_QueryInterface(ID3D11ClassLinkage *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11ClassLinkage) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11ClassLinkage_AddRef(*object = iface); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_class_linkage_AddRef(ID3D11ClassLinkage *iface) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + ULONG refcount = InterlockedIncrement(&class_linkage->refcount); + + TRACE("%p increasing refcount to %u.\n", class_linkage, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_class_linkage_Release(ID3D11ClassLinkage *iface) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + ULONG refcount = InterlockedDecrement(&class_linkage->refcount); + + TRACE("%p decreasing refcount to %u.\n", class_linkage, refcount); + + if (!refcount) + { + wined3d_private_store_cleanup(&class_linkage->private_store); + HeapFree(GetProcessHeap(), 0, class_linkage); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_class_linkage_GetDevice(ID3D11ClassLinkage *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_GetPrivateData(ID3D11ClassLinkage *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&class_linkage->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_SetPrivateData(ID3D11ClassLinkage *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&class_linkage->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_SetPrivateDataInterface(ID3D11ClassLinkage *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&class_linkage->private_store, guid, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_GetClassInstance(ID3D11ClassLinkage *iface, + const char *instance_name, UINT instance_index, ID3D11ClassInstance **class_instance) +{ + FIXME("iface %p, instance_name %s, instance_index %u, class_instance %p stub!\n", + iface, debugstr_a(instance_name), instance_index, class_instance); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_CreateClassInstance(ID3D11ClassLinkage *iface, + const char *type_name, UINT cb_offset, UINT cb_vector_offset, UINT texture_offset, + UINT sampler_offset, ID3D11ClassInstance **class_instance) +{ + FIXME("iface %p, type_name %s, cb_offset %u, cb_vector_offset %u, texture_offset %u, " + "sampler_offset %u, class_instance %p stub!\n", + iface, debugstr_a(type_name), cb_offset, cb_vector_offset, texture_offset, + sampler_offset, class_instance); + + return E_NOTIMPL; +} + +static const struct ID3D11ClassLinkageVtbl d3d11_class_linkage_vtbl = +{ + /* IUnknown methods */ + d3d11_class_linkage_QueryInterface, + d3d11_class_linkage_AddRef, + d3d11_class_linkage_Release, + /* ID3D11DeviceChild methods */ + d3d11_class_linkage_GetDevice, + d3d11_class_linkage_GetPrivateData, + d3d11_class_linkage_SetPrivateData, + d3d11_class_linkage_SetPrivateDataInterface, + /* ID3D11ClassLinkage methods */ + d3d11_class_linkage_GetClassInstance, + d3d11_class_linkage_CreateClassInstance, +}; + +HRESULT d3d11_class_linkage_create(struct d3d_device *device, struct d3d11_class_linkage **class_linkage) +{ + struct d3d11_class_linkage *object; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3D11ClassLinkage_iface.lpVtbl = &d3d11_class_linkage_vtbl; + object->refcount = 1; + wined3d_private_store_init(&object->private_store); + + TRACE("Created class linkage %p.\n", object); + *class_linkage = object; + + return S_OK; +}

1 0