diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-03-13 08:00:41 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-03-13 08:00:41 +0000 |
| commit | 11fcecff7c310c2cc10bda2ab2fa2daf525be571 (patch) | |
| tree | 86fb20fc1ce5e243dd9a973f84b9f1ae6a85c1b4 /plugins/AvatarHistory/src | |
| parent | cb68918922e0d297cc57c4b00fcc42ceaf141965 (diff) | |
- another portion of '#ifdef UNICODE' clean up
git-svn-id: http://svn.miranda-ng.org/main/trunk@3993 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AvatarHistory/src')
| -rw-r--r-- | plugins/AvatarHistory/src/AvatarDlg.cpp | 4 | ||||
| -rw-r--r-- | plugins/AvatarHistory/src/AvatarHistory.cpp | 23 |
2 files changed, 2 insertions, 25 deletions
diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp index c79374a1ec..435b8fea6f 100644 --- a/plugins/AvatarHistory/src/AvatarDlg.cpp +++ b/plugins/AvatarHistory/src/AvatarDlg.cpp @@ -86,11 +86,7 @@ int OpenAvatarDialog(HANDLE hContact, char* fn) }
else
{
-#ifdef _UNICODE
MultiByteToWideChar(CP_ACP, 0, fn, -1, avdlg->fn, MAX_REGS(avdlg->fn));
-#else
- lstrcpyn(avdlg->fn, fn, sizeof(avdlg->fn));
-#endif
}
CloseHandle(CreateThread(NULL, 0, AvatarDialogThread, (LPVOID)avdlg, 0, &dwId));
diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp index 4c33dfa38a..27b6c3b579 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.cpp +++ b/plugins/AvatarHistory/src/AvatarHistory.cpp @@ -315,17 +315,8 @@ void ErrorExit(HANDLE hContact,LPTSTR lpszFunction) LocalFree(lpDisplayBuf);
}
-#ifdef _UNICODE
-
#define CS "%S"
-#else
-
-#define CS "%s"
-
-#endif
-
-
TCHAR * GetExtension(TCHAR *file)
{
if(file == NULL) return _T("");
@@ -734,13 +725,9 @@ BOOL CreateShortcut(TCHAR *file, TCHAR *shortcut) if (SUCCEEDED(hr))
{
-#ifdef _UNICODE
+
hr = ppf->Save(shortcut, TRUE);
-#else
- WCHAR tmp[MAX_PATH];
- MultiByteToWideChar(CP_ACP, 0, shortcut, -1, tmp, MAX_PATH);
- hr = ppf->Save(tmp, TRUE);
-#endif
+
ppf->Release();
}
@@ -768,13 +755,7 @@ BOOL ResolveShortcut(TCHAR *shortcut, TCHAR *file) if (SUCCEEDED(hr))
{
-#ifdef _UNICODE
hr = ppf->Load(shortcut, STGM_READ);
-#else
- WCHAR tmp[MAX_PATH];
- MultiByteToWideChar(CP_ACP, 0, shortcut, -1, tmp, MAX_PATH);
- hr = ppf->Load(tmp, STGM_READ);
-#endif
if (SUCCEEDED(hr))
{
|