February 2017 - Wine-commits

Lauri Kenttä : crypt32: Fix Base64 issues in CryptStringToBinary.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 552820acbf00b60ef268811e1546f9fde1aa0fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=552820acbf00b60ef268811e1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 14 16:59:34 2017 +0200 crypt32: Fix Base64 issues in CryptStringToBinary. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 280 ++++++++++++++------------------------------ dlls/crypt32/tests/base64.c | 9 +- 2 files changed, 90 insertions(+), 199 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552820acbf00b60ef2688…

1 0

Lauri Kenttä : crypt32: CryptStringToBinary accepts any header.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: a2f2de1e960d37840bb0df541e31d64941e65197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f2de1e960d37840bb0df541… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 14 16:59:35 2017 +0200 crypt32: CryptStringToBinary accepts any header. For example, X509 CRL accepts -----BEGIN foo-----. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 22 ++++++++++++---------- dlls/crypt32/tests/base64.c | 2 -- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 9084789..6c2e252 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -603,10 +603,12 @@ static LONG Base64ToBinaryA(LPCSTR pszString, DWORD cchString, } static LONG Base64WithHeaderAndTrailerToBinaryA(LPCSTR pszString, - DWORD cchString, LPCSTR header, LPCSTR trailer, BYTE *pbBinary, + DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) { LONG ret; + LPCSTR header = CERT_HEADER_START; + LPCSTR trailer = CERT_TRAILER_START; LPCSTR headerBegins; LPCSTR dataBegins; @@ -678,7 +680,7 @@ static LONG Base64HeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - CERT_HEADER_START, CERT_TRAILER_START, pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -689,7 +691,7 @@ static LONG Base64RequestHeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - CERT_REQUEST_HEADER, CERT_REQUEST_TRAILER, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -700,7 +702,7 @@ static LONG Base64X509HeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - X509_HEADER, X509_TRAILER, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; @@ -835,10 +837,12 @@ static LONG Base64ToBinaryW(LPCWSTR pszString, DWORD cchString, } static LONG Base64WithHeaderAndTrailerToBinaryW(LPCWSTR pszString, - DWORD cchString, LPCWSTR header, LPCWSTR trailer, BYTE *pbBinary, + DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) { LONG ret; + LPCWSTR header = CERT_HEADER_START_W; + LPCWSTR trailer = CERT_TRAILER_START_W; LPCWSTR headerBegins; LPCWSTR dataBegins; @@ -910,8 +914,7 @@ static LONG Base64HeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - CERT_HEADER_START_W, CERT_TRAILER_START_W, pbBinary, pcbBinary, - pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -922,8 +925,7 @@ static LONG Base64RequestHeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - CERT_REQUEST_HEADER_W, CERT_REQUEST_TRAILER_W, pbBinary, pcbBinary, - pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -934,7 +936,7 @@ static LONG Base64X509HeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - X509_HEADER_W, X509_TRAILER_W, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index e0669d0..fb70ca0 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -419,7 +419,6 @@ static void testStringToBinaryA(void) decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64HEADER, "T", 0); decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64HEADER, "T", 0); decodeBase64WithFmt("-----BEGIN -----V-----END foo-----", CRYPT_STRING_BASE64HEADER, "T", 0); - todo_wine { decodeBase64WithFmt("-----BEGIN -----V-----END -----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); @@ -428,7 +427,6 @@ static void testStringToBinaryA(void) decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); decodeBase64WithFmt("-----BEGIN -----V-----END foo-----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); - } /* Too small buffer */ buf[0] = 0;

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_imin opcode.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: d0e7ffa0e4110301527442ced5af06240bccbda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e7ffa0e4110301527442ced… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:20 2017 +0100 wined3d: Recognize SM5 imm_atomic_imin opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3e32cab..24dcb05 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5144,6 +5144,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff24a92..adc6746 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9345,6 +9345,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0a07253..6f012cd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -164,6 +164,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", /* WINED3DSIH_IMM_ATOMIC_IMAX */ "imm_atomic_imax", + /* WINED3DSIH_IMM_ATOMIC_IMIN */ "imm_atomic_imin", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 44a9da9..61af803 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -284,6 +284,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, WINED3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba, + WINED3D_SM5_OP_IMM_ATOMIC_IMIN = 0xbb, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, @@ -1011,6 +1012,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, {WINED3D_SM5_OP_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_IMAX, "iU", "ii"}, + {WINED3D_SM5_OP_IMM_ATOMIC_IMIN, WINED3DSIH_IMM_ATOMIC_IMIN, "iU", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d63983..54adf26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -695,6 +695,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_IADD, WINED3DSIH_IMM_ATOMIC_IMAX, + WINED3DSIH_IMM_ATOMIC_IMIN, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMIN,

