Module: wine Branch: master Commit: 87c9a0dd08356cce9b653486b09bc4235c823ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c9a0dd08356cce9b653486b...
Author: Eric Pouech eric.pouech@gmail.com Date: Sat Mar 5 12:07:55 2022 +0100
shell32/tests: Use correct integral type.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shell32/tests/recyclebin.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++---- dlls/shell32/tests/shlfolder.c | 16 +++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index 50e262e918d..9207872d40f 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -39,7 +39,7 @@ static void test_query_recyclebin(void) { SHQUERYRBINFO info1={sizeof(info1),0xdeadbeef,0xdeadbeef}; SHQUERYRBINFO info2={sizeof(info2),0xdeadbeef,0xdeadbeef}; - UINT written; + DWORD written; HRESULT hr; HANDLE file; SHFILEOPSTRUCTA shfo; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1c7f25ccd52..180ff4b1108 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -290,7 +290,8 @@ static void check_icon_size( HICON icon, DWORD flags ) { ICONINFO info; BITMAP bm; - SIZE list_size, metrics_size; + SIZE metrics_size; + int list_cx, list_cy; IImageList *list;
GetIconInfo( icon, &info ); @@ -298,7 +299,7 @@ static void check_icon_size( HICON icon, DWORD flags )
SHGetImageList( (flags & SHGFI_SMALLICON) ? SHIL_SMALL : SHIL_LARGE, &IID_IImageList, (void **)&list ); - IImageList_GetIconSize( list, &list_size.cx, &list_size.cy ); + IImageList_GetIconSize( list, &list_cx, &list_cy ); IImageList_Release( list );
metrics_size.cx = GetSystemMetrics( (flags & SHGFI_SMALLICON) ? SM_CXSMICON : SM_CXICON ); @@ -307,8 +308,8 @@ static void check_icon_size( HICON icon, DWORD flags )
if (flags & SHGFI_SHELLICONSIZE) { - ok( bm.bmWidth == list_size.cx, "got %d expected %d\n", bm.bmWidth, list_size.cx ); - ok( bm.bmHeight == list_size.cy, "got %d expected %d\n", bm.bmHeight, list_size.cy ); + ok( bm.bmWidth == list_cx, "got %d expected %d\n", bm.bmWidth, list_cx ); + ok( bm.bmHeight == list_cy, "got %d expected %d\n", bm.bmHeight, list_cy ); } else { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 13108f92246..608d4defcb9 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3311,7 +3311,8 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { LPITEMIDLIST apidl[5]; - UINT done, numitems, i; + UINT done; + DWORD numitems, i;
for(done = 0; done < 5; done++) if(IEnumIDList_Next(peidl, 1, &apidl[done], NULL) != S_OK) @@ -3387,7 +3388,7 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { IShellItem *psi2; - UINT count; + DWORD count; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count == 1, "Got count %d\n", count); @@ -3464,7 +3465,7 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - UINT count_sia, i; + DWORD count_sia, i; hr = IShellItemArray_GetCount(psia, &count_sia); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count_sia == count, "Counts differ (%d, %d)\n", count, count_sia); @@ -3544,7 +3545,7 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { IShellItem *psi; - UINT count = 0; + DWORD count = 0;
hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -3597,7 +3598,7 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { IShellItem *psi; - UINT count = 0; + DWORD count = 0;
hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -3639,7 +3640,7 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { IShellItem *psi; - UINT count = 0; + DWORD count = 0;
hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -3731,7 +3732,8 @@ static void test_ShellItemArrayEnumItems(void) { IShellItemArray *psia; LPITEMIDLIST apidl[5]; - UINT done, numitems, i; + UINT done; + DWORD numitems, i;
for(done = 0; done < 5; done++) if(IEnumIDList_Next(peidl, 1, &apidl[done], NULL) != S_OK)