X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=base%2Fshell%2Fexplorer-new%2Fprecomp.h;h=6fc33724fb76c2e9113cc678ca368bfb47d6ad24;hp=64f3ce706ed3ab3e3985116f3762ce789ea73bb5;hb=f66525ee02257ec70732abc74034a2161e12190b;hpb=6c8e7899a94651ed4d25ef2f83d9c5ce1df23b4d

diff --git a/base/shell/explorer-new/precomp.h b/base/shell/explorer-new/precomp.h
index 64f3ce706ed..6fc33724fb7 100644
--- a/base/shell/explorer-new/precomp.h
+++ b/base/shell/explorer-new/precomp.h
@@ -1,27 +1,33 @@
 #ifndef _EXPLORER_PRECOMP__H_
 #define _EXPLORER_PRECOMP__H_
 #define COBJMACROS
-#include <windows.h>
-#include <commctrl.h>
-#include <oleidl.h>
-#include <ole2.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wingdi.h>
+#include <winnls.h>
+#include <winver.h>
+#include <wincon.h>
+#include <shellapi.h>
 #include <shlobj.h>
 #include <shlobj_undoc.h>
 #include <shlwapi.h>
-#include <servprov.h>
-#include <shlguid.h>
 #include <shlguid_undoc.h>
-#include <ocidl.h>
-#include <objidl.h>
-#include <docobj.h>
+#include <shdeprecated.h>
 #include <tchar.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <uxtheme.h>
 
+#include "tmschema.h"
 #include "resource.h"
 #include "comcsup.h"
-#include "todo.h"
-#include "initguid.h"
+//#include "todo.h"
+//#include "initguid.h"
 #include "undoc.h"
 
 /* dynamic imports due to lack of support in msvc linker libs */
@@ -75,12 +81,12 @@ Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)
 }
 
 #define ASSERT(cond) \
-    if (!(cond)) { \
+    do if (!(cond)) { \
         Win32DbgPrint(__FILE__, __LINE__, "ASSERTION %s FAILED!\n", #cond); \
-    }
+    } while (0)
 
 #define DbgPrint(fmt, ...) \
-    Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__);
+    Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
 
 extern HINSTANCE hExplorerInstance;
 extern HMODULE hUser32;
@@ -126,6 +132,8 @@ CreateDropTarget(IN HWND hwndTarget,
  * explorer.c
  */
 
+#define IDHK_RUN 1 /* Win+R */
+
 LONG
 SetWindowStyle(IN HWND hWnd,
                IN LONG dwStyleMask,
@@ -164,6 +172,8 @@ GetExplorerRegValueSet(IN HKEY hKey,
  * traywnd.c
  */
 
+#define TWM_OPENSTARTMENU (WM_USER + 260)
+
 typedef HMENU (*PCREATECTXMENU)(IN HWND hWndOwner,
                                 IN PVOID *ppcmContext,
                                 IN PVOID Context  OPTIONAL);
@@ -232,12 +242,39 @@ TrayProcessMessages(IN OUT ITrayWindow *Tray);
 VOID
 TrayMessageLoop(IN OUT ITrayWindow *Tray);
 
+/*
+ * settings.c
+ */
+
+/* Structure to hold non-default options*/
+typedef struct _ADVANCED_SETTINGS {
+    BOOL bShowSeconds;
+} ADVANCED_SETTINGS, *PADVANCED_SETTINGS;
+
+extern ADVANCED_SETTINGS AdvancedSettings;
+extern const TCHAR szAdvancedSettingsKey[];
+
+VOID
+LoadAdvancedSettings(VOID);
+
+BOOL
+SaveSettingDword(IN PCTSTR pszKeyName,
+                 IN PCTSTR pszValueName,
+                 IN DWORD dwValue);
+
+/*
+ * startup.c
+ */
+
+int
+ProcessStartupItems(VOID);
+
 /*
  * trayprop.h
  */
 
-HWND
-DisplayTrayProperties(ITrayWindow *Tray);
+VOID
+DisplayTrayProperties(IN HWND hwndOwner);
 
 /*
  * desktop.c
@@ -384,11 +421,20 @@ HWND
 CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow,
                     IN BOOL bHideClock);
 
+VOID
+TrayNotify_NotifyMsg(IN HWND hwnd,
+                     IN WPARAM wParam,
+                     IN LPARAM lParam);
+
+BOOL
+TrayNotify_GetClockRect(IN HWND hwnd,
+                        OUT PRECT rcClock);
+
 /*
  * taskswnd.c
  */
 
-#define TSWM_ENABLEGROUPING (WM_USER + 1)
+#define TSWM_ENABLEGROUPING     (WM_USER + 1)
 #define TSWM_UPDATETASKBARPOS   (WM_USER + 2)
 
 BOOL