Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[rharabien] 52244: [NTOSKRNL] - Disable displaying string by bootvid after successful kernel phase 1 initialization, so there won't be graphical glitches at the top of screen if system has screen d...

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Jun 15 12:53:32 2011 New Revision: 52244 URL: http://svn.reactos.org/svn/reactos?rev=52244&view=rev Log: [NTOSKRNL] - Disable displaying string by bootvid after successful kernel phase 1 initialization, so there won't be graphical glitches at the top of screen if system has screen debugging enabled - Make screen black right after phase 1 initialization finish instead of waiting 5 seconds. It removes black rectangle which appeared for me in explorer. - Initialize some global variables in inbv.c (it was done by compiler before) Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=522… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Jun 15 12:53:32 2011 @@ -1313,7 +1313,7 @@ size_t Remaining; PRTL_USER_PROCESS_INFORMATION ProcessInfo; KEY_VALUE_PARTIAL_INFORMATION KeyPartialInfo; - UNICODE_STRING KeyName, DebugString; + UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE KeyHandle, OptionHandle; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; @@ -1925,18 +1925,19 @@ /* Update progress bar */ InbvUpdateProgressBar(100); - /* Allow strings to be displayed */ - InbvEnableDisplayString(TRUE); - - /* Wait 5 seconds for it to initialize */ + /* Disallow strings to be displayed */ + InbvEnableDisplayString(FALSE); + + /* Clean the screen */ + if (InbvBootDriverInstalled) FinalizeBootLogo(); + + /* Wait 5 seconds for initial process to initialize */ Timeout.QuadPart = Int32x32To64(5, -10000000); Status = ZwWaitForSingleObject(ProcessInfo->ProcessHandle, FALSE, &Timeout); - if (InbvBootDriverInstalled) FinalizeBootLogo(); if (Status == STATUS_SUCCESS) { /* Failed, display error */ - RtlInitUnicodeString(&DebugString, L"INIT: Session Manager terminated."); - ZwDisplayString(&DebugString); + DPRINT1("INIT: Session Manager terminated.\n"); /* Bugcheck the system if SMSS couldn't initialize */ KeBugCheck(SESSION5_INITIALIZATION_FAILED); Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Wed Jun 15 12:53:32 2011 @@ -10,16 +10,16 @@ KSPIN_LOCK BootDriverLock; KIRQL InbvOldIrql; INBV_DISPLAY_STATE InbvDisplayState; -BOOLEAN InbvBootDriverInstalled; -BOOLEAN InbvDisplayDebugStrings; +BOOLEAN InbvBootDriverInstalled = FALSE; +BOOLEAN InbvDisplayDebugStrings = FALSE; INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; ULONG ProgressBarLeft, ProgressBarTop; -BOOLEAN ShowProgressBar; +BOOLEAN ShowProgressBar = FALSE; INBV_PROGRESS_STATE InbvProgressState; INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; ULONG ResourceCount; PUCHAR ResourceList[64]; -BOOLEAN SysThreadCreated; +BOOLEAN SysThreadCreated = FALSE; ROT_BAR_TYPE RotBarSelection; ULONG PltRotBarStatus; BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Wed Jun 15 12:53:32 2011 @@ -480,10 +480,18 @@ KeSetTimerEx(&IopTimer, ExpireTime, 1000, &IopTimerDpc); /* Create Object Types */ - if (!IopCreateObjectTypes()) return FALSE; + if (!IopCreateObjectTypes()) + { + DPRINT1("IopCreateObjectTypes failed!\n"); + return FALSE; + } /* Create Object Directories */ - if (!IopCreateRootDirectories()) return FALSE; + if (!IopCreateRootDirectories()) + { + DPRINT1("IopCreateRootDirectories failed!\n"); + return FALSE; + } /* Initialize PnP manager */ IopInitializePlugPlayServices(); @@ -511,10 +519,19 @@ IopLoaderBlock = NULL; /* Create ARC names for boot devices */ - if (!NT_SUCCESS(IopCreateArcNames(LoaderBlock))) return FALSE; + Status = IopCreateArcNames(LoaderBlock); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopCreateArcNames failed: %lx\n", Status); + return FALSE; + } /* Mark the system boot partition */ - if (!IopMarkBootPartition(LoaderBlock)) return FALSE; + if (!IopMarkBootPartition(LoaderBlock)) + { + DPRINT1("IopMarkBootPartition failed!\n"); + return FALSE; + } /* Initialize PnP root relations */ IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); @@ -539,7 +556,11 @@ /* Convert SystemRoot from ARC to NT path */ Status = IopReassignSystemRoot(LoaderBlock, &NtBootPath); - if (!NT_SUCCESS(Status)) return FALSE; + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopReassignSystemRoot failed: %lx\n", Status); + return FALSE; + } /* Set the ANSI_STRING for the root path */ RootString.MaximumLength = NtSystemRoot.MaximumLength / sizeof(WCHAR); @@ -550,7 +571,11 @@ /* Convert the path into the ANSI_STRING */ Status = RtlUnicodeStringToAnsiString(&RootString, &NtSystemRoot, FALSE); - if (!NT_SUCCESS(Status)) return FALSE; + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlUnicodeStringToAnsiString failed: %lx\n", Status); + return FALSE; + } /* Assign drive letters */ IoAssignDriveLetters(LoaderBlock, @@ -560,10 +585,19 @@ /* Update system root */ Status = RtlAnsiStringToUnicodeString(&NtSystemRoot, &RootString, FALSE); - if (!NT_SUCCESS(Status)) return FALSE; + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlAnsiStringToUnicodeString failed: %lx\n", Status); + return FALSE; + } /* Load the System DLL and its Entrypoints */ - if (!NT_SUCCESS(PsLocateSystemDll())) return FALSE; + Status = PsLocateSystemDll(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("PsLocateSystemDll failed: %lx\n", Status); + return FALSE; + } /* Return success */ return TRUE;

