Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[akhaldi] 61359: [GDIPLUS] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in...
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 18:33:45 2013 New Revision: 61359 URL: http://svn.reactos.org/svn/reactos?rev=61359&view=rev Log: [GDIPLUS] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/customlinecap.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/imageattributes.c trunk/reactos/dll/win32/gdiplus/matrix.c trunk/reactos/dll/win32/gdiplus/metafile.c trunk/reactos/dll/win32/gdiplus/pathiterator.c trunk/reactos/dll/win32/gdiplus/pen.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/dll/win32/gdiplus/stringformat.c Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "wingdi.h" - -#define COBJMACROS -//#include "objbase.h" -//#include "olectl.h" -//#include "ole2.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); /* Unix stuff Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/customli… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,19 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, GpCustomLineCap** to) Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,21 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winnls.h" -//#include "winreg.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" /* PANOSE is 10 bytes in size, need to pack the structure properly */ Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> -//#include <math.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "winreg.h" -//#include "shlwapi.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static const REAL mm_per_inch = 25.4; static const REAL point_per_inch = 72.0; Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -19,24 +19,30 @@ #ifndef __WINE_GP_PRIVATE_H_ #define __WINE_GP_PRIVATE_H_ +#include <math.h> +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <math.h> -#include <stdarg.h> +#define NONAMELESSUNION +#define COBJMACROS + +#define INITGUID #include <windef.h> +#include <winbase.h> #include <wingdi.h> -#include <winbase.h> -//#include "winuser.h" - -#include <objbase.h> -//#include "ocidl.h" +#include <ole2.h> #include <wincodecsdk.h> +#include <gdiplus.h> + +#include <wine/unicode.h> #include <wine/list.h> -#include <gdiplus.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,31 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> -//#include <math.h> -//#include <limits.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "wingdi.h" -#include <wine/unicode.h> - -#define COBJMACROS -//#include "objbase.h" -//#include "ocidl.h" -//#include "olectl.h" -//#include "ole2.h" +#include "gdiplus_private.h" #include <winreg.h> - -//#include "gdiplus.h" -#include "gdiplus_private.h" #include <shlwapi.h> -#include <wine/debug.h> -//#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); /* Mike "tamlin" Nordell 2012-09-14 for ReactOS: * NOTE: Wine uses per-GpGraphics id's ('contid' starting from zero in Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,21 +17,7 @@ * */ -//#include <stdarg.h> -//#include <math.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); typedef struct path_list_node_t path_list_node_t; struct path_list_node_t { Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,32 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "gdiplus_private.h" + #include <assert.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "wingdi.h" - -#define COBJMACROS -//#include "objbase.h" -#include <ole2.h> #include <olectl.h> - -#include <initguid.h> -//#include "wincodec.h" -//#include "gdiplus.h" -#include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) Modified: trunk/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/imageatt… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,16 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr) Modified: trunk/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/matrix.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/matrix.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/matrix.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,20 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> -//#include <math.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); /* Multiplies two matrices of the form * Modified: trunk/reactos/dll/win32/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/metafile… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/metafile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/metafile.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,29 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> -//#include <math.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "wine/unicode.h" - -#define COBJMACROS -//#include "objbase.h" -//#include "ocidl.h" -//#include "olectl.h" -//#include "ole2.h" - -//#include "winreg.h" -//#include "shlwapi.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> -//#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); typedef struct EmfPlusRecordHeader { Modified: trunk/reactos/dll/win32/gdiplus/pathiterator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pathiter… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/pathiterator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/pathiterator.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,19 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator **iterator, GpPath* path) { Modified: trunk/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pen.c?re… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,19 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static DWORD gdip_to_gdi_dash(GpDashStyle dash) { Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,19 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); /********************************************************** * Modified: trunk/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/stringfo… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winnls.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format)

1 0

