Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 53239: [CMAKE] - get back to DllMAinCRTStartup entry point
by jgardou＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: jgardou Date: Sun Aug 14 20:34:13 2011 New Revision: 53239 URL: http://svn.reactos.org/svn/reactos?rev=53239&view=rev Log: [CMAKE] - get back to DllMAinCRTStartup entry point Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53239&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Aug 14 20:34:13 2011 @@ -145,17 +145,17 @@ set_entrypoint(${MODULE} mainCRTStartup) endif(IS_UNICODE) elseif(${TYPE} MATCHES win32dll) - set_entrypoint(${MODULE} DllMain 12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() message(STATUS "${MODULE} has no base address") endif() elseif(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMain 12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") elseif(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMain 12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Aug 14 20:34:13 2011 @@ -63,7 +63,7 @@ wine ${PSEH_LIB}) -add_importlibs(advapi32 rpcrt4 kernel32 ntdll msvcrt) +add_importlibs(advapi32 rpcrt4 msvcrt kernel32 ntdll) add_pch(advapi32 advapi32.h ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Aug 14 20:34:13 2011 @@ -93,8 +93,8 @@ devmgr winspool winmm + msvcrt kernel32 - msvcrt ntdll) add_pch(shell32 precomp.h) Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Sun Aug 14 20:34:13 2011 @@ -46,10 +46,10 @@ winmm version shell32 + msvcrt kernel32 userenv wininet - msvcrt ntdll) add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Sun Aug 14 20:34:13 2011 @@ -35,7 +35,7 @@ set_module_type(win32csr win32dll) -add_importlibs(win32csr user32 gdi32 advapi32 psapi kernel32 ntdll msvcrt) +add_importlibs(win32csr user32 gdi32 advapi32 psapi msvcrt kernel32 ntdll) add_pch(win32csr w32csr.h)

1 0

[tkreuzer] 53238: [GDI FONT DRIVER] - Set FM_INFO_OPTICALLY_FIXED_PITCH for fixed width fonts - Fix calculation of fixed width. Fixes display of fixed width fonts, like Lucida Console
by tkreuzer＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: tkreuzer Date: Sun Aug 14 20:27:26 2011 New Revision: 53238 URL: http://svn.reactos.org/svn/reactos?rev=53238&view=rev Log: [GDI FONT DRIVER] - Set FM_INFO_OPTICALLY_FIXED_PITCH for fixed width fonts - Fix calculation of fixed width. Fixes display of fixed width fonts, like Lucida Console Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Sun Aug 14 20:27:26 2011 @@ -111,6 +111,8 @@ pifi->flInfo |= FM_INFO_NOT_CONTIGUOUS; if (pface->ulFontFormat != FMT_FNT) pifi->flInfo |= /*FM_INFO_RETURNS_OUTLINES |*/ FM_INFO_ARB_XFORMS; + if (ftface->face_flags & FT_FACE_FLAG_FIXED_WIDTH) + pifi->flInfo |= FM_INFO_OPTICALLY_FIXED_PITCH; pifi->flInfo |= FM_INFO_RIGHT_HANDED; // FIXME: how to determine? /* Font resolution */ Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sun Aug 14 20:27:26 2011 @@ -138,7 +138,7 @@ FLOATOBJ y; } POINTEF, *PPOINTEF; -typedef struct +typedef struct _FTFD_FONT { FONTOBJ *pfo; PFTFD_FILE pfile; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Sun Aug 14 20:27:26 2011 @@ -305,6 +305,34 @@ return pfont; } +static +BOOL +FtfdLoadGlyph( + PFTFD_FONT pfont, + HGLYPH hg, + ULONG iFormat) // 0 = bitmap, 1 = outline +{ + FT_Error fterror; + + /* Check if the glyph needs to be updated */ + if (pfont->hgSelected != hg) + { + /* Load the glyph into the freetype face slot */ + fterror = FT_Load_Glyph(pfont->ftface, hg, 0); + if (fterror) + { + WARN("Couldn't load glyph 0x%lx\n", hg); + pfont->hgSelected = -1; + return FALSE; + } + + /* Update the selected glyph */ + pfont->hgSelected = hg; + } + + return TRUE; +} + ULONG NTAPI FtfdQueryMaxExtents( @@ -331,11 +359,28 @@ /* Accelerator flags (ignored atm) */ pfddm->flRealizedType = 0; - /* Set fixed width advance */ + /* Check for fixed width font */ if (FT_IS_FIXED_WIDTH(ftface)) - pfddm->lD = ftface->max_advance_width; + { + /* Make sure a glyph is loaded */ + if ((pfont->hgSelected != -1) || + FtfdLoadGlyph(pfont, 0, 0)) + { + /* Convert advance from 26.6 fixpoint to pixel format */ + pfddm->lD = pface->ftface->glyph->advance.x >> 6; + } + else + { + /* Fall back to dynamic pitch */ + WARN("Couldn't load a glyph\n"); + pfddm->lD = 0; + } + } else + { + /* Variable pitch */ pfddm->lD = 0; + } /* Copy some values from the font structure */ pfddm->fxMaxAscender = pfont->metrics.fxMaxAscender; @@ -380,33 +425,6 @@ return sizeof(FD_DEVICEMETRICS); } -static -BOOL -FtfdLoadGlyph( - PFTFD_FONT pfont, - HGLYPH hg, - ULONG iFormat) // 0 = bitmap, 1 = outline -{ - FT_Error fterror; - - /* Check if the glyph needs to be updated */ - if (pfont->hgSelected != hg) - { - /* Load the glyph into the freetype face slot */ - fterror = FT_Load_Glyph(pfont->ftface, hg, 0); - if (fterror) - { - WARN("Couldn't load glyph 0x%lx\n", hg); - pfont->hgSelected = -1; - return FALSE; - } - - /* Update the selected glyph */ - pfont->hgSelected = hg; - } - - return TRUE; -} static VOID @@ -436,8 +454,8 @@ pgd->fxAB = pgd->fxA + ftglyph->metrics.height; } - /* D is the glyph advance width */ - pgd->fxD = ftglyph->advance.x / 4; // FIXME: should be projected on the x-axis + /* D is the glyph advance width. Convert it from 26.6 to 28.4 fixpoint format */ + pgd->fxD = ftglyph->advance.x >> 2; // FIXME: should be projected on the x-axis /* Get the bitnmap size */ sizlBitmap.cx = ftglyph->bitmap.width;