13 years, 6 months

[tkreuzer] 52243: forgot to commit this file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 15 11:42:37 2011 New Revision: 52243 URL: http://svn.reactos.org/svn/reactos?rev=52243&view=rev Log: forgot to commit this file Added: trunk/reactos/include/reactos/wcsfuncs.h (with props) Added: trunk/reactos/include/reactos/wcsfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wcsfuncs.h… ============================================================================== --- trunk/reactos/include/reactos/wcsfuncs.h (added) +++ trunk/reactos/include/reactos/wcsfuncs.h [iso-8859-1] Wed Jun 15 11:42:37 2011 @@ -1,0 +1,23 @@ +/* + PROJECT: ReactOS + LICENSE: GPL v2 or any later version + FILE: include/host/wcsfuncs.h + PURPOSE: Header for the "host_wcsfuncs" static library + COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> +*/ + +#ifndef _HOST_WCSFUNCS_H +#define _HOST_WCSFUNCS_H + +/* Map str*W functions to wcs* function */ + +#define isspaceW iswspace +#define strchrW wcschr +#define strcmpiW _wcsicmp +#define strcpyW wcscpy +#define strlenW wcslen +#define strncmpW wcsncmp +#define strtolW wcstol +#define strtoulW wcstoul + +#endif Propchange: trunk/reactos/include/reactos/wcsfuncs.h ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 6 months

[tkreuzer] 52242: [CABMAN] Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 15 10:52:34 2011 New Revision: 52242 URL: http://svn.reactos.org/svn/reactos?rev=52242&view=rev Log: [CABMAN] Fix build Modified: trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Wed Jun 15 10:52:34 2011 @@ -14,7 +14,7 @@ #include <fcntl.h> #include <sys/types.h> #include <time.h> -#include <host/typedefs.h> +#include <typedefs.h> #include <unistd.h> #ifndef MAX_PATH #define MAX_PATH 260

13 years, 6 months

[tkreuzer] 52241: [RBUILD] Add include/host ad include directory

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 15 10:46:57 2011 New Revision: 52241 URL: http://svn.reactos.org/svn/reactos?rev=52241&view=rev Log: [RBUILD] Add include/host ad include directory Modified: trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] Wed Jun 15 10:46:57 2011 @@ -296,7 +296,7 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_TEST_SPECIAL_OBJECTS) -RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos +RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos -Iinclude/host RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -463,7 +463,7 @@ $(RBUILD_MSVC_INT_)msvc.o: $(RBUILD_MSVC_BASE_)msvc.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - + $(RBUILD_MSVC_INT_)projmaker.o: $(RBUILD_MSVC_BASE_)projmaker.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

13 years, 6 months

