September 2020 - Wine-commits

Gijs Vermeulen : crypt32: Remove unused variable in test_CryptBinaryToString().
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: a963947322da7a4d572e73ca597cc3caf67e498f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a963947322da7a4d572e73ca… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 3 00:20:19 2020 +0200 crypt32: Remove unused variable in test_CryptBinaryToString(). This was missed in eb00dbd9134783242d0e3c21be8f5fafd4519d70. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 7b9f4c1077..a48f0a5c44 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -240,7 +240,6 @@ static void test_CryptBinaryToString(void) { static const DWORD flags[] = { 0, CRYPT_STRING_NOCR, CRYPT_STRING_NOCRLF }; static const WCHAR hexdig[] = L"0123456789abcdef"; - OSVERSIONINFOA ver = { sizeof(ver) }; BYTE input[256 * sizeof(WCHAR)]; DWORD strLen, strLen2, i, j; WCHAR *hex, *cmp, *ptr;

1 0

Zebediah Figura : wined3d: Read the SM5 resource type instruction modifier.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 9610e71f3423ba3443faad8477833a49345d16cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9610e71f3423ba3443faad84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 18:40:35 2020 -0500 wined3d: Read the SM5 resource type instruction modifier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 77 +++++++++++++++++------------------------- dlls/wined3d/shader_sm4.c | 74 +++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 83 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f4c4eb07d8..a8765fd445 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2042,6 +2042,29 @@ static void shader_dump_shader_input_sysval_semantic(struct wined3d_string_buffe shader_addline(buffer, "unknown_shader_input_sysval_semantic(%#x)", semantic); } +static void shader_dump_resource_type(struct wined3d_string_buffer *buffer, enum wined3d_shader_resource_type type) +{ + static const char *const resource_type_names[] = + { + /* WINED3D_SHADER_RESOURCE_NONE */ "none", + /* WINED3D_SHADER_RESOURCE_BUFFER */ "buffer", + /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ "texture1d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ "texture2d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ "texture2dms", + /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ "texture3d", + /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ "texturecube", + /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ "texture1darray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ "texture2darray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ "texture2dmsarray", + /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", + }; + + if (type <= ARRAY_SIZE(resource_type_names)) + shader_addline(buffer, "%s", resource_type_names[type]); + else + shader_addline(buffer, "unknown"); +} + static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, const struct wined3d_shader_semantic *semantic, unsigned int flags, const struct wined3d_shader_version *shader_version) @@ -2075,52 +2098,7 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, shader_addline(buffer, "_resource_"); else shader_addline(buffer, "_uav_"); - switch (semantic->resource_type) - { - case WINED3D_SHADER_RESOURCE_BUFFER: - shader_addline(buffer, "buffer"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_1D: - shader_addline(buffer, "texture1d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2D: - shader_addline(buffer, "texture2d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: - shader_addline(buffer, "texture2dms"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_3D: - shader_addline(buffer, "texture3d"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: - shader_addline(buffer, "texturecube"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: - shader_addline(buffer, "texture1darray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: - shader_addline(buffer, "texture2darray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: - shader_addline(buffer, "texture2dmsarray"); - break; - - case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: - shader_addline(buffer, "texturecubearray"); - break; - - default: - shader_addline(buffer, "unknown"); - break; - } + shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->reg.reg.type == WINED3DSPR_UAV) shader_dump_uav_flags(buffer, flags); switch (semantic->resource_data_type) @@ -3116,6 +3094,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); + if (ins.resource_type != WINED3D_SHADER_RESOURCE_NONE) + { + shader_addline(&buffer, "("); + shader_dump_resource_type(&buffer, ins.resource_type); + shader_addline(&buffer, ")"); + } + for (i = 0; i < ins.dst_count; ++i) { shader_dump_ins_modifiers(&buffer, &ins.dst[i]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 443cfe7e4b..54646174a2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -26,7 +26,11 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) -#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 +#define WINED3D_SM4_MODIFIER_MASK 0x3fu + +#define WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 +#define WINED3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) + #define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 #define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) #define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 @@ -304,6 +308,12 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; +enum wined3d_sm4_instruction_modifier +{ + WINED3D_SM4_MODIFIER_AOFFIMMI = 0x1, + WINED3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x00, @@ -1609,32 +1619,49 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD 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; + enum wined3d_sm4_instruction_modifier modifier_type = modifier & WINED3D_SM4_MODIFIER_MASK; - if (modifier & ~recognized_bits) + switch (modifier_type) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); - } - else - { - /* Bit fields are used for sign extension */ - struct + case WINED3D_SM4_MODIFIER_AOFFIMMI: { - int u : 4; - int v : 4; - int w : 4; + static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER + | WINED3D_SM4_MODIFIER_MASK + | WINED3D_SM4_AOFFIMMI_U_MASK + | WINED3D_SM4_AOFFIMMI_V_MASK + | WINED3D_SM4_AOFFIMMI_W_MASK; + + /* Bit fields are used for sign extension. */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } aoffimmi; + + if (modifier & ~recognized_bits) + FIXME("Unhandled instruction modifier %#x.\n", modifier); + + 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; + break; + } + + case WINED3D_SM5_MODIFIER_RESOURCE_TYPE: + { + enum wined3d_sm4_resource_type resource_type + = (modifier & WINED3D_SM5_MODIFIER_RESOURCE_TYPE_MASK) >> WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT; + + ins->resource_type = resource_type_table[resource_type]; + break; } - 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; + + default: + FIXME("Unhandled instruction modifier %#x.\n", modifier); } } @@ -1703,6 +1730,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->dst = priv->dst_param; ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; + ins->resource_type = WINED3D_SHADER_RESOURCE_NONE; memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 16b3d0325c..6e905ca6a4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1246,6 +1246,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_dst_param *dst; const struct wined3d_shader_src_param *src; struct wined3d_shader_texel_offset texel_offset; + enum wined3d_shader_resource_type resource_type; BOOL coissue; const struct wined3d_shader_src_param *predicate; union

1 0

Zebediah Figura : wined3d: Read the SM5 resource data type instruction modifier.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 2f94e72b8061d168b167e89333c1508c0e327ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f94e72b8061d168b167e893… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 18:40:36 2020 -0500 wined3d: Read the SM5 resource data type instruction modifier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 51 +++++++++++++++++++++--------------------- dlls/wined3d/shader_sm4.c | 16 +++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a8765fd445..0166746bfd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2065,6 +2065,27 @@ static void shader_dump_resource_type(struct wined3d_string_buffer *buffer, enum shader_addline(buffer, "unknown"); } +static void shader_dump_data_type(struct wined3d_string_buffer *buffer, enum wined3d_data_type type) +{ + static const char *const data_type_names[] = + { + /* WINED3D_DATA_FLOAT */ "(float)", + /* WINED3D_DATA_INT */ "(int)", + /* WINED3D_DATA_RESOURCE */ "(resource)", + /* WINED3D_DATA_SAMPLER */ "(sampler)", + /* WINED3D_DATA_UAV */ "(uav)", + /* WINED3D_DATA_UINT */ "(uint)", + /* WINED3D_DATA_UNORM */ "(unorm)", + /* WINED3D_DATA_SNORM */ "(snorm)", + /* WINED3D_DATA_OPAQUE */ "(opaque)", + }; + + if (type <= ARRAY_SIZE(data_type_names)) + shader_addline(buffer, "%s", data_type_names[type]); + else + shader_addline(buffer, "(unknown)"); +} + static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, const struct wined3d_shader_semantic *semantic, unsigned int flags, const struct wined3d_shader_version *shader_version) @@ -2101,32 +2122,7 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, shader_dump_resource_type(buffer, semantic->resource_type); if (semantic->reg.reg.type == WINED3DSPR_UAV) shader_dump_uav_flags(buffer, flags); - switch (semantic->resource_data_type) - { - case WINED3D_DATA_FLOAT: - shader_addline(buffer, " (float)"); - break; - - case WINED3D_DATA_INT: - shader_addline(buffer, " (int)"); - break; - - case WINED3D_DATA_UINT: - shader_addline(buffer, " (uint)"); - break; - - case WINED3D_DATA_UNORM: - shader_addline(buffer, " (unorm)"); - break; - - case WINED3D_DATA_SNORM: - shader_addline(buffer, " (snorm)"); - break; - - default: - shader_addline(buffer, " (unknown)"); - break; - } + shader_dump_data_type(buffer, semantic->resource_data_type); } else { @@ -3101,6 +3097,9 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, ")"); } + if (ins.resource_data_type != WINED3D_DATA_FLOAT) + shader_dump_data_type(&buffer, ins.resource_data_type); + for (i = 0; i < ins.dst_count; ++i) { shader_dump_ins_modifiers(&buffer, &ins.dst[i]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 54646174a2..90135553d8 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -28,6 +28,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_MODIFIER_MASK 0x3fu +#define WINED3D_SM5_MODIFIER_DATA_TYPE_SHIFT 6 +#define WINED3D_SM5_MODIFIER_DATA_TYPE_MASK (0xffffu << WINED3D_SM5_MODIFIER_DATA_TYPE_SHIFT) + #define WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT 6 #define WINED3D_SM5_MODIFIER_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM5_MODIFIER_RESOURCE_TYPE_SHIFT) @@ -312,6 +315,7 @@ enum wined3d_sm4_instruction_modifier { WINED3D_SM4_MODIFIER_AOFFIMMI = 0x1, WINED3D_SM5_MODIFIER_RESOURCE_TYPE = 0x2, + WINED3D_SM5_MODIFIER_DATA_TYPE = 0x3, }; enum wined3d_sm4_register_type @@ -1651,6 +1655,17 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_ break; } + case WINED3D_SM5_MODIFIER_DATA_TYPE: + { + DWORD components = (modifier & WINED3D_SM5_MODIFIER_DATA_TYPE_MASK) >> WINED3D_SM5_MODIFIER_DATA_TYPE_SHIFT; + enum wined3d_sm4_data_type data_type = components & 0xf; + + if ((components & 0xfff0) != (components & 0xf) * 0x1110) + FIXME("Components (%#x) have different data types.\n", components); + ins->resource_data_type = data_type_table[data_type]; + break; + } + case WINED3D_SM5_MODIFIER_RESOURCE_TYPE: { enum wined3d_sm4_resource_type resource_type @@ -1731,6 +1746,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; ins->resource_type = WINED3D_SHADER_RESOURCE_NONE; + ins->resource_data_type = WINED3D_DATA_FLOAT; memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e905ca6a4..b2605b837a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1247,6 +1247,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_src_param *src; struct wined3d_shader_texel_offset texel_offset; enum wined3d_shader_resource_type resource_type; + enum wined3d_data_type resource_data_type; BOOL coissue; const struct wined3d_shader_src_param *predicate; union

1 0

Zebediah Figura : dxgi: Add DXGI_FORMAT_NV12 and DXGI_FORMAT_YUY2.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 26da9b429700ce5aeea4ece8789eec5d5805c421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26da9b429700ce5aeea4ece8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 23:11:38 2020 -0500 dxgi: Add DXGI_FORMAT_NV12 and DXGI_FORMAT_YUY2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 6c49d4539c..665413e4c6 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -147,6 +147,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); + WINE_DXGI_TO_STR(DXGI_FORMAT_NV12); + WINE_DXGI_TO_STR(DXGI_FORMAT_YUY2); WINE_DXGI_TO_STR(DXGI_FORMAT_B4G4R4A4_UNORM); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); @@ -260,6 +262,8 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; + case WINED3DFMT_NV12: return DXGI_FORMAT_NV12; + case WINED3DFMT_YUY2: return DXGI_FORMAT_YUY2; case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: FIXME("Unhandled wined3d format %#x.\n", format); @@ -371,6 +375,8 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; + case DXGI_FORMAT_NV12: return WINED3DFMT_NV12; + case DXGI_FORMAT_YUY2: return WINED3DFMT_YUY2; case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format);

1 0

Zebediah Figura : d3d11: Add DXGI_FORMAT_NV12 and DXGI_FORMAT_YUY2.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 314368e6c442f043ebfc22b70c1113e4e6232c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=314368e6c442f043ebfc22b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 2 23:11:39 2020 -0500 d3d11: Add DXGI_FORMAT_NV12 and DXGI_FORMAT_YUY2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 0e483fd4bb..1a0be470f3 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -147,6 +147,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_D3D_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); + WINE_D3D_TO_STR(DXGI_FORMAT_NV12); + WINE_D3D_TO_STR(DXGI_FORMAT_YUY2); WINE_D3D_TO_STR(DXGI_FORMAT_B4G4R4A4_UNORM); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); @@ -309,6 +311,8 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; + case WINED3DFMT_NV12: return DXGI_FORMAT_NV12; + case WINED3DFMT_YUY2: return DXGI_FORMAT_YUY2; case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: FIXME("Unhandled wined3d format %#x.\n", format); @@ -420,6 +424,8 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; + case DXGI_FORMAT_NV12: return WINED3DFMT_NV12; + case DXGI_FORMAT_YUY2: return WINED3DFMT_YUY2; case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format);