1 0

Józef Kucia : d3d10core/tests: Add more tests for format reinterpreting SRVs.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 1703d49906fde4794b0d7bdd76306bdaf1ca9672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1703d49906fde4794b0d7bdd7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:21 2017 +0100 d3d10core/tests: Add more tests for format reinterpreting SRVs. 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/d3d10core/tests/device.c | 50 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3735d94..763abcd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5267,6 +5267,7 @@ static void test_texture(void) 0x00000000, 0x00100e46, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, }; + static const struct shader ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; static const DWORD ps_ld_sint8_code[] = { #if 0 @@ -5304,6 +5305,7 @@ static void test_texture(void) 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0a000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, }; + static const struct shader ps_ld_sint8 = {ps_ld_sint8_code, sizeof(ps_ld_sint8_code)}; static const DWORD ps_ld_uint8_code[] = { #if 0 @@ -5336,6 +5338,7 @@ static void test_texture(void) 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e, }; + static const struct shader ps_ld_uint8 = {ps_ld_uint8_code, sizeof(ps_ld_uint8_code)}; static const DWORD ps_sample_code[] = { #if 0 @@ -5362,6 +5365,7 @@ static void test_texture(void) 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; + static const struct shader ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; static const DWORD ps_sample_b_code[] = { #if 0 @@ -5391,6 +5395,7 @@ static void test_texture(void) 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; + static const struct shader ps_sample_b = {ps_sample_b_code, sizeof(ps_sample_b_code)}; static const DWORD ps_sample_l_code[] = { #if 0 @@ -5420,6 +5425,7 @@ static void test_texture(void) 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; + static const struct shader ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const DWORD ps_sample_2d_array_code[] = { #if 0 @@ -5451,12 +5457,6 @@ static void test_texture(void) 0x0020800a, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100246, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; - static const struct shader ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; - static const struct shader ps_ld_sint8 = {ps_ld_sint8_code, sizeof(ps_ld_sint8_code)}; - static const struct shader ps_ld_uint8 = {ps_ld_uint8_code, sizeof(ps_ld_uint8_code)}; - static const struct shader ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; - static const struct shader ps_sample_b = {ps_sample_b_code, sizeof(ps_sample_b_code)}; - static const struct shader ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const struct shader ps_sample_2d_array = {ps_sample_2d_array_code, sizeof(ps_sample_2d_array_code)}; static const DWORD red_data[] = { @@ -5544,6 +5544,20 @@ static void test_texture(void) 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, }; + static const float r32_float[] = + { + 0.0f, 1.0f, 0.5f, 0.50f, + 1.0f, 0.0f, 0.0f, 0.75f, + 0.0f, 1.0f, 0.5f, 0.25f, + 1.0f, 0.0f, 0.0f, 0.75f, + }; + static const DWORD r32_uint[] = + { + 0, 1, 2, 3, + 100, 200, 255, 128, + 40, 30, 20, 10, + 250, 210, 155, 190, + }; static const struct texture rgba_texture = { 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -5583,6 +5597,10 @@ static void test_texture(void) {blue_data, 5 * sizeof(*blue_data)}, } }; + static const struct texture r32f_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, + {{r32_float, 4 * sizeof(*r32_float)}}}; + static const struct texture r32u_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, + {{r32_uint, 4 * sizeof(*r32_uint)}}}; static const DWORD red_colors[] = { 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, @@ -5660,6 +5678,20 @@ static void test_texture(void) 0x7e7e7e7e, 0x7e7e7e7e, 0x7e7e7e7e, 0x7e808080, 0x7e7e7e7e, 0x7e7f7f7f, 0x7e7f7f7f, 0x7e7f7f7f, }; + static const DWORD r32f_colors[] = + { + 0xff000000, 0xff0000ff, 0xff00007f, 0xff00007f, + 0xff0000ff, 0xff000000, 0xff000000, 0xff0000bf, + 0xff000000, 0xff0000ff, 0xff00007f, 0xff000040, + 0xff0000ff, 0xff000000, 0xff000000, 0xff0000bf, + }; + static const DWORD r32u_colors[16] = + { + 0x01000000, 0x01000001, 0x01000002, 0x01000003, + 0x01000064, 0x010000c8, 0x010000ff, 0x01000080, + 0x01000028, 0x0100001e, 0x01000014, 0x0100000a, + 0x010000fa, 0x010000d2, 0x0100009b, 0x010000be, + }; static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; @@ -5798,6 +5830,8 @@ static void test_texture(void) #define BC3_UNORM_SRGB DXGI_FORMAT_BC3_UNORM_SRGB #define R8G8B8A8_UNORM_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB #define R8G8B8A8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define R32_FLOAT DXGI_FORMAT_R32_FLOAT +#define R32_UINT DXGI_FORMAT_R32_UINT #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN {&ps_sample, &bc1_typeless, {BC1_UNORM, TEX_2D, 0, 1}, 0.0f, bc_colors}, {&ps_sample, &bc1_typeless, {BC1_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, @@ -5807,10 +5841,12 @@ static void test_texture(void) {&ps_sample, &bc3_typeless, {BC3_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, srgb_colors}, {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM, TEX_2D, 0, 1}, 0.0f, srgb_data}, + {&ps_sample, &r32f_typeless, {R32_FLOAT, TEX_2D, 0, 1}, 0.0f, r32f_colors}, {&ps_sample, &array_2d_texture, {FMT_UNKNOWN, TEX_2D, 0, 1}, 0.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 0, 1}, 0.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 1, 1}, 0.0f, green_data}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 2, 1}, 0.0f, blue_colors}, + {&ps_ld_uint8, &r32u_typeless, {R32_UINT, TEX_2D, 0, 1}, 0.0f, r32u_colors}, #undef TEX_2D #undef TEX_2D_ARRAY #undef BC1_UNORM @@ -5821,6 +5857,8 @@ static void test_texture(void) #undef BC3_UNORM_SRGB #undef R8G8B8A8_UNORM_SRGB #undef R8G8B8A8_UNORM +#undef R32_FLOAT +#undef R32_UINT #undef FMT_UNKNOWN };

1 0

Józef Kucia : d3d10core/tests: Add optional "rect" parameter to check_texture_sub_resource_* functions.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: e57dfb804494b52433b0d50315c0b71736cbd432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57dfb804494b52433b0d5031… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:22 2017 +0100 d3d10core/tests: Add optional "rect" parameter to check_texture_sub_resource_* functions. 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/d3d10core/tests/device.c | 95 ++++++++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 763abcd..e289329 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -617,19 +617,25 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne return color; } -#define check_texture_sub_resource_color(t, s, c, d) check_texture_sub_resource_color_(__LINE__, t, s, c, d) +#define check_texture_sub_resource_color(a, b, c, d, e) check_texture_sub_resource_color_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_color_(unsigned int line, ID3D10Texture2D *texture, - unsigned int sub_resource_idx, DWORD expected_color, BYTE max_diff) + unsigned int sub_resource_idx, const RECT *rect, DWORD expected_color, BYTE max_diff) { struct resource_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; + RECT default_rect; DWORD color = 0; get_texture_readback(texture, sub_resource_idx, &rb); - for (y = 0; y < rb.height; ++y) + if (!rect) { - for (x = 0; x < rb.width; ++x) + SetRect(&default_rect, 0, 0, rb.width, rb.height); + rect = &default_rect; + } + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) { color = get_readback_color(&rb, x, y); if (!compare_color(color, expected_color, max_diff)) @@ -657,22 +663,28 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, ID3D10Texture2D_GetDesc(texture, &texture_desc); sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) - check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); + check_texture_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); } -#define check_texture_sub_resource_float(r, s, f, d) check_texture_sub_resource_float_(__LINE__, r, s, f, d) +#define check_texture_sub_resource_float(a, b, c, d, e) check_texture_sub_resource_float_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D *texture, - unsigned int sub_resource_idx, float expected_value, BYTE max_diff) + unsigned int sub_resource_idx, const RECT *rect, float expected_value, BYTE max_diff) { struct resource_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; float value = 0.0f; + RECT default_rect; get_texture_readback(texture, sub_resource_idx, &rb); - for (y = 0; y < rb.height; ++y) + if (!rect) + { + SetRect(&default_rect, 0, 0, rb.width, rb.height); + rect = &default_rect; + } + for (y = rect->top; y < rect->bottom; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = rect->left; x < rect->right; ++x) { value = get_readback_float(&rb, x, y); if (!compare_float(value, expected_value, max_diff)) @@ -700,22 +712,28 @@ static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, ID3D10Texture2D_GetDesc(texture, &texture_desc); sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) - check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); + check_texture_sub_resource_float_(line, texture, sub_resource_idx, NULL, expected_value, max_diff); } -#define check_texture_sub_resource_vec4(a, b, c, d) check_texture_sub_resource_vec4_(__LINE__, a, b, c, d) +#define check_texture_sub_resource_vec4(a, b, c, d, e) check_texture_sub_resource_vec4_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_vec4_(unsigned int line, ID3D10Texture2D *texture, - unsigned int sub_resource_idx, const struct vec4 *expected_value, BYTE max_diff) + unsigned int sub_resource_idx, const RECT *rect, const struct vec4 *expected_value, BYTE max_diff) { struct resource_readback rb; unsigned int x = 0, y = 0; struct vec4 value = {0}; BOOL all_match = TRUE; + RECT default_rect; get_texture_readback(texture, sub_resource_idx, &rb); - for (y = 0; y < rb.height; ++y) + if (!rect) + { + SetRect(&default_rect, 0, 0, rb.width, rb.height); + rect = &default_rect; + } + for (y = rect->top; y < rect->bottom; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = rect->left; x < rect->right; ++x) { value = *get_readback_vec4(&rb, x, y); if (!compare_vec4(&value, expected_value, max_diff)) @@ -745,22 +763,28 @@ static void check_texture_vec4_(unsigned int line, ID3D10Texture2D *texture, ID3D10Texture2D_GetDesc(texture, &texture_desc); sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) - check_texture_sub_resource_vec4_(line, texture, sub_resource_idx, expected_value, max_diff); + check_texture_sub_resource_vec4_(line, texture, sub_resource_idx, NULL, expected_value, max_diff); } -#define check_texture_sub_resource_uvec4(a, b, c) check_texture_sub_resource_uvec4_(__LINE__, a, b, c) +#define check_texture_sub_resource_uvec4(a, b, c, d) check_texture_sub_resource_uvec4_(__LINE__, a, b, c, d) static void check_texture_sub_resource_uvec4_(unsigned int line, ID3D10Texture2D *texture, - unsigned int sub_resource_idx, const struct uvec4 *expected_value) + unsigned int sub_resource_idx, const RECT *rect, const struct uvec4 *expected_value) { struct resource_readback rb; unsigned int x = 0, y = 0; struct uvec4 value = {0}; BOOL all_match = TRUE; + RECT default_rect; get_texture_readback(texture, sub_resource_idx, &rb); - for (y = 0; y < rb.height; ++y) + if (!rect) { - for (x = 0; x < rb.width; ++x) + SetRect(&default_rect, 0, 0, rb.width, rb.height); + rect = &default_rect; + } + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) { value = *get_readback_uvec4(&rb, x, y); if (!compare_uvec4(&value, expected_value)) @@ -791,7 +815,7 @@ static void check_texture_uvec4_(unsigned int line, ID3D10Texture2D *texture, ID3D10Texture2D_GetDesc(texture, &texture_desc); sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) - check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, expected_value); + check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } static ID3D10Device *create_device(void) @@ -2509,7 +2533,7 @@ static void test_render_target_views(void) sub_resource_count = texture_desc.MipLevels * texture_desc.ArraySize; assert(sub_resource_count <= sizeof(test->expected_colors) / sizeof(*test->expected_colors)); for (j = 0; j < sub_resource_count; ++j) - check_texture_sub_resource_color(texture, j, test->expected_colors[j], 1); + check_texture_sub_resource_color(texture, j, NULL, test->expected_colors[j], 1); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(texture); @@ -10525,15 +10549,15 @@ static void test_sm4_ret_instruction(void) static void test_primitive_restart(void) { struct d3d10core_test_context test_context; - unsigned int stride, offset, x, y; ID3D10Buffer *ib32, *ib16, *vb; - struct resource_readback rb; + unsigned int stride, offset; ID3D10InputLayout *layout; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10Device *device; unsigned int i; HRESULT hr; + RECT rect; static const DWORD ps_code[] = { @@ -10650,25 +10674,12 @@ static void test_primitive_restart(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, black); ID3D10Device_DrawIndexed(device, 9, 0, 0); - get_texture_readback(test_context.backbuffer, 0, &rb); - for (y = 0; y < 480; ++y) - { - for (x = 0; x < 640; ++x) - { - DWORD color = get_readback_color(&rb, x, y); - DWORD expected_color; - if (x < 240) - expected_color = 0xffffff00; - else if (x >= 640 - 240) - expected_color = 0xff0000ff; - else - expected_color = 0x00000000; - ok(compare_color(color, expected_color, 1), - "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", - i, color, expected_color, x, y); - } - } - release_resource_readback(&rb); + SetRect(&rect, 0, 0, 240, 480); + check_texture_sub_resource_color(test_context.backbuffer, 0, &rect, 0xffffff00, 1); + SetRect(&rect, 240, 0, 400, 480); + check_texture_sub_resource_color(test_context.backbuffer, 0, &rect, 0x00000000, 1); + SetRect(&rect, 400, 0, 640, 480); + check_texture_sub_resource_color(test_context.backbuffer, 0, &rect, 0xff0000ff, 1); } ID3D10Buffer_Release(ib16);

