Ros-diffs January 2017

ros-diffs@reactos.org

15 participants
160 discussions

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jan 13 19:35:36 2017 New Revision: 73543 URL: http://svn.reactos.org/svn/reactos?rev=73543&view=rev Log: - Fix leak. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Fri Jan 13 19:35:36 2017 @@ -383,6 +383,7 @@ UserDerefObjectCo(Child); } } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } /* FIXME : Use snap shot mode until window death is fixed while surfing menus! Fix CORE-12085 and CORE-12071. pWnd = pWnd->spwndChild;

7 years, 11 months

[hbelusca] 73542: FTSU GCCLin.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 13 19:09:11 2017 New Revision: 73542 URL: http://svn.reactos.org/svn/reactos?rev=73542&view=rev Log: FTSU GCCLin. 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] Fri Jan 13 19:09:11 2017 @@ -113,7 +113,7 @@ } hr = psl->SetPath(testDef->pathIn); - ok(hr == testDef->hrSetPath, "IShellLink::SetPath(%lu), got hr = %lx, expected %lx\n", i, hr, testDef->hrSetPath); + ok(hr == testDef->hrSetPath, "IShellLink::SetPath(%d), got hr = %lx, expected %lx\n", i, hr, testDef->hrSetPath); expectedPathOut = NULL; for (i1 = 0; i1 <= 1; i1++ ) @@ -143,10 +143,10 @@ hr = psl->GetPath(wPathOut, _countof(wPathOut), NULL, flags); ok(hr == expectedHr, - "IShellLink::GetPath(%lu), flags %lx, got hr = %lx, expected %lx\n", + "IShellLink::GetPath(%d), flags %lx, got hr = %lx, expected %lx\n", i, flags, hr, expectedHr); ok(wcsicmp(wPathOut, expectedPathOut) == 0, - "IShellLink::GetPath(%lu), flags %lx, in %S, got %S, expected %S\n", + "IShellLink::GetPath(%d), flags %lx, in %S, got %S, expected %S\n", i, flags, testDef->pathIn, wPathOut, expectedPathOut); } @@ -211,9 +211,9 @@ /* Needed for test */ SetEnvironmentVariableW(L"shell", L"cmd.exe"); - for (i = 0; i < ARRAYSIZE(linkTestList); ++i) - { - DPRINT("IShellLink-Test(%lu): %S\n", i, linkTestList[i].pathIn); + for (i = 0; i < _countof(linkTestList); ++i) + { + DPRINT("IShellLink-Test(%d): %S\n", i, linkTestList[i].pathIn); test_checklinkpath(i, &linkTestList[i]); }

7 years, 11 months

