Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

by gdalsnes＠svn.reactos.com

hardon cant svn Deleted: branches/hardons1stbranch/ Added: branches/win32k rewrite attempt/hardons1stbranch/ _____ Copied: branches/win32k rewrite attempt/hardons1stbranch (from rev 16818, branches/hardons1stbranch)

19 years, 6 months

[gdalsnes] 16818: move stuff:-|

by gdalsnes＠svn.reactos.com

move stuff:-| Deleted: branches/win32k rewrite attempt/Doxyfile Deleted: branches/win32k rewrite attempt/dib/ Deleted: branches/win32k rewrite attempt/eng/ Deleted: branches/win32k rewrite attempt/include/ Deleted: branches/win32k rewrite attempt/ldr/ Deleted: branches/win32k rewrite attempt/main/ Deleted: branches/win32k rewrite attempt/misc/ Deleted: branches/win32k rewrite attempt/ntddraw/ Deleted: branches/win32k rewrite attempt/ntuser/ Deleted: branches/win32k rewrite attempt/objects/ Deleted: branches/win32k rewrite attempt/stubs/ Deleted: branches/win32k rewrite attempt/tests/ Deleted: branches/win32k rewrite attempt/w32k.h Added: branches/win32k rewrite attempt/win32k/ Added: branches/win32k rewrite attempt/win32k/Doxyfile Added: branches/win32k rewrite attempt/win32k/dib/ Added: branches/win32k rewrite attempt/win32k/eng/ Added: branches/win32k rewrite attempt/win32k/include/ Added: branches/win32k rewrite attempt/win32k/ldr/ Added: branches/win32k rewrite attempt/win32k/main/ Added: branches/win32k rewrite attempt/win32k/misc/ Added: branches/win32k rewrite attempt/win32k/ntddraw/ Added: branches/win32k rewrite attempt/win32k/ntuser/ Added: branches/win32k rewrite attempt/win32k/objects/ Added: branches/win32k rewrite attempt/win32k/stubs/ Added: branches/win32k rewrite attempt/win32k/tests/ Added: branches/win32k rewrite attempt/win32k/w32k.h Added: branches/win32k rewrite attempt/win32k/win32k.def Added: branches/win32k rewrite attempt/win32k/win32k.rc Added: branches/win32k rewrite attempt/win32k/win32k.xml Deleted: branches/win32k rewrite attempt/win32k.def Deleted: branches/win32k rewrite attempt/win32k.rc Deleted: branches/win32k rewrite attempt/win32k.xml _____ Deleted: branches/win32k rewrite attempt/Doxyfile --- branches/win32k rewrite attempt/Doxyfile 2005-07-27 21:09:08 UTC (rev 16817) +++ branches/win32k rewrite attempt/Doxyfile 2005-07-27 21:22:26 UTC (rev 16818) @@ -1,206 +0,0 @@ -# Doxyfile 1.3.5 - -#---------------------------------------------------------------------- ----- -# Project related configuration options -#---------------------------------------------------------------------- ----- -PROJECT_NAME = "ReactOS WIN32K" -PROJECT_NUMBER = -OUTPUT_DIRECTORY = doxy-doc -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = YES -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = YES -STRIP_FROM_PATH = ../.. -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = NO -SUBGROUPING = YES -#---------------------------------------------------------------------- ----- -# Build related configuration options -#---------------------------------------------------------------------- ----- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = YES -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -#---------------------------------------------------------------------- ----- -# configuration options related to warning and progress messages -#---------------------------------------------------------------------- ----- -QUIET = NO -WARNINGS = NO -WARN_IF_UNDOCUMENTED = NO -WARN_IF_DOC_ERROR = YES -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#---------------------------------------------------------------------- ----- -# configuration options related to the input files -#---------------------------------------------------------------------- ----- -INPUT = . -FILE_PATTERNS = *.c \ - *.h -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = YES -IMAGE_PATH = -INPUT_FILTER = -FILTER_SOURCE_FILES = NO -#---------------------------------------------------------------------- ----- -# configuration options related to source browsing -#---------------------------------------------------------------------- ----- -SOURCE_BROWSER = YES -INLINE_SOURCES = YES -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -VERBATIM_HEADERS = NO -#---------------------------------------------------------------------- ----- -# configuration options related to the alphabetical class index -#---------------------------------------------------------------------- ----- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#---------------------------------------------------------------------- ----- -# configuration options related to the HTML output -#---------------------------------------------------------------------- ----- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 200 -#---------------------------------------------------------------------- ----- -# configuration options related to the LaTeX output -#---------------------------------------------------------------------- ----- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#---------------------------------------------------------------------- ----- -# configuration options related to the RTF output -#---------------------------------------------------------------------- ----- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = YES -RTF_HYPERLINKS = YES -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#---------------------------------------------------------------------- ----- -# configuration options related to the man page output -#---------------------------------------------------------------------- ----- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#---------------------------------------------------------------------- ----- -# configuration options related to the XML output -#---------------------------------------------------------------------- ----- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -#---------------------------------------------------------------------- ----- -# configuration options for the AutoGen Definitions output -#---------------------------------------------------------------------- ----- -GENERATE_AUTOGEN_DEF = NO -#---------------------------------------------------------------------- ----- -# configuration options related to the Perl module output -#---------------------------------------------------------------------- ----- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#---------------------------------------------------------------------- ----- -# Configuration options related to the preprocessor -#---------------------------------------------------------------------- ----- -ENABLE_PREPROCESSING = NO -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = ../../include -INCLUDE_FILE_PATTERNS = *.h -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#---------------------------------------------------------------------- ----- -# Configuration::addtions related to external references -#---------------------------------------------------------------------- ----- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#---------------------------------------------------------------------- ----- -# Configuration options related to the dot tool -#---------------------------------------------------------------------- ----- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = NO -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = YES -GRAPHICAL_HIERARCHY = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#---------------------------------------------------------------------- ----- -# Configuration::addtions related to the search engine -#---------------------------------------------------------------------- ----- -SEARCHENGINE = YES _____ Deleted: branches/win32k rewrite attempt/w32k.h --- branches/win32k rewrite attempt/w32k.h 2005-07-27 21:09:08 UTC (rev 16817) +++ branches/win32k rewrite attempt/w32k.h 2005-07-27 21:22:26 UTC (rev 16818) @@ -1,45 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Graphics Subsystem - * FILE: subsys/win32k/w32k.h - * PURPOSE: Main Win32K Header - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -/* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ndk/ntndk.h> - -/* Win32 Headers */ -/* FIXME: Defines in winbase.h that we need... */ -typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; -#define WINBASEAPI -#define STARTF_USESIZE 2 -#define STARTF_USEPOSITION 4 -#include <stdarg.h> -#include <windef.h> -#include <wingdi.h> -#include <winddi.h> -#include <winuser.h> -#include <dde.h> -#include <wincon.h> - -/* SEH Support with PSEH */ -#include <pseh/pseh.h> - -/* CSRSS Header */ -#include <csrss/csrss.h> - -/* Helper Header */ -#include <reactos/helper.h> - -/* External Win32K Header */ -#include <win32k/win32k.h> -#include <win32k/win32.h> - -/* Internal Win32K Header */ -#include "include/win32k.h" _____ Copied: branches/win32k rewrite attempt/win32k/Doxyfile (from rev 16817, branches/win32k rewrite attempt/Doxyfile) _____ Copied: branches/win32k rewrite attempt/win32k/dib (from rev 16817, branches/win32k rewrite attempt/dib) _____ Copied: branches/win32k rewrite attempt/win32k/eng (from rev 16817, branches/win32k rewrite attempt/eng) _____ Copied: branches/win32k rewrite attempt/win32k/include (from rev 16817, branches/win32k rewrite attempt/include) _____ Copied: branches/win32k rewrite attempt/win32k/ldr (from rev 16817, branches/win32k rewrite attempt/ldr) _____ Copied: branches/win32k rewrite attempt/win32k/main (from rev 16817, branches/win32k rewrite attempt/main) _____ Copied: branches/win32k rewrite attempt/win32k/misc (from rev 16817, branches/win32k rewrite attempt/misc) _____ Copied: branches/win32k rewrite attempt/win32k/ntddraw (from rev 16817, branches/win32k rewrite attempt/ntddraw) _____ Copied: branches/win32k rewrite attempt/win32k/ntuser (from rev 16817, branches/win32k rewrite attempt/ntuser) _____ Copied: branches/win32k rewrite attempt/win32k/objects (from rev 16817, branches/win32k rewrite attempt/objects) _____ Copied: branches/win32k rewrite attempt/win32k/stubs (from rev 16817, branches/win32k rewrite attempt/stubs) _____ Copied: branches/win32k rewrite attempt/win32k/tests (from rev 16817, branches/win32k rewrite attempt/tests) _____ Copied: branches/win32k rewrite attempt/win32k/w32k.h (from rev 16817, branches/win32k rewrite attempt/w32k.h) _____ Copied: branches/win32k rewrite attempt/win32k/win32k.def (from rev 16817, branches/win32k rewrite attempt/win32k.def) _____ Copied: branches/win32k rewrite attempt/win32k/win32k.rc (from rev 16817, branches/win32k rewrite attempt/win32k.rc) _____ Copied: branches/win32k rewrite attempt/win32k/win32k.xml (from rev 16817, branches/win32k rewrite attempt/win32k.xml) _____ Deleted: branches/win32k rewrite attempt/win32k.def --- branches/win32k rewrite attempt/win32k.def 2005-07-27 21:09:08 UTC (rev 16817) +++ branches/win32k rewrite attempt/win32k.def 2005-07-27 21:22:26 UTC (rev 16818) @@ -1,193 +0,0 @@ -; $Id$ -; -; win32k.def -; -; ReactOS win32k.sys -; -LIBRARY win32k -EXPORTS -BRUSHOBJ_pvAllocRbrush@8 -BRUSHOBJ_pvGetRbrush@4 -BRUSHOBJ_ulGetBrushColor@4 -CLIPOBJ_bEnum@12 -CLIPOBJ_cEnumStart@20 -CLIPOBJ_ppoGetPath@4 -EngAlphaBlend@28 -EngAcquireSemaphore@4 -EngAllocMem@12 -EngAllocPrivateUserMem@12 -EngAllocUserMem@8 -EngAssociateSurface@12 -EngBitBlt@44 -EngCheckAbort@4 -EngComputeGlyphSet@12 -EngControlSprites@8 -EngCopyBits@24 -EngCreateBitmap@24 -EngCreateClip@0 -EngCreateDeviceBitmap@16 -EngCreateDeviceSurface@16 -EngCreateDriverObj@12 -EngCreateEvent@4 -EngCreatePalette@24 -EngCreatePath@0 -EngCreateSemaphore@0 -EngCreateWnd@20 -EngDebugBreak(a)12=NTOSKRNL.DbgBreakPoint -EngDebugPrint@12 -EngDeleteClip@4 -EngDeleteDriverObj@12 -EngDeleteEvent@4 -EngDeletePalette@4 -EngDeletePath@4 -EngDeleteSafeSemaphore@4 -EngDeleteSemaphore@4 -EngDeleteSurface@4 -EngDeleteWnd@4 -EngDeviceIoControl@28 -EngDitherColor@16 -EngEnumForms@24 -EngEraseSurface@12 -EngFillPath@28 -EngFindImageProcAddress@8 -EngFindResource@16 -EngFreeMem@4 -EngFreeModule@4 -EngFreePrivateUserMem@8 -EngFreeUserMem@4 -EngGetCurrentCodePage(a)8=ntoskrnl.RtlGetCurrentCodePage -EngGetCurrentProcessId@0 -EngGetCurrentThreadId@0 -EngGetDriverName@4 -EngGetFileChangeTime@8 -EngGetFilePath@8 -EngGetForm@24 -EngGetLastError@0 -EngGetPrinter@20 -EngGetPrinterData@24 -EngGetPrinterDataFileName@4 -EngGetProcessHandle@0 -EngGetType1FontList@24 -EngGradientFill@40 -EngInitializeSafeSemaphore@4 -EngLineTo@36 -EngLoadImage@4 -EngLoadModule@4 -EngLoadModuleForWrite@8 -EngLockDriverObj@4 -EngLockSurface@4 -EngMapEvent@20 -EngMapFontFile@12 -EngMapModule@8 -EngMarkBandingSurface@4 -EngModifySurface@32 -EngMovePointer@16 -EngMulDiv@12 -EngMultiByteToUnicodeN(a)20=ntoskrnl.RtlMultiByteToUnicodeN -EngMultiByteToWideChar@20 -EngPaint@20 -EngProbeForRead(a)12=NTOSKRNL.ProbeForRead -EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite -EngQueryLocalTime@4 -EngQueryPalette@16 -EngQueryPerformanceCounter@4 -EngQueryPerformanceFrequency@4 -EngQuerySystemAttribute@8 -EngReleaseSemaphore@4 -EngRestoreFloatingPointState@4 -EngSaveFloatingPointState@8 -EngSecureMem@8 -EngSetEvent@4 -EngSetLastError@4 -EngSetPointerShape@40 -EngSetPointerTag@20 -EngSetPrinterData@20 -EngSort@16 -EngStretchBlt@44 -EngStrokeAndFillPath@40 -EngStrokePath@32 -EngTextOut@40 -EngTransparentBlt@32 -EngUnicodeToMultiByteN(a)20=ntoskrnl.RtlUnicodeToMultiByteN -EngUnloadImage@4 -EngUnlockDriverObj@4 -EngUnlockSurface@4 -EngUnmapEvent@4 -EngUnmapFontFile@4 -EngUnsecureMem@4 -EngWaitForSingleObject@8 -EngWideCharToMultiByte@20 -EngWritePrinter@16 -FLOATOBJ_Add@8 -FLOATOBJ_AddFloat@8 -FLOATOBJ_AddFloatObj -FLOATOBJ_AddLong@8 -FLOATOBJ_Div@8 -FLOATOBJ_DivFloat@8 -FLOATOBJ_DivFloatObj -FLOATOBJ_DivLong@8 -FLOATOBJ_Equal@8 -FLOATOBJ_EqualLong@8 -FLOATOBJ_GetFloat@4 -FLOATOBJ_GetLong@4 -FLOATOBJ_GreaterThan@8 -FLOATOBJ_GreaterThanLong@8 -FLOATOBJ_LessThan@8 -FLOATOBJ_LessThanLong@8 -FLOATOBJ_Mul@8 -FLOATOBJ_MulFloat@8 -FLOATOBJ_MulFloatObj -FLOATOBJ_MulLong@8 -FLOATOBJ_Neg@4 -FLOATOBJ_SetFloat@8 -FLOATOBJ_SetLong@8 -FLOATOBJ_Sub@8 -FLOATOBJ_SubFloat@8 -FLOATOBJ_SubFloatObj -FLOATOBJ_SubLong@8 -FONTOBJ_cGetAllGlyphHandles@8 -FONTOBJ_cGetGlyphs@20 -FONTOBJ_pifi@4 -FONTOBJ_pvTrueTypeFontFile@8 -FONTOBJ_pxoGetXform@4 -FONTOBJ_vGetInfo@12 -HeapVidMemAllocAligned@20 -HT_ComputeRGBGammaTable@24 -HT_Get8BPPFormatPalette@16 -PALOBJ_cGetColors@16 -PATHOBJ_bCloseFigure@4 -PATHOBJ_bEnum@8 -PATHOBJ_bEnumClipLines@12 -PATHOBJ_bMoveTo@12 -PATHOBJ_bPolyBezierTo@12 -PATHOBJ_bPolyLineTo@12 -PATHOBJ_vEnumStart@4 -PATHOBJ_vEnumStartClipLines@16 -PATHOBJ_vGetBounds@8 -RtlAnsiCharToUnicodeChar(a)4=NTOSKRNL.RtlAnsiCharToUnicodeChar -RtlMultiByteToUnicodeN(a)20=NTOSKRNL.RtlMultiByteToUnicodeN -RtlRaiseException(a)4=NTOSKRNL.RtlRaiseException -RtlUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUnicodeToMultiByteN -RtlUnicodeToMultiByteSize(a)12=NTOSKRNL.RtlUnicodeToMultiByteSize -RtlUnwind(a)16=NTOSKRNL.RtlUnwind -RtlUpcaseUnicodeChar(a)4=NTOSKRNL.RtlUpcaseUnicodeChar -RtlUpcaseUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN -STROBJ_bEnum@12 -STROBJ_dwGetCodePage@4 -STROBJ_vEnumStart@4 -VidMemFree@8 -Win32kInitialize@0 -WNDOBJ_bEnum@12 -WNDOBJ_cEnumStart@16 -WNDOBJ_vSetConsumer@8 -XFORMOBJ_bApplyXform@20 -XFORMOBJ_iGetFloatObjXform@8 -XFORMOBJ_iGetXform@8 -XLATEOBJ_cGetPalette@16 -XLATEOBJ_iXlate@8 -XLATEOBJ_piVector@4 -_abnormal_termination=NTOSKRNL._abnormal_termination -_except_handler2=NTOSKRNL._except_handler2 -_global_unwind2=NTOSKRNL._global_unwind2 -_local_unwind2=NTOSKRNL._local_unwind2 -;EOF _____ Deleted: branches/win32k rewrite attempt/win32k.rc --- branches/win32k rewrite attempt/win32k.rc 2005-07-27 21:09:08 UTC (rev 16817) +++ branches/win32k rewrite attempt/win32k.rc 2005-07-27 21:22:26 UTC (rev 16818) @@ -1,7 +0,0 @@ -/* $Id$ */ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "W32 GDI KM subsystem\0" -#define REACTOS_STR_INTERNAL_NAME "win32k\0" -#define REACTOS_STR_ORIGINAL_FILENAME "win32k.sys\0" -#include <reactos/version.rc> _____ Deleted: branches/win32k rewrite attempt/win32k.xml --- branches/win32k rewrite attempt/win32k.xml 2005-07-27 21:09:08 UTC (rev 16817) +++ branches/win32k rewrite attempt/win32k.xml 2005-07-27 21:22:26 UTC (rev 16818) @@ -1,145 +0,0 @@ -<module name="win32k_base" type="objectlibrary"> - <include base="win32k">.</include> - <include base="win32k">include</include> - <include base="ntoskrnl">include</include> - <include base="freetype">include</include> - <define name="UNICODE" /> - <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0501</define> - <define name="WINVER">0x600</define> - <define name="_SEH_NO_NATIVE_NLG" /> - <define name="_WIN32K_" /> - <pch>w32k.h</pch> - <directory name="dib"> - <file>dib1bpp.c</file> - <file>dib4bpp.c</file> - <file>dib8bpp.c</file> - <file>dib16bpp.c</file> - <file>dib16gen.c</file> - <file>dib24bpp.c</file> - <file>dib32bpp.c</file> - <file>dib.c</file> - </directory> - <directory name="eng"> - <file>bitblt.c</file> - <file>brush.c</file> - <file>clip.c</file> - <file>copybits.c</file> - <file>debug.c</file> - <file>device.c</file> - <file>driverobj.c</file> - <file>error.c</file> - <file>event.c</file> - <file>float.c</file> - <file>gradient.c</file> - <file>lineto.c</file> - <file>mem.c</file> - <file>misc.c</file> - <file>mouse.c</file> - <file>paint.c</file> - <file>palette.c</file> - <file>perfcnt.c</file> - <file>semaphor.c</file> - <file>sort.c</file> - <file>surface.c</file> - <file>transblt.c</file> - <file>window.c</file> - <file>xlate.c</file> - </directory> - <directory name="ldr"> - <file>loader.c</file> - </directory> - <directory name="main"> - <file>dllmain.c</file> - </directory> - <directory name="misc"> - <file>driver.c</file> - <file>error.c</file> - <file>math.c</file> - <file>ssec.c</file> - <file>copy.c</file> - </directory> - <directory name="ntddraw"> - <file>ddraw.c</file> - <file>stubs.c</file> - </directory> - <directory name="ntuser"> - <file>handle.c</file> - <file>accelerator.c</file> - <file>callback.c</file> - <file>caret.c</file> - <file>class.c</file> - <file>clipboard.c</file> - <file>csr.c</file> - <file>cursoricon.c</file> - <file>desktop.c</file> - <file>focus.c</file> - <file>guicheck.c</file> - <file>hook.c</file> - <file>hotkey.c</file> - <file>input.c</file> - <file>keyboard.c</file> - <file>menu.c</file> - <file>message.c</file> - <file>metric.c</file> - <file>misc.c</file> - <file>monitor.c</file> - <file>msgqueue.c</file> - <file>ntuser.c</file> - <file>painting.c</file> - <file>prop.c</file> - <file>scrollbar.c</file> - <file>stubs.c</file> - <file>timer.c</file> - <file>useratom.c</file> - <file>vis.c</file> - <file>windc.c</file> - <file>window.c</file> - <file>winpos.c</file> - <file>winsta.c</file> - </directory> - <directory name="objects"> - <file>bezier.c</file> - <file>bitmaps.c</file> - <file>brush.c</file> - <file>cliprgn.c</file> - <file>color.c</file> - <file>coord.c</file> - <file>dc.c</file> - <file>dib.c</file> - <file>fillshap.c</file> - <file>font.c</file> - <file>gdiobj.c</file> - <file>icm.c</file> - <file>line.c</file> - <file>metafile.c</file> - <file>paint.c</file> - <file>palette.c</file> - <file>path.c</file> - <file>pen.c</file> - <file>polyfill.c</file> - <file>print.c</file> - <file>rect.c</file> - <file>region.c</file> - <file>stockobj.c</file> - <file>text.c</file> - <file>wingl.c</file> - </directory> - <directory name="stubs"> - <file>stubs.c</file> - <file>xpstubs.c</file> - </directory> -</module> -<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" warnings="true"> - <importlibrary definition="win32k.def" /> - <library>win32k_base</library> - <library>pseh</library> - <library>rosrtl</library> - <library>ntoskrnl</library> - <library>hal</library> - <library>freetype</library> - <file>win32k.rc</file> -</module> -<directory name="tests"> - <xi:include href="tests/win32k.xml" /> -</directory>

