rtoss - Diff between revs 181 and 182

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 181 Rev 182
Line 72... Line 72...
72         strHelpFile.ReleaseBuffer(); 72         strHelpFile.ReleaseBuffer();
73 73
74         strVersion = strHelpFile; 74         strVersion = strHelpFile;
75         PathRemoveFileSpec(strHelpFile.GetBuffer(MAX_PATH)); 75         PathRemoveFileSpec(strHelpFile.GetBuffer(MAX_PATH));
76         strHelpFile.ReleaseBuffer(); 76         strHelpFile.ReleaseBuffer();
77         strHelpFile += "\\gen_tbar.chm"; -  
-   77         strHelpFile += _T("\\gen_tbar.chm");
78 78
79         DWORD dwArg; 79         DWORD dwArg;
80         DWORD dwInfoSize = GetFileVersionInfoSize(strVersion.GetBuffer(MAX_PATH), &dwArg); 80         DWORD dwInfoSize = GetFileVersionInfoSize(strVersion.GetBuffer(MAX_PATH), &dwArg);
81         strVersion.ReleaseBuffer(); 81         strVersion.ReleaseBuffer();
82 82
Line 86... Line 86...
86 86
87         UINT uInfoSize; 87         UINT uInfoSize;
88         LPVOID lpValue; 88         LPVOID lpValue;
89 89
90         if (VerQueryValue(lpBuffer, TEXT("\\StringFileInfo\\040904b0\\FileVersion"), &lpValue, &uInfoSize)) 90         if (VerQueryValue(lpBuffer, TEXT("\\StringFileInfo\\040904b0\\FileVersion"), &lpValue, &uInfoSize))
91                 strVersion.Format("Titlebar Info %s", lpValue); -  
-   91                 strVersion.Format(_T("Titlebar Info %s"), lpValue);
92         else 92         else
93                 strVersion = "Titlebar Info x.xx"; -  
-   93                 strVersion = _T("Titlebar Info x.xx");
94 94
95         delete[] lpBuffer; 95         delete[] lpBuffer;
96         lpBuffer = NULL; 96         lpBuffer = NULL;
-   97
-   98 #ifndef _MBCS
-   99         strVersion += " [Unicode]";
-   100 #endif
97 101
98         // Set plugin description 102         // Set plugin description
99         static char c[512]; 103         static char c[512];
100 104
101         CStdString strFilename; 105         CStdString strFilename;
102         GetModuleFileName(hInstance, strFilename.GetBuffer(MAX_PATH), MAX_PATH); 106         GetModuleFileName(hInstance, strFilename.GetBuffer(MAX_PATH), MAX_PATH);
103         strFilename.ReleaseBuffer(); 107         strFilename.ReleaseBuffer();
-   108         std::string strVersionA, strFilenameA;
-   109         ssasn(strVersionA, strVersion.GetBuffer(MAX_PATH));
-   110         ssasn(strFilenameA, PathFindFileName(strFilename.GetBuffer(MAX_PATH)));
104 111
105         wsprintf((c), "%s (%s)", strVersion.GetBuffer(MAX_PATH), PathFindFileName(strFilename.GetBuffer(MAX_PATH))); // "%s" must be a pointer to char! -  
-   112         wsprintfA((c), "%s (%s)", strVersionA.c_str(), strFilenameA.c_str()); // "%s" must be a pointer to char!
106         plugin.description = c; 113         plugin.description = c;
107 114
108         strFilename.ReleaseBuffer(); 115         strFilename.ReleaseBuffer();
109         strVersion.ReleaseBuffer(); 116         strVersion.ReleaseBuffer();
110 117