[hbelusca] 73541: [SHELL32_APITEST]: Improve a bit the output of the CShellLink test.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 13 19:00:33 2017 New Revision: 73541 URL: http://svn.reactos.org/svn/reactos?rev=73541&view=rev Log: [SHELL32_APITEST]: Improve a bit the output of the CShellLink test. 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] Fri Jan 13 19:00:33 2017 @@ -85,18 +85,16 @@ L"", SLGP_SHORTPATH, ERROR_INVALID_FUNCTION, FALSE, L"", SLGP_RAWPATH, ERROR_INVALID_FUNCTION, FALSE }, - { NULL, 0, NULL, 0, 0, NULL, 0, 0 } }; - -static const UINT evVarChLen = 255; -static WCHAR evVar[evVarChLen]; static VOID -test_checklinkpath(TestShellLinkDef* testDef) -{ +test_checklinkpath(UINT i, TestShellLinkDef* testDef) +{ +static WCHAR evVar[MAX_PATH]; + HRESULT hr, expectedHr; - WCHAR wPathOut[255]; + WCHAR wPathOut[MAX_PATH]; bool expandPathOut; const WCHAR* expectedPathOut; IShellLinkW *psl; @@ -115,7 +113,7 @@ } hr = psl->SetPath(testDef->pathIn); - ok(hr == testDef->hrSetPath, "IShellLink::SetPath, got hr = %lx, expected %lx\n", hr, testDef->hrSetPath); + ok(hr == testDef->hrSetPath, "IShellLink::SetPath(%lu), got hr = %lx, expected %lx\n", i, hr, testDef->hrSetPath); expectedPathOut = NULL; for (i1 = 0; i1 <= 1; i1++ ) @@ -138,18 +136,18 @@ /* Patch some variables */ if (expandPathOut == TRUE) { - ExpandEnvironmentStringsW(expectedPathOut,evVar,evVarChLen); + ExpandEnvironmentStringsW(expectedPathOut, evVar, _countof(evVar)); DPRINT("** %S **\n",evVar); expectedPathOut = evVar; } - hr = psl->GetPath(wPathOut,sizeof(wPathOut),NULL,flags); + hr = psl->GetPath(wPathOut, _countof(wPathOut), NULL, flags); ok(hr == expectedHr, - "IShellLink::GetPath, flags %lx, got hr = %lx, expected %lx\n", - flags, hr, expectedHr); - ok(wcsicmp(wPathOut,expectedPathOut) == 0, - "IShellLink::GetPath, flags %lx, in %S, got %S, expected %S\n", - flags,testDef->pathIn,wPathOut,expectedPathOut); + "IShellLink::GetPath(%lu), flags %lx, got hr = %lx, expected %lx\n", + i, flags, hr, expectedHr); + ok(wcsicmp(wPathOut, expectedPathOut) == 0, + "IShellLink::GetPath(%lu), flags %lx, in %S, got %S, expected %S\n", + i, flags, testDef->pathIn, wPathOut, expectedPathOut); } psl->Release(); @@ -200,36 +198,32 @@ ok(hr == S_OK, "IShellLink::GetDescription returned hr = %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) { - TestShellLinkDef *testDef; - UINT i1 = 0; - - /* needed for test */ - SetEnvironmentVariableW(L"shell",L"cmd.exe"); - - testDef = &linkTestList[i1]; - while (testDef->pathIn != NULL) - { - - DPRINT("IShellLink-Test: %S\n", testDef->pathIn); - test_checklinkpath(testDef); - i1++; - testDef = &linkTestList[i1]; + UINT i; + + /* Needed for test */ + SetEnvironmentVariableW(L"shell", L"cmd.exe"); + + for (i = 0; i < ARRAYSIZE(linkTestList); ++i) + { + DPRINT("IShellLink-Test(%lu): %S\n", i, linkTestList[i].pathIn); + test_checklinkpath(i, &linkTestList[i]); } SetEnvironmentVariableW(L"shell",NULL); - +} + +START_TEST(CShellLink) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + TestShellLink(); TestDescription(); } - -START_TEST(CShellLink) -{ - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - - TestShellLink(); -}

7 years, 11 months

[cfinck] 73540: [CMAKE] Call the NAME_ON_CD parameter RENAME (because it's not tied to a CD/ISO) and simplify the implementation.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jan 13 16:39:33 2017 New Revision: 73540 URL: http://svn.reactos.org/svn/reactos?rev=73540&view=rev Log: [CMAKE] Call the NAME_ON_CD parameter RENAME (because it's not tied to a CD/ISO) and simplify the implementation. Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Fri Jan 13 16:39:33 2017 @@ -820,7 +820,7 @@ add_custom_target(rostests_install COMMAND ${CMAKE_COMMAND} -DCOMPONENT=rostests -P ${CMAKE_BINARY_DIR}/cmake_install.cmake) function(add_rostests_file) - cmake_parse_arguments(_ROSTESTS "" "SUBDIR;NAME_ON_CD;TARGET" "FILE" ${ARGN}) + cmake_parse_arguments(_ROSTESTS "" "RENAME;SUBDIR;TARGET" "FILE" ${ARGN}) if(NOT (_ROSTESTS_TARGET OR _ROSTESTS_FILE)) message(FATAL_ERROR "You must provide a target or a file to install!") endif() @@ -829,22 +829,17 @@ get_target_property(_ROSTESTS_FILE ${_ROSTESTS_TARGET} LOCATION_${CMAKE_BUILD_TYPE}) endif() + if(NOT _ROSTESTS_RENAME) + get_filename_component(_ROSTESTS_RENAME ${_ROSTESTS_FILE} NAME) + endif() + if(_ROSTESTS_SUBDIR) set(_ROSTESTS_SUBDIR "/${_ROSTESTS_SUBDIR}") endif() - if(_ROSTESTS_NAME_ON_CD) - add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_NAME_ON_CD} FOR all) - - if(DEFINED ENV{ROSTESTS_INSTALL}) - install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests RENAME${_ROSTESTS_NAME_ON_CD}) - endif() - else() - add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" FOR all) - - if(DEFINED ENV{ROSTESTS_INSTALL}) - install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests) - endif() - endif() - -endfunction() + add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_RENAME} FOR all) + + if(DEFINED ENV{ROSTESTS_INSTALL}) + install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests RENAME ${_ROSTESTS_RENAME}) + endif() +endfunction()

