Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 73563: [SHELL32_APITEST] - Use smart COM pointers (thanks Mark ; ) - Add other tests for testing non-existing files in existing directories.
by hbelusca＠svn.reactos.org 16 Jan '17

16 Jan '17

Author: hbelusca Date: Mon Jan 16 18:02:43 2017 New Revision: 73563 URL: http://svn.reactos.org/svn/reactos?rev=73563&view=rev Log: [SHELL32_APITEST] - Use smart COM pointers (thanks Mark ;) - Add other tests for testing non-existing files in existing directories. Modified: trunk/rostests/apitests/shell32/CShellLink.cpp Modified: trunk/rostests/apitests/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellLi… ============================================================================== --- trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] Mon Jan 16 18:02:43 2017 @@ -77,6 +77,11 @@ L"%comspec%", SLGP_RAWPATH, S_OK, TRUE }, { + L"%systemroot%\\non-existent-file", S_OK, + L"%systemroot%\\non-existent-file", SLGP_SHORTPATH, S_OK, TRUE, + L"%systemroot%\\non-existent-file", SLGP_RAWPATH, S_OK, FALSE + }, + { L"c:\\non-existent-path\\non-existent-file", S_OK, L"c:\\non-existent-path\\non-existent-file", SLGP_SHORTPATH, S_OK, FALSE, L"c:\\non-existent-path\\non-existent-file", SLGP_RAWPATH, S_OK, FALSE @@ -98,7 +103,7 @@ WCHAR wPathOut[MAX_PATH]; BOOL expandPathOut; PCWSTR expectedPathOut; - IShellLinkW *psl; + CComPtr<IShellLinkW> psl; UINT i1; DWORD flags; @@ -150,8 +155,6 @@ "IShellLink::GetPath(%d), flags 0x%lx, in %S, got %S, expected %S\n", i, flags, testDef->pathIn, wPathOut, expectedPathOut); } - - psl->Release(); } static @@ -177,7 +180,7 @@ TestDescription(void) { HRESULT hr; - IShellLinkW *psl; + CComPtr<IShellLinkW> psl; WCHAR buffer[64]; PCWSTR testDescription = L"This is a test description"; @@ -217,8 +220,6 @@ ok(hr == S_OK, "IShellLink::GetDescription returned hr = 0x%lx\n", hr); ok(buffer[0] == 0, "buffer[0] = %x\n", buffer[0]); ok(buffer[1] == 0x5555, "buffer[1] = %x\n", buffer[1]); - - psl->Release(); } @@ -250,7 +251,9 @@ {L"%SystemRoot%\\system32\\shell32.dll", S_FALSE, E_INVALIDARG, S_OK, L"*", GIL_NOTFILENAME | GIL_PERCLASS}, - /* Non-existing file */ + /* Non-existing files */ + {L"%SystemRoot%\\non-existent-file.sdf", S_FALSE, E_INVALIDARG, + S_OK, L"*", GIL_NOTFILENAME | GIL_PERCLASS}, {L"c:\\non-existent-path\\non-existent-file.sdf", S_FALSE, E_INVALIDARG, S_OK, L"*", GIL_NOTFILENAME | GIL_PERCLASS}, }; @@ -260,8 +263,8 @@ test_iconlocation(UINT i, TEST_SHELL_ICON* testDef) { HRESULT hr; - IShellLinkW *psl; - IExtractIconW *pei; + CComPtr<IShellLinkW> psl; + CComPtr<IExtractIconW> pei; INT iIcon; UINT wFlags; PCWSTR pszExplorer = L"%SystemRoot%\\explorer.exe"; @@ -301,7 +304,6 @@ if (!pei) { win_skip("No IExtractIconW interface\n"); - psl->Release(); return; } @@ -386,10 +388,6 @@ // ok(*szPath == L'\0', "IExtractIcon::GetIconLocation returned '%S'\n", szPath); // ok(iIcon == 0, "IExtractIcon::GetIconLocation returned %d\n", iIcon); // ok(FALSE, "hr = 0x%lx, szPath = '%S', iIcon = %d, wFlags = %d\n", hr, szPath, iIcon, wFlags); - - /* Release the interfaces */ - pei->Release(); - psl->Release(); } static

1 0

[hbelusca] 73562: [SHELL32_APITEST]: Add more tests to see how IShellLink::Get/SetIconLocation interacts with IExtractIcon::GetIconLocation.
by hbelusca＠svn.reactos.org 16 Jan '17

16 Jan '17