19 years, 6 months

[gdalsnes] 16817: give better name

by gdalsnes＠svn.reactos.com

give better name Deleted: branches/hardons1stbranch/win32k/ Added: branches/win32k rewrite attempt/ _____ Copied: branches/win32k rewrite attempt (from rev 16816, branches/hardons1stbranch/win32k)

19 years, 6 months

[weiden] 16816: implemented GetExplicitEntriesFromAcl and forward it to the MARTA provider

by weiden＠svn.reactos.com

implemented GetExplicitEntriesFromAcl and forward it to the MARTA provider Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/advapi32/sec/ac.c Modified: trunk/reactos/lib/advapi32/sec/misc.c Modified: trunk/reactos/lib/ntmarta/ntmarta.c Modified: trunk/reactos/lib/ntmarta/ntmarta.def _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-07-27 20:09:46 UTC (rev 16815) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-07-27 20:24:11 UTC (rev 16816) @@ -242,8 +242,8 @@ ;GetEffectiveRightsFromAclA@12 ;GetEffectiveRightsFromAclW@12 ;GetEventLogInformation -;GetExplicitEntriesFromAclA@12 -;GetExplicitEntriesFromAclW@12 +GetExplicitEntriesFromAclA(a)12=ADVAPI32.GetExplicitEntriesFromAclW +GetExplicitEntriesFromAclW@12 GetFileSecurityA@20 GetFileSecurityW@20 ;GetInformationCodeAuthzLevelW _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2005-07-27 20:09:46 UTC (rev 16815) +++ trunk/reactos/lib/advapi32/advapi32.h 2005-07-27 20:24:11 UTC (rev 16816) @@ -67,7 +67,10 @@ PACL OldAcl, PACL* NewAcl); - PVOID RewriteGetExplicitEntriesFromAcl; + DWORD (STDCALL *RewriteGetExplicitEntriesFromAcl)(PACL pacl, + PULONG pcCountOfExplicitEntries, + PEXPLICIT_ACCESS_W* pListOfExplicitEntries); + PVOID TreeResetNamedSecurityInfo; DWORD (STDCALL *GetInheritanceSource)(LPWSTR pObjectName, _____ Modified: trunk/reactos/lib/advapi32/sec/ac.c --- trunk/reactos/lib/advapi32/sec/ac.c 2005-07-27 20:09:46 UTC (rev 16815) +++ trunk/reactos/lib/advapi32/sec/ac.c 2005-07-27 20:24:11 UTC (rev 16816) @@ -669,4 +669,30 @@ } +/* + * @implemented + */ +DWORD +STDCALL +GetExplicitEntriesFromAclW( + PACL pacl, + PULONG pcCountOfExplicitEntries, + PEXPLICIT_ACCESS_W* pListOfExplicitEntries + ) +{ + DWORD ErrorCode; + + ErrorCode = CheckNtMartaPresent(); + if (ErrorCode == ERROR_SUCCESS) + { + /* call the MARTA provider */ + ErrorCode = AccRewriteGetExplicitEntriesFromAcl(pacl, + pcCountOfExplicitEntries, + pListOfExplicitEntries); + } + + return ErrorCode; +} + + /* EOF */ _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-07-27 20:09:46 UTC (rev 16815) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-07-27 20:24:11 UTC (rev 16816) @@ -59,8 +59,8 @@ FindNtMartaProc(RewriteGetHandleRights); FindNtMartaProc(RewriteSetHandleRights); FindNtMartaProc(RewriteSetEntriesInAcl); + FindNtMartaProc(RewriteGetExplicitEntriesFromAcl); #if 0 - FindNtMartaProc(RewriteGetExplicitEntriesFromAcl); FindNtMartaProc(TreeResetNamedSecurityInfo); #endif FindNtMartaProc(GetInheritanceSource); _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-27 20:09:46 UTC (rev 16815) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-27 20:24:11 UTC (rev 16816) @@ -158,6 +158,21 @@ } +/********************************************************************** + * AccRewriteGetExplicitEntriesFromAcl EXPORTED + * + * @unimplemented + */ +DWORD STDCALL +AccRewriteGetExplicitEntriesFromAcl(PACL pacl, + PULONG pcCountOfExplicitEntries, + PEXPLICIT_ACCESS_W* pListOfExplicitEntries) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + BOOL STDCALL DllMain(IN HINSTANCE hinstDLL, IN DWORD dwReason, _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.def --- trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-27 20:09:46 UTC (rev 16815) +++ trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-27 20:24:11 UTC (rev 16816) @@ -4,7 +4,7 @@ AccFreeIndexArray@12 AccGetInheritanceSource@40 ;AccProvHandleGrantAccessRights; -;AccRewriteGetExplicitEntriesFromAcl +AccRewriteGetExplicitEntriesFromAcl@12 AccRewriteGetHandleRights@32 AccRewriteGetNamedRights@32 AccRewriteSetEntriesInAcl@16

