Changeset 55159fd in nscp

Timestamp:

02/16/05 23:30:52 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

50744c5

Parents:

402f042

Message:

removed some debugging code, and added "getBasePath" to allow modules to find the "root"

Files:

• StdAfx.h (modified) (1 diff)
• include/NSCHelper.cpp (modified) (4 diffs)
• include/NSCHelper.h (modified) (2 diffs)
• include/thread.h (modified) (1 diff)

StdAfx.h

@@ -25 +25 @@
 #include <singleton.h>
 #include <charEx.h>
+#include <memory>
 
 #endif // !defined(AFX_STDAFX_H__6B96F953_C431_11D3_BCD2_00A0D21A1A22__INCLUDED_)

include/NSCHelper.cpp

@@ -59 +59 @@
 
 namespace NSCModuleHelper {
+  lpNSAPIGetBasePath fNSAPIGetBasePath = NULL;
   lpNSAPIGetApplicationName fNSAPIGetApplicationName = NULL;
   lpNSAPIGetApplicationVersionStr fNSAPIGetApplicationVersionStr = NULL;
@@ -141 +142 @@
 }
 /**
- * Retrieve the application name (in human readable format) from the core.
- * @return A string representing the application name.
- */
+* Retrieve the application name (in human readable format) from the core.
+* @return A string representing the application name.
+*/
 std::string NSCModuleHelper::getApplicationName() {
   if (!fNSAPIGetApplicationName)
@@ -150 +151 @@
   if (fNSAPIGetApplicationName(buffer, BUFF_LEN) != NSCAPI::success)
     throw "Application name could not be retrieved";
+  std::string ret = buffer;
+  delete [] buffer;
+  return ret;
+}
+/**
+ * Retrieve the directory root of the application from the core.
+ * @return A string representing the base path.
+ */
+std::string NSCModuleHelper::getBasePath() {
+  if (!fNSAPIGetBasePath)
+    return "NSCore has not been initiated...";
+  char *buffer = new char[BUFF_LEN+1];
+  if (fNSAPIGetBasePath(buffer, BUFF_LEN) != NSCAPI::success)
+    throw "Base path could not be retrieved";
   std::string ret = buffer;
   delete [] buffer;
@@ -216 +231 @@
   NSCModuleHelper::fNSAPIStopServer = (NSCModuleHelper::lpNSAPIStopServer)f("NSAPIStopServer");
   NSCModuleHelper::fNSAPIInject = (NSCModuleHelper::lpNSAPIInject)f("NSAPIInject");
+  NSCModuleHelper::fNSAPIGetBasePath = (NSCModuleHelper::lpNSAPIGetBasePath)f("NSAPIGetBasePath");
   return NSCAPI::success;
 }
 /**
- * Wrap the GetModuleName function call
- * @param buf Buffer to store the module name
- * @param bufLen Length of buffer
- * @param str String to store inside the buffer
- * @return buffer copy status
- */
+* Wrap the GetModuleName function call
+* @param buf Buffer to store the module name
+* @param bufLen Length of buffer
+* @param str String to store inside the buffer
+* @return buffer copy status
+*/
 int NSCModuleWrapper::wrapGetModuleName(char* buf, unsigned int bufLen, std::string str) {
   return NSCHelper::wrapReturnString(buf, bufLen, str);

include/NSCHelper.h

@@ -15 +15 @@
 {
   // Types for the Callbacks into the main program
+  typedef int (*lpNSAPIGetBasePath)(char*,unsigned int);
   typedef int (*lpNSAPIGetApplicationName)(char*,unsigned int);
   typedef int (*lpNSAPIGetApplicationVersionStr)(char*,unsigned int);
@@ -32 +33 @@
   std::string InjectCommand(std::string command);
   void StopService(void);
+  std::string getBasePath();
 };
 

include/thread.h

@@ -164 +164 @@
       throw "Could not terminate thread, has not been started yet...";
     pObject_->exitThread();
-    std::cout << "Waiting for socket to close..." << std::endl;
     DWORD dwWaitResult = endMutext.wait(5000L);
     switch (dwWaitResult) {