Author: hbelusca Date: Mon Jan 16 17:27:44 2017 New Revision: 73562 URL: http://svn.reactos.org/svn/reactos?rev=73562&view=rev Log: [SHELL32_APITEST]: Add more tests to see how IShellLink::Get/SetIconLocation interacts with IExtractIcon::GetIconLocation. Modified: trunk/rostests/apitests/shell32/CShellLink.cpp Modified: trunk/rostests/apitests/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellLi… ============================================================================== --- trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] Mon Jan 16 17:27:44 2017 @@ -248,11 +248,11 @@ /* Existing file */ {L"%SystemRoot%\\system32\\shell32.dll", S_FALSE, E_INVALIDARG, - S_OK, L"%SystemRoot%\\system32\\shell32.dll", GIL_NOTFILENAME | GIL_PERCLASS}, + S_OK, L"*", GIL_NOTFILENAME | GIL_PERCLASS}, /* Non-existing file */ {L"c:\\non-existent-path\\non-existent-file.sdf", S_FALSE, E_INVALIDARG, - S_OK, L"c:\\non-existent-path\\non-existent-file.sdf", GIL_NOTFILENAME | GIL_PERCLASS}, + S_OK, L"*", GIL_NOTFILENAME | GIL_PERCLASS}, }; static @@ -264,7 +264,9 @@ IExtractIconW *pei; INT iIcon; UINT wFlags; + PCWSTR pszExplorer = L"%SystemRoot%\\explorer.exe"; WCHAR szPath[MAX_PATH]; + WCHAR szPath2[MAX_PATH]; hr = CoCreateInstance(CLSID_ShellLink, NULL, @@ -291,7 +293,7 @@ hr = psl->GetIconLocation(szPath, _countof(szPath), &iIcon); ok(hr == S_OK, "IShellLink::GetIconLocation(%d) failed, hr = 0x%lx\n", i, hr); ok(*szPath == L'\0', "IShellLink::GetIconLocation(%d) returned '%S'\n", i, szPath); - ok(iIcon == 0, "IShellLink::GetIconLocation(%d) returned %d\n", i, iIcon); + 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)); @@ -306,23 +308,83 @@ iIcon = wFlags = 0xdeadbeef; wcscpy(szPath, L"garbage"); hr = pei->GetIconLocation(GIL_DEFAULTICON, szPath, _countof(szPath), &iIcon, &wFlags); - ok(hr == testDef->hrDefIcon, "IShellLink::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrDefIcon); - ok(*szPath == L'\0', "IShellLink::GetIconLocation(%d) returned '%S'\n", i, szPath); - // ok(iIcon == 0, "IShellLink::GetIconLocation(%d) returned %d\n", i, iIcon); + ok(hr == testDef->hrDefIcon, "IExtractIcon::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrDefIcon); + ok(*szPath == L'\0', "IExtractIcon::GetIconLocation(%d) returned '%S'\n", i, szPath); + // ok(iIcon == 0, "IExtractIcon::GetIconLocation(%d) returned %d\n", i, iIcon); iIcon = wFlags = 0xdeadbeef; wcscpy(szPath, L"garbage"); hr = pei->GetIconLocation(GIL_FORSHORTCUT, szPath, _countof(szPath), &iIcon, &wFlags); - ok(hr == testDef->hrForShrt, "IShellLink::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShrt); + ok(hr == testDef->hrForShrt, "IExtractIcon::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShrt); // Here, both szPath and iIcon are untouched... iIcon = wFlags = 0xdeadbeef; wcscpy(szPath, L"garbage"); hr = pei->GetIconLocation(GIL_FORSHELL, szPath, _countof(szPath), &iIcon, &wFlags); - ok(hr == testDef->hrForShell, "IShellLink::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShell); - ok(wFlags == testDef->Flags, "IShellLink::GetIconLocation(%d) returned wFlags = 0x%x, expected 0x%x\n", i, wFlags, testDef->Flags); - // ok(*szPath == L'\0', "IShellLink::GetIconLocation returned '%S'\n", szPath); - // ok(iIcon == 0, "IShellLink::GetIconLocation returned %d\n", iIcon); + ok(hr == testDef->hrForShell, "IExtractIcon::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShell); + ok(wFlags == testDef->Flags, "IExtractIcon::GetIconLocation(%d) returned wFlags = 0x%x, expected 0x%x\n", i, wFlags, testDef->Flags); + /* + * Actually, even if wFlags specifies GIL_NOTFILENAME, a correct file name is returned + * for executables only (at least...), otherwise we can get an asterix '*'. + */ + ExpandEnvironmentStringsW(testDef->IconPath, szPath2, _countof(szPath2)); + ok(_wcsicmp(szPath2, szPath) == 0, "IExtractIcon::GetIconLocation(%d) returned '%S', expected '%S'\n", i, szPath, szPath2); + + // ok(*szPath == L'\0', "IExtractIcon::GetIconLocation returned '%S'\n", szPath); + // ok(iIcon == 0, "IExtractIcon::GetIconLocation returned %d\n", iIcon); + // ok(FALSE, "hr = 0x%lx, szPath = '%S', iIcon = %d, wFlags = %d\n", hr, szPath, iIcon, wFlags); + + + /* + * Now we test what happens when we explicitly set an icon to the shortcut. + * Note that actually, SetIconLocation() does not verify whether the file + * really exists. + */ + hr = psl->SetIconLocation(pszExplorer, 1); + ok(hr == S_OK, "IShellLink::SetIconLocation(%d) failed, hr = 0x%lx\n", i, hr); + + /* + * First, we call IShellLink::GetIconLocation. We retrieve + * exactly what we specified with SetIconLocation. + */ + iIcon = 0xdeadbeef; + wcscpy(szPath, L"garbage"); + hr = psl->GetIconLocation(szPath, _countof(szPath), &iIcon); + ok(hr == S_OK, "IShellLink::GetIconLocation(%d) failed, hr = 0x%lx\n", i, hr); + ok(wcscmp(szPath, pszExplorer) == 0, "IShellLink::GetIconLocation(%d) returned '%S', expected '%S'\n", i, szPath, pszExplorer); + ok(iIcon == 1, "IShellLink::GetIconLocation(%d) returned %d, expected %d\n", i, iIcon, 1); + + /* + * Now we test what happens with IExtractIcon::GetIconLocation. + * We see that it retrieves the icon of the shortcut's underlying file. + */ + iIcon = wFlags = 0xdeadbeef; + wcscpy(szPath, L"garbage"); + hr = pei->GetIconLocation(GIL_DEFAULTICON, szPath, _countof(szPath), &iIcon, &wFlags); + ok(hr == testDef->hrDefIcon, "IExtractIcon::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrDefIcon); + ok(*szPath == L'\0', "IExtractIcon::GetIconLocation(%d) returned '%S'\n", i, szPath); + // ok(iIcon == 0, "IExtractIcon::GetIconLocation(%d) returned %d\n", i, iIcon); + + iIcon = wFlags = 0xdeadbeef; + wcscpy(szPath, L"garbage"); + hr = pei->GetIconLocation(GIL_FORSHORTCUT, szPath, _countof(szPath), &iIcon, &wFlags); + ok(hr == testDef->hrForShrt, "IExtractIcon::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShrt); + // Here, both szPath and iIcon are untouched... + + iIcon = wFlags = 0xdeadbeef; + wcscpy(szPath, L"garbage"); + hr = pei->GetIconLocation(GIL_FORSHELL, szPath, _countof(szPath), &iIcon, &wFlags); + ok(hr == testDef->hrForShell, "IExtractIcon::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShell); + ok(wFlags == testDef->Flags, "IExtractIcon::GetIconLocation(%d) returned wFlags = 0x%x, expected 0x%x\n", i, wFlags, testDef->Flags); + /* + * Actually, even if wFlags specifies GIL_NOTFILENAME, a correct file name is returned + * for executables only (at least...), otherwise we can get an asterix '*'. + */ + ExpandEnvironmentStringsW(testDef->IconPath, szPath2, _countof(szPath2)); + ok(_wcsicmp(szPath2, szPath) == 0, "IExtractIcon::GetIconLocation(%d) returned '%S', expected '%S'\n", i, szPath, szPath2); + + // ok(*szPath == L'\0', "IExtractIcon::GetIconLocation returned '%S'\n", szPath); + // ok(iIcon == 0, "IExtractIcon::GetIconLocation returned %d\n", iIcon); // ok(FALSE, "hr = 0x%lx, szPath = '%S', iIcon = %d, wFlags = %d\n", hr, szPath, iIcon, wFlags); /* Release the interfaces */ @@ -342,6 +404,7 @@ } } + START_TEST(CShellLink) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);

