March 2017 - Wine-Commits - list.winehq.org

Michael Müller : bcrypt: Add a builtin sha256 implementation.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: f34bd5b174b01c23dd556beb462aa25a3d1fb93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34bd5b174b01c23dd556beb4… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 7 23:15:08 2017 +0100 bcrypt: Add a builtin sha256 implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 3 +- dlls/bcrypt/bcrypt_internal.h | 11 +++ dlls/bcrypt/bcrypt_main.c | 13 ++++ dlls/bcrypt/sha256.c | 169 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 195 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index ef9d7ea..c2322c8 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -4,6 +4,7 @@ IMPORTLIB = bcrypt EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ - bcrypt_main.c + bcrypt_main.c \ + sha256.c RC_SRCS = version.rc diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index de6a37e..ef137e9 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -25,6 +25,17 @@ #include "windef.h" #include "winbase.h" +typedef struct +{ + ULONG64 len; + DWORD h[8]; + UCHAR buf[64]; +} SHA256_CTX; + +void sha256_init(SHA256_CTX *ctx) DECLSPEC_HIDDEN; +void sha256_update(SHA256_CTX *ctx, const UCHAR *buffer, ULONG len) DECLSPEC_HIDDEN; +void sha256_finalize(SHA256_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN; + /* Definitions from advapi32 */ typedef struct { diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index cef2b1b..301f454 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -448,6 +448,7 @@ struct hash_impl { MD5_CTX md5; SHA_CTX sha1; + SHA256_CTX sha256; } u; }; @@ -463,6 +464,10 @@ static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) A_SHAInit( &hash->u.sha1 ); break; + case ALG_ID_SHA256: + sha256_init( &hash->u.sha256 ); + break; + default: ERR( "unhandled id %u\n", alg_id ); return STATUS_NOT_IMPLEMENTED; @@ -483,6 +488,10 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, A_SHAUpdate( &hash->u.sha1, input, size ); break; + case ALG_ID_SHA256: + sha256_update( &hash->u.sha256, input, size ); + break; + default: ERR( "unhandled id %u\n", alg_id ); return STATUS_NOT_IMPLEMENTED; @@ -504,6 +513,10 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, A_SHAFinal( &hash->u.sha1, (ULONG *)output ); break; + case ALG_ID_SHA256: + sha256_finalize( &hash->u.sha256, output ); + break; + default: ERR( "unhandled id %u\n", alg_id ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/sha256.c b/dlls/bcrypt/sha256.c new file mode 100644 index 0000000..48c4a48 --- /dev/null +++ b/dlls/bcrypt/sha256.c @@ -0,0 +1,169 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +/* Based on public domain implementation from + https://git.musl-libc.org/cgit/musl/tree/src/crypt/crypt_sha256.c */ + +#include "bcrypt_internal.h" + +static DWORD ror(DWORD n, int k) { return (n >> k) | (n << (32-k)); } +#define Ch(x,y,z) (z ^ (x & (y ^ z))) +#define Maj(x,y,z) ((x & y) | (z & (x | y))) +#define S0(x) (ror(x,2) ^ ror(x,13) ^ ror(x,22)) +#define S1(x) (ror(x,6) ^ ror(x,11) ^ ror(x,25)) +#define R0(x) (ror(x,7) ^ ror(x,18) ^ (x>>3)) +#define R1(x) (ror(x,17) ^ ror(x,19) ^ (x>>10)) + +static const DWORD K[64] = +{ + 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, + 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, + 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, + 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, + 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, + 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, + 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, + 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 +}; + +static void processblock(SHA256_CTX *ctx, const UCHAR *buffer) +{ + DWORD W[64], t1, t2, a, b, c, d, e, f, g, h; + int i; + + for (i = 0; i < 16; i++) + { + W[i] = (DWORD)buffer[4*i]<<24; + W[i] |= (DWORD)buffer[4*i+1]<<16; + W[i] |= (DWORD)buffer[4*i+2]<<8; + W[i] |= buffer[4*i+3]; + } + + for (; i < 64; i++) + W[i] = R1(W[i-2]) + W[i-7] + R0(W[i-15]) + W[i-16]; + + a = ctx->h[0]; + b = ctx->h[1]; + c = ctx->h[2]; + d = ctx->h[3]; + e = ctx->h[4]; + f = ctx->h[5]; + g = ctx->h[6]; + h = ctx->h[7]; + + for (i = 0; i < 64; i++) + { + t1 = h + S1(e) + Ch(e,f,g) + K[i] + W[i]; + t2 = S0(a) + Maj(a,b,c); + h = g; + g = f; + f = e; + e = d + t1; + d = c; + c = b; + b = a; + a = t1 + t2; + } + + ctx->h[0] += a; + ctx->h[1] += b; + ctx->h[2] += c; + ctx->h[3] += d; + ctx->h[4] += e; + ctx->h[5] += f; + ctx->h[6] += g; + ctx->h[7] += h; +} + +static void pad(SHA256_CTX *ctx) +{ + ULONG64 r = ctx->len % 64; + + ctx->buf[r++] = 0x80; + + if (r > 56) + { + memset(ctx->buf + r, 0, 64 - r); + r = 0; + processblock(ctx, ctx->buf); + } + + memset(ctx->buf + r, 0, 56 - r); + ctx->len *= 8; + ctx->buf[56] = ctx->len >> 56; + ctx->buf[57] = ctx->len >> 48; + ctx->buf[58] = ctx->len >> 40; + ctx->buf[59] = ctx->len >> 32; + ctx->buf[60] = ctx->len >> 24; + ctx->buf[61] = ctx->len >> 16; + ctx->buf[62] = ctx->len >> 8; + ctx->buf[63] = ctx->len; + + processblock(ctx, ctx->buf); +} + +void sha256_init(SHA256_CTX *ctx) +{ + ctx->len = 0; + ctx->h[0] = 0x6a09e667; + ctx->h[1] = 0xbb67ae85; + ctx->h[2] = 0x3c6ef372; + ctx->h[3] = 0xa54ff53a; + ctx->h[4] = 0x510e527f; + ctx->h[5] = 0x9b05688c; + ctx->h[6] = 0x1f83d9ab; + ctx->h[7] = 0x5be0cd19; +} + +void sha256_update(SHA256_CTX *ctx, const UCHAR *buffer, ULONG len) +{ + const UCHAR *p = buffer; + ULONG64 r = ctx->len % 64; + + ctx->len += len; + if (r) + { + if (len < 64 - r) + { + memcpy(ctx->buf + r, p, len); + return; + } + memcpy(ctx->buf + r, p, 64 - r); + len -= 64 - r; + p += 64 - r; + processblock(ctx, ctx->buf); + } + for (; len >= 64; len -= 64, p += 64) + processblock(ctx, p); + memcpy(ctx->buf, p, len); +} + +void sha256_finalize(SHA256_CTX *ctx, UCHAR *buffer) +{ + int i; + + pad(ctx); + for (i = 0; i < 8; i++) + { + buffer[4*i] = ctx->h[i] >> 24; + buffer[4*i+1] = ctx->h[i] >> 16; + buffer[4*i+2] = ctx->h[i] >> 8; + buffer[4*i+3] = ctx->h[i]; + } +}

