Changeset 3bdaf18 in nscp for helpers/installer-dlls/main_dll/installer_helper.hpp

Timestamp:

04/16/11 22:51:04 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

7ec3dd1

Parents:

d66ccee

Message:

Tweaks to building on linux, stil need to fix the utf8 issue and some modules...

File:

• helpers/installer-dlls/main_dll/installer_helper.hpp (modified) (6 diffs)

helpers/installer-dlls/main_dll/installer_helper.hpp

@@ -30 +30 @@
 
   std::wstring getTargetPath(std::wstring path) {
-    TCHAR tmpBuf[MAX_PATH];
+    wchar_t tmpBuf[MAX_PATH];
     DWORD len = 0;
     if (MsiGetTargetPath(hInstall_ ,path.c_str(), tmpBuf, &len) != ERROR_MORE_DATA)
@@ -57 +57 @@
   }
   std::wstring getPropery(std::wstring path) {
-    TCHAR tmpBuf[MAX_PATH];
+    wchar_t tmpBuf[MAX_PATH];
     DWORD len = 0;
     if (MsiGetProperty(hInstall_ ,path.c_str(), tmpBuf, &len) != ERROR_MORE_DATA)
@@ -70 +70 @@
   }
   char_buffer getProperyRAW(std::wstring path) {
-    TCHAR emptyString[MAX_PATH];
+    wchar_t emptyString[MAX_PATH];
     DWORD len = 0;
     UINT er;
@@ -571 +571 @@
       return used_size() > size;
     }
-    operator const TCHAR* () const {
+    operator const wchar_t* () const {
       return buf_.c_str();
     }
@@ -628 +628 @@
     DWORD id = 0;
     std::list<std::wstring> ret;
-    for (int i=0; ::MsiEnumProducts(i, reinterpret_cast<TCHAR*>(&buffer)) == ERROR_SUCCESS; i++) {
+    for (int i=0; ::MsiEnumProducts(i, reinterpret_cast<wchar_t*>(&buffer)) == ERROR_SUCCESS; i++) {
       std::wstring name = getProductName(buffer);
       ret.push_back(buffer);
@@ -638 +638 @@
     MsiGetProductInfo(code.c_str(), INSTALLPROPERTY_INSTALLEDPRODUCTNAME, NULL, &size);
     size++;
-    TCHAR *buffer = new TCHAR[size+4];
+    wchar_t *buffer = new wchar_t[size+4];
     MsiGetProductInfo(code.c_str(), INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buffer, &size);
     std::wstring ret = buffer;