1 0

[jgardou] 53237: [UNICOWS] - doesn't have an entry point
by jgardou＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: jgardou Date: Sun Aug 14 20:01:20 2011 New Revision: 53237 URL: http://svn.reactos.org/svn/reactos?rev=53237&view=rev Log: [UNICOWS] - doesn't have an entry point Modified: trunk/reactos/dll/win32/unicows/CMakeLists.txt Modified: trunk/reactos/dll/win32/unicows/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/unicows/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/unicows/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/unicows/CMakeLists.txt [iso-8859-1] Sun Aug 14 20:01:20 2011 @@ -7,7 +7,8 @@ add_library(unicows SHARED ${SOURCE}) -set_module_type(unicows win32dll) +set_entrypoint(unicows 0) + add_importlibs(unicows avicap32 msvfw32

1 0

[akhaldi] 53236: [ROSSYM_NEW] * Add a PCH.
by akhaldi＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: akhaldi Date: Sun Aug 14 18:12:05 2011 New Revision: 53236 URL: http://svn.reactos.org/svn/reactos?rev=53236&view=rev Log: [ROSSYM_NEW] * Add a PCH. Added: trunk/reactos/lib/rossym_new/precomp.h (with props) Modified: trunk/reactos/lib/rossym_new/CMakeLists.txt trunk/reactos/lib/rossym_new/delete.c trunk/reactos/lib/rossym_new/dwarfabbrev.c trunk/reactos/lib/rossym_new/dwarfaranges.c trunk/reactos/lib/rossym_new/dwarfcfa.c trunk/reactos/lib/rossym_new/dwarfget.c trunk/reactos/lib/rossym_new/dwarfinfo.c trunk/reactos/lib/rossym_new/dwarfopen.c trunk/reactos/lib/rossym_new/dwarfpc.c trunk/reactos/lib/rossym_new/dwarfpubnames.c trunk/reactos/lib/rossym_new/find.c trunk/reactos/lib/rossym_new/fromfile.c trunk/reactos/lib/rossym_new/init.c trunk/reactos/lib/rossym_new/initum.c trunk/reactos/lib/rossym_new/pe.c trunk/reactos/lib/rossym_new/zwfile.c Modified: trunk/reactos/lib/rossym_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/CMakeLists.… ============================================================================== --- trunk/reactos/lib/rossym_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/CMakeLists.txt [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -1,24 +1,25 @@ if(MSVC) -add_library(rossym dummy.c) + add_library(rossym dummy.c) else() -add_definitions(-D_NTSYSTEM_) -list(APPEND SOURCE - delete.c - dwarfabbrev.c - dwarfaranges.c - dwarfcfa.c - dwarfinfo.c - dwarfget.c - dwarfopen.c - dwarfpc.c - dwarfpubnames.c - find.c - fromfile.c - init.c - initum.c - pe.c - zwfile.c) -add_library(rossym ${SOURCE}) -add_dependencies(rossym psdk bugcodes) + add_definitions(-D_NTSYSTEM_) + list(APPEND SOURCE + delete.c + dwarfabbrev.c + dwarfaranges.c + dwarfcfa.c + dwarfget.c + dwarfinfo.c + dwarfopen.c + dwarfpc.c + dwarfpubnames.c + find.c + fromfile.c + init.c + initum.c + pe.c + zwfile.c) + add_library(rossym ${SOURCE}) + add_pch(rossym precomp.h) + add_dependencies(rossym psdk bugcodes) endif() Modified: trunk/reactos/lib/rossym_new/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/delete.c?re… ============================================================================== --- trunk/reactos/lib/rossym_new/delete.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/delete.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -7,17 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) */ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include <ntimage.h> - -#define NDEBUG -#include <debug.h> - -#include "rossympriv.h" -#include "pe.h" -#include "dwarf.h" +#include <precomp.h> VOID RosSymDelete(PROSSYM_INFO RosSymInfo) Modified: trunk/reactos/lib/rossym_new/dwarfabbrev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfabbrev… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfabbrev.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfabbrev.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -6,18 +6,9 @@ * explicit reference counting if this turns out not to be acceptable. */ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include <ntimage.h> +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "rossym.h" -#include "rossympriv.h" -#include "dwarf.h" static int parseabbrevs(Dwarf*, ulong, DwarfAbbrev*, DwarfAttr*, int*, int*); DwarfAbbrev *dwarfgetabbrev(Dwarf*, ulong, ulong); Modified: trunk/reactos/lib/rossym_new/dwarfaranges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfarange… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfaranges.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfaranges.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -2,16 +2,9 @@ * Dwarf address ranges parsing code. */ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include <ntimage.h> +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "dwarf.h" int dwarfaddrtounit(Dwarf *d, ulong addr, ulong *unit) Modified: trunk/reactos/lib/rossym_new/dwarfcfa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfcfa.c?… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfcfa.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfcfa.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -8,17 +8,9 @@ * the same encoding. */ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include <ntimage.h> +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "pe.h" -#include "dwarf.h" #define trace 1 Modified: trunk/reactos/lib/rossym_new/dwarfget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfget.c?… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfget.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfget.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -2,17 +2,9 @@ * Dwarf data format parsing routines. */ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include <ntimage.h> +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "dwarf.h" -#include "pe.h" ulong dwarfget1(DwarfBuf *b) Modified: trunk/reactos/lib/rossym_new/dwarfinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfinfo.c… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfinfo.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfinfo.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -2,19 +2,8 @@ * Dwarf info parse and search. */ -#define NTOSAPI -#include <ntifs.h> -#include <ndk/ntndk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include <ntimage.h> - +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "dwarf.h" -#include "pe.h" -#include <windef.h> enum { Modified: trunk/reactos/lib/rossym_new/dwarfopen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfopen.c… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfopen.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfopen.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -1,14 +1,6 @@ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include <ntimage.h> +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "dwarf.h" -#include "pe.h" /* Adapted for PE */ Modified: trunk/reactos/lib/rossym_new/dwarfpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfpc.c?r… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfpc.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfpc.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -11,18 +11,9 @@ * The encoding may be small, but it sure isn't simple! */ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include <ntimage.h> +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "dwarf.h" -#include "pe.h" - #define trace 0 enum Modified: trunk/reactos/lib/rossym_new/dwarfpubnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfpubnam… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfpubnames.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfpubnames.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -1,12 +1,6 @@ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include <ntimage.h> +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "dwarf.h" static int _dwarfnametounit(Dwarf *d, char *name, DwarfBlock *bl, DwarfSym *s) Modified: trunk/reactos/lib/rossym_new/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/find.c?rev=… ============================================================================== --- trunk/reactos/lib/rossym_new/find.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/find.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -35,16 +35,9 @@ * SUCH DAMAGE. */ -#include <ntddk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "rossym.h" -#include "dwarf.h" -#include "pe.h" BOOLEAN RosSymGetAddressInformation Modified: trunk/reactos/lib/rossym_new/fromfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/fromfile.c?… ============================================================================== --- trunk/reactos/lib/rossym_new/fromfile.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/fromfile.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -7,18 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) */ -#define NTOSAPI -#include <ntifs.h> -#include <ndk/ntndk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include "pe.h" -#include <ntimage.h> - -#include "dwarf.h" - -#define NDEBUG -#include <debug.h> +#include <precomp.h> #define SYMBOL_SIZE 18 Modified: trunk/reactos/lib/rossym_new/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/init.c?rev=… ============================================================================== --- trunk/reactos/lib/rossym_new/init.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/init.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -7,9 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) */ -#include <windows.h> -#include <reactos/rossym.h> -#include "rossympriv.h" +#include <precomp.h> ROSSYM_CALLBACKS RosSymCallbacks; Modified: trunk/reactos/lib/rossym_new/initum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/initum.c?re… ============================================================================== --- trunk/reactos/lib/rossym_new/initum.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/initum.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -7,16 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) */ -#define WIN32_NO_STATUS -#include <windows.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <pseh/pseh.h> - -#define NDEBUG -#include <debug.h> +#include <precomp.h> static PVOID RosSymAllocMemUM(ULONG_PTR Size) Modified: trunk/reactos/lib/rossym_new/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/pe.c?rev=53… ============================================================================== --- trunk/reactos/lib/rossym_new/pe.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/pe.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -1,16 +1,6 @@ -#define NTOSAPI -#include <ntifs.h> -#include <ndk/ntndk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" -#include <ntimage.h> +#include <precomp.h> #define NDEBUG -#include <debug.h> - -#include "dwarf.h" -#include "pe.h" -#include "rossympriv.h" PeSect *pesection(Pe *pe, const char *name) { Added: trunk/reactos/lib/rossym_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/precomp.h?r… ============================================================================== --- trunk/reactos/lib/rossym_new/precomp.h (added) +++ trunk/reactos/lib/rossym_new/precomp.h [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -1,0 +1,12 @@ +#define NTOSAPI +#include <ntifs.h> +#include <ntimage.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <reactos/rossym.h> + +#include "rossympriv.h" +#include "pe.h" +#include "dwarf.h" + +#include <debug.h> Propchange: trunk/reactos/lib/rossym_new/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rossym_new/zwfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/zwfile.c?re… ============================================================================== --- trunk/reactos/lib/rossym_new/zwfile.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/zwfile.c [iso-8859-1] Sun Aug 14 18:12:05 2011 @@ -7,13 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) */ -#define NTOSAPI -#include <ntddk.h> -#include <reactos/rossym.h> -#include "rossympriv.h" - -#define NDEBUG -#include <debug.h> +#include <precomp.h> NTSTATUS RosSymStatus;

