[COMDLG32] Sync with Wine Staging 3.3. CORE-14434

[reactos.git] / dll / win32 / comdlg32 / filedlgbrowser.h

diff --git a/dll/win32/comdlg32/filedlgbrowser.h b/dll/win32/comdlg32/filedlgbrowser.h
index db82840..5cb5435 100644 (file)
--- a/dll/win32/comdlg32/filedlgbrowser.h
+++ b/dll/win32/comdlg32/filedlgbrowser.h
@@ -22,21 +22,16 @@
 #ifndef SHBROWSER_H
 #define SHBROWSER_H
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#ifndef RC_INVOKED
-//#include <stdarg.h>
-//#endif
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-#include "wincon.h"
-#include <shlobj.h>
-//#include "objbase.h"
-//#include "commdlg.h"
+#ifndef RC_INVOKED
+#include <stdarg.h>
+#endif
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "shlobj.h"
+#include "objbase.h"
+#include "commdlg.h"
 
 /***********************************************************************
  * Defines and global variables
@@ -97,6 +92,7 @@ typedef struct
        UINT sharevistring;
     } HookMsg;
 
+    BOOL ole_initialized;
 } FileOpenDlgInfos;
 
 /***********************************************************************
@@ -110,6 +106,7 @@ typedef struct
 #define IDS_INVALID_FILENAME           121
 #define IDS_PATHNOTEXISTING            122
 #define IDS_FILENOTEXISTING            123
+#define IDS_INVALID_FOLDERNAME         124
 
 /* File Dialog Tooltips string IDs */
 
@@ -150,7 +147,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) DECLSPEC_HIDDEN;
 /**************************************************************************
 *   External Prototypes
 */
-extern const char FileOpenDlgInfosStr[] DECLSPEC_HIDDEN;
+extern FileOpenDlgInfos *get_filedlg_infoptr(HWND hwnd) DECLSPEC_HIDDEN;
 
 extern IShellFolder*    GetShellFolderFromPidl(LPITEMIDLIST pidlAbs) DECLSPEC_HIDDEN;
 extern LPITEMIDLIST     GetParentPidl(LPITEMIDLIST pidl) DECLSPEC_HIDDEN;