Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[akhaldi] 61825: [VBSCRIPT] * 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 26 Jan '14

26 Jan '14

Author: akhaldi Date: Sun Jan 26 10:42:07 2014 New Revision: 61825 URL: http://svn.reactos.org/svn/reactos?rev=61825&view=rev Log: [VBSCRIPT] * 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/vbscript/global.c trunk/reactos/dll/win32/vbscript/vbscript.h Modified: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] Sun Jan 26 10:42:07 2014 @@ -19,6 +19,7 @@ #include "vbscript.h" #include <math.h> +#include <mshtmhst.h> #define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5)) Modified: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] Sun Jan 26 10:42:07 2014 @@ -27,16 +27,16 @@ #include <windef.h> #include <winbase.h> -#include <ole2.h> +#include <objbase.h> +#include <oleauto.h> #include <objsafe.h> #include <dispex.h> #include <activscp.h> -#include <mshtmhst.h> - + +#include <wine/debug.h> #include <wine/list.h> #include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(vbscript); typedef struct {

1 0

[ekohl] 61824: [SAMSRV] Implement SamIFreeVoid.
by ekohl＠svn.reactos.org 26 Jan '14

26 Jan '14

Author: ekohl Date: Sun Jan 26 02:34:59 2014 New Revision: 61824 URL: http://svn.reactos.org/svn/reactos?rev=61824&view=rev Log: [SAMSRV] Implement SamIFreeVoid. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun Jan 26 02:34:59 2014 @@ -143,6 +143,14 @@ VOID NTAPI +SamIFreeVoid(PVOID Ptr) +{ + MIDL_user_free(Ptr); +} + + +VOID +NTAPI SamIFree_SAMPR_ENUMERATION_BUFFER(PSAMPR_ENUMERATION_BUFFER Ptr) { ULONG i; Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sun Jan 26 02:34:59 2014 @@ -16,7 +16,7 @@ @ stub SamIFloatingSingleMasterOpEx @ stub SamIFreeSidAndAttributesList @ stub SamIFreeSidArray -@ stub SamIFreeVoid +@ stdcall SamIFreeVoid(ptr) @ stub SamIFree_SAMPR_ALIAS_INFO_BUFFER @ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER @ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER

1 0

[tkreuzer] 61823: [CRYPTLIB] MSVC doesn't define __BYTE_ORDER__, so simply assume it is LE.
by tkreuzer＠svn.reactos.org 25 Jan '14

25 Jan '14

Author: tkreuzer Date: Sat Jan 25 23:51:04 2014 New Revision: 61823 URL: http://svn.reactos.org/svn/reactos?rev=61823&view=rev Log: [CRYPTLIB] MSVC doesn't define __BYTE_ORDER__, so simply assume it is LE. Modified: trunk/reactos/lib/cryptlib/util.c trunk/reactos/lib/cryptlib/util.h Modified: trunk/reactos/lib/cryptlib/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cryptlib/util.c?rev=61… ============================================================================== --- trunk/reactos/lib/cryptlib/util.c [iso-8859-1] (original) +++ trunk/reactos/lib/cryptlib/util.c [iso-8859-1] Sat Jan 25 23:51:04 2014 @@ -1,6 +1,6 @@ -#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +#if !defined(_MSC_VER) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) #include <stdlib.h> #include <intrin.h> @@ -22,5 +22,5 @@ } while (--longs); } -#endif // (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +#endif // !defined(_MSC_VER) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) Modified: trunk/reactos/lib/cryptlib/util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cryptlib/util.h?rev=61… ============================================================================== --- trunk/reactos/lib/cryptlib/util.h [iso-8859-1] (original) +++ trunk/reactos/lib/cryptlib/util.h [iso-8859-1] Sat Jan 25 23:51:04 2014 @@ -1,8 +1,7 @@ #pragma once - -#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) +#if defined(_MSC_VER) || (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) #define byteReverse(buf, long)((void)(buf, long)) #else void

1 0

[akhaldi] 61822: [UXTHEME] * 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 25 Jan '14

25 Jan '14

Author: akhaldi Date: Sat Jan 25 23:07:09 2014 New Revision: 61822 URL: http://svn.reactos.org/svn/reactos?rev=61822&view=rev Log: [UXTHEME] * 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/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/uxini.c trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sat Jan 25 23:07:09 2014 @@ -20,6 +20,7 @@ #include "uxthemep.h" +#include <stdio.h> #include <winreg.h> #include <uxundoc.h> Modified: trunk/reactos/dll/win32/uxtheme/uxini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] Sat Jan 25 23:07:09 2014 @@ -19,7 +19,7 @@ */ #include "uxthemep.h" -#include <winnls.h> + /*********************************************************************** * Defines and global variables */ Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Sat Jan 25 23:07:09 2014 @@ -1,10 +1,14 @@ -#include <stdio.h> +#include <stdarg.h> #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winuser.h> +#include <winnls.h> #include <windowsx.h> #include <undocuser.h> #include <uxtheme.h>

1 0

[hbelusca] 61821: [NTVDM]: Implement a basic BIOS Wait interrupt INT 15h, AH=86h.
by hbelusca＠svn.reactos.org 25 Jan '14

25 Jan '14

Author: hbelusca Date: Sat Jan 25 22:29:54 2014 New Revision: 61821 URL: http://svn.reactos.org/svn/reactos?rev=61821&view=rev Log: [NTVDM]: Implement a basic BIOS Wait interrupt INT 15h, AH=86h. Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sat Jan 25 22:29:54 2014 @@ -49,6 +49,22 @@ { switch (getAH()) { + /* Wait */ + case 0x86: + { + /* + * Interval in microseconds CX:DX + * See Ralf Brown: http://www.ctyme.com/intr/rb-1525.htm + * for more information. + */ + Sleep(MAKELONG(getDX(), getCX())); + + /* Clear CF */ + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + + break; + } + /* Copy Extended Memory */ case 0x87: {

1 0

[akhaldi] 61820: [USERENV] * 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 25 Jan '14

25 Jan '14

Author: akhaldi Date: Sat Jan 25 22:24:43 2014 New Revision: 61820 URL: http://svn.reactos.org/svn/reactos?rev=61820&view=rev Log: [USERENV] * 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/userenv/desktop.c trunk/reactos/dll/win32/userenv/directory.c trunk/reactos/dll/win32/userenv/environment.c trunk/reactos/dll/win32/userenv/gpolicy.c trunk/reactos/dll/win32/userenv/internal.h trunk/reactos/dll/win32/userenv/misc.c trunk/reactos/dll/win32/userenv/precomp.h trunk/reactos/dll/win32/userenv/profile.c trunk/reactos/dll/win32/userenv/registry.c trunk/reactos/dll/win32/userenv/setup.c Modified: trunk/reactos/dll/win32/userenv/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/desktop.… ============================================================================== --- trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -26,9 +26,10 @@ #include "precomp.h" +#include <shlobj.h> + #define NDEBUG #include <debug.h> - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/director… ============================================================================== --- trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -29,7 +29,6 @@ #define NDEBUG #include <debug.h> - /* FUNCTIONS ***************************************************************/ BOOL Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -29,7 +29,6 @@ #define NDEBUG #include <debug.h> - static BOOL SetUserEnvironmentVariable(LPVOID *Environment, Modified: trunk/reactos/dll/win32/userenv/gpolicy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/gpolicy.… ============================================================================== --- trunk/reactos/dll/win32/userenv/gpolicy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/gpolicy.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -28,7 +28,6 @@ #define NDEBUG #include <debug.h> - typedef struct _GP_NOTIFY { Modified: trunk/reactos/dll/win32/userenv/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/internal… ============================================================================== --- trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -111,5 +111,3 @@ UninitializeGPNotifications(VOID); #endif /* _INTERNAL_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/userenv/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/misc.c?r… ============================================================================== --- trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -26,6 +26,8 @@ #include "precomp.h" +#include <ndk/sefuncs.h> + #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/userenv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/precomp.… ============================================================================== --- trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -1,17 +1,16 @@ #include <stdio.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include <windef.h> #include <winbase.h> #include <winreg.h> #include <winnls.h> +#include <objbase.h> #define NTOS_MODE_USER -#include <ndk/sefuncs.h> #include <ndk/rtlfuncs.h> #include <userenv.h> -#include <sddl.h> -#include <shlobj.h> #include "internal.h" -#include "resources.h" Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -26,9 +26,10 @@ #include "precomp.h" +#include <sddl.h> + #define NDEBUG #include <debug.h> - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/userenv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/registry… ============================================================================== --- trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -29,7 +29,6 @@ #define NDEBUG #include <debug.h> - /* FUNCTIONS ***************************************************************/ static Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -29,6 +29,7 @@ #define NDEBUG #include <debug.h> +#include "resources.h" typedef struct _FOLDERDATA {

1 0

[akhaldi] 61819: [URLMON] * 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 25 Jan '14

25 Jan '14

Author: akhaldi Date: Sat Jan 25 20:24:12 2014 New Revision: 61819 URL: http://svn.reactos.org/svn/reactos?rev=61819&view=rev Log: [URLMON] * 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/urlmon/umon.c trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/dll/win32/urlmon/urlmon_main.h Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Sat Jan 25 20:24:12 2014 @@ -22,6 +22,7 @@ #include "urlmon_main.h" +#include <shellapi.h> #include <hlink.h> typedef struct { Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] Sat Jan 25 20:24:12 2014 @@ -19,6 +19,8 @@ */ #include "urlmon_main.h" + +#include <ole2.h> #include <initguid.h> DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] Sat Jan 25 20:24:12 2014 @@ -33,18 +33,18 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> -#include <ole2.h> +#include <objbase.h> +#include <oleauto.h> #include <urlmon.h> #include <wininet.h> -#include <shellapi.h> #include <advpub.h> #define NO_SHLWAPI_REG #include <shlwapi.h> +#include <wine/debug.h> #include <wine/list.h> #include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(urlmon); extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;

1 0

[akhaldi] 61818: [SYSSETUP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi＠svn.reactos.org 25 Jan '14

25 Jan '14

Author: akhaldi Date: Sat Jan 25 19:51:44 2014 New Revision: 61818 URL: http://svn.reactos.org/svn/reactos?rev=61818&view=rev Log: [SYSSETUP] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/dll/win32/syssetup/classinst.c trunk/reactos/dll/win32/syssetup/dllmain.c trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/logfile.c trunk/reactos/dll/win32/syssetup/precomp.h trunk/reactos/dll/win32/syssetup/security.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/classin… ============================================================================== --- trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] Sat Jan 25 19:51:44 2014 @@ -10,7 +10,6 @@ #define NDEBUG #include <debug.h> - /* * @unimplemented Modified: trunk/reactos/dll/win32/syssetup/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/dllmain… ============================================================================== --- trunk/reactos/dll/win32/syssetup/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/dllmain.c [iso-8859-1] Sat Jan 25 19:51:44 2014 @@ -32,7 +32,6 @@ HINSTANCE hDllInstance; - /* FUNCTIONS *****************************************************************/ BOOL WINAPI Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Sat Jan 25 19:51:44 2014 @@ -16,6 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#pragma once typedef struct _TZ_INFO { Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Jan 25 19:51:44 2014 @@ -28,7 +28,14 @@ #include "precomp.h" +#include <tchar.h> +#include <wincon.h> +#include <winsvc.h> +#include <userenv.h> +#include <shlobj.h> +#include <shlwapi.h> #include <rpcproxy.h> +#include <ndk/cmfuncs.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/syssetup/logfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/logfile… ============================================================================== --- trunk/reactos/dll/win32/syssetup/logfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/logfile.c [iso-8859-1] Sat Jan 25 19:51:44 2014 @@ -25,12 +25,12 @@ */ /* INCLUDES *****************************************************************/ + #include "precomp.h" /* GLOBALS ******************************************************************/ HANDLE hLogFile = NULL; - /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/syssetup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/precomp… ============================================================================== --- trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] Sat Jan 25 19:51:44 2014 @@ -1,4 +1,4 @@ -#include <stdarg.h> +#include <stdio.h> #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -8,26 +8,12 @@ #include <winbase.h> #include <winreg.h> #include <wingdi.h> -#include <winsvc.h> -#include <winnls.h> #include <winuser.h> -#include <windowsx.h> -#include <wincon.h> #define NTOS_MODE_USER -#include <ndk/cmfuncs.h> #include <ndk/rtlfuncs.h> #include <setupapi.h> -#include <stdio.h> -#include <tchar.h> #include <syssetup/syssetup.h> -#include <userenv.h> -#include <shlobj.h> -#include <shlwapi.h> -#include <time.h> -#include <ntlsa.h> -#include <ntsecapi.h> -#include <ntsam.h> -#include <sddl.h> +#include <pseh/pseh2.h> #include "globals.h" #include "resource.h" Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Sat Jan 25 19:51:44 2014 @@ -10,9 +10,13 @@ #include "precomp.h" +#include <ntlsa.h> +#include <ntsecapi.h> +#include <ntsam.h> +#include <sddl.h> + #define NDEBUG #include <debug.h> - /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat Jan 25 19:51:44 2014 @@ -10,6 +10,11 @@ /* INCLUDES *****************************************************************/ #include "precomp.h" + +#include <stdlib.h> +#include <time.h> +#include <winnls.h> +#include <windowsx.h> #define NDEBUG #include <debug.h>

1 0

[akhaldi] 61817: [SXS] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Improve the GUIDs situation. * Improve header inclusions. C...
by akhaldi＠svn.reactos.org 25 Jan '14

25 Jan '14

Author: akhaldi Date: Sat Jan 25 19:01:00 2014 New Revision: 61817 URL: http://svn.reactos.org/svn/reactos?rev=61817&view=rev Log: [SXS] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716 Added: trunk/reactos/dll/win32/sxs/guid.c (with props) Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt trunk/reactos/dll/win32/sxs/cache.c trunk/reactos/dll/win32/sxs/name.c trunk/reactos/dll/win32/sxs/sxs.c trunk/reactos/dll/win32/sxs/sxs_private.h Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sxs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Sat Jan 25 19:01:00 2014 @@ -7,6 +7,7 @@ cache.c name.c sxs.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/sxs.def) Modified: trunk/reactos/dll/win32/sxs/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/cache.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/sxs/cache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/cache.c [iso-8859-1] Sat Jan 25 19:01:00 2014 @@ -18,27 +18,12 @@ * 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 INITGUID - -#include <windef.h> -#include <winbase.h> -#include <ole2.h> -#include <winsxs.h> +#include "sxs_private.h" + +#include <oleauto.h> #include <msxml2.h> -#include <wine/debug.h> #include <wine/list.h> -#include <wine/unicode.h> -#include "sxs_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(sxs); static const WCHAR cache_mutex_nameW[] = {'_','_','W','I','N','E','_','S','X','S','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; Added: trunk/reactos/dll/win32/sxs/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/guid.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/sxs/guid.c (added) +++ trunk/reactos/dll/win32/sxs/guid.c [iso-8859-1] Sat Jan 25 19:01:00 2014 @@ -0,0 +1,16 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <objbase.h> +#include <winsxs.h> +#include <msxml2.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/sxs/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/sxs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/name.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/sxs/name.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/name.c [iso-8859-1] Sat Jan 25 19:01:00 2014 @@ -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 <ole2.h> -#include <winsxs.h> - -#include <wine/debug.h> -#include <wine/unicode.h> #include "sxs_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(sxs); struct name { Modified: trunk/reactos/dll/win32/sxs/sxs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.c?rev=61… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/sxs.c [iso-8859-1] Sat Jan 25 19:01:00 2014 @@ -18,13 +18,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 "sxs_private.h" /*********************************************************************** * DllMain (SXS.@) Modified: trunk/reactos/dll/win32/sxs/sxs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs_private.… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/sxs_private.h [iso-8859-1] Sat Jan 25 19:01:00 2014 @@ -15,6 +15,24 @@ * 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 WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <winsxs.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); enum name_attr_id {

1 0

[hbelusca] 61816: [NTVDM] - Shut up some DPRINTs in io.c and ntvdm.c - I forgot to update the call to PitClock in the previous revision...
by hbelusca＠svn.reactos.org 25 Jan '14

25 Jan '14

Author: hbelusca Date: Sat Jan 25 18:57:17 2014 New Revision: 61816 URL: http://svn.reactos.org/svn/reactos?rev=61816&view=rev Log: [NTVDM] - Shut up some DPRINTs in io.c and ntvdm.c - I forgot to update the call to PitClock in the previous revision... Modified: branches/ntvdm/subsystems/ntvdm/io.c branches/ntvdm/subsystems/ntvdm/ntvdm.c 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] Sat Jan 25 18:57:17 2014 @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ -// #define NDEBUG +#define NDEBUG #include "emulator.h" #include "io.h" Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Jan 25 18:57:17 2014 @@ -169,8 +169,10 @@ DWORD StartTickCount, CurrentTickCount; DWORD LastClockUpdate; DWORD LastVerticalRefresh; +#if 0 DWORD LastCyclePrintout; DWORD Cycles = 0; +#endif INT KeyboardIntCounter = 0; #ifndef TESTING @@ -241,7 +243,7 @@ QueryPerformanceCounter(&StartPerfCount); /* Set the different last counts to the starting count */ - LastClockUpdate = LastVerticalRefresh = LastCyclePrintout = StartTickCount; + LastClockUpdate = LastVerticalRefresh = /*LastCyclePrintout =*/ StartTickCount; /* Set the last timer ticks to the current time */ LastTimerTick = LastRtcTick = StartPerfCount; @@ -275,7 +277,7 @@ /* Update the PIT */ if (TimerTicks > 0) { - PitDecrementCount(TimerTicks); + PitClock(TimerTicks); LastTimerTick = Counter; } @@ -315,15 +317,19 @@ for (i = 0; (i < STEPS_PER_CYCLE) && VdmRunning; i++) { EmulatorStep(); +#if 0 Cycles++; - } - +#endif + } + +#if 0 if ((CurrentTickCount - LastCyclePrintout) >= 1000) { DPRINT1("NTVDM: %lu Instructions Per Second\n", Cycles); LastCyclePrintout = CurrentTickCount; Cycles = 0; } +#endif } /* Perform another screen refresh */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
43
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 January 2014