1 0

[akhaldi] 53235: * Include NDK headers on-demand.
by akhaldi＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: akhaldi Date: Sun Aug 14 17:31:30 2011 New Revision: 53235 URL: http://svn.reactos.org/svn/reactos?rev=53235&view=rev Log: * Include NDK headers on-demand. Modified: trunk/reactos/base/system/services/services.h trunk/reactos/dll/win32/lpk/ros_lpk.h trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/msafd/msafd.h trunk/reactos/dll/win32/netcfgx/precomp.h trunk/reactos/dll/win32/ntmarta/ntmarta.h trunk/reactos/dll/win32/opengl32/opengl32.h trunk/reactos/dll/win32/psapi/precomp.h trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/secur32/precomp.h trunk/reactos/dll/win32/secur32/stubs.c trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/syssetup/precomp.h trunk/reactos/dll/win32/uext2/uext2.c trunk/reactos/dll/win32/ufat/ufat.c trunk/reactos/dll/win32/untfs/untfs.c trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/userenv/precomp.h trunk/reactos/dll/win32/wshirda/wshirda.h Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -8,7 +8,6 @@ #include <netevent.h> #define NTOS_MODE_USER #include <ndk/iofuncs.h> -#include <ndk/obtypes.h> #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <services/services.h> Modified: trunk/reactos/dll/win32/lpk/ros_lpk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/ros_lpk.h?re… ============================================================================== --- trunk/reactos/dll/win32/lpk/ros_lpk.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/ros_lpk.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -9,7 +9,7 @@ #define NTOS_MODE_USER #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> /* FIXME USP10 api that does not have prototype in any include file */ VOID WINAPI LpkPresent(VOID); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -11,7 +11,10 @@ #include <windows.h> #include <ntsecapi.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> #include <string.h> Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -15,7 +15,10 @@ #include <windows.h> #include <ws2spi.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> /* This includes ntsecapi.h so it needs to come after the NDK */ #include <wsahelp.h> Modified: trunk/reactos/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -8,7 +8,8 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/rtlfuncs.h> #include <netcfgx.h> #include <setupapi.h> #include <stdio.h> Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -1,7 +1,9 @@ #define WIN32_NO_STATUS #define NTOS_MODE_USER #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <accctrl.h> #include <aclapi.h> #include <winsvc.h> Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -37,7 +37,7 @@ #define NTOS_MODE_USER #include <winddi.h> -#include <ndk/ntndk.h> +#include <ndk/pstypes.h> #include <GL/gl.h> #include <GL/glu.h> Modified: trunk/reactos/dll/win32/psapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/psapi/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/precomp.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -1,7 +1,11 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/exfuncs.h> +#include <ndk/mmtypes.h> +#include <ndk/mmfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> #include <psapi.h> #include <epsapi/epsapi.h> Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -22,7 +22,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/umtypes.h> //#include <samsrv.h> Modified: trunk/reactos/dll/win32/secur32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/secur32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/precomp.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -12,7 +12,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> #include <lsass/lsass.h> #include <ntsecapi.h> Modified: trunk/reactos/dll/win32/secur32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/secur32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/stubs.c [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -1,14 +1,11 @@ - -#include <windows.h> +#include <precomp.h> #define NDEBUG #include <reactos/debug.h> #define SEC_ENTRY WINAPI -#define STATUS_UNSUCCESSFUL ((SECURITY_STATUS)0x80000001) -typedef LONG SECURITY_STATUS; typedef PVOID PSECURITY_PACKAGE_OPTIONS, PSecurityUserData; SECURITY_STATUS Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -41,7 +41,9 @@ #include <wine/debug.h> #include <wine/unicode.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <pseh/pseh2.h> Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -44,7 +44,7 @@ #include <ntquery.h> #include <recyclebin.h> #include <shtypes.h> -#include <ndk/ntndk.h> +#include <ndk/umtypes.h> #include <fmifs/fmifs.h> #include <largeint.h> #include <sddl.h> Modified: trunk/reactos/dll/win32/syssetup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/precomp… ============================================================================== --- trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -3,7 +3,9 @@ #include <windowsx.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/rtlfuncs.h> #include <setupapi.h> #include <commctrl.h> Modified: trunk/reactos/dll/win32/uext2/uext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.c?re… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -10,7 +10,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/umtypes.h> #include <fmifs/fmifs.h> INT WINAPI Modified: trunk/reactos/dll/win32/ufat/ufat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -10,7 +10,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/umtypes.h> #include <fmifs/fmifs.h> INT WINAPI Modified: trunk/reactos/dll/win32/untfs/untfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.c?re… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -10,7 +10,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/umtypes.h> #include <fmifs/fmifs.h> INT WINAPI Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -22,8 +22,11 @@ #include <winuser.h> #include <windowsx.h> #include <winnls32.h> -#include <ndk/ntndk.h> -#include <ntstatus.h> +#include <ndk/cmfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/umfuncs.h> /* CSRSS Headers */ #include <csrss/csrss.h> Modified: trunk/reactos/dll/win32/userenv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/precomp.… ============================================================================== --- trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -2,7 +2,8 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/sefuncs.h> +#include <ndk/rtlfuncs.h> #include <userenv.h> #include <sddl.h> #include <shlobj.h> Modified: trunk/reactos/dll/win32/wshirda/wshirda.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/wshirda.… ============================================================================== --- trunk/reactos/dll/win32/wshirda/wshirda.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshirda/wshirda.h [iso-8859-1] Sun Aug 14 17:31:30 2011 @@ -10,7 +10,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> #include <wsahelp.h>

