[COMDLG32]

* Move some inclusions to the main header.
* Extract the resource related definitions into resource.h and include it in both the main header and the resource file.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61343

diff --git a/reactos/dll/win32/comdlg32/cdlg.h b/reactos/dll/win32/comdlg32/cdlg.h
index b7e255b..72aab02 100644 (file)
--- a/reactos/dll/win32/comdlg32/cdlg.h
+++ b/reactos/dll/win32/comdlg32/cdlg.h
@@ -21,7 +21,49 @@
 #ifndef _WINE_DLL_CDLG_H
 #define _WINE_DLL_CDLG_H
 
 #ifndef _WINE_DLL_CDLG_H
 #define _WINE_DLL_CDLG_H
 

+#include <config.h>
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winnls.h>
+#include <wincon.h>
+#include <winternl.h>
+#include <commctrl.h>
+#include <objbase.h>
+#include <commdlg.h>
+#include <shlobj.h>
+#include <shellapi.h>

 #include <dlgs.h>
 #include <dlgs.h>

+#include <cderr.h>
+
+// RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#include <winreg.h>
+
+#define NO_SHLWAPI_STREAM
+#include <shlwapi.h>
+
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
+
+#include "filedlgbrowser.h"
+#include "resource.h"

 
 /* Common dialogs implementation globals */
 #define COMDLG32_Atom  ((ATOM)0xa000)  /* MS uses this one to identify props */
 
 /* Common dialogs implementation globals */
 #define COMDLG32_Atom  ((ATOM)0xa000)  /* MS uses this one to identify props */


@@ -44,150 +86,6 @@ typedef struct {
         } user_fr;
 } COMDLG32_FR_Data;
 
         } user_fr;
 } COMDLG32_FR_Data;
 

-#define PD32_PRINT_TITLE        7000
-
-#define PD32_VALUE_UREADABLE                  1104
-#define PD32_INVALID_PAGE_RANGE               1105
-#define PD32_FROM_NOT_ABOVE_TO                1106
-#define PD32_MARGINS_OVERLAP                  1107
-#define PD32_NR_OF_COPIES_EMPTY               1108
-#define PD32_TOO_LARGE_COPIES                 1109
-#define PD32_PRINT_ERROR                      1110
-#define PD32_NO_DEFAULT_PRINTER               1111
-#define PD32_CANT_FIND_PRINTER                1112
-#define PD32_OUT_OF_MEMORY                    1113
-#define PD32_GENERIC_ERROR                    1114
-#define PD32_DRIVER_UNKNOWN                   1115
-#define PD32_NO_DEVICES                       1121
-
-#define PD32_PRINTER_STATUS_READY             1536
-#define PD32_PRINTER_STATUS_PAUSED            1537
-#define PD32_PRINTER_STATUS_ERROR             1538
-#define PD32_PRINTER_STATUS_PENDING_DELETION  1539
-#define PD32_PRINTER_STATUS_PAPER_JAM         1540
-#define PD32_PRINTER_STATUS_PAPER_OUT         1541
-#define PD32_PRINTER_STATUS_MANUAL_FEED       1542
-#define PD32_PRINTER_STATUS_PAPER_PROBLEM     1543
-#define PD32_PRINTER_STATUS_OFFLINE           1544
-#define PD32_PRINTER_STATUS_IO_ACTIVE         1545
-#define PD32_PRINTER_STATUS_BUSY              1546
-#define PD32_PRINTER_STATUS_PRINTING          1547
-#define PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   1548
-#define PD32_PRINTER_STATUS_NOT_AVAILABLE     1549
-#define PD32_PRINTER_STATUS_WAITING           1550
-#define PD32_PRINTER_STATUS_PROCESSING        1551
-#define PD32_PRINTER_STATUS_INITIALIZING      1552
-#define PD32_PRINTER_STATUS_WARMING_UP        1553
-#define PD32_PRINTER_STATUS_TONER_LOW         1554
-#define PD32_PRINTER_STATUS_NO_TONER          1555
-#define PD32_PRINTER_STATUS_PAGE_PUNT         1556
-#define PD32_PRINTER_STATUS_USER_INTERVENTION 1557
-#define PD32_PRINTER_STATUS_OUT_OF_MEMORY     1558
-#define PD32_PRINTER_STATUS_DOOR_OPEN         1559
-#define PD32_PRINTER_STATUS_SERVER_UNKNOWN    1560
-#define PD32_PRINTER_STATUS_POWER_SAVE        1561
-
-#define PD32_DEFAULT_PRINTER                  1582
-#define PD32_NR_OF_DOCUMENTS_IN_QUEUE         1583
-
-#define PD32_MARGINS_IN_INCHES                1585
-#define PD32_MARGINS_IN_MILLIMETERS           1586
-#define PD32_MILLIMETERS                      1587
-
-/* Charset names string IDs */
-
-#define IDS_CHARSET_ANSI        200
-#define IDS_CHARSET_SYMBOL      201
-#define IDS_CHARSET_JIS         202
-#define IDS_CHARSET_HANGUL      203
-#define IDS_CHARSET_GB2312      204
-#define IDS_CHARSET_BIG5        205
-#define IDS_CHARSET_GREEK       206
-#define IDS_CHARSET_TURKISH     207
-#define IDS_CHARSET_HEBREW      208
-#define IDS_CHARSET_ARABIC      209
-#define IDS_CHARSET_BALTIC      210
-#define IDS_CHARSET_VIETNAMESE  211
-#define IDS_CHARSET_RUSSIAN     212
-#define IDS_CHARSET_EE          213
-#define IDS_CHARSET_THAI        214
-#define IDS_CHARSET_JOHAB       215
-#define IDS_CHARSET_MAC         216
-#define IDS_CHARSET_OEM         217
-#define IDS_CHARSET_VISCII      218
-#define IDS_CHARSET_TCVN        219
-#define IDS_CHARSET_KOI8        220
-#define IDS_CHARSET_ISO3        221
-#define IDS_CHARSET_ISO4        222
-#define IDS_CHARSET_ISO10       223
-#define IDS_CHARSET_CELTIC      224
-
-/* Font styles */
-
-#define IDS_FONT_REGULAR        256
-#define IDS_FONT_BOLD           257
-#define IDS_FONT_ITALIC         258
-#define IDS_FONT_BOLD_ITALIC    259
-
-/* Color names string IDs */
-
-#define IDS_COLOR_BLACK                 1040
-#define IDS_COLOR_MAROON                1041
-#define IDS_COLOR_GREEN                 1042
-#define IDS_COLOR_OLIVE                 1043
-#define IDS_COLOR_NAVY                  1044
-#define IDS_COLOR_PURPLE                1045
-#define IDS_COLOR_TEAL                  1046
-#define IDS_COLOR_GRAY                  1047
-#define IDS_COLOR_SILVER                1048
-#define IDS_COLOR_RED                   1049
-#define IDS_COLOR_LIME                  1050
-#define IDS_COLOR_YELLOW                1051
-#define IDS_COLOR_BLUE                  1052
-#define IDS_COLOR_FUCHSIA               1053
-#define IDS_COLOR_AQUA                  1054
-#define IDS_COLOR_WHITE                 1055
-
-/* Color dialog controls */
-#define IDC_COLOR_LUMBAR 702
-#define IDC_COLOR_EDIT_H 703
-#define IDC_COLOR_EDIT_S 704
-#define IDC_COLOR_EDIT_L 705
-#define IDC_COLOR_EDIT_R 706
-#define IDC_COLOR_EDIT_G 707
-#define IDC_COLOR_EDIT_B 708
-#define IDC_COLOR_RESULT 709
-#define IDC_COLOR_GRAPH  710
-#define IDC_COLOR_ADD    712
-#define IDC_COLOR_RES    713
-#define IDC_COLOR_DEFINE 719
-#define IDC_COLOR_PREDEF 720
-#define IDC_COLOR_USRDEF 721
-#define IDC_COLOR_HL     723
-#define IDC_COLOR_SL     724
-#define IDC_COLOR_LL     725
-#define IDC_COLOR_RL     726
-#define IDC_COLOR_GL     727
-#define IDC_COLOR_BL     728
-
-#define IDS_FONT_SIZE    1200
-#define IDS_SAVE_BUTTON  1201
-#define IDS_SAVE_IN      1202
-#define IDS_SAVE         1203
-#define IDS_SAVE_AS      1204
-#define IDS_OPEN_FILE    1205
-
-#define IDS_FAKEDOCTEXT  1300
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "commctrl.h"
-#include "shlobj.h"
-#include "shellapi.h"
-

 /* Constructors */
 HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN;
 HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN;
 /* Constructors */
 HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN;
 HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN;

diff --git a/reactos/dll/win32/comdlg32/cdlg32.c b/reactos/dll/win32/comdlg32/cdlg32.c
index 118a3e3..e0aca77 100644 (file)
--- a/reactos/dll/win32/comdlg32/cdlg32.c
+++ b/reactos/dll/win32/comdlg32/cdlg32.c
@@ -19,28 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include "winbase.h"
-#include <winuser.h>
-#include <wingdi.h>
-#include <objbase.h>
-#include "rpcproxy.h"
-#include <commdlg.h>
-#include <cderr.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-

 #include "cdlg.h"
 
 #include "cdlg.h"
 

-

 DECLSPEC_HIDDEN HINSTANCE      COMDLG32_hInstance = 0;
 
 static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES;
 DECLSPEC_HIDDEN HINSTANCE      COMDLG32_hInstance = 0;
 
 static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES;

diff --git a/reactos/dll/win32/comdlg32/cdlg_xx.rc b/reactos/dll/win32/comdlg32/cdlg_xx.rc
index d2f1aae..50a45fa 100644 (file)
--- a/reactos/dll/win32/comdlg32/cdlg_xx.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_xx.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #define WINE_FILEDESCRIPTION_STR "Common Dialog Boxes"
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #define WINE_FILEDESCRIPTION_STR "Common Dialog Boxes"


@@ -28,7 +26,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define WINE_FILEVERSION 4,0,0,950 /* Maybe 4.1.0.980 for win98?? */
 #define WINE_FILEVERSION_STR "4.0"
 
 #define WINE_FILEVERSION 4,0,0,950 /* Maybe 4.1.0.980 for win98?? */
 #define WINE_FILEVERSION_STR "4.0"
 

-#include "wine/wine_common_ver.rc"
+#include <wine/wine_common_ver.rc>

 
 /* Translators do not need to translate this text, unless the language uses a
  * different character set or if the distribution of characters looks wrong.
 
 /* Translators do not need to translate this text, unless the language uses a
  * different character set or if the distribution of characters looks wrong.

diff --git a/reactos/dll/win32/comdlg32/colordlg.c b/reactos/dll/win32/comdlg32/colordlg.c
index 2acabc7..ff9067d 100644 (file)
--- a/reactos/dll/win32/comdlg32/colordlg.c
+++ b/reactos/dll/win32/comdlg32/colordlg.c
@@ -23,25 +23,8 @@
    sometimes, especially when 2 instances of the
    dialog are loaded at the same time */
 
    sometimes, especially when 2 instances of the
    dialog are loaded at the same time */
 

-#define WIN32_NO_STATUS
-
-//#include <ctype.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
-#include <dlgs.h>
-#include <wine/debug.h>
-#include <cderr.h>

 #include "cdlg.h"
 
 #include "cdlg.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-

 static INT_PTR CALLBACK ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam );
 
 #define CONV_LPARAMTOPOINT(lp,p) do { (p)->x = (short)LOWORD(lp); (p)->y = (short)HIWORD(lp); } while(0)
 static INT_PTR CALLBACK ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam );
 
 #define CONV_LPARAMTOPOINT(lp,p) do { (p)->x = (short)LOWORD(lp); (p)->y = (short)HIWORD(lp); } while(0)

diff --git a/reactos/dll/win32/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c
index 01a3537..e61e1fc 100644 (file)
--- a/reactos/dll/win32/comdlg32/filedlg.c
+++ b/reactos/dll/win32/comdlg32/filedlg.c
@@ -45,45 +45,7 @@
  *
  */
 
  *
  */
 

-// RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
-
-#define WIN32_NO_STATUS
-
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <ctype.h>
-//#include <stdlib.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <winternl.h>
-//#include "winnls.h"
-#include <winreg.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
-#include <dlgs.h>

 #include "cdlg.h"
 #include "cdlg.h"

-#include <cderr.h>
-//#include "shellapi.h"
-//#include "shlobj.h"
-#include "filedlgbrowser.h"
-#include <shlwapi.h>
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

 
 #define UNIMPLEMENTED_FLAGS \
 (OFN_DONTADDTORECENT |\
 
 #define UNIMPLEMENTED_FLAGS \
 (OFN_DONTADDTORECENT |\

diff --git a/reactos/dll/win32/comdlg32/filedlg31.c b/reactos/dll/win32/comdlg32/filedlg31.c
index 6795bca..fca7c59 100644 (file)
--- a/reactos/dll/win32/comdlg32/filedlg31.c
+++ b/reactos/dll/win32/comdlg32/filedlg31.c
@@ -18,25 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-//#include <ctype.h>
-//#include <stdlib.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-#include <windef.h>
-//#include "winbase.h"
-//#include "winnls.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
-#include <winreg.h>
-#include <winternl.h>
-#include <commdlg.h>
-#include <shlwapi.h>
-//#include "cderr.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

 
 #include "cdlg.h"
 
 
 #include "cdlg.h"
 

diff --git a/reactos/dll/win32/comdlg32/filedlgbrowser.c b/reactos/dll/win32/comdlg32/filedlgbrowser.c
index 5aa7e0c..61416e4 100644 (file)
--- a/reactos/dll/win32/comdlg32/filedlgbrowser.c
+++ b/reactos/dll/win32/comdlg32/filedlgbrowser.c
@@ -19,35 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <commdlg.h>
-
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
-#include <filedlgbrowser.h>

 #include "cdlg.h"
 #include "cdlg.h"

-//#include "shlguid.h"
-//#include "servprov.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

 
 typedef struct
 {
 
 typedef struct
 {

diff --git a/reactos/dll/win32/comdlg32/filedlgbrowser.h b/reactos/dll/win32/comdlg32/filedlgbrowser.h
index db82840..04d961d 100644 (file)
--- a/reactos/dll/win32/comdlg32/filedlgbrowser.h
+++ b/reactos/dll/win32/comdlg32/filedlgbrowser.h
@@ -22,22 +22,6 @@
 #ifndef SHBROWSER_H
 #define SHBROWSER_H
 
 #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"
-

 /***********************************************************************
  * Defines and global variables
  */
 /***********************************************************************
  * Defines and global variables
  */

diff --git a/reactos/dll/win32/comdlg32/finddlg.c b/reactos/dll/win32/comdlg32/finddlg.c
index 18cf318..a6d2ea9 100644 (file)
--- a/reactos/dll/win32/comdlg32/finddlg.c
+++ b/reactos/dll/win32/comdlg32/finddlg.c
@@ -19,25 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-//#include <string.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-#include <winuser.h>
-#include <wingdi.h>
-#include <commdlg.h>
-#include <cderr.h>
-#include <dlgs.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-

 #include "cdlg.h"
 
 #include "cdlg.h"
 

-

 /*-----------------------------------------------------------------------*/
 
 static UINT            FindReplaceMessage;
 /*-----------------------------------------------------------------------*/
 
 static UINT            FindReplaceMessage;

diff --git a/reactos/dll/win32/comdlg32/fontdlg.c b/reactos/dll/win32/comdlg32/fontdlg.c
index 6fc78d9..7f12c23 100644 (file)
--- a/reactos/dll/win32/comdlg32/fontdlg.c
+++ b/reactos/dll/win32/comdlg32/fontdlg.c
@@ -19,26 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-
-//#include <ctype.h>
-//#include <stdlib.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-#include <windef.h>
-#include "winbase.h"
-//#include "winnls.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
-#include <dlgs.h>
-#include <wine/debug.h>
-#include <cderr.h>

 #include "cdlg.h"
 
 #include "cdlg.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-

 typedef struct
 {
   HWND hWnd1;
 typedef struct
 {
   HWND hWnd1;

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc
index 66010ce..82a29b3 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc
index 945c514..abf683e 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc
index 7e1fd0b..ab62ae4 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc
index a813057..bd16523 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_De.rc b/reactos/dll/win32/comdlg32/lang/cdlg_De.rc
index 03242bd..c92c5cc 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_De.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_De.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_El.rc b/reactos/dll/win32/comdlg32/lang/cdlg_El.rc
index 5136c1b..3098168 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_El.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_El.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_En.rc b/reactos/dll/win32/comdlg32/lang/cdlg_En.rc
index 2d5e8a0..16a8de4 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_En.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_En.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc
index 936759d..344b6ee 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc
index d36f65e..b8ccc20 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc
index 17a67c5..ae605a2 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc
index 29242b4..6654887 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_He.rc b/reactos/dll/win32/comdlg32/lang/cdlg_He.rc
index a0f9f50..bbd11e1 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_He.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_He.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc
index b1401c4..6e563d5 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_It.rc b/reactos/dll/win32/comdlg32/lang/cdlg_It.rc
index eb52c16..ce6b144 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_It.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_It.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc
index 8d4be1b..8983aeb 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc
index 5a0381b..02887e8 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc
index 3942c06..5619eb8 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc
index 9348bc6..00aefbb 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_No.rc b/reactos/dll/win32/comdlg32/lang/cdlg_No.rc
index 4c49b01..b9b2944 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_No.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_No.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc
index 074dff6..69b0417 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc
index 1013582..d49b500 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc
index 4cc52bc..cdf1256 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc
index 9feef5d..be030b5 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc
index 662627b..8e3697b 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc
index c8633f3..73fb734 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc
index 9de7de7..3cfee02 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc
index 237c6ff..8ed0ecc 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc
index b4bc565..923aebd 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc
index a8a6dd9..e65a300 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc
@@ -21,9 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc
index 7911ef8..42edb34 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 STRINGTABLE
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc
index c3e9433..551974e 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc
index 41151a4..a951159 100644 (file)
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "cdlg.h"
-#include "filedlgbrowser.h"
-

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 STRINGTABLE
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 STRINGTABLE

diff --git a/reactos/dll/win32/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c
index c4be31f..8ef077a 100644 (file)
--- a/reactos/dll/win32/comdlg32/printdlg.c
+++ b/reactos/dll/win32/comdlg32/printdlg.c
@@ -21,35 +21,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#define WIN32_NO_STATUS

 
 

-//#include <ctype.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
+#include "cdlg.h"

 #include <assert.h>
 #include <assert.h>

-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>

 #include <winspool.h>
 #include <winspool.h>

-//#include "winerror.h"
-#include <objbase.h>
-#include <commdlg.h>
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-//#include "dlgs.h"
-#include <cderr.h>
-#include "cdlg.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

 
 /* Yes these constants are the same, but we're just copying win98 */
 #define UPDOWN_ID 0x270f
 
 /* Yes these constants are the same, but we're just copying win98 */
 #define UPDOWN_ID 0x270f

diff --git a/reactos/dll/win32/comdlg32/resource.h b/reactos/dll/win32/comdlg32/resource.h
new file mode 100644 (file)
index 0000000..4d13e43
--- /dev/null
+++ b/reactos/dll/win32/comdlg32/resource.h
@@ -0,0 +1,136 @@
+#pragma once
+
+#define PD32_PRINT_TITLE        7000
+
+#define PD32_VALUE_UREADABLE                  1104
+#define PD32_INVALID_PAGE_RANGE               1105
+#define PD32_FROM_NOT_ABOVE_TO                1106
+#define PD32_MARGINS_OVERLAP                  1107
+#define PD32_NR_OF_COPIES_EMPTY               1108
+#define PD32_TOO_LARGE_COPIES                 1109
+#define PD32_PRINT_ERROR                      1110
+#define PD32_NO_DEFAULT_PRINTER               1111
+#define PD32_CANT_FIND_PRINTER                1112
+#define PD32_OUT_OF_MEMORY                    1113
+#define PD32_GENERIC_ERROR                    1114
+#define PD32_DRIVER_UNKNOWN                   1115
+#define PD32_NO_DEVICES                       1121
+
+#define PD32_PRINTER_STATUS_READY             1536
+#define PD32_PRINTER_STATUS_PAUSED            1537
+#define PD32_PRINTER_STATUS_ERROR             1538
+#define PD32_PRINTER_STATUS_PENDING_DELETION  1539
+#define PD32_PRINTER_STATUS_PAPER_JAM         1540
+#define PD32_PRINTER_STATUS_PAPER_OUT         1541
+#define PD32_PRINTER_STATUS_MANUAL_FEED       1542
+#define PD32_PRINTER_STATUS_PAPER_PROBLEM     1543
+#define PD32_PRINTER_STATUS_OFFLINE           1544
+#define PD32_PRINTER_STATUS_IO_ACTIVE         1545
+#define PD32_PRINTER_STATUS_BUSY              1546
+#define PD32_PRINTER_STATUS_PRINTING          1547
+#define PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   1548
+#define PD32_PRINTER_STATUS_NOT_AVAILABLE     1549
+#define PD32_PRINTER_STATUS_WAITING           1550
+#define PD32_PRINTER_STATUS_PROCESSING        1551
+#define PD32_PRINTER_STATUS_INITIALIZING      1552
+#define PD32_PRINTER_STATUS_WARMING_UP        1553
+#define PD32_PRINTER_STATUS_TONER_LOW         1554
+#define PD32_PRINTER_STATUS_NO_TONER          1555
+#define PD32_PRINTER_STATUS_PAGE_PUNT         1556
+#define PD32_PRINTER_STATUS_USER_INTERVENTION 1557
+#define PD32_PRINTER_STATUS_OUT_OF_MEMORY     1558
+#define PD32_PRINTER_STATUS_DOOR_OPEN         1559
+#define PD32_PRINTER_STATUS_SERVER_UNKNOWN    1560
+#define PD32_PRINTER_STATUS_POWER_SAVE        1561
+
+#define PD32_DEFAULT_PRINTER                  1582
+#define PD32_NR_OF_DOCUMENTS_IN_QUEUE         1583
+
+#define PD32_MARGINS_IN_INCHES                1585
+#define PD32_MARGINS_IN_MILLIMETERS           1586
+#define PD32_MILLIMETERS                      1587
+
+/* Charset names string IDs */
+
+#define IDS_CHARSET_ANSI        200
+#define IDS_CHARSET_SYMBOL      201
+#define IDS_CHARSET_JIS         202
+#define IDS_CHARSET_HANGUL      203
+#define IDS_CHARSET_GB2312      204
+#define IDS_CHARSET_BIG5        205
+#define IDS_CHARSET_GREEK       206
+#define IDS_CHARSET_TURKISH     207
+#define IDS_CHARSET_HEBREW      208
+#define IDS_CHARSET_ARABIC      209
+#define IDS_CHARSET_BALTIC      210
+#define IDS_CHARSET_VIETNAMESE  211
+#define IDS_CHARSET_RUSSIAN     212
+#define IDS_CHARSET_EE          213
+#define IDS_CHARSET_THAI        214
+#define IDS_CHARSET_JOHAB       215
+#define IDS_CHARSET_MAC         216
+#define IDS_CHARSET_OEM         217
+#define IDS_CHARSET_VISCII      218
+#define IDS_CHARSET_TCVN        219
+#define IDS_CHARSET_KOI8        220
+#define IDS_CHARSET_ISO3        221
+#define IDS_CHARSET_ISO4        222
+#define IDS_CHARSET_ISO10       223
+#define IDS_CHARSET_CELTIC      224
+
+/* Font styles */
+
+#define IDS_FONT_REGULAR        256
+#define IDS_FONT_BOLD           257
+#define IDS_FONT_ITALIC         258
+#define IDS_FONT_BOLD_ITALIC    259
+
+/* Color names string IDs */
+
+#define IDS_COLOR_BLACK                 1040
+#define IDS_COLOR_MAROON                1041
+#define IDS_COLOR_GREEN                 1042
+#define IDS_COLOR_OLIVE                 1043
+#define IDS_COLOR_NAVY                  1044
+#define IDS_COLOR_PURPLE                1045
+#define IDS_COLOR_TEAL                  1046
+#define IDS_COLOR_GRAY                  1047
+#define IDS_COLOR_SILVER                1048
+#define IDS_COLOR_RED                   1049
+#define IDS_COLOR_LIME                  1050
+#define IDS_COLOR_YELLOW                1051
+#define IDS_COLOR_BLUE                  1052
+#define IDS_COLOR_FUCHSIA               1053
+#define IDS_COLOR_AQUA                  1054
+#define IDS_COLOR_WHITE                 1055
+
+/* Color dialog controls */
+#define IDC_COLOR_LUMBAR 702
+#define IDC_COLOR_EDIT_H 703
+#define IDC_COLOR_EDIT_S 704
+#define IDC_COLOR_EDIT_L 705
+#define IDC_COLOR_EDIT_R 706
+#define IDC_COLOR_EDIT_G 707
+#define IDC_COLOR_EDIT_B 708
+#define IDC_COLOR_RESULT 709
+#define IDC_COLOR_GRAPH  710
+#define IDC_COLOR_ADD    712
+#define IDC_COLOR_RES    713
+#define IDC_COLOR_DEFINE 719
+#define IDC_COLOR_PREDEF 720
+#define IDC_COLOR_USRDEF 721
+#define IDC_COLOR_HL     723
+#define IDC_COLOR_SL     724
+#define IDC_COLOR_LL     725
+#define IDC_COLOR_RL     726
+#define IDC_COLOR_GL     727
+#define IDC_COLOR_BL     728
+
+#define IDS_FONT_SIZE    1200
+#define IDS_SAVE_BUTTON  1201
+#define IDS_SAVE_IN      1202
+#define IDS_SAVE         1203
+#define IDS_SAVE_AS      1204
+#define IDS_OPEN_FILE    1205
+
+#define IDS_FAKEDOCTEXT  1300

diff --git a/reactos/dll/win32/comdlg32/rsrc.rc b/reactos/dll/win32/comdlg32/rsrc.rc
index 55b41dc..47cc1fd 100644 (file)
--- a/reactos/dll/win32/comdlg32/rsrc.rc
+++ b/reactos/dll/win32/comdlg32/rsrc.rc
@@ -18,13 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "cdlg.h"
-//#include "winspool.h"
-//#include "filedlgbrowser.h"
+#include <windef.h>
+#include <winuser.h>
+#include <dlgs.h>
+
+#include "filedlgbrowser.h"
+#include "resource.h"

 
 /*
  * Everything that does not depend on language,
 
 /*
  * Everything that does not depend on language,