1 files changed, 24 insertions, 7 deletions

diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp
index 139001a8c47..ffabb6e17ee 100644
--- a/cpp/test/Ice/plugin/Client.cpp
+++ b/cpp/test/Ice/plugin/Client.cpp
@@ -63,7 +63,7 @@ private:
     bool _initialized;
     bool _destroyed;
 };
-typedef IceUtil::Handle<MyPlugin> MyPluginPtr;
+ICE_DEFINE_PTR(MyPluginPtr, MyPlugin);
 
 }
 
@@ -91,7 +91,7 @@ main(int argc, char* argv[])
     try
     {
         communicator = Ice::initialize(argc, argv);
-        MyPluginPtr plugin = MyPluginPtr::dynamicCast(communicator->getPluginManager()->getPlugin("Static1"));
+        MyPluginPtr plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static1"));
         test(plugin && plugin->isInitialized());
         try
         {
@@ -113,9 +113,9 @@ main(int argc, char* argv[])
         initData.properties = Ice::createProperties(argc, argv);
         initData.properties->setProperty("Ice.Plugin.Static2", "1");
         communicator = Ice::initialize(argc, argv, initData);
-        MyPluginPtr plugin = MyPluginPtr::dynamicCast(communicator->getPluginManager()->getPlugin("Static1"));
+        MyPluginPtr plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static1"));
         test(plugin && plugin->isInitialized());
-        plugin = MyPluginPtr::dynamicCast(communicator->getPluginManager()->getPlugin("Static2"));
+        plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static2"));
         test(plugin && plugin->isInitialized());
         communicator->destroy();
     }
@@ -126,10 +126,27 @@ main(int argc, char* argv[])
     }
     cout << "ok" << endl;
 
-#ifdef ICE_OS_WINRT
+#if !defined(_WIN32)
+	string pluginDir = "plugins/";
+#elif defined(ICE_OS_WINRT)
     string pluginDir = "plugins/winrt/";
 #else
-    string pluginDir = "plugins/";
+	string pluginDir = "msbuild/testplugin/";
+#   if defined(_M_X64)
+	pluginDir += "x64/";
+#   else
+	pluginDir += "Win32/";
+#   endif
+
+#   if defined(ICE_CPP11_MAPPING)
+	pluginDir += "Cpp11-";
+#   endif
+
+#   if defined(_DEBUG)
+	pluginDir += "Debug/";
+#   else
+	pluginDir += "Release/";
+#   endif
 #endif
 
     cout << "testing a simple plug-in... " << flush;
@@ -266,7 +283,7 @@ main(int argc, char* argv[])
         test(pm->getPlugin("PluginTwo"));
         test(pm->getPlugin("PluginThree"));
 
-        MyPluginPtr p4 = new MyPlugin;
+        MyPluginPtr p4 = ICE_MAKE_SHARED(MyPlugin);
         pm->addPlugin("PluginFour", p4);
         test(pm->getPlugin("PluginFour"));