wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Michael Müller : bcrypt: Implement BCryptEncrypt for AES GCM mode.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 7c9291ce0799ebf6eadc266ee13a74cbc0b7ff50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9291ce0799ebf6eadc266e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:06 2018 +0000 bcrypt: Implement BCryptEncrypt for AES GCM mode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 59 +++++++++++++++++++++++++++++++++++++++------- dlls/bcrypt/tests/bcrypt.c | 18 +++++++------- 2 files changed, 60 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fa80318..9669553 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -63,6 +63,12 @@ MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); #undef MAKE_FUNCPTR +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#endif + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -848,6 +854,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; gnutls_cipher_hd_t handle; UCHAR *secret; @@ -858,6 +865,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; CCCryptorRef ref_encrypt; CCCryptorRef ref_decrypt; @@ -868,6 +876,7 @@ struct key struct key { struct object hdr; + enum mode_id mode; ULONG block_size; }; #endif @@ -923,6 +932,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->handle = 0; /* initialized on first use */ key->secret = buffer; key->secret_len = secret_len; @@ -935,9 +945,13 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) switch (key->alg_id) { case ALG_ID_AES: - FIXME( "handle block size and chaining mode\n" ); - return GNUTLS_CIPHER_AES_128_CBC; - + WARN( "handle block size\n" ); + switch (key->mode) + { + case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_CBC: + default: return GNUTLS_CIPHER_AES_128_CBC; + } default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; @@ -1019,6 +1033,14 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s switch (alg->id) { case ALG_ID_AES: + switch (alg->mode) + { + case MODE_ID_CBC: + break; + default: + FIXME( "mode %u not supported\n", alg->mode ); + return STATUS_NOT_SUPPORTED; + } break; default: @@ -1031,6 +1053,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->ref_encrypt = NULL; /* initialized on first use */ key->ref_decrypt = NULL; key->secret = buffer; @@ -1260,17 +1283,37 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) + FIXME( "call chaining not implemented\n" ); + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_encrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index ba2011f..1875fb3 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -751,12 +751,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); @@ -766,12 +766,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 24, &auth_info, ivbuf, 16, ciphertext, 24, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 24, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 24, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); @@ -784,7 +784,7 @@ static void test_BCryptEncrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

Henri Verbeet : wined3d: Merge texture2d_upload_data() and texture3d_upload_data().
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: d6f45dab821a1dcd48381209b0202312ccf10d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6f45dab821a1dcd48381209… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 21 13:18:52 2018 +0330 wined3d: Merge texture2d_upload_data() and texture3d_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 169 ++++++++++++----------------------------- dlls/wined3d/wined3d_private.h | 4 - 2 files changed, 49 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6f45dab821a1dcd4838…

1 0

Henri Verbeet : wined3d: Handle upload conversion in texture2d_upload_data ().
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: af47c9406b3bee54447b5530bc93a93e8bac0d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af47c9406b3bee54447b5530… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 21 13:18:51 2018 +0330 wined3d: Handle upload conversion in texture2d_upload_data(). For consistency with texture3d_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 35 ++++--------------- dlls/wined3d/texture.c | 77 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 67 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af47c9406b3bee54447b…

1 0

