fixed broken build

Foundation/Foundation_x64_vs120.vcxproj.filters

@@ -1880,10 +1880,12 @@
     <ClInclude Include="include\Poco\UTF32Encoding.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\Poco\PBKDF2Engine.h" />
     <ClInclude Include="include\Poco\UTFString.h">
       <Filter>Text\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\PBKDF2Engine.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">

Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters

@@ -585,6 +585,9 @@
     <ClCompile Include="src\Driver.cpp">
       <Filter>_Driver\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\PBKDF2EngineTest.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
@@ -992,5 +995,8 @@
     <ClInclude Include="src\ArrayTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\PBKDF2EngineTest.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Foundation/testsuite/src/UnicodeConverterTest.h

@@ -48,9 +48,9 @@ private:
 		T wtext, wtext2, wtext3;
 		Poco::UnicodeConverter::convert(text, wtext);
 		if (sizeof(T) == 2)
-			assert(Poco::utfStringLength(wtext.data()) == 8);
+			assert(Poco::UnicodeConverter::UTFStrlen(wtext.data()) == 8);
 		else if (sizeof(T) == 4)
-			assert(Poco::utfStringLength(wtext.data()) == 5);
+			assert(Poco::UnicodeConverter::UTFStrlen(wtext.data()) == 5);
 		Poco::UnicodeConverter::convert((const char*) supp, strlen((const char*) supp), wtext2);
 		Poco::UnicodeConverter::convert((const char*)supp, wtext3);
 		assert(wtext == wtext2);