1 0

[hbelusca] 73561: Comply to GCCLin rules.
by hbelusca＠svn.reactos.org 16 Jan '17

16 Jan '17

Author: hbelusca Date: Mon Jan 16 16:35:01 2017 New Revision: 73561 URL: http://svn.reactos.org/svn/reactos?rev=73561&view=rev Log: Comply to GCCLin rules. Modified: trunk/rostests/apitests/shell32/CShellLink.cpp Modified: trunk/rostests/apitests/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellLi… ============================================================================== --- trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] Mon Jan 16 16:35:01 2017 @@ -320,7 +320,7 @@ wcscpy(szPath, L"garbage"); hr = pei->GetIconLocation(GIL_FORSHELL, szPath, _countof(szPath), &iIcon, &wFlags); ok(hr == testDef->hrForShell, "IShellLink::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShell); - ok(wFlags == testDef->Flags, "IShellLink::GetIconLocation(%d) returned wFlags = 0x%lx, expected 0x%lx\n", i, wFlags, testDef->Flags); + ok(wFlags == testDef->Flags, "IShellLink::GetIconLocation(%d) returned wFlags = 0x%x, expected 0x%x\n", i, wFlags, testDef->Flags); // ok(*szPath == L'\0', "IShellLink::GetIconLocation returned '%S'\n", szPath); // ok(iIcon == 0, "IShellLink::GetIconLocation returned %d\n", iIcon); // ok(FALSE, "hr = 0x%lx, szPath = '%S', iIcon = %d, wFlags = %d\n", hr, szPath, iIcon, wFlags);

1 0

[hbelusca] 73560: [SHELL32_APITEST]: Add some tests for GetIconLocation. Show also that CShellLink inherits from IExtractIcon(A/W).
by hbelusca＠svn.reactos.org 16 Jan '17

16 Jan '17