Henri Verbeet : wined3d: Don' t bother removing PBOs for formats with upload/ download conversion in texture2d_load_texture().
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: faf4559a761c13d1783b768a6479fe5af290510f URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf4559a761c13d1783b768a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 21 13:18:50 2018 +0330 wined3d: Don't bother removing PBOs for formats with upload/download conversion in texture2d_load_texture(). We don't use PBOs for those in the first place. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3760abb..8f4e1ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2087,7 +2087,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is * getting called. */ - if ((format.conv_byte_count || conversion) && texture->sub_resources[sub_resource_idx].buffer_object) + if (conversion && sub_resource->buffer_object) { TRACE("Removing the pbo attached to texture %p, %u.\n", texture, sub_resource_idx);

1 0

Henri Verbeet : wined3d: Always pass a valid source box to texture3d_upload_data().
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 15d3155e595a6afa26b7775cf54027c7d141c08a URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d3155e595a6afa26b7775c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 21 13:18:49 2018 +0330 wined3d: Always pass a valid source box to texture3d_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 35 +++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 9 +++++++++ 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e8f5af3..f589243 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2549,22 +2549,13 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); - if (src_box) - { - addr += src_box->front * slice_pitch; - addr += src_box->top * row_pitch; - addr += src_box->left * format->byte_count; + addr += src_box->front * slice_pitch; + addr += src_box->top * row_pitch; + addr += src_box->left * format->byte_count; - update_w = src_box->right - src_box->left; - update_h = src_box->bottom - src_box->top; - update_d = src_box->back - src_box->front; - } - else - { - update_w = wined3d_texture_get_level_width(texture, level); - update_h = wined3d_texture_get_level_height(texture, level); - update_d = wined3d_texture_get_level_depth(texture, level); - } + update_w = src_box->right - src_box->left; + update_h = src_box->bottom - src_box->top; + update_d = src_box->back - src_box->front; if (format->conv_byte_count) { @@ -2646,6 +2637,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; unsigned int row_pitch, slice_pitch; struct wined3d_bo_address data; + struct wined3d_box src_box; /* Optimisations are possible, but the effort should be put into either * implementing EXT_SRGB_DECODE in the driver or finding out why we @@ -2659,11 +2651,12 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in return; wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); + &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); heap_free(data.addr); } @@ -2685,21 +2678,27 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in if (sub_resource->locations & WINED3D_LOCATION_SYSMEM) { struct wined3d_const_bo_address data = {0, texture->resource.heap_memory}; + struct wined3d_box src_box; + data.addr += sub_resource->offset; wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); + &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; + struct wined3d_box src_box; + wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); + wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); + &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 311e292..cb2938b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3241,6 +3241,15 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi return max(1, texture->pow2_height >> level); } +static inline void wined3d_texture_get_level_box(const struct wined3d_texture *texture, + unsigned int level, struct wined3d_box *box) +{ + wined3d_box_set(box, 0, 0, + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level), + 0, wined3d_texture_get_level_depth(texture, level)); +} + HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags,

1 0

Jarkko Korpi : kernel32: Silence repeated LocaleNameToLCID unsupported flags.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: dc5b22963bac51f796e5f9618b18ae2ab9488325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc5b22963bac51f796e5f961… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Wed Jul 15 02:38:25 2015 +0300 kernel32: Silence repeated LocaleNameToLCID unsupported flags. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b305610..c5eeabf 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1396,8 +1396,10 @@ LANGID WINAPI GetSystemDefaultUILanguage(void) LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) { struct locale_name locale_name; + static int once; - if (flags) FIXME( "unsupported flags %x\n", flags ); + if (flags && !once++) + FIXME( "unsupported flags %x\n", flags ); if (name == LOCALE_NAME_USER_DEFAULT) return GetUserDefaultLCID(); @@ -1427,7 +1429,8 @@ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) */ INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) { - if (flags) FIXME( "unsupported flags %x\n", flags ); + static int once; + if (flags && !once++) FIXME( "unsupported flags %x\n", flags ); return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); }

1 0

Dagfinn Reiakvam : iphlpapi: Add support for ConvertLengthToIpv4Mask().
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 1d82495ba154b0f0fd5e2fe493d15290d22d2637 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d82495ba154b0f0fd5e2fe4… Author: Dagfinn Reiakvam <dagfinn(a)reiakvam.no> Date: Tue Mar 20 18:27:04 2018 +0100 iphlpapi: Add support for ConvertLengthToIpv4Mask(). Signed-off-by: Dagfinn Reiakvam <dagfinn(a)reiakvam.no> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 19 +++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 36 ++++++++++++++++++++++++++++++++++++ include/netioapi.h | 1 + 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b6c9aef..bbd1ed8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -23,7 +23,7 @@ @ stdcall ConvertInterfaceNameToLuidW( wstr ptr ) #@ stub ConvertInterfacePhysicalAddressToLuid #@ stub ConvertIpv4MaskToLength -#@ stub ConvertLengthToIpv4Mask +@ stdcall ConvertLengthToIpv4Mask( long ptr ) #@ stub ConvertRemoteInterfaceAliasToLuid #@ stub ConvertRemoteInterfaceGuidToLuid #@ stub ConvertRemoteInterfaceIndexToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 97284ed..604470a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,6 +3223,25 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } /****************************************************************** + * ConvertLengthToIpv4Mask (IPHLPAPI.@) + */ +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask) +{ + if (mask_len > 32) + { + *mask = INADDR_NONE; + return ERROR_INVALID_PARAMETER; + } + + if (mask_len == 0) + *mask = 0; + else + *mask = htonl(~0u << (32 - mask_len)); + + return NO_ERROR; +} + +/****************************************************************** * if_nametoindex (IPHLPAPI.@) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 873612d..3509005 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -96,6 +96,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -149,6 +150,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } @@ -2174,6 +2176,39 @@ static void test_GetUnicastIpAddressTable(void) pFreeMibTable(table); } +static void test_ConvertLengthToIpv4Mask(void) +{ + DWORD ret; + DWORD n; + ULONG mask; + ULONG expected; + + if (!pConvertLengthToIpv4Mask) + { + win_skip( "ConvertLengthToIpv4Mask not available\n" ); + return; + } + + for (n = 0; n <= 32; n++) + { + mask = 0xdeadbeef; + if (n > 0) + expected = htonl( ~0u << (32 - n) ); + else + expected = 0; + + ret = pConvertLengthToIpv4Mask( n, &mask ); + ok( ret == NO_ERROR, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", ret, NO_ERROR ); + ok( mask == expected, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, expected ); + } + + /* Testing for out of range. In this case both mask and return are changed to indicate error. */ + mask = 0xdeadbeef; + ret = pConvertLengthToIpv4Mask( 33, &mask ); + ok( ret == ERROR_INVALID_PARAMETER, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", ret, ERROR_INVALID_PARAMETER ); + ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); +} + START_TEST(iphlpapi) { @@ -2201,6 +2236,7 @@ START_TEST(iphlpapi) test_GetIfTable2Ex(); test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); + test_ConvertLengthToIpv4Mask(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index 1095888..4bd64e8 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -170,6 +170,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID*,char*,SIZE_T); DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID*,WCHAR*,SIZE_T); DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); +DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**);

