Ros-diffs July 2020

ros-diffs@reactos.org

14 participants
55 discussions

[reactos] 01/01: [ADVAPI32_WINETEST] test_create_delete_svc(): Fix 'account' size (#2960)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54e0dbe3b633456eb5159… commit 54e0dbe3b633456eb5159fa1902da7ca83c323b4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 4 15:24:46 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 4 15:24:46 2020 +0200 [ADVAPI32_WINETEST] test_create_delete_svc(): Fix 'account' size (#2960) Cherry-pick https://source.winehq.org/git/wine.git/commit/56a83c585aeb071af29824399e22d… --- modules/rostests/winetests/advapi32/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/advapi32/service.c b/modules/rostests/winetests/advapi32/service.c index 8c13fbb2c6c..b92625fdf05 100644 --- a/modules/rostests/winetests/advapi32/service.c +++ b/modules/rostests/winetests/advapi32/service.c @@ -194,7 +194,7 @@ static void test_create_delete_svc(void) SC_HANDLE scm_handle, svc_handle1, svc_handle2; CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; - CHAR account[UNLEN + 3]; + CHAR account[MAX_PATH + UNLEN + 1]; static const CHAR servicename [] = "Winetest"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = "";

4 years, 3 months

[reactos] 01/01: [UTILDLL_APITEST] Create 'CachedGetUserFromSid()' test (#2954)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=092e2457548f53da15d6b… commit 092e2457548f53da15d6be7e01022180ae0aefc9 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 4 15:24:13 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 4 15:24:13 2020 +0200 [UTILDLL_APITEST] Create 'CachedGetUserFromSid()' test (#2954) --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/utildll/CMakeLists.txt | 11 +++ .../apitests/utildll/CachedGetUserFromSid.c | 94 ++++++++++++++++++++++ modules/rostests/apitests/utildll/testlist.c | 10 +++ 4 files changed, 116 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 59bdeb46832..c0a6e85ad17 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -45,6 +45,7 @@ add_subdirectory(psapi) add_subdirectory(user32) add_subdirectory(user32_dynamic) add_subdirectory(userenv) +add_subdirectory(utildll) add_subdirectory(uxtheme) if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") add_subdirectory(win32u) diff --git a/modules/rostests/apitests/utildll/CMakeLists.txt b/modules/rostests/apitests/utildll/CMakeLists.txt new file mode 100644 index 00000000000..f16e7f59fd8 --- /dev/null +++ b/modules/rostests/apitests/utildll/CMakeLists.txt @@ -0,0 +1,11 @@ + +list(APPEND SOURCE + CachedGetUserFromSid.c) + +add_executable(utildll_apitest + ${SOURCE} + testlist.c) + +set_module_type(utildll_apitest win32cui) +add_importlibs(utildll_apitest msvcrt kernel32) +add_rostests_file(TARGET utildll_apitest) diff --git a/modules/rostests/apitests/utildll/CachedGetUserFromSid.c b/modules/rostests/apitests/utildll/CachedGetUserFromSid.c new file mode 100644 index 00000000000..04a5ad75e14 --- /dev/null +++ b/modules/rostests/apitests/utildll/CachedGetUserFromSid.c @@ -0,0 +1,94 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for CachedGetUserFromSid + * COPYRIGHT: Copyright 2020 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> + */ + +#include <apitest.h> + +#include <lmcons.h> +#include <wchar.h> + +static VOID (WINAPI *pCachedGetUserFromSid)(PSID pSid, LPWSTR pUserName, PULONG pcwcUserName); + +static void test_Sid_Null(void) +{ + const WCHAR szUserNameFromNull[] = L"(unknown)"; + const ULONG cchUserNameFromNull = (ULONG)wcslen(szUserNameFromNull); + + WCHAR szUserName[UNLEN + 1]; + ULONG cchUserName; + + // First, full success case, to load result into cache. + // Otherwise, expect misbehavior/corruption/crash! + // Same issues with 'NULL' or '0' arguments. + // Behavior changed on NT6.0 then NT6.1+... + + wmemset(szUserName, L'?', _countof(szUserName)); + cchUserName = _countof(szUserName); + pCachedGetUserFromSid(NULL, szUserName, &cchUserName); + ok(cchUserName == cchUserNameFromNull, "cchUserName: expected %lu, got %lu\n", cchUserNameFromNull, cchUserName); + ok(wcscmp(szUserName, szUserNameFromNull) == 0, "szUserName: expected \"%S\", got \"%.*S\"\n", szUserNameFromNull, (int)cchUserName, szUserName); + + wmemset(szUserName, L'?', _countof(szUserName)); + cchUserName = 1; + pCachedGetUserFromSid(NULL, szUserName, &cchUserName); + ok(cchUserName == 0, "cchUserName: expected 0, got %lu\n", cchUserName); + ok(szUserName[0] == UNICODE_NULL, "szUserName: missing UNICODE_NULL, got \"%.*S\"\n", (int)cchUserName, szUserName); + + wmemset(szUserName, L'?', _countof(szUserName)); + cchUserName = 2; + pCachedGetUserFromSid(NULL, szUserName, &cchUserName); + ok(cchUserName == 1, "cchUserName: expected 0, got %lu\n", cchUserName); + ok(szUserName[1] == UNICODE_NULL, "szUserName: missing UNICODE_NULL, got \"%.*S\"\n", (int)cchUserName, szUserName); + ok(wcsncmp(szUserName, szUserNameFromNull, 1) == 0, "szUserName: expected \"%.*S\", got \"%.*S\"\n", 1, szUserNameFromNull, (int)cchUserName, szUserName); + + wmemset(szUserName, L'?', _countof(szUserName)); + cchUserName = cchUserNameFromNull; + pCachedGetUserFromSid(NULL, szUserName, &cchUserName); + ok(cchUserName == cchUserNameFromNull - 1, "cchUserName: expected %lu, got %lu\n", cchUserNameFromNull - 1, cchUserName); + ok(szUserName[cchUserNameFromNull - 1] == UNICODE_NULL, "szUserName: missing UNICODE_NULL, got \"%.*S\"\n", (int)cchUserName, szUserName); + ok(wcsncmp(szUserName, szUserNameFromNull, cchUserNameFromNull - 1) == 0, "szUserName: expected \"%.*S\", got \"%.*S\"\n", (int)cchUserNameFromNull - 1, szUserNameFromNull, (int)cchUserName, szUserName); + + wmemset(szUserName, L'?', _countof(szUserName)); + cchUserName = cchUserNameFromNull + 1; + pCachedGetUserFromSid(NULL, szUserName, &cchUserName); + ok(cchUserName == cchUserNameFromNull, "cchUserName: expected %lu, got %lu\n", cchUserNameFromNull, cchUserName); + ok(wcscmp(szUserName, szUserNameFromNull) == 0, "szUserName: expected \"%S\", got \"%.*S\"\n", szUserNameFromNull, (int)cchUserName, szUserName); +} + +START_TEST(CachedGetUserFromSid) +{ + const char szFunction[] = "CachedGetUserFromSid"; + + // TODO: Dynamically checking, until ReactOS implements this dll. + HMODULE hModule = LoadLibraryW(L"utildll.dll"); + DWORD dwLE = GetLastError(); + + if (!hModule) + { + ok(FALSE, "LoadLibraryW(\"%S\") failed! (dwLE = %lu)\n", L"utildll.dll", dwLE); + + skip("No DLL\n"); + return; + } + + void *pFunction = (void *)GetProcAddress(hModule, szFunction); + dwLE = GetLastError(); + + if (!pFunction) + { + ok(FALSE, "GetProcAddress(\"%s\") failed! (dwLE = %lu)\n", szFunction, dwLE); + + skip("No function\n"); + FreeLibrary(hModule); + return; + } + + pCachedGetUserFromSid = pFunction; + + test_Sid_Null(); + + FreeLibrary(hModule); +} diff --git a/modules/rostests/apitests/utildll/testlist.c b/modules/rostests/apitests/utildll/testlist.c new file mode 100644 index 00000000000..a5b45cd6bf1 --- /dev/null +++ b/modules/rostests/apitests/utildll/testlist.c @@ -0,0 +1,10 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_CachedGetUserFromSid(void); + +const struct test winetest_testlist[] = +{ + { "CachedGetUserFromSid", func_CachedGetUserFromSid }, + { 0, 0 } +};

4 years, 3 months

[reactos] 01/01: [ROSTESTS] sertest.c: Replace a busy loop with 'Sleep()' (#2886)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7187b4d846f690996543f… commit 7187b4d846f690996543fd605345c48962fe22e6 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 4 15:18:22 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 4 15:18:22 2020 +0200 [ROSTESTS] sertest.c: Replace a busy loop with 'Sleep()' (#2886) Detected by Cppcheck: uninitvar. ROSTESTS-204 Co-authored-by: Victor Martinez <vicmarcal(a)gmail.com> --- modules/rostests/tests/sertest/sertest.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/rostests/tests/sertest/sertest.c b/modules/rostests/tests/sertest/sertest.c index ea5cdbe379a..f56f36ec83f 100644 --- a/modules/rostests/tests/sertest/sertest.c +++ b/modules/rostests/tests/sertest/sertest.c @@ -18,8 +18,6 @@ int main(int argc, char *argv[]) BOOL bResult; HANDLE hPort; int i; - int j; - int k; int nPortNum = 1; TCHAR szPortName[MAX_PORTNAME_LEN]; @@ -56,9 +54,7 @@ int main(int argc, char *argv[]) if (!bResult) { printf("WARNING: EscapeCommFunction(SETRTS) failed: %lx\n", (DWORD)bResult); } - for (j = 0; j < 1000; j++) { - k *= j; - } + Sleep(500); /* #define CLRDTR (6) #define CLRRTS (4)

4 years, 3 months

[reactos] 01/01: [NET] cmdAccounts(): Set ProductType default value (#2365)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4292fdd8aa27746bb59ca… commit 4292fdd8aa27746bb59cac5a016225ad3bfdd661 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 4 15:16:22 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 4 15:16:22 2020 +0200 [NET] cmdAccounts(): Set ProductType default value (#2365) --- base/applications/network/net/cmdAccounts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index 7fad061c5c0..00b037ff1f4 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -17,7 +17,7 @@ cmdAccounts( PUSER_MODALS_INFO_0 Info0 = NULL; PUSER_MODALS_INFO_1 Info1 = NULL; PUSER_MODALS_INFO_3 Info3 = NULL; - NT_PRODUCT_TYPE ProductType; + NT_PRODUCT_TYPE ProductType = NtProductWinNt; LPWSTR p; LPWSTR endptr; DWORD ParamErr;

4 years, 3 months

[reactos] 01/01: [USER32][NTUSER] Fix wrong return from LB_GETLISTBOXINFO (#2168)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62e52c723729455687989… commit 62e52c7237294556879890f29e271c2ade129fa3 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Jul 4 14:11:10 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 4 15:11:10 2020 +0200 [USER32][NTUSER] Fix wrong return from LB_GETLISTBOXINFO (#2168) And is now consistent with comctl32 and Wine too... --- win32ss/user/ntuser/window.c | 5 +---- win32ss/user/user32/controls/listbox.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index c70b6081191..6095ed1b403 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3349,10 +3349,7 @@ NtUserGetListBoxInfo( { LB_DESCR *descr = ((PWND2LB)Wnd)->pLBiv; // See Controls ListBox.c:LB_GETLISTBOXINFO must match... - if (descr->style & LBS_MULTICOLUMN) //// ReactOS - Ret = descr->page_size * descr->column_width; - else - Ret = descr->page_size; + Ret = descr->page_size; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { diff --git a/win32ss/user/user32/controls/listbox.c b/win32ss/user/user32/controls/listbox.c index 8e909f9857e..195241d1884 100644 --- a/win32ss/user/user32/controls/listbox.c +++ b/win32ss/user/user32/controls/listbox.c @@ -3055,10 +3055,7 @@ LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, return LB_OKAY; case LB_GETLISTBOXINFO: - if (descr->style & LBS_MULTICOLUMN) //// ReactOS - return descr->page_size * descr->column_width; - else - return descr->page_size; + return descr->page_size; case WM_DESTROY: return LISTBOX_Destroy( descr );

4 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2020