1 0

Michael Müller : bcrypt: Add a builtin sha384/ sha512 implementation.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: b56ddad8b00f7a406dc072250d5774b9562c47f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56ddad8b00f7a406dc072250… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 8 13:09:04 2017 +0100 bcrypt: Add a builtin sha384/sha512 implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 3 +- dlls/bcrypt/bcrypt_internal.h | 15 +++ dlls/bcrypt/bcrypt_main.c | 25 +++++ dlls/bcrypt/sha512.c | 212 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 254 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b56ddad8b00f7a406dc07…

1 0

Henri Verbeet : wined3d: Validate instruction lengths in shader_sm4_read_instruction() (AFL).
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: a9e5a02a20a2b11edf0949c5bb1c4dd6c5297644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e5a02a20a2b11edf0949c5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:04 2017 +0100 wined3d: Validate instruction lengths in shader_sm4_read_instruction() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index bd974a2..8986d35 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1507,16 +1507,36 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi DWORD opcode_token, opcode, previous_token; struct wined3d_sm4_data *priv = data; unsigned int i, len; + SIZE_T remaining; const DWORD *p; list_move_head(&priv->src_free, &priv->src); + if (*ptr >= priv->end) + { + WARN("End of byte-code, failed to read opcode.\n"); + goto fail; + } + remaining = priv->end - *ptr; + opcode_token = *(*ptr)++; opcode = opcode_token & WINED3D_SM4_OPCODE_MASK; len = ((opcode_token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT); if (!len) + { + if (remaining < 2) + { + WARN("End of byte-code, failed to read length token.\n"); + goto fail; + } len = **ptr; + } + if (!len || remaining < len) + { + WARN("Read invalid length %u (remaining %lu).\n", len, remaining); + goto fail; + } --len; if (TRACE_ON(d3d_bytecode)) @@ -1589,6 +1609,13 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } } } + + return; + +fail: + *ptr = priv->end; + ins->handler_idx = WINED3DSIH_TABLE_SIZE; + return; } static BOOL shader_sm4_is_end(void *data, const DWORD **ptr)