7 years, 11 months

[cfinck] 73539: [LOCALSPL_APITEST] Disable fpGetPrintProcessorDirectory tests that use PSEH. For some reason, they can only be run once and corrupt something inside spoolsv, so that spoolsv needs t...

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jan 13 16:15:13 2017 New Revision: 73539 URL: http://svn.reactos.org/svn/reactos?rev=73539&view=rev Log: [LOCALSPL_APITEST] Disable fpGetPrintProcessorDirectory tests that use PSEH. For some reason, they can only be run once and corrupt something inside spoolsv, so that spoolsv needs to be restarted afterwards. Modified: trunk/rostests/apitests/localspl/dll/fpGetPrintProcessorDirectory.c Modified: trunk/rostests/apitests/localspl/dll/fpGetPrintProcessorDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/dll/fpG… ============================================================================== --- trunk/rostests/apitests/localspl/dll/fpGetPrintProcessorDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/dll/fpGetPrintProcessorDirectory.c [iso-8859-1] Fri Jan 13 16:15:13 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler API Tests Injected DLL * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for fpGetPrintProcessorDirectory - * COPYRIGHT: Copyright 2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2016-2017 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -26,7 +26,7 @@ { DWORD cbNeeded; DWORD cbTemp; - DWORD dwReturned; + //DWORD dwReturned; PGetPrintProcessorDirectoryW pGetPrintProcessorDirectoryW; PRINTPROVIDOR pp; PWSTR pwszBuffer; @@ -48,6 +48,8 @@ ok(!pp.fpGetPrintProcessorDirectory(NULL, L"invalid", 0, NULL, 0, NULL), "fpGetPrintProcessorDirectory returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_ENVIRONMENT, "fpGetPrintProcessorDirectory returns error %lu!\n", GetLastError()); + // This test corrupts something inside spoolsv so that it's only runnable once without restarting spoolsv. Therefore it's disabled. +#if 0 // Now provide a valid environment and prove that it is checked case-insensitively. // In contrast to GetPrintProcessorDirectoryW, the level isn't the next thing checked here, but fpGetPrintProcessorDirectory // already tries to access the non-supplied pcbNeeded variable. @@ -63,6 +65,7 @@ _SEH2_END; ok(dwReturned == EXCEPTION_ACCESS_VIOLATION, "dwReturned is %lu!\n", dwReturned); +#endif // fpGetPrintProcessorDirectory doesn't care about the supplied level at all. Prove this here. // With no buffer given, this needs to fail with ERROR_INSUFFICIENT_BUFFER. @@ -72,6 +75,8 @@ ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "fpGetPrintProcessorDirectory returns error %lu!\n", GetLastError()); ok(cbNeeded > 0, "cbNeeded is %lu!\n", cbNeeded); + // This test corrupts something inside spoolsv so that it's only runnable once without restarting spoolsv. Therefore it's disabled. +#if 0 // Now provide the demanded size, but no buffer. // Unlike GetPrintProcessorDirectoryW, fpGetPrintProcessorDirectory doesn't check for this case and tries to access the buffer. _SEH2_TRY @@ -86,6 +91,7 @@ _SEH2_END; ok(dwReturned == EXCEPTION_ACCESS_VIOLATION, "dwReturned is %lu!\n", dwReturned); +#endif // Prove that this check is implemented in spoolss' GetPrintProcessorDirectoryW instead. // In contrast to winspool's GetPrintProcessorDirectoryW, cbTemp is left untouched though. This comes from the fact that RPC isn't involved here.