1 0

[akhaldi] 53234: [SMDLL] * Include NDK headers on-demand. * Introduce a PCH.
by akhaldi＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: akhaldi Date: Sun Aug 14 17:17:02 2011 New Revision: 53234 URL: http://svn.reactos.org/svn/reactos?rev=53234&view=rev Log: [SMDLL] * Include NDK headers on-demand. * Introduce a PCH. Added: trunk/reactos/dll/win32/smdll/precomp.h (with props) Modified: trunk/reactos/dll/win32/smdll/CMakeLists.txt trunk/reactos/dll/win32/smdll/dllmain.c trunk/reactos/dll/win32/smdll/query.c Modified: trunk/reactos/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Sun Aug 14 17:17:02 2011 @@ -14,6 +14,7 @@ target_link_libraries(smdll smlib) set_entrypoint(smdll DllMainCRTStartup 12) add_importlibs(smdll ntdll) +add_pch(smdll precomp.h) add_dependencies(smdll psdk) add_cd_file(TARGET smdll DESTINATION reactos/system32 FOR all) add_importlib_target(smdll.spec) Modified: trunk/reactos/dll/win32/smdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/dllmain.c?… ============================================================================== --- trunk/reactos/dll/win32/smdll/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/dllmain.c [iso-8859-1] Sun Aug 14 17:17:02 2011 @@ -6,7 +6,7 @@ * PURPOSE: SM Helper Library */ -#include <windows.h> +#include <precomp.h> BOOL WINAPI DllMainCRTStartup(HANDLE hinstDll, DWORD fdwReason, LPVOID fImpLoad) { Added: trunk/reactos/dll/win32/smdll/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/smdll/precomp.h (added) +++ trunk/reactos/dll/win32/smdll/precomp.h [iso-8859-1] Sun Aug 14 17:17:02 2011 @@ -1,0 +1,6 @@ +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <sm/helper.h> Propchange: trunk/reactos/dll/win32/smdll/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/smdll/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/query.c?re… ============================================================================== --- trunk/reactos/dll/win32/smdll/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/query.c [iso-8859-1] Sun Aug 14 17:17:02 2011 @@ -5,11 +5,8 @@ * FILE: lib/smdll/query.c * PURPOSE: Call SM API SM_API_QUERY_INFORMATION (not in NT) */ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <sm/helper.h> + +#include <precomp.h> #define NDEBUG #include <debug.h>