Author: hbelusca Date: Mon Jan 16 16:22:40 2017 New Revision: 73560 URL: http://svn.reactos.org/svn/reactos?rev=73560&view=rev Log: [SHELL32_APITEST]: Add some tests for GetIconLocation. Show also that CShellLink inherits from IExtractIcon(A/W). Modified: trunk/rostests/apitests/shell32/CShellLink.cpp Modified: trunk/rostests/apitests/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellLi… ============================================================================== --- trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] Mon Jan 16 16:22:40 2017 @@ -221,12 +221,134 @@ psl->Release(); } + +/* Test IShellLink::Get/SetIconLocation and IExtractIcon::GetIconLocation */ +typedef struct +{ + PCWSTR FilePath; + + /* Expected results */ + HRESULT hrDefIcon; // Return value for GIL_DEFAULTICON + HRESULT hrForShrt; // Return value for GIL_FORSHORTCUT + /* Return values for GIL_FORSHELL */ + HRESULT hrForShell; + PCWSTR IconPath; + UINT Flags; +} TEST_SHELL_ICON; + +static TEST_SHELL_ICON ShIconTests[] = +{ + /* Executable with icons */ + {L"%SystemRoot%\\system32\\cmd.exe", S_FALSE, E_INVALIDARG, + S_OK, L"%SystemRoot%\\system32\\cmd.exe", GIL_NOTFILENAME | GIL_PERINSTANCE}, + + /* Executable without icon */ + {L"%SystemRoot%\\system32\\autochk.exe", S_FALSE, E_INVALIDARG, + S_OK, L"%SystemRoot%\\system32\\autochk.exe", GIL_NOTFILENAME | GIL_PERINSTANCE}, + + /* Existing file */ + {L"%SystemRoot%\\system32\\shell32.dll", S_FALSE, E_INVALIDARG, + S_OK, L"%SystemRoot%\\system32\\shell32.dll", GIL_NOTFILENAME | GIL_PERCLASS}, + + /* Non-existing file */ + {L"c:\\non-existent-path\\non-existent-file.sdf", S_FALSE, E_INVALIDARG, + S_OK, L"c:\\non-existent-path\\non-existent-file.sdf", GIL_NOTFILENAME | GIL_PERCLASS}, +}; + +static +VOID +test_iconlocation(UINT i, TEST_SHELL_ICON* testDef) +{ + HRESULT hr; + IShellLinkW *psl; + IExtractIconW *pei; + INT iIcon; + UINT wFlags; + WCHAR szPath[MAX_PATH]; + + hr = CoCreateInstance(CLSID_ShellLink, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellLinkW, &psl)); + ok(hr == S_OK, "CoCreateInstance, hr = 0x%lx\n", hr); + if (FAILED(hr)) + { + skip("Could not instantiate CShellLink\n"); + return; + } + + /* Set the path to a file */ + ExpandEnvironmentStringsW(testDef->FilePath, szPath, _countof(szPath)); + hr = psl->SetPath(szPath); + ok(hr == S_OK, "IShellLink::SetPath failed, hr = 0x%lx\n", hr); + + /* + * This test shows that this does not imply that the icon is automatically + * set and be retrieved naively by a call to IShellLink::GetIconLocation. + */ + iIcon = 0xdeadbeef; + wcscpy(szPath, L"garbage"); + hr = psl->GetIconLocation(szPath, _countof(szPath), &iIcon); + ok(hr == S_OK, "IShellLink::GetIconLocation(%d) failed, hr = 0x%lx\n", i, hr); + ok(*szPath == L'\0', "IShellLink::GetIconLocation(%d) returned '%S'\n", i, szPath); + ok(iIcon == 0, "IShellLink::GetIconLocation(%d) returned %d\n", i, iIcon); + + /* Try to grab the IExtractIconW interface */ + 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) + { + win_skip("No IExtractIconW interface\n"); + psl->Release(); + return; + } + + iIcon = wFlags = 0xdeadbeef; + wcscpy(szPath, L"garbage"); + hr = pei->GetIconLocation(GIL_DEFAULTICON, szPath, _countof(szPath), &iIcon, &wFlags); + ok(hr == testDef->hrDefIcon, "IShellLink::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrDefIcon); + ok(*szPath == L'\0', "IShellLink::GetIconLocation(%d) returned '%S'\n", i, szPath); + // ok(iIcon == 0, "IShellLink::GetIconLocation(%d) returned %d\n", i, iIcon); + + iIcon = wFlags = 0xdeadbeef; + wcscpy(szPath, L"garbage"); + hr = pei->GetIconLocation(GIL_FORSHORTCUT, szPath, _countof(szPath), &iIcon, &wFlags); + ok(hr == testDef->hrForShrt, "IShellLink::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShrt); + // Here, both szPath and iIcon are untouched... + + iIcon = wFlags = 0xdeadbeef; + wcscpy(szPath, L"garbage"); + hr = pei->GetIconLocation(GIL_FORSHELL, szPath, _countof(szPath), &iIcon, &wFlags); + ok(hr == testDef->hrForShell, "IShellLink::GetIconLocation(%d) returned hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrForShell); + ok(wFlags == testDef->Flags, "IShellLink::GetIconLocation(%d) returned wFlags = 0x%lx, expected 0x%lx\n", i, wFlags, testDef->Flags); + // ok(*szPath == L'\0', "IShellLink::GetIconLocation returned '%S'\n", szPath); + // ok(iIcon == 0, "IShellLink::GetIconLocation returned %d\n", iIcon); + // ok(FALSE, "hr = 0x%lx, szPath = '%S', iIcon = %d, wFlags = %d\n", hr, szPath, iIcon, wFlags); + + /* Release the interfaces */ + pei->Release(); + psl->Release(); +} + +static +VOID +TestIconLocation(void) +{ + UINT i; + + for (i = 0; i < _countof(ShIconTests); ++i) + { + test_iconlocation(i, &ShIconTests[i]); + } +} + START_TEST(CShellLink) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); TestShellLink(); TestDescription(); + TestIconLocation(); CoUninitialize(); }

1 0

[hbelusca] 73559: [SHELL32_APITEST] - Fix the names of some expected return values get from the APIs; - Move a bit the TestShellLink() function. - When displaying hexadecimal, prepend the "0x" stri...
by hbelusca＠svn.reactos.org 16 Jan '17

16 Jan '17