7 years, 11 months

[gadamopoulos] 73538: [KERNEL32_APITEST] - Add tests for LoadLibraryExW to test its ability to load a redirected dll. Do not include it in the build until a way is found for it to be compiled prope...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Jan 13 15:33:38 2017 New Revision: 73538 URL: http://svn.reactos.org/svn/reactos?rev=73538&view=rev Log: [KERNEL32_APITEST] - Add tests for LoadLibraryExW to test its ability to load a redirected dll. Do not include it in the build until a way is found for it to be compiled properly. Added: trunk/rostests/apitests/kernel32/LoadLibraryExW.c (with props) trunk/rostests/apitests/kernel32/redirptest/ trunk/rostests/apitests/kernel32/redirptest/CMakeLists.txt (with props) trunk/rostests/apitests/kernel32/redirptest/redirtest.c (with props) trunk/rostests/apitests/kernel32/redirptest/redirtest.spec (with props) trunk/rostests/apitests/kernel32/redirptest/redirtest2.manifest (with props) Added: trunk/rostests/apitests/kernel32/LoadLibraryExW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/LoadLib… ============================================================================== --- trunk/rostests/apitests/kernel32/LoadLibraryExW.c (added) +++ trunk/rostests/apitests/kernel32/LoadLibraryExW.c [iso-8859-1] Fri Jan 13 15:33:38 2017 @@ -0,0 +1,90 @@ +/* + * Copyright 2017 Giannis Adamopoulos + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +HANDLE _CreateActCtxFromFile(LPCWSTR FileName, int line); +VOID _ActivateCtx(HANDLE h, ULONG_PTR *cookie, int line); +VOID _DeactivateCtx(ULONG_PTR cookie, int line); + +typedef DWORD (WINAPI *LPGETVERSION)(); + +VOID _TestVesion(HANDLE dll, DWORD ExpectedVersion, int line) +{ + LPGETVERSION proc = (LPGETVERSION)GetProcAddress(dll, "GetVersion"); + DWORD version = proc(); + ok_(__FILE__, line)(version == ExpectedVersion, "Got version %d, expected %d\n", version, ExpectedVersion); +} + +VOID TestDllRedirection() +{ + HANDLE dll1, dll2, h; + ULONG_PTR cookie; + + /* Try to load the libraries without sxs */ + dll1 = LoadLibraryExW(L"kernel32test_versioned.dll",0 , 0); + ok (dll1 != NULL, "LoadLibraryExW failed\n"); + dll2 = LoadLibraryExW(L"testdata\\kernel32test_versioned.dll",0 , 0); + ok (dll2 != NULL, "LoadLibraryExW failed\n"); + + ok (dll1 != dll2, "\n"); + _TestVesion(dll1, 1, __LINE__); + _TestVesion(dll2, 2, __LINE__); + + FreeLibrary(dll1); + FreeLibrary(dll2); + + dll1 = LoadLibraryExW(L"kernel32test_versioned.dll",0 , 0); + ok (dll1 != NULL, "LoadLibraryExW failed\n"); + + h = _CreateActCtxFromFile(L"testdata\\redirtest2.manifest", __LINE__); + _ActivateCtx(h, &cookie, __LINE__); + dll2 = LoadLibraryExW(L"kernel32test_versioned.dll",0 , 0); + _DeactivateCtx(cookie, __LINE__); + ok (dll2 != NULL, "LoadLibraryExW failed\n"); + + ok (dll1 != dll2, "\n"); + _TestVesion(dll1, 1, __LINE__); + _TestVesion(dll2, 2, __LINE__); + + FreeLibrary(dll1); + FreeLibrary(dll2); + + dll1 = LoadLibraryExW(L"comctl32.dll",0 ,0); + ok (dll1 != NULL, "LoadLibraryExW failed\n"); + + h = _CreateActCtxFromFile(L"comctl32dep.manifest", __LINE__); + _ActivateCtx(h, &cookie, __LINE__); + dll2 = LoadLibraryExW(L"comctl32.dll",0 , 0); + _DeactivateCtx(cookie, __LINE__); + ok (dll2 != NULL, "LoadLibraryExW failed\n"); + + ok (dll1 != dll2, "\n"); + +} + +START_TEST(LoadLibraryExW) +{ + TestDllRedirection(); +} Propchange: trunk/rostests/apitests/kernel32/LoadLibraryExW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/kernel32/redirptest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/redirpt… ============================================================================== --- trunk/rostests/apitests/kernel32/redirptest/CMakeLists.txt (added) +++ trunk/rostests/apitests/kernel32/redirptest/CMakeLists.txt [iso-8859-1] Fri Jan 13 15:33:38 2017 @@ -0,0 +1,25 @@ + +spec2def(redirtest.dll redirtest.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + redirtest.c + ${CMAKE_CURRENT_BINARY_DIR}/redirtest_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/redirtest.def) + +add_definitions(-DTESTVER=1) + +add_library(redirtest1 SHARED ${SOURCE}) +set_module_type(redirtest1 win32dll) +add_importlibs(redirtest1 msvcrt kernel32 ntdll) +add_rostests_file(TARGET redirtest1 NAME_ON_CD kernel32test_versioned.dll) + +remove_definitions(-DTESTVER=1) +add_definitions(-DTESTVER=2) + +add_library(redirtest2 SHARED ${SOURCE}) +set_module_type(redirtest2 win32dll) +add_importlibs(redirtest2 msvcrt kernel32 ntdll) +add_rostests_file(TARGET redirtest2 SUBDIR testdata NAME_ON_CD kernel32test_versioned.dll) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/redirtest2.manifest" SUBDIR testdata) + +remove_definitions(-DTESTVER=2) Propchange: trunk/rostests/apitests/kernel32/redirptest/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/kernel32/redirptest/redirtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/redirpt… ============================================================================== --- trunk/rostests/apitests/kernel32/redirptest/redirtest.c (added) +++ trunk/rostests/apitests/kernel32/redirptest/redirtest.c [iso-8859-1] Fri Jan 13 15:33:38 2017 @@ -0,0 +1,27 @@ + +#include <windef.h> +#include <winbase.h> + +DWORD WINAPI GetVersion() +{ + return TESTVER; +} + +BOOL +WINAPI +DllMain(HINSTANCE hinstDll, + DWORD dwReason, + LPVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDll); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: trunk/rostests/apitests/kernel32/redirptest/redirtest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/kernel32/redirptest/redirtest.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/redirpt… ============================================================================== --- trunk/rostests/apitests/kernel32/redirptest/redirtest.spec (added) +++ trunk/rostests/apitests/kernel32/redirptest/redirtest.spec [iso-8859-1] Fri Jan 13 15:33:38 2017 @@ -0,0 +1 @@ +@ stdcall GetVersion() Propchange: trunk/rostests/apitests/kernel32/redirptest/redirtest.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/kernel32/redirptest/redirtest2.manifest URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/redirpt… ============================================================================== --- trunk/rostests/apitests/kernel32/redirptest/redirtest2.manifest (added) +++ trunk/rostests/apitests/kernel32/redirptest/redirtest2.manifest [iso-8859-1] Fri Jan 13 15:33:38 2017 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="redirtest2" version="0.2.2.2" processorArchitecture="x86" /> + <file name="kernel32test_versioned.dll"/> +</assembly> + Propchange: trunk/rostests/apitests/kernel32/redirptest/redirtest2.manifest ------------------------------------------------------------------------------ svn:eol-style = CRLF