1 0

Józef Kucia : wined3d: Implement SM5 ld_raw instruction.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 80bd7efcf8ed359edf2a4584c7cbcd6c867711fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bd7efcf8ed359edf2a4584c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:23 2017 +0100 wined3d: Implement SM5 ld_raw instruction. 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/glsl_shader.c | 49 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adc6746..b583453 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3831,9 +3831,7 @@ static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) dst = ins->dst[0]; for (i = 0; i < 4; ++i) { - write_mask = WINED3DSP_WRITEMASK_0 << i; - dst.write_mask = ins->dst[0].write_mask & write_mask; - + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; @@ -3864,9 +3862,7 @@ static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) dst = ins->dst[0]; for (i = 0; i < 4; ++i) { - write_mask = WINED3DSP_WRITEMASK_0 << i; - dst.write_mask = ins->dst[0].write_mask & write_mask; - + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; @@ -5034,6 +5030,45 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } +static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) +{ + const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + const struct wined3d_shader_src_param *src = &ins->src[1]; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct wined3d_shader_dst_param dst; + const char *function, *resource; + struct glsl_src_param offset; + char dst_swizzle[6]; + DWORD write_mask; + unsigned int i; + + if (src->reg.type == WINED3DSPR_RESOURCE) + { + function = "texelFetch"; + resource = "sampler"; + } + else + { + function = "imageLoad"; + resource = "image"; + } + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &offset); + + dst = ins->dst[0]; + for (i = 0; i < 4; ++i) + { + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); + if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, + &dst, dst.reg.data_type))) + continue; + + shader_glsl_swizzle_to_str(src->swizzle, FALSE, write_mask, dst_swizzle); + shader_addline(buffer, "%s(%s_%s%u, %s / 4)%s);\n", + function, prefix, resource, src->reg.idx[0].offset, offset.param_str, dst_swizzle); + } +} + static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -9359,7 +9394,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, - /* WINED3DSIH_LD_RAW */ NULL, + /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit,

