merge ROS Shell without integrated explorer part into trunk

[reactos.git] / reactos / subsys / system / explorer / utility / utility.h

diff --git a/reactos/subsys/system/explorer/utility/utility.h b/reactos/subsys/system/explorer/utility/utility.h
index 19ac762..51c7cf1 100644 (file)
--- a/reactos/subsys/system/explorer/utility/utility.h
+++ b/reactos/subsys/system/explorer/utility/utility.h
@@ -59,6 +59,8 @@
 #define _MAX_PATH      260
 #endif
 
+#define        W_VER_NT 0      // constant for HIWORD(GetVersion())>>14
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -152,6 +154,9 @@ BOOL RecursiveCreateDirectory(LPCTSTR path_in);
  // read DWORD value from registry
 DWORD RegGetDWORDValue(HKEY root, LPCTSTR path, LPCTSTR valueName, DWORD def);
 
+ // write DWORD value to registry
+BOOL RegSetDWORDValue(HKEY root, LPCTSTR path, LPCTSTR valueName, DWORD value);
+
  // test for existing directory
 BOOL exists_path(LPCTSTR path);
 
@@ -194,9 +199,9 @@ using namespace _com_util;
 
 
  // launch a program or document file
-extern BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow, LPCTSTR parameters=NULL);
+extern BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow=SW_SHOWNORMAL, LPCTSTR parameters=NULL);
 #ifdef UNICODE
-extern BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow, LPCSTR parameters=NULL);
+extern BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow=SW_SHOWNORMAL, LPCSTR parameters=NULL);
 #else
 #define        launch_fileA launch_file
 #endif
@@ -257,14 +262,16 @@ protected:
 struct HiddenWindow : public WindowHandle
 {
        HiddenWindow(HWND hwnd)
-        :      WindowHandle(hwnd)
+        :      WindowHandle(IsWindowVisible(hwnd)? hwnd: 0)
        {
-               SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_HIDEWINDOW|SWP_NOREDRAW|SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER);
+               if (_hwnd)
+                       SetWindowPos(_hwnd, 0, 0, 0, 0, 0, SWP_HIDEWINDOW|SWP_NOREDRAW|SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER);
        }
 
        ~HiddenWindow()
        {
-               SetWindowPos(_hwnd, 0, 0, 0, 0, 0, SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER);
+               if (_hwnd)
+                       SetWindowPos(_hwnd, 0, 0, 0, 0, 0, SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER);
        }
 };
 
@@ -310,16 +317,22 @@ protected:
 struct Thread
 {
        Thread()
-        :      _alive(false)
+        :      _alive(false),
+               _destroy(false)
        {
                _hThread = INVALID_HANDLE_VALUE;
+               _evtFinish = CreateEvent(NULL, TRUE, FALSE, NULL);
        }
 
        virtual ~Thread()
        {
                Stop();
 
+               CloseHandle(_evtFinish);
                CloseHandle(_hThread);
+
+               if (_destroy)
+                       delete this;
        }
 
        void Start()
@@ -332,6 +345,8 @@ struct Thread
 
        void Stop()
        {
+               SetEvent(_evtFinish);
+
                if (_alive) {
                        {
                        Lock lock(_crit_sect);
@@ -353,7 +368,9 @@ protected:
        static DWORD WINAPI ThreadProc(void* para);
 
        HANDLE  _hThread;
+       HANDLE  _evtFinish;
        bool    _alive;
+       bool    _destroy;
 };
 
 
@@ -741,8 +758,10 @@ struct String
 #endif
 
        String() {}
+
        String(LPCTSTR s) {if (s) super::assign(s);}
        String(LPCTSTR s, int l) : super(s, l) {}
+
        String(const super& other) : super(other) {}
        String(const String& other) : super(other) {}
 
@@ -893,6 +912,10 @@ protected:
 #endif
 
 
+ // determine windows version string
+String get_windows_version_str();
+
+
  /// link dynamicly to functions by using GetModuleHandle() and GetProcAddress()
 template<typename FCT> struct DynamicFct
 {
@@ -1007,7 +1030,7 @@ protected:
 #define        CONTEXT_OBJ __ctx__._obj
 #define        CONTEXT(c) Context __ctx__(c)
 #define        CURRENT_CONTEXT Context::current()
-#define        OBJ_CONTEXT(c, o) Context __ctx__(c, o);
+#define        OBJ_CONTEXT(c, o) Context __ctx__(c, o)
 
 
 extern bool SplitFileSysURL(LPCTSTR url, String& dir_out, String& fname_out);