7 years, 11 months

[gadamopoulos] 73537: [CMakeMacros.cmake] - Add NAME_ON_CD parameter to add_rostests_file to make it possible to select a different name for a file.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Jan 13 15:15:55 2017 New Revision: 73537 URL: http://svn.reactos.org/svn/reactos?rev=73537&view=rev Log: [CMakeMacros.cmake] - Add NAME_ON_CD parameter to add_rostests_file to make it possible to select a different name for a file. Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Fri Jan 13 15:15:55 2017 @@ -820,7 +820,7 @@ add_custom_target(rostests_install COMMAND ${CMAKE_COMMAND} -DCOMPONENT=rostests -P ${CMAKE_BINARY_DIR}/cmake_install.cmake) function(add_rostests_file) - cmake_parse_arguments(_ROSTESTS "" "SUBDIR;TARGET" "FILE" ${ARGN}) + cmake_parse_arguments(_ROSTESTS "" "SUBDIR;NAME_ON_CD;TARGET" "FILE" ${ARGN}) if(NOT (_ROSTESTS_TARGET OR _ROSTESTS_FILE)) message(FATAL_ERROR "You must provide a target or a file to install!") endif() @@ -833,9 +833,18 @@ set(_ROSTESTS_SUBDIR "/${_ROSTESTS_SUBDIR}") endif() - add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" FOR all) - - if(DEFINED ENV{ROSTESTS_INSTALL}) - install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests) - endif() -endfunction() + if(_ROSTESTS_NAME_ON_CD) + add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_NAME_ON_CD} FOR all) + + if(DEFINED ENV{ROSTESTS_INSTALL}) + install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests RENAME${_ROSTESTS_NAME_ON_CD}) + endif() + else() + add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" FOR all) + + if(DEFINED ENV{ROSTESTS_INSTALL}) + install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests) + endif() + endif() + +endfunction()