1 0

Józef Kucia : d3d11/tests: Add test for unaligned raw buffer access.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: c2a4e620ee5a959daafd3de8e629dfb212bef6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a4e620ee5a959daafd3de8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:24 2017 +0100 d3d11/tests: Add test for unaligned raw buffer access. 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/tests/d3d11.c | 304 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 296 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2a4e620ee5a959daafd3…

1 0

Alex Henrie : ddraw/tests: Validate the "surface" pointer is unmodified after CreateSurface() without cooperative level.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 438d0fed865b9e55dad0efa4dd98dc0afafe80a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438d0fed865b9e55dad0efa4d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 16 15:12:14 2017 +0100 ddraw/tests: Validate the "surface" pointer is unmodified after CreateSurface() without cooperative level. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 ++ dlls/ddraw/tests/ddraw2.c | 2 ++ dlls/ddraw/tests/ddraw4.c | 2 ++ dlls/ddraw/tests/ddraw7.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c682466..1001d4f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3296,8 +3296,10 @@ static void test_coop_level_surf_create(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + surface = (void *)0xdeadbeef; hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d6491ea..1836f76 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3517,8 +3517,10 @@ static void test_coop_level_surf_create(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + surface = (void *)0xdeadbeef; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bda2ebf..557854a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3647,8 +3647,10 @@ static void test_coop_level_surf_create(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + surface = (void *)0xdeadbeef; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 31e7640..827496b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3373,8 +3373,10 @@ static void test_coop_level_surf_create(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + surface = (void *)0xdeadbeef; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); IDirectDraw7_Release(ddraw); }

1 0

Alex Henrie : ddraw: Validate the "surface" pointer before creating the surface in CreateSurface().
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 062f1ae7524ef0049bbb8579bd6d03e6eca0be16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062f1ae7524ef0049bbb8579b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 16 15:12:15 2017 +0100 ddraw: Validate the "surface" pointer before creating the surface in CreateSurface(). And thereby avoid leaking the surface on the error path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 128 +++++++++++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 62 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 254dae7..ba264c0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2815,6 +2815,18 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -2830,23 +2842,12 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface7_iface; - IDirectDraw7_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -2877,6 +2878,18 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -2892,23 +2905,12 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface4_iface; + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -2940,6 +2942,18 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + DDSD_to_DDSD2(surface_desc, &surface_desc2); if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { @@ -2956,22 +2970,11 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; return hr; } @@ -3003,6 +3006,18 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER) || (surface_desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER)) @@ -3016,22 +3031,11 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; return hr; }

