Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 42831: - Fix EXT2 IFS for msvc: - Fix SEH for MSVC - Disable C4003 (caused by the try_return mess) - Add missing NTAPI to Ext2GetCurrentTime
by sginsberg＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: sginsberg Date: Fri Aug 21 19:39:37 2009 New Revision: 42831 URL: http://svn.reactos.org/svn/reactos?rev=42831&view=rev Log: - Fix EXT2 IFS for msvc: - Fix SEH for MSVC - Disable C4003 (caused by the try_return mess) - Add missing NTAPI to Ext2GetCurrentTime Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild trunk/reactos/drivers/filesystems/ext2/inc/struct.h trunk/reactos/drivers/filesystems/ext2/src/misc.c Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Fri Aug 21 19:39:37 2009 @@ -3,6 +3,7 @@ <module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="ext2fs">inc</include> + <compilerflag compilerset="msc">/wd4003</compilerflag> <library>ntoskrnl</library> <library>hal</library> <directory name="src"> Modified: trunk/reactos/drivers/filesystems/ext2/inc/struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/struct.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/struct.h [iso-8859-1] Fri Aug 21 19:39:37 2009 @@ -31,11 +31,21 @@ typedef PVOID PBCB; +// +// This is a huge hack that will create a broken driver for GCC. +// The driver should use PSEH2. +// +#ifdef _MSC_VER +#define try __try +#define except __except +#define finally __finally +#else #define try if (1) #define except(x) if (0 && (x)) #define finally if (1) #define GetExceptionInformation() 0 #define GetExceptionCode() 0 +#endif // we will use the LARGE_INTEGER structure as defined by NT Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Fri Aug 21 19:39:37 2009 @@ -2111,7 +2111,7 @@ } -ULONG Ext2GetCurrentTime() +ULONG NTAPI Ext2GetCurrentTime() { LARGE_INTEGER CurrentTime; ULONG Time;

1 0

[mkupfer] 42830: fixed typo in German translation
by mkupfer＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: mkupfer Date: Fri Aug 21 19:27:28 2009 New Revision: 42830 URL: http://svn.reactos.org/svn/reactos?rev=42830&view=rev Log: fixed typo in German translation Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] Fri Aug 21 19:27:28 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Audio Grabber @@ -15,5 +15,5 @@ [Section.0407] Licence = Unbekannt Description = Ein sehr guter CD-Ripper/Audio-Datei-Konverter. -URLSize = Unbekannt +URLSite = Unbekannt Size = Unbekannt

1 0