1 0

Matteo Bruni : d3dx9/tests: Add a test for texture refcounts and OnLostDevice().
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: f57d316cd3dc843d13673c378ff6f82d97011f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57d316cd3dc843d13673c37… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 20 23:37:30 2018 +0100 d3dx9/tests: Add a test for texture refcounts and OnLostDevice(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 118 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b7e2d72..bcaf377 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7368,6 +7368,123 @@ if (hr == D3D_OK) DestroyWindow(window); } +static unsigned int get_texture_refcount(IDirect3DTexture9 *iface) +{ + IDirect3DTexture9_AddRef(iface); + return IDirect3DTexture9_Release(iface); +} + +static void test_refcount(void) +{ + IDirect3DTexture9 *texture, *cur_texture, *managed_texture, *sysmem_texture; + unsigned int passes_count; + IDirect3DDevice9 *device; + ID3DXEffect *effect; + ULONG refcount; + HWND window; + HRESULT hr; + + if (!(device = create_device(&window))) + return; + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, + sizeof(test_effect_preshader_effect_blob), NULL, NULL, + D3DXFX_DONOTSAVESTATE, NULL, &effect, NULL); + ok(hr == D3D_OK, "Failed to create effect, hr %#x.\n", hr); + + hr = effect->lpVtbl->SetTexture(effect, "tex1", (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Failed to set texture parameter, hr %#x.\n", hr); + + hr = effect->lpVtbl->Begin(effect, &passes_count, D3DXFX_DONOTSAVESTATE); + ok(hr == D3D_OK, "Begin() failed, hr %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "BeginPass() failed, hr %#x.\n", hr); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == texture, "Unexpected current texture %p.\n", cur_texture); + IDirect3DTexture9_Release(cur_texture); + + IDirect3DDevice9_SetTexture(device, 0, NULL); + effect->lpVtbl->CommitChanges(effect); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == NULL, "Unexpected current texture %p.\n", cur_texture); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "EndPass() failed, hr %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "BeginPass() failed, hr %#x.\n", hr); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == texture, "Unexpected current texture %p.\n", cur_texture); + IDirect3DTexture9_Release(cur_texture); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "EndPass() failed, hr %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "End() failed, hr %#x.\n", hr); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == texture, "Unexpected current texture %p.\n", cur_texture); + IDirect3DTexture9_Release(cur_texture); + refcount = get_texture_refcount(texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + + hr = effect->lpVtbl->OnLostDevice(effect); + ok(hr == D3D_OK, "OnLostDevice() failed, hr %#x.\n", hr); + refcount = get_texture_refcount(texture); + ok(refcount == 1, "Unexpected texture refcount %u.\n", refcount); + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, + &managed_texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + effect->lpVtbl->SetTexture(effect, "tex1", (IDirect3DBaseTexture9 *)managed_texture); + + refcount = get_texture_refcount(managed_texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + hr = effect->lpVtbl->OnLostDevice(effect); + ok(hr == D3D_OK, "OnLostDevice() failed, hr %#x.\n", hr); + refcount = get_texture_refcount(managed_texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, + &sysmem_texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + effect->lpVtbl->SetTexture(effect, "tex1", (IDirect3DBaseTexture9 *)sysmem_texture); + + refcount = get_texture_refcount(managed_texture); + ok(refcount == 1, "Unexpected texture refcount %u.\n", refcount); + IDirect3DTexture9_Release(managed_texture); + refcount = get_texture_refcount(sysmem_texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + hr = effect->lpVtbl->OnLostDevice(effect); + ok(hr == D3D_OK, "OnLostDevice() failed, hr %#x.\n", hr); + refcount = get_texture_refcount(sysmem_texture); + ok(refcount == 2, "Unexpected texture refcount %u.\n", refcount); + + effect->lpVtbl->Release(effect); + + refcount = get_texture_refcount(sysmem_texture); + ok(refcount == 1, "Unexpected texture refcount %u.\n", refcount); + IDirect3DTexture9_Release(sysmem_texture); + + IDirect3DDevice9_GetTexture(device, 0, (IDirect3DBaseTexture9 **)&cur_texture); + ok(cur_texture == texture, "Unexpected current texture %p.\n", cur_texture); + IDirect3DTexture9_Release(cur_texture); + refcount = get_texture_refcount(texture); + ok(refcount == 1, "Unexpected texture refcount %u.\n", refcount); + IDirect3DTexture9_Release(texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(effect) { IDirect3DDevice9 *device; @@ -7404,4 +7521,5 @@ START_TEST(effect) test_effect_unsupported_shader(); test_effect_null_shader(); test_effect_clone(); + test_refcount(); }

1 0

Matteo Bruni : d3dx9: Implement ID3DXEffect::OnLostDevice().
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 1bba7c5705da23586c39de98c764700c5a54fcc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bba7c5705da23586c39de98… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 20 23:37:29 2018 +0100 d3dx9: Implement ID3DXEffect::OnLostDevice(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 340f3d3..33e0fc4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4328,13 +4328,65 @@ static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, struct IDire return S_OK; } +static BOOL param_on_lost_device(void *data, struct d3dx_parameter *param) +{ + struct IDirect3DVolumeTexture9 *volume_texture; + struct IDirect3DCubeTexture9 *cube_texture; + struct IDirect3DTexture9 *texture; + D3DSURFACE_DESC surface_desc; + D3DVOLUME_DESC volume_desc; + + if (param->class == D3DXPC_OBJECT && !param->element_count) + { + switch (param->type) + { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + texture = *(IDirect3DTexture9 **)param->data; + if (!texture) + return FALSE; + IDirect3DTexture9_GetLevelDesc(texture, 0, &surface_desc); + if (surface_desc.Pool != D3DPOOL_DEFAULT) + return FALSE; + break; + case D3DXPT_TEXTURE3D: + volume_texture = *(IDirect3DVolumeTexture9 **)param->data; + if (!volume_texture) + return FALSE; + IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc); + if (volume_desc.Pool != D3DPOOL_DEFAULT) + return FALSE; + break; + case D3DXPT_TEXTURECUBE: + cube_texture = *(IDirect3DCubeTexture9 **)param->data; + if (!cube_texture) + return FALSE; + IDirect3DTexture9_GetLevelDesc(cube_texture, 0, &surface_desc); + if (surface_desc.Pool != D3DPOOL_DEFAULT) + return FALSE; + break; + default: + return FALSE; + } + IUnknown_Release(*(IUnknown **)param->data); + *(IUnknown **)param->data = NULL; + } + return FALSE; +} + static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_base_effect *base = &effect->base_effect; + unsigned int i; - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + for (i = 0; i < base->parameter_count; ++i) + walk_parameter_tree(&base->parameters[i].param, param_on_lost_device, NULL); + + return D3D_OK; } static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface)

1 0

Matteo Bruni : d3dx9: Add a comment about a specific preshader parsing failure mode.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 633ad47b29180f92d9c4f99177462bd975892087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=633ad47b29180f92d9c4f991… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 20 23:37:28 2018 +0100 d3dx9: Add a comment about a specific preshader parsing failure mode. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 78e4868..8551d2f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1209,7 +1209,8 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u } if (reg_idx >= pres->regs.table_sizes[table]) { - FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.\n", + /* Native accepts these broken preshaders. */ + FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u, preshader parsing failed.\n", i, j, table, reg_idx); return D3DXERR_INVALIDDATA; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018