7 years, 11 months

[hbelusca] 73536: [SHLWAPI_APITEST]: Commit few tests for PathUnExpandEnvStrings.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 13 14:51:25 2017 New Revision: 73536 URL: http://svn.reactos.org/svn/reactos?rev=73536&view=rev Log: [SHLWAPI_APITEST]: Commit few tests for PathUnExpandEnvStrings. Added: trunk/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c (with props) Modified: trunk/rostests/apitests/shlwapi/CMakeLists.txt trunk/rostests/apitests/shlwapi/testlist.c Modified: trunk/rostests/apitests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shlwapi/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shlwapi/CMakeLists.txt [iso-8859-1] Fri Jan 13 14:51:25 2017 @@ -1,5 +1,10 @@ -add_executable(shlwapi_apitest PathIsUNC.c testlist.c) +list(APPEND SOURCE + PathIsUNC.c + PathUnExpandEnvStrings.c + testlist.c) + +add_executable(shlwapi_apitest ${SOURCE}) set_module_type(shlwapi_apitest win32cui) -add_importlibs(shlwapi_apitest msvcrt kernel32) +add_importlibs(shlwapi_apitest shlwapi msvcrt kernel32) add_cd_file(TARGET shlwapi_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shlwapi/PathUnEx… ============================================================================== --- trunk/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c (added) +++ trunk/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c [iso-8859-1] Fri Jan 13 14:51:25 2017 @@ -0,0 +1,119 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Tests for PathUnExpandEnvStrings + * PROGRAMMERS: Hermes Belusca-Maito + */ + +#include <apitest.h> +#include <shlwapi.h> +#include <strsafe.h> + +#define DO_TEST(Res, TestStr, ExpStr) \ +do { \ + BOOL ret = PathUnExpandEnvStringsW((TestStr), OutStr, _countof(OutStr)); \ + ok(ret == (Res), "Tested %s, expected returned value %d, got %d\n", \ + wine_dbgstr_w((TestStr)), (Res), ret); \ + if (ret) \ + ok(_wcsicmp(OutStr, (ExpStr)) == 0, "Tested %s, expected %s, got %s\n", \ + wine_dbgstr_w((TestStr)), wine_dbgstr_w((ExpStr)), wine_dbgstr_w(OutStr)); \ +} while (0) + +START_TEST(PathUnExpandEnvStrings) +{ + INT len; + DWORD ret; + WCHAR TestStr[MAX_PATH]; + WCHAR ExpStr[MAX_PATH]; + WCHAR OutStr[MAX_PATH]; + + /* + * We expect here that the following standard environment variables: + * %COMPUTERNAME%, %ProgramFiles%, %SystemRoot% and %SystemDrive% + * are correctly defined. + */ + + /* No unexpansion possible */ + DO_TEST(FALSE, L"ZZ:\\foobar\\directory", L""); + + /* Contrary to what MSDN says, %COMPUTERNAME% does not seeem to be unexpanded... */ + ret = GetEnvironmentVariableW(L"COMPUTERNAME", TestStr, _countof(TestStr)); + ok(ret, "got %lu\n", ret); + DO_TEST(FALSE, TestStr, L"%COMPUTERNAME%"); +#if 0 + StringCchCopyW(TestStr, _countof(TestStr), L"ZZ:\\foobar\\"); + len = wcslen(TestStr); + ret = GetEnvironmentVariableW(L"COMPUTERNAME", TestStr + len, _countof(TestStr) - len); + ok(ret, "got %lu\n", ret); + StringCchCatW(TestStr, _countof(TestStr), L"\\directory"); + DO_TEST(TRUE, TestStr, L"ZZ:\\foobar\\%COMPUTERNAME%\\directory"); +#endif + + /* + * L"%SystemRoot%\\%SystemRoot%" to L"%SystemRoot%\\%SystemRoot%" (no expansion) + * Unexpansion fails. + * This shows that given a path string, if PathUnExpandEnvStrings fails, + * the string could have been already unexpanded... + */ + DO_TEST(FALSE, L"%SystemRoot%\\%SystemRoot%", L"%SystemRoot%\\%SystemRoot%"); + + /* + * L"<real_SystemRoot><real_SystemRoot>" to L"%SystemRoot%<real_SystemRoot>" + * example: L"C:\\WindowsC:\\Windows" + * Unexpansion succeeds only on the first path. + */ + ret = GetEnvironmentVariableW(L"SystemRoot", TestStr, _countof(TestStr)); + ok(ret, "got %lu\n", ret); + len = wcslen(TestStr); + ret = GetEnvironmentVariableW(L"SystemRoot", TestStr + len, _countof(TestStr) - len); + ok(ret, "got %lu\n", ret); + + StringCchCopyW(ExpStr, _countof(ExpStr), L"%SystemRoot%"); + len = wcslen(ExpStr); + ret = GetEnvironmentVariableW(L"SystemRoot", ExpStr + len, _countof(ExpStr) - len); + ok(ret, "got %lu\n", ret); + DO_TEST(TRUE, TestStr, ExpStr); + + /* + * L"%SystemRoot%\\<real_Program_Files>" to L"%SystemRoot%\\%ProgramFiles%" + * Unexpansion fails. + */ + StringCchCopyW(TestStr, _countof(TestStr), L"%SystemRoot%\\"); + len = wcslen(TestStr); + ret = GetEnvironmentVariableW(L"ProgramFiles", TestStr + len, _countof(TestStr) - len); + ok(ret, "got %lu\n", ret); + DO_TEST(FALSE, TestStr, L"%SystemRoot%\\%ProgramFiles%"); + + /* + * L"<real_SystemRoot>\\%ProgramFiles%" to L"%SystemRoot%\\%ProgramFiles%" + * Unexpansion succeeds. + */ + ret = GetEnvironmentVariableW(L"SystemRoot", TestStr, _countof(TestStr)); + ok(ret, "got %lu\n", ret); + StringCchCatW(TestStr, _countof(TestStr), L"\\%ProgramFiles%"); + DO_TEST(TRUE, TestStr, L"%SystemRoot%\\%ProgramFiles%"); + + /* + * L"<real_SystemRoot>\\notepad.exe <real_SystemRoot>\\file.txt" to L"%SystemRoot%\\notepad.exe %SystemRoot%\\file.txt" + * Unexpansion succeeds only on the first path, therefore the obtained string is not the one naively expected. + */ + ret = GetEnvironmentVariableW(L"SystemRoot", TestStr, _countof(TestStr)); + ok(ret, "got %lu\n", ret); + StringCchCatW(TestStr, _countof(TestStr), L"\\notepad.exe "); + len = wcslen(TestStr); + ret = GetEnvironmentVariableW(L"SystemRoot", TestStr + len, _countof(TestStr) - len); + ok(ret, "got %lu\n", ret); + StringCchCatW(TestStr, _countof(TestStr), L"\\file.txt"); + // DO_TEST(TRUE, TestStr, L"%SystemRoot%\\notepad.exe %SystemRoot%\\file.txt"); + + /* + * L"<real_SystemRoot>\\notepad.exe <real_SystemRoot>\\file.txt" to L"%SystemRoot%\\notepad.exe <real_SystemRoot>\\file.txt" + * Unexpansion succeeds only on the first path. + */ + StringCchCopyW(ExpStr, _countof(ExpStr), L"%SystemRoot%\\notepad.exe "); + len = wcslen(ExpStr); + ret = GetEnvironmentVariableW(L"SystemRoot", ExpStr + len, _countof(ExpStr) - len); + ok(ret, "got %lu\n", ret); + StringCchCatW(ExpStr, _countof(ExpStr), L"\\file.txt"); + DO_TEST(TRUE, TestStr, ExpStr); +} Propchange: trunk/rostests/apitests/shlwapi/PathUnExpandEnvStrings.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shlwapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shlwapi/testlist… ============================================================================== --- trunk/rostests/apitests/shlwapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/shlwapi/testlist.c [iso-8859-1] Fri Jan 13 14:51:25 2017 @@ -2,9 +2,11 @@ #include <apitest.h> extern void func_isuncpath(void); +extern void func_PathUnExpandEnvStrings(void); const struct test winetest_testlist[] = { { "PathIsUNC", func_isuncpath }, + { "PathUnExpandEnvStrings", func_PathUnExpandEnvStrings }, { 0, 0 } };