1 0

Alexandre Julliard : ntdll: Add a helper function for fixed anonymous mmaps.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 74deee7df0abd7e05b433f875e86e26d7e2f447f URL: https://source.winehq.org/git/wine.git/?a=commit;h=74deee7df0abd7e05b433f87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 10:51:09 2020 +0200 ntdll: Add a helper function for fixed anonymous mmaps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 30 +++++++++++++++++------------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dcbe4eff0f..5f8fcd82be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -610,7 +610,7 @@ static NTSTATUS map_so_dll( const IMAGE_NT_HEADERS *nt_descr, HMODULE module ) + sizeof(IMAGE_NT_HEADERS) + nb_sections * sizeof(IMAGE_SECTION_HEADER)); - if (wine_anon_mmap( addr, size, PROT_READ | PROT_WRITE, MAP_FIXED ) != addr) return STATUS_NO_MEMORY; + if (anon_mmap_fixed( addr, size, PROT_READ | PROT_WRITE, 0 ) != addr) return STATUS_NO_MEMORY; dos = (IMAGE_DOS_HEADER *)addr; nt = (IMAGE_NT_HEADERS *)((BYTE *)(dos + 1) + sizeof(builtin_signature)); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f71963f4a9..f77cb7b214 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -176,6 +176,7 @@ extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; +extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3468f771b9..23731fb33a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -211,6 +211,11 @@ static inline BOOL is_inside_signal_stack( void *ptr ) (char *)ptr < (char *)get_signal_stack() + signal_stack_size); } +/* mmap() anonymous memory at a fixed address */ +void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) +{ + return mmap( start, size, prot, MAP_PRIVATE | MAP_ANON | MAP_FIXED | flags, -1, 0 ); +} static void mmap_add_reserved_area( void *addr, SIZE_T size ) { @@ -1163,7 +1168,7 @@ static void add_reserved_area( void *addr, size_t size ) addr = user_space_limit; } /* blow away existing mappings */ - wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); + anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); mmap_add_reserved_area( addr, size ); } @@ -1266,7 +1271,7 @@ static inline void unmap_area( void *addr, size_t size ) break; } case 1: /* in a reserved area */ - wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); + anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); break; default: case 0: /* not in a reserved area */ @@ -1684,7 +1689,7 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) case 1: /* in a reserved area, make sure the address is available */ if (find_view_range( base, size )) return STATUS_CONFLICTING_ADDRESSES; /* replace the reserved area by our mapping */ - if ((ptr = wine_anon_mmap( base, size, get_unix_prot(vprot), MAP_FIXED )) != base) + if ((ptr = anon_mmap_fixed( base, size, get_unix_prot(vprot), 0 )) != base) return STATUS_INVALID_PARAMETER; break; } @@ -1725,7 +1730,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); - if (wine_anon_mmap( ptr, size, get_unix_prot(vprot), MAP_FIXED ) != ptr) + if (anon_mmap_fixed( ptr, size, get_unix_prot(vprot), 0 ) != ptr) return STATUS_INVALID_PARAMETER; goto done; } @@ -1817,8 +1822,8 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start } /* Reserve the memory with an anonymous mmap */ - ptr = wine_anon_mmap( (char *)view->base + start, size, PROT_READ | PROT_WRITE, MAP_FIXED ); - if (ptr == (void *)-1) return STATUS_NO_MEMORY; + ptr = anon_mmap_fixed( (char *)view->base + start, size, PROT_READ | PROT_WRITE, 0 ); + if (ptr == MAP_FAILED) return STATUS_NO_MEMORY; /* Now read in the file */ pread( fd, ptr, size, offset ); if (prot != (PROT_READ|PROT_WRITE)) mprotect( ptr, size, prot ); /* Set the right protection */ @@ -1875,7 +1880,7 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro */ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t size ) { - if (wine_anon_mmap( (char *)view->base + start, size, PROT_NONE, MAP_FIXED ) != (void *)-1) + if (anon_mmap_fixed( (char *)view->base + start, size, PROT_NONE, 0 ) != MAP_FAILED) { set_page_vprot_bits( (char *)view->base + start, size, 0, VPROT_COMMITTED ); return STATUS_SUCCESS; @@ -1920,7 +1925,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot addr = wine_anon_mmap( (void *)page_size, 0x10000 - page_size, unix_prot, 0 ); if (addr == (void *)page_size) { - if (!wine_anon_mmap( NULL, page_size, unix_prot, MAP_FIXED )) + if (!anon_mmap_fixed( NULL, page_size, unix_prot, 0 )) { addr = NULL; TRACE( "successfully mapped low 64K range\n" ); @@ -1938,7 +1943,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /* now reserve the whole range */ size = (char *)dosmem_size - (char *)addr; - wine_anon_mmap( addr, size, unix_prot, MAP_FIXED ); + anon_mmap_fixed( addr, size, unix_prot, 0 ); return create_view( view, addr, size, vprot ); } @@ -2350,9 +2355,8 @@ static int CDECL alloc_virtual_heap( void *base, SIZE_T size, void *arg ) if (is_beyond_limit( base, size, address_space_limit )) address_space_limit = (char *)base + size; if (size < alloc->size) return 0; if (is_win64 && base < (void *)0x80000000) return 0; - alloc->base = wine_anon_mmap( (char *)base + size - alloc->size, alloc->size, - PROT_READ|PROT_WRITE, MAP_FIXED ); - return (alloc->base != (void *)-1); + alloc->base = anon_mmap_fixed( (char *)base + size - alloc->size, alloc->size, PROT_READ|PROT_WRITE, 0 ); + return (alloc->base != MAP_FAILED); } /*********************************************************************** @@ -2417,7 +2421,7 @@ void virtual_init(void) /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ size = (char *)address_space_start - (char *)0x10000; if (size && mmap_is_in_reserved_area( (void*)0x10000, size ) == 1) - wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED ); + anon_mmap_fixed( (void *)0x10000, size, PROT_READ | PROT_WRITE, 0 ); }

