From 5dc3ad07bd36291eedb46df99548beee6594cb14 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 26 Dec 2013 19:01:25 +0000
Subject: [PATCH] [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
---
 reactos/dll/win32/oledlg/insobjdlg.c       | 18 +-----------------
 reactos/dll/win32/oledlg/lang/oledlg_Cs.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Da.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_De.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_En.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Es.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Fr.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_He.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Hu.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_It.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Ja.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Ko.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Lt.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Nl.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_No.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Pl.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Pt.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Ro.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Ru.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Si.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Sv.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Tr.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Uk.rc |  2 --
 reactos/dll/win32/oledlg/lang/oledlg_Zh.rc |  2 --
 reactos/dll/win32/oledlg/oledlg_main.c     | 17 +----------------
 reactos/dll/win32/oledlg/oledlg_private.h  | 21 +++++++++++++++++++++
 reactos/dll/win32/oledlg/pastespl.c        | 22 ----------------------
 reactos/dll/win32/oledlg/resource.h        |  2 +-
 reactos/dll/win32/oledlg/rsrc.rc           | 12 ++----------
 29 files changed, 26 insertions(+), 112 deletions(-)

diff --git a/reactos/dll/win32/oledlg/insobjdlg.c b/reactos/dll/win32/oledlg/insobjdlg.c
index 2fa4ec3f2ae..612290a1846 100644
--- 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 e098dc2d72b..e3526345478 100644
--- 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 52e8d81f0fa..e7fbb6bdc28 100644
--- 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 f7db2b2d1d0..b771e75de32 100644
--- 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 a806db7dbde..92a7a8c857d 100644
--- 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 8b3d0abb2df..f6087484d4c 100644
--- 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 a0e40524b8f..d1131593c42 100644
--- 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 febec8b3425..38f6c33e172 100644
--- 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 a4286373b10..b40070a6013 100644
--- 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 187fbc6f1fa..f450ea38b95 100644
--- 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 f3c137f2dae..b11eb7b8289 100644
--- 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 2c313e4dde6..5e67206ae4e 100644
--- 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 8ef09ef62d7..fe6f2f8866d 100644
--- 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 b603c58ee5b..707861365ae 100644
--- 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 fc3aea6845c..847cd1dcb63 100644
--- 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 341fcbf937f..18b251fc984 100644
--- 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 3cec3e463bc..c48f0fb618e 100644
--- 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 4b0e2a81c95..91973d537eb 100644
--- 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 eff2c57c2fa..fd708f5046e 100644
--- 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 a6ba5d48827..3990a01d978 100644
--- 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 1dc70cbea11..7767d46d2ce 100644
--- 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 2f1b1219068..b49063d3dd4 100644
--- 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 045b7c71a7f..29821dc09a9 100644
--- 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 19234ec7026..6a320923677 100644
--- 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 8864cd01f93..fc3645ff83f 100644
--- 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 8be1d6b3cb6..d9df7c27336 100644
--- 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 81133b9320e..2a5765d16df 100644
--- 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 13ca052daa8..bb339bd44cd 100644
--- 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 165acf301a3..70a3314befe 100644
--- 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