1 0

[akhaldi] 53233: [SAMLIB] * Include NDK headers on-demand. * Introduce a PCH.
by akhaldi＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: akhaldi Date: Sun Aug 14 16:59:43 2011 New Revision: 53233 URL: http://svn.reactos.org/svn/reactos?rev=53233&view=rev Log: [SAMLIB] * Include NDK headers on-demand. * Introduce a PCH. Added: trunk/reactos/dll/win32/samlib/precomp.h (with props) Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt trunk/reactos/dll/win32/samlib/dllmain.c trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.rbuild Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Sun Aug 14 16:59:43 2011 @@ -13,10 +13,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/samlib.def) add_library(samlib SHARED ${SOURCE}) - set_module_type(samlib win32dll) - add_importlibs(samlib advapi32 msvcrt kernel32 ntdll) - +add_pch(samlib precomp.h) add_cd_file(TARGET samlib DESTINATION reactos/system32 FOR all) add_importlib_target(samlib.spec) Modified: trunk/reactos/dll/win32/samlib/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] Sun Aug 14 16:59:43 2011 @@ -27,13 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <stdio.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> - -#include "debug.h" +#include "precomp.h" //#define LOG_DEBUG_MESSAGES Added: trunk/reactos/dll/win32/samlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/samlib/precomp.h (added) +++ trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] Sun Aug 14 16:59:43 2011 @@ -1,0 +1,10 @@ +#include <stdio.h> +#include <stdarg.h> + +#define WIN32_NO_STATUS +#include <windows.h> +#include <winerror.h> +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> + +#include "debug.h" Propchange: trunk/reactos/dll/win32/samlib/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun Aug 14 16:59:43 2011 @@ -26,14 +26,9 @@ */ /* INCLUDES *****************************************************************/ -#define WIN32_NO_STATUS -#include <windows.h> -#include <winerror.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> #define NDEBUG -#include "debug.h" +#include "precomp.h" /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/samlib/samlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.rb… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.rbuild [iso-8859-1] Sun Aug 14 16:59:43 2011 @@ -6,4 +6,5 @@ <file>dllmain.c</file> <file>samlib.c</file> <file>samlib.rc</file> + <pch>precomp.h</pch> </module>