Author: hbelusca Date: Mon Jan 16 16:17:59 2017 New Revision: 73559 URL: http://svn.reactos.org/svn/reactos?rev=73559&view=rev Log: [SHELL32_APITEST] - Fix the names of some expected return values get from the APIs; - Move a bit the TestShellLink() function. - When displaying hexadecimal, prepend the "0x" string (otherwise, when you see: "hr = 10", is it 10 in decimal or in hex??) - Call CoUninitialize() at the end of the tests. Modified: trunk/rostests/apitests/shell32/CShellLink.cpp Modified: trunk/rostests/apitests/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellLi… ============================================================================== --- trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] Mon Jan 16 16:17:59 2017 @@ -15,25 +15,26 @@ #include <debug.h> #include <shellutils.h> -typedef -struct _TestShellLinkDef -{ - const WCHAR* pathIn; +/* Test IShellLink::SetPath with environment-variables, existing, non-existing, ...*/ +typedef struct +{ + PCWSTR pathIn; HRESULT hrSetPath; + /* Test 1 - hrGetPathX = IShellLink::GetPath(pathOutX, ... , flagsX); */ - const WCHAR* pathOut1; + PCWSTR pathOut1; DWORD flags1; HRESULT hrGetPath1; - bool expandPathOut1; + BOOL expandPathOut1; + /* Test 2 */ - const WCHAR* pathOut2; + PCWSTR pathOut2; DWORD flags2; HRESULT hrGetPath2; - bool expandPathOut2; -} TestShellLinkDef; - -/* Test IShellLink::SetPath with environment-variables, existing, non-existing, ...*/ -static struct _TestShellLinkDef linkTestList[] = + BOOL expandPathOut2; +} TEST_SHELL_LINK_DEF; + +static TEST_SHELL_LINK_DEF linkTestList[] = { { L"%comspec%", S_OK, @@ -42,8 +43,8 @@ }, { L"%anyvar%", E_INVALIDARG, - L"", SLGP_SHORTPATH, ERROR_INVALID_FUNCTION, FALSE, - L"", SLGP_RAWPATH, ERROR_INVALID_FUNCTION, FALSE + L"", SLGP_SHORTPATH, S_FALSE, FALSE, + L"", SLGP_RAWPATH, S_FALSE, FALSE }, { L"%anyvar%%comspec%", S_OK, @@ -82,21 +83,21 @@ }, { L"non-existent-file", E_INVALIDARG, - L"", SLGP_SHORTPATH, ERROR_INVALID_FUNCTION, FALSE, - L"", SLGP_RAWPATH, ERROR_INVALID_FUNCTION, FALSE + L"", SLGP_SHORTPATH, S_FALSE, FALSE, + L"", SLGP_RAWPATH, S_FALSE, FALSE }, }; static VOID -test_checklinkpath(UINT i, TestShellLinkDef* testDef) +test_checklinkpath(UINT i, TEST_SHELL_LINK_DEF* testDef) { static WCHAR evVar[MAX_PATH]; HRESULT hr, expectedHr; WCHAR wPathOut[MAX_PATH]; - bool expandPathOut; - const WCHAR* expectedPathOut; + BOOL expandPathOut; + PCWSTR expectedPathOut; IShellLinkW *psl; UINT i1; DWORD flags; @@ -105,7 +106,7 @@ NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellLinkW, &psl)); - ok(hr == S_OK, "CoCreateInstance, hr = %lx\n", hr); + ok(hr == S_OK, "CoCreateInstance, hr = 0x%lx\n", hr); if (FAILED(hr)) { skip("Could not instantiate CShellLink\n"); @@ -113,19 +114,19 @@ } hr = psl->SetPath(testDef->pathIn); - ok(hr == testDef->hrSetPath, "IShellLink::SetPath(%d), got hr = %lx, expected %lx\n", i, hr, testDef->hrSetPath); + ok(hr == testDef->hrSetPath, "IShellLink::SetPath(%d), got hr = 0x%lx, expected 0x%lx\n", i, hr, testDef->hrSetPath); expectedPathOut = NULL; - for (i1 = 0; i1 <= 1; i1++ ) - { - if (i1 == 1) + for (i1 = 0; i1 <= 1; i1++) + { + if (i1 == 1) /* Usually SLGP_RAWPATH */ { flags = testDef->flags1; expandPathOut = testDef->expandPathOut1; expectedPathOut = testDef->pathOut1; expectedHr = testDef->hrGetPath1; } - else + else /* Usually SLGP_SHORTPATH */ { flags = testDef->flags2; expandPathOut = testDef->expandPathOut2; @@ -134,7 +135,7 @@ } /* Patch some variables */ - if (expandPathOut == TRUE) + if (expandPathOut) { ExpandEnvironmentStringsW(expectedPathOut, evVar, _countof(evVar)); DPRINT("** %S **\n",evVar); @@ -143,14 +144,32 @@ hr = psl->GetPath(wPathOut, _countof(wPathOut), NULL, flags); ok(hr == expectedHr, - "IShellLink::GetPath(%d), flags %lx, got hr = %lx, expected %lx\n", + "IShellLink::GetPath(%d), flags 0x%lx, got hr = 0x%lx, expected 0x%lx\n", i, flags, hr, expectedHr); ok(wcsicmp(wPathOut, expectedPathOut) == 0, - "IShellLink::GetPath(%d), flags %lx, in %S, got %S, expected %S\n", + "IShellLink::GetPath(%d), flags 0x%lx, in %S, got %S, expected %S\n", i, flags, testDef->pathIn, wPathOut, expectedPathOut); } psl->Release(); +} + +static +VOID +TestShellLink(void) +{ + UINT i; + + /* Needed for test */ + SetEnvironmentVariableW(L"shell", L"cmd.exe"); + + for (i = 0; i < _countof(linkTestList); ++i) + { + DPRINT("IShellLink-Test(%d): %S\n", i, linkTestList[i].pathIn); + test_checklinkpath(i, &linkTestList[i]); + } + + SetEnvironmentVariableW(L"shell",NULL); } static @@ -167,7 +186,7 @@ NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellLinkW, &psl)); - ok(hr == S_OK, "CoCreateInstance, hr = %lx\n", hr); + ok(hr == S_OK, "CoCreateInstance, hr = 0x%lx\n", hr); if (FAILED(hr)) { skip("Could not instantiate CShellLink\n"); @@ -176,54 +195,38 @@ memset(buffer, 0x55, sizeof(buffer)); hr = psl->GetDescription(buffer, RTL_NUMBER_OF(buffer)); - ok(hr == S_OK, "IShellLink::GetDescription returned hr = %lx\n", hr); + ok(hr == S_OK, "IShellLink::GetDescription returned hr = 0x%lx\n", hr); ok(buffer[0] == 0, "buffer[0] = %x\n", buffer[0]); ok(buffer[1] == 0x5555, "buffer[1] = %x\n", buffer[1]); hr = psl->SetDescription(testDescription); - ok(hr == S_OK, "IShellLink::SetDescription returned hr = %lx\n", hr); + ok(hr == S_OK, "IShellLink::SetDescription returned hr = 0x%lx\n", hr); memset(buffer, 0x55, sizeof(buffer)); hr = psl->GetDescription(buffer, RTL_NUMBER_OF(buffer)); - ok(hr == S_OK, "IShellLink::GetDescription returned hr = %lx\n", hr); + ok(hr == S_OK, "IShellLink::GetDescription returned hr = 0x%lx\n", hr); ok(buffer[wcslen(testDescription)] == 0, "buffer[n] = %x\n", buffer[wcslen(testDescription)]); ok(buffer[wcslen(testDescription) + 1] == 0x5555, "buffer[n+1] = %x\n", buffer[wcslen(testDescription) + 1]); ok(!wcscmp(buffer, testDescription), "buffer = '%ls'\n", buffer); hr = psl->SetDescription(NULL); - ok(hr == S_OK, "IShellLink::SetDescription returned hr = %lx\n", hr); + ok(hr == S_OK, "IShellLink::SetDescription returned hr = 0x%lx\n", hr); memset(buffer, 0x55, sizeof(buffer)); hr = psl->GetDescription(buffer, RTL_NUMBER_OF(buffer)); - ok(hr == S_OK, "IShellLink::GetDescription returned hr = %lx\n", hr); + ok(hr == S_OK, "IShellLink::GetDescription returned hr = 0x%lx\n", hr); ok(buffer[0] == 0, "buffer[0] = %x\n", buffer[0]); ok(buffer[1] == 0x5555, "buffer[1] = %x\n", buffer[1]); psl->Release(); } -static -VOID -TestShellLink(void) -{ - UINT i; - - /* Needed for test */ - SetEnvironmentVariableW(L"shell", L"cmd.exe"); - - for (i = 0; i < _countof(linkTestList); ++i) - { - DPRINT("IShellLink-Test(%d): %S\n", i, linkTestList[i].pathIn); - test_checklinkpath(i, &linkTestList[i]); - } - - SetEnvironmentVariableW(L"shell",NULL); -} - START_TEST(CShellLink) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); TestShellLink(); TestDescription(); -} + + CoUninitialize(); +}