[hbelusca] 61358: [NTVDM] - Implement and export VDDInstallIOHook and VDDDeInstallIOHook; rework EmulatorRead/WriteIo to take into account for different port handlers' sizes (byte, word, dword). St...
by hbelusca＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: hbelusca Date: Mon Dec 23 18:17:29 2013 New Revision: 61358 URL: http://svn.reactos.org/svn/reactos?rev=61358&view=rev Log: [NTVDM] - Implement and export VDDInstallIOHook and VDDDeInstallIOHook; rework EmulatorRead/WriteIo to take into account for different port handlers' sizes (byte, word, dword). Still WIP and may be subject to renamings... RegisterIoPort needs to be converted. - Stubplement and export getIntelRegistersPointer. - Export c_get/setXX functions which are aliases to get/setXX functions, for MIPS NTVDM compatibility. Modified: branches/ntvdm/subsystems/ntvdm/io.c branches/ntvdm/subsystems/ntvdm/io.h branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/ntvdm.spec branches/ntvdm/subsystems/ntvdm/registers.c branches/ntvdm/subsystems/ntvdm/registers.h Modified: branches/ntvdm/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.c?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] Mon Dec 23 18:17:29 2013 @@ -16,38 +16,281 @@ /* PRIVATE VARIABLES **********************************************************/ -typedef struct _EMULATOR_IOPORT_HANDLER -{ - EMULATOR_IN_PROC In; - EMULATOR_OUT_PROC Out; -} EMULATOR_IOPORT_HANDLER, *PEMULATOR_IOPORT_HANDLER; +typedef struct _EMULATOR_IOPORT_HANDLERS +{ + /* For Windows compatibility only, not used internally */ + HANDLE hVdd; // == 0 if unused, + // INVALID_HANDLE_VALUE if handled internally, + // a valid VDD handle if handled externally. + VDD_IO_HANDLERS VddIoHandlers; + + /* We use internally these members */ + // EMULATOR_IN_PROC In; + // EMULATOR_OUT_PROC Out; + + + EMULATOR_INB_PROC InB; + EMULATOR_INW_PROC InW; + EMULATOR_IND_PROC InD; + + EMULATOR_INSB_PROC InsB; + EMULATOR_INSW_PROC InsW; + EMULATOR_INSD_PROC InsD; + + EMULATOR_OUTB_PROC OutB; + EMULATOR_OUTW_PROC OutW; + EMULATOR_OUTD_PROC OutD; + + EMULATOR_OUTSB_PROC OutsB; + EMULATOR_OUTSW_PROC OutsW; + EMULATOR_OUTSD_PROC OutsD; +} EMULATOR_IOPORT_HANDLERS, *PEMULATOR_IOPORT_HANDLERS; /* * This is the list of registered I/O Port handlers. */ -EMULATOR_IOPORT_HANDLER IoPortProc[EMULATOR_MAX_IOPORTS_NUM]; +EMULATOR_IOPORT_HANDLERS IoPortProc[EMULATOR_MAX_IOPORTS_NUM] = {{NULL}}; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID +IOReadB(ULONG Port, + PUCHAR Buffer) +{ + if (IoPortProc[Port].InB) + { + *Buffer = IoPortProc[Port].InB(Port); + } + else + { + /* Return an empty port byte value */ + DPRINT1("Read from unknown port: 0x%X\n", Port); + *Buffer = 0xFF; + } +} + +static VOID +IOReadStrB(ULONG Port, + PUCHAR Buffer, + ULONG Count) +{ + if (IoPortProc[Port].InsB) + { + IoPortProc[Port].InsB(Port, Buffer, Count); + } + else + { + while (Count--) + { + IOReadB(Port, Buffer++); + } + } +} + +static VOID +IOWriteB(ULONG Port, + PUCHAR Buffer) +{ + if (IoPortProc[Port].OutB) + { + IoPortProc[Port].OutB(Port, *Buffer); + } + else + { + /* Do nothing */ + DPRINT1("Write to unknown port: 0x%X\n", Port); + } +} + +static VOID +IOWriteStrB(ULONG Port, + PUCHAR Buffer, + ULONG Count) +{ + if (IoPortProc[Port].OutsB) + { + IoPortProc[Port].OutsB(Port, Buffer, Count); + } + else + { + while (Count--) + { + IOWriteB(Port, Buffer++); + } + } +} + +static VOID +IOReadW(ULONG Port, + PUSHORT Buffer) +{ + if (IoPortProc[Port].InW) + { + *Buffer = IoPortProc[Port].InW(Port); + } + else + { + UCHAR Low, High; + + // FIXME: Is it ok on Little endian and Big endian ?? + IOReadB(Port, &Low); + IOReadB(Port + sizeof(UCHAR), &High); + *Buffer = MAKEWORD(Low, High); + } +} + +static VOID +IOReadStrW(ULONG Port, + PUSHORT Buffer, + ULONG Count) +{ + if (IoPortProc[Port].InsW) + { + IoPortProc[Port].InsW(Port, Buffer, Count); + } + else + { + while (Count--) + { + IOReadW(Port, Buffer++); + } + } +} + +static VOID +IOWriteW(ULONG Port, + PUSHORT Buffer) +{ + if (IoPortProc[Port].OutW) + { + IoPortProc[Port].OutW(Port, *Buffer); + } + else + { + UCHAR Low, High; + + // FIXME: Is it ok on Little endian and Big endian ?? + Low = LOBYTE(*Buffer); + High = HIBYTE(*Buffer); + IOWriteB(Port, &Low); + IOWriteB(Port + sizeof(UCHAR), &High); + } +} + +static VOID +IOWriteStrW(ULONG Port, + PUSHORT Buffer, + ULONG Count) +{ + if (IoPortProc[Port].OutsW) + { + IoPortProc[Port].OutsW(Port, Buffer, Count); + } + else + { + while (Count--) + { + IOWriteW(Port, Buffer++); + } + } +} + +static VOID +IOReadD(ULONG Port, + PULONG Buffer) +{ + if (IoPortProc[Port].InD) + { + *Buffer = IoPortProc[Port].InD(Port); + } + else + { + USHORT Low, High; + + // FIXME: Is it ok on Little endian and Big endian ?? + IOReadW(Port, &Low); + IOReadW(Port + sizeof(USHORT), &High); + *Buffer = MAKELONG(Low, High); + } +} + +static VOID +IOReadStrD(ULONG Port, + PULONG Buffer, + ULONG Count) +{ + if (IoPortProc[Port].InsD) + { + IoPortProc[Port].InsD(Port, Buffer, Count); + } + else + { + while (Count--) + { + IOReadD(Port, Buffer++); + } + } +} + +static VOID +IOWriteD(ULONG Port, + PULONG Buffer) +{ + if (IoPortProc[Port].OutD) + { + IoPortProc[Port].OutD(Port, *Buffer); + } + else + { + USHORT Low, High; + + // FIXME: Is it ok on Little endian and Big endian ?? + Low = LOWORD(*Buffer); + High = HIWORD(*Buffer); + IOWriteW(Port, &Low); + IOWriteW(Port + sizeof(USHORT), &High); + } +} + +static VOID +IOWriteStrD(ULONG Port, + PULONG Buffer, + ULONG Count) +{ + if (IoPortProc[Port].OutsD) + { + IoPortProc[Port].OutsD(Port, Buffer, Count); + } + else + { + while (Count--) + { + IOWriteD(Port, Buffer++); + } + } +} /* PUBLIC FUNCTIONS ***********************************************************/ -VOID WINAPI RegisterIoPort(ULONG Port, - EMULATOR_IN_PROC InHandler, - EMULATOR_OUT_PROC OutHandler) -{ - if (IoPortProc[Port].In == NULL) - IoPortProc[Port].In = InHandler; - else - DPRINT1("IoPortProc[0x%X].In already registered\n", Port); - - if (IoPortProc[Port].Out == NULL) - IoPortProc[Port].Out = OutHandler; - else - DPRINT1("IoPortProc[0x%X].Out already registered\n", Port); -} - -VOID WINAPI UnregisterIoPort(ULONG Port) -{ - IoPortProc[Port].In = NULL; - IoPortProc[Port].Out = NULL; +VOID RegisterIoPort(ULONG Port, + EMULATOR_INB_PROC InHandler, + EMULATOR_OUTB_PROC OutHandler) +{ + if (IoPortProc[Port].InB == NULL) + IoPortProc[Port].InB = InHandler; + else + DPRINT1("IoPortProc[0x%X].InB already registered\n", Port); + + if (IoPortProc[Port].OutB == NULL) + IoPortProc[Port].OutB = OutHandler; + else + DPRINT1("IoPortProc[0x%X].OutB already registered\n", Port); +} + +VOID UnregisterIoPort(ULONG Port) +{ + IoPortProc[Port].InB = NULL; + IoPortProc[Port].OutB = NULL; } VOID WINAPI @@ -57,24 +300,73 @@ ULONG DataCount, UCHAR DataSize) { - INT i, j; - LPBYTE Address = (LPBYTE)Buffer; - UNREFERENCED_PARAMETER(State); - for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++) - { - ULONG CurrentPort = Port + j; - - /* Call the IN Port handler */ - if (IoPortProc[CurrentPort].In != NULL) - { - *(Address++) = IoPortProc[CurrentPort].In(CurrentPort); - } + if (DataSize == 0 || DataCount == 0) return; + + if (DataSize == sizeof(UCHAR)) + { + if (DataCount == 1) + IOReadB(Port, Buffer); else - { - DPRINT1("Read from unknown port: 0x%X\n", CurrentPort); - *(Address++) = 0xFF; // Empty port value + IOReadStrB(Port, Buffer, DataCount); + } + else if (DataSize == sizeof(USHORT)) + { + if (DataCount == 1) + IOReadW(Port, Buffer); + else + IOReadStrW(Port, Buffer, DataCount); + } + else if (DataSize == sizeof(ULONG)) + { + if (DataCount == 1) + IOReadD(Port, Buffer); + else + IOReadStrD(Port, Buffer, DataCount); + } + else + { + PBYTE Address = (PBYTE)Buffer; + + while (DataCount--) + { + ULONG CurrentPort = Port; + ULONG Count; + UCHAR NewDataSize = DataSize; + + /* Read dword */ + Count = NewDataSize / sizeof(ULONG); + NewDataSize = NewDataSize % sizeof(ULONG); + while (Count--) + { + IOReadD(CurrentPort, (PULONG)Address); + CurrentPort += sizeof(ULONG); + Address += sizeof(ULONG); + } + + /* Read word */ + Count = NewDataSize / sizeof(USHORT); + NewDataSize = NewDataSize % sizeof(USHORT); + while (Count--) + { + IOReadW(CurrentPort, (PUSHORT)Address); + CurrentPort += sizeof(USHORT); + Address += sizeof(USHORT); + } + + /* Read byte */ + Count = NewDataSize / sizeof(UCHAR); + NewDataSize = NewDataSize % sizeof(UCHAR); + while (Count--) + { + IOReadB(CurrentPort, (PUCHAR)Address); + CurrentPort += sizeof(UCHAR); + Address += sizeof(UCHAR); + } + + ASSERT(Count == 0); + ASSERT(NewDataSize == 0); } } } @@ -86,20 +378,174 @@ ULONG DataCount, UCHAR DataSize) { - INT i, j; - LPBYTE Address = (LPBYTE)Buffer; - UNREFERENCED_PARAMETER(State); - for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++) - { - ULONG CurrentPort = Port + j; - - /* Call the OUT Port handler */ - if (IoPortProc[CurrentPort].Out != NULL) - IoPortProc[CurrentPort].Out(CurrentPort, *(Address++)); + if (DataSize == 0 || DataCount == 0) return; + + if (DataSize == sizeof(UCHAR)) + { + if (DataCount == 1) + IOWriteB(Port, Buffer); else - DPRINT1("Write to unknown port: 0x%X\n", CurrentPort); + IOWriteStrB(Port, Buffer, DataCount); + } + else if (DataSize == sizeof(USHORT)) + { + if (DataCount == 1) + IOWriteW(Port, Buffer); + else + IOWriteStrW(Port, Buffer, DataCount); + } + else if (DataSize == sizeof(ULONG)) + { + if (DataCount == 1) + IOWriteD(Port, Buffer); + else + IOWriteStrD(Port, Buffer, DataCount); + } + else + { + PBYTE Address = (PBYTE)Buffer; + + while (DataCount--) + { + ULONG CurrentPort = Port; + ULONG Count; + UCHAR NewDataSize = DataSize; + + /* Write dword */ + Count = NewDataSize / sizeof(ULONG); + NewDataSize = NewDataSize % sizeof(ULONG); + while (Count--) + { + IOWriteD(CurrentPort, (PULONG)Address); + CurrentPort += sizeof(ULONG); + Address += sizeof(ULONG); + } + + /* Write word */ + Count = NewDataSize / sizeof(USHORT); + NewDataSize = NewDataSize % sizeof(USHORT); + while (Count--) + { + IOWriteW(CurrentPort, (PUSHORT)Address); + CurrentPort += sizeof(USHORT); + Address += sizeof(USHORT); + } + + /* Write byte */ + Count = NewDataSize / sizeof(UCHAR); + NewDataSize = NewDataSize % sizeof(UCHAR); + while (Count--) + { + IOWriteB(CurrentPort, (PUCHAR)Address); + CurrentPort += sizeof(UCHAR); + Address += sizeof(UCHAR); + } + + ASSERT(Count == 0); + ASSERT(NewDataSize == 0); + } + } +} + + + +BOOL +WINAPI +VDDInstallIOHook(HANDLE hVdd, + WORD cPortRange, + PVDD_IO_PORTRANGE pPortRange, + PVDD_IO_HANDLERS IOhandler) +{ + /* Check possible validity of the VDD handle */ + if (hVdd == 0 || hVdd == INVALID_HANDLE_VALUE) return FALSE; + + /* Loop for each range of I/O ports */ + while (cPortRange--) + { + WORD i; + + /* Register the range of I/O ports */ + for (i = pPortRange->First; i <= pPortRange->Last; ++i) + { + /* + * Don't do anything if the I/O port is already + * handled internally or externally. + */ + if (IoPortProc[i].hVdd != 0) + { + DPRINT1("IoPortProc[0x%X] already registered\n", i); + continue; + } + + /* Register wrt. the VDD */ + IoPortProc[i].hVdd = hVdd; + + /* Disable the internal handlers */ + IoPortProc[i].InB = NULL; + IoPortProc[i].InW = NULL; + IoPortProc[i].InD = NULL; + + IoPortProc[i].InsB = NULL; + IoPortProc[i].InsW = NULL; + IoPortProc[i].InsD = NULL; + + IoPortProc[i].OutB = NULL; + IoPortProc[i].OutW = NULL; + IoPortProc[i].OutD = NULL; + + IoPortProc[i].OutsB = NULL; + IoPortProc[i].OutsW = NULL; + IoPortProc[i].OutsD = NULL; + + /* Save our handlers */ + IoPortProc[i].VddIoHandlers = *IOhandler; // IOhandler[i]; ????????? + } + + /* Go to next range */ + ++pPortRange; + } + + return TRUE; +} + +VOID +WINAPI +VDDDeInstallIOHook(HANDLE hVdd, + WORD cPortRange, + PVDD_IO_PORTRANGE pPortRange) +{ + /* Check possible validity of the VDD handle */ + if (hVdd == 0 || hVdd == INVALID_HANDLE_VALUE) return; + + /* Loop for each range of I/O ports */ + while (cPortRange--) + { + WORD i; + + /* Unregister the range of I/O ports */ + for (i = pPortRange->First; i <= pPortRange->Last; ++i) + { + /* + * Don't do anything if we don't own the I/O port. + */ + if (IoPortProc[i].hVdd != hVdd) + { + DPRINT1("IoPortProc[0x%X] owned by somebody else\n", i); + continue; + } + + /* + * Put automagically all the fields to zero: + * the hVdd gets unregistered as well as all the handlers. + */ + // IoPortProc[i] = {NULL}; + ZeroMemory(&IoPortProc[i], sizeof(IoPortProc[i])); + } + + /* Go to next range */ + ++pPortRange; } } Modified: branches/ntvdm/subsystems/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.h?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.h [iso-8859-1] Mon Dec 23 18:17:29 2013 @@ -16,14 +16,28 @@ /* FUNCTIONS ******************************************************************/ -typedef BYTE (WINAPI *EMULATOR_IN_PROC)(ULONG Port); -typedef VOID (WINAPI *EMULATOR_OUT_PROC)(ULONG Port, BYTE Data); +typedef UCHAR (WINAPI *EMULATOR_INB_PROC)(ULONG Port); +typedef USHORT (WINAPI *EMULATOR_INW_PROC)(ULONG Port); +typedef ULONG (WINAPI *EMULATOR_IND_PROC)(ULONG Port); -VOID WINAPI RegisterIoPort(ULONG Port, - EMULATOR_IN_PROC InHandler, - EMULATOR_OUT_PROC OutHandler); +typedef VOID (WINAPI *EMULATOR_INSB_PROC)(ULONG Port, PUCHAR Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_INSW_PROC)(ULONG Port, PUSHORT Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_INSD_PROC)(ULONG Port, PULONG Buffer, ULONG Count); -VOID WINAPI UnregisterIoPort(ULONG Port); +typedef VOID (WINAPI *EMULATOR_OUTB_PROC)(ULONG Port, UCHAR Data); +typedef VOID (WINAPI *EMULATOR_OUTW_PROC)(ULONG Port, USHORT Data); +typedef VOID (WINAPI *EMULATOR_OUTD_PROC)(ULONG Port, ULONG Data); + +typedef VOID (WINAPI *EMULATOR_OUTSB_PROC)(ULONG Port, PUCHAR Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_OUTSW_PROC)(ULONG Port, PUSHORT Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_OUTSD_PROC)(ULONG Port, PULONG Buffer, ULONG Count); + + +VOID RegisterIoPort(ULONG Port, + EMULATOR_INB_PROC InHandler, + EMULATOR_OUTB_PROC OutHandler); + +VOID UnregisterIoPort(ULONG Port); VOID WINAPI EmulatorReadIo ( Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Mon Dec 23 18:17:29 2013 @@ -21,7 +21,10 @@ #include <wingdi.h> #include <wincon.h> #include <winnls.h> +#include <winreg.h> #include <winuser.h> + +#include <nt_vdd.h> #include <debug.h> Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.sp… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] Mon Dec 23 18:17:29 2013 @@ -31,7 +31,7 @@ @ stdcall getFS() @ stdcall getGS() @ stdcall getIF() -; @ stdcall getIntelRegistersPointer() +@ stdcall getIntelRegistersPointer() @ stdcall getIP() @ stdcall getMSW() @ stdcall getOF() @@ -41,8 +41,6 @@ @ stdcall getSP() @ stdcall getSS() @ stdcall getZF() - - @ stdcall setAF(long) @ stdcall setAH(long) @@ -88,6 +86,96 @@ @ stdcall setZF(long) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; NTVDM CCPU MIPS exports ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +@ stdcall c_getAF() getAF +@ stdcall c_getAH() getAH +@ stdcall c_getAL() getAL +@ stdcall c_getAX() getAX +@ stdcall c_getBH() getBH +@ stdcall c_getBL() getBL +@ stdcall c_getBP() getBP +@ stdcall c_getBX() getBX +@ stdcall c_getCF() getCF +@ stdcall c_getCH() getCH +@ stdcall c_getCL() getCL +@ stdcall c_getCS() getCS +@ stdcall c_getCX() getCX +@ stdcall c_getDF() getDF +@ stdcall c_getDH() getDH +@ stdcall c_getDI() getDI +@ stdcall c_getDL() getDL +@ stdcall c_getDS() getDS +@ stdcall c_getDX() getDX +@ stdcall c_getEAX() getEAX +@ stdcall c_getEBP() getEBP +@ stdcall c_getEBX() getEBX +@ stdcall c_getECX() getECX +@ stdcall c_getEDI() getEDI +@ stdcall c_getEDX() getEDX +@ stdcall c_getEIP() getEIP +@ stdcall c_getES() getES +@ stdcall c_getESI() getESI +@ stdcall c_getESP() getESP +@ stdcall c_getFS() getFS +@ stdcall c_getGS() getGS +@ stdcall c_getIF() getIF +@ stdcall c_getIP() getIP +@ stdcall c_getMSW() getMSW +@ stdcall c_getOF() getOF +@ stdcall c_getPF() getPF +@ stdcall c_getSF() getSF +@ stdcall c_getSI() getSI +@ stdcall c_getSP() getSP +@ stdcall c_getSS() getSS +@ stdcall c_getZF() getZF + +@ stdcall c_setAF(long) setAF +@ stdcall c_setAH(long) setAH +@ stdcall c_setAL(long) setAL +@ stdcall c_setAX(long) setAX +@ stdcall c_setBH(long) setBH +@ stdcall c_setBL(long) setBL +@ stdcall c_setBP(long) setBP +@ stdcall c_setBX(long) setBX +@ stdcall c_setCF(long) setCF +@ stdcall c_setCH(long) setCH +@ stdcall c_setCL(long) setCL +@ stdcall c_setCS(long) setCS +@ stdcall c_setCX(long) setCX +@ stdcall c_setDF(long) setDF +@ stdcall c_setDH(long) setDH +@ stdcall c_setDI(long) setDI +@ stdcall c_setDL(long) setDL +@ stdcall c_setDS(long) setDS +@ stdcall c_setDX(long) setDX +@ stdcall c_setEAX(long) setEAX +@ stdcall c_setEBP(long) setEBP +@ stdcall c_setEBX(long) setEBX +@ stdcall c_setECX(long) setECX +@ stdcall c_setEDI(long) setEDI +@ stdcall c_setEDX(long) setEDX +@ stdcall c_setEIP(long) setEIP +@ stdcall c_setES(long) setES +@ stdcall c_setESI(long) setESI +@ stdcall c_setESP(long) setESP +@ stdcall c_setFS(long) setFS +@ stdcall c_setGS(long) setGS +@ stdcall c_setIF(long) setIF +@ stdcall c_setIP(long) setIP +@ stdcall c_setMSW(long) setMSW +@ stdcall c_setOF(long) setOF +@ stdcall c_setPF(long) setPF +@ stdcall c_setSF(long) setSF +@ stdcall c_setSI(long) setSI +@ stdcall c_setSP(long) setSP +@ stdcall c_setSS(long) setSS +@ stdcall c_setZF(long) setZF + + + + @ stdcall MGetVdmPointer(long long long) @ stdcall Sim32pGetVDMPointer(long long) @@ -95,3 +183,6 @@ ;@ stdcall VdmFlushCache(long long long long) ; Not exported on x86 @ stdcall VdmMapFlat(long long long) ;@ stdcall VdmUnmapFlat(long long ptr long) ; Not exported on x86 + +@ stdcall VDDInstallIOHook(long long ptr ptr) +@ stdcall VDDDeInstallIOHook(long long ptr) Modified: branches/ntvdm/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] Mon Dec 23 18:17:29 2013 @@ -37,6 +37,14 @@ +PVOID +WINAPI +getIntelRegistersPointer(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + ULONG WINAPI getEAX(VOID) Modified: branches/ntvdm/subsystems/ntvdm/registers.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] Mon Dec 23 18:17:29 2013 @@ -13,6 +13,8 @@ VOID EmulatorSetStack(WORD Segment, DWORD Offset); + +PVOID WINAPI getIntelRegistersPointer(VOID); ULONG WINAPI getEAX(VOID); VOID WINAPI setEAX(ULONG);

1 0

[akhaldi] 61357: [FUSION] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in ...
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 18:16:01 2013 New Revision: 61357 URL: http://svn.reactos.org/svn/reactos?rev=61357&view=rev Log: [FUSION] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/fusion/asmcache.c trunk/reactos/dll/win32/fusion/asmenum.c trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/dll/win32/fusion/assembly.c trunk/reactos/dll/win32/fusion/fusion.c trunk/reactos/dll/win32/fusion/fusionpriv.h Modified: trunk/reactos/dll/win32/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] Mon Dec 23 18:16:01 2013 @@ -18,32 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winver.h" -//#include "wincrypt.h" -#include <winreg.h> -#include <shlwapi.h> -//#include "dbghelp.h" -//#include "ole2.h" -#include <fusion.h> +#include "fusionpriv.h" + #include <corerror.h> - -#include "fusionpriv.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(fusion); static const WCHAR cache_mutex_nameW[] = {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; Modified: trunk/reactos/dll/win32/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmenum.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] Mon Dec 23 18:16:01 2013 @@ -18,30 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "guiddef.h" -#include <fusion.h> -//#include "corerror.h" #include "fusionpriv.h" -#include <wine/debug.h> -#include <wine/unicode.h> #include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(fusion); typedef struct _tagASMNAME { Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Mon Dec 23 18:16:01 2013 @@ -18,29 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> +#include "fusionpriv.h" + #include <assert.h> - -#define COBJMACROS -#define INITGUID - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "guiddef.h" -#include <fusion.h> #include <corerror.h> - -#include <wine/debug.h> -#include <wine/unicode.h> -#include "fusionpriv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(fusion); typedef struct { IAssemblyName IAssemblyName_iface; Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Mon Dec 23 18:16:01 2013 @@ -18,26 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <winver.h> +#include "fusionpriv.h" + #include <wincrypt.h> #include <dbghelp.h> -#include <ole2.h> -#include <fusion.h> #include <corhdr.h> - -#include "fusionpriv.h" -#include <wine/debug.h> -#include <wine/unicode.h> #define TableFromToken(tk) (TypeFromToken(tk) >> 24) #define TokenFromTable(idx) (idx << 24) Modified: trunk/reactos/dll/win32/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.c?… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.c [iso-8859-1] Mon Dec 23 18:16:01 2013 @@ -18,24 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <fusion.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(fusion); - +#include "fusionpriv.h" /****************************************************************** * InitializeFusion (FUSION.@) Modified: trunk/reactos/dll/win32/fusion/fusionpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusionpri… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] Mon Dec 23 18:16:01 2013 @@ -21,12 +21,28 @@ #ifndef __WINE_FUSION_PRIVATE__ #define __WINE_FUSION_PRIVATE__ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#define INITGUID + +#include <windef.h> +#include <winbase.h> #include <winver.h> +#include <ole2.h> +#include <fusion.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(fusion); #include <pshpack1.h>

1 0

[hbelusca] 61356: [NTVDM] - Simplify EmulatorReadMemory (first MMIO-mapped devices copy their memory image back to the VM' memory area, then data is read via RtlCopyMemory), and EmulatorWriteMemory...
by hbelusca＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: hbelusca Date: Mon Dec 23 18:09:18 2013 New Revision: 61356 URL: http://svn.reactos.org/svn/reactos?rev=61356&view=rev Log: [NTVDM] - Simplify EmulatorReadMemory (first MMIO-mapped devices copy their memory image back to the VM' memory area, then data is read via RtlCopyMemory), and EmulatorWriteMemory (simplify VgaBuffer computation and rename this variable accordingly, for readability purposes). - Fix Sim32pGetVDMPointer and MGetVdmPointer prototypes. Modified: branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Mon Dec 23 18:09:18 2013 @@ -43,21 +43,24 @@ /* Make sure the requested address is valid */ if ((Address + Size) >= MAX_ADDRESS) return; - /* Read the data from the virtual address space and store it in the buffer */ - RtlCopyMemory(Buffer, (LPVOID)((ULONG_PTR)BaseAddress + Address), Size); - - /* Check if we modified the console video memory */ + /* + * Check if we are going to read the VGA memory and + * copy it into the virtual address space if needed. + */ if (((Address + Size) >= VgaGetVideoBaseAddress()) && (Address < VgaGetVideoLimitAddress())) { DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); DWORD ActualSize = min(Address + Size - 1, VgaGetVideoLimitAddress()) - VgaAddress + 1; - LPBYTE VgaBuffer = (LPBYTE)((ULONG_PTR)Buffer + VgaAddress - Address); + LPBYTE DestBuffer = (LPBYTE)((ULONG_PTR)BaseAddress + VgaAddress); /* Read from the VGA memory */ - VgaReadMemory(VgaAddress, VgaBuffer, ActualSize); + VgaReadMemory(VgaAddress, DestBuffer, ActualSize); } + + /* Read the data from the virtual address space and store it in the buffer */ + RtlCopyMemory(Buffer, (LPVOID)((ULONG_PTR)BaseAddress + Address), Size); } VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) @@ -76,17 +79,19 @@ /* Read the data from the buffer and store it in the virtual address space */ RtlCopyMemory((LPVOID)((ULONG_PTR)BaseAddress + Address), Buffer, Size); - /* Check if we modified the console video memory */ + /* + * Check if we modified the VGA memory. + */ if (((Address + Size) >= VgaGetVideoBaseAddress()) && (Address < VgaGetVideoLimitAddress())) { DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); DWORD ActualSize = min(Address + Size - 1, VgaGetVideoLimitAddress()) - VgaAddress + 1; - LPBYTE VgaBuffer = (LPBYTE)((ULONG_PTR)Buffer + VgaAddress - Address); + LPBYTE SrcBuffer = (LPBYTE)((ULONG_PTR)BaseAddress + VgaAddress); /* Write to the VGA memory */ - VgaWriteMemory(VgaAddress, VgaBuffer, ActualSize); + VgaWriteMemory(VgaAddress, SrcBuffer, ActualSize); } } @@ -178,8 +183,8 @@ PBYTE WINAPI -Sim32pGetVDMPointer(IN ULONG Address, - IN BOOL ProtectedMode) +Sim32pGetVDMPointer(IN ULONG Address, + IN BOOLEAN ProtectedMode) { // FIXME UNREFERENCED_PARAMETER(ProtectedMode); @@ -189,14 +194,14 @@ * or Selector (if ProtectedMode == TRUE ) * LOWORD(Address) == Offset */ - return SEG_OFF_TO_PTR(HIWORD(Address), LOWORD(Address)); + return (PBYTE)FAR_POINTER(Address); } PBYTE WINAPI -MGetVdmPointer(IN ULONG Address, - IN ULONG Size, - IN BOOL ProtectedMode) +MGetVdmPointer(IN ULONG Address, + IN ULONG Size, + IN BOOLEAN ProtectedMode) { UNREFERENCED_PARAMETER(Size); return Sim32pGetVDMPointer(Address, ProtectedMode);

1 0

[hbelusca] 61355: [NTVDM]: Remove unneeded WINAPI convention calls.
by hbelusca＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: hbelusca Date: Mon Dec 23 18:04:32 2013 New Revision: 61355 URL: http://svn.reactos.org/svn/reactos?rev=61355&view=rev Log: [NTVDM]: Remove unneeded WINAPI convention calls. Modified: branches/ntvdm/subsystems/ntvdm/bop.c branches/ntvdm/subsystems/ntvdm/bop.h branches/ntvdm/subsystems/ntvdm/int32.c branches/ntvdm/subsystems/ntvdm/int32.h Modified: branches/ntvdm/subsystems/ntvdm/bop.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] Mon Dec 23 18:04:32 2013 @@ -23,7 +23,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID WINAPI RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler) +VOID RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler) { BopProc[BopCode] = BopHandler; } Modified: branches/ntvdm/subsystems/ntvdm/bop.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] Mon Dec 23 18:04:32 2013 @@ -20,7 +20,7 @@ typedef VOID (WINAPI *EMULATOR_BOP_PROC)(LPWORD Stack); -VOID WINAPI RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler); +VOID RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler); VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode); #endif // _BOP_H_ Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Mon Dec 23 18:04:32 2013 @@ -146,7 +146,7 @@ DPRINT1("Unassigned Control BOP Function: 0x%02X\n", FuncNum); } -VOID WINAPI InitializeInt32(WORD BiosSegment) +VOID InitializeInt32(WORD BiosSegment) { LPDWORD IntVecTable = (LPDWORD)BaseAddress; LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BiosSegment, 0); @@ -207,7 +207,7 @@ RegisterBop(BOP_CONTROL, ControlBop); } -VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler) +VOID RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler) { Int32Proc[IntNumber] = IntHandler; } Modified: branches/ntvdm/subsystems/ntvdm/int32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.h [iso-8859-1] Mon Dec 23 18:04:32 2013 @@ -23,8 +23,8 @@ typedef VOID (WINAPI *EMULATOR_INT32_PROC)(LPWORD Stack); VOID WINAPI Int32Dispatch(LPWORD Stack); -VOID WINAPI InitializeInt32(WORD BiosSegment); -VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler); +VOID InitializeInt32(WORD BiosSegment); +VOID RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler); #endif // _INT32_H_

1 0

[akhaldi] 61354: [FRAMEDYN] * Improve header inclusions.
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 18:03:35 2013 New Revision: 61354 URL: http://svn.reactos.org/svn/reactos?rev=61354&view=rev Log: [FRAMEDYN] * Improve header inclusions. Modified: trunk/reactos/dll/win32/framedyn/main.c Modified: trunk/reactos/dll/win32/framedyn/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/main.c?… ============================================================================== --- trunk/reactos/dll/win32/framedyn/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/main.c [iso-8859-1] Mon Dec 23 18:03:35 2013 @@ -9,7 +9,9 @@ /* INCLUDES ******************************************************************/ -#include <windows.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

[akhaldi] 61353: [CRYPT32] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 17:56:35 2013 New Revision: 61353 URL: http://svn.reactos.org/svn/reactos?rev=61353&view=rev Log: [CRYPT32] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Modified: trunk/reactos/dll/win32/crypt32/base64.c trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/collectionstore.c trunk/reactos/dll/win32/crypt32/context.c trunk/reactos/dll/win32/crypt32/crl.c trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/ctl.c trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/dll/win32/crypt32/filestore.c trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc trunk/reactos/dll/win32/crypt32/main.c trunk/reactos/dll/win32/crypt32/message.c trunk/reactos/dll/win32/crypt32/msg.c trunk/reactos/dll/win32/crypt32/object.c trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/proplist.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/provstore.c trunk/reactos/dll/win32/crypt32/regstore.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/dll/win32/crypt32/serialize.c trunk/reactos/dll/win32/crypt32/sip.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/crypt32/str.c Modified: trunk/reactos/dll/win32/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/base64.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/base64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/base64.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -19,14 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <wincrypt.h> -#include <wine/debug.h> -#include <wine/unicode.h> +#include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,22 +17,9 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <assert.h> -#include <stdarg.h> - -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <wincrypt.h> -//#include "winnls.h" +#include "crypt32_private.h" + #include <rpc.h> -#include <wine/debug.h> -#include <wine/unicode.h> -#include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -16,17 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#define CERT_CHAIN_PARA_HAS_EXTRA_FIELDS -#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS -#include "wincrypt.h" -#include "wininet.h" -#include "wine/debug.h" -#include "wine/unicode.h" + #include "crypt32_private.h" + +#include <wininet.h> WINE_DEFAULT_DEBUG_CHANNEL(crypt); WINE_DECLARE_DEBUG_CHANNEL(chain); Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/collecti… ============================================================================== --- trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,12 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,13 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(context); Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,14 +17,6 @@ * */ -#include <assert.h> -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,10 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "cryptres.h" + +#include "cryptres.h" #define WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library" #define WINE_FILENAME_STR "crypt32.dll" Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -18,6 +18,35 @@ #ifndef __CRYPT32_PRIVATE_H__ #define __CRYPT32_PRIVATE_H__ + +#include <config.h> +#include <wine/port.h> + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <snmp.h> + +#define CERT_CHAIN_PARA_HAS_EXTRA_FIELDS +#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS +#include <wincrypt.h> + +#include <mssip.h> + +#include <wine/unicode.h> +#include <wine/list.h> +#include <wine/exception.h> +#include <wine/debug.h> /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ */ #ifndef __WINE_CRYPTRES_H__ #define __WINE_CRYPTRES_H__ - -//#include <windef.h> #define IDS_AUTHORITY_KEY_ID 1000 #define IDS_KEY_ATTRIBUTES 1001 Modified: trunk/reactos/dll/win32/crypt32/ctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/ctl.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/ctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/ctl.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,14 +17,6 @@ * */ -#include <assert.h> -#include <stdarg.h> - -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/decode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/decode.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -30,23 +30,6 @@ * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */ -#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winnls.h" -#include "snmp.h" -#include "wine/debug.h" -#include "wine/exception.h" #include "crypt32_private.h" /* This is a bit arbitrary, but to set some limit: */ Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -30,23 +30,6 @@ * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */ -#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "snmp.h" -#include "wine/debug.h" -#include "wine/exception.h" -#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); Modified: trunk/reactos/dll/win32/crypt32/filestore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/filestor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/filestore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/filestore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,13 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winnls.h" -#include "wine/debug.h" -#include "wine/unicode.h" + #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" /*UTF-8*/ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/crypt32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,18 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winreg.h" -#include "winuser.h" +#include "crypt32_private.h" + #include "i_cryptasn1tls.h" -#include "crypt32_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/message.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/message.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -16,12 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" - -#include "wine/debug.h" +#include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -16,18 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "snmp.h" - -#include "wine/debug.h" -#include "wine/exception.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/object.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,18 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "mssip.h" -#include "winuser.h" -#include "wintrust.h" + #include "crypt32_private.h" + +#include <wintrust.h> + #include "cryptres.h" -#include "wine/unicode.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,20 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <stdio.h> -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winreg.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" + #include "cryptres.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/proplist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/proplist… ============================================================================== --- trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,13 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -34,15 +34,7 @@ * */ -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" +#include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/provstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/provstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/provstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/provstore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,12 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/regstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/regstore… ============================================================================== --- trunk/reactos/dll/win32/crypt32/regstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/regstore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,15 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winreg.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,9 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> -#include <stdio.h> + +#include "crypt32_private.h" + #include <sys/types.h> #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -34,15 +34,6 @@ #ifdef HAVE_SECURITY_SECURITY_H #include <Security/Security.h> #endif -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wincrypt.h" -#include "winternl.h" -#include "wine/debug.h" -#include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/serialize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/serializ… ============================================================================== --- trunk/reactos/dll/win32/crypt32/serialize.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/serialize.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -16,15 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/exception.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/sip.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/sip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/sip.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winreg.h" -#include "winnls.h" -#include "mssip.h" -#include "winuser.h" - -#include "wine/debug.h" -#include "wine/list.h" +#include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/store.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/store.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -23,20 +23,6 @@ * - Many flags, options and whatnot are unimplemented. */ -#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "winuser.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/exception.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,17 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winuser.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/unicode.h" + +#include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt);

1 0

[hbelusca] 61352: [DDK] Introduce DDK headers needed for Virtual Device Drivers development. nt_vdd.h and vddsvc.h will get populated with functions as soon as they will be implemented in NTVDM. is...
by hbelusca＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: hbelusca Date: Mon Dec 23 17:40:50 2013 New Revision: 61352 URL: http://svn.reactos.org/svn/reactos?rev=61352&view=rev Log: [DDK] Introduce DDK headers needed for Virtual Device Drivers development. nt_vdd.h and vddsvc.h will get populated with functions as soon as they will be implemented in NTVDM. isvbop.h/.inc is fully implemented. isvbop.inc defines 3rd-party VDD bops and "function"-calls for 16-bit apps (in assembler), and isvbop.h defines the same in C-language. They are both MSVC and GCC-compatible. Added: branches/ntvdm/include/ddk/isvbop.h (with props) branches/ntvdm/include/ddk/isvbop.inc (with props) branches/ntvdm/include/ddk/nt_vdd.h (with props) branches/ntvdm/include/ddk/vddsvc.h (with props) Added: branches/ntvdm/include/ddk/isvbop.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/isvbop.h?rev=… ============================================================================== --- branches/ntvdm/include/ddk/isvbop.h (added) +++ branches/ntvdm/include/ddk/isvbop.h [iso-8859-1] Mon Dec 23 17:40:50 2013 @@ -0,0 +1,51 @@ +/* + * isvbop.h + * + * Windows NT Device Driver Kit + * + * This file is part of the ReactOS DDK package. + * + * Contributors: + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +/* + * The corresponding ASM header of this file is isvbop.inc. + */ + +#pragma once + +/* BOP Identifiers */ +#define BOP_3RDPARTY 0x58 // 3rd-party VDD BOP +#define BOP_UNSIMULATE 0xFE // Stop execution + +#if defined(__GNUC__) + +#define RegisterModule() __asm__(".byte 0xC4, 0xC4, %c0, 0" : : "i"(BOP_3RDPARTY)) +#define UnRegisterModule() __asm__(".byte 0xC4, 0xC4, %c0, 1" : : "i"(BOP_3RDPARTY)) +#define DispatchCall() __asm__(".byte 0xC4, 0xC4, %c0, 2" : : "i"(BOP_3RDPARTY)) +#define VDDUnSimulate16() __asm__(".byte 0xC4, 0xC4, %c0" : : "i"(BOP_UNSIMULATE)) + +#elif defined(_MSC_VER) + +#define RegisterModule() _asm _emit 0xC4 _asm _emit 0xC4 _asm _emit BOP_3RDPARTY _asm _emit 0 +#define UnRegisterModule() _asm _emit 0xC4 _asm _emit 0xC4 _asm _emit BOP_3RDPARTY _asm _emit 1 +#define DispatchCall() _asm _emit 0xC4 _asm _emit 0xC4 _asm _emit BOP_3RDPARTY _asm _emit 2 +#define VDDUnSimulate16() _asm _emit 0xC4 _asm _emit 0xC4 _asm _emit BOP_UNSIMULATE + +#else +#error Unknown compiler for inline assembler +#endif + +/* EOF */ Propchange: branches/ntvdm/include/ddk/isvbop.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/include/ddk/isvbop.inc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/isvbop.inc?re… ============================================================================== --- branches/ntvdm/include/ddk/isvbop.inc (added) +++ branches/ntvdm/include/ddk/isvbop.inc [iso-8859-1] Mon Dec 23 17:40:50 2013 @@ -0,0 +1,49 @@ +/* + * isvbop.inc + * + * Windows NT Device Driver Kit + * + * This file is part of the ReactOS DDK package. + * + * Contributors: + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +/* + * This is the corresponding ASM header for isvbop.h. + * Please refer to isvbop.h for information about these interfaces. + */ + +#include <asm.inc> + +BOP_3RDPARTY = HEX(58) +BOP_UNSIMULATE = HEX(FE) + +MACRO(RegisterModule) + .byte HEX(C4), HEX(C4), BOP_3RDPARTY, 0 +ENDM + +MACRO(UnRegisterModule) + .byte HEX(C4), HEX(C4), BOP_3RDPARTY, 1 +ENDM + +MACRO(DispatchCall) + .byte HEX(C4), HEX(C4), BOP_3RDPARTY, 2 +ENDM + +MACRO(VDDUnSimulate16) + .byte HEX(C4), HEX(C4), BOP_UNSIMULATE +ENDM + +/* EOF */ Propchange: branches/ntvdm/include/ddk/isvbop.inc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/include/ddk/nt_vdd.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/nt_vdd.h?rev=… ============================================================================== --- branches/ntvdm/include/ddk/nt_vdd.h (added) +++ branches/ntvdm/include/ddk/nt_vdd.h [iso-8859-1] Mon Dec 23 17:40:50 2013 @@ -0,0 +1,85 @@ +/* + * nt_vdd.h + * + * Windows NT Device Driver Kit + * + * This file is part of the ReactOS DDK package. + * + * Contributors: + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#pragma once + +#define _NT_VDD + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * I/O Port services + */ + +typedef VOID (*PFNVDD_INB) (WORD iport, PBYTE data); +typedef VOID (*PFNVDD_INW) (WORD iport, PWORD data); +typedef VOID (*PFNVDD_INSB) (WORD iport, PBYTE data, WORD count); +typedef VOID (*PFNVDD_INSW) (WORD iport, PWORD data, WORD count); +typedef VOID (*PFNVDD_OUTB) (WORD iport, BYTE data); +typedef VOID (*PFNVDD_OUTW) (WORD iport, WORD data); +typedef VOID (*PFNVDD_OUTSB) (WORD iport, PBYTE data, WORD count); +typedef VOID (*PFNVDD_OUTSW) (WORD iport, PWORD data, WORD count); + +typedef struct _VDD_IO_HANDLERS +{ + PFNVDD_INB inb_handler; + PFNVDD_INW inw_handler; + PFNVDD_INSB insb_handler; + PFNVDD_INSW insw_handler; + PFNVDD_OUTB outb_handler; + PFNVDD_OUTW outw_handler; + PFNVDD_OUTSB outsb_handler; + PFNVDD_OUTSW outsw_handler; +} VDD_IO_HANDLERS, *PVDD_IO_HANDLERS; + +typedef struct _VDD_IO_PORTRANGE +{ + WORD First; + WORD Last; +} VDD_IO_PORTRANGE, *PVDD_IO_PORTRANGE; + +BOOL +WINAPI +VDDInstallIOHook +( + HANDLE hVdd, + WORD cPortRange, + PVDD_IO_PORTRANGE pPortRange, + PVDD_IO_HANDLERS IOhandler +); + +VOID +WINAPI +VDDDeInstallIOHook +( + HANDLE hVdd, + WORD cPortRange, + PVDD_IO_PORTRANGE pPortRange +); + +#ifdef __cplusplus +} +#endif + +/* EOF */ Propchange: branches/ntvdm/include/ddk/nt_vdd.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/include/ddk/vddsvc.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/vddsvc.h?rev=… ============================================================================== --- branches/ntvdm/include/ddk/vddsvc.h (added) +++ branches/ntvdm/include/ddk/vddsvc.h [iso-8859-1] Mon Dec 23 17:40:50 2013 @@ -0,0 +1,31 @@ +/* + * vddsvc.h + * + * Windows NT Device Driver Kit + * + * This file is part of the ReactOS DDK package. + * + * Contributors: + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#pragma once + +#ifndef _NT_VDD +#include <nt_vdd.h> +#endif + + + +/* EOF */ Propchange: branches/ntvdm/include/ddk/vddsvc.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 61351: [UNIATA] * Use the proper debugging define.
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 15:11:00 2013 New Revision: 61351 URL: http://svn.reactos.org/svn/reactos?rev=61351&view=rev Log: [UNIATA] * Use the proper debugging define. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Dec 23 15:11:00 2013 @@ -2236,7 +2236,7 @@ if(ChipFlags & UNIATA_AHCI) { KdPrint2((PRINT_PREFIX " AHCI path\n")); if(UniataAhciChanImplemented(deviceExtension, j)) { -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif AtapiDisableInterrupts(deviceExtension, j); @@ -4771,13 +4771,13 @@ statusByte |= IDE_STATUS_ERROR; } else { // We have only Overflow. Abort operation and continue -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif if(!UniataAhciAbortOperation(chan)) { KdPrint2((PRINT_PREFIX "need UniataAhciReset\n")); } -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif UniataAhciWaitCommandReady(chan, 10); @@ -4948,7 +4948,7 @@ if(deviceExtension->HwFlags & UNIATA_AHCI) { error = AtaReq->ahci.in_error; // wait ready -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif if(!UniataAhciAbortOperation(chan)) { @@ -4956,11 +4956,11 @@ } // clear interrupts again UniataAhciWaitCommandReady(chan, 10); -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif UniataAhciStatus(HwDeviceExtension, lChannel, DEVNUM_NOT_SPECIFIED); -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif } else {

1 0

[akhaldi] 61350: [SFC_OS] * We don't need a PCH (one source file).
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 15:08:58 2013 New Revision: 61350 URL: http://svn.reactos.org/svn/reactos?rev=61350&view=rev Log: [SFC_OS] * We don't need a PCH (one source file). Removed: trunk/reactos/dll/win32/sfc_os/precomp.h Modified: trunk/reactos/dll/win32/sfc_os/CMakeLists.txt trunk/reactos/dll/win32/sfc_os/sfc_os.c Modified: trunk/reactos/dll/win32/sfc_os/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/CMakeLists.txt [iso-8859-1] Mon Dec 23 15:08:58 2013 @@ -11,5 +11,4 @@ set_module_type(sfc_os win32dll) add_importlibs(sfc_os msvcrt kernel32 ntdll) -add_pch(sfc_os precomp.h) add_cd_file(TARGET sfc_os DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/sfc_os/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/precomp.h (removed) @@ -1,10 +0,0 @@ -#ifndef _PRECOMP_H__ -#define _PRECOMP_H__ - -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> - -#endif Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.c?… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] Mon Dec 23 15:08:58 2013 @@ -18,7 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#define WIN32_NO_STATUS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> + +#define NDEBUG #include <debug.h> HINSTANCE hLibModule; @@ -162,4 +170,4 @@ UNIMPLEMENTED; /* Always return success */ return 0; -} +}

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
31
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 December 2013