Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[hbelusca] 61795: [NTVDM]: Register functions are already declared via the inclusion of ddk/vddsvc.h. However still keep their definitions also in registers.h (yet #if 0'ed out) for reference.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 24 20:37:40 2014 New Revision: 61795 URL: http://svn.reactos.org/svn/reactos?rev=61795&view=rev Log: [NTVDM]: Register functions are already declared via the inclusion of ddk/vddsvc.h. However still keep their definitions also in registers.h (yet #if 0'ed out) for reference. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/registers.c branches/ntvdm/subsystems/ntvdm/registers.h branches/ntvdm/subsystems/ntvdm/vddsup.c 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] Fri Jan 24 20:37:40 2014 @@ -25,6 +25,7 @@ #include <winuser.h> #include <vddsvc.h> +// #include "registers.h" #include <debug.h> 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] Fri Jan 24 20:37:40 2014 @@ -11,7 +11,6 @@ #define NDEBUG #include "emulator.h" -#include "registers.h" /* PUBLIC FUNCTIONS ***********************************************************/ 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] Fri Jan 24 20:37:40 2014 @@ -13,6 +13,7 @@ VOID EmulatorSetStack(WORD Segment, DWORD Offset); +#if 0 // Those function prototypes are already included via ddk/vddsvc.h PVOID WINAPI getIntelRegistersPointer(VOID); @@ -115,6 +116,8 @@ USHORT WINAPI getMSW(VOID); VOID WINAPI setMSW(USHORT); +#endif + #endif // _REGISTERS_H_ /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vddsup.c… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vddsup.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vddsup.c [iso-8859-1] Fri Jan 24 20:37:40 2014 @@ -14,7 +14,6 @@ #include "vddsup.h" #include "bop.h" -#include "registers.h" #include <isvbop.h>

10 years, 9 months

[hbelusca] 61794: [NTVDM]: Clean ConsoleFramebuffer after leaving graphics mode.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 24 20:36:17 2014 New Revision: 61794 URL: http://svn.reactos.org/svn/reactos?rev=61794&view=rev Log: [NTVDM]: Clean ConsoleFramebuffer after leaving graphics mode. Modified: branches/ntvdm/subsystems/ntvdm/hardware/vga.c Modified: branches/ntvdm/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Fri Jan 24 20:36:17 2014 @@ -617,6 +617,7 @@ /* Cleanup the video data */ CloseHandle(ConsoleMutex); ConsoleMutex = NULL; + ConsoleFramebuffer = NULL; CloseHandle(GraphicsConsoleBuffer); GraphicsConsoleBuffer = NULL; DoubleVision = FALSE;

10 years, 9 months

[akhaldi] 61793: [NETAPI32] * Remove one time inclusions from the main header and put them back where they belong. * Move some inclusions to the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 24 20:24:47 2014 New Revision: 61793 URL: http://svn.reactos.org/svn/reactos?rev=61793&view=rev Log: [NETAPI32] * Remove one time inclusions from the main header and put them back where they belong. * Move some inclusions to the main header. CORE-7716 Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/browsr.c trunk/reactos/dll/win32/netapi32/ds.c trunk/reactos/dll/win32/netapi32/group.c trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/misc.c trunk/reactos/dll/win32/netapi32/nbcmdqueue.c trunk/reactos/dll/win32/netapi32/nbcmdqueue.h trunk/reactos/dll/win32/netapi32/nbnamecache.c trunk/reactos/dll/win32/netapi32/nbnamecache.h trunk/reactos/dll/win32/netapi32/nbt.c trunk/reactos/dll/win32/netapi32/netapi32.c trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/netbios.c trunk/reactos/dll/win32/netapi32/netbios.h trunk/reactos/dll/win32/netapi32/share.c trunk/reactos/dll/win32/netapi32/user.c trunk/reactos/dll/win32/netapi32/wksta.c Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -21,7 +21,6 @@ #include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - /************************************************************ * ACCESS_QueryAdminDisplayInformation Modified: trunk/reactos/dll/win32/netapi32/browsr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/browsr.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/browsr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/browsr.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -20,6 +20,8 @@ #include "netapi32.h" +#include <lmbrowsr.h> + /************************************************************ * I_BrowserSetNetlogonState (NETAPI32.@) */ Modified: trunk/reactos/dll/win32/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/ds.c?re… ============================================================================== --- trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -19,6 +19,9 @@ */ #include "netapi32.h" + +#include <dsrole.h> +#include <dsgetdc.h> WINE_DEFAULT_DEBUG_CHANNEL(ds); Modified: trunk/reactos/dll/win32/netapi32/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/group.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -21,7 +21,6 @@ #include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - /************************************************************ * NetGroupAdd (NETAPI32.@) Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -21,7 +21,6 @@ #include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - typedef enum _ENUM_PHASE { Modified: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -11,14 +11,11 @@ #include "netapi32.h" - WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - /* GLOBALS *******************************************************************/ static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/netapi32/nbcmdqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbcmdqu… ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbcmdqueue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbcmdqueue.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -14,9 +14,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 <config.h> -#include <wine/debug.h> -#include "nbcmdqueue.h" + +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); Modified: trunk/reactos/dll/win32/netapi32/nbcmdqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbcmdqu… ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbcmdqueue.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbcmdqueue.h [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -16,15 +16,6 @@ */ #ifndef __NBCMDQUEUE_H__ #define __NBCMDQUEUE_H__ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <nb30.h> /* This file defines a queue of pending NetBIOS commands. The queue operations * are thread safe, with the exception of NBCmdQueueDestroy: ensure no other Modified: trunk/reactos/dll/win32/netapi32/nbnamecache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbnamec… ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbnamecache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbnamecache.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -19,10 +19,7 @@ * rather more efficient than not having a name cache at all. */ -#include <config.h> -//#include "wine/port.h" - -#include "nbnamecache.h" +#include "netapi32.h" typedef struct _NBNameCacheNode { Modified: trunk/reactos/dll/win32/netapi32/nbnamecache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbnamec… ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbnamecache.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbnamecache.h [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -16,16 +16,6 @@ */ #ifndef __WINE_NBNAMECACHE_H #define __WINE_NBNAMECACHE_H - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <nb30.h> struct NBNameCache; Modified: trunk/reactos/dll/win32/netapi32/nbt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/nbt.c?r… ============================================================================== --- trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/nbt.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -65,22 +65,10 @@ * See also other FIXMEs in the code. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> +#include "netapi32.h" + #include <winsock2.h> -#include <wine/debug.h> #include <winreg.h> -#include <iphlpapi.h> - -#include "netbios.h" -#include "nbnamecache.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -16,16 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#include <config.h> - -#include <wine/debug.h> -//#include "lm.h" -#include "netbios.h" - -#define NTOS_MODE_USER -#include <ndk/rtlfuncs.h> #include "netapi32.h" + +#include <lmserver.h> WINE_DEFAULT_DEBUG_CHANNEL(netbios); Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -1,34 +1,32 @@ - #ifndef __WINE_NETAPI32_H__ #define __WINE_NETAPI32_H__ +#include <wine/config.h> + #include <stdarg.h> -//#include "ntstatus.h" #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <windef.h> #include <winbase.h> -//#include "winerror.h" -//#include "lmcons.h" #include <lmaccess.h> #include <lmapibuf.h> -#include <lmbrowsr.h> #include <lmerr.h> -//#include "lmshare.h" -//#include "lmuse.h" #include <ntsecapi.h> -#include <dsrole.h> -#include <dsgetdc.h> +#include <nb30.h> +#include <iphlpapi.h> + #include <wine/debug.h> -//#include "wine/unicode.h" -#include <wine/list.h> #define NTOS_MODE_USER -#include <ndk/kefuncs.h> -#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> + #include <ntsam.h> +#include "nbnamecache.h" +#include "netbios.h" NET_API_STATUS WINAPI @@ -64,4 +62,4 @@ BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); -#endif +#endif /* __WINE_NETAPI32_H__ */ Modified: trunk/reactos/dll/win32/netapi32/netbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netbios… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netbios.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netbios.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -14,10 +14,10 @@ * 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 <wine/debug.h> + +#include "netapi32.h" + #include "nbcmdqueue.h" -#include "netbios.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); Modified: trunk/reactos/dll/win32/netapi32/netbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netbios… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netbios.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netbios.h [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -16,12 +16,6 @@ */ #ifndef __WINE_NETBIOS_H__ #define __WINE_NETBIOS_H__ - -//#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <lm.h> -#include <nb30.h> /* This file describes the interface WINE's NetBIOS implementation uses to * interact with a transport implementation (where a transport might be Modified: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -15,9 +15,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/debug.h> -#include <lm.h> -//#include "winerror.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(share); Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -29,8 +29,10 @@ #include "netapi32.h" +#include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> + WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - typedef struct _ENUM_CONTEXT { Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Fri Jan 24 20:24:47 2014 @@ -18,28 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <stdlib.h> -#include <ntstatus.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <windef.h> -#include <winbase.h> -//#include "winsock2.h" -//#include "nb30.h" -//#include "lmcons.h" -//#include "lmapibuf.h" -//#include "lmerr.h" -//#include "lmwksta.h" -#include <iphlpapi.h> -//#include "winerror.h" -#include <ntsecapi.h> -#include "netbios.h" -#include <wine/debug.h> +#include "netapi32.h" + +#include <lmwksta.h> +#include <lmjoin.h> WINE_DEFAULT_DEBUG_CHANNEL(netapi32);

10 years, 9 months

[akhaldi] 61792: [MSXML3] * Move some inclusions to the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 24 20:15:05 2014 New Revision: 61792 URL: http://svn.reactos.org/svn/reactos?rev=61792&view=rev Log: [MSXML3] * Move some inclusions to the main header. CORE-7716 Modified: trunk/reactos/dll/win32/msxml3/bsc.c trunk/reactos/dll/win32/msxml3/dispex.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/httprequest.c trunk/reactos/dll/win32/msxml3/mxnamespace.c trunk/reactos/dll/win32/msxml3/precomp.h trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/xmldoc.c trunk/reactos/dll/win32/msxml3/xslpattern.tab.c trunk/reactos/dll/win32/msxml3/xslpattern.yy.c Modified: trunk/reactos/dll/win32/msxml3/bsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/bsc.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msxml3/bsc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/bsc.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -18,10 +18,6 @@ #include "precomp.h" -#include <wininet.h> -#include <winreg.h> -#include <shlwapi.h> - struct bsc_t { IBindStatusCallback IBindStatusCallback_iface; Modified: trunk/reactos/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/dispex.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/dispex.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -17,8 +17,6 @@ */ #include "precomp.h" - -#include <wine/list.h> static CRITICAL_SECTION cs_dispex_static_data; static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -32,8 +32,6 @@ #include <olectl.h> #include <objsafe.h> - -#include <wine/list.h> #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreque… ============================================================================== --- trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -22,12 +22,9 @@ #include "precomp.h" #include <wingdi.h> -#include <wininet.h> #include <mshtml.h> #include <objsafe.h> #include <docobj.h> - -#include <wine/list.h> #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/mxnamespace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxnamespa… ============================================================================== --- trunk/reactos/dll/win32/msxml3/mxnamespace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/mxnamespace.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -20,8 +20,6 @@ #include "precomp.h" -#include <wine/list.h> - struct ns { BSTR prefix; Modified: trunk/reactos/dll/win32/msxml3/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/msxml3/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/precomp.h [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -15,12 +15,17 @@ #include <windef.h> #include <winbase.h> +#include <winreg.h> #include <ole2.h> #include <msxml6.h> +#include <wininet.h> +#include <shlwapi.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include <wine/list.h> #include "msxml_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + #endif /* _MSXML3_PCH_ */ Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -24,8 +24,6 @@ #ifdef HAVE_LIBXML2 # include <libxml/parserInternals.h> #endif - -#include <wine/list.h> #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -19,10 +19,6 @@ */ #include "precomp.h" - -#include <wininet.h> -#include <winreg.h> -#include <shlwapi.h> #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/xslpattern.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.tab.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -78,16 +78,13 @@ /* Line 189 of yacc.c */ #line 21 "xslpattern.y" -#include <config.h> +#include "precomp.h" + #include <wine/port.h> #ifdef HAVE_LIBXML2 #include "xslpattern.h" #include <libxml/xpathInternals.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - static const xmlChar NameTest_mod_pre[] = "*[name()='"; static const xmlChar NameTest_mod_post[] = "']"; Modified: trunk/reactos/dll/win32/msxml3/xslpattern.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.yy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.yy.c [iso-8859-1] Fri Jan 24 20:15:05 2014 @@ -526,16 +526,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #line 22 "xslpattern.l" -#include "config.h" +#include "precomp.h" #include "wine/port.h" #ifdef HAVE_LIBXML2 #include "xslpattern.h" #include "xslpattern.tab.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #define SCAN xslpattern_get_extra(yyscanner)

10 years, 9 months

[akhaldi] 61791: [MSWSOCK] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 24 18:18:39 2014 New Revision: 61791 URL: http://svn.reactos.org/svn/reactos?rev=61791&view=rev Log: [MSWSOCK] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/mswsock/extensions.c trunk/reactos/dll/win32/mswsock/precomp.h trunk/reactos/dll/win32/mswsock/stubs.c Modified: trunk/reactos/dll/win32/mswsock/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/extensio… ============================================================================== --- trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] Fri Jan 24 18:18:39 2014 @@ -8,6 +8,9 @@ */ #include "precomp.h" + +#include <winsock2.h> +#include <mswsock.h> /* * @implemented Modified: trunk/reactos/dll/win32/mswsock/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/precomp.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/precomp.h [iso-8859-1] Fri Jan 24 18:18:39 2014 @@ -1,11 +1,8 @@ +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> #include <windef.h> #include <winbase.h> -#include <winsock2.h> -#include <mswsock.h> -#include <ws2spi.h> -#include <nspapi.h> Modified: trunk/reactos/dll/win32/mswsock/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] Fri Jan 24 18:18:39 2014 @@ -8,6 +8,9 @@ */ #include "precomp.h" + +#include <ws2spi.h> +#include <nspapi.h> typedef DWORD (* LPFN_NSPAPI)(VOID); typedef struct _NS_ROUTINE {

10 years, 9 months

[akhaldi] 61790: [MSVFW32] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Remo...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 24 18:03:28 2014 New Revision: 61790 URL: http://svn.reactos.org/svn/reactos?rev=61790&view=rev Log: [MSVFW32] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Added: trunk/reactos/dll/win32/msvfw32/resource.h (with props) Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc trunk/reactos/dll/win32/msvfw32/mciwnd.c trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/dll/win32/msvfw32/msvideo_private.h trunk/reactos/dll/win32/msvfw32/rsrc.rc Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -20,21 +20,7 @@ * Handle palettes */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -#include <vfw.h> - -#include <wine/debug.h> +#include "msvideo_private.h" WINE_DEFAULT_DEBUG_CHANNEL(msvideo); Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -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 "msvideo_private.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -16,8 +16,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 "msvideo_private.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -16,8 +16,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 "msvideo_private.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -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 "msvideo_private.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -16,9 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvideo_private.h" - -/*UTF-8*/ +/* UTF-8 */ #pragma code_page(65001) LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -16,8 +16,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 "msvideo_private.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -16,8 +16,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 "msvideo_private.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -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 "msvideo_private.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -15,8 +15,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 "msvideo_private.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -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 "msvideo_private.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -16,8 +16,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 "msvideo_private.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -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 "msvideo_private.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msvfw32/mciwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/mciwnd.c… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/mciwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/mciwnd.c [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -21,23 +21,12 @@ * Add support for MCIWNDF_RECORD. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -#include <wingdi.h> -//#include "winuser.h" +#include "msvideo_private.h" + #include <winternl.h> -#include <vfw.h> #include <digitalv.h> #include <commctrl.h> #include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(mci); Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -26,24 +26,12 @@ * - no thread safety */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> +#include "msvideo_private.h" + #include <winreg.h> -#include <winnls.h> -#include <wingdi.h> -#include <winuser.h> #include <commdlg.h> -#include <vfw.h> -#include "msvideo_private.h" -#include <wine/debug.h> + +#include "resource.h" /* Drivers32 settings */ #define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32" Modified: trunk/reactos/dll/win32/msvfw32/msvideo_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_private.h [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -19,12 +19,22 @@ #ifndef __WINE_MSVIDEO_PRIVATE_H #define __WINE_MSVIDEO_PRIVATE_H +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <windef.h> -#include <winuser.h> +#include <winbase.h> +#include <winnls.h> +#include <wingdi.h> +#include <vfw.h> + +#include <wine/debug.h> #define ICM_CHOOSE_COMPRESSOR 1 #define IDC_COMP_LIST 880 -#define IDS_FULLFRAMES 901 /* HIC struct (same layout as Win95 one) */ typedef struct tagWINE_HIC { @@ -46,17 +56,4 @@ extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN; -#define IDC_CONFIGURE 882 -#define IDC_ABOUT 883 - -#define IDC_QUALITY_SCROLL 884 -#define IDC_QUALITY_TXT 886 - -#define IDC_KEYFRAME_CHECKBOX 887 -#define IDC_KEYFRAME 888 -#define IDC_KEYFRAME_FRAMES 889 -#define IDC_DATARATE_CHECKBOX 894 -#define IDC_DATARATE 895 -#define IDC_DATARATE_KB 896 - #endif /* __WINE_MSVIDEO_PRIVATE_H */ Added: trunk/reactos/dll/win32/msvfw32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/resource… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/resource.h (added) +++ trunk/reactos/dll/win32/msvfw32/resource.h [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -0,0 +1,34 @@ +/* + * Copyright 1999 Marcus Meissner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma once + +#define IDS_FULLFRAMES 901 + +#define IDC_CONFIGURE 882 +#define IDC_ABOUT 883 + +#define IDC_QUALITY_SCROLL 884 +#define IDC_QUALITY_TXT 886 + +#define IDC_KEYFRAME_CHECKBOX 887 +#define IDC_KEYFRAME 888 +#define IDC_KEYFRAME_FRAMES 889 +#define IDC_DATARATE_CHECKBOX 894 +#define IDC_DATARATE 895 +#define IDC_DATARATE_KB 896 Propchange: trunk/reactos/dll/win32/msvfw32/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] Fri Jan 24 18:03:28 2014 @@ -16,9 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winuser.h" -//#include "msvideo_private.h" +#include <windef.h> +#include <winuser.h> + +#include "resource.h" #ifdef LANGUAGE_DA_DK #include "lang/msvfw32_Da.rc"

10 years, 9 months

[akhaldi] 61789: [MSPORTS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 24 18:00:48 2014 New Revision: 61789 URL: http://svn.reactos.org/svn/reactos?rev=61789&view=rev Log: [MSPORTS] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/msports/classinst.c trunk/reactos/dll/win32/msports/internal.h trunk/reactos/dll/win32/msports/precomp.h Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Fri Jan 24 18:00:48 2014 @@ -7,6 +7,11 @@ */ #include "precomp.h" + +#include <wchar.h> + +#define NTOS_MODE_USER +#include <ndk/cmtypes.h> typedef enum _PORT_TYPE { Modified: trunk/reactos/dll/win32/msports/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/internal… ============================================================================== --- trunk/reactos/dll/win32/msports/internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/internal.h [iso-8859-1] Fri Jan 24 18:00:48 2014 @@ -6,4 +6,4 @@ * COPYRIGHT: Copyright 2011 Eric Kohl */ -extern HINSTANCE hInstance; +extern HINSTANCE hInstance; Modified: trunk/reactos/dll/win32/msports/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/precomp.… ============================================================================== --- trunk/reactos/dll/win32/msports/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/precomp.h [iso-8859-1] Fri Jan 24 18:00:48 2014 @@ -1,16 +1,19 @@ +#include <stdarg.h> + #define WIN32_NO_STATUS -#include <stdarg.h> +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <windef.h> #include <winbase.h> #include <winreg.h> #include <winuser.h> -#include <wchar.h> -#include <cmtypes.h> #include <msports.h> #include <setupapi.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msports); #include "internal.h" #include "resource.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msports);

10 years, 9 months

[akhaldi] 61788: [MSIMTF] * Create a main header and move some inclusions to it. * Improve the header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 24 17:59:28 2014 New Revision: 61788 URL: http://svn.reactos.org/svn/reactos?rev=61788&view=rev Log: [MSIMTF] * Create a main header and move some inclusions to it. * Improve the header inclusions. CORE-7716 Added: trunk/reactos/dll/win32/msimtf/precomp.h (with props) Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c trunk/reactos/dll/win32/msimtf/main.c Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… ============================================================================== --- trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] Fri Jan 24 17:59:28 2014 @@ -18,31 +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 <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winreg.h" -//#include "winuser.h" -//#include "winerror.h" -#include <objbase.h> -#include <dimm.h> -//#include "imm.h" - -//#include "wine/unicode.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msimtf); +#include "precomp.h" typedef struct tagActiveIMMApp { IActiveIMMApp IActiveIMMApp_iface; Modified: trunk/reactos/dll/win32/msimtf/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] Fri Jan 24 17:59:28 2014 @@ -16,28 +16,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 "precomp.h" -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -#include <ole2.h> #include <rpcproxy.h> -#include <dimm.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msimtf); extern HRESULT ActiveIMMApp_Constructor(IUnknown *punkOuter, IUnknown **ppOut); Added: trunk/reactos/dll/win32/msimtf/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/msimtf/precomp.h (added) +++ trunk/reactos/dll/win32/msimtf/precomp.h [iso-8859-1] Fri Jan 24 17:59:28 2014 @@ -0,0 +1,23 @@ +#ifndef _MSIMTF_PCH_ +#define _MSIMTF_PCH_ + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <dimm.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msimtf); + +#endif /* _MSIMTF_PCH_ */ Propchange: trunk/reactos/dll/win32/msimtf/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 9 months

[akhaldi] 61787: [MSCTF] * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 24 17:37:14 2014 New Revision: 61787 URL: http://svn.reactos.org/svn/reactos?rev=61787&view=rev Log: [MSCTF] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Fri Jan 24 17:37:14 2014 @@ -37,7 +37,6 @@ #include <objbase.h> #include <olectl.h> #include <msctf.h> -#include <shlwapi.h> #include <wine/list.h> #include <wine/unicode.h>

10 years, 9 months

[hbelusca] 61786: [NTVDM]: Use EmulatorRead/WriteMemory instead of directly use the VgaXXXMemory helpers.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 24 00:41:26 2014 New Revision: 61786 URL: http://svn.reactos.org/svn/reactos?rev=61786&view=rev Log: [NTVDM]: Use EmulatorRead/WriteMemory instead of directly use the VgaXXXMemory helpers. Modified: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c Modified: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Fri Jan 24 00:41:26 2014 @@ -618,9 +618,10 @@ for (j = Rectangle.Left; j <= Rectangle.Right; j++) { /* Read from video memory */ - VgaReadMemory(VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), - (LPVOID)&Character, - sizeof(WORD)); + EmulatorReadMemory(&EmulatorContext, + VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), + (LPVOID)&Character, + sizeof(WORD)); /* Write the data to the buffer in row order */ Buffer[Counter++] = Character; @@ -642,9 +643,10 @@ Character = Buffer[Counter++]; /* Write to video memory */ - VgaWriteMemory(VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), - (LPVOID)&Character, - sizeof(WORD)); + EmulatorWriteMemory(&EmulatorContext, + VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), + (LPVOID)&Character, + sizeof(WORD)); } } } @@ -775,9 +777,10 @@ ++Counter; /* Write to video memory */ - VgaWriteMemory(VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), - (LPVOID)&Character, - sizeof(WORD)); + EmulatorWriteMemory(&EmulatorContext, + VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), + (LPVOID)&Character, + sizeof(WORD)); } } @@ -1044,6 +1047,109 @@ return TRUE; } +VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) +{ + WORD CharData = MAKEWORD(Character, Attribute); + BYTE Row, Column; + + /* Make sure the page exists */ + if (Page >= BIOS_MAX_PAGES) return; + + /* Get the cursor location */ + VidBiosGetCursorPosition(&Row, &Column, Page); + + if (Character == '\a') + { + /* Bell control character */ + // NOTE: We may use what the terminal emulator offers to us... + Beep(800, 200); + return; + } + else if (Character == '\b') + { + /* Backspace control character */ + if (Column > 0) + { + Column--; + } + else if (Row > 0) + { + Column = Bda->ScreenColumns - 1; + Row--; + } + + /* Erase the existing character */ + CharData = MAKEWORD(' ', Attribute); + EmulatorWriteMemory(&EmulatorContext, + TO_LINEAR(TEXT_VIDEO_SEG, + Page * Bda->VideoPageSize + + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), + (LPVOID)&CharData, + sizeof(WORD)); + } + else if (Character == '\t') + { + /* Horizontal Tabulation control character */ + do + { + // Taken from DOSBox + VidBiosPrintCharacter(' ', Attribute, Page); + VidBiosGetCursorPosition(&Row, &Column, Page); + } while (Column % 8); + } + else if (Character == '\n') + { + /* Line Feed control character */ + Row++; + } + else if (Character == '\r') + { + /* Carriage Return control character */ + Column = 0; + } + else + { + /* Default character */ + + /* Write the character */ + EmulatorWriteMemory(&EmulatorContext, + TO_LINEAR(TEXT_VIDEO_SEG, + Page * Bda->VideoPageSize + + (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), + (LPVOID)&CharData, + sizeof(WORD)); + + /* Advance the cursor */ + Column++; + } + + /* Check if it passed the end of the row */ + if (Column >= Bda->ScreenColumns) + { + /* Return to the first column and go to the next line */ + Column = 0; + Row++; + } + + /* Scroll the screen up if needed */ + if (Row > Bda->ScreenRows) + { + /* The screen must be scrolled up */ + SMALL_RECT Rectangle = { 0, 0, Bda->ScreenColumns - 1, Bda->ScreenRows }; + + VidBiosScrollWindow(SCROLL_DIRECTION_UP, + 1, + Rectangle, + Page, + DEFAULT_ATTRIBUTE); + + Row--; + } + + /* Set the cursor position */ + VidBiosSetCursorPosition(Row, Column, Page); +} + static VOID WINAPI VidBiosVideoService(LPWORD Stack) { switch (getAH()) @@ -1146,9 +1252,10 @@ if (getAH() == 0x08) { /* Read from the video memory */ - VgaReadMemory(TO_LINEAR(TEXT_VIDEO_SEG, Offset), - (LPVOID)&CharacterData, - sizeof(WORD)); + EmulatorReadMemory(&EmulatorContext, + TO_LINEAR(TEXT_VIDEO_SEG, Offset), + (LPVOID)&CharacterData, + sizeof(WORD)); /* Return the character in AX */ setAX(CharacterData); @@ -1156,9 +1263,10 @@ else { /* Write to video memory */ - VgaWriteMemory(TO_LINEAR(TEXT_VIDEO_SEG, Offset), - (LPVOID)&CharacterData, - (getBH() == 0x09) ? sizeof(WORD) : sizeof(BYTE)); + EmulatorWriteMemory(&EmulatorContext, + TO_LINEAR(TEXT_VIDEO_SEG, Offset), + (LPVOID)&CharacterData, + (getBH() == 0x09) ? sizeof(WORD) : sizeof(BYTE)); } break; @@ -1427,124 +1535,16 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID VidBiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page) -{ - WORD CharData = MAKEWORD(Character, Attribute); - BYTE Row, Column; - - /* Make sure the page exists */ - if (Page >= BIOS_MAX_PAGES) return; - - /* Get the cursor location */ - VidBiosGetCursorPosition(&Row, &Column, Page); - - if (Character == '\a') - { - /* Bell control character */ - // NOTE: We may use what the terminal emulator offers to us... - Beep(800, 200); - return; - } - else if (Character == '\b') - { - /* Backspace control character */ - if (Column > 0) - { - Column--; - } - else if (Row > 0) - { - Column = Bda->ScreenColumns - 1; - Row--; - } - - /* Erase the existing character */ - CharData = MAKEWORD(' ', Attribute); - EmulatorWriteMemory(&EmulatorContext, - TO_LINEAR(TEXT_VIDEO_SEG, - Page * Bda->VideoPageSize + - (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), - (LPVOID)&CharData, - sizeof(WORD)); - } - else if (Character == '\t') - { - /* Horizontal Tabulation control character */ - do - { - // Taken from DOSBox - VidBiosPrintCharacter(' ', Attribute, Page); - VidBiosGetCursorPosition(&Row, &Column, Page); - } while (Column % 8); - } - else if (Character == '\n') - { - /* Line Feed control character */ - Row++; - } - else if (Character == '\r') - { - /* Carriage Return control character */ - Column = 0; - } - else - { - /* Default character */ - - /* Write the character */ - EmulatorWriteMemory(&EmulatorContext, - TO_LINEAR(TEXT_VIDEO_SEG, - Page * Bda->VideoPageSize + - (Row * Bda->ScreenColumns + Column) * sizeof(WORD)), - (LPVOID)&CharData, - sizeof(WORD)); - - /* Advance the cursor */ - Column++; - } - - /* Check if it passed the end of the row */ - if (Column >= Bda->ScreenColumns) - { - /* Return to the first column and go to the next line */ - Column = 0; - Row++; - } - - /* Scroll the screen up if needed */ - if (Row > Bda->ScreenRows) - { - /* The screen must be scrolled up */ - SMALL_RECT Rectangle = { 0, 0, Bda->ScreenColumns - 1, Bda->ScreenRows }; - - VidBiosScrollWindow(SCROLL_DIRECTION_UP, - 1, - Rectangle, - Page, - DEFAULT_ATTRIBUTE); - - Row--; - } - - /* Set the cursor position */ - VidBiosSetCursorPosition(Row, Column, Page); -} - BOOLEAN VidBiosInitialize(HANDLE ConsoleOutput) { CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; /* Some interrupts are in fact addresses to tables */ ((PDWORD)BaseAddress)[0x1D] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x1E] = (DWORD)NULL; ((PDWORD)BaseAddress)[0x1F] = (DWORD)NULL; - - ((PDWORD)BaseAddress)[0x41] = (DWORD)NULL; + // ((PDWORD)BaseAddress)[0x42] = (DWORD)NULL; ((PDWORD)BaseAddress)[0x43] = (DWORD)NULL; ((PDWORD)BaseAddress)[0x44] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x46] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x48] = (DWORD)NULL; - ((PDWORD)BaseAddress)[0x49] = (DWORD)NULL; /* Save the default BIOS console output handle for cleanup */ if (ConsoleOutput == INVALID_HANDLE_VALUE) return FALSE;

10 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014