1 0

Alexandre Julliard : ntdll: Add a helper function for memory allocations through mmap().
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 72b97eeba0d934ed2c8607f45429664130dd8f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72b97eeba0d934ed2c8607f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 10:52:11 2020 +0200 ntdll: Add a helper function for memory allocations through mmap(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 5 ++--- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 19 +++++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index cc8b519b98..f162572264 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -85,7 +85,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winnt.h" -#include "wine/library.h" #include "wine/server.h" #include "wine/debug.h" #include "unix_private.h" @@ -914,8 +913,8 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, if (!entry) fd_cache[0] = fd_cache_initial_block; else { - void *ptr = wine_anon_mmap( NULL, FD_CACHE_BLOCK_SIZE * sizeof(union fd_cache_entry), - PROT_READ | PROT_WRITE, 0 ); + void *ptr = anon_mmap_alloc( FD_CACHE_BLOCK_SIZE * sizeof(union fd_cache_entry), + PROT_READ | PROT_WRITE ); if (ptr == MAP_FAILED) return FALSE; fd_cache[entry] = ptr; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f77cb7b214..3185f3a8ac 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -177,6 +177,7 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o data_size_t *ret_len ) DECLSPEC_HIDDEN; extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) DECLSPEC_HIDDEN; +extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 23731fb33a..907524ecc5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -217,6 +217,13 @@ void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) return mmap( start, size, prot, MAP_PRIVATE | MAP_ANON | MAP_FIXED | flags, -1, 0 ); } +/* allocate anonymous mmap() memory at any address */ +void *anon_mmap_alloc( size_t size, int prot ) +{ + return mmap( NULL, size, prot, MAP_PRIVATE | MAP_ANON, -1, 0 ); +} + + static void mmap_add_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; @@ -756,7 +763,7 @@ static BOOL alloc_pages_vprot( const void *addr, size_t size ) for (i = idx >> pages_vprot_shift; i < (end + pages_vprot_mask) >> pages_vprot_shift; i++) { if (pages_vprot[i]) continue; - if ((ptr = wine_anon_mmap( NULL, pages_vprot_mask + 1, PROT_READ | PROT_WRITE, 0 )) == (void *)-1) + if ((ptr = anon_mmap_alloc( pages_vprot_mask + 1, PROT_READ | PROT_WRITE )) == MAP_FAILED) return FALSE; pages_vprot[i] = ptr; } @@ -1299,8 +1306,8 @@ static struct file_view *alloc_view(void) } if (view_block_start == view_block_end) { - void *ptr = wine_anon_mmap( NULL, view_block_size, PROT_READ | PROT_WRITE, 0 ); - if (ptr == (void *)-1) return NULL; + void *ptr = anon_mmap_alloc( view_block_size, PROT_READ | PROT_WRITE ); + if (ptr == MAP_FAILED) return NULL; view_block_start = ptr; view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); } @@ -1746,7 +1753,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, for (;;) { - if ((ptr = wine_anon_mmap( NULL, view_size, get_unix_prot(vprot), 0 )) == (void *)-1) + if ((ptr = anon_mmap_alloc( view_size, get_unix_prot(vprot) )) == MAP_FAILED) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; @@ -2405,9 +2412,9 @@ void virtual_init(void) if (mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) mmap_remove_reserved_area( alloc_views.base, alloc_views.size ); else - alloc_views.base = wine_anon_mmap( NULL, alloc_views.size, PROT_READ | PROT_WRITE, 0 ); + alloc_views.base = anon_mmap_alloc( alloc_views.size, PROT_READ | PROT_WRITE ); - assert( alloc_views.base != (void *)-1 ); + assert( alloc_views.base != MAP_FAILED ); view_block_start = alloc_views.base; view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); free_ranges = (void *)((char *)alloc_views.base + view_block_size);

1 0

Alexandre Julliard : ntdll: Add a helper function to try an mmap at a fixed address.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 4e80f2ea5e350168933599ab7ad633254717e93c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e80f2ea5e350168933599ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 10:54:17 2020 +0200 ntdll: Add a helper function to try an mmap at a fixed address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 112 ++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 54 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 907524ecc5..22d328b1ce 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -59,7 +59,6 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" -#include "wine/library.h" #include "wine/exception.h" #include "wine/list.h" #include "wine/rbtree.h" @@ -173,12 +172,6 @@ static struct list teb_list = LIST_INIT( teb_list ); #ifndef MAP_NORESERVE #define MAP_NORESERVE 0 #endif -#ifndef MAP_TRYFIXED -#define MAP_TRYFIXED 0 -#endif -#ifndef MAP_FIXED_NOREPLACE -#define MAP_FIXED_NOREPLACE 0 -#endif #ifdef _WIN64 /* on 64-bit the page protection bytes use a 2-level table */ static const size_t pages_vprot_shift = 20; @@ -211,6 +204,11 @@ static inline BOOL is_inside_signal_stack( void *ptr ) (char *)ptr < (char *)get_signal_stack() + signal_stack_size); } +static inline BOOL is_beyond_limit( const void *addr, size_t size, const void *limit ) +{ + return (addr >= limit || (const char *)addr + size > (const char *)limit); +} + /* mmap() anonymous memory at a fixed address */ void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) { @@ -375,6 +373,48 @@ static int mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T s return ret; } +static void *anon_mmap_tryfixed( void *start, size_t size, int prot, int flags ) +{ + void *ptr; + +#ifdef MAP_FIXED_NOREPLACE + ptr = mmap( start, size, prot, MAP_FIXED_NOREPLACE | MAP_PRIVATE | MAP_ANON | flags, -1, 0 ); +#elif defined(MAP_TRYFIXED) + ptr = mmap( start, size, prot, MAP_TRYFIXED | MAP_PRIVATE | MAP_ANON | flags, -1, 0 ); +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + ptr = mmap( start, size, prot, MAP_FIXED | MAP_EXCL | MAP_PRIVATE | MAP_ANON | flags, -1, 0 ); + if (ptr == MAP_FAILED && errno == EINVAL) errno = EEXIST; +#elif defined(__APPLE__) + mach_vm_address_t result = (mach_vm_address_t)start; + kern_return_t ret = mach_vm_map( mach_task_self(), &result, size, 0, VM_FLAGS_FIXED, + MEMORY_OBJECT_NULL, 0, 0, prot, VM_PROT_ALL, VM_INHERIT_COPY ); + + if (!ret) + { + if ((ptr = anon_mmap_fixed( start, size, prot, flags )) == MAP_FAILED) + mach_vm_deallocate( mach_task_self(), result, size ); + } + else + { + errno = (ret == KERN_NO_SPACE ? EEXIST : ENOMEM); + ptr = MAP_FAILED; + } +#else + ptr = mmap( start, size, prot, MAP_PRIVATE | MAP_ANON | flags, -1, 0 ); +#endif + if (ptr != MAP_FAILED && ptr != start) + { + if (is_beyond_limit( ptr, size, user_space_limit )) + { + anon_mmap_fixed( ptr, size, PROT_NONE, MAP_NORESERVE ); + mmap_add_reserved_area( ptr, size ); + } + else munmap( ptr, size ); + ptr = MAP_FAILED; + errno = EEXIST; + } + return ptr; +} static void reserve_area( void *addr, void *end ) { @@ -432,23 +472,15 @@ static void reserve_area( void *addr, void *end ) } #else void *ptr; - int flags = MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_TRYFIXED; size_t size = (char *)end - (char *)addr; if (!size) return; -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - ptr = mmap( addr, size, PROT_NONE, flags | MAP_FIXED | MAP_EXCL, -1, 0 ); -#else - ptr = mmap( addr, size, PROT_NONE, flags, -1, 0 ); -#endif - if (ptr == addr) + if ((ptr = anon_mmap_tryfixed( addr, size, PROT_NONE, MAP_NORESERVE )) != MAP_FAILED) { mmap_add_reserved_area( addr, size ); return; } - if (ptr != (void *)-1) munmap( ptr, size ); - size = (size / 2) & ~granularity_mask; if (size) { @@ -1028,20 +1060,14 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step, while (start && base <= start && (char*)start + size <= (char*)end) { - if ((ptr = wine_anon_mmap( start, size, unix_prot, MAP_FIXED_NOREPLACE )) == start) - return start; + if ((ptr = anon_mmap_tryfixed( start, size, unix_prot, 0 )) != MAP_FAILED) return start; TRACE( "Found free area is already mapped, start %p.\n", start ); - - if (ptr == (void *)-1 && errno != EEXIST) + if (errno != EEXIST) { - ERR( "wine_anon_mmap() error %s, range %p-%p, unix_prot %#x.\n", - strerror(errno), start, (char *)start + size, unix_prot ); + ERR( "mmap() error %s, range %p-%p, unix_prot %#x.\n", + strerror(errno), start, (char *)start + size, unix_prot ); return NULL; } - - if (ptr != (void *)-1) - munmap( ptr, size ); - if ((step > 0 && (char *)end - (char *)start < step) || (step < 0 && (char *)start - (char *)base < -step) || step == 0) @@ -1243,17 +1269,6 @@ static int CDECL get_area_boundary_callback( void *start, SIZE_T size, void *arg } -/*********************************************************************** - * is_beyond_limit - * - * Check if an address range goes beyond a given limit. - */ -static inline BOOL is_beyond_limit( const void *addr, size_t size, const void *limit ) -{ - return (addr >= limit || (const char *)addr + size > (const char *)limit); -} - - /*********************************************************************** * unmap_area * @@ -1678,18 +1693,12 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) return status; } case 0: /* not in a reserved area, do a normal allocation */ - if ((ptr = wine_anon_mmap( base, size, get_unix_prot(vprot), 0 )) == (void *)-1) + if ((ptr = anon_mmap_tryfixed( base, size, get_unix_prot(vprot), 0 )) == MAP_FAILED) { if (errno == ENOMEM) return STATUS_NO_MEMORY; + if (errno == EEXIST) return STATUS_CONFLICTING_ADDRESSES; return STATUS_INVALID_PARAMETER; } - if (ptr != base) - { - /* We couldn't get the address we wanted */ - if (is_beyond_limit( ptr, size, user_space_limit )) add_reserved_area( ptr, size ); - else munmap( ptr, size ); - return STATUS_CONFLICTING_ADDRESSES; - } break; default: @@ -1917,20 +1926,16 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot if (mmap_is_in_reserved_area( low_64k, dosmem_size - 0x10000 ) != 1) { - addr = wine_anon_mmap( low_64k, dosmem_size - 0x10000, unix_prot, 0 ); - if (addr != low_64k) - { - if (addr != (void *)-1) munmap( addr, dosmem_size - 0x10000 ); - return map_view( view, NULL, dosmem_size, FALSE, vprot, 0 ); - } + addr = anon_mmap_tryfixed( low_64k, dosmem_size - 0x10000, unix_prot, 0 ); + if (addr == MAP_FAILED) return map_view( view, NULL, dosmem_size, FALSE, vprot, 0 ); } /* now try to allocate the low 64K too */ if (mmap_is_in_reserved_area( NULL, 0x10000 ) != 1) { - addr = wine_anon_mmap( (void *)page_size, 0x10000 - page_size, unix_prot, 0 ); - if (addr == (void *)page_size) + addr = anon_mmap_tryfixed( (void *)page_size, 0x10000 - page_size, unix_prot, 0 ); + if (addr != MAP_FAILED) { if (!anon_mmap_fixed( NULL, page_size, unix_prot, 0 )) { @@ -1941,7 +1946,6 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot } else { - if (addr != (void *)-1) munmap( addr, 0x10000 - page_size ); addr = low_64k; TRACE( "failed to map low 64K range\n" ); }

1 0

Alexandre Julliard : ntdll: Load libwine dynamically.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 2d91f7def15cb0df65fdb87c19e24a5a6c99839e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d91f7def15cb0df65fdb87c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 12:16:52 2020 +0200 ntdll: Load libwine dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/env.c | 15 +++++--------- dlls/ntdll/unix/loader.c | 45 ++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 50 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index bf1755c879..52f63892af 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -3,7 +3,7 @@ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = -lwine $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) +EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \ diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 43920135a0..e1a3d33957 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -60,18 +60,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(environ); -extern int __wine_main_argc; -extern char **__wine_main_argv; -extern char **__wine_main_environ; -extern WCHAR **__wine_main_wargv; - USHORT *uctable = NULL, *lctable = NULL; SIZE_T startup_info_size = 0; int main_argc = 0; char **main_argv = NULL; char **main_envp = NULL; -static WCHAR **main_wargv; +WCHAR **main_wargv = NULL; static LCID user_lcid, system_lcid; static LANGID user_ui_language, system_ui_language; @@ -966,10 +961,10 @@ void init_environment( int argc, char *argv[], char *envp[] ) uctable = case_table + 2; lctable = case_table + case_table[1] + 2; } - __wine_main_argc = main_argc = argc; - __wine_main_argv = main_argv = argv; - __wine_main_wargv = main_wargv = build_wargv( argv ); - __wine_main_environ = main_envp = envp; + main_argc = argc; + main_argv = argv; + main_wargv = build_wargv( argv ); + main_envp = envp; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5f8fcd82be..bc5b627cbc 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -87,7 +87,6 @@ #include "winternl.h" #include "unix_private.h" #include "wine/list.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(module); @@ -815,6 +814,48 @@ static void load_builtin_callback( void *module, const char *filename ) callback_module = module; } + +/*********************************************************************** + * load_libwine + */ +static void load_libwine(void) +{ +#ifdef __APPLE__ +#define LIBWINE "libwine.1.dylib" +#elif defined(__ANDROID__) +#define LIBWINE "libwine.so" +#else +#define LIBWINE "libwine.so.1" +#endif + typedef void (*load_dll_callback_t)( void *, const char * ); + static void (*p_wine_dll_set_callback)( load_dll_callback_t load ); + static int *p___wine_main_argc; + static char ***p___wine_main_argv; + static char ***p___wine_main_environ; + static WCHAR ***p___wine_main_wargv; + + char *path; + void *handle; + + if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); + else path = build_path( dll_dir, "../" LIBWINE ); + + if (!(handle = dlopen( path, RTLD_NOW )) && !(handle = dlopen( LIBWINE, RTLD_NOW ))) return; + + p_wine_dll_set_callback = dlsym( handle, "wine_dll_set_callback" ); + p___wine_main_argc = dlsym( handle, "__wine_main_argc" ); + p___wine_main_argv = dlsym( handle, "__wine_main_argv" ); + p___wine_main_wargv = dlsym( handle, "__wine_main_wargv" ); + p___wine_main_environ = dlsym( handle, "__wine_main_environ" ); + + if (p_wine_dll_set_callback) p_wine_dll_set_callback( load_builtin_callback ); + if (p___wine_main_argc) *p___wine_main_argc = main_argc; + if (p___wine_main_argv) *p___wine_main_argv = main_argv; + if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; + if (p___wine_main_environ) *p___wine_main_environ = main_envp; +} + + /*********************************************************************** * dlopen_dll */ @@ -1610,7 +1651,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) load_ntdll(); init_environment( argc, argv, envp ); - wine_dll_set_callback( load_builtin_callback ); + load_libwine(); #ifdef __APPLE__ apple_main_thread(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3185f3a8ac..39edee09a0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -129,6 +129,7 @@ extern SIZE_T startup_info_size DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN; +extern WCHAR **main_wargv DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : combase: Use typed list iteration macros.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 3255b4b86c6b75a394b857dd36301c455c45ea70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3255b4b86c6b75a394b857dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 11:11:04 2020 +0300 combase: Use typed list iteration macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 12 ++++-------- dlls/combase/marshal.c | 20 ++++++++------------ dlls/combase/stubmanager.c | 28 ++++++++-------------------- 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 125eaff142..5fbec944eb 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -629,13 +629,11 @@ struct apartment * apartment_get_current_or_mta(void) /* The given OXID must be local to this process */ struct apartment * apartment_findfromoxid(OXID oxid) { - struct apartment *result = NULL; - struct list *cursor; + struct apartment *result = NULL, *apt; EnterCriticalSection(&apt_cs); - LIST_FOR_EACH( cursor, &apts ) + LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry) { - struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); if (apt->oxid == oxid) { result = apt; @@ -653,13 +651,11 @@ struct apartment * apartment_findfromoxid(OXID oxid) * is no longer required. */ struct apartment * apartment_findfromtid(DWORD tid) { - struct apartment *result = NULL; - struct list *cursor; + struct apartment *result = NULL, *apt; EnterCriticalSection(&apt_cs); - LIST_FOR_EACH( cursor, &apts ) + LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry) { - struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); if (apt->tid == tid) { result = apt; diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index bcc7813265..bdfb44bffa 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -1803,12 +1803,11 @@ static HRESULT proxy_manager_create_ifproxy( static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found) { HRESULT hr = E_NOINTERFACE; /* assume not found */ - struct list * cursor; + struct ifproxy *ifproxy; EnterCriticalSection(&This->cs); - LIST_FOR_EACH(cursor, &This->interfaces) + LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry) { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); if (IsEqualIID(riid, &ifproxy->iid)) { *ifproxy_found = ifproxy; @@ -1823,7 +1822,7 @@ static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID ri static void proxy_manager_disconnect(struct proxy_manager * This) { - struct list * cursor; + struct ifproxy *ifproxy; TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid), wine_dbgstr_longlong(This->oid)); @@ -1836,9 +1835,8 @@ static void proxy_manager_disconnect(struct proxy_manager * This) * working */ if (!(This->sorflags & SORFP_NOLIFETIMEMGMT)) { - LIST_FOR_EACH(cursor, &This->interfaces) + LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry) { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); ifproxy_disconnect(ifproxy); } } @@ -1963,13 +1961,12 @@ static void proxy_manager_destroy(struct proxy_manager * This) * reference to the proxy_manager when the object is no longer used. */ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struct proxy_manager ** proxy_found) { + struct proxy_manager *proxy; BOOL found = FALSE; - struct list * cursor; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->proxies) + LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry) { - struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); if ((oxid == proxy->oxid) && (oid == proxy->oid)) { /* be careful of a race with ClientIdentity_Release, which would @@ -1989,11 +1986,10 @@ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struc HRESULT apartment_disconnectproxies(struct apartment *apt) { - struct list * cursor; + struct proxy_manager *proxy; - LIST_FOR_EACH(cursor, &apt->proxies) + LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry) { - struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); proxy_manager_disconnect(proxy); } diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index 16b8bb35d0..e9f20962e3 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -137,14 +137,11 @@ static void stub_manager_delete_ifstub(struct stub_manager *m, struct ifstub *if static struct ifstub *stub_manager_ipid_to_ifstub(struct stub_manager *m, const IPID *ipid) { - struct list *cursor; - struct ifstub *result = NULL; + struct ifstub *result = NULL, *ifstub; EnterCriticalSection(&m->lock); - LIST_FOR_EACH( cursor, &m->ifstubs ) + LIST_FOR_EACH_ENTRY(ifstub, &m->ifstubs, struct ifstub, entry) { - struct ifstub *ifstub = LIST_ENTRY( cursor, struct ifstub, entry ); - if (IsEqualGUID(ipid, &ifstub->ipid)) { result = ifstub; @@ -337,8 +334,7 @@ ULONG stub_manager_int_release(struct stub_manager *m) * it must also call release on the stub manager when it is no longer needed */ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; IUnknown *object; HRESULT hres; @@ -350,10 +346,8 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno } EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); - if (m->object == object) { result = m; @@ -386,14 +380,11 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno * it must also call release on the stub manager when it is no longer needed */ struct stub_manager * get_stub_manager(struct apartment *apt, OID oid) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); - if (m->oid == oid) { result = m; @@ -480,14 +471,11 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea * it must also call release on the stub manager when it is no longer needed */ static struct stub_manager *get_stub_manager_from_ipid(struct apartment *apt, const IPID *ipid, struct ifstub **ifstub) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); - if ((*ifstub = stub_manager_ipid_to_ifstub(m, ipid))) { result = m;

1 0