diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:41 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:41 +0200 |
| commit | d6301fca6b78db52d0d98f8e0799aba175ad2e59 (patch) | |
| tree | 0380aac034e0d70ee058db07900d80ff20cfc81e /ui/IFileDialog_Vista | |
| parent | 5.7 (diff) | |
| download | FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.gz FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.bz2 FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.zip | |
5.8
Diffstat (limited to 'ui/IFileDialog_Vista')
| -rw-r--r-- | ui/IFileDialog_Vista/dll_main.cpp | 2 | ||||
| -rw-r--r-- | ui/IFileDialog_Vista/ifile_dialog.cpp | 6 | ||||
| -rw-r--r-- | ui/IFileDialog_Vista/ifile_dialog.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ui/IFileDialog_Vista/dll_main.cpp b/ui/IFileDialog_Vista/dll_main.cpp index 95d14910..4665154a 100644 --- a/ui/IFileDialog_Vista/dll_main.cpp +++ b/ui/IFileDialog_Vista/dll_main.cpp @@ -1,7 +1,7 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved * +// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/ui/IFileDialog_Vista/ifile_dialog.cpp b/ui/IFileDialog_Vista/ifile_dialog.cpp index dd2bc7c8..8c3e694c 100644 --- a/ui/IFileDialog_Vista/ifile_dialog.cpp +++ b/ui/IFileDialog_Vista/ifile_dialog.cpp @@ -1,7 +1,7 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved * +// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #include "ifile_dialog.h" @@ -59,7 +59,7 @@ bool showFolderPickerImpl(HWND ownerWindow, //throw ComError; return "false" if const wchar_t* allocString(const std::wstring& msg) //ownership passed { - auto tmp = new wchar_t [msg.size() + 1]; //bad_alloc ? + auto tmp = new wchar_t [msg.size() + 1]; //std::bad_alloc ? ::wmemcpy(tmp, msg.c_str(), msg.size() + 1); //include 0-termination return tmp; } @@ -87,7 +87,7 @@ void ifile::showFolderPicker(void* ownerWindow, } catch (const ComError& e) { - errorMsg = allocString(e.toString()); + errorMsg = allocString(e.toString()); //std::bad_alloc ? } } diff --git a/ui/IFileDialog_Vista/ifile_dialog.h b/ui/IFileDialog_Vista/ifile_dialog.h index 87a67625..d0099dda 100644 --- a/ui/IFileDialog_Vista/ifile_dialog.h +++ b/ui/IFileDialog_Vista/ifile_dialog.h @@ -1,7 +1,7 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved * +// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #ifndef IFILE_DIALOG_HEADER_916743921746324 @@ -58,4 +58,6 @@ const char funName_freeString [] = "freeString"; inline const wchar_t* getDllName() { return zen::is64BitBuild ? L"IFileDialog_Vista_x64.dll" : L"IFileDialog_Vista_Win32.dll"; } } +#undef DLL_FUNCTION_DECLARATION + #endif //IFILE_DIALOG_HEADER_916743921746324 |