Module: wine Branch: master Commit: 259557cdce3669e970d3ee523d1606cc8aa6630c URL: https://source.winehq.org/git/wine.git/?a=commit;h=259557cdce3669e970d3ee523...
Author: Alex Henrie alexhenrie24@gmail.com Date: Mon Feb 14 00:11:52 2022 -0700
comctl32/tests: Drop mru test workarounds for Windows <= 2000.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/comctl32/tests/mru.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 87677b33902..6a9a04d9663 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -340,15 +340,11 @@ static void test_MRUListA(void) iRet, GetLastError());
/* Add (NULL string) */ - if (0) - { - /* Some native versions crash when passed NULL or fail to SetLastError() */ SetLastError(0); iRet = pAddMRUStringA(hMRU, NULL); - ok(iRet == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "AddMRUStringA(NULL str) expected 0,ERROR_INVALID_PARAMETER got %d,%d\n", + todo_wine ok(iRet == 0 && !GetLastError(), + "AddMRUStringA(NULL str) expected 0,0 got %d,%d\n", iRet, GetLastError()); - }
/* Add 3 strings. Check the registry is correct after each add */ SetLastError(0); @@ -450,7 +446,7 @@ static void test_MRUListA(void) pFreeMRUList(hMRU); }
- /* FreeMRUList(NULL) crashes on Win98 OSR0 */ + pFreeMRUList(NULL); /* should not crash */ }
typedef struct { @@ -504,13 +500,9 @@ static void test_EnumMRUList(void) return; }
- /* NULL handle */ - if (0) - { - /* crashes on NT4, passed on Win2k, XP, 2k3, Vista, 2k8 */ - pEnumMRUListA(NULL, 0, NULL, 0); - pEnumMRUListW(NULL, 0, NULL, 0); - } + /* NULL handle - should not crash */ + pEnumMRUListA(NULL, 0, NULL, 0); + pEnumMRUListW(NULL, 0, NULL, 0); }
static void test_FindMRUData(void)