[tkreuzer] 52240: [HOST] Only use /include/host as include directory for host tools / libs.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 15 10:30:03 2011 New Revision: 52240 URL: http://svn.reactos.org/svn/reactos?rev=52240&view=rev Log: [HOST] Only use /include/host as include directory for host tools / libs. Added: trunk/reactos/include/host/wine/unicode.h - copied, changed from r52236, trunk/reactos/tools/unicode/wine/unicode.h trunk/reactos/tools/rbuild_helper/argv_parser.h - copied, changed from r52236, trunk/reactos/include/reactos/kjk/argv_parser.h trunk/reactos/tools/rbuild_helper/null_output_iterator.h - copied unchanged from r52236, trunk/reactos/include/reactos/kjk/null_output_iterator.h trunk/reactos/tools/rbuild_helper/stringz_iterator.h - copied unchanged from r52236, trunk/reactos/include/reactos/kjk/stringz_iterator.h Removed: trunk/reactos/include/host/wcsfuncs.h trunk/reactos/lib/host/ trunk/reactos/tools/unicode/wine/unicode.h Modified: trunk/reactos/CMakeLists.txt trunk/reactos/ReactOS-generic.rbuild trunk/reactos/include/host/config.h trunk/reactos/include/host/nls.h trunk/reactos/include/host/typedefs.h trunk/reactos/lib/CMakeLists.txt trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/inflib/inflib.mak trunk/reactos/lib/inflib/inflib.rbuild trunk/reactos/lib/lib.rbuild trunk/reactos/lib/newinflib/CMakeLists.txt trunk/reactos/lib/newinflib/builddep.h trunk/reactos/tools/kbdtool/kbdtool.h trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/nandflash/nandflash.h trunk/reactos/tools/rbuild_helper/rbuild_helper.cpp trunk/reactos/tools/rbuild_helper/rbuild_helper.rbuild trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/write_msft.c trunk/reactos/tools/wmc/wmctypes.h trunk/reactos/tools/wrc/newstruc.c trunk/reactos/tools/wrc/wrcrostypes.h Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=52240&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -52,11 +52,7 @@ add_compiler_flags(-fshort-wchar) endif() - include_directories( - ${REACTOS_SOURCE_DIR}/tools/unicode - include - include/host - ${REACTOS_BINARY_DIR}/include) + include_directories(include/host) add_subdirectory(tools) add_subdirectory(lib) Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -81,10 +81,7 @@ <include root="intermediate">include/reactos/mc</include> <include>include/reactos/libs</include> - <include host="true">include</include> - <include host="true" root="intermediate">include</include> - <include host="true">include/reactos</include> - <include host="true">include/reactos/wine</include> + <include host="true">include/host</include> <group compilerset="gcc"> <compilerflag>-Wall</compilerflag> Modified: trunk/reactos/include/host/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/config.h?rev=… ============================================================================== --- trunk/reactos/include/host/config.h [iso-8859-1] (original) +++ trunk/reactos/include/host/config.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -1,7 +1,5 @@ /* include/config.h. Generated by configure. */ /* include/config.h.in. Generated from configure.ac by autoheader. */ - -#include "reactos/buildno.h" #define __WINE_CONFIG_H @@ -125,7 +123,7 @@ #define PACKAGE_TARNAME "ReactOS" /* Define to the version of this package. */ -#define PACKAGE_VERSION KERNEL_VERSION_STR +#define PACKAGE_VERSION "<undefined version>" /* Define to the full name and version of this package. */ #define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION Modified: trunk/reactos/include/host/nls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/nls.h?rev=522… ============================================================================== --- trunk/reactos/include/host/nls.h [iso-8859-1] (original) +++ trunk/reactos/include/host/nls.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -9,7 +9,7 @@ #ifndef _HOST_NLS_H #define _HOST_NLS_H -#include <host/typedefs.h> +#include <typedefs.h> typedef DWORD LCID; Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -70,7 +70,7 @@ #define MAXUSHORT USHRT_MAX /* Widely used structures */ -#include <host/pshpack4.h> +#include <pshpack4.h> typedef struct _RTL_BITMAP { ULONG SizeOfBitMap; @@ -112,7 +112,7 @@ USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; -#include <host/poppack.h> +#include <poppack.h> /* List Functions */ static __inline @@ -170,7 +170,7 @@ { PLIST_ENTRY OldFlink; PLIST_ENTRY OldBlink; - + OldFlink = Entry->Flink; OldBlink = Entry->Blink; OldFlink->Blink = OldBlink; @@ -185,7 +185,7 @@ { PLIST_ENTRY Flink; PLIST_ENTRY Entry; - + Entry = ListHead->Flink; Flink = Entry->Flink; ListHead->Flink = Flink; @@ -200,7 +200,7 @@ { PLIST_ENTRY Blink; PLIST_ENTRY Entry; - + Entry = ListHead->Blink; Blink = Entry->Blink; ListHead->Blink = Blink; Removed: trunk/reactos/include/host/wcsfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/wcsfuncs.h?re… ============================================================================== --- trunk/reactos/include/host/wcsfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/wcsfuncs.h (removed) @@ -1,29 +1,0 @@ -/* - PROJECT: ReactOS - LICENSE: GPL v2 or any later version - FILE: include/host/wcsfuncs.h - PURPOSE: Header for the "host_wcsfuncs" static library - COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> -*/ - -#ifndef _HOST_WCSFUNCS_H -#define _HOST_WCSFUNCS_H - -#ifdef USE_HOST_WCSFUNCS - /* Function prototypes */ - -#else - /* Map str*W functions to wcs* function */ - - #define isspaceW iswspace - #define strchrW wcschr - #define strcmpiW _wcsicmp - #define strcpyW wcscpy - #define strlenW wcslen - #define strncmpW wcsncmp - #define strtolW wcstol - #define strtoulW wcstoul - -#endif - -#endif Copied: trunk/reactos/include/host/wine/unicode.h (from r52236, trunk/reactos/tools/unicode/wine/unicode.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/wine/unicode.… ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/host/wine/unicode.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -23,7 +23,7 @@ #include <stdarg.h> #include <string.h> -#include <host/typedefs.h> +#include <typedefs.h> // Definitions copied from <winnls.h> // We only want to include host headers, so we define them manually Modified: trunk/reactos/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/CMakeLists.txt?rev=522… ============================================================================== --- trunk/reactos/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/CMakeLists.txt [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -24,7 +24,6 @@ else() -add_subdirectory(host/wcsfuncs) add_subdirectory(3rdparty/zlib) endif() Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=522… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -46,11 +46,7 @@ // #define VALUE_COMP_NAME 0x0001 -#ifdef CMLIB_HOST -#include <host/pshpack1.h> -#else #include <pshpack1.h> -#endif // // For memory-mapped Hives @@ -154,11 +150,7 @@ UCHAR Data[ANYSIZE_ARRAY]; } CM_KEY_SECURITY, *PCM_KEY_SECURITY; -#ifdef CMLIB_HOST -#include <host/poppack.h> -#else #include <poppack.h> -#endif // // Generic Index Entry Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=5224… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -14,7 +14,7 @@ #ifdef CMLIB_HOST #include <wine/unicode.h> - #include <host/typedefs.h> + #include <typedefs.h> #include <stdio.h> #include <string.h> @@ -92,9 +92,9 @@ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT #include <ntddk.h> -#endif - -#include <host/wcsfuncs.h> + #include <wcsfuncs.h> +#endif + // // These define the Debug Masks Supported @@ -311,8 +311,8 @@ VOID CMAPI CmPrepareHive( PHHIVE RegistryHive); - - + + BOOLEAN CMAPI HvTrackCellRef( Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=5… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -100,11 +100,7 @@ Volatile = 1 } HSTORAGE_TYPE; -#ifdef CMLIB_HOST -#include <host/pshpack1.h> -#else #include <pshpack1.h> -#endif /** * @name HBASE_BLOCK @@ -188,11 +184,7 @@ LONG Size; } HCELL, *PHCELL; -#ifdef CMLIB_HOST -#include <host/poppack.h> -#else #include <poppack.h> -#endif struct _HHIVE; Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=… ============================================================================== --- trunk/reactos/lib/inflib/builddep.h [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/builddep.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -8,7 +8,7 @@ /* Definitions native to the host on which we're building */ -#include <host/typedefs.h> +#include <typedefs.h> #include <stdarg.h> #include <stdio.h> Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=… ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.mak [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude $(HOST_CFLAGS) + -Iinclude/host -Iinclude $(HOST_CFLAGS) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_HOSTAR) Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r… ============================================================================== --- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -11,6 +11,7 @@ <file>infrosput.c</file> </module> <module name="inflibhost" type="hoststaticlibrary" allowwarnings="true"> + <include base="ReactOS">include/host</include> <include base="inflibhost">.</include> <define name="__NO_CTYPE_INLINES" /> <group compilerset="gcc"> Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=52240&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/lib.rbuild [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -30,9 +30,6 @@ </directory> <directory name="fslib"> <xi:include href="fslib/directory.rbuild" /> - </directory> - <directory name="host"> - <xi:include href="host/directory.rbuild" /> </directory> <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> Modified: trunk/reactos/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -5,7 +5,7 @@ infput.c) if(CMAKE_CROSSCOMPILING) - list(APPEND SOURCE + list(APPEND SOURCE infrosgen.c infrosget.c infrosput.c) @@ -13,7 +13,7 @@ add_library(inflib ${GLOBAL_FILES} ${SOURCE}) add_dependencies(inflib psdk) else() - list(APPEND SOURCE + list(APPEND SOURCE infhostgen.c infhostget.c infhostput.c Modified: trunk/reactos/lib/newinflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/builddep.h?r… ============================================================================== --- trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -9,7 +9,7 @@ /* Definitions native to the host on which we're building */ #include <wine/unicode.h> -#include <host/typedefs.h> +#include <typedefs.h> #include <stdarg.h> #include <stdio.h> @@ -63,6 +63,7 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <wcsfuncs.h> extern PVOID InfpHeap; @@ -82,6 +83,4 @@ #endif /* INFLIB_HOST */ -#include <host/wcsfuncs.h> - /* EOF */ Modified: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?re… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -14,7 +14,7 @@ #include <stdlib.h> #include <getopt.h> #include <time.h> -#include <host/typedefs.h> +#include <typedefs.h> #define KEYWORD_COUNT 17 Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -29,10 +29,7 @@ #include <stdio.h> #include <stdlib.h> -#include <host/typedefs.h> - -#define USE_HOST_WCSFUNCS -#include <host/wcsfuncs.h> +#include <typedefs.h> // Definitions copied from <ntstatus.h> // We only want to include host headers, so we define them manually Modified: trunk/reactos/tools/nandflash/nandflash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nandflash/nandflash.… ============================================================================== --- trunk/reactos/tools/nandflash/nandflash.h [iso-8859-1] (original) +++ trunk/reactos/tools/nandflash/nandflash.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -11,7 +11,7 @@ #include <string.h> #include <stdio.h> #include <fcntl.h> -#include <host/typedefs.h> +#include <typedefs.h> /* NAND Image Sizes */ #define NAND_PAGE_SIZE (2 * 1024) // 2 KB Copied: trunk/reactos/tools/rbuild_helper/argv_parser.h (from r52236, trunk/reactos/include/reactos/kjk/argv_parser.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild_helper/argv_p… ============================================================================== --- trunk/reactos/include/reactos/kjk/argv_parser.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild_helper/argv_parser.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -24,7 +24,7 @@ #define KJK_ARGV_PARSER_H_ #include <iterator> -#include <kjk/null_output_iterator.h> +#include <null_output_iterator.h> namespace kjk { Modified: trunk/reactos/tools/rbuild_helper/rbuild_helper.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild_helper/rbuild… ============================================================================== --- trunk/reactos/tools/rbuild_helper/rbuild_helper.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild_helper/rbuild_helper.cpp [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -47,8 +47,8 @@ #define ARRAYSIZE(X_) (sizeof(X_) / sizeof((X_)[0])) #endif -#include <kjk/argv_parser.h> -#include <kjk/stringz_iterator.h> +#include <argv_parser.h> +#include <stringz_iterator.h> using namespace kjk; Modified: trunk/reactos/tools/rbuild_helper/rbuild_helper.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild_helper/rbuild… ============================================================================== --- trunk/reactos/tools/rbuild_helper/rbuild_helper.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild_helper/rbuild_helper.rbuild [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <module name="rbuild_helper" type="buildtool"> + <include base="rbuild_helper">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> <file>rbuild_helper.cpp</file> Removed: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wine/unicode… ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/wine/unicode.h (removed) @@ -1,329 +1,0 @@ -/* - * Wine internal Unicode definitions - * - * Copyright 2000 Alexandre Julliard - * - * 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 - */ - -#ifndef __WINE_WINE_UNICODE_H -#define __WINE_WINE_UNICODE_H - -#include <stdarg.h> -#include <string.h> -#include <host/typedefs.h> - -// Definitions copied from <winnls.h> -// We only want to include host headers, so we define them manually -#define C1_UPPER 1 -#define C1_LOWER 2 -#define C1_DIGIT 4 -#define C1_SPACE 8 -#define C1_PUNCT 16 -#define C1_CNTRL 32 -#define C1_BLANK 64 -#define C1_XDIGIT 128 -#define C1_ALPHA 256 -#define MB_COMPOSITE 2 -#define MB_ERR_INVALID_CHARS 8 -#define MB_USEGLYPHCHARS 0x04 -#define WC_COMPOSITECHECK 512 -#define WC_DISCARDNS 16 -#define WC_DEFAULTCHAR 64 -#define WC_NO_BEST_FIT_CHARS 1024 -#define WC_ERR_INVALID_CHARS 0x0080 - -#ifdef __WINE_WINE_TEST_H -#error This file should not be used in Wine tests -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef WINE_UNICODE_API -# if defined(_MSC_VER) || defined(__MINGW32__) -# define WINE_UNICODE_API DECLSPEC_IMPORT -# else -# define WINE_UNICODE_API -# endif -#endif - -#ifndef WINE_UNICODE_INLINE -#define WINE_UNICODE_INLINE static inline -#endif - -/* code page info common to SBCS and DBCS */ -struct cp_info -{ - unsigned int codepage; /* codepage id */ - unsigned int char_size; /* char size (1 or 2 bytes) */ - WCHAR def_char; /* default char value (can be double-byte) */ - WCHAR def_unicode_char; /* default Unicode char value */ - const char *name; /* code page name */ -}; - -struct sbcs_table -{ - struct cp_info info; - const WCHAR *cp2uni; /* code page -> Unicode map */ - const WCHAR *cp2uni_glyphs; /* code page -> Unicode map with glyph chars */ - const unsigned char *uni2cp_low; /* Unicode -> code page map */ - const unsigned short *uni2cp_high; -}; - -struct dbcs_table -{ - struct cp_info info; - const WCHAR *cp2uni; /* code page -> Unicode map */ - const unsigned char *cp2uni_leadbytes; - const unsigned short *uni2cp_low; /* Unicode -> code page map */ - const unsigned short *uni2cp_high; - unsigned char lead_bytes[12]; /* lead bytes ranges */ -}; - -union cptable -{ - struct cp_info info; - struct sbcs_table sbcs; - struct dbcs_table dbcs; -}; - -extern const union cptable *wine_cp_get_table( unsigned int codepage ); -extern const union cptable *wine_cp_enum_table( unsigned int index ); - -extern int wine_cp_mbstowcs( const union cptable *table, int flags, - const char *src, int srclen, - WCHAR *dst, int dstlen ); -extern int wine_cp_wcstombs( const union cptable *table, int flags, - const WCHAR *src, int srclen, - char *dst, int dstlen, const char *defchar, int *used ); -extern int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen ); -extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ); -extern int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); -extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); - -extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2 ); -extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); -extern int wine_fold_string( int flags, const WCHAR *src, int srclen , WCHAR *dst, int dstlen ); - -extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); -extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); -extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); -extern WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ); -extern long int strtolW( const WCHAR *nptr, WCHAR **endptr, int base ); -extern unsigned long int strtoulW( const WCHAR *nptr, WCHAR **endptr, int base ); -extern int sprintfW( WCHAR *str, const WCHAR *format, ... ); -extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); -extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); -extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); - -WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) -{ - return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); -} - -WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) -{ - extern WINE_UNICODE_API const WCHAR wine_casemap_lower[]; - return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; -} - -WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) -{ - extern WINE_UNICODE_API const WCHAR wine_casemap_upper[]; - return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; -} - -/* the character type contains the C1_* flags in the low 12 bits */ -/* and the C2_* type in the high 4 bits */ -WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) -{ - extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; - return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; -} - -WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_CNTRL; -} - -WINE_UNICODE_INLINE int ispunctW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_PUNCT; -} - -WINE_UNICODE_INLINE int isspaceW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_SPACE; -} - -WINE_UNICODE_INLINE int isdigitW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_DIGIT; -} - -WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_XDIGIT; -} - -WINE_UNICODE_INLINE int islowerW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_LOWER; -} - -WINE_UNICODE_INLINE int isupperW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_UPPER; -} - -WINE_UNICODE_INLINE int isalnumW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isalphaW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isgraphW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isprintW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); -} - -/* some useful string manipulation routines */ - -WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ) -{ - const WCHAR *s = str; - while (*s) s++; - return (unsigned int)(s - str); -} - -WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) -{ - WCHAR *p = dst; - while ((*p++ = *src++)); - return dst; -} - -/* strncpy doesn't do what you think, don't use it */ -#define strncpyW(d,s,n) error do_not_use_strncpyW_use_lstrcpynW_or_memcpy_instead - -WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) -{ - strcpyW( dst + strlenW(dst), src ); - return dst; -} - -WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ) -{ - do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); - return NULL; -} - -WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) -{ - WCHAR *ret = NULL; - do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); - return ret; -} - -WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) -{ - for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; - return NULL; -} - -WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ) -{ - const WCHAR *ptr; - for (ptr = str; *ptr; ptr++) if (!strchrW( accept, *ptr )) break; - return ptr - str; -} - -WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) -{ - const WCHAR *ptr; - for (ptr = str; *ptr; ptr++) if (strchrW( reject, *ptr )) break; - return ptr - str; -} - -WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) -{ - WCHAR *ret = str; - while ((*str = tolowerW(*str))) str++; - return ret; -} - -WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) -{ - WCHAR *ret = str; - while ((*str = toupperW(*str))) str++; - return ret; -} - -WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) -{ - const WCHAR *end; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)(ULONG_PTR)ptr; - return NULL; -} - -WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) -{ - const WCHAR *end; - WCHAR *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; - return ret; -} - -WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) -{ - return strtolW( str, (WCHAR **)0, 10 ); -} - -WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) -{ - return (int)atolW( str ); -} - -#undef WINE_UNICODE_INLINE - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_WINE_UNICODE_H */ Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=5224… ============================================================================== --- trunk/reactos/tools/widl/hash.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/hash.c [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -21,7 +21,7 @@ #include <stdio.h> #include <stdarg.h> -#include <host/nls.h> +#include <nls.h> #include "widltypes.h" #include "hash.h" Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=5… ============================================================================== --- trunk/reactos/tools/widl/typelib.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib.c [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -35,7 +35,7 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include <host/typedefs.h> +#include <typedefs.h> #include "widl.h" #include "utils.h" Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… ============================================================================== --- trunk/reactos/tools/widl/typelib_struct.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib_struct.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -302,7 +302,7 @@ * */ -#include <host/pshpack1.h> +#include <pshpack1.h> typedef struct { /*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */ @@ -599,7 +599,7 @@ WORD typeofarray */ -#include <host/poppack.h> +#include <poppack.h> /*---------------------------END--------------------------------------------*/ #endif Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/write_msft.c [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -40,8 +40,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include <host/typedefs.h> -#include <host/nls.h> +#include <typedefs.h> +#include <nls.h> #include "widl.h" #include "typelib.h" @@ -909,7 +909,7 @@ if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; } else { @@ -947,7 +947,7 @@ if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & VT_TYPEMASK) | VT_ARRAY; } else { @@ -1129,7 +1129,7 @@ if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; } else { @@ -1548,7 +1548,7 @@ } /* update the index data */ - typeinfo->func_indices[typeinfo->typeinfo->cElement & 0xffff] = id; + typeinfo->func_indices[typeinfo->typeinfo->cElement & 0xffff] = id; typeinfo->func_offsets[typeinfo->typeinfo->cElement & 0xffff] = offset; typeinfo->func_names[typeinfo->typeinfo->cElement & 0xffff] = name_offset; @@ -1605,7 +1605,7 @@ INT *typedata; int var_datawidth; int var_alignment; - int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; + int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; int alignment; int varflags = 0; const attr_t *attr; @@ -2551,8 +2551,8 @@ time_t cur_time; char *time_override; unsigned int version = 5 << 24 | 1 << 16 | 164; /* 5.01.0164 */ - GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; pointer_size = (typelib_kind == SYS_WIN64) ? 8 : 4; @@ -2594,7 +2594,7 @@ set_help_context(msft); set_help_string_dll(msft); set_help_string_context(msft); - + /* midl adds two sets of custom data to the library: the current unix time and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE"); Modified: trunk/reactos/tools/wmc/wmctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=5… ============================================================================== --- trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -23,7 +23,7 @@ #include <stdarg.h> #include <string.h> -#include <host/typedefs.h> +#include <typedefs.h> /* Byteordering defines */ #define WMC_BO_NATIVE 0x00 Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=5… ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/newstruc.c [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -32,7 +32,7 @@ #include "utils.h" #include "parser.h" -#include <host/pshpack2.h> +#include <pshpack2.h> typedef struct { DWORD biSize; @@ -41,7 +41,7 @@ WORD biPlanes; WORD biBitCount; } BITMAPOS2HEADER; -#include <host/poppack.h> +#include <poppack.h> /* Generate new_* functions that have no parameters (NOTE: no ';') */ __NEW_STRUCT_FUNC(dialog) Modified: trunk/reactos/tools/wrc/wrcrostypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrcrostypes.h?re… ============================================================================== --- trunk/reactos/tools/wrc/wrcrostypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/wrcrostypes.h [iso-8859-1] Wed Jun 15 10:30:03 2011 @@ -9,8 +9,8 @@ #ifndef _WRC_ROSTYPES_H #define _WRC_ROSTYPES_H -#include <host/typedefs.h> -#include <host/nls.h> +#include <typedefs.h> +#include <nls.h> #include <string.h> // Definitions copied from various <win....h> files @@ -55,7 +55,7 @@ #define WS_TABSTOP 0x10000 #define WS_VISIBLE 0x10000000 -#include <host/pshpack2.h> +#include <pshpack2.h> typedef struct tagBITMAPFILEHEADER { WORD bfType; DWORD bfSize; @@ -63,7 +63,7 @@ WORD bfReserved2; DWORD bfOffBits; } BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER; -#include <host/poppack.h> +#include <poppack.h> typedef int FXPT2DOT30; typedef struct tagCIEXYZ {