7 years, 11 months

[cfinck] 73535: [KMTESTS] Temporarily disable kmtests for "rostests_install" (and subsequently the WHS-Testbot) as long as kmtest:ExPools crashes the machine and I have to reboot it manually.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jan 13 11:20:52 2017 New Revision: 73535 URL: http://svn.reactos.org/svn/reactos?rev=73535&view=rev Log: [KMTESTS] Temporarily disable kmtests for "rostests_install" (and subsequently the WHS-Testbot) as long as kmtest:ExPools crashes the machine and I have to reboot it manually. Modified: trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Jan 13 11:20:52 2017 @@ -141,7 +141,8 @@ add_target_compile_definitions(kmtest KMT_USER_MODE) #add_pch(kmtest include/kmt_test.h) set_target_properties(kmtest PROPERTIES OUTPUT_NAME "kmtest_") -add_rostests_file(TARGET kmtest) +#add_rostests_file(TARGET kmtest) +add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR all) # # Group targets

7 years, 11 months

[cfinck] 73534: Only generate installation rules for rostests if the ROSTESTS_INSTALL environment variable is defined.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jan 13 09:43:12 2017 New Revision: 73534 URL: http://svn.reactos.org/svn/reactos?rev=73534&view=rev Log: Only generate installation rules for rostests if the ROSTESTS_INSTALL environment variable is defined. Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Fri Jan 13 09:43:12 2017 @@ -834,5 +834,8 @@ endif() add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" FOR all) - install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests) -endfunction() + + if(DEFINED ENV{ROSTESTS_INSTALL}) + install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests) + endif() +endfunction()

7 years, 11 months

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2017