19 years, 6 months

[ion] 16815: - Fix included headers in GDI for PSDK compatibility

by ion＠svn.reactos.com

- Fix included headers in GDI for PSDK compatibility - Fix some incorrect definitions. - Remove more quintuplicated header nonsense... Deleted: trunk/reactos/include/win32k/debug.h Deleted: trunk/reactos/include/win32k/debug1.h Modified: trunk/reactos/include/win32k/driver.h Modified: trunk/reactos/include/win32k/kapi.h Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/gdi32/misc/stubs.c Modified: trunk/reactos/lib/gdi32/misc/wingl.c _____ Deleted: trunk/reactos/include/win32k/debug.h --- trunk/reactos/include/win32k/debug.h 2005-07-27 20:09:19 UTC (rev 16814) +++ trunk/reactos/include/win32k/debug.h 2005-07-27 20:09:46 UTC (rev 16815) @@ -1,12 +0,0 @@ - -#ifndef H_WIN32K_DEBUG -#define H_WIN32K_DEBUG - -#ifdef CHECKED_BUILD -#define FIXME(S) DbgPrint ("win32k: FIXME at: File:%s line:%d reason:%s", __FILE__, __LINE__, S) -#else -#define FIXME(S) -#endif - -#endif - _____ Deleted: trunk/reactos/include/win32k/debug1.h --- trunk/reactos/include/win32k/debug1.h 2005-07-27 20:09:19 UTC (rev 16814) +++ trunk/reactos/include/win32k/debug1.h 2005-07-27 20:09:46 UTC (rev 16815) @@ -1,72 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/internal/debug.h - * PURPOSE: Useful debugging macros - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * UPDATE HISTORY: - * 28/05/98: Created - */ - -/* - * NOTE: Define NDEBUG before including this header to disable debugging - * macros - */ - -#ifndef __INTERNAL_DEBUG -#define __INTERNAL_DEBUG - -#define UNIMPLEMENTED do {DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); for(;;); } while(0); - -/* FIXME: should probably remove this later */ -#if !defined(CHECKED) && !defined(NDEBUG) -#define CHECKED -#endif - -#ifndef NASSERT -#ifndef assert -#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); KeBugCheck(0); } -#endif -#ifndef ASSERT -#define ASSERT(x) assert(x) -#endif -#else -#ifndef assert -#define assert(x) -#endif -#ifndef ASSERT -#define ASSERT(x) -#endif -#endif - -#ifdef DBG -#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint -#define CHECKPOINT1 DbgPrint("%s:%d\n",__FILE__,__LINE__); -#else -#define DPRINT1(args...) -#define CHECKPOINT1(args...) -#endif - -#ifdef __NTOSKRNL__ -#define DPRINT_CHECKS -#else -#define DPRINT_CHECKS -#endif - -#ifndef NDEBUG -#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint -#define CHECKPOINT DbgPrint("%s:%d\n",__FILE__,__LINE__); -#else -#define DPRINT(args...) -#define CHECKPOINT -#endif /* NDEBUG */ - -/* - * FUNCTION: Assert a maximum value for the current irql - * ARGUMENTS: - * x = Maximum irql - */ -#define ASSERT_IRQL(x) assert(KeGetCurrentIrql()<=(x)) -#define assert_irql(x) assert(KeGetCurrentIrql()<=(x)) - -#endif /* __INTERNAL_DEBUG */ _____ Modified: trunk/reactos/include/win32k/driver.h --- trunk/reactos/include/win32k/driver.h 2005-07-27 20:09:19 UTC (rev 16814) +++ trunk/reactos/include/win32k/driver.h 2005-07-27 20:09:46 UTC (rev 16815) @@ -2,7 +2,7 @@ #ifndef __WIN32K_DRIVER_H #define __WIN32K_DRIVER_H -#include <ddk/winddi.h> +#include <winddi.h> typedef BOOL (STDCALL *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); typedef DHPDEV (STDCALL *PGD_ENABLEPDEV)(DEVMODEW *, _____ Modified: trunk/reactos/include/win32k/kapi.h --- trunk/reactos/include/win32k/kapi.h 2005-07-27 20:09:19 UTC (rev 16814) +++ trunk/reactos/include/win32k/kapi.h 2005-07-27 20:09:46 UTC (rev 16815) @@ -16,7 +16,6 @@ #include <win32k/dc.h> #include <win32k/coord.h> #include <win32k/bitmaps.h> -#include <win32k/debug.h> #include <win32k/fillshap.h> #include <win32k/font.h> #include <win32k/icm.h> _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2005-07-27 20:09:19 UTC (rev 16814) +++ trunk/reactos/lib/gdi32/include/precomp.h 2005-07-27 20:09:46 UTC (rev 16815) @@ -9,12 +9,14 @@ /* INCLUDES ******************************************************************/ /* SDK/DDK/NDK Headers. */ +#define NTOS_MODE_USER +#define __GDI32__ #include <windows.h> #include <ddraw.h> -#include <ddk/winddi.h> -#include <ddk/prntfont.h> +#include <ddrawi.h> +#include <winddi.h> +#include <prntfont.h> #include <ddrawgdi.h> -#define NTOS_MODE_USER #include <ndk/ntndk.h> /* Win32K External Headers */ _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-27 20:09:19 UTC (rev 16814) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-27 20:09:46 UTC (rev 16815) @@ -1200,7 +1200,7 @@ /* * @unimplemented */ -HANDLE +HCOLORSPACE STDCALL GetColorSpace( HDC hDc @@ -1215,7 +1215,7 @@ /* * @unimplemented */ -BOOL +HCOLORSPACE STDCALL SetColorSpace( HDC a0, @@ -3950,7 +3950,7 @@ /* * @unimplemented */ -BOOL STDCALL DdGetDC( +HDC STDCALL DdGetDC( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, LPPALETTEENTRY pColorTable ) _____ Modified: trunk/reactos/lib/gdi32/misc/wingl.c --- trunk/reactos/lib/gdi32/misc/wingl.c 2005-07-27 20:09:19 UTC (rev 16814) +++ trunk/reactos/lib/gdi32/misc/wingl.c 2005-07-27 20:09:46 UTC (rev 16815) @@ -24,7 +24,7 @@ #include "precomp.h" #define NDEBUG -#include <win32k/debug1.h> +#include <debug.h>

19 years, 6 months

[chorns] 16814: Add Revison ISO interface

by chorns＠svn.reactos.com