[sginsberg] 42829: - svchost: #ifdef _MSC_VER doesn't mean "using Microsoft's headers" anymore - ddraw, imm32, msxml3, oleaut32, riched20: Include typeof.h for typeof emulation when compiling under MSVC and remove from ReactOS-generic.rbuild (this can't go to port.h as the modules do not include it). - TCPIP: Fix a check for MSVC. - NDIS: Don't use floating point arithmetics in kernel mode -- spotted by MSVC trying to link to ftol (gcc inlined the operation). - SAMLIB: Use __VA_ARGS__ instead of
by sginsberg＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: sginsberg Date: Fri Aug 21 17:57:26 2009 New Revision: 42829 URL: http://svn.reactos.org/svn/reactos?rev=42829&view=rev Log: - svchost: #ifdef _MSC_VER doesn't mean "using Microsoft's headers" anymore - ddraw, imm32, msxml3, oleaut32, riched20: Include typeof.h for typeof emulation when compiling under MSVC and remove from ReactOS-generic.rbuild (this can't go to port.h as the modules do not include it). - TCPIP: Fix a check for MSVC. - NDIS: Don't use floating point arithmetics in kernel mode -- spotted by MSVC trying to link to ftol (gcc inlined the operation). - SAMLIB: Use __VA_ARGS__ instead of gcc-specific macro manipulation. - WIN32CSR: Don't use gcc-specific \% if you want % in the string -- this is incorrect and will pass a broken string to swprintf (the code seems to be uncalled though, so this shouldn't change anything). Use %% instead. - Error out on MSVC implementation of logb -- it doesn't produce the same code as the gcc version. - Rename gcc's float.h to gcc_float.h and use #include instead of #include_next for consistency. - Remove leftover header guard from types.h - Remove superfluous brackets from PSEH2->MSVC defines -- this isn't necessary anymore after 41597 - Correction to 42216: MSVC *does* let you define types in a function, but only at the top of scope. Move back the C_ASSERT into KiAcquireGuardedMutex. - Simplify definition of alloca - scripts.cpp: Silence unavoidable warning. - Remove compile time warning from Uniata -- the code has been unused for 1 1/2 years and will probably remain so. Added: trunk/reactos/include/crt/mingw32/gcc_float.h - copied unchanged from r42808, trunk/reactos/include/crt/mingw32/float.h Removed: trunk/reactos/include/crt/mingw32/float.h Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/base/services/svchost/svchost.h trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/win32/imm32/imm32.rbuild trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild trunk/reactos/dll/win32/riched20/riched20.rbuild trunk/reactos/dll/win32/samlib/debug.h trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/include/crt/float.h trunk/reactos/include/crt/malloc.h trunk/reactos/include/crt/sys/types.h trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/nls/scripts/scripts.cpp trunk/reactos/lib/sdk/crt/float/i386/logb.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c 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] Fri Aug 21 17:57:26 2009 @@ -100,7 +100,6 @@ <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> - <compilerflag>/FIwine/typeof.h</compilerflag> </group> <group compilerset="gcc"> Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ -#ifdef _MSC_VER +#if 0 #define _CRT_SECURE_NO_DEPRECATE 1 #endif Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <define name="USE_WIN32_OPENGL" /> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <library>advapi32</library> <library>dxguid</library> Modified: trunk/reactos/dll/win32/imm32/imm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.rbui… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm32.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <redefine name="_WIN32_WINNT">0x600</redefine> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <file>imm.c</file> <file>version.rc</file> <library>wine</library> Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -10,6 +10,7 @@ <define name="_WINE" /> <redefine name="_WIN32_WINNT">0x601</redefine> <define name="LIBXML_STATIC" /> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <library>libxml2</library> <library>libxslt</library> <library>wine</library> Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -15,6 +15,7 @@ <define name="PROXY_DELEGATION"/> <define name="REGISTER_PROXY_DLL"/> <define name="ENTRY_PREFIX">OLEAUTPS_</define> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <file>connpt.c</file> <file>dispatch.c</file> <file>hash.c</file> Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2… ============================================================================== --- trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -6,6 +6,7 @@ <include base="riched20">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag> <file>caret.c</file> <file>clipboard.c</file> Modified: trunk/reactos/dll/win32/samlib/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/debug.h?r… ============================================================================== --- trunk/reactos/dll/win32/samlib/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/debug.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -1,12 +1,12 @@ #ifdef NDEBUG -#define DPRINT(args...) +#define DPRINT(...) #define CHECKPOINT #else -#define DPRINT(args...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(args); } while(0) +#define DPRINT(...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(__VA_ARGS__); } while(0) #define CHECKPOINT do { DebugPrint("(SAMLIB:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) #endif -#define DPRINT1(args...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(args); } while(0) +#define DPRINT1(...) do { DebugPrint("(SAMLIB:%s:%d) ",__FILE__,__LINE__); DebugPrint(__VA_ARGS__); } while(0) #define CHECKPOINT1 do { DebugPrint("(SAMLIB:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -705,7 +705,14 @@ while (j < str.Length && str.Buffer[j] != '\0') j++; - *NetworkAddressLength = (UINT)((j/2)+0.5); + if ((j % 2) == 0) + { + *NetworkAddressLength = (UINT)(j/2); + } + else + { + *NetworkAddressLength = (UINT)((j/2)+1); + } if ((*NetworkAddressLength) == 0) { Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -1058,7 +1058,7 @@ ("About to call send routine %x\n", (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send))); - if( (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send) ) + if( (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send != NULL) ) Status = (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send)( Request.Handle.AddressHandle, DgramInfo->SendDatagramInformation, Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -426,9 +426,8 @@ i++; } else { #ifdef _MSC_VER -#pragma message ("HACK HACK HACK Disabling warning HACK HACK HACK") #pragma warning(push) -#pragma warning(disable:4333) +#pragma warning(disable:4333) // right shift by too large amount, data loss #endif fis[7] |= (plba[3] >> 24) & 0x0f; #ifdef _MSC_VER Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=42… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -16,12 +16,12 @@ * */ -#ifdef __GNUC__ -#include_next<float.h> -#endif - -#ifdef _MSC_VER +#if defined(__GNUC__) +#include <gcc_float.h> +#elif defined(_MSC_VER) #include <msc_float.h> +#else +#error #endif #ifndef _MINGW_FLOAT_H_ Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -146,12 +146,7 @@ #endif /* RC_INVOKED */ #ifndef NO_OLDNAMES -#undef alloca -#ifdef __GNUC__ -#define alloca(x) __builtin_alloca((x)) -#else #define alloca _alloca -#endif #endif #ifdef HEAPHOOK Removed: trunk/reactos/include/crt/mingw32/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/float.… ============================================================================== --- trunk/reactos/include/crt/mingw32/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/float.h (removed) @@ -1,162 +1,0 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GCC 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ - -/* As a special exception, if you include this header file into source - files compiled by GCC, this header file does not by itself cause - the resulting executable to be covered by the GNU General Public - License. This exception does not however invalidate any other - reasons why the executable file might be covered by the GNU General - Public License. */ - -/* - * ISO C Standard: 5.2.4.2.2 Characteristics of floating types <float.h> - */ - -#ifndef _FLOAT_H___ -#define _FLOAT_H___ - -/* Radix of exponent representation, b. */ -#undef FLT_RADIX -#define FLT_RADIX __FLT_RADIX__ - -/* Number of base-FLT_RADIX digits in the significand, p. */ -#undef FLT_MANT_DIG -#undef DBL_MANT_DIG -#undef LDBL_MANT_DIG -#define FLT_MANT_DIG __FLT_MANT_DIG__ -#define DBL_MANT_DIG __DBL_MANT_DIG__ -#define LDBL_MANT_DIG __LDBL_MANT_DIG__ - -/* Number of decimal digits, q, such that any floating-point number with q - decimal digits can be rounded into a floating-point number with p radix b - digits and back again without change to the q decimal digits, - - p * log10(b) if b is a power of 10 - floor((p - 1) * log10(b)) otherwise -*/ -#undef FLT_DIG -#undef DBL_DIG -#undef LDBL_DIG -#define FLT_DIG __FLT_DIG__ -#define DBL_DIG __DBL_DIG__ -#define LDBL_DIG __LDBL_DIG__ - -/* Minimum int x such that FLT_RADIX**(x-1) is a normalized float, emin */ -#undef FLT_MIN_EXP -#undef DBL_MIN_EXP -#undef LDBL_MIN_EXP -#define FLT_MIN_EXP __FLT_MIN_EXP__ -#define DBL_MIN_EXP __DBL_MIN_EXP__ -#define LDBL_MIN_EXP __LDBL_MIN_EXP__ - -/* Minimum negative integer such that 10 raised to that power is in the - range of normalized floating-point numbers, - - ceil(log10(b) * (emin - 1)) -*/ -#undef FLT_MIN_10_EXP -#undef DBL_MIN_10_EXP -#undef LDBL_MIN_10_EXP -#define FLT_MIN_10_EXP __FLT_MIN_10_EXP__ -#define DBL_MIN_10_EXP __DBL_MIN_10_EXP__ -#define LDBL_MIN_10_EXP __LDBL_MIN_10_EXP__ - -/* Maximum int x such that FLT_RADIX**(x-1) is a representable float, emax. */ -#undef FLT_MAX_EXP -#undef DBL_MAX_EXP -#undef LDBL_MAX_EXP -#define FLT_MAX_EXP __FLT_MAX_EXP__ -#define DBL_MAX_EXP __DBL_MAX_EXP__ -#define LDBL_MAX_EXP __LDBL_MAX_EXP__ - -/* Maximum integer such that 10 raised to that power is in the range of - representable finite floating-point numbers, - - floor(log10((1 - b**-p) * b**emax)) -*/ -#undef FLT_MAX_10_EXP -#undef DBL_MAX_10_EXP -#undef LDBL_MAX_10_EXP -#define FLT_MAX_10_EXP __FLT_MAX_10_EXP__ -#define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ -#define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ - -/* Maximum representable finite floating-point number, - - (1 - b**-p) * b**emax -*/ -#undef FLT_MAX -#undef DBL_MAX -#undef LDBL_MAX -#define FLT_MAX __FLT_MAX__ -#define DBL_MAX __DBL_MAX__ -#define LDBL_MAX __LDBL_MAX__ - -/* The difference between 1 and the least value greater than 1 that is - representable in the given floating point type, b**1-p. */ -#undef FLT_EPSILON -#undef DBL_EPSILON -#undef LDBL_EPSILON -#define FLT_EPSILON __FLT_EPSILON__ -#define DBL_EPSILON __DBL_EPSILON__ -#define LDBL_EPSILON __LDBL_EPSILON__ - -/* Minimum normalized positive floating-point number, b**(emin - 1). */ -#undef FLT_MIN -#undef DBL_MIN -#undef LDBL_MIN -#define FLT_MIN __FLT_MIN__ -#define DBL_MIN __DBL_MIN__ -#define LDBL_MIN __LDBL_MIN__ - -/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown. */ -/* ??? This is supposed to change with calls to fesetround in <fenv.h>. */ -#undef FLT_ROUNDS -#define FLT_ROUNDS 1 - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -/* The floating-point expression evaluation method. - -1 indeterminate - 0 evaluate all operations and constants just to the range and - precision of the type - 1 evaluate operations and constants of type float and double - to the range and precision of the double type, evaluate - long double operations and constants to the range and - precision of the long double type - 2 evaluate all operations and constants to the range and - precision of the long double type - - ??? This ought to change with the setting of the fp control word; - the value provided by the compiler assumes the widest setting. */ -#undef FLT_EVAL_METHOD -#define FLT_EVAL_METHOD __FLT_EVAL_METHOD__ - -/* Number of decimal digits, n, such that any floating-point number in the - widest supported floating type with pmax radix b digits can be rounded - to a floating-point number with n decimal digits and back again without - change to the value, - - pmax * log10(b) if b is a power of 10 - ceil(1 + pmax * log10(b)) otherwise -*/ -#undef DECIMAL_DIG -#define DECIMAL_DIG __DECIMAL_DIG__ - -#endif /* C99 */ -#endif /* _FLOAT_H___ */ Modified: trunk/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/types.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/types.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/types.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -36,9 +36,7 @@ # endif #endif -#ifdef _WINE -#ifndef _PID_T_ -#define _PID_T_ +#if defined(_WINE) #ifndef _WIN64 typedef int _pid_t; #else @@ -50,7 +48,6 @@ typedef _pid_t pid_t; #endif /* __pid_t_defined */ #endif -#endif /* Not _PID_T_ */ #endif #endif /* !_INC_TYPES */ Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -370,10 +370,10 @@ #include <excpt.h> -#define _SEH2_TRY __try { -#define _SEH2_FINALLY } __finally { -#define _SEH2_EXCEPT(...) } __except(__VA_ARGS__) { -#define _SEH2_END } +#define _SEH2_TRY __try +#define _SEH2_FINALLY __finally +#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) +#define _SEH2_END #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) #define _SEH2_GetExceptionCode() (GetExceptionCode()) Modified: trunk/reactos/lib/nls/scripts/scripts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/scripts/scripts.cp… ============================================================================== --- trunk/reactos/lib/nls/scripts/scripts.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/nls/scripts/scripts.cpp [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -45,6 +45,11 @@ #include "scripts.h" +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4351) // elements of array 'array' will be default initialized +#endif + struct SCRIPTS_ScriptsSet { private: @@ -144,6 +149,10 @@ return retval; } }; + +#ifdef _MSC_VER +#pragma warning(pop) +#endif int WINAPI Modified: trunk/reactos/lib/sdk/crt/float/i386/logb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/log… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/logb.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/logb.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -29,6 +29,7 @@ ("fxtract\n\t" : "=t" (__junk), "=u" (__val) : "0" (__x)); #else +#error REVIEW ME __asm fld [__x]; __asm fxtract; __asm fstp st(0); Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=428… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -117,15 +117,15 @@ NULL); } -/* KiAcquireGuardedMutex depends on these bits being right */ -C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); - VOID FASTCALL KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex) { ULONG BitsToRemove, BitsToAdd; LONG OldValue, NewValue; + + /* We depend on these bits being just right */ + C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); /* Increase the contention count */ GuardedMutex->Contention++; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Fri Aug 21 17:57:26 2009 @@ -375,11 +375,11 @@ while((ptr = wcschr(szProcessName, L'\\'))) ptr[0] = L'_'; - swprintf(szBuffer, L"Console\\\%SystemRoot\%%S", &szProcessName[wLength]); + swprintf(szBuffer, L"Console\\%%SystemRoot%%%S", &szProcessName[wLength]); DPRINT("#3 Path : %S\n", szBuffer); if (RegOpenKeyExW(hKey, szBuffer, 0, samDesired, hSubKey) == ERROR_SUCCESS) { - swprintf(GuiData->szProcessName, L"\%SystemRoot\%%S", &szProcessName[wLength]); + swprintf(GuiData->szProcessName, L"%%SystemRoot%%%S", &szProcessName[wLength]); RegCloseKey(hKey); return TRUE; }

