From 50560726e9a3deb2ad3a97fed2de61d4110aa32a Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Fri, 1 Aug 2008 16:29:40 +0000 Subject: [PATCH] - Revert 35008 svn path=/trunk/; revision=35011 --- reactos/dll/win32/acledit/acledit.c | 3 ++- reactos/dll/win32/acledit/acledit.rbuild | 1 - reactos/dll/win32/acledit/acledit.rc | 3 ++- reactos/dll/win32/acledit/acleditint.h | 4 ---- reactos/dll/win32/acledit/resource.h | 8 ++++++++ reactos/dll/win32/acledit/stubs.c | 2 +- reactos/dll/win32/beepmidi/beepmidi.c | 11 ++++++++++- reactos/dll/win32/beepmidi/beepmidi.h | 15 --------------- reactos/dll/win32/beepmidi/beepmidi.rbuild | 1 - reactos/dll/win32/cards/cards.c | 3 +++ reactos/dll/win32/cards/cards.h | 3 --- reactos/dll/win32/cards/cards.rbuild | 1 - reactos/dll/win32/cards/cards.rc | 2 +- reactos/dll/win32/crtdll/dllmain.c | 5 +++++ reactos/dll/win32/crtdll/precomp.h | 6 ------ reactos/dll/win32/dbghelp/pe_module.c | 4 ++-- reactos/dll/win32/dhcpcsvc/dhcpcsvc.c | 6 +++++- reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild | 1 - reactos/dll/win32/dhcpcsvc/dhcpsvc.h | 10 ---------- reactos/dll/win32/lpk/lpk.rbuild | 2 +- reactos/dll/win32/lsasrv/lsarpc.c | 9 ++++++++- reactos/dll/win32/lsasrv/lsasrv.c | 6 +++++- reactos/dll/win32/lsasrv/lsasrv.rbuild | 1 - reactos/dll/win32/lsasrv/precomp.h | 7 ------- reactos/dll/win32/uext2/precomp.h | 5 ----- reactos/dll/win32/uext2/uext2.c | 6 +++++- reactos/dll/win32/uext2/uext2.rbuild | 1 - reactos/dll/win32/ufat/precomp.h | 5 ----- reactos/dll/win32/ufat/ufat.c | 6 +++++- reactos/dll/win32/ufat/ufat.rbuild | 1 - reactos/dll/win32/untfs/precomp.h | 5 ----- reactos/dll/win32/untfs/untfs.c | 6 +++++- reactos/dll/win32/untfs/untfs.rbuild | 1 - reactos/dll/win32/ws2help/ws2help.rbuild | 1 - reactos/dll/win32/wshirda/wshirda.rbuild | 1 - reactos/dll/win32/wshtcpip/wshtcpip.rbuild | 1 - reactos/dll/win32/wsock32/stubs.c | 8 +++++--- reactos/dll/win32/wsock32/wsock32.h | 2 -- reactos/dll/win32/wsock32/wsock32.rbuild | 1 - 39 files changed, 73 insertions(+), 91 deletions(-) create mode 100644 reactos/dll/win32/acledit/resource.h delete mode 100644 reactos/dll/win32/beepmidi/beepmidi.h delete mode 100644 reactos/dll/win32/dhcpcsvc/dhcpsvc.h delete mode 100644 reactos/dll/win32/lsasrv/precomp.h delete mode 100644 reactos/dll/win32/uext2/precomp.h delete mode 100644 reactos/dll/win32/ufat/precomp.h delete mode 100644 reactos/dll/win32/untfs/precomp.h delete mode 100644 reactos/dll/win32/wsock32/wsock32.h diff --git a/reactos/dll/win32/acledit/acledit.c b/reactos/dll/win32/acledit/acledit.c index 64367c4df05..94119f0f36f 100644 --- a/reactos/dll/win32/acledit/acledit.c +++ b/reactos/dll/win32/acledit/acledit.c @@ -29,8 +29,9 @@ * UPDATE HISTORY: * 07/09/2004 Created */ - +#include #include "acleditint.h" +#include "resource.h" HINSTANCE hDllInstance; diff --git a/reactos/dll/win32/acledit/acledit.rbuild b/reactos/dll/win32/acledit/acledit.rbuild index ea15f9f04c9..e71a8ee9ccc 100644 --- a/reactos/dll/win32/acledit/acledit.rbuild +++ b/reactos/dll/win32/acledit/acledit.rbuild @@ -8,7 +8,6 @@ kernel32 advapi32 user32 - acleditint.h acledit.c stubs.c acledit.rc diff --git a/reactos/dll/win32/acledit/acledit.rc b/reactos/dll/win32/acledit/acledit.rc index d1b0ec23a20..85623bed8bc 100644 --- a/reactos/dll/win32/acledit/acledit.rc +++ b/reactos/dll/win32/acledit/acledit.rc @@ -1,4 +1,5 @@ -#include "acleditint.h" +#include +#include "resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Access Control Editor\0" diff --git a/reactos/dll/win32/acledit/acleditint.h b/reactos/dll/win32/acledit/acleditint.h index 298265a4016..3b10fa5f4f3 100644 --- a/reactos/dll/win32/acledit/acleditint.h +++ b/reactos/dll/win32/acledit/acleditint.h @@ -1,10 +1,6 @@ #ifndef __ACLEDITINT_H #define __ACLEDITINT_H -#include - -#define IDI_DEVMGR 100 - extern HINSTANCE hDllInstance; typedef struct _ACL_HELP_CONTROL diff --git a/reactos/dll/win32/acledit/resource.h b/reactos/dll/win32/acledit/resource.h new file mode 100644 index 00000000000..89c5d02b7cf --- /dev/null +++ b/reactos/dll/win32/acledit/resource.h @@ -0,0 +1,8 @@ +#ifndef __DEVMGR_RESOURCE_H +#define __DEVMGR_RESOURCE_H + +#define IDI_DEVMGR 100 + +#endif /* __DEVMGR_RESOURCE_H */ + +/* EOF */ diff --git a/reactos/dll/win32/acledit/stubs.c b/reactos/dll/win32/acledit/stubs.c index 90dd94563a7..b679c6036aa 100644 --- a/reactos/dll/win32/acledit/stubs.c +++ b/reactos/dll/win32/acledit/stubs.c @@ -13,7 +13,7 @@ * UPDATE HISTORY: * 07/09/2004 Created */ - +#include #include "acleditint.h" ULONG DbgPrint(PCH Format,...); diff --git a/reactos/dll/win32/beepmidi/beepmidi.c b/reactos/dll/win32/beepmidi/beepmidi.c index a80c78eab16..8665bec17d4 100644 --- a/reactos/dll/win32/beepmidi/beepmidi.c +++ b/reactos/dll/win32/beepmidi/beepmidi.c @@ -40,7 +40,16 @@ */ #define CONTINUOUS_NOTES -#include +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#include +#include +#include +#include +#include + +#include +#include /*#define DPRINT printf*/ #define DPRINT FakePrintf diff --git a/reactos/dll/win32/beepmidi/beepmidi.h b/reactos/dll/win32/beepmidi/beepmidi.h deleted file mode 100644 index fa144532f92..00000000000 --- a/reactos/dll/win32/beepmidi/beepmidi.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _BEEPMIDI_H_ -#define _BEEPMIDI_H_ - -#define WIN32_NO_STATUS -#define NTOS_MODE_USER -#include -#include -#include -#include -#include - -#include -#include - -#endif diff --git a/reactos/dll/win32/beepmidi/beepmidi.rbuild b/reactos/dll/win32/beepmidi/beepmidi.rbuild index 7485183661d..156d95cba4f 100644 --- a/reactos/dll/win32/beepmidi/beepmidi.rbuild +++ b/reactos/dll/win32/beepmidi/beepmidi.rbuild @@ -5,6 +5,5 @@ kernel32 user32 winmm - beepmidi.h beepmidi.c diff --git a/reactos/dll/win32/cards/cards.c b/reactos/dll/win32/cards/cards.c index a1e8bf3ea9d..eed5ce0d673 100644 --- a/reactos/dll/win32/cards/cards.c +++ b/reactos/dll/win32/cards/cards.c @@ -18,6 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include + +#include "windows.h" #include "cards.h" HBITMAP g_CardBitmaps[MAX_CARD_BITMAPS]; diff --git a/reactos/dll/win32/cards/cards.h b/reactos/dll/win32/cards/cards.h index 7b1e4b7d977..92b33d61a64 100644 --- a/reactos/dll/win32/cards/cards.h +++ b/reactos/dll/win32/cards/cards.h @@ -21,9 +21,6 @@ #ifndef _CARDS_H #define _CARDS_H -#include -#include "windows.h" - /* * 52 card faces + * 12 card backs + diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild index d9d66145fa0..cab5fdb975d 100644 --- a/reactos/dll/win32/cards/cards.rbuild +++ b/reactos/dll/win32/cards/cards.rbuild @@ -8,7 +8,6 @@ kernel32 gdi32 user32 - cards.h cards.c cards.rc diff --git a/reactos/dll/win32/cards/cards.rc b/reactos/dll/win32/cards/cards.rc index 10858471304..b17613f783a 100644 --- a/reactos/dll/win32/cards/cards.rc +++ b/reactos/dll/win32/cards/cards.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "cards.h" +#include #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Cardplaying Helper DLL\0" diff --git a/reactos/dll/win32/crtdll/dllmain.c b/reactos/dll/win32/crtdll/dllmain.c index 9af025af63b..a97de0cc312 100644 --- a/reactos/dll/win32/crtdll/dllmain.c +++ b/reactos/dll/win32/crtdll/dllmain.c @@ -17,7 +17,12 @@ */ #include +#include +#include +#include +#include +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crtdll); diff --git a/reactos/dll/win32/crtdll/precomp.h b/reactos/dll/win32/crtdll/precomp.h index 97479189de9..d30dfa7109e 100644 --- a/reactos/dll/win32/crtdll/precomp.h +++ b/reactos/dll/win32/crtdll/precomp.h @@ -5,11 +5,5 @@ #include #include #include -#include -#include -#include -#include - -#include "wine/debug.h" #endif /* _CRT_PRECOMP_H */ diff --git a/reactos/dll/win32/dbghelp/pe_module.c b/reactos/dll/win32/dbghelp/pe_module.c index 6d5f85e998e..3027f5ba00c 100644 --- a/reactos/dll/win32/dbghelp/pe_module.c +++ b/reactos/dll/win32/dbghelp/pe_module.c @@ -138,7 +138,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, else WINE_ERR("-Unable to peruse .DBG file %s (%s)\n", dbg_name, debugstr_a(tmp)); - if (dbg_mapping) UnmapViewOfFile((PVOID)dbg_mapping); + if (dbg_mapping) UnmapViewOfFile(dbg_mapping); if (hMap) CloseHandle(hMap); if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); return ret; @@ -266,7 +266,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, for (j = 0; j < exports->NumberOfNames; j++) if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; - snprintf(buffer, sizeof(buffer), "%lu", i + exports->Base); + snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1, TRUE /* FIXME */, TRUE /* FIXME */); } diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c index 1c35b35c7dd..cf382b94751 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c +++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c @@ -6,7 +6,11 @@ * COPYRIGHT: Copyright 2005 Art Yerkes */ -#include +#include +#include +#include +#include +#include #define NDEBUG #include diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild index c88b3bfbef5..6964d56c0a9 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild +++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild @@ -8,7 +8,6 @@ msvcrt ws2_32 iphlpapi - dhcpsvc.h dhcpcsvc.c dhcpcsvc.rc dhcpcsvc.spec diff --git a/reactos/dll/win32/dhcpcsvc/dhcpsvc.h b/reactos/dll/win32/dhcpcsvc/dhcpsvc.h deleted file mode 100644 index d2293075aab..00000000000 --- a/reactos/dll/win32/dhcpcsvc/dhcpsvc.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _DHCPSVC_H_ -#define _DHCPSVC_H_ - -#include -#include -#include -#include -#include - -#endif diff --git a/reactos/dll/win32/lpk/lpk.rbuild b/reactos/dll/win32/lpk/lpk.rbuild index efe21000a90..fe83c7ec489 100644 --- a/reactos/dll/win32/lpk/lpk.rbuild +++ b/reactos/dll/win32/lpk/lpk.rbuild @@ -9,7 +9,7 @@ kernel32 user32 usp10 - ros_lpk.h + dllmain.c stub.c diff --git a/reactos/dll/win32/lsasrv/lsarpc.c b/reactos/dll/win32/lsasrv/lsarpc.c index e3639814947..97b7535eab1 100644 --- a/reactos/dll/win32/lsasrv/lsarpc.c +++ b/reactos/dll/win32/lsasrv/lsarpc.c @@ -1,6 +1,13 @@ /* INCLUDES ****************************************************************/ -#include "precomp.h" +#define WIN32_NO_STATUS +#include +#include +#define NTOS_MODE_USER +#include + +#include "lsa_s.h" + #define NDEBUG #include diff --git a/reactos/dll/win32/lsasrv/lsasrv.c b/reactos/dll/win32/lsasrv/lsasrv.c index de4e15fe71e..94d643bb41c 100644 --- a/reactos/dll/win32/lsasrv/lsasrv.c +++ b/reactos/dll/win32/lsasrv/lsasrv.c @@ -1,4 +1,8 @@ -#include "precomp.h" +#define WIN32_NO_STATUS +#include +#define NTOS_MODE_USER +#include + #define NDEBUG #include diff --git a/reactos/dll/win32/lsasrv/lsasrv.rbuild b/reactos/dll/win32/lsasrv/lsasrv.rbuild index 966f1b0d6c1..b87a23a0681 100644 --- a/reactos/dll/win32/lsasrv/lsasrv.rbuild +++ b/reactos/dll/win32/lsasrv/lsasrv.rbuild @@ -9,7 +9,6 @@ kernel32 rpcrt4 pseh - precomp.h lsarpc.c lsasrv.c lsasrv.rc diff --git a/reactos/dll/win32/lsasrv/precomp.h b/reactos/dll/win32/lsasrv/precomp.h deleted file mode 100644 index 271ad967428..00000000000 --- a/reactos/dll/win32/lsasrv/precomp.h +++ /dev/null @@ -1,7 +0,0 @@ -#define WIN32_NO_STATUS -#include -#include -#define NTOS_MODE_USER -#include - -#include "lsa_s.h" diff --git a/reactos/dll/win32/uext2/precomp.h b/reactos/dll/win32/uext2/precomp.h deleted file mode 100644 index d869f1f6355..00000000000 --- a/reactos/dll/win32/uext2/precomp.h +++ /dev/null @@ -1,5 +0,0 @@ -#define WIN32_NO_STATUS -#include -#define NTOS_MODE_USER -#include -#include diff --git a/reactos/dll/win32/uext2/uext2.c b/reactos/dll/win32/uext2/uext2.c index c211231ecdf..2e3ecfe0367 100644 --- a/reactos/dll/win32/uext2/uext2.c +++ b/reactos/dll/win32/uext2/uext2.c @@ -7,7 +7,11 @@ * PROGRAMMERS: Pierre Schweitzer */ -#include "precomp.h" +#define WIN32_NO_STATUS +#include +#define NTOS_MODE_USER +#include +#include INT WINAPI DllMain( diff --git a/reactos/dll/win32/uext2/uext2.rbuild b/reactos/dll/win32/uext2/uext2.rbuild index 8cbb9bd5d83..5725bb4aff1 100644 --- a/reactos/dll/win32/uext2/uext2.rbuild +++ b/reactos/dll/win32/uext2/uext2.rbuild @@ -5,7 +5,6 @@ 0x0600 ext2lib ntdll - precomp.h uext2.c uext2.rc diff --git a/reactos/dll/win32/ufat/precomp.h b/reactos/dll/win32/ufat/precomp.h deleted file mode 100644 index d869f1f6355..00000000000 --- a/reactos/dll/win32/ufat/precomp.h +++ /dev/null @@ -1,5 +0,0 @@ -#define WIN32_NO_STATUS -#include -#define NTOS_MODE_USER -#include -#include diff --git a/reactos/dll/win32/ufat/ufat.c b/reactos/dll/win32/ufat/ufat.c index 9bd65ad49db..8a876a29ab3 100644 --- a/reactos/dll/win32/ufat/ufat.c +++ b/reactos/dll/win32/ufat/ufat.c @@ -7,7 +7,11 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org) */ -#include "precomp.h" +#define WIN32_NO_STATUS +#include +#define NTOS_MODE_USER +#include +#include INT WINAPI DllMain( diff --git a/reactos/dll/win32/ufat/ufat.rbuild b/reactos/dll/win32/ufat/ufat.rbuild index cbd96abca36..6ecbaab768d 100644 --- a/reactos/dll/win32/ufat/ufat.rbuild +++ b/reactos/dll/win32/ufat/ufat.rbuild @@ -5,7 +5,6 @@ 0x0600 vfatlib ntdll - precomp.h ufat.c ufat.rc diff --git a/reactos/dll/win32/untfs/precomp.h b/reactos/dll/win32/untfs/precomp.h deleted file mode 100644 index d869f1f6355..00000000000 --- a/reactos/dll/win32/untfs/precomp.h +++ /dev/null @@ -1,5 +0,0 @@ -#define WIN32_NO_STATUS -#include -#define NTOS_MODE_USER -#include -#include diff --git a/reactos/dll/win32/untfs/untfs.c b/reactos/dll/win32/untfs/untfs.c index 7a2531ddf60..f359e5f90e6 100644 --- a/reactos/dll/win32/untfs/untfs.c +++ b/reactos/dll/win32/untfs/untfs.c @@ -7,7 +7,11 @@ * PROGRAMMERS: Pierre Schweitzer */ -#include "precomp.h" +#define WIN32_NO_STATUS +#include +#define NTOS_MODE_USER +#include +#include INT WINAPI DllMain( diff --git a/reactos/dll/win32/untfs/untfs.rbuild b/reactos/dll/win32/untfs/untfs.rbuild index 3e2b400545f..7652bd6ec11 100644 --- a/reactos/dll/win32/untfs/untfs.rbuild +++ b/reactos/dll/win32/untfs/untfs.rbuild @@ -5,7 +5,6 @@ 0x0600 ntfslib ntdll - precomp.h untfs.c untfs.rc diff --git a/reactos/dll/win32/ws2help/ws2help.rbuild b/reactos/dll/win32/ws2help/ws2help.rbuild index 314d05a8587..6f3a0a69dc1 100644 --- a/reactos/dll/win32/ws2help/ws2help.rbuild +++ b/reactos/dll/win32/ws2help/ws2help.rbuild @@ -5,7 +5,6 @@ ntdll kernel32 ws2_32 - ws2help.h ws2help.c ws2help.rc diff --git a/reactos/dll/win32/wshirda/wshirda.rbuild b/reactos/dll/win32/wshirda/wshirda.rbuild index 7cc4ecb8fe0..5704b4bbb0f 100644 --- a/reactos/dll/win32/wshirda/wshirda.rbuild +++ b/reactos/dll/win32/wshirda/wshirda.rbuild @@ -5,7 +5,6 @@ ntdll kernel32 ws2_32 - wshirda.h wshirda.c wshirda.rc diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild index a3d8f6d162a..0fd9a7d9eb6 100644 --- a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild +++ b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild @@ -6,7 +6,6 @@ ntdll kernel32 ws2_32 - wshtcpip.h wshtcpip.c wshtcpip.rc diff --git a/reactos/dll/win32/wsock32/stubs.c b/reactos/dll/win32/wsock32/stubs.c index 15c1bffc168..930eb44e751 100644 --- a/reactos/dll/win32/wsock32/stubs.c +++ b/reactos/dll/win32/wsock32/stubs.c @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock DLL * FILE: stubs.c @@ -6,8 +7,9 @@ * PROGRAMMERS: Ge van Geldorp (ge@gse.nl) * REVISIONS: */ - -#include "wsock32.h" +#include +#include +//#include /* * @unimplemented diff --git a/reactos/dll/win32/wsock32/wsock32.h b/reactos/dll/win32/wsock32/wsock32.h deleted file mode 100644 index b0ec32c857a..00000000000 --- a/reactos/dll/win32/wsock32/wsock32.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#include diff --git a/reactos/dll/win32/wsock32/wsock32.rbuild b/reactos/dll/win32/wsock32/wsock32.rbuild index 299cdc0d51b..757702b4547 100644 --- a/reactos/dll/win32/wsock32/wsock32.rbuild +++ b/reactos/dll/win32/wsock32/wsock32.rbuild @@ -4,7 +4,6 @@ ntdll kernel32 ws2_32 - wsock32.h stubs.c wsock32.rc