1 0

[cgutman] 53232: [NTOSKRNL] - Fix NULL termination of strings in IoGetDeviceProperty - Fixes garbage displayed in the Enumerator field of the device manager property page
by cgutman＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: cgutman Date: Sun Aug 14 14:44:34 2011 New Revision: 53232 URL: http://svn.reactos.org/svn/reactos?rev=53232&view=rev Log: [NTOSKRNL] - Fix NULL termination of strings in IoGetDeviceProperty - Fixes garbage displayed in the Enumerator field of the device manager property page Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Aug 14 14:44:34 2011 @@ -3467,6 +3467,8 @@ NTSTATUS Status = STATUS_BUFFER_TOO_SMALL; GUID BusTypeGuid; POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; + BOOLEAN NullTerminate = FALSE; + DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty); /* Assume failure */ @@ -3517,7 +3519,10 @@ /* Get the name from the path */ EnumeratorNameEnd = wcschr(DeviceInstanceName, OBJ_NAME_PATH_SEPARATOR); ASSERT(EnumeratorNameEnd); - + + /* This string needs to be NULL-terminated */ + NullTerminate = TRUE; + /* This is the format of the returned data */ PIP_RETURN_DATA((EnumeratorNameEnd - DeviceInstanceName) * sizeof(WCHAR), DeviceInstanceName); @@ -3567,7 +3572,10 @@ /* It's up to the caller to try again */ Status = STATUS_BUFFER_TOO_SMALL; } - + + /* This string needs to be NULL-terminated */ + NullTerminate = TRUE; + /* Return if successful */ if (NT_SUCCESS(Status)) PIP_RETURN_DATA(ObjectNameInfo->Name.Length, ObjectNameInfo->Name.Buffer); @@ -3633,15 +3641,14 @@ else if (NT_SUCCESS(Status)) { /* We know up-front how much data to expect, check the caller's buffer */ - *ResultLength = ReturnLength; - if (ReturnLength <= BufferLength) + *ResultLength = ReturnLength + (NullTerminate ? sizeof(UNICODE_NULL) : 0); + if (*ResultLength <= BufferLength) { /* Buffer is all good, copy the data */ RtlCopyMemory(PropertyBuffer, Data, ReturnLength); - /* Check for properties that require a null-terminated string */ - if ((DeviceProperty == DevicePropertyEnumeratorName) || - (DeviceProperty == DevicePropertyPhysicalDeviceObjectName)) + /* Check if we need to NULL-terminate the string */ + if (NullTerminate) { /* Terminate the string */ ((PWCHAR)PropertyBuffer)[ReturnLength / sizeof(WCHAR)] = UNICODE_NULL;