1 0

Józef Kucia : d3d11/tests: Add test for unbinding shader resource view.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: 1c8cb5974370629d7fb70f502f866a50a5581cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8cb5974370629d7fb70f502… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 9 10:03:03 2017 +0100 d3d11/tests: Add test for unbinding shader resource view. 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 | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2060ab6..94a5a8f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12248,6 +12248,95 @@ static void test_shader_input_registers_limits(void) release_test_context(&test_context); } +static void test_unbind_shader_resource_view(void) +{ + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + ID3D11ShaderResourceView *srv, *srv2; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t0; + Texture2D t1; + SamplerState s; + + float4 main() : SV_Target + { + return min(t0.Sample(s, float2(0, 0)) + t1.Sample(s, float2(0, 0)), 1.0f); + } +#endif + 0x43425844, 0x698dc0cb, 0x0bf322b8, 0xee127418, 0xfe9214ce, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c, + 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, + 0x00107000, 0x00000001, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, + 0x0c000045, 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0c000045, 0x001000f2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000000, + 0x07000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a000033, + 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD texture_data[] = {0xff00ff00}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext_PSSetShaderResources(context, 1, 1, &srv); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + srv2 = NULL; + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv2); + ID3D11DeviceContext_PSSetShaderResources(context, 1, 1, &srv2); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 1); + + ID3D11PixelShader_Release(ps); + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_stencil_separate(void) { struct d3d11_test_context test_context; @@ -15734,6 +15823,7 @@ START_TEST(d3d11) run_for_each_9_x_feature_level(test_fl9_draw); test_ddy(); test_shader_input_registers_limits(); + test_unbind_shader_resource_view(); test_stencil_separate(); test_uav_load(); test_cs_uav_store();

1 0

Sebastian Lackner : schedsvc: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: be0e05604a5560e26757d161708c2c3dae717834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0e05604a5560e26757d1617… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 9 16:12:10 2017 +0100 schedsvc: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc_private.h | 18 ++++++++---------- dlls/schedsvc/svc_main.c | 6 ++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 3abce07..b426078 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -23,26 +23,24 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return MIDL_user_allocate(size); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - void *ptr = MIDL_user_allocate(size); - if (ptr) memset(ptr, 0, size); - return ptr; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void heap_free(void *ptr) +static inline BOOL heap_free(void *mem) { - MIDL_user_free(ptr); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *heap_strdupW(const WCHAR *src) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 45496c9..bd8a29d 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -27,6 +27,8 @@ #include "schrpc.h" #include "wine/debug.h" +#include "schedsvc_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); static const WCHAR scheduleW[] = {'S','c','h','e','d','u','l','e',0}; @@ -200,10 +202,10 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { - return HeapAlloc(GetProcessHeap(), 0, len); + return heap_alloc(len); } void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) { - HeapFree(GetProcessHeap(), 0, ptr); + heap_free(ptr); }

1 0

Alexandre Julliard : gdi32/tests: Remove workarounds for old Windows versions in the DIB tests.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: 57aa60689d87c57467e856d0ca628611797ffb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57aa60689d87c57467e856d0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 13:28:32 2017 +0100 gdi32/tests: Remove workarounds for old Windows versions in the DIB tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dib.c | 302 +++++++------------------------------------------ 1 file changed, 43 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57aa60689d87c57467e85…

1 0

Stefan Dösinger : ddraw/tests: Rewrite SrcColorKey32BlitTest.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: c3521cd6739924c645f0ca7e954b97a4702091e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3521cd6739924c645f0ca7e9… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Mar 8 19:29:00 2017 +0000 ddraw/tests: Rewrite SrcColorKey32BlitTest. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 + dlls/ddraw/tests/ddraw1.c | 482 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 496 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 468 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 468 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 510 -------------------------------------------- 6 files changed, 1920 insertions(+), 510 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3521cd6739924c645f0c…

1 0

Matteo Bruni : d3d9/tests: Fix pixel shader version check in test_pointsize().
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: 7b34f460d8164f622b0de3b5eb36226726a156c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b34f460d8164f622b0de3b5e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 8 20:45:48 2017 +0100 d3d9/tests: Fix pixel shader version check in test_pointsize(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e012d1b..41a883d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10588,7 +10588,7 @@ static void test_pointsize(void) ps2 = {D3DPS_VERSION(2, 0), pshader2_code}, ps2_zw = {D3DPS_VERSION(2, 0), pshader2_zw_code}, ps3 = {D3DPS_VERSION(3, 0), pshader3_code}, - ps3_zw = {D3DVS_VERSION(3, 0), pshader3_zw_code}; + ps3_zw = {D3DPS_VERSION(3, 0), pshader3_zw_code}; static const struct { const struct test_shader *vs;

1 0

Matteo Bruni : d3d9/tests: Skip test_vshader_input() if PS 3.0 isn' t supported.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: 101159309f1a0b1dcdabd9ce1ae09068269e2265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101159309f1a0b1dcdabd9ce1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 8 20:45:47 2017 +0100 d3d9/tests: Skip test_vshader_input() if PS 3.0 isn't supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c8cab8c..e012d1b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7828,6 +7828,12 @@ static void test_vshader_input(void) IDirect3DDevice9_Release(device); goto done; } + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) + { + skip("No ps_3_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr);

1 0

Michael Müller : bcrypt: Use builtin MD5/ SHA1 implementation.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: 03630a42f4db194ca70192769fbf3ea3c3dccca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03630a42f4db194ca70192769… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 7 23:14:36 2017 +0100 bcrypt: Use builtin MD5/SHA1 implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 53 ++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/bcrypt_main.c | 60 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 106 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h new file mode 100644 index 0000000..de6a37e --- /dev/null +++ b/dlls/bcrypt/bcrypt_internal.h @@ -0,0 +1,53 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef __BCRYPT_INTERNAL_H +#define __BCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +/* Definitions from advapi32 */ +typedef struct +{ + unsigned int i[2]; + unsigned int buf[4]; + unsigned char in[64]; + unsigned char digest[16]; +} MD5_CTX; + +VOID WINAPI MD5Init(MD5_CTX *ctx); +VOID WINAPI MD5Update(MD5_CTX *ctx, const unsigned char *buf, unsigned int len); +VOID WINAPI MD5Final(MD5_CTX *ctx); + +typedef struct +{ + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX; + +VOID WINAPI A_SHAInit(SHA_CTX *ctx); +VOID WINAPI A_SHAUpdate(SHA_CTX *ctx, const UCHAR *buffer, UINT size); +VOID WINAPI A_SHAFinal(SHA_CTX *ctx, PULONG result); + +#endif /* __BCRYPT_INTERNAL_H */ diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 849dc3e..cef2b1b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -36,6 +36,8 @@ #include "ntsecapi.h" #include "bcrypt.h" +#include "bcrypt_internal.h" + #include "wine/debug.h" #include "wine/library.h" #include "wine/unicode.h" @@ -442,27 +444,71 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, #else struct hash_impl { - + union + { + MD5_CTX md5; + SHA_CTX sha1; + } u; }; static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) { - ERR( "support for hashes not available at build time\n" ); - return STATUS_NOT_IMPLEMENTED; + switch (alg_id) + { + case ALG_ID_MD5: + MD5Init( &hash->u.md5 ); + break; + + case ALG_ID_SHA1: + A_SHAInit( &hash->u.sha1 ); + break; + + default: + ERR( "unhandled id %u\n", alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + return STATUS_SUCCESS; } static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, UCHAR *input, ULONG size ) { - ERR( "support for hashes not available at build time\n" ); - return STATUS_NOT_IMPLEMENTED; + switch (alg_id) + { + case ALG_ID_MD5: + MD5Update( &hash->u.md5, input, size ); + break; + + case ALG_ID_SHA1: + A_SHAUpdate( &hash->u.sha1, input, size ); + break; + + default: + ERR( "unhandled id %u\n", alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + return STATUS_SUCCESS; } static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, UCHAR *output, ULONG size ) { - ERR( "support for hashes not available at build time\n" ); - return STATUS_NOT_IMPLEMENTED; + switch (alg_id) + { + case ALG_ID_MD5: + MD5Final( &hash->u.md5 ); + memcpy( output, hash->u.md5.digest, 16 ); + break; + + case ALG_ID_SHA1: + A_SHAFinal( &hash->u.sha1, (ULONG *)output ); + break; + + default: + ERR( "unhandled id %u\n", alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + return STATUS_SUCCESS; } #endif

1 0