Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-22 10:35:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHLWAPI_WINETEST] Sync with Wine Staging 2.16. CORE-13762

Browse source
This commit is contained in:
Amine Khaldi 2017-10-21 14:00:13 +01:00
parent 684625e49f
commit 7a90aee56c
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/rostests/winetests/shlwapi/CMakeLists.txt
View file

@ -1,5 +1,7 @@
add_definitions(-DUSE_WINE_TODOS)
add_definitions(
-DUSE_WINE_TODOS
-DWINETEST_USE_DBGSTR_LONGLONG)
list(APPEND SOURCE
assoc.c

28
modules/rostests/winetests/shlwapi/string.c
View file

@ -575,8 +575,8 @@ static void test_StrToInt64ExA(void)
ok(!bRet || return_val != -1, "No result returned from '%s'\n",
result->string);
if (bRet)
ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n",
result->string, (DWORD)(return_val >> 32), (DWORD)return_val);
ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n",
result->string, wine_dbgstr_longlong(return_val));
result++;
}
@ -588,8 +588,8 @@ static void test_StrToInt64ExA(void)
ok(!bRet || return_val != -1, "No result returned from '%s'\n",
result->string);
if (bRet)
ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n",
result->string, (DWORD)(return_val >> 32), (DWORD)return_val);
ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n",
result->string, wine_dbgstr_longlong(return_val));
result++;
}
}
@ -615,8 +615,8 @@ static void test_StrToInt64ExW(void)
ok(!bRet || return_val != -1, "No result returned from '%s'\n",
result->string);
if (bRet)
ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n",
result->string, (DWORD)(return_val >> 32), (DWORD)return_val);
ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n",
result->string, wine_dbgstr_longlong(return_val));
result++;
}
@ -629,8 +629,8 @@ static void test_StrToInt64ExW(void)
ok(!bRet || return_val != -1, "No result returned from '%s'\n",
result->string);
if (bRet)
ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n",
result->string, (DWORD)(return_val >> 32), (DWORD)return_val);
ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n",
result->string, wine_dbgstr_longlong(return_val));
result++;
}
}
@ -677,8 +677,8 @@ static void test_StrFormatByteSize64A(void)
pStrFormatByteSize64A(result->value, szBuff, 256);
ok(!strcmp(result->byte_size_64, szBuff),
"Formatted %x%08x wrong: got %s, expected %s\n",
(LONG)(result->value >> 32), (LONG)result->value, szBuff, result->byte_size_64);
"Formatted %s wrong: got %s, expected %s\n",
wine_dbgstr_longlong(result->value), szBuff, result->byte_size_64);
result++;
}
@ -701,8 +701,8 @@ static void test_StrFormatKBSizeW(void)
pStrFormatKBSizeW(result->value, szBuffW, 256);
WideCharToMultiByte(CP_ACP,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),NULL,NULL);
ok(!strcmp(result->kb_size, szBuff), "Formatted %x%08x wrong: got %s, expected %s\n",
(LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size);
ok(!strcmp(result->kb_size, szBuff), "Formatted %s wrong: got %s, expected %s\n",
wine_dbgstr_longlong(result->value), szBuff, result->kb_size);
result++;
}
}
@ -726,8 +726,8 @@ static void test_StrFormatKBSizeA(void)
* and does not correctly handle extremely large values. */
ok(!strcmp(result->kb_size, szBuff) ||
(result->kb_size_broken && !strcmp(result->kb_size2, szBuff)),
"Formatted %x%08x wrong: got %s, expected %s\n",
(LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size);
"Formatted %s wrong: got %s, expected %s\n",
wine_dbgstr_longlong(result->value), szBuff, result->kb_size);
result++;
}
}