1 0

Michael Stefaniuc : crypt32/tests: Use IsEqualGUID() to compare GUIDs.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: b669dbc2f63c0d5ba5f576c24ef91a4c97c408cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b669dbc2f63c0d5ba5f576c24… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 16 11:50:34 2017 +0100 crypt32/tests: Use IsEqualGUID() to compare GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/sip.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 0677903..e2ec2f4 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -176,8 +176,8 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND or ERROR_PATH_NOT_FOUND, got %d.\n", GetLastError()); - ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &nullSubject), + "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", wine_dbgstr_guid(&subject)); /* Now with an executable that should exist * @@ -195,8 +195,8 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(regeditPathW, NULL, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &unknownGUID), + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); /* The same thing but now with a handle instead of a filename */ file = CreateFileA(regeditPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -204,8 +204,8 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(NULL, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &unknownGUID), + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); CloseHandle(file); /* And both */ @@ -214,8 +214,8 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(regeditPathW, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &unknownGUID), + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); CloseHandle(file); /* Now with an empty file */ @@ -234,8 +234,8 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_SUCCESS /* most Win98 */ || GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); - ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &nullSubject), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* Use a file with a size of 3 (at least < 4) */ file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -250,8 +250,8 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_SUCCESS /* most Win98 */ || GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, "Expected ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); - ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &nullSubject), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* And now >= 4 */ file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -265,8 +265,8 @@ static void test_SIPRetrieveSubjectGUID(void) ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN || GetLastError() == ERROR_SUCCESS /* Win98 */, "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); - ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &nullSubject), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile); @@ -283,8 +283,8 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", GetLastError(), GetLastError() ); - ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), - "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &cabGUID), + "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile); @@ -301,8 +301,8 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", GetLastError(), GetLastError() ); - ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), - "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &cabGUID), + "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile);

1 0