Add Revison ISO interface Added: trunk/cis/ReactOS.RevisionISO/ Added: trunk/cis/ReactOS.RevisionISO/config.template.php Added: trunk/cis/ReactOS.RevisionISO/index.php _____ Added: trunk/cis/ReactOS.RevisionISO/config.template.php --- trunk/cis/ReactOS.RevisionISO/config.template.php 2005-07-27 20:06:18 UTC (rev 16813) +++ trunk/cis/ReactOS.RevisionISO/config.template.php 2005-07-27 20:09:19 UTC (rev 16814) @@ -0,0 +1,8 @@ +<?php + +/* Rename to config.php */ + +define(ISO_BASE_URL, "http://www.server.com/iso/"); +define(ISO_PATH, "C:\\iso\\"); + +?> Property changes on: trunk/cis/ReactOS.RevisionISO/config.template.php ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/cis/ReactOS.RevisionISO/index.php --- trunk/cis/ReactOS.RevisionISO/index.php 2005-07-27 20:06:18 UTC (rev 16813) +++ trunk/cis/ReactOS.RevisionISO/index.php 2005-07-27 20:09:19 UTC (rev 16814) @@ -0,0 +1,158 @@ +<?php + +include ('config.php'); + +function dm_usort_cmp ($a, $b) { + if ($a == $b) return 0; + return ($a > $b) ? -1 : 1; +} + +function printHeader() +{ +?> +<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>ReactOS Revison ISOs</title> +<meta name="generator" content="Editpad"> +<meta name="keywords" content="OS, ReactOS, operating system"> +<meta name="author" content="ReactOS Project (ros-dev(a)reactos.com)"> +<style> +.box +{ + padding: 0px; + background-color: #88aadd; + border-left: 1px solid #f0f0f0; + border-right: 1px solid #000000; + border-top: 1px solid #f0f0f0; + border-bottom: 1px solid #000000; +} +</style> +</head> +<body bgcolor="#88aadd"> +<form method="post" action=""> +<?php +} + +function printMenu() +{ +?> +<table border="0" class="box" cellpadding="5"> +<tr> +<td height="2px"> +</td> +</tr> +<tr> +<td> + +<table border="0" cellpadding="0" cellspacing="0"> +<tr> + <td> + <b>Branch:</b> + </td> + <td> + <select name="branch" tabindex="1"> +<?php + + $d = dir(ISO_PATH); + $i = 0; + $dirlist = array(); + while (false !== ($entry = $d->read())) { + if ((strcasecmp($entry, ".") != 0) && (strcasecmp($entry, "..") != 0) && is_dir(ISO_PATH . "\\" . $entry)=="dir") { + $dirlist[$i++] = $entry; + } + } + $d->close(); + + if (is_array($dirlist)) { + usort($dirlist, "dm_usort_cmp"); + reset($dirlist); + while (list($key, $val) = each($dirlist)) { + $branch = $val; + if ($branch == $_POST["branch"] || (!isset($_POST["branch"]) && $branch == "trunk")) + $selected = " selected"; + else + $selected = ""; + echo "<option$selected>$branch</option>"; + } + } + +?> + </select> + </td> + <td> +   + </td> + <td> + <b>Revision:</b> + </td> + <td> +<?php + $revision = $_POST["revision"]; + echo "<input type=\"text\" name=\"revision\" size=\"10\" maxlength=\"10\" tabindex=\"2\" value=\"" . $revision . "\"></input>"; +?> + </td> + <td> +   + </td> + <td> + <input type="submit" name="getiso" value="Download" tabindex="3" style="border: 1px solid #000000"></input> + </td> +</tr> +</table> + +</td> +</tr> +<tr> +<td height="2px"> +</td> +</tr> +</table> +<?php +} + +function printFooter() +{ +?> +</form> + +<script> +var revision = document.getElementById('revision'); +if (revision) revision.focus(); +</script> +</body> +</html> +<?php +} + +function main() +{ + $branch = $_POST["branch"]; + $revision = $_POST["revision"]; + + $filename = "ReactOS-" . $branch . "-r" . $revision . ".iso"; + if (file_exists(ISO_PATH . $branch . "\\" . $filename)) + { + $location = ISO_BASE_URL . $branch . "/" . $filename; + header("Location: $location"); + return; + } + else + { + printHeader(); + printMenu(); + echo "<br><b>No ISO exist for branch '" . $branch . "' and revision " . $revision . ".</b><br><br>"; + printFooter(); + } +} + +if (!empty($_POST["getiso"]) && !empty($_POST["branch"]) && !empty($_POST["revision"]) && is_numeric($_POST["revision"])) + main(); +else +{ + printHeader(); + printMenu(); + printFooter(); +} + +?> Property changes on: trunk/cis/ReactOS.RevisionISO/index.php ___________________________________________________________________ Name: svn:eol-style + native

19 years, 6 months

[chorns] 16813: Move API status stylesheet

by chorns＠svn.reactos.com

Move API status stylesheet Deleted: trunk/reactos/tools/rgenstat/web/rapistatus.xsl _____ Deleted: trunk/reactos/tools/rgenstat/web/rapistatus.xsl --- trunk/reactos/tools/rgenstat/web/rapistatus.xsl 2005-07-27 20:04:48 UTC (rev 16812) +++ trunk/reactos/tools/rgenstat/web/rapistatus.xsl 2005-07-27 20:06:18 UTC (rev 16813) @@ -1,182 +0,0 @@ -<?xml version="1.0" ?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - - <xsl:output method="html" indent="no"/> -  - - - <xsl:template match="/"> - <HTML> - <HEAD> - <TITLE> - ReactOS API Status - </TITLE> - <SCRIPT src="rapistatus.js"></SCRIPT> - <LINK rel="stylesheet" type="text/css" href="rapistatus.css"></LINK> - </HEAD> - <BODY onLoad="onLoad();"> - <P> - <H1>ReactOS API Status</H1> - </P> - <P> - <TABLE> - <TR> - <TD> <INPUT type="checkbox" ID="implemented" onClick="selectImplemented();" checked="1"/> </TD> - <TD> <IMG src="i.gif"/> </TD> - <TD> Implemented </TD> - <TD width="20"/> - </TR> - <TR> - <TD> <INPUT type="checkbox" ID="unimplemented" onClick="selectUnimplemented();" checked="1"/> </TD> - <TD> <IMG src="u.gif"/> </TD> - <TD> Unimplemented </TD> - <TD width="20"/> - </TR> - </TABLE> - </P> - <DIV ID="ROOT"> - <xsl:apply-templates/> - </DIV> - <P> - Legend :<BR/> - <TABLE> - <TR> - <TD> <IMG src="c.gif"/> </TD> - <TD> Component </TD> - <TD> <IMG src="i.gif"/> </TD> - <TD> Implemented </TD> - <TD> <IMG src="sc.gif"/> </TD> - <TD> Complete </TD> - <TR> - </TR> - <TD> <IMG src="f.gif"/> </TD> - <TD> Function </TD> - <TD> <IMG src="u.gif"/> </TD> - <TD> Unimplemented </TD> - <TD></TD> - <TD></TD> - </TR> - </TABLE> - - </P> - </BODY> - </HTML> - </xsl:template> - - -  - <xsl:template match="/components"> - <xsl:apply-templates select="component"> - <xsl:sort select="@name"/> - </xsl:apply-templates> - </xsl:template> - - <xsl:template match="components/component[@implemented_total or @unimplemented_total]"> - <DIV> - <xsl:call-template name="ELEMENT"> - <xsl:with-param name="class">c</xsl:with-param> - </xsl:call-template> - <xsl:apply-templates/> - </DIV> - </xsl:template> - - -  - <xsl:template match="functions"> - <xsl:apply-templates select="function"> - <xsl:sort select="@name"/> - </xsl:apply-templates> - </xsl:template> - - <xsl:template match="functions/function"> - <DIV> - <xsl:call-template name="ELEMENT"> - <xsl:with-param name="class">f</xsl:with-param> - </xsl:call-template> - <xsl:apply-templates/> - </DIV> - </xsl:template> - - -  - - <xsl:template name="ELEMENT"> - <xsl:param name="class"/> - <xsl:param name="image"/> - <xsl:attribute name="class"> - <xsl:value-of select="$class"/> - <xsl:text>_</xsl:text> - </xsl:attribute> - <xsl:call-template name="toggle"/> - <xsl:choose> - <xsl:when test="./node() and local-name() != 'component' and @implemented = 'true'"> - <img src="i.gif" class="i"/> - </xsl:when> - <xsl:when test="./node() and local-name() != 'component' and @implemented = 'false'"> - <img src="u.gif" class="u"/> - </xsl:when> - <xsl:when test="./node() and local-name() = 'component' and @complete >= 100"> - <img src="sc.gif"/> - </xsl:when> - <xsl:otherwise> - <img src="tb.gif" with="12" height="12"/> - </xsl:otherwise> - </xsl:choose> - <xsl:choose> - <xsl:when test="$image"> - <img src="{$image}.gif" class="t"/> - </xsl:when> - <xsl:otherwise> - <img src="{$class}.gif" class="t"/> - </xsl:otherwise> - </xsl:choose> - <xsl:call-template name="name"/> - <xsl:call-template name="file"/> - <xsl:call-template name="status"/> - </xsl:template> - - <xsl:template name="status"> - <xsl:if test="@complete and @complete != 0"> - <SPAN class="st"> - <img src="sc.gif"/> - <xsl:text>: </xsl:text> - <xsl:value-of select="@complete"/> - <xsl:text>%</xsl:text> - </SPAN> - </xsl:if> - <xsl:if test="@implemented_total"> - <SPAN class="st"> - <img src="i.gif"/>: <xsl:value-of select="@implemented_total"/> - </SPAN> - </xsl:if> - <xsl:if test="@unimplemented_total"> - <SPAN class="st"> - <img src="u.gif"/>: <xsl:value-of select="@unimplemented_total"/> - </SPAN> - </xsl:if> - </xsl:template> - - <xsl:template name="toggle"> - <xsl:choose> - <xsl:when test="local-name() = 'component'"> - <IMG src="tp.gif" class="t"/> - </xsl:when> - <xsl:otherwise> - <IMG src="tb.gif"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template name="name"> - <xsl:if test="@name"> - <SPAN class="l"><xsl:value-of select="@name"/></SPAN> - </xsl:if> - </xsl:template> - - <xsl:template name="file"> - <xsl:if test="@file"> - <SPAN class="h"><xsl:value-of select="@file"/></SPAN> - </xsl:if> - </xsl:template> - -</xsl:stylesheet>

19 years, 6 months

[chorns] 16812: Add API status scripts

by chorns＠svn.reactos.com

Add API status scripts Added: trunk/cis/ Added: trunk/cis/ReactOS.ApiStatus/ Added: trunk/cis/ReactOS.ApiStatus/Default.build Added: trunk/cis/ReactOS.ApiStatus/config.template.include Added: trunk/cis/ReactOS.ApiStatus/rapistatus.xsl _____ Added: trunk/cis/ReactOS.ApiStatus/Default.build --- trunk/cis/ReactOS.ApiStatus/Default.build 2005-07-27 19:21:46 UTC (rev 16811) +++ trunk/cis/ReactOS.ApiStatus/Default.build 2005-07-27 20:04:48 UTC (rev 16812) @@ -0,0 +1,46 @@ +<?xml version="1.0"?> + +<project name="ReactOS.ApiStatus" default="publish"> + + <property name="reactos.dir" value="reactos" /> + <property name="apistatus.xsl" value="rapistatus.xsl" /> + <property name="apistatus.xml" value="rapistatus.xml" /> + <property name="apistatus.html" value="index.html" /> + <include buildfile="config.include" /> + + <target name="publish"> + <delete dir="${reactos.dir}" if="${directory::exists(reactos.dir)}" /> + <exec program="svn" commandline="export -r HEAD ${source.url} ${reactos.dir}" /> + <exec program="rgenstat" commandline="reactos\apistatus.lst ${apistatus.xml}" /> + <style style="${apistatus.xsl}" destdir="${reactos.dir}" in="${apistatus.xml}" out="${apistatus.html}" /> + <copy todir="${publish.dir}" overwrite="true"> + <fileset basedir="."> + <include name="${apistatus.xml}" /> + <include name="${apistatus.html}" /> + </fileset> + </copy> + <delete> + <fileset basedir="."> + <include name="${apistatus.xml}" /> + <include name="${apistatus.html}" /> + </fileset> + </delete> + <delete dir="${reactos.dir}" if="${directory::exists(reactos.dir)}" /> + </target> +</project> Property changes on: trunk/cis/ReactOS.ApiStatus/Default.build ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/cis/ReactOS.ApiStatus/config.template.include --- trunk/cis/ReactOS.ApiStatus/config.template.include 2005-07-27 19:21:46 UTC (rev 16811) +++ trunk/cis/ReactOS.ApiStatus/config.template.include 2005-07-27 20:04:48 UTC (rev 16812) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<project> + <property name="source.url" value="svn://svn.reactos.com/trunk/reactos" /> + <property name="publish.dir" value="C:\api" /> +</project> Property changes on: trunk/cis/ReactOS.ApiStatus/config.template.include ___________________________________________________________________ Name: svn:eol-style + native _____ Copied: trunk/cis/ReactOS.ApiStatus/rapistatus.xsl (from rev 16811, trunk/reactos/tools/rgenstat/web/rapistatus.xsl)

19 years, 6 months

[ion] 16811: - Fix debug header nonsense

by ion＠svn.reactos.com

- Fix debug header nonsense - Fix some w32api definitions - MSVC/PSDK Compatibility fixes. - Clean up user32 headers for greater PCH usage. Modified: trunk/reactos/apps/utils/ps/ps.c Modified: trunk/reactos/drivers/dd/mpu401/settings.c Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/wine/debug.h Modified: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/user32/controls/button.c Modified: trunk/reactos/lib/user32/controls/combo.c Deleted: trunk/reactos/lib/user32/controls/controls.h Modified: trunk/reactos/lib/user32/controls/edit.c Modified: trunk/reactos/lib/user32/controls/icontitle.c Modified: trunk/reactos/lib/user32/controls/listbox.c Modified: trunk/reactos/lib/user32/controls/scrollbar.c Added: trunk/reactos/lib/user32/include/controls.h Added: trunk/reactos/lib/user32/include/dde_private.h Deleted: trunk/reactos/lib/user32/include/debug.h Modified: trunk/reactos/lib/user32/include/user32.h Modified: trunk/reactos/lib/user32/include/user32p.h Modified: trunk/reactos/lib/user32/misc/dde.c Deleted: trunk/reactos/lib/user32/misc/dde_private.h Modified: trunk/reactos/lib/user32/misc/ddeclient.c Modified: trunk/reactos/lib/user32/misc/ddeserver.c Modified: trunk/reactos/lib/user32/misc/display.c Modified: trunk/reactos/lib/user32/misc/dllmain.c Modified: trunk/reactos/lib/user32/misc/exticon.c Modified: trunk/reactos/lib/user32/misc/object.c Modified: trunk/reactos/lib/user32/misc/stubs.c Modified: trunk/reactos/lib/user32/windows/bitmap.c Modified: trunk/reactos/lib/user32/windows/clipboard.c Modified: trunk/reactos/lib/user32/windows/cursor.c Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/dialog.c Modified: trunk/reactos/lib/user32/windows/draw.c Modified: trunk/reactos/lib/user32/windows/font.c Modified: trunk/reactos/lib/user32/windows/hook.c Modified: trunk/reactos/lib/user32/windows/icon.c Modified: trunk/reactos/lib/user32/windows/input.c Modified: trunk/reactos/lib/user32/windows/mdi.c Modified: trunk/reactos/lib/user32/windows/menu.c Modified: trunk/reactos/lib/user32/windows/message.c Modified: trunk/reactos/lib/user32/windows/messagebox.c Modified: trunk/reactos/lib/user32/windows/nonclient.c Modified: trunk/reactos/lib/user32/windows/paint.c Modified: trunk/reactos/lib/user32/windows/window.c Added: trunk/reactos/w32api/include/winnls32.h Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/apps/utils/ps/ps.c --- trunk/reactos/apps/utils/ps/ps.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/apps/utils/ps/ps.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -268,7 +268,7 @@ WriteFile(stdout, buf1, lstrlen(buf1), &r, NULL); EnumThreadWindows((DWORD)CurrentProcess->Threads[ti].ClientId.UniqueThre ad, - (ENUMWINDOWSPROC) EnumThreadProc, + (WNDENUMPROC) EnumThreadProc, (LPARAM)(LPTSTR) szWindowName ); } CurrentProcess = (PSYSTEM_PROCESSES)((ULONG_PTR)CurrentProcess + _____ Modified: trunk/reactos/drivers/dd/mpu401/settings.c --- trunk/reactos/drivers/dd/mpu401/settings.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/drivers/dd/mpu401/settings.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -13,7 +13,7 @@ #include "mpu401.h" -// #define NDEBUG +#define NDEBUG #include <debug.h> #include "sbdebug.h" // our own debug helper _____ Modified: trunk/reactos/include/reactos/debug.h --- trunk/reactos/include/reactos/debug.h 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/include/reactos/debug.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -63,7 +63,7 @@ #endif #ifndef NDEBUG -#define DPRINT(...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); } while(0); +#define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); #else #ifdef __GNUC__ _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/include/wine/debug.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -6,6 +6,11 @@ #include <windows.h> #include <wchar.h> +/* Add ROS Master debug functions if not added yet */ +#ifndef __INTERNAL_DEBUG +#include <reactos/debug.h> +#endif + #ifndef __GNUC__ #define __FUNCTION__ "" #define inline __inline @@ -13,21 +18,6 @@ unsigned long DbgPrint(char *Format,...); -#ifdef DBG -#define DPRINT1 DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint -#else -#define DPRINT1(...) -#endif - -#if !defined(DBG) || !defined(YDEBUG) -#define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) -#else -#define DPRINT DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint -#endif - -#define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - - struct _GUID; /* Exported definitions and macros */ _____ Modified: trunk/reactos/lib/ntdll/inc/ntdll.h --- trunk/reactos/lib/ntdll/inc/ntdll.h 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/ntdll/inc/ntdll.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -20,6 +20,9 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> +/* ELF Support */ +#include <elf/elf.h> + /* Internal NTDLL */ #include "ntdllp.h" _____ Modified: trunk/reactos/lib/user32/controls/button.c --- trunk/reactos/lib/user32/controls/button.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/controls/button.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -19,20 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define __WINE__ #include <user32.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> -#include "controls.h" -#include "wine/unicode.h" -#include "wine/debug.h" - -#ifdef __REACTOS__ -HPEN STDCALL GetSysColorPen(int nIndex); -#endif - /* GetWindowLong offsets for window extra information */ #define STATE_GWL_OFFSET 0 #define HFONT_GWL_OFFSET (sizeof(LONG)) @@ -126,33 +114,33 @@ }; -inline static LONG get_button_state( HWND hwnd ) +__inline static LONG get_button_state( HWND hwnd ) { return GetWindowLongA( hwnd, STATE_GWL_OFFSET ); } -inline static void set_button_state( HWND hwnd, LONG state ) +__inline static void set_button_state( HWND hwnd, LONG state ) { SetWindowLongA( hwnd, STATE_GWL_OFFSET, state ); } -inline static HFONT get_button_font( HWND hwnd ) +__inline static HFONT get_button_font( HWND hwnd ) { return (HFONT)GetWindowLongA( hwnd, HFONT_GWL_OFFSET ); } -inline static void set_button_font( HWND hwnd, HFONT font ) +__inline static void set_button_font( HWND hwnd, HFONT font ) { SetWindowLongA( hwnd, HFONT_GWL_OFFSET, (LONG)font ); } -inline static UINT get_button_type( LONG window_style ) +__inline static UINT get_button_type( LONG window_style ) { return (window_style & 0x0f); } /* paint a button of any type */ -inline static void paint_button( HWND hwnd, LONG style, UINT action ) +__inline static void paint_button( HWND hwnd, LONG style, UINT action ) { if (btnPaintFunc[style] && IsWindowVisible(hwnd)) { @@ -163,7 +151,7 @@ } /* retrieve the button text; returned buffer must be freed by caller */ -inline static WCHAR *get_button_text( HWND hwnd ) +__inline static WCHAR *get_button_text( HWND hwnd ) { INT len = 512; WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); _____ Modified: trunk/reactos/lib/user32/controls/combo.c --- trunk/reactos/lib/user32/controls/combo.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/controls/combo.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -20,18 +20,9 @@ * FIXME: roll up in Netscape 3.01. */ -#define __WINE__ #include <user32.h> -#include <stdarg.h> -#include <string.h> - #define NDEBUG -#include <string.h> -#include <stdlib.h> -#include <stdio.h> -#include "controls.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include <debug.h> WINE_DEFAULT_DEBUG_CHANNEL(combo); _____ Deleted: trunk/reactos/lib/user32/controls/controls.h --- trunk/reactos/lib/user32/controls/controls.h 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/controls/controls.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -1,113 +0,0 @@ -#ifndef _ROS_CONTROLS_H -#define _ROS_CONTROLS_H - -/* Missing from Winuser.h */ -#define ES_COMBO 0x00000200 /* Undocumented. Parent is a combobox */ -#ifndef MAKEINTATOMA -#define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) -#endif -#ifndef WM_ISACTIVEICON -#define WM_ISACTIVEICON 0x0035 -#endif - -#ifndef __USE_W32API -#if defined(STRICT) -typedef INT (CALLBACK *EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT); -typedef INT (CALLBACK *EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT); -#else -typedef FARPROC EDITWORDBREAKPROCA; -typedef FARPROC EDITWORDBREAKPROCW; -#endif -#endif - -#ifndef HBMMENU_CALLBACK -#define HBMMENU_CALLBACK ((HBITMAP) -1) -#endif -#ifndef HBMMENU_SYSTEM -#define HBMMENU_SYSTEM ((HBITMAP) 1) -#endif -#ifndef HBMMENU_MBAR_RESTORE -#define HBMMENU_MBAR_RESTORE ((HBITMAP) 2) -#endif -#ifndef HBMMENU_MBAR_MINIMIZE -#define HBMMENU_MBAR_MINIMIZE ((HBITMAP) 3) -#endif -#ifndef HBMMENU_MBAR_CLOSE -#define HBMMENU_MBAR_CLOSE ((HBITMAP) 5) -#endif -#ifndef HBMMENU_MBAR_CLOSE_D -#define HBMMENU_MBAR_CLOSE_D ((HBITMAP) 6) -#endif -#ifndef HBMMENU_MBAR_MINIMIZE_D -#define HBMMENU_MBAR_MINIMIZE_D ((HBITMAP) 7) -#endif -#ifndef HBMMENU_POPUP_CLOSE -#define HBMMENU_POPUP_CLOSE ((HBITMAP) 8) -#endif -#ifndef HBMMENU_POPUP_RESTORE -#define HBMMENU_POPUP_RESTORE ((HBITMAP) 9) -#endif -#ifndef HBMMENU_POPUP_MAXIMIZE -#define HBMMENU_POPUP_MAXIMIZE ((HBITMAP) 10) -#endif -#ifndef HBMMENU_POPUP_MINIMIZE -#define HBMMENU_POPUP_MINIMIZE ((HBITMAP) 11) -#endif - -/* winuser.h */ - - -// I dont know where this goes - -#define LB_CARETON 0x01a3 -#define LB_CARETOFF 0x01a4 - -/* combo box */ - -#define ID_CB_LISTBOX 1000 -#define ID_CB_EDIT 1001 - -/* Combo box message return values */ -#define CB_OKAY 0 - -/* internal flags */ -#define CBF_DROPPED 0x0001 -#define CBF_BUTTONDOWN 0x0002 -#define CBF_NOROLLUP 0x0004 -#define CBF_MEASUREITEM 0x0008 -#define CBF_FOCUSED 0x0010 -#define CBF_CAPTURE 0x0020 -#define CBF_EDIT 0x0040 -#define CBF_NORESIZE 0x0080 -#define CBF_NOTIFY 0x0100 -#define CBF_NOREDRAW 0x0200 -#define CBF_SELCHANGE 0x0400 -#define CBF_NOEDITNOTIFY 0x1000 -#define CBF_NOLBSELECT 0x2000 /* do not change current selection */ -#define CBF_EUI 0x8000 - -/* combo state struct */ -typedef struct -{ - HWND self; - HWND owner; - UINT dwStyle; - HWND hWndEdit; - HWND hWndLBox; - UINT wState; - HFONT hFont; - RECT textRect; - RECT buttonRect; - RECT droppedRect; - INT droppedIndex; - INT fixedOwnerDrawHeight; - INT droppedWidth; /* last two are not used unless set */ - INT editHeight; /* explicitly */ -} HEADCOMBO,*LPHEADCOMBO; - -/* Note, that CBS_DROPDOWNLIST style is actually (CBS_SIMPLE | CBS_DROPDOWN) */ -#define CB_GETTYPE( lphc ) ((lphc)->dwStyle & (CBS_DROPDOWNLIST)) - -extern BOOL COMBO_FlipListbox( LPHEADCOMBO, BOOL, BOOL ); - -#endif /* _ROS_CONTROLS_H */ _____ Modified: trunk/reactos/lib/user32/controls/edit.c --- trunk/reactos/lib/user32/controls/edit.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/controls/edit.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -36,14 +36,9 @@ * */ -#define __WINE__ #include <user32.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> -#include "controls.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#define NDEBUG +#include <debug.h> WINE_DEFAULT_DEBUG_CHANNEL(edit); WINE_DECLARE_DEBUG_CHANNEL(combo); @@ -167,10 +162,10 @@ * We still like to call them internally * "static inline" makes them more like macro's */ -static inline BOOL EDIT_EM_CanUndo(EDITSTATE *es); -static inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es); -static inline void EDIT_WM_Clear(EDITSTATE *es); -static inline void EDIT_WM_Cut(EDITSTATE *es); +static __inline BOOL EDIT_EM_CanUndo(EDITSTATE *es); +static __inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es); +static __inline void EDIT_WM_Clear(EDITSTATE *es); +static __inline void EDIT_WM_Cut(EDITSTATE *es); /* * Helper functions only valid for one type of control @@ -310,7 +305,7 @@ * EM_CANUNDO * */ -static inline BOOL EDIT_EM_CanUndo(EDITSTATE *es) +static __inline BOOL EDIT_EM_CanUndo(EDITSTATE *es) { return (es->undo_insert_count || strlenW(es->undo_text)); } @@ -321,7 +316,7 @@ * EM_EMPTYUNDOBUFFER * */ -static inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es) +static __inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es) { es->undo_insert_count = 0; *es->undo_text = '\0'; @@ -333,7 +328,7 @@ * WM_CLEAR * */ -static inline void EDIT_WM_Clear(EDITSTATE *es) +static __inline void EDIT_WM_Clear(EDITSTATE *es) { static const WCHAR empty_stringW[] = {0}; @@ -350,7 +345,7 @@ * WM_CUT * */ -static inline void EDIT_WM_Cut(EDITSTATE *es) +static __inline void EDIT_WM_Cut(EDITSTATE *es) { EDIT_WM_Copy(es); EDIT_WM_Clear(es); @@ -406,7 +401,7 @@ return (HBRUSH)SendMessageW(GetParent(es->hwndSelf), msg, (WPARAM)hdc, (LPARAM)es->hwndSelf); } -static inline LRESULT DefWindowProcT(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) +static __inline LRESULT DefWindowProcT(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) { if(unicode) return DefWindowProcW(hwnd, msg, wParam, lParam); _____ Modified: trunk/reactos/lib/user32/controls/icontitle.c --- trunk/reactos/lib/user32/controls/icontitle.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/controls/icontitle.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -18,9 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "user32.h" -#include "controls.h" -#include "wine/unicode.h" +#include <user32.h> #ifdef __REACTOS__ #define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) _____ Modified: trunk/reactos/lib/user32/controls/listbox.c --- trunk/reactos/lib/user32/controls/listbox.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/controls/listbox.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -18,15 +18,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define __WINE__ #include <user32.h> -#include <string.h> -#include <stdlib.h> -#include "controls.h" -#include "wine/debug.h" +#define NDEBUG +#include <debug.h> -#ifdef __REACTOS__ -#include "wine/unicode.h" /* Start of hack section -------------------------------- */ typedef short *LPINT16; @@ -42,10 +37,9 @@ #define WM_SYSTIMER 280 UINT STDCALL SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); -WINBOOL STDCALL KillSystemTimer(HWND,UINT_PTR); +BOOL STDCALL KillSystemTimer(HWND,UINT_PTR); /* End of hack section -------------------------------- */ -#endif /* Unimplemented yet: * - LBS_USETABSTOPS _____ Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -31,8 +31,10 @@ /* INCLUDES *******************************************************************/ #include <user32.h> -#include <oleacc.h> +#define NDEBUG +#include <debug.h> + /* GLOBAL VARIABLES ***********************************************************/ /* Definitions for scrollbar hit testing [See SCROLLBARINFO in MSDN] */ @@ -70,7 +72,7 @@ static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); UINT STDCALL SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); -WINBOOL STDCALL KillSystemTimer(HWND,UINT_PTR); +BOOL STDCALL KillSystemTimer(HWND,UINT_PTR); /********************************************************************* * scrollbar class descriptor @@ -1272,10 +1274,11 @@ // infoPtr->flags = wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH; // SCROLL_RefreshScrollBar(hwnd, SB_CTL, TRUE, TRUE); // } + HDC hdc; DbgPrint("ScrollBarWndProc WM_ENABLE\n"); NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); /* Refresh Scrollbars. */ - HDC hdc = GetDCEx( Wnd, 0, DCX_CACHE ); + hdc = GetDCEx( Wnd, 0, DCX_CACHE ); if (!hdc) return 1; IntDrawScrollBar( Wnd, hdc, SB_CTL); ReleaseDC( Wnd, hdc ); _____ Copied: trunk/reactos/lib/user32/include/controls.h (from rev 16791, trunk/reactos/lib/user32/controls/controls.h) _____ Copied: trunk/reactos/lib/user32/include/dde_private.h (from rev 16791, trunk/reactos/lib/user32/misc/dde_private.h) --- trunk/reactos/lib/user32/misc/dde_private.h 2005-07-27 05:42:33 UTC (rev 16791) +++ trunk/reactos/lib/user32/include/dde_private.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -0,0 +1,268 @@ +/* -*- tab-width: 8; c-basic-offset: 4 -*- */ + +/* + * DDEML library + * + * Copyright 1997 Alexandre Julliard + * Copyright 1997 Len White + * Copyright 1999 Keith Matthews + * Copyright 2000 Corel + * Copyright 2001 Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_DDEML_PRIVATE_H +#define __WINE_DDEML_PRIVATE_H + +/* defined in atom.c file. + */ +#define MAX_ATOM_LEN 255 + +/* Maximum buffer size ( including the '\0' ). + */ +#define MAX_BUFFER_LEN (MAX_ATOM_LEN + 1) + +/* The internal structures (prefixed by WDML) are used as follows: + * + a WDML_INSTANCE is created for each instance creation (DdeInitialize) + * - a popup window (InstanceClass) is created for each instance. + * - this window is used to receive all the DDEML events (server registration, + * conversation confirmation...). See the WM_WDML_???? messages for details + * + when registring a server (DdeNameService) a WDML_SERVER is created + * - a popup window (ServerNameClass) is created + * + a conversation is represented by two WDML_CONV structures: + * - one on the client side, the other one on the server side + * - this is needed because the address spaces may be different + * - therefore, two lists of links are kept for each instance + * - two windows are created for a conversation: + * o a popup window on client side (ClientConvClass) + * o a child window (of the ServerName) on the server side + * (ServerConvClass) + * - all the exchanges then take place between those two windows + * - windows for the conversation exist in two forms (Ansi & Unicode). This + * is only needed when a partner in a conv is not handled by DDEML. The + * type (A/W) of the window is used to handle the ansi <=> unicode + * transformations + * - two handles are created for a conversation (on each side). Each handle + * is linked to a structure. To help differentiate those handles, the + * local one has an even value, whereas the remote one has an odd value. + * + a (warm or link) is represented by two WDML_LINK structures: + * - one on client side, the other one on server side + * - therefore, two lists of links are kept for each instance + * + * To help getting back to data, WDML windows store information: + * - offset 0: the DDE instance + * - offset 4: the current conversation (for ClientConv and ServerConv only) + * + * All the implementation (client & server) makes the assumption that the other side + * is not always a DDEML partner. However, if it's the case, supplementary services + * are available (most notably the REGISTER/UNREGISTER and CONNECT_CONFIRM messages + * to the callback function). To be correct in every situation, all the basic + * exchanges are made using the 'pure' DDE protocol. A (future !) enhancement would + * be to provide a new protocol in the case were both partners are handled by DDEML. + * + * The StringHandles are in fact stored as local atoms. So an HSZ and a (local) atom + * can be used interchangably. However, in order to keep track of the allocated HSZ, + * and to free them upon instance termination, all HSZ are stored in a link list. + * When the HSZ need to be passed thru DDE messages, we need to convert them back and + * forth to global atoms. + */ + +/* this struct has the same mapping as all the DDE??? structures */ +typedef struct { + unsigned short unused:12, + fResponse:1, + fRelease:1, + fDeferUpd:1, + fAckReq:1; + short cfFormat; +} WINE_DDEHEAD; + +typedef struct tagHSZNode +{ + struct tagHSZNode* next; + HSZ hsz; + unsigned refCount; +} HSZNode; + +typedef struct tagWDML_SERVER +{ + struct tagWDML_SERVER* next; + HSZ hszService; + HSZ hszServiceSpec; + ATOM atomService; + ATOM atomServiceSpec; + BOOL filterOn; + HWND hwndServer; +} WDML_SERVER; + +typedef struct tagWDML_XACT { + struct tagWDML_XACT* next; /* list of transactions in conversation */ + DWORD xActID; + UINT ddeMsg; + HDDEDATA hDdeData; + DWORD dwTimeout; + DWORD hUser; + UINT wType; + UINT wFmt; + HSZ hszItem; + ATOM atom; /* as converted from or to hszItem */ + HGLOBAL hMem; + LPARAM lParam; /* useful for reusing */ +} WDML_XACT; + +typedef struct tagWDML_CONV +{ + struct tagWDML_CONV* next; /* to link all the conversations */ + struct tagWDML_INSTANCE* instance; + HSZ hszService; /* pmt used for connection */ + HSZ hszTopic; /* pmt used for connection */ + UINT afCmd; /* service name flag */ + CONVCONTEXT convContext; + HWND hwndClient; /* source of conversation (ClientConvClass) */ + HWND hwndServer; /* destination of conversation (ServerConvClass) */ + WDML_XACT* transactions; /* pending transactions */ + DWORD hUser; /* user defined value */ + DWORD wStatus; /* same bits as convinfo.wStatus */ + DWORD wConvst; /* same values as convinfo.wConvst */ +} WDML_CONV; + +/* DDE_LINK struct defines hot, warm, and cold links */ +typedef struct tagWDML_LINK { + struct tagWDML_LINK* next; /* to link all the active links */ + HCONV hConv; /* to get back to the converstaion */ + UINT transactionType;/* 0 for no link */ + HSZ hszItem; /* item targetted for (hot/warm) link */ + UINT uFmt; /* format for data */ +} WDML_LINK; + +typedef struct tagWDML_INSTANCE +{ + struct tagWDML_INSTANCE* next; + DWORD instanceID; /* needed to track monitor usage */ + DWORD threadID; /* needed to keep instance linked to a unique thread */ + BOOL monitor; /* have these two as full Booleans cos they'll be tested frequently */ + BOOL clientOnly; /* bit wasteful of space but it will be faster */ + BOOL unicode; /* Flag to indicate Win32 API used to initialise */ + BOOL win16; /* flag to indicate Win16 API used to initialize */ + HSZNode* nodeList; /* for cleaning upon exit */ + PFNCALLBACK callback; + DWORD CBFflags; + DWORD monitorFlags; + DWORD lastError; + HWND hwndEvent; + WDML_SERVER* servers; /* list of registered servers */ + WDML_CONV* convs[2]; /* active conversations for this instance (client and server) */ + WDML_LINK* links[2]; /* active links for this instance (client and server) */ +} WDML_INSTANCE; + +extern CRITICAL_SECTION WDML_CritSect; /* protection for instance list */ + +/* header for the DDE Data objects */ +typedef struct tagDDE_DATAHANDLE_HEAD +{ + short cfFormat; + WORD bAppOwned; +} DDE_DATAHANDLE_HEAD; + +typedef enum tagWDML_SIDE +{ + WDML_CLIENT_SIDE = 0, WDML_SERVER_SIDE = 1 +} WDML_SIDE; + +typedef enum { + WDML_QS_ERROR, WDML_QS_HANDLED, WDML_QS_PASS, WDML_QS_SWALLOWED, WDML_QS_BLOCK, +} WDML_QUEUE_STATE; + +extern HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInst, UINT uType, UINT uFmt, HCONV hConv, + HSZ hsz1, HSZ hsz2, HDDEDATA hdata, + DWORD dwData1, DWORD dwData2); +extern HDDEDATA WDML_InvokeCallback16(PFNCALLBACK pfn, UINT uType, UINT uFmt, HCONV hConv, + HSZ hsz1, HSZ hsz2, HDDEDATA hdata, + DWORD dwData1, DWORD dwData2); +extern WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); +extern void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); +extern WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); +/* transaction handler on the server side */ +extern WDML_QUEUE_STATE WDML_ServerHandle(WDML_CONV* pConv, WDML_XACT* pXAct); +/* called both in DdeClientTransaction and server side. */ +extern UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, + DWORD afCmd, DWORD ulRes, BOOL bUnicode, BOOL b16); +extern WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, + HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer); +extern void WDML_RemoveConv(WDML_CONV* pConv, WDML_SIDE side); +extern WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected); +extern WDML_CONV* WDML_GetConvFromWnd(HWND hWnd); +extern WDML_CONV* WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side, + HSZ hszService, HSZ hszTopic); +extern BOOL WDML_PostAck(WDML_CONV* pConv, WDML_SIDE side, WORD appRetCode, + BOOL fBusy, BOOL fAck, UINT pmt, LPARAM lParam, UINT oldMsg); +extern void WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, + UINT wType, HSZ hszItem, UINT wFmt); +extern WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, + HSZ hszItem, BOOL use_fmt, UINT uFmt); +extern void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, + HSZ hszItem, UINT wFmt); +extern void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side); +/* string internals */ +extern void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance); +extern BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz); +extern BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz); +extern ATOM WDML_MakeAtomFromHsz(HSZ hsz); +extern HSZ WDML_MakeHszFromAtom(WDML_INSTANCE* pInstance, ATOM atom); +/* client calls these */ +extern WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, UINT wFmt, HSZ hszItem); +extern void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct); +extern BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct); +extern void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt); +extern WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid); +extern HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, + BOOL fDeferUpd, BOOL dAckReq); +extern HDDEDATA WDML_Global2DataHandle(HGLOBAL hMem, WINE_DDEHEAD* da); +extern BOOL WDML_IsAppOwned(HDDEDATA hDdeData); +extern WDML_INSTANCE* WDML_GetInstance(DWORD InstId); +extern WDML_INSTANCE* WDML_GetInstanceFromWnd(HWND hWnd); +/* broadcasting to DDE windows */ +extern void WDML_BroadcastDDEWindows(const char* clsName, UINT uMsg, + WPARAM wParam, LPARAM lParam); +extern void WDML_NotifyThreadExit(DWORD tid); + +static __inline void WDML_ExtractAck(WORD status, DDEACK* da) +{ + *da = *((DDEACK*)&status); +} + +extern const char WDML_szEventClass[]; /* class of window for events (aka instance) */ +extern const char WDML_szServerConvClassA[]; /* class of window for server side conv (ansi) */ +extern const WCHAR WDML_szServerConvClassW[]; /* class of window for server side conv (unicode) */ +extern const char WDML_szClientConvClassA[]; /* class of window for client side conv (ansi) */ +extern const WCHAR WDML_szClientConvClassW[]; /* class of window for client side conv (unicode) */ + +#define WM_WDML_REGISTER (WM_USER + 0x200) +#define WM_WDML_UNREGISTER (WM_USER + 0x201) +#define WM_WDML_CONNECT_CONFIRM (WM_USER + 0x202) + +/* parameters for messages: + * wParam lParam + * Register atom for service name atom for service spec + * Unregister atom for service name atom for service spec + * ConnectConfirm client window handle server window handle + */ + +#define GWL_WDML_INSTANCE (0) +#define GWL_WDML_CONVERSATION (4) +#define GWL_WDML_SERVER (4) + +#endif /* __WINE_DDEML_PRIVATE_H */ _____ Deleted: trunk/reactos/lib/user32/include/debug.h --- trunk/reactos/lib/user32/include/debug.h 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/include/debug.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -1,74 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: include/debug.h - * PURPOSE: Debugging support macros - * DEFINES: DBG - Enable debug output - * NASSERT - Disable assertions - */ -#ifndef __DEBUG_H -#define __DEBUG_H - -#define NORMAL_MASK 0x000000FF -#define SPECIAL_MASK 0xFFFFFF00 -#define MIN_TRACE 0x00000001 -#define MID_TRACE 0x00000002 -#define MAX_TRACE 0x00000003 - -#define DEBUG_CHECK 0x00000100 -#define DEBUG_OBJECT 0x00000200 -#define DEBUG_WINDOW 0x00000400 -#define DEBUG_ULTRA 0xFFFFFFFF - -#ifdef ASSERT -#undef ASSERT -#endif - -#ifdef DBG - -extern DWORD DebugTraceLevel; - -#define D(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ - DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _x_; \ - } - -#ifdef NASSERT -#define ASSERT(x) -#else /* NASSERT */ -#define ASSERT(x) if (!(x)) { D(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); } -#endif /* NASSERT */ - -#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) - -#else /* DBG */ - -#define D(_t_, _x_) - -#define ASSERT_IRQL(x) -#define ASSERT(x) - -#endif /* DBG */ - -#ifdef assert -#undef assert -#endif -#define assert(x) ASSERT(x) -#define assert_irql(x) ASSERT_IRQL(x) - - -#define UNIMPLEMENTED \ - D(MIN_TRACE, ("is unimplemented, please try again later.\n")); - -#define CHECKPOINT \ - D(DEBUG_CHECK, ("\n")); - -#define DPRINT(X...) D(DEBUG_CHECK, (X)) - -#define CP CHECKPOINT - -#endif /* __DEBUG_H */ - -/* EOF */ _____ Modified: trunk/reactos/lib/user32/include/user32.h --- trunk/reactos/lib/user32/include/user32.h 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/include/user32.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -8,17 +8,17 @@ /* INCLUDES ******************************************************************/ -#ifndef USER32_H -#define USER32_H - /* C Headers */ #include <stdio.h> -#include <ctype.h> +#include <math.h> /* SDK/NDK Headers */ +#define _USER32_ +#define OEMRESOURCE +#define NTOS_MODE_USER #include <windows.h> #include <windowsx.h> -#define NTOS_MODE_USER +#include <winnls32.h> #include <ndk/ntndk.h> /* CSRSS Headers */ @@ -32,11 +32,13 @@ #include <win32k/menu.h> #include <win32k/paint.h> +/* WINE Headers */ +#include <wine/debug.h> +#include <wine/unicode.h> + /* Internal User32 Headers */ #include "user32p.h" /* FIXME: FILIP */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); DWORD STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, DWORD *); - -#endif /* USER32_H */ _____ Modified: trunk/reactos/lib/user32/include/user32p.h --- trunk/reactos/lib/user32/include/user32p.h 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/include/user32p.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -14,10 +14,9 @@ /* Private User32 Headers */ #include "accel.h" #include "cursor.h" -#ifndef __WINE__ -#include "debug.h" -#endif +#include "controls.h" #include "draw.h" +#include "dde_private.h" #include "menu.h" #include "message.h" #include "regcontrol.h" _____ Modified: trunk/reactos/lib/user32/misc/dde.c --- trunk/reactos/lib/user32/misc/dde.c 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/misc/dde.c 2005-07-27 19:21:46 UTC (rev 16811) @@ -22,22 +22,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "wine/config.h" -#include "wine/port.h" +#include <user32.h> +#define NDEBUG +#include <debug.h> -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" -#include "dde.h" -#include "ddeml.h" -#include "wine/debug.h" -#include "dde_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(ddeml); /* convert between ATOM and HSZ avoiding compiler warnings */ _____ Deleted: trunk/reactos/lib/user32/misc/dde_private.h --- trunk/reactos/lib/user32/misc/dde_private.h 2005-07-27 19:10:57 UTC (rev 16810) +++ trunk/reactos/lib/user32/misc/dde_private.h 2005-07-27 19:21:46 UTC (rev 16811) @@ -1,268 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ - -/* - * DDEML library - * - * Copyright 1997 Alexandre Julliard - * Copyright 1997 Len White - * Copyright 1999 Keith Matthews - * Copyright 2000 Corel - * Copyright 2001 Eric Pouech - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_DDEML_PRIVATE_H -#define __WINE_DDEML_PRIVATE_H - -/* defined in atom.c file. - */ -#define MAX_ATOM_LEN 255 - -/* Maximum buffer size ( including the '\0' ). - */ -#define MAX_BUFFER_LEN (MAX_ATOM_LEN + 1) - -/* The internal structures (prefixed by WDML) are used as follows: - * + a WDML_INSTANCE is created for each instance creation (DdeInitialize) - * - a popup window (InstanceClass) is created for each instance. - * - this window is used to receive all the DDEML events (server registration, - * conversation confirmation...). See the WM_WDML_???? messages for details - * + when registring a server (DdeNameService) a WDML_SERVER is created - * - a popup window (ServerNameClass) is created - * + a conversation is represented by two WDML_CONV structures: - * - one on the client side, the other one on the server side - * - this is needed because the address spaces may be different - * - therefore, two lists of links are kept for each instance - * - two windows are created for a conversation: - * o a popup window on client side (ClientConvClass) - * o a child window (of the ServerName) on the server side - * (ServerConvClass) - * - all the exchanges then take place between those two windows - * - windows for the conversation exist in two forms (Ansi & Unicode). This - * is only needed when a partner in a conv is not handled by DDEML. The - * type (A/W) of the window is used to handle the ansi <=> unicode - * transformations - * - two handles are created for a conversation (on each side). Each handle - * is linked to a structure. To help differentiate those handles, the - * local one has an even value, whereas the remote one has an odd value. - * + a (warm or link) is represented by two WDML_LINK structures: - * - one on client side, the other one on server side - * - therefore, two lists of links are kept for each instance - * - * To help getting back to data, WDML windows store information: - * - offset 0: the DDE instance - * - offset 4: the current conversation (for ClientConv and ServerConv only) - * - * All the implementation (client & server) makes the assumption that the other side - * is not always a DDEML partner. However, if it's the case, supplementary services - * are available (most notably the REGISTER/UNREGISTER and CONNECT_CONFIRM messages - * to the callback function). To be correct in every situation, all the basic - * exchanges are made using the 'pure' DDE protocol. A (future !) enhancement would - * be to provide a new protocol in the case were both partners are handled by DDEML. - * - * The StringHandles are in fact stored as local atoms. So an HSZ and a (local) atom - * can be used interchangably. However, in order to keep track of the allocated HSZ, [truncated at 1000 lines; 798 more skipped]

19 years, 6 months

[chorns] 16810: Put halmp.dll on CD

by chorns＠svn.reactos.com

Put halmp.dll on CD Modified: trunk/reactos/hal/hal/hal.xml Modified: trunk/reactos/hal/halx86/mp/halmp.xml Modified: trunk/reactos/hal/halx86/up/halup.xml Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/bootstrap.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.txt _____ Modified: trunk/reactos/hal/hal/hal.xml --- trunk/reactos/hal/hal/hal.xml 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/hal/hal/hal.xml 2005-07-27 19:10:57 UTC (rev 16810) @@ -7,3 +7,9 @@ <file>hal.c</file> <file>hal.rc</file> </module> + +<module ifnot="${MP}" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> +</module> + +<module if="${MP}" name="halmpalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halmp"> +</module> _____ Modified: trunk/reactos/hal/halx86/mp/halmp.xml --- trunk/reactos/hal/halx86/mp/halmp.xml 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/hal/halx86/mp/halmp.xml 2005-07-27 19:10:57 UTC (rev 16810) @@ -1,5 +1,6 @@ -<module if="${MP}" name="halmp" type="kernelmodedll" installbase="system32" installname="hal.dll"> +<module name="halmp" type="kernelmodedll"> <importlibrary definition="../../hal/hal.def" /> + <bootstrap base="reactos" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: trunk/reactos/hal/halx86/up/halup.xml --- trunk/reactos/hal/halx86/up/halup.xml 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/hal/halx86/up/halup.xml 2005-07-27 19:10:57 UTC (rev 16810) @@ -1,4 +1,4 @@ -<module ifnot="${MP}" name="halup" type="kernelmodedll" installbase="system32" installname="hal.dll"> +<module name="halup" type="kernelmodedll"> <importlibrary definition="../../hal/hal.def" /> <bootstrap base="reactos" nameoncd="hal.dll" /> <include base="hal_generic">../include</include> _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-07-27 19:10:57 UTC (rev 16810) @@ -566,6 +566,8 @@ return false; if ( module.type == Test ) return false; + if ( module.type == Alias ) + return false; return true; } @@ -977,6 +979,19 @@ } } +const Module& +MingwBackend::GetAliasedModuleOrModule ( const Module& module ) const +{ + if ( module.aliasedModuleName.size () > 0 ) + { + const Module* aliasedModule = ProjectNode.LocateModule ( module.aliasedModuleName ); + assert ( aliasedModule ); + return *aliasedModule; + } + else + return module; +} + void MingwBackend::OutputModuleInstallTargets () { @@ -987,8 +1002,9 @@ continue; if ( module.installName.length () > 0 ) { + const Module& aliasedModule = GetAliasedModuleOrModule ( module ); string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( module.GetPath () ), + NormalizeFilename ( aliasedModule.GetPath () ), outputDirectory ); OutputInstallTarget ( sourceFilename, module.installName, _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-07-27 19:10:57 UTC (rev 16810) @@ -68,6 +68,7 @@ virtual void Process (); std::string AddDirectoryTarget ( const std::string& directory, Directory* directoryTree ); + const Module& GetAliasedModuleOrModule ( const Module& module ) const; std::string compilerPrefix; std::string compilerCommand; std::string nasmCommand; _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-27 19:10:57 UTC (rev 16810) @@ -237,6 +237,9 @@ case RpcClient: handler = new MingwRpcClientModuleHandler ( module ); break; + case Alias: + handler = new MingwAliasModuleHandler ( module ); + break; default: throw UnknownModuleTypeException ( module.node.location, @@ -2877,12 +2880,13 @@ continue; if ( m.installName.length () > 0 ) { + const Module& aliasedModule = backend->GetAliasedModuleOrModule ( m ); string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( m.GetPath () ), + NormalizeFilename ( aliasedModule.GetPath () ), backend->outputDirectory ); OutputCopyCommand ( sourceFilename, - m.installName, - livecdDirectory + SSEP + reactosDirectory + SSEP + m.installBase ); + m.installName, + livecdDirectory + SSEP + reactosDirectory + SSEP + m.installBase ); } } } @@ -3057,6 +3061,7 @@ GenerateRules (); } + MingwRpcClientModuleHandler::MingwRpcClientModuleHandler ( const Module& module_ ) @@ -3069,3 +3074,16 @@ { GenerateRules (); } + + +MingwAliasModuleHandler::MingwAliasModuleHandler ( + const Module& module_ ) + + : MingwModuleHandler ( module_ ) +{ +} + +void +MingwAliasModuleHandler::Process () +{ +} _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-27 19:10:57 UTC (rev 16810) @@ -442,4 +442,12 @@ virtual void Process (); }; +class MingwAliasModuleHandler : public MingwModuleHandler +{ +public: + MingwAliasModuleHandler ( const Module& module ); + virtual HostType DefaultHost() { return HostFalse; } + virtual void Process (); +}; + #endif /* MINGW_MODULEHANDLER_H */ _____ Modified: trunk/reactos/tools/rbuild/bootstrap.cpp --- trunk/reactos/tools/rbuild/bootstrap.cpp 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/tools/rbuild/bootstrap.cpp 2005-07-27 19:10:57 UTC (rev 16810) @@ -23,8 +23,8 @@ using std::string; Bootstrap::Bootstrap ( const Project& project_, - const Module* module_, - const XMLElement& bootstrapNode ) + const Module* module_, + const XMLElement& bootstrapNode ) : project(project_), module(module_), node(bootstrapNode) @@ -60,6 +60,7 @@ case Test: case RpcServer: case RpcClient: + case Alias: return false; } throw InvalidOperationException ( __FILE__, _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/tools/rbuild/module.cpp 2005-07-27 19:10:57 UTC (rev 16810) @@ -282,6 +282,12 @@ enableWarnings = att->value == "true"; else enableWarnings = false; + + att = moduleNode.GetAttribute ( "aliasof", false ); + if ( type == Alias && att != NULL ) + aliasedModuleName = att->value; + else + aliasedModuleName = ""; } Module::~Module () @@ -304,6 +310,22 @@ void Module::ProcessXML() { + if ( type == Alias ) + { + if ( aliasedModuleName == name ) + throw InvalidBuildFileException ( + node.location, + "module '%s' cannot link against itself", + name.c_str() ); + const Module* m = project.LocateModule ( aliasedModuleName ); + if ( !m ) + throw InvalidBuildFileException ( + node.location, + "module '%s' trying to alias non-existant module '%s'", + name.c_str(), + aliasedModuleName.c_str() ); + } + size_t i; for ( i = 0; i < node.subElements.size(); i++ ) ProcessXMLSubElement ( *node.subElements[i], path ); @@ -543,6 +565,8 @@ return RpcServer; if ( attribute.value == "rpcclient" ) return RpcClient; + if ( attribute.value == "alias" ) + return Alias; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -582,6 +606,8 @@ return ".o"; case RpcClient: return ".o"; + case Alias: + return ""; } throw InvalidOperationException ( __FILE__, __LINE__ ); @@ -618,6 +644,7 @@ case LiveIso: case RpcServer: case RpcClient: + case Alias: return ""; } throw InvalidOperationException ( __FILE__, @@ -652,6 +679,7 @@ case LiveIso: case RpcServer: case RpcClient: + case Alias: return ""; } throw InvalidOperationException ( __FILE__, @@ -688,6 +716,7 @@ case LiveIso: case RpcServer: case RpcClient: + case Alias: return false; } throw InvalidOperationException ( __FILE__, @@ -718,6 +747,7 @@ case ObjectLibrary: case RpcServer: case RpcClient: + case Alias: return false; } throw InvalidOperationException ( __FILE__, _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-07-27 19:10:57 UTC (rev 16810) @@ -193,7 +193,8 @@ LiveIso = 14, Test = 15, RpcServer = 16, - RpcClient = 17 + RpcClient = 17, + Alias = 18 }; enum HostType @@ -230,6 +231,7 @@ HostType host; std::string installBase; std::string installName; + std::string aliasedModuleName; bool useWRC; bool enableWarnings; bool enabled; @@ -737,6 +739,7 @@ std::string StripSymbol ( std::string symbol ); }; + extern std::string FixSeparator ( const std::string& s ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.txt --- trunk/reactos/tools/rbuild/rbuild.txt 2005-07-27 18:46:52 UTC (rev 16809) +++ trunk/reactos/tools/rbuild/rbuild.txt 2005-07-27 19:10:57 UTC (rev 16810) @@ -107,7 +107,7 @@ There can be zero or more modules per xml build file. Syntax: - <module if="${MP}" ifnot="${MP}" name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true"> + <module if="${MP}" ifnot="${MP}" name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true" aliasof="module1"> ... </module> @@ -124,7 +124,7 @@ installname - Name of generated file in the installation directory. This attribute is optional, but if not specified, the generated file is not copied to the installation directory. usewrc - Use WRC to compile resources if true. If false, windres is used. This attribute is optional. If not specified, WRC will be used. warnings - Error out if false and at least one warning is emitted during building of this module. This attribute is optional. If not specified, it is assumed to be false. - + aliasof - Name of module that is aliased. Value: None. @@ -151,6 +151,7 @@ test - Builds a testsuite. Default extension is .exe. Default entrypoint is _mainCRTStartup. The baseaddress module attribute is not applicable for this module type. rpcserver - Generates and builds server code for an RPC interface. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. rpcclient - Generates and builds client code for an RPC interface. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. + alias - Module is an alias for another module. This module type is the only module type for which the aliasof attribute is applicable. Only the module install functionality is aliased. Bootstrap element

19 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005