1 0

[pschweitzer] 73558: [SHELL32] Fix truncated French text in File Properties dialog. Patch by Katayama Hirofumi MZ. CORE-12554
by pschweitzer＠svn.reactos.org 15 Jan '17

15 Jan '17

Author: pschweitzer Date: Sun Jan 15 17:20:17 2017 New Revision: 73558 URL: http://svn.reactos.org/svn/reactos?rev=73558&view=rev Log: [SHELL32] Fix truncated French text in File Properties dialog. Patch by Katayama Hirofumi MZ. CORE-12554 Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sun Jan 15 17:20:17 2017 @@ -284,8 +284,8 @@ LTEXT "Copyright : ", 14004, 10, 46, 66, 10 EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER GROUPBOX "Autres informations de version : ", 14006, 6, 70, 222, 115 - LTEXT "Nom de l'Ã©lÃ©ment : ", 14007, 13, 82, 50, 10 - LTEXT "Valeur : ", 14008, 112, 82, 45, 10 + LTEXT "Nom de l'Ã©lÃ©ment : ", 14007, 13, 82, 94, 10 + LTEXT "Valeur : ", 14008, 112, 82, 94, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END

1 0

[pschweitzer] 73557: [INTL] Fix truncated French text in Languages dialog. Patch by Katayama Hirofumi MZ. CORE-12366
by pschweitzer＠svn.reactos.org 15 Jan '17

15 Jan '17

Author: pschweitzer Date: Sun Jan 15 14:24:11 2017 New Revision: 73557 URL: http://svn.reactos.org/svn/reactos?rev=73557&view=rev Log: [INTL] Fix truncated French text in Languages dialog. Patch by Katayama Hirofumi MZ. CORE-12366 Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] Sun Jan 15 14:24:11 2017 @@ -37,9 +37,9 @@ LTEXT "Pour voir ou changer la langue ou les mÃ©thodes de saisie de texte, pressez ""DÃ©tails...""", -1, 12, 15, 220, 18 PUSHBUTTON "DÃ©&tails...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Support de langues additionnelles", -1, 5, 62, 234, 82 - LTEXT "La plupart des langues sont installÃ©es par dÃ©faut. Pour installer des langues supplÃ©mentaires, sÃ©lectionnez la case Ã cocher appropriÃ©e ci-dessous.", -1, 12, 72, 220, 18 - CHECKBOX "I&nstaller les fichiers pour les scripts complexes et les langues de droite Ã gauche", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP - CHECKBOX "In&staller les fichiers pour les langues de l'Asie de l'Est", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP + LTEXT "La plupart des langues sont installÃ©es par dÃ©faut. Pour installer des langues supplÃ©mentaires, sÃ©lectionnez la case Ã cocher appropriÃ©e ci-dessous.", -1, 12, 72, 220, 28 + CHECKBOX "I&nstaller les fichiers pour les scripts complexes et les langues de droite Ã gauche", IDC_INST_FILES_FOR_RTOL_LANG, 12, 102, 215, 19, BS_MULTILINE | BS_TOP + CHECKBOX "In&staller les fichiers pour les langues de l'Asie de l'Est", IDC_INST_FILES_FOR_ASIAN, 12, 124, 218, 14, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230