1 0

[akhaldi] 53231: * Include NDK headers on-demand.
by akhaldi＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: akhaldi Date: Sun Aug 14 12:59:05 2011 New Revision: 53231 URL: http://svn.reactos.org/svn/reactos?rev=53231&view=rev Log: * Include NDK headers on-demand. Modified: trunk/reactos/base/system/services/services.h trunk/reactos/base/system/smss/smss.h trunk/reactos/dll/directx/ksuser/ksuser.h trunk/reactos/dll/ntdll/include/ntdll.h trunk/reactos/dll/win32/aclui/precomp.h trunk/reactos/dll/win32/beepmidi/beepmidi.c trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c trunk/reactos/dll/win32/fmifs/precomp.h trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h trunk/reactos/dll/win32/kernel32/k32.h Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -7,7 +7,10 @@ #include <windows.h> #include <netevent.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obtypes.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <services/services.h> Modified: trunk/reactos/base/system/smss/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.h?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -6,7 +6,16 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmtypes.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/umfuncs.h> #include <sm/api.h> #include <sm/helper.h> Modified: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -4,7 +4,10 @@ #define WIN32_NO_STATUS #include <windows.h> -#include <ndk/ntndk.h> +//#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obtypes.h> +#include <ndk/rtlfuncs.h> #include <ks.h> Modified: trunk/reactos/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -24,7 +24,19 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/dbgkfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdtypes.h> +#include <ndk/kefuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/umfuncs.h> /* Internal NTDLL */ #include "ntdllp.h" Modified: trunk/reactos/dll/win32/aclui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/aclui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/precomp.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -1,8 +1,8 @@ +#define _ACLUI_ #define WIN32_NO_STATUS +#include <windows.h> #define NTOS_MODE_USER -#define _ACLUI_ -#include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> #include <commctrl.h> #include <oleauto.h> #include <objsel.h> Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -41,9 +41,11 @@ #define CONTINUOUS_NOTES #define WIN32_NO_STATUS +#include <windows.h> #define NTOS_MODE_USER -#include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <stdio.h> #include <ntddbeep.h> #include <math.h> Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/pr… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -15,7 +15,7 @@ #include <windows.h> #include <winerror.h> #include <windns.h> -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> /* Internal DNSAPI Headers */ #include <internal/windns.h> Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/st… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -1,10 +1,4 @@ -/* Can't use precomp.h because these weren't stubbed properly */ -#define WIN32_NO_STATUS -#define NTOS_MODE_USER -#include <windows.h> -#include <windns.h> -#include <ndk/ntndk.h> - +#include "precomp.h" #include <debug.h> DNS_STATUS WINAPI Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -15,9 +15,13 @@ #define UNICODE #define _UNICODE +#include <stdio.h> + /* PSDK/NDK Headers */ #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> /* FMIFS Public Header */ #include <fmifs/fmifs.h> Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -4,6 +4,7 @@ #define NtCurrentTeb NtXCurrentTeb #include <stdarg.h> +#include <stdio.h> #include <stdlib.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H @@ -24,7 +25,9 @@ #include <ws2tcpip.h> #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <nspapi.h> #include <iptypes.h> #include "iphlpapi.h" Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -20,7 +20,20 @@ #undef NTDDI_VERSION #define NTDDI_VERSION NTDDI_WS03SP1 -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/dbgkfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdtypes.h> +#include <ndk/kefuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/pofuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> +#include <ndk/umfuncs.h> /* CSRSS Header */ #include <csrss/csrss.h>

