3.10

1 files changed, 7 insertions, 20 deletions

diff --git a/shared/Taskbar_Seven/taskbar.h b/shared/Taskbar_Seven/taskbar.h
index 3b7abc51..34e122c0 100644
--- a/shared/Taskbar_Seven/taskbar.h
+++ b/shared/Taskbar_Seven/taskbar.h
@@ -14,7 +14,7 @@
 #endif
 
 
-namespace TaskbarSeven
+namespace tbseven
 {
 enum TaskBarStatus
 {
@@ -25,25 +25,16 @@ enum TaskBarStatus
     STATUS_PAUSED
 };
 
-typedef size_t TBHandle;
-
 
 //COM needs to be initialized before calling any of these functions! CoInitializeEx/CoUninitialize
-DLL_FUNCTION_DECLARATION
-TBHandle init(); //returns handle; 0 on failure
-
-DLL_FUNCTION_DECLARATION
-void release(TBHandle handle); //release taskbar handle
 
 DLL_FUNCTION_DECLARATION
-bool setStatus(TBHandle handle,
-               void* hwnd, //HWND: window assciated to the taskbar icon
+bool setStatus(void* hwnd, //HWND: window assciated to the taskbar icon
                TaskBarStatus status);
 
 
 DLL_FUNCTION_DECLARATION
-bool setProgress(TBHandle handle,
-                 void* hwnd, //HWND: window assciated to the taskbar icon
+bool setProgress(void* hwnd, //HWND: window assciated to the taskbar icon
                  size_t current,
                  size_t total);
 
@@ -53,18 +44,14 @@ void getLastError(wchar_t* errorMessage, size_t errorBufferLen);
 
 
 //function typedefs
-typedef TBHandle (*initFct)();
-typedef void (*releaseFct)(TBHandle handle);
-typedef bool (*setStatusFct)(TBHandle handle, void* hwnd, TaskBarStatus status);
-typedef bool (*setProgressFct)(TBHandle handle, void* hwnd, size_t current, size_t total);
-typedef void (*getLastErrorFct)(wchar_t* errorMessage, size_t errorBufferLen);
+typedef bool (*SetStatusFct)(void* hwnd, TaskBarStatus status);
+typedef bool (*SetProgressFct)(void* hwnd, size_t current, size_t total);
+typedef void (*GetLastErrorFct)(wchar_t* errorMessage, size_t errorBufferLen);
 
 //function names (use const pointers to ensure internal linkage)
-const char* const initFctName         = "init";
-const char* const releaseFctName      = "release";
 const char* const setStatusFctName    = "setStatus";
 const char* const setProgressFctName  = "setProgress";
 const char* const getLastErrorFctName = "getLastError";
 }
 
-#endif //TASKBAR_SEVEN_DLL_H
\ No newline at end of file
+#endif //TASKBAR_SEVEN_DLL_H