[janderwald] 25650: - move wine includes to precomp.h - this enables compiling nearly all (printdlg has some issues) of comdlg32 with msvc (first include all standard headers and then include the wine compability headers)
27 Jan
2007
27 Jan
'07
5:52 p.m.
Author: janderwald
Date: Sat Jan 27 20:52:03 2007
New Revision: 25650
URL: http://svn.reactos.org/svn/reactos?rev=25650&view=rev
Log:
- move wine includes to precomp.h
- this enables compiling nearly all (printdlg has some issues) of comdlg32 with msvc
(first include all standard headers and then include the wine compability headers)
Added:
trunk/reactos/dll/win32/comdlg32/precomp.h (with props)
Modified:
trunk/reactos/dll/win32/comdlg32/cdlg.h
trunk/reactos/dll/win32/comdlg32/cdlg32.c
trunk/reactos/dll/win32/comdlg32/colordlg.c
trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild
trunk/reactos/dll/win32/comdlg32/filedlg.c
trunk/reactos/dll/win32/comdlg32/filedlg31.c
trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c
trunk/reactos/dll/win32/comdlg32/filetitle.c
trunk/reactos/dll/win32/comdlg32/finddlg32.c
trunk/reactos/dll/win32/comdlg32/fontdlg.c
trunk/reactos/dll/win32/comdlg32/printdlg.c
Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg.h (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg.h Sat Jan 27 20:52:03 2007
@@ -21,9 +21,7 @@
#ifndef _WINE_DLL_CDLG_H
#define _WINE_DLL_CDLG_H
-#define COM_NO_WINDOWS_H
-#include "dlgs.h"
-#include "wownt32.h"
+#include <wownt32.h>
/* Common dialogs implementation globals */
#define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */
@@ -155,15 +153,6 @@
#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"
-
/* ITEMIDLIST */
extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
Modified: trunk/reactos/dll/win32/comdlg32/cdlg32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg32.…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg32.c (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg32.c Sat Jan 27 20:52:03 2007
@@ -19,20 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "commdlg.h"
-#include "cderr.h"
-#include "wine/debug.h"
+#include <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-
-#include "cdlg.h"
-
HINSTANCE COMDLG32_hInstance = 0;
Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/colordlg.c (original)
+++ trunk/reactos/dll/win32/comdlg32/colordlg.c Sat Jan 27 20:52:03 2007
@@ -23,20 +23,7 @@
sometimes, especially when 2 instances of the
dialog are loaded at the same time */
-#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 <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original)
+++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Sat Jan 27 20:52:03 2007
@@ -30,4 +30,5 @@
<file>printdlg.c</file>
<file>rsrc.rc</file>
<file>comdlg32.spec</file>
+ <pch>precomp.h</pch>
</module>
Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/filedlg.c (original)
+++ trunk/reactos/dll/win32/comdlg32/filedlg.c Sat Jan 27 20:52:03 2007
@@ -46,39 +46,10 @@
*
*/
-#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 "winreg.h"
-#include "winternl.h"
-#include "winnls.h"
-#include "wine/unicode.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "commdlg.h"
-#include "dlgs.h"
-#include "cdlg.h"
-#include "filedlg31.h"
-#include "wine/debug.h"
-#include "cderr.h"
-#include "shellapi.h"
-#include "shlguid.h"
-#include "shlobj.h"
-#include "filedlgbrowser.h"
-#include "shlwapi.h"
+//#include "config.h"
+//#include "wine/port.h"
+
+#include <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/filedlg31.c (original)
+++ trunk/reactos/dll/win32/comdlg32/filedlg31.c Sat Jan 27 20:52:03 2007
@@ -18,32 +18,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
*/
-#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 "cderr.h"
-#include "winreg.h"
-#include "winternl.h"
-#include "winuser.h"
-#include "commdlg.h"
-#include "cderr.h"
-#include "winreg.h"
-#include "winternl.h"
-#include "shlwapi.h"
+
+#include <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-
-#include "cdlg.h"
-#include "filedlg31.h"
#define BUFFILE 512
#define BUFFILEALLOC 512 * sizeof(WCHAR)
Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c (original)
+++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c Sat Jan 27 20:52:03 2007
@@ -19,28 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#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"
-
-#define NO_SHLWAPI_STREAM
-#include "shlwapi.h"
-#include "filedlgbrowser.h"
-#include "cdlg.h"
-#include "shlguid.h"
-#include "servprov.h"
-#include "wine/debug.h"
+#include <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
Modified: trunk/reactos/dll/win32/comdlg32/filetitle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filetit…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/filetitle.c (original)
+++ trunk/reactos/dll/win32/comdlg32/filetitle.c Sat Jan 27 20:52:03 2007
@@ -19,21 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-#include <string.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "winternl.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "commdlg.h"
-#include "cdlg.h"
-#include "cdlg16.h"
-#include "wine/unicode.h"
-#include "wine/debug.h"
+#include <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
@@ -49,11 +35,11 @@
LPWSTR lpWTitle;
RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile);
- lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR));
+ lpWTitle = HeapAlloc( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR));
ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf);
if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL );
RtlFreeUnicodeString( &strWFile );
- RtlFreeHeap( GetProcessHeap(), 0, lpWTitle );
+ HeapFree( GetProcessHeap(), 0, lpWTitle );
return ret;
}
Modified: trunk/reactos/dll/win32/comdlg32/finddlg32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/finddlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/finddlg32.c (original)
+++ trunk/reactos/dll/win32/comdlg32/finddlg32.c Sat Jan 27 20:52:03 2007
@@ -19,22 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-#include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "commdlg.h"
-#include "cderr.h"
-#include "dlgs.h"
-#include "wine/debug.h"
+#include <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-
-#include "cdlg.h"
-
/*-----------------------------------------------------------------------*/
Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/fontdlg.c (original)
+++ trunk/reactos/dll/win32/comdlg32/fontdlg.c Sat Jan 27 20:52:03 2007
@@ -19,20 +19,7 @@
* 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 "commdlg.h"
-#include "dlgs.h"
-#include "wine/debug.h"
-#include "cderr.h"
+#include <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
Added: trunk/reactos/dll/win32/comdlg32/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/precomp…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/precomp.h (added)
+++ trunk/reactos/dll/win32/comdlg32/precomp.h Sat Jan 27 20:52:03 2007
@@ -1,0 +1,76 @@
+#ifndef PRECOMP_H__
+#define PRECOMP_H__
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#define NO_SHLWAPI_STREAM
+#define COM_NO_WINDOWS_H
+#define _COMDLG32_
+
+#if defined (_MSC_VER)
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <commdlg.h>
+#include <shellapi.h>
+#include <shlguid.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+#include <guiddef.h>
+#include <dlgs.h>
+#include <cderr.h>
+#endif
+
+#include "wine/windef.h"
+#include "winbase.h"
+#include "wine/wingdi.h"
+#include "wine/winuser.h"
+#include "wine/commdlg.h"
+#include "wine/shellapi.h"
+
+#if !defined (_MSC_VER)
+#include "psdk/shlguid.h"
+#include "psdk/shlobj.h"
+#endif
+
+#include "wine/shlguid.h"
+#include "wine/shlobj.h"
+
+#if !defined (_MSC_VER)
+#include "psdk/shlguid.h"
+#include "psdk/shlwapi.h"
+#include "wine/shlwapi.h"
+#endif
+
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
+#include "wine/guiddef.h"
+#include "wine/dlgs.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+#include <cderr.h>
+#include <cdlg.h>
+#include <winspool.h>
+#include <winerror.h>
+#include <winnls.h>
+#include <winreg.h>
+#include <winternl.h>
+
+//local headers
+#include "cdlg.h"
+#include "printdlg.h"
+#include "filedlgbrowser.h"
+#include "cdlg.h"
+#include "servprov.h"
+#include "filedlg31.h"
+
+#endif
Propchange: trunk/reactos/dll/win32/comdlg32/precomp.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/printdlg.c (original)
+++ trunk/reactos/dll/win32/comdlg32/printdlg.c Sat Jan 27 20:52:03 2007
@@ -20,31 +20,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
*/
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winspool.h"
-#include "winerror.h"
-
-#include "wine/debug.h"
-
-#include "commdlg.h"
-#include "dlgs.h"
-#include "cderr.h"
+
+#include <precomp.h>
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-
-#include "cdlg.h"
-#include "printdlg.h"
/* Yes these constants are the same, but we're just copying win98 */
#define UPDOWN_ID 0x270f
6828
days inactive
6828
days old
0 comments
1 participants
participants (1)
-
janderwald＠svn.reactos.org