1 0

[akhaldi] 53230: [AUTOCHK][CMD][TASKMGR] * Exclude some indirectly included headers.
by akhaldi＠svn.reactos.org 14 Aug '11

14 Aug '11

Author: akhaldi Date: Sun Aug 14 12:56:59 2011 New Revision: 53230 URL: http://svn.reactos.org/svn/reactos?rev=53230&view=rev Log: [AUTOCHK][CMD][TASKMGR] * Exclude some indirectly included headers. Modified: trunk/reactos/base/applications/taskmgr/precomp.h trunk/reactos/base/shell/cmd/precomp.h trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/precomp.h [iso-8859-1] Sun Aug 14 12:56:59 2011 @@ -13,7 +13,6 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/extypes.h> #include <ndk/exfuncs.h> #include <aclapi.h> #include <commctrl.h> Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] Sun Aug 14 12:56:59 2011 @@ -26,7 +26,6 @@ #include <assert.h> #define NTOS_MODE_USER -#include <ndk/pstypes.h> #include <ndk/rtlfuncs.h> #include "resource.h" Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Sun Aug 14 12:56:59 2011 @@ -15,9 +15,7 @@ #define NTOS_MODE_USER #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> -#include <ndk/obtypes.h> #include <ndk/obfuncs.h> -#include <ndk/pstypes.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/umfuncs.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs