March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : taskschd/tests: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 0ff329c041b0a420d1b3d1393e0fdae638e387d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ff329c041b0a420d1b3d139… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:44 2022 +0100 taskschd/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/Makefile.in | 1 - dlls/taskschd/tests/scheduler.c | 618 ++++++++++++++++++++-------------------- 2 files changed, 309 insertions(+), 310 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ff329c041b0a420d1b3…

1 0

Eric Pouech : sxs/tests: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 0dabbc1548e8de4d28ce2c1b7eb02b8dec7c96a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dabbc1548e8de4d28ce2c1b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:32 2022 +0100 sxs/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/tests/Makefile.in | 1 - dlls/sxs/tests/cache.c | 70 +++++++++++++++++++++++----------------------- dlls/sxs/tests/name.c | 66 +++++++++++++++++++++---------------------- dlls/sxs/tests/sxs.c | 38 ++++++++++++------------- 4 files changed, 87 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0dabbc1548e8de4d28ce…

1 0

Eric Pouech : shell32/tests: Use correct integral type.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 87c9a0dd08356cce9b653486b09bc4235c823ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c9a0dd08356cce9b653486… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:07:55 2022 +0100 shell32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)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)

1 0

Eric Pouech : kernel32/tests/profile: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: f588d96e95540295585fd072803ede03ebb0bc19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f588d96e95540295585fd072… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:06:54 2022 +0100 kernel32/tests/profile: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 347 +++++++++++++++++++++--------------------- 1 file changed, 174 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f588d96e95540295585f…

1 0

Eric Pouech : kernel32/tests/process: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: a9ae4866a54c0c308228e94c73f3ac97978cbffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9ae4866a54c0c308228e94c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:06:47 2022 +0100 kernel32/tests/process: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 939 +++++++++++++++++++++--------------------- 1 file changed, 470 insertions(+), 469 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9ae4866a54c0c308228…

1 0

Eric Pouech : kernel32/tests/pipe: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: c1cebdf19a544d0f23c4a10820be1204ad540d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1cebdf19a544d0f23c4a108… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:06:41 2022 +0100 kernel32/tests/pipe: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 949 +++++++++++++++++++++++---------------------- 1 file changed, 475 insertions(+), 474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1cebdf19a544d0f23c4…

1 0

Eric Pouech : kernel32/tests/path: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 51005afca3d8887509e29f456305b5b2856a66e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51005afca3d8887509e29f45… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:06:35 2022 +0100 kernel32/tests/path: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 401 +++++++++++++++++++++++---------------------- 1 file changed, 201 insertions(+), 200 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=51005afca3d8887509e2…

1 0

Eric Pouech : slc/tests: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 754c5eb4cf22f16b1f8678db6a2d94f6a775dd01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=754c5eb4cf22f16b1f8678db… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:14 2022 +0100 slc/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/tests/Makefile.in | 1 - dlls/slc/tests/slc.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/slc/tests/Makefile.in b/dlls/slc/tests/Makefile.in index 86f77823a71..51b648cb854 100644 --- a/dlls/slc/tests/Makefile.in +++ b/dlls/slc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = slc.dll IMPORTS = slc diff --git a/dlls/slc/tests/slc.c b/dlls/slc/tests/slc.c index fc0b1c84ad7..10a87571e7d 100644 --- a/dlls/slc/tests/slc.c +++ b/dlls/slc/tests/slc.c @@ -33,30 +33,30 @@ static void test_SLGetWindowsInformationDWORD(void) HRESULT res; res = SLGetWindowsInformationDWORD(L"Nonexistent-License-Value", NULL); - ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); + ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", res); res = SLGetWindowsInformationDWORD(NULL, &value); - ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); + ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", res); value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(L"Nonexistent-License-Value", &value); - ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08x\n", res); - ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); + ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08lx\n", res); + ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %lu\n", value); value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(L"", &value); ok(res == SL_E_RIGHT_NOT_GRANTED || broken(res == 0xd000000d) /* Win 8 */, - "expected SL_E_RIGHT_NOT_GRANTED, got %08x\n", res); - ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); + "expected SL_E_RIGHT_NOT_GRANTED, got %08lx\n", res); + ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %lu\n", value); value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(L"Kernel-MUI-Language-Allowed", &value); - ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08x\n", res); - ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); + ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08lx\n", res); + ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %lu\n", value); value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(L"Kernel-MUI-Number-Allowed", &value); - ok(res == S_OK, "expected S_OK, got %u\n", res); + ok(res == S_OK, "expected S_OK, got %lu\n", res); ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); }

1 0

Eric Pouech : tapi32/tests: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: bb71d6d9bad586144d61a5e72775b535a87face0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb71d6d9bad586144d61a5e7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:38 2022 +0100 tapi32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/tests/Makefile.in | 1 - dlls/tapi32/tests/tapi.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in index 6c420bf270f..126eed1c85c 100644 --- a/dlls/tapi32/tests/Makefile.in +++ b/dlls/tapi32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = tapi32.dll IMPORTS = tapi32 diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c index 13772c8c7d4..462f0ceb0c6 100644 --- a/dlls/tapi32/tests/tapi.c +++ b/dlls/tapi32/tests/tapi.c @@ -35,25 +35,25 @@ static void test_lineInitialize(void) HLINEAPP lnApp; ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %lx.\n", ret); ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %lx.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %lx.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %lx.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); - ok(!ret, "unexpected return value, got %u.\n", ret); + ok(!ret, "unexpected return value, got %lu.\n", ret); ret = lineShutdown(NULL); - todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %lx.\n", ret); ret = lineShutdown(lnApp); - ok(!ret, "unexpected return value, got %u.\n", ret); + ok(!ret, "unexpected return value, got %lu.\n", ret); } START_TEST(tapi)

1 0

Eric Pouech : twain_32/tests: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: b6dbbfe649c3a30540a41ac4da29e5f06766c37a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6dbbfe649c3a30540a41ac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:50 2022 +0100 twain_32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/tests/Makefile.in | 1 - dlls/twain_32/tests/dsm.c | 42 ++++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6dbbfe649c3a30540a4…

1 0