Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 22:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FORMATTING] Remove trailing whitespace. Addendum to 34593d93.

Browse source 
Excluded: 3rd-party code (incl. wine) and most of the win32ss.
This commit is contained in:
Hermès Bélusca-Maïto 2021-09-13 03:33:14 +02:00
parent bbabe2489e
commit 9393fc320e
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
701 changed files with 14685 additions and 14693 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/rostests/apitests/shell32/CFSFolder.cpp
View file

@ -67,10 +67,10 @@ VOID TestUninitialized()
hr = psf->GetDisplayNameOf(NULL,SHGDN_FORPARSING|SHGDN_INFOLDER,&strretName);
ok(hr == E_INVALIDARG, "hr = %lx\n", hr);
/* Use Initialize method with a dummy pidl and test the still non initialized CFSFolder */
CComPtr<IPersistFolder2> ppf2;
hr = psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2));
@ -80,7 +80,7 @@ VOID TestUninitialized()
hr = ppf2->Initialize(testpidl);
ok(hr == S_OK, "hr = %lx\n", hr);
CComHeapPtr<ITEMIDLIST> pidl;
hr = ppf2->GetCurFolder(&pidl);
ok(hr == S_OK, "hr = %lx\n", hr);
@ -91,7 +91,7 @@ VOID TestUninitialized()
ok(hr == (IsWindows7OrGreater() ? E_INVALIDARG : E_FAIL), "hr = %lx\n", hr);
hr = psf->EnumObjects(NULL, 0, &penum);
ok(hr == (IsWindows7OrGreater() ? E_INVALIDARG : HRESULT_FROM_WIN32(ERROR_CANCELLED)), "hr = %lx\n", hr);
/* The following continue to work though */
hr = psf->CreateViewObject(NULL, IID_PPV_ARG(IDropTarget, &pdt));
ok(hr == S_OK, "hr = %lx\n", hr);
@ -160,7 +160,7 @@ VOID TestInitialize()
hr = psf->GetDisplayNameOf(NULL,SHGDN_FORPARSING,&strretName);
ok(hr == S_OK, "hr = %lx\n", hr);
ok(strretName.uType == STRRET_WSTR, "strretName.uType == %x\n", strretName.uType);
ok(wcscmp(strretName.pOleStr, L"C:\\") == 0, "wrong name, got: %S\n", strretName.pOleStr);
ok(wcscmp(strretName.pOleStr, L"C:\\") == 0, "wrong name, got: %S\n", strretName.pOleStr);
}
VOID TestGetUIObjectOf()
@ -179,7 +179,7 @@ VOID TestGetUIObjectOf()
}
START_TEST(CFSFolder)
{
{
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
TestUninitialized();

2
modules/rostests/apitests/shell32/CShellDesktop.cpp
View file

@ -198,7 +198,7 @@ VOID TestInitialize(_In_ IShellFolder *psf)
ok(hr == E_INVALIDARG, "hr = %lx\n", hr);
//crashes in xp, works on win10
//hr = ppf2->Initialize(NULL);
//hr = ppf2->Initialize(NULL);
//ok(hr == S_OK, "hr = %lx\n", hr);
//hr = ppf2->Initialize((LPCITEMIDLIST)0xdeaddead);
//ok(hr == S_OK, "hr = %lx\n", hr);

2
modules/rostests/apitests/shell32/CShellLink.cpp
View file

@ -296,7 +296,7 @@ test_iconlocation(UINT i, TEST_SHELL_ICON* testDef)
ok(iIcon == 0, "IShellLink::GetIconLocation(%d) returned %d, expected %d\n", i, iIcon, 0);
/* Try to grab the IExtractIconW interface */
hr = psl->QueryInterface(IID_PPV_ARG(IExtractIconW, &pei));
hr = psl->QueryInterface(IID_PPV_ARG(IExtractIconW, &pei));
ok(hr == S_OK, "IShellLink::QueryInterface(IExtractIconW)(%d) failed, hr = 0x%lx\n", i, hr);
if (!pei)
{

2
modules/rostests/apitests/shell32/CUserNotification.cpp
View file

@ -86,7 +86,7 @@ TestNotification(void)
skip("Could not instantiate IUserNotification\n");
return;
}
/* Set an invalid icon for the notification icon */
hr = pUserNotif->SetIconInfo((HICON)UlongToHandle(0xdeadbeef), L"Tooltip text");
ok_hr(hr, S_OK);

4
modules/rostests/apitests/shell32/Control_RunDLLW.cpp
View file

@ -63,7 +63,7 @@ CPlApplet(HWND hwndCPl,
{
wcscpy(pinfo->szName, L"name1");
wcscpy(pinfo->szInfo, L"info1");
wcscpy(pinfo->szHelpFile, L"help1");
wcscpy(pinfo->szHelpFile, L"help1");
}
break;
}
@ -93,7 +93,7 @@ struct param_test
INT iClick; /* MSG_NOT_CALLED when CPL_DBLCLK is not sent */
};
struct param_test tests[] =
struct param_test tests[] =
{
{__LINE__, L"", MSG_NOT_CALLED, L"", 0},
{__LINE__, L",name0", MSG_NOT_CALLED, L"", 0},

4
modules/rostests/apitests/shell32/PathResolve.cpp
View file

@ -562,7 +562,7 @@ static const ENTRY s_Entries[] =
};
static BOOL
CreateShortcut(LPCWSTR pszLnkFileName,
CreateShortcut(LPCWSTR pszLnkFileName,
LPCWSTR pszTargetPathName)
{
IPersistFile *ppf;
@ -572,7 +572,7 @@ CreateShortcut(LPCWSTR pszLnkFileName,
hres = CoInitialize(NULL);
if (SUCCEEDED(hres))
{
hres = CoCreateInstance(CLSID_ShellLink, NULL,
hres = CoCreateInstance(CLSID_ShellLink, NULL,
CLSCTX_INPROC_SERVER, IID_IShellLinkW, (LPVOID*)&psl);
if (SUCCEEDED(hres))
{

8
modules/rostests/apitests/shell32/SHParseDisplayName.cpp
View file

@ -52,8 +52,8 @@ struct test_data Tests[] =
{__LINE__, L"\\\\?\\", NULL, 0, E_INVALIDARG, 0},
/* Tests for the shell: protocol */
{__LINE__, L"shell:", NULL, 0, HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), 0},
{__LINE__, L"shell::", NULL, 0, HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), 0},
{__LINE__, L"shell:::", NULL, 0, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), 0},
{__LINE__, L"shell::", NULL, 0, HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), 0},
{__LINE__, L"shell:::", NULL, 0, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), 0},
{__LINE__, L"shell:::{", NULL, 0, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), 0},
{__LINE__, L"shell:fail", NULL, 0, HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), 0},
{__LINE__, L"shell:::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", 0, S_OK, 0},
@ -87,8 +87,8 @@ struct test_data Tests[] =
{__LINE__, L"ftp://ftp.gnu.org/gnu/octave/", L"ftp://ftp.gnu.org/gnu/octave/", 0, S_OK, T_VISTA_PLUS},
/* Tests for CRegFolder */
{__LINE__, L"::", NULL, 0, CO_E_CLASSSTRING, 0},
{__LINE__, L"::{", NULL, 0, CO_E_CLASSSTRING, 0},
{__LINE__, L"::{ ", NULL, 0, CO_E_CLASSSTRING, 0},
{__LINE__, L"::{", NULL, 0, CO_E_CLASSSTRING, 0},
{__LINE__, L"::{ ", NULL, 0, CO_E_CLASSSTRING, 0},
{__LINE__, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", 0, S_OK, 0},
{__LINE__, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D} ", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", 0, S_OK, 0},
{__LINE__, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}a", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", 0, S_OK, 0},