1 0

[pschweitzer] 73556: [SHELL32] Fix truncated French text in Open With dialog. Patch by Katayama Hirofumi MZ. CORE-12556
by pschweitzer＠svn.reactos.org 15 Jan '17

15 Jan '17

Author: pschweitzer Date: Sun Jan 15 14:15:55 2017 New Revision: 73556 URL: http://svn.reactos.org/svn/reactos?rev=73556&view=rev Log: [SHELL32] Fix truncated French text in Open With dialog. Patch by Katayama Hirofumi MZ. CORE-12556 Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sun Jan 15 14:15:55 2017 @@ -389,8 +389,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 - LTEXT "Choisissez le programme que vous dÃ©sirez utiliser pour ouvrir ce fichier :", -1, 44, 12, 211, 10 - LTEXT "Fichier : ", 14001, 44, 25, 188, 20 + LTEXT "Choisissez le programme que vous dÃ©sirez utiliser pour ouvrir ce fichier :", -1, 44, 5, 211, 20 + LTEXT "Fichier : ", 14001, 44, 25, 213, 20 GROUPBOX "&Programmes", -1, 7, 42, 249, 187 CONTROL "Programmes", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "Toujours utiliser le progr&amme sÃ©lectionnÃ© pour ouvrir ce type de fichier", 14003, 20, 193, 225, 10

1 0

[cfinck] 73555: [BOOTSECT] Add a simple MBR boot sector that chainloads the El Torito BIOS Boot Sector of the ReactOS ISO. This is our equivalent to syslinux's isohdpfx.S and will be used as input ...
by cfinck＠svn.reactos.org 15 Jan '17

15 Jan '17

Author: cfinck Date: Sun Jan 15 12:31:47 2017 New Revision: 73555 URL: http://svn.reactos.org/svn/reactos?rev=73555&view=rev Log: [BOOTSECT] Add a simple MBR boot sector that chainloads the El Torito BIOS Boot Sector of the ReactOS ISO. This is our equivalent to syslinux's isohdpfx.S and will be used as input for the soon to be imported "isohybrid" patching tool. Largely untested Work In Progress towards CORE-12648 Added: trunk/reactos/boot/freeldr/bootsect/isombr.S (with props) Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Sun Jan 15 12:31:47 2017 @@ -20,6 +20,7 @@ CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) + CreateBootSectorTarget(isombr ${CMAKE_CURRENT_SOURCE_DIR}/isombr.S ${CMAKE_CURRENT_BINARY_DIR}/isombr.bin 7000) add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR bootcd regtest) add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR bootcd regtest) Added: trunk/reactos/boot/freeldr/bootsect/isombr.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isom… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isombr.S (added) +++ trunk/reactos/boot/freeldr/bootsect/isombr.S [iso-8859-1] Sun Jan 15 12:31:47 2017 @@ -0,0 +1,102 @@ +/* + * PROJECT: ReactOS MBR Boot Sector for ISO file system ("isohybrid mode") + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + */ + +#include <asm.inc> + +.code16 + +// The "isohybrid" tool patching our ISO will write the LBA of the El Torito BIOS Boot Sector to this address. +pBootSectorLBA = start+432; + +// Our BIOS Boot Sector contains this signature at the specified position and our third-party imported "isohybrid" patching tool checks for it. +// This is also why it's the same signature ISOLINUX uses. +HybridSignature = HEX(7078C0FB) +pBootSectorHybridSignature = HEX(7C00)+64 +pBootSectorHybridEntryPoint = HEX(7C00)+64+4 + +start: + // The MBR needs to start with 33h, because some dumb BIOSes check for that (cf. syslinux commit d0f275981c9289dc4b8df64e72cd9902bf85aebe). + // The following line encodes a "xor ax, ax" (but it's not the only way to encode it, so we can't just write that instruction here). + .byte HEX(33), HEX(C0) + + // Set up our stack and a flat addressing model. + cli + mov ss, ax + mov sp, offset start + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + sti + + // Our boot sector has been loaded to address 0x7C00. + // Relocate our 512 bytes boot sector to the given base address (should be 0x7000). + cld + mov cx, 512 / 4 + mov si, HEX(7C00) + mov di, offset start + rep movsd + + // Jump to the relocated code. + ljmp16 0, relocated + +relocated: + // Prepare the Disk Access Packet (DAP) for INT 13h, Function 42h: Extended Read Sectors from Drive. + // Read 4 sectors to address 7C00h, which is exactly our 2K-sized BIOS Boot Sector. + push 0 + push 0 + push dword ptr es:[pBootSectorLBA] + push es + push HEX(7C00) + push 4 + push HEX(10) + + // Call the BIOS function. Note that we haven't clobbered DL up to this point, so the Drive Number passed by the BIOS is still there. + // Read errors are indicated by the Carry Flag. + mov ah, HEX(42) + mov si, sp + int HEX(13) + jc read_error + + // Verify the Hybrid Signature. + cmp dword ptr es:[pBootSectorHybridSignature], HybridSignature + jne invalid_signature + + // Signature is valid, so jump to the entry point for the hybrid code. + ljmp16 0, pBootSectorHybridEntryPoint + +read_error: + call die_with_error + .ascii "ISOMBR: Read Error!", CR, LF + +invalid_signature: + call die_with_error + .ascii "ISOMBR: Invalid Boot Sector Hybrid Signature!", CR, LF + +die_with_error: + // Fetch the message to output stored at the return address on the stack. + pop si + + // Call BIOS INT 10h, Function 0Eh to output a single character. + // Do this in a loop and stop after we have printed the newline LF character. +next_character: + lodsb + mov ah, HEX(0E) + xor bx, bx + int HEX(10) + cmp al, 10 + jne next_character + + // Die gracefully, that means in an infinite HLT loop to not put any stress on the CPU. +die: + hlt + jmp die + +// The "isohybrid" tool will add the remaining information, including the infamous 0xAA55 MBR signature. + +.endcode16 + +END Propchange: trunk/reactos/boot/freeldr/bootsect/isombr.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 73554: [NTDLL_APITEST] -Create a copy of the test in testdata and add along three empty files: ntdll_apitest.exe.local, shell32.dll and test.dll. Make the test start the subprocess f...
by gadamopoulos＠svn.reactos.org 15 Jan '17

