Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:43:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- move wine includes to precomp.h

Browse source 
- 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)

svn path=/trunk/; revision=25650
This commit is contained in:
Johannes Anderwald 2007-01-27 17:52:03 +00:00
parent da3a838762
commit 9e0537881f
12 changed files with 92 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/dll/win32/comdlg32/cdlg.h
View file

@ -21,9 +21,7 @@
#ifndef _WINE_DLL_CDLG_H #ifndef _WINE_DLL_CDLG_H
#define _WINE_DLL_CDLG_H #define _WINE_DLL_CDLG_H
#define COM_NO_WINDOWS_H #include <wownt32.h>
#include "dlgs.h"
#include "wownt32.h"
/* Common dialogs implementation globals */ /* Common dialogs implementation globals */
#define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ #define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */
@ -155,15 +153,6 @@ typedef struct {
#define IDS_FAKEDOCTEXT 1300 #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 */ /* ITEMIDLIST */
extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST); extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);

13
reactos/dll/win32/comdlg32/cdlg32.c
View file

@ -19,21 +19,10 @@
* 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 <stdarg.h> #include <precomp.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "commdlg.h"
#include "cderr.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
#include "cdlg.h"
HINSTANCE COMDLG32_hInstance = 0; HINSTANCE COMDLG32_hInstance = 0;
static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES;

15
reactos/dll/win32/comdlg32/colordlg.c
View file

@ -23,20 +23,7 @@
sometimes, especially when 2 instances of the sometimes, especially when 2 instances of the
dialog are loaded at the same time */ dialog are loaded at the same time */
#include <ctype.h> #include <precomp.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"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

1
reactos/dll/win32/comdlg32/comdlg32.rbuild
View file

@ -30,4 +30,5 @@
<file>printdlg.c</file> <file>printdlg.c</file>
<file>rsrc.rc</file> <file>rsrc.rc</file>
<file>comdlg32.spec</file> <file>comdlg32.spec</file>
<pch>precomp.h</pch>
</module> </module>

35
reactos/dll/win32/comdlg32/filedlg.c
View file

@ -46,39 +46,10 @@
* *
*/ */
#include "config.h" //#include "config.h"
#include "wine/port.h" //#include "wine/port.h"
#include <ctype.h> #include <precomp.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"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

26
reactos/dll/win32/comdlg32/filedlg31.c
View file

@ -18,33 +18,11 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* 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 <ctype.h>
#include <stdlib.h> #include <precomp.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"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
#include "cdlg.h"
#include "filedlg31.h"
#define BUFFILE 512 #define BUFFILE 512
#define BUFFILEALLOC 512 * sizeof(WCHAR) #define BUFFILEALLOC 512 * sizeof(WCHAR)

23
reactos/dll/win32/comdlg32/filedlgbrowser.c
View file

@ -19,28 +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
*/ */
#include <stdarg.h> #include <precomp.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"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

20
reactos/dll/win32/comdlg32/filetitle.c
View file

@ -19,21 +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
*/ */
#include <stdarg.h> #include <precomp.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"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
@ -49,11 +35,11 @@ short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf)
LPWSTR lpWTitle; LPWSTR lpWTitle;
RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile);
lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); lpWTitle = HeapAlloc( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR));
ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf); ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf);
if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL );
RtlFreeUnicodeString( &strWFile ); RtlFreeUnicodeString( &strWFile );
RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); HeapFree( GetProcessHeap(), 0, lpWTitle );
return ret; return ret;
} }

15
reactos/dll/win32/comdlg32/finddlg32.c
View file

@ -19,23 +19,10 @@
* 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 <stdarg.h> #include <precomp.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"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
#include "cdlg.h"
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static UINT FindReplaceMessage; static UINT FindReplaceMessage;

15
reactos/dll/win32/comdlg32/fontdlg.c
View file

@ -19,20 +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
*/ */
#include <ctype.h> #include <precomp.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"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

76
reactos/dll/win32/comdlg32/precomp.h Normal file
View file

@ -0,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

23
reactos/dll/win32/comdlg32/printdlg.c
View file

@ -20,32 +20,11 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* 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 <ctype.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define NONAMELESSUNION #include <precomp.h>
#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"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg); WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
#include "cdlg.h"
#include "printdlg.h"
/* Yes these constants are the same, but we're just copying win98 */ /* Yes these constants are the same, but we're just copying win98 */
#define UPDOWN_ID 0x270f #define UPDOWN_ID 0x270f
#define MAX_COPIES 9999 #define MAX_COPIES 9999