ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Implement 64-bit version of __std_type_info_hash. 

Signed-off-by: GOUJON Alexandre <ale.goujon@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Goujon 2016-10-05 20:51:52 +02:00 committed by Alexandre Julliard
parent a6d35fdaa8
commit eac56fbda5
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/msvcrt/cpp.c
View File

@ -1591,20 +1591,31 @@ void CDECL MSVCRT_type_info_destroy_list(SLIST_HEADER *header)
/****************************************************************** /******************************************************************
* __std_type_info_hash (UCRTBASE.@) * __std_type_info_hash (UCRTBASE.@)
*
* TODO: 64-bit version of the function uses different constants
*/ */
MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti) MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti)
{ {
MSVCRT_size_t hash = 0x811c9dc5; MSVCRT_size_t hash, fnv_prime;
const char *p; const char *p;
#ifdef _WIN64
hash = 0xcbf29ce484222325;
fnv_prime = 0x100000001b3;
#else
hash = 0x811c9dc5;
fnv_prime = 0x1000193;
#endif
TRACE("(%p)->%s\n", ti, ti->mangled); TRACE("(%p)->%s\n", ti, ti->mangled);
for(p = ti->mangled+1; *p; p++) { for(p = ti->mangled+1; *p; p++) {
hash ^= *p; hash ^= *p;
hash *= 0x1000193; hash *= fnv_prime;
} }
#ifdef _WIN64
hash ^= hash >> 32;
#endif
return hash; return hash;
} }
#endif #endif

11
dlls/ucrtbase/tests/cpp.c
View File

@ -163,19 +163,22 @@ static void test___std_type_info(void)
ti1.mangled[2] = 0; ti1.mangled[2] = 0;
hash1 = p___std_type_info_hash(&ti1); hash1 = p___std_type_info_hash(&ti1);
#ifdef _WIN64 #ifdef _WIN64
todo_wine ok(hash1 == 0xcbf29ce44fd0bfc1, "hash = %p\n", (void*)hash1); ok(hash1 == 0xcbf29ce44fd0bfc1, "hash = %p\n", (void*)hash1);
#else #else
ok(hash1 == 0x811c9dc5, "hash = %p\n", (void*)hash1); ok(hash1 == 0x811c9dc5, "hash = %p\n", (void*)hash1);
#endif #endif
ti1.mangled[0] = 1; ti1.mangled[0] = 1;
hash2 = p___std_type_info_hash(&ti1); hash2 = p___std_type_info_hash(&ti1);
ok(hash1 == hash2, "hash1 != hash2 (first char not ignorred)\n"); ok(hash1 == hash2, "hash1 != hash2 (first char not ignored)\n");
ti1.mangled[1] = 1; ti1.mangled[1] = 1;
hash1 = p___std_type_info_hash(&ti1); hash1 = p___std_type_info_hash(&ti1);
if(sizeof(void*) == sizeof(int)) #ifdef _WIN64
ok(hash1 == 0x40c5b8c, "hash = %p\n", (void*)hash1); ok(hash1 == 0xaf63bc4c29620a60, "hash = %p\n", (void*)hash1);
#else
ok(hash1 == 0x40c5b8c, "hash = %p\n", (void*)hash1);
#endif
ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); ok(hash1 != hash2, "hash1 == hash2 for different strings\n");
ti1.mangled[1] = 2; ti1.mangled[1] = 2;