1 0

[janderwald] 42828: - Kernel is not yet writing the Control key when activating a device interface
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 17:08:46 2009 New Revision: 42828 URL: http://svn.reactos.org/svn/reactos?rev=42828&view=rev Log: - Kernel is not yet writing the Control key when activating a device interface Modified: trunk/reactos/dll/win32/setupapi/interface.c Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Fri Aug 21 17:08:46 2009 @@ -255,6 +255,7 @@ rc = RegOpenKeyExW(hReferenceKey, Control, 0, KEY_QUERY_VALUE, &hControlKey); if (rc != ERROR_SUCCESS) { +#if 0 if (OnlyPresentInterfaces) { DestroyDeviceInterface(interfaceInfo); @@ -262,6 +263,7 @@ } else interfaceInfo->Flags |= SPINT_REMOVED; +#endif } else {

1 0

[janderwald] 42827: - RegQueryValueExW returns ERRROR_SUCCESS
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 16:53:04 2009 New Revision: 42827 URL: http://svn.reactos.org/svn/reactos?rev=42827&view=rev Log: - RegQueryValueExW returns ERRROR_SUCCESS Modified: trunk/reactos/dll/win32/setupapi/interface.c Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Fri Aug 21 16:53:04 2009 @@ -266,7 +266,7 @@ else { dwLength = sizeof(DWORD); - if (RegQueryValueExW(hControlKey, Linked, NULL, &dwRegType, (LPBYTE)&LinkedValue, &dwLength) + if (RegQueryValueExW(hControlKey, Linked, NULL, &dwRegType, (LPBYTE)&LinkedValue, &dwLength) == ERROR_SUCCESS && dwRegType == REG_DWORD && LinkedValue) interfaceInfo->Flags |= SPINT_ACTIVE; RegCloseKey(hControlKey);

1 0

[gschneider] 42826: Remove glyph guard (bug #933): there is no way to such an exclusion properly without working GetCharPlacement, every font engine handles glyphed output slightly different. Fixes Abiword text regression
by gschneider＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: gschneider Date: Fri Aug 21 16:35:48 2009 New Revision: 42826 URL: http://svn.reactos.org/svn/reactos?rev=42826&view=rev Log: Remove glyph guard (bug #933): there is no way to such an exclusion properly without working GetCharPlacement, every font engine handles glyphed output slightly different. Fixes Abiword text regression Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Fri Aug 21 16:35:48 2009 @@ -3732,12 +3732,6 @@ } } - /* FIXME: remove this as soon as GetCharacterPlacementA/W work properly */ - if ((fuOptions & ETO_GLYPH_INDEX) && (fuOptions != (ETO_GLYPH_INDEX | ETO_PDY))) - { - fuOptions &= ~ETO_GLYPH_INDEX; - } - /* Finally call the internal routine */ Result = GreExtTextOutW(hDC, XStart,

1 0

[janderwald] 42825: - Remove test code
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 15:15:38 2009 New Revision: 42825 URL: http://svn.reactos.org/svn/reactos?rev=42825&view=rev Log: - Remove test code Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Fri Aug 21 15:15:38 2009 @@ -203,8 +203,6 @@ PIO_WORKITEM WorkItem = NULL; PSYSAUDIODEVEXT DeviceExtension; PKSAUDIO_DEVICE_ENTRY DeviceEntry = NULL; - PDEVICE_OBJECT AudioDeviceObject; - UNICODE_STRING ReferenceString, SymbolicLinkName; /* a new device has arrived */ DeviceEntry = ExAllocatePool(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); @@ -259,24 +257,6 @@ Ctx->DeviceEntry = DeviceEntry; Ctx->WorkItem = WorkItem; - - /* HACK - * sysaudio should register the device object for itself - */ - AudioDeviceObject = IoGetRelatedDeviceObject(DeviceEntry->FileObject); - RtlInitUnicodeString(&ReferenceString, L"sad0"); - Status = IoRegisterDeviceInterface(AudioDeviceObject, &KSCATEGORY_AUDIO_DEVICE, &ReferenceString, &SymbolicLinkName); - if (NT_SUCCESS(Status)) - { - IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - RtlFreeUnicodeString(&SymbolicLinkName); - } - else - { - DPRINT1("Failed to open %wZ with Status %x\n", &DeviceEntry->DeviceName, Status); - DbgBreakPoint(); - - } /* fetch device extension */ DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension;

1 0

[fireball] 42824: - Convert a wrong macro to an inlined function.
by fireball＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: fireball Date: Fri Aug 21 15:01:27 2009 New Revision: 42824 URL: http://svn.reactos.org/svn/reactos?rev=42824&view=rev Log: - Convert a wrong macro to an inlined function. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Fri Aug 21 15:01:27 2009 @@ -72,24 +72,28 @@ * The erratum (#4) description is incorrect. AMD's workaround waits * till some bits (mostly reserved) are clear; ok for all revs. */ -#define read_roothub(hc, register, mask) ({ \ - ULONG temp = OHCI_READ_PORT_ULONG(&((hc)->regs->roothub.register)); \ - if (temp == -1) \ - /*disable (hc)*/; \ - /*else if (hc->flags & OHCI_QUIRK_AMD756) \ - while (temp & mask) \ - temp = ohci_readl (hc, &hc->regs->roothub.register); */ \ - temp; }) +ULONG +FORCEINLINE +read_roothub(POHCI_DEV hc, PULONG reg, ULONG mask) +{ + ULONG temp = OHCI_READ_PORT_ULONG(reg); + if (temp == -1) + /*disable (hc)*/; + /*else if (hc->flags & OHCI_QUIRK_AMD756) + while (temp & mask) + temp = ohci_readl (hc, &hc->regs->roothub.register); */ + return temp; +} static ULONG roothub_a (POHCI_DEV hc) - { return read_roothub (hc, a, 0xfc0fe000); } + { return read_roothub (hc, &hc->regs->roothub.a, 0xfc0fe000); } /* static inline u32 roothub_b (struct ohci_hcd *hc) { return ohci_readl (hc, &hc->regs->roothub.b); } static inline u32 roothub_status (struct ohci_hcd *hc) { return ohci_readl (hc, &hc->regs->roothub.status); } static u32 roothub_portstatus (struct ohci_hcd *hc, int i) - { return read_roothub (hc, portstatus [i], 0xffe0fce0); } + { return read_roothub (hc, &hc->regs->roothub.portstatus [i], 0xffe0fce0); } */

1 0

[janderwald] 42823: - Partly implement KsCreateBusEnumObject
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 14:58:20 2009 New Revision: 42823 URL: http://svn.reactos.org/svn/reactos?rev=42823&view=rev Log: - Partly implement KsCreateBusEnumObject Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/kstypes.h Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Fri Aug 21 14:58:20 2009 @@ -1709,7 +1709,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -1722,8 +1722,118 @@ IN REFGUID InterfaceGuid OPTIONAL, IN PWCHAR ServiceRelativePath OPTIONAL) { - UNIMPLEMENTED - return STATUS_UNSUCCESSFUL; + ULONG Length; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ServiceKeyPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\"); + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PDEVICE_EXTENSION DeviceExtension; + + /* calculate sizeof bus enum device extension */ + Length = wcslen(BusIdentifier) * sizeof(WCHAR); + Length += sizeof(BUS_ENUM_DEVICE_EXTENSION); + + BusDeviceExtension = ExAllocatePool(NonPagedPool, Length); + if (!BusDeviceExtension) + { + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* zero device extension */ + RtlZeroMemory(BusDeviceExtension, sizeof(BUS_ENUM_DEVICE_EXTENSION)); + + /* initialize bus device extension */ + wcscpy(BusDeviceExtension->BusIdentifier, BusIdentifier); + + /* allocate service path string */ + Length = ServiceKeyPath.MaximumLength; + Length += BusDeviceObject->DriverObject->DriverExtension->ServiceKeyName.MaximumLength; + + if (ServiceRelativePath) + { + /* relative path for devices */ + Length += wcslen(ServiceRelativePath) + 2 * sizeof(WCHAR); + } + + BusDeviceExtension->ServicePath.Length = 0; + BusDeviceExtension->ServicePath.MaximumLength = Length; + BusDeviceExtension->ServicePath.Buffer = ExAllocatePool(NonPagedPool, Length); + + if (!BusDeviceExtension->ServicePath.Buffer) + { + /* not enough memory */ + ExFreePool(BusDeviceExtension); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeStringToString(&BusDeviceExtension->ServicePath, &ServiceKeyPath); + RtlAppendUnicodeStringToString(&BusDeviceExtension->ServicePath, &BusDeviceObject->DriverObject->DriverExtension->ServiceKeyName); + + if (ServiceRelativePath) + { + RtlAppendUnicodeToString(&BusDeviceExtension->ServicePath, L"\\"); + RtlAppendUnicodeToString(&BusDeviceExtension->ServicePath, ServiceRelativePath); + } + + if (InterfaceGuid) + { + /* register an device interface */ + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, InterfaceGuid, NULL, &BusDeviceExtension->SymbolicLinkName); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + ExFreePool(BusDeviceExtension->ServicePath.Buffer); + ExFreePool(BusDeviceExtension); + return Status; + } + + /* now enable device interface */ + Status = IoSetDeviceInterfaceState(&BusDeviceExtension->SymbolicLinkName, TRUE); + + if (!NT_SUCCESS(Status)) + { + ExFreePool(BusDeviceExtension->ServicePath.Buffer); + ExFreePool(BusDeviceExtension); + return Status; + } + + /* set state enabled */ + BusDeviceExtension->Enabled = TRUE; + } + + /* store device objects */ + BusDeviceExtension->BusDeviceObject = BusDeviceObject; + BusDeviceExtension->PnpDeviceObject = PnpDeviceObject; + BusDeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + + if (!PnpDeviceObject) + { + BusDeviceExtension->PnpDeviceObject = IoAttachDeviceToDeviceStack(BusDeviceObject, PhysicalDeviceObject); + + if (!BusDeviceExtension->PnpDeviceObject) + { + /* failed to attach device */ + if (BusDeviceExtension->Enabled) + { + IoSetDeviceInterfaceState(&BusDeviceExtension->SymbolicLinkName, FALSE); + RtlFreeUnicodeString(&BusDeviceExtension->SymbolicLinkName); + } + + /* free device extension */ + ExFreePool(BusDeviceExtension->ServicePath.Buffer); + ExFreePool(BusDeviceExtension); + + return STATUS_DEVICE_REMOVED; + } + } + + /* attach device extension */ + DeviceExtension = (PDEVICE_EXTENSION)BusDeviceObject->DeviceExtension; + DeviceExtension->DeviceHeader = (PKSIDEVICE_HEADER)BusDeviceExtension; + + /* FIXME scan bus and invalidate device relations */ + return Status; } NTSTATUS Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Fri Aug 21 14:58:20 2009 @@ -145,4 +145,19 @@ typedef BOOLEAN (NTAPI *PKSEVENT_SYNCHRONIZED_ROUTINE)(PKSEVENT_CTX Context); +typedef struct +{ + BOOLEAN Enabled; + + PDEVICE_OBJECT PnpDeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT BusDeviceObject; + + UNICODE_STRING ServicePath; + UNICODE_STRING SymbolicLinkName; + + WCHAR BusIdentifier[1]; +}BUS_ENUM_DEVICE_EXTENSION, *PBUS_ENUM_DEVICE_EXTENSION; + + #endif

1 0

[gschneider] 42822: - co_IntLoadSysMenuTemplate: only copy buffer if prior operation succeeded, bug #4803 - co_IntLoadDefaultCursors: result is not used, no need to copy it
by gschneider＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: gschneider Date: Fri Aug 21 13:27:24 2009 New Revision: 42822 URL: http://svn.reactos.org/svn/reactos?rev=42822&view=rev Log: - co_IntLoadSysMenuTemplate: only copy buffer if prior operation succeeded, bug #4803 - co_IntLoadDefaultCursors: result is not used, no need to copy it Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Fri Aug 21 13:27:24 2009 @@ -249,7 +249,7 @@ HMENU APIENTRY co_IntLoadSysMenuTemplate() { - LRESULT Result; + LRESULT Result = 0; NTSTATUS Status; PVOID ResultPointer; ULONG ResultLength; @@ -264,23 +264,20 @@ 0, &ResultPointer, &ResultLength); - - /* Simulate old behaviour: copy into our local buffer */ - Result = *(LRESULT*)ResultPointer; + if (NT_SUCCESS(Status)) + { + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + } UserEnterCo(); - if (!NT_SUCCESS(Status)) - { - return(0); - } return (HMENU)Result; } BOOL APIENTRY co_IntLoadDefaultCursors(VOID) { - LRESULT Result; NTSTATUS Status; PVOID ResultPointer; ULONG ResultLength; @@ -296,9 +293,6 @@ sizeof(BOOL), &ResultPointer, &ResultLength); - - /* Simulate old behaviour: copy into our local buffer */ - Result = *(LRESULT*)ResultPointer; UserEnterCo();

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs