[OLEDLG]

* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61430

diff --git a/reactos/dll/win32/oledlg/insobjdlg.c b/reactos/dll/win32/oledlg/insobjdlg.c
index 2fa4ec3..612290a 100644 (file)
--- a/reactos/dll/win32/oledlg/insobjdlg.c
+++ b/reactos/dll/win32/oledlg/insobjdlg.c
@@ -18,25 +18,9 @@
  * 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 "oledlg_private.h"
 
-#include <stdarg.h>
-//#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
 #include <winreg.h>
-//#include "winternl.h"
-//#include "winerror.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-//#include "oledlg.h"
-#include "resource.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(oledlg);
 

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc b/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc
index e098dc2..e352634 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Da.rc b/reactos/dll/win32/oledlg/lang/oledlg_Da.rc
index 52e8d81..e7fbb6b 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Da.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Da.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 UIINSERTOBJECT DIALOG  0, 0, 294, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_De.rc b/reactos/dll/win32/oledlg/lang/oledlg_De.rc
index f7db2b2..b771e75 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_De.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_De.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_En.rc b/reactos/dll/win32/oledlg/lang/oledlg_En.rc
index a806db7..92a7a8c 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_En.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_En.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 UIINSERTOBJECT DIALOG  0, 0, 294, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Es.rc b/reactos/dll/win32/oledlg/lang/oledlg_Es.rc
index 8b3d0ab..f608748 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Es.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Es.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 UIINSERTOBJECT DIALOG  0, 0, 294, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc b/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc
index a0e4052..d113159 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_He.rc b/reactos/dll/win32/oledlg/lang/oledlg_He.rc
index febec8b..38f6c33 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_He.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_He.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 UIINSERTOBJECT DIALOG  0, 0, 294, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc b/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc
index a428637..b40070a 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_It.rc b/reactos/dll/win32/oledlg/lang/oledlg_It.rc
index 187fbc6..f450ea3 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_It.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_It.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc b/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc
index f3c137f..b11eb7b 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc b/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc
index 2c313e4..5e67206 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 UIINSERTOBJECT DIALOG  0, 0, 294, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc b/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc
index 8ef09ef..fe6f2f8 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc b/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc
index b603c58..7078613 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_No.rc b/reactos/dll/win32/oledlg/lang/oledlg_No.rc
index fc3aea6..847cd1d 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_No.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_No.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 UIINSERTOBJECT DIALOG  0, 0, 294, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc b/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc
index 341fcbf..18b251f 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 UIINSERTOBJECT DIALOG  0, 0, 310, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc b/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc
index 3cec3e4..c48f0fb 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc b/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc
index 4b0e2a8..91973d5 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc b/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc
index eff2c57..fd708f5 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Si.rc b/reactos/dll/win32/oledlg/lang/oledlg_Si.rc
index a6ba5d4..3990a01 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Si.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Si.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc b/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc
index 1dc70cb..7767d46 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 UIINSERTOBJECT DIALOG  0, 0, 294, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc b/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc
index 2f1b121..b49063d 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 UIINSERTOBJECT DIALOG  0, 0, 294, 151

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc b/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc
index 045b7c7..29821dc 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc b/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc
index 19234ec..6a32092 100644 (file)
--- a/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc
+++ b/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/oledlg/oledlg_main.c b/reactos/dll/win32/oledlg/oledlg_main.c
index 8864cd0..fc3645f 100644 (file)
--- a/reactos/dll/win32/oledlg/oledlg_main.c
+++ b/reactos/dll/win32/oledlg/oledlg_main.c
@@ -18,22 +18,7 @@
  * 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 <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <oledlg.h>
-//#include "ole2.h"
-//#include "oledlg_private.h"
-
-#include <wine/debug.h>
+#include "oledlg_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oledlg/oledlg_private.h b/reactos/dll/win32/oledlg/oledlg_private.h
index 8be1d6b..d9df7c2 100644 (file)
--- a/reactos/dll/win32/oledlg/oledlg_private.h
+++ b/reactos/dll/win32/oledlg/oledlg_private.h
@@ -21,6 +21,27 @@
 #ifndef __OLEDLG_PRIVATE_H__
 #define __OLEDLG_PRIVATE_H__
 
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <oledlg.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#include "resource.h"
+
 extern HINSTANCE OLEDLG_hInstance DECLSPEC_HIDDEN;
 
 extern UINT cf_embed_source DECLSPEC_HIDDEN;

diff --git a/reactos/dll/win32/oledlg/pastespl.c b/reactos/dll/win32/oledlg/pastespl.c
index 81133b9..2a5765d 100644 (file)
--- a/reactos/dll/win32/oledlg/pastespl.c
+++ b/reactos/dll/win32/oledlg/pastespl.c
@@ -18,29 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <wingdi.h>
-#include <winuser.h>
-//#include "winnls.h"
-//#include "oledlg.h"
-
 #include "oledlg_private.h"
-#include "resource.h"
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/oledlg/resource.h b/reactos/dll/win32/oledlg/resource.h
index 13ca052..bb339bd 100644 (file)
--- a/reactos/dll/win32/oledlg/resource.h
+++ b/reactos/dll/win32/oledlg/resource.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <oledlg.h>
+#pragma once
 
 #define IDS_RESULTOBJDESC               101
 #define IDS_RESULTFILEOBJDESC           102

diff --git a/reactos/dll/win32/oledlg/rsrc.rc b/reactos/dll/win32/oledlg/rsrc.rc
index 165acf3..70a3314 100644 (file)
--- a/reactos/dll/win32/oledlg/rsrc.rc
+++ b/reactos/dll/win32/oledlg/rsrc.rc
@@ -18,17 +18,9 @@
  * 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 <oledlg.h>
 
-#include <windef.h>
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "oledlg.h"
-
-//#include "resource.h"
+#include "resource.h"
 
 /*
  * Everything specific to any language goes