13 years, 6 months

[rharabien] 52239: [BOOTVID] - Fix scrolling if ScrollRegion contain whole screen. - Add backspace support - Remove unneeded code - Now screen debugging in BSOD works much better :)

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jun 14 22:04:42 2011 New Revision: 52239 URL: http://svn.reactos.org/svn/reactos?rev=52239&view=rev Log: [BOOTVID] - Fix scrolling if ScrollRegion contain whole screen. - Add backspace support - Remove unneeded code - Now screen debugging in BSOD works much better :) Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Tue Jun 14 22:04:42 2011 @@ -66,7 +66,6 @@ ULONG TextColor = 0xF; ULONG curr_x = 0; ULONG curr_y = 0; -BOOLEAN NextLine = FALSE; ULONG_PTR VgaRegisterBase = 0; ULONG_PTR VgaBase = 0; @@ -346,8 +345,7 @@ VOID NTAPI PreserveRow(IN ULONG CurrentTop, - IN ULONG TopDelta, - IN BOOLEAN Direction) + IN ULONG TopDelta) { PUCHAR Position1, Position2; ULONG Count; @@ -361,19 +359,9 @@ /* Set Mode 1 */ ReadWriteMode(1); - /* Check which way we're preserving */ - if (Direction) - { - /* Calculate the position in memory for the row */ - Position1 = (PUCHAR)VgaBase + CurrentTop * 80; - Position2 = (PUCHAR)VgaBase + 0x9600; - } - else - { - /* Calculate the position in memory for the row */ - Position1 = (PUCHAR)VgaBase + 0x9600; - Position2 = (PUCHAR)VgaBase + CurrentTop * 80; - } + /* Calculate the position in memory for the row */ + Position1 = (PUCHAR)VgaBase + 0x9600; + Position2 = (PUCHAR)VgaBase + CurrentTop * 80; /* Set the count and make sure it's above 0 */ Count = TopDelta * 80; @@ -390,6 +378,33 @@ Position1++; } while (--Count); } +} + +VOID +NTAPI +CleanCharacter(IN ULONG Left, + IN ULONG Top, + IN ULONG TopDelta) +{ + PUCHAR Position1, Position2; + ULONG i; + + /* Clear the 4 planes */ + __outpw(0x3C4, 0xF02); + + /* Set the bitmask to 0xFF for all 4 planes */ + __outpw(0x3CE, 0xFF08); + + /* Set Mode 1 */ + ReadWriteMode(1); + + /* Calculate the position in memory for the character */ + Position1 = (PUCHAR)VgaBase + 0x9600 + Left / 8; + Position2 = (PUCHAR)VgaBase + Top * 80 + Left / 8; + + /* Copy data from preserved row */ + for(i = 0; i < TopDelta; ++i) + WRITE_REGISTER_UCHAR(Position2 + i * 80, READ_REGISTER_UCHAR(Position1)); } VOID @@ -749,57 +764,62 @@ { /* Modify Y position */ curr_y += TopDelta; - if (curr_y >= ScrollRegion[3]) + if (curr_y + TopDelta >= ScrollRegion[3]) { /* Scroll the view */ VgaScroll(TopDelta); curr_y -= TopDelta; - - /* Preserve row */ - PreserveRow(curr_y, TopDelta, TRUE); + } + else + { + /* Preserve the current row */ + PreserveRow(curr_y, TopDelta); } /* Update current X */ curr_x = ScrollRegion[0]; - - /* Preseve the current row */ - PreserveRow(curr_y, TopDelta, FALSE); } else if (*String == '\r') { /* Update current X */ curr_x = ScrollRegion[0]; - - /* Check if we're being followed by a new line */ - if (String[1] != '\n') NextLine = TRUE; + } + else if (*String == '\b') + { + /* Update current X */ + if (curr_x > ScrollRegion[0]) + curr_x -= 8; + else + { + /* We are at line begin - move to previous row */ + curr_x = ScrollRegion[0]; + curr_y -= TopDelta; + } + + /* Clean current character */ + CleanCharacter(curr_x, curr_y, TopDelta); } else { - /* Check if we had a \n\r last time */ - if (NextLine) - { - /* We did, preserve the current row */ - PreserveRow(curr_y, TopDelta, TRUE); - NextLine = FALSE; - } - /* Display this character */ DisplayCharacter(*String, curr_x, curr_y, TextColor, 16); curr_x += 8; /* Check if we should scroll */ - if (curr_x > ScrollRegion[2]) + if (curr_x + 8 > ScrollRegion[2]) { /* Update Y position and check if we should scroll it */ curr_y += TopDelta; - if (curr_y > ScrollRegion[3]) + if (curr_y + TopDelta > ScrollRegion[3]) { /* Do the scroll */ VgaScroll(TopDelta); curr_y -= TopDelta; - - /* Save the row */ - PreserveRow(curr_y, TopDelta, TRUE); + } + else + { + /* Preserve the current row */ + PreserveRow(curr_y, TopDelta); } /* Update X */