15 Jan '17

Author: gadamopoulos Date: Sun Jan 15 11:51:06 2017 New Revision: 73554 URL: http://svn.reactos.org/svn/reactos?rev=73554&view=rev Log: [NTDLL_APITEST] -Create a copy of the test in testdata and add along three empty files: ntdll_apitest.exe.local, shell32.dll and test.dll. Make the test start the subprocess from testdata to avoid any kind of interference of the .local to all the other tests. The empty dlls are needed there because there is no way to rename the files while adding them to the cab file like we do with NAME_ON_CD and creating them at runtime is not reliable as caching can cause random failures. Added: trunk/rostests/apitests/ntdll/ntdll_apitest.exe.local trunk/rostests/apitests/ntdll/shell32.dll trunk/rostests/apitests/ntdll/test.dll Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sun Jan 15 11:51:06 2017 @@ -64,3 +64,8 @@ endif() add_rostests_file(TARGET ntdll_apitest) +add_rostests_file(TARGET ntdll_apitest SUBDIR testdata) +# These are empty files +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdll_apitest.exe.local" SUBDIR testdata) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/shell32.dll" SUBDIR testdata) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/test.dll" SUBDIR testdata) Modified: trunk/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosAppl… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c [iso-8859-1] Sun Jan 15 11:51:06 2017 @@ -41,7 +41,6 @@ /* But redirecting gdiplus from a different directory doesn't work */ {__LINE__, STATUS_SXS_KEY_NOT_FOUND, L"c:\\GDIPLUS.DLL", NULL}, {__LINE__, STATUS_SXS_KEY_NOT_FOUND, L"c:\\comctl32.DLL", NULL}, -#if 0 /* Redirection based on .local */ {__LINE__, STATUS_SUCCESS, L"test", EXPECT_IN_SAME_DIR}, {__LINE__, STATUS_SUCCESS, L"test.dll", EXPECT_IN_SAME_DIR}, @@ -50,7 +49,6 @@ {__LINE__, STATUS_SUCCESS, L"shell32", EXPECT_IN_SAME_DIR}, {__LINE__, STATUS_SUCCESS, L"shell32.dll", EXPECT_IN_SAME_DIR}, {__LINE__, STATUS_SUCCESS, L"c:\\shell32.dll", EXPECT_IN_SAME_DIR} -#endif }; void TestRedirection(void) @@ -125,39 +123,33 @@ START_TEST(RtlDosApplyFileIsolationRedirection_Ustr) { -#if 0 - WCHAR TestPath[MAX_PATH]; - WCHAR* separator; - STARTUPINFOW si = { sizeof(si) }; - PROCESS_INFORMATION pi; - BOOL created; - HANDLE file; + int argc; + char **test_argv; + argc = winetest_get_mainargs( &test_argv ); + if (argc >= 3) + { + TestRedirection(); + } + else + { + WCHAR TestPath[MAX_PATH]; + WCHAR* separator; + STARTUPINFOW si = { sizeof(si) }; + PROCESS_INFORMATION pi; + BOOL created; - /* Create .local files */ - GetModuleFileNameW(NULL, TestPath, MAX_PATH); - - wcscat(TestPath, L".local"); - file = CreateFileW(TestPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_NO_BUFFERING , NULL); - CloseHandle(file); - separator = wcsrchr(TestPath, L'\\'); - separator++; - wcscpy(separator, L"test.dll"); - file = CreateFileW(TestPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_NO_BUFFERING , NULL); - CloseHandle(file); - wcscpy(separator, L"shell32.dll"); - file = CreateFileW(TestPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_NO_BUFFERING , NULL); - CloseHandle(file); - *separator = 0; -#endif - TestRedirection(); -#if 0 - /*Cleanup*/ - wcscpy(separator, L"test.dll"); - DeleteFileW(TestPath); - wcscpy(separator, L"shell32.dll"); - DeleteFileW(TestPath); - GetModuleFileNameW(NULL, TestPath, MAX_PATH); - wcscat(TestPath, L".local"); - DeleteFileW(TestPath); -#endif + GetModuleFileNameW(NULL, TestPath, MAX_PATH); + separator = wcsrchr(TestPath, L'\\'); + separator++; + wcscpy(separator, L"testdata\\ntdll_apitest.exe RtlDosApplyFileIsolationRedirection_Ustr DoTest"); + + created = CreateProcessW(NULL, TestPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(created, "Expected CreateProcess to succeed\n"); + if (created) + { + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } + } } Added: trunk/rostests/apitests/ntdll/ntdll_apitest.exe.local URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== (empty) Added: trunk/rostests/apitests/ntdll/shell32.dll URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/shell32.dl… ============================================================================== (empty) Added: trunk/rostests/apitests/ntdll/test.dll URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/test.dll?r… ============================================================================== (empty)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs