From fbe76102e941b9f1edaf236788e42678f05fdf9a Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:08:06 +0200
Subject: 3.9

---
 shared/Taskbar_Seven/Taskbar_Seven.vcxproj |  2 +-
 shared/Taskbar_Seven/dll_main.cpp          | 25 +++++++++++++++++++++++++
 shared/Taskbar_Seven/dllmain.cpp           | 27 ---------------------------
 shared/Taskbar_Seven/taskbar.cpp           | 30 +++++-------------------------
 4 files changed, 31 insertions(+), 53 deletions(-)
 create mode 100644 shared/Taskbar_Seven/dll_main.cpp
 delete mode 100644 shared/Taskbar_Seven/dllmain.cpp

(limited to 'shared/Taskbar_Seven')

diff --git a/shared/Taskbar_Seven/Taskbar_Seven.vcxproj b/shared/Taskbar_Seven/Taskbar_Seven.vcxproj
index db8b6feb..5b04a98c 100644
--- a/shared/Taskbar_Seven/Taskbar_Seven.vcxproj
+++ b/shared/Taskbar_Seven/Taskbar_Seven.vcxproj
@@ -208,7 +208,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
+    <ClCompile Include="dll_main.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
diff --git a/shared/Taskbar_Seven/dll_main.cpp b/shared/Taskbar_Seven/dll_main.cpp
new file mode 100644
index 00000000..142e26a2
--- /dev/null
+++ b/shared/Taskbar_Seven/dll_main.cpp
@@ -0,0 +1,25 @@
+// **************************************************************************
+// * 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) 2008-2010 ZenJu (zhnmju123 AT gmx.de)                    *
+// **************************************************************************
+//
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+//optional: add init/teardown logic here
+BOOL APIENTRY DllMain(HINSTANCE hinstDLL,
+                      DWORD     fdwReason,
+                      LPVOID    lpvReserved)
+{
+    switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+    case DLL_PROCESS_DETACH:
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        break;
+    }
+    return TRUE;
+}
diff --git a/shared/Taskbar_Seven/dllmain.cpp b/shared/Taskbar_Seven/dllmain.cpp
deleted file mode 100644
index 18bb453d..00000000
--- a/shared/Taskbar_Seven/dllmain.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// **************************************************************************
-// * 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) 2008-2010 ZenJu (zhnmju123 AT gmx.de)                    *
-// **************************************************************************
-//
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
- 
-
-BOOL APIENTRY DllMain( HMODULE hModule,
-                       DWORD  ul_reason_for_call,
-                       LPVOID lpReserved
-                     )
-{
-    switch (ul_reason_for_call)
-    {
-    case DLL_PROCESS_ATTACH:
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    } 
-    return TRUE;
-}
-
diff --git a/shared/Taskbar_Seven/taskbar.cpp b/shared/Taskbar_Seven/taskbar.cpp
index f5249e08..c9a2e7df 100644
--- a/shared/Taskbar_Seven/taskbar.cpp
+++ b/shared/Taskbar_Seven/taskbar.cpp
@@ -13,7 +13,7 @@
 #include <map>
 #include <string> 
 #include <comdef.h>
-
+#include "../com_error.h"
 
 namespace
 {
@@ -24,27 +24,7 @@ void writeString(const std::wstring& input, wchar_t* output, size_t outputBuffer
     output[newSize-1] = 0; //if output buffer is too small...
 }
 
-
-std::wstring numberToHexString(const long number)
-{
-    wchar_t result[100];
-    swprintf(result, 100, L"0x%08x", number);
-    return std::wstring(result);
-}
-
-
-std::wstring writeErrorMsg(const wchar_t* input, HRESULT hr)
-{
-    std::wstring output(input);
-    output += L" (";
-    output += numberToHexString(hr);
-    output += L": ";
-    output += _com_error(hr).ErrorMessage();
-    output += L")";
-    return output;
-}
-
-
+using Util::generateErrorMsg;
 using TaskbarSeven::TBHandle;
 typedef std::map<TBHandle, ITaskbarList3*> TaskBarHandleMap;
 
@@ -70,7 +50,7 @@ TaskbarSeven::TBHandle TaskbarSeven::init() //call on app initializaiton; return
                                   IID_PPV_ARGS(&pto));
     if (FAILED(hr))
     {
-        lastErrorMessage = writeErrorMsg(L"Error calling \"CoCreateInstance\".", hr);
+        lastErrorMessage = generateErrorMsg(L"Error calling \"CoCreateInstance\".", hr);
         return 0;
     }
 
@@ -123,7 +103,7 @@ bool TaskbarSeven::setStatus(TBHandle handle,
                                            flag); //[in]  TBPFLAG tbpFlags
         if (FAILED(hr))
         {
-            lastErrorMessage = writeErrorMsg(L"Error calling \"SetProgressState\".", hr);
+            lastErrorMessage = generateErrorMsg(L"Error calling \"SetProgressState\".", hr);
             return false;
         }
     }
@@ -146,7 +126,7 @@ bool TaskbarSeven::setProgress(TBHandle handle,
                          total);  //[in]  ULONGLONG ullTotal
         if (FAILED(hr))
         {
-            lastErrorMessage = writeErrorMsg(L"Error calling \"SetProgressValue\".", hr);
+            lastErrorMessage = generateErrorMsg(L"Error calling \"SetProgressValue\".", hr);
             return false;
         }
     }
-- 
cgit