13 years, 6 months

[osiejka] 52238: Converting POLISH localisation strings to UTF-8. Part 4/5: - dll/cpl converted Tested on rbuild/cmake

by osiejka＠svn.reactos.org

Author: osiejka Date: Tue Jun 14 21:28:07 2011 New Revision: 52238 URL: http://svn.reactos.org/svn/reactos?rev=52238&view=rev Log: Converting POLISH localisation strings to UTF-8. Part 4/5: - dll/cpl converted Tested on rbuild/cmake Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/console/lang/pl-PL.rc trunk/reactos/dll/cpl/console/lang/ro-RO.rc trunk/reactos/dll/cpl/console/rsrc.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/rsrc.rc trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ro-RO.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/joy/lang/pl-PL.rc trunk/reactos/dll/cpl/joy/lang/ro-RO.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/liccpa/lang/pl-PL.rc trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/main/lang/ro-RO.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/rsrc.rc trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc trunk/reactos/dll/cpl/telephon/lang/ro-RO.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc trunk/reactos/dll/cpl/timedate/rsrc.rc trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc trunk/reactos/dll/cpl/usrmgr/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pl-PL… Modified: trunk/reactos/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ro-RO… Modified: trunk/reactos/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/rsrc.rc?re… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=5… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=5… Modified: trunk/reactos/dll/cpl/joy/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/pl-PL.rc?… Modified: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ro-RO.rc?… Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=52… Modified: trunk/reactos/dll/cpl/liccpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=5… Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/mmsys/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/rsrc.rc?rev=… Modified: trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/pl-P… Modified: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… Modified: trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/pl-P… Modified: trunk/reactos/dll/cpl/telephon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ro-R… Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… Modified: trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pl-P… Modified: trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ro-R… Modified: trunk/reactos/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/rsrc.rc?r… Modified: trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev…

