[ros-diffs] [akhaldi] 61430: [OLEDLG] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716

Author: akhaldi
Date: Thu Dec 26 19:01:25 2013
New Revision: 61430

URL: http://svn.reactos.org/svn/reactos?rev=61430&view=rev
Log:
[OLEDLG]
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

Modified:
    trunk/reactos/dll/win32/oledlg/insobjdlg.c
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc
    trunk/reactos/dll/win32/oledlg/oledlg_main.c
    trunk/reactos/dll/win32/oledlg/oledlg_private.h
    trunk/reactos/dll/win32/oledlg/pastespl.c
    trunk/reactos/dll/win32/oledlg/resource.h
    trunk/reactos/dll/win32/oledlg/rsrc.rc

Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/insobjdlg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/insobjdlg.c	[iso-8859-1] Thu Dec 26 19:01:25 2013
@@ -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 <stdarg.h>
-//#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
+#include "oledlg_private.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);
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -18,8 +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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -17,8 +17,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -19,8 +19,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
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -17,8 +17,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -16,8 +16,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
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -16,8 +16,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -17,8 +17,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -16,8 +16,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -18,8 +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
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -17,8 +17,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -17,8 +17,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
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -15,8 +15,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
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc	[iso-8859-1] Thu Dec 26 19:01:25
2013
@@ -17,8 +17,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
  */
-
-#include "resource.h"
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/oledlg/oledlg_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_ma…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_main.c	[iso-8859-1] Thu Dec 26 19:01:25 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/oledlg/oledlg_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_pr…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_private.h	[iso-8859-1] Thu Dec 26 19:01:25 2013
@@ -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;

Modified: trunk/reactos/dll/win32/oledlg/pastespl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/pastespl.…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/pastespl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/pastespl.c	[iso-8859-1] Thu Dec 26 19:01:25 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/oledlg/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/resource.…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/resource.h	[iso-8859-1] Thu Dec 26 19:01:25 2013
@@ -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

Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/rsrc.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/rsrc.rc	[iso-8859-1] Thu Dec 26 19:01:25 2013
@@ -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