2
modules/rostests/apitests/shell32/ShellExecuteEx.cpp
View file

@ -75,7 +75,7 @@ TestShellExecuteEx(const WCHAR* Name, BOOL ExpectedResult)
ShellExecInfo.lpDirectory = NULL;
Result = ShellExecuteExW(&ShellExecInfo);
ok(Result == ExpectedResult, "ShellExecuteEx lpFile %s failed. Error: %lu\n", wine_dbgstr_w(Name), GetLastError());
if (ShellExecInfo.hProcess)
if (ShellExecInfo.hProcess)
{
Result = TerminateProcess(ShellExecInfo.hProcess, 0);
if (!Result) trace("Terminate process failed. Error: %lu\n", GetLastError());

4
modules/rostests/apitests/shell32/ShellExecuteW.cpp
View file

@ -47,7 +47,7 @@ START_TEST(ShellExecuteW)
ret = (INT)(UINT_PTR)hInstance;
ok(ret > 31, "TEST #1: ret:%d, LastError: %ld\n", ret, GetLastError());
trace("TEST #1 ret: %d.\n", ret);
if (hInstance)
if (hInstance)
{
Sleep(WAIT_SLEEP);
// Terminate Window
@ -73,7 +73,7 @@ START_TEST(ShellExecuteW)
ret = (INT)(UINT_PTR)hInstance;
ok(ret > 31, "TEST #3: ret:%d, LastError: %ld\n", ret, GetLastError());
trace("TEST #3 ret: %d.\n", ret);
if (hInstance)
if (hInstance)
{
Sleep(WAIT_SLEEP);
// Terminate Window

32
modules/rostests/apitests/shell32/menu.cpp
View file

@ -32,7 +32,7 @@ class CDummyWindow : public CUnknownBase<IOleWindow>
{
protected:
HWND m_hwnd;
const QITAB* GetQITab()
{
static const QITAB tab[] = {{ &IID_IOleWindow, OFFSETOFCLASS(IOleWindow, CDummyWindow) }, {0}};
@ -90,7 +90,7 @@ void test_CShellMenu_params()
HWND hwndOwner;
DWORD menuFlagss;
IShellFolder *shellFolder;
if (!CreateCShellMenu(&shellMenu, &dockingMenu, &menuWithSite))
{
skip("failed to create CShellMenuObject\n");
@ -113,7 +113,7 @@ void test_CShellMenu_params()
hResult = dockingMenu->GetWindow(&hwndToolbar);
test_HRES(hResult, E_FAIL, "GetWindow should fail");
hResult = shellMenu->GetMenu(&hmenu, &hwndOwner, &menuFlagss);
hResult = shellMenu->GetMenu(&hmenu, &hwndOwner, &menuFlagss);
test_HRES(hResult, E_FAIL, "GetMenu should fail");
hmenu = CreatePopupMenu();
@ -128,7 +128,7 @@ void test_CShellMenu_params()
hResult = shellMenu->SetMenu(NULL, NULL, 0);
test_S_OK(hResult, "SetMenu failed");
hResult = shellMenu->GetMenu(&hmenu, &hwndOwner, &menuFlagss);
hResult = shellMenu->GetMenu(&hmenu, &hwndOwner, &menuFlagss);
test_S_OK(hResult, "GetMenu failed");
ok (hmenu == NULL, "Got a menu\n");
@ -140,7 +140,7 @@ void test_CShellMenu_params()
hResult = shellMenu->SetShellFolder(shellFolder, NULL, 0, 0);
test_S_OK(hResult, "SetShellFolder failed");
hResult = shellMenu->SetShellFolder(NULL, NULL, 0, 0);
test_HRES(hResult, E_INVALIDARG, "SetShellFolder should fail");
@ -219,7 +219,7 @@ protected:
int m_iCallback;
struct _test_info *m_results;
int m_testsCount;
const QITAB* GetQITab()
{
static const QITAB tab[] = {{ &IID_IShellMenuCallback, OFFSETOFCLASS(IShellMenuCallback, CMenuCallback) }, {0}};
@ -245,8 +245,8 @@ public:
{
/*trace ("callback type %d\n", uMsg);*/
/*
* it seems callback 0x10000000 is called for every item added so
/*
* it seems callback 0x10000000 is called for every item added so
* we will ignore consecutive callbacks of this type
* Note: this callback is invoked by shell32.dll!CMenuSFToolbar::_FilterPidl
*/
@ -267,7 +267,7 @@ public:
ok(psmd != NULL, "Got NULL psmd\n");
ok(m_iTest == result->iTest, "Wrong test number (%d not %d)\n", m_iTest, result->iTest);
ok(result->uMsg == uMsg, "%d: Got wrong uMsg (%d instead of %d)\n", m_iCallback, uMsg, result->uMsg);
if(uMsg == SMC_CREATE)
{
ok(psmd->dwFlags == 0, "wrong dwFlags\n");
@ -276,7 +276,7 @@ public:
ok(psmd->hwnd == 0, "wrong hwnd\n");
ok(psmd->punk != NULL, "punk is null\n");
}
if (uMsg == SMC_GETSFOBJECT)
{
ok(psmd->psf != 0, "wrong dwFlags\n");
@ -298,7 +298,7 @@ void test_CShellMenu_callbacks(IShellFolder *shellFolder, HMENU hmenu)
CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandle(NULL), NULL);
CDummyWindow* dummyWindow = new CDummyWindow(hWndParent);
ShowWindow(hWndParent, SW_SHOW);
if (!CreateCShellMenu(&shellMenu, &dockingMenu, &menuWithSite))
{
skip("failed to create CShellMenuObject\n");
@ -335,7 +335,7 @@ void test_CShellMenu_callbacks(IShellFolder *shellFolder, HMENU hmenu)
test_S_OK(hResult, "SetShellFolder failed");
callback->SetTest(3);
hResult = shellMenu->SetMenu(hmenu, hWndParent, SMSET_TOP);
hResult = shellMenu->SetMenu(hmenu, hWndParent, SMSET_TOP);
test_S_OK(hResult, "SetMenu failed");
hResult = menuWithSite->SetSite(dummyWindow);
@ -343,7 +343,7 @@ void test_CShellMenu_callbacks(IShellFolder *shellFolder, HMENU hmenu)
callback->SetTest(4);
hResult = dockingMenu->ShowDW(TRUE);
test_HRES(hResult, S_FALSE, "ShowDW failed");
test_HRES(hResult, S_FALSE, "ShowDW failed");
}
void test_CShellMenu_with_DeskBar(IShellFolder *shellFolder, HMENU hmenu)
@ -366,9 +366,9 @@ void test_CShellMenu_with_DeskBar(IShellFolder *shellFolder, HMENU hmenu)
skip("failed to create MenuBandSite object\n");
return;
}
/* Create the popup menu */
hResult = shellMenu->Initialize(NULL, 0, ANCESTORDEFAULT, SMINIT_TOPLEVEL|SMINIT_VERTICAL);
hResult = shellMenu->Initialize(NULL, 0, ANCESTORDEFAULT, SMINIT_TOPLEVEL|SMINIT_VERTICAL);
test_S_OK(hResult, "Initialize failed");
hResult = shellMenu->SetMenu( hmenu, NULL, SMSET_TOP);
test_S_OK(hResult, "SetMenu failed");
@ -386,7 +386,7 @@ void test_CShellMenu_with_DeskBar(IShellFolder *shellFolder, HMENU hmenu)
/* Ensure that the created windows are correct */
hResult = dockingMenu->GetWindow(&hWndToolbar);
test_S_OK(hResult, "GetWindow failed");
test_S_OK(hResult, "GetWindow failed");
ok(hWndToolbar != NULL, "GetWindow should return a window\n");
hResult = menuPopup->GetWindow(&hWndToplevel);