13 years, 6 months

[tkreuzer] 52237: [DDK] according to WDK FsRtlRemoveBaseMcbEntry returns BOOLEAN

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 14 20:36:24 2011 New Revision: 52237 URL: http://svn.reactos.org/svn/reactos?rev=52237&view=rev Log: [DDK] according to WDK FsRtlRemoveBaseMcbEntry returns BOOLEAN Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=52… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue Jun 14 20:36:24 2011 @@ -7344,7 +7344,7 @@ IN LONGLONG SectorCount); NTKERNELAPI -VOID +BOOLEAN NTAPI FsRtlRemoveBaseMcbEntry( IN PBASE_MCB Mcb,

13 years, 6 months

[akhaldi] 52236: * Revert r52232.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 14 18:51:43 2011 New Revision: 52236 URL: http://svn.reactos.org/svn/reactos?rev=52236&view=rev Log: * Revert r52232. Added: trunk/reactos/include/reactos/msvchelper.h - copied unchanged from r52231, trunk/reactos/include/reactos/msvchelper.h Removed: trunk/reactos/include/reactos/wine/math.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt trunk/reactos/dll/3rdparty/CMakeLists.txt trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -2,9 +2,7 @@ add_subdirectory(arp) add_subdirectory(dwnl) add_subdirectory(finger) -if(NOT MSVC) - add_subdirectory(ftp) # FIXME: fix msvc build -endif() +add_subdirectory(ftp) add_subdirectory(ipconfig) add_subdirectory(net) add_subdirectory(netstat) @@ -12,7 +10,7 @@ add_subdirectory(ping) add_subdirectory(route) if(NOT MSVC) - add_subdirectory(telnet) # FIXME: fix msvc build +add_subdirectory(telnet) endif() add_subdirectory(tracert) add_subdirectory(whois) Modified: trunk/reactos/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -5,8 +5,7 @@ add_subdirectory(libjpeg) add_subdirectory(libpng) add_subdirectory(libtiff) - +add_subdirectory(libxslt) if(NOT MSVC) - add_subdirectory(libxslt) - add_subdirectory(mesa32) +add_subdirectory(mesa32) endif() Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -16,9 +16,7 @@ add_subdirectory(dsound) #add_subdirectory(dsound_new) #disabled in trunk add_subdirectory(dxdiagn) -if(NOT MSVC) - add_subdirectory(ksproxy) #FIXME: fix msvc build -endif() +add_subdirectory(ksproxy) add_subdirectory(ksuser) add_subdirectory(msdmo) #add_subdirectory(msdvbnp) #disabled in trunk Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -6,6 +6,10 @@ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +if(MSVC) + add_definitions(-FImsvchelper.h) +endif() set_rc_compiler() Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -6,6 +6,10 @@ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +if(MSVC) + add_definitions(-FImsvchelper.h) +endif() set_rc_compiler() Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -963,7 +963,7 @@ fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f * INFINITY; + fogstart = -1.0f / 0.0f; fogend = 0.0f; } break; Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Tue Jun 14 18:51:43 2011 @@ -196,8 +196,8 @@ } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn * INFINITY; /* +INF / -INF */ - else return NAN; + if(m == 0) return sgn / 0.0f; /* +INF / -INF */ + else return 0.0f / 0.0f; /* NAN */ } } @@ -218,8 +218,8 @@ } else { - if (m == 0) return sgn * INFINITY; /* +INF / -INF */ - else return NAN; + if (m == 0) return sgn / 0.0f; /* +INF / -INF */ + else return 0.0f / 0.0f; /* NAN */ } } Removed: trunk/reactos/include/reactos/wine/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/math.… ============================================================================== --- trunk/reactos/include/reactos/wine/math.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/math.h (removed) @@ -1,26 +1,0 @@ -#ifndef __WINE_MATH_H_ -#define __WINE_MATH_H_ - -#include <crt/math.h> - -#ifdef _MSC_VER -__forceinline float _NaN() -{ - unsigned long NaN = 0x7fc00000; - return *(float*)&NaN; -} -#define NAN _NaN() - -__forceinline float _Infinity() -{ - unsigned long Infinity = 0x7f800000; - return *(float*)&Infinity; -} -#define INFINITY _Infinity() - -#else -#define NAN (0.0f / 0.0f) -#define INFINITY (1.0F/0.0F) -#endif - -#endif /* __WINE_MATH_H_ */

13 years, 6 months

[rharabien] 52235: [FREELDR] - Revert 52230 - it breaks freeldr build in GCC

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jun 14 18:34:10 2011 New Revision: 52235 URL: http://svn.reactos.org/svn/reactos?rev=52235&view=rev Log: [FREELDR] - Revert 52230 - it breaks freeldr build in GCC Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Jun 14 18:34:10 2011 @@ -188,7 +188,7 @@ endif() set_subsystem(freeldr_pe native) -set_image_base(freeldr_pe 0x10000) +set_image_base(freeldr_pe 0x9000) set_entrypoint(freeldr_pe RealEntryPoint) if(ARCH MATCHES i386) @@ -242,7 +242,7 @@ endif() set_subsystem(setupldr_pe native) -set_image_base(setupldr_pe 0x10000) +set_image_base(setupldr_pe 0x9000) set_entrypoint(setupldr_pe RealEntryPoint) if(ARCH MATCHES i386)

13 years, 6 months

← Newer
1
...
23
24
25
26
27
28
29
...
46
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 June 2011