Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[jmorlan] 47485: [WIN32CSR] Split up excessively large and disorganized conio.c into 3 separate files: one for input-related functions, one for output-related functions, and one for general/miscellaneous functions.
by jmorlan＠svn.reactos.org 31 May '10

31 May '10

Author: jmorlan Date: Mon May 31 08:28:55 2010 New Revision: 47485 URL: http://svn.reactos.org/svn/reactos?rev=47485&view=rev Log: [WIN32CSR] Split up excessively large and disorganized conio.c into 3 separate files: one for input-related functions, one for output-related functions, and one for general/miscellaneous functions. Added: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c - copied, changed from r47457, trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c - copied, changed from r47457, trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/console.c - copied, changed from r47457, trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Removed: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Copied: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c (from r47457, trunk/reactos/subsystems/win32/csrss/win32csr/conio.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Removed: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Copied: trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c (from r47457, trunk/reactos/subsystems/win32/csrss/win32csr/conio.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Copied: trunk/reactos/subsystems/win32/csrss/win32csr/console.c (from r47457, trunk/reactos/subsystems/win32/csrss/win32csr/conio.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…

1 0

[tkreuzer] 47484: - add explicit braces to avoid ambiguous 'else' - fix deprecated conversion from string constant to 'char*'
by tkreuzer＠svn.reactos.org 31 May '10

31 May '10

Author: tkreuzer Date: Mon May 31 06:13:40 2010 New Revision: 47484 URL: http://svn.reactos.org/svn/reactos?rev=47484&view=rev Log: - add explicit braces to avoid ambiguous 'else' - fix deprecated conversion from string constant to 'char*' Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon May 31 06:13:40 2010 @@ -414,10 +414,16 @@ { SMINFO *infoPtr = (SMINFO *)lParam; if ((infoPtr->dwMask & SMIM_FLAGS) != 0) + { if (psmd->uId == FCIDM_MENU_FAVORITES) + { infoPtr->dwFlags |= SMIF_DROPCASCADE; - else{ - infoPtr->dwFlags |= SMIF_TRACKPOPUP;} + } + else + { + infoPtr->dwFlags |= SMIF_TRACKPOPUP; + } + } if ((infoPtr->dwMask & SMIM_ICON) != 0) infoPtr->iIcon = -1; } @@ -1213,7 +1219,7 @@ CComPtr<IObjectWithSite> objectWithSite; CComPtr<IContextMenu> contextMenu; CMINVOKECOMMANDINFO commandInfo; - char *searchGUID = "{169A0691-8DF9-11d1-A1C4-00C04FD75D13}"; + const char *searchGUID = "{169A0691-8DF9-11d1-A1C4-00C04FD75D13}"; HRESULT hResult; // TODO: Query shell if this command is enabled first

1 0

[tkreuzer] 47483: remove WTIME_S_DEFINED guard and move the functions from wchar_s to wchar.h (like in MS headers)
by tkreuzer＠svn.reactos.org 31 May '10

31 May '10

Author: tkreuzer Date: Mon May 31 05:32:51 2010 New Revision: 47483 URL: http://svn.reactos.org/svn/reactos?rev=47483&view=rev Log: remove WTIME_S_DEFINED guard and move the functions from wchar_s to wchar.h (like in MS headers) Modified: trunk/reactos/include/crt/sec_api/wchar_s.h trunk/reactos/include/crt/wchar.h Modified: trunk/reactos/include/crt/sec_api/wchar_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/wchar_… ============================================================================== --- trunk/reactos/include/crt/sec_api/wchar_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/wchar_s.h [iso-8859-1] Mon May 31 05:32:51 2010 @@ -96,16 +96,6 @@ _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); #endif -#ifndef _WTIME_S_DEFINED -#define _WTIME_S_DEFINED - _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); - _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); -#if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); -#endif - #if !defined (RC_INVOKED) && !defined (_INC_WTIME_S_INL) #define _INC_WTIME_S_INL #ifdef _USE_32BIT_TIME_T Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=47… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Mon May 31 05:32:51 2010 @@ -751,19 +751,27 @@ _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale); _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer); _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer); + + _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); + _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); + _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); + _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); + #if _INTEGRAL_MAX_BITS >= 64 _CRTIMP wchar_t *__cdecl _wctime64(const __time64_t *_Time); + _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); #endif #if !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) #define _INC_WTIME_INL #ifdef _USE_32BIT_TIME_T __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime32(_Time); } -#else +#else /* !_USE_32BIT_TIME_T */ __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime64(_Time); } -#endif -#endif -#endif +#endif /* !_USE_32BIT_TIME_T */ +#endif /* !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) */ + +#endif /* _WTIME_DEFINED */ typedef int mbstate_t; typedef wchar_t _Wint_t;

1 0

[tkreuzer] 47482: [IPHLPAPI] - remove unused variable
by tkreuzer＠svn.reactos.org 31 May '10

31 May '10

Author: tkreuzer Date: Mon May 31 04:29:36 2010 New Revision: 47482 URL: http://svn.reactos.org/svn/reactos?rev=47482&view=rev Log: [IPHLPAPI] - remove unused variable Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Mon May 31 04:29:36 2010 @@ -63,7 +63,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - DWORD Version; switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL );

1 0

[tkreuzer] 47481: Fix build (don't redefine structures)
by tkreuzer＠svn.reactos.org 31 May '10

31 May '10

Author: tkreuzer Date: Mon May 31 04:23:30 2010 New Revision: 47481 URL: http://svn.reactos.org/svn/reactos?rev=47481&view=rev Log: Fix build (don't redefine structures) Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/iotypes.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4748… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon May 31 04:23:30 2010 @@ -6594,6 +6594,65 @@ /* While MS WDK uses inheritance in C++, we cannot do this with gcc, as inheritance, even from a struct renders the type non-POD. So we use this hack */ + + struct _PCI_HEADER_TYPE_0 { + ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; + ULONG CIS; + USHORT SubVendorID; + USHORT SubSystemID; + ULONG ROMBaseAddress; + UCHAR CapabilitiesPtr; + UCHAR Reserved1[3]; + ULONG Reserved2; + UCHAR InterruptLine; + UCHAR InterruptPin; + UCHAR MinimumGrant; + UCHAR MaximumLatency; + }; + + struct _PCI_HEADER_TYPE_1 { + ULONG BaseAddresses[PCI_TYPE1_ADDRESSES]; + UCHAR PrimaryBus; + UCHAR SecondaryBus; + UCHAR SubordinateBus; + UCHAR SecondaryLatency; + UCHAR IOBase; + UCHAR IOLimit; + USHORT SecondaryStatus; + USHORT MemoryBase; + USHORT MemoryLimit; + USHORT PrefetchBase; + USHORT PrefetchLimit; + ULONG PrefetchBaseUpper32; + ULONG PrefetchLimitUpper32; + USHORT IOBaseUpper16; + USHORT IOLimitUpper16; + UCHAR CapabilitiesPtr; + UCHAR Reserved1[3]; + ULONG ROMBaseAddress; + UCHAR InterruptLine; + UCHAR InterruptPin; + USHORT BridgeControl; + }; + + struct _PCI_HEADER_TYPE_2 { + ULONG SocketRegistersBaseAddress; + UCHAR CapabilitiesPtr; + UCHAR Reserved; + USHORT SecondaryStatus; + UCHAR PrimaryBus; + UCHAR SecondaryBus; + UCHAR SubordinateBus; + UCHAR SecondaryLatency; + struct { + ULONG Base; + ULONG Limit; + } Range[PCI_TYPE2_ADDRESSES-1]; + UCHAR InterruptLine; + UCHAR InterruptPin; + USHORT BridgeControl; + }; + #define PCI_COMMON_HEADER_LAYOUT \ USHORT VendorID; \ USHORT DeviceID; \ @@ -6608,61 +6667,9 @@ UCHAR HeaderType; \ UCHAR BIST; \ union { \ - struct _PCI_HEADER_TYPE_0 { \ - ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; \ - ULONG CIS; \ - USHORT SubVendorID; \ - USHORT SubSystemID; \ - ULONG ROMBaseAddress; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved1[3]; \ - ULONG Reserved2; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - UCHAR MinimumGrant; \ - UCHAR MaximumLatency; \ - } type0; \ - struct _PCI_HEADER_TYPE_1 { \ - ULONG BaseAddresses[PCI_TYPE1_ADDRESSES]; \ - UCHAR PrimaryBus; \ - UCHAR SecondaryBus; \ - UCHAR SubordinateBus; \ - UCHAR SecondaryLatency; \ - UCHAR IOBase; \ - UCHAR IOLimit; \ - USHORT SecondaryStatus; \ - USHORT MemoryBase; \ - USHORT MemoryLimit; \ - USHORT PrefetchBase; \ - USHORT PrefetchLimit; \ - ULONG PrefetchBaseUpper32; \ - ULONG PrefetchLimitUpper32; \ - USHORT IOBaseUpper16; \ - USHORT IOLimitUpper16; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved1[3]; \ - ULONG ROMBaseAddress; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - USHORT BridgeControl; \ - } type1; \ - struct _PCI_HEADER_TYPE_2 { \ - ULONG SocketRegistersBaseAddress; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved; \ - USHORT SecondaryStatus; \ - UCHAR PrimaryBus; \ - UCHAR SecondaryBus; \ - UCHAR SubordinateBus; \ - UCHAR SecondaryLatency; \ - struct { \ - ULONG Base; \ - ULONG Limit; \ - } Range[PCI_TYPE2_ADDRESSES-1]; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - USHORT BridgeControl; \ - } type2; \ + struct _PCI_HEADER_TYPE_0 type0; \ + struct _PCI_HEADER_TYPE_1 type1; \ + struct _PCI_HEADER_TYPE_2 type2; \ } u; typedef struct _PCI_COMMON_HEADER { Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Mon May 31 04:23:30 2010 @@ -2917,6 +2917,65 @@ /* While MS WDK uses inheritance in C++, we cannot do this with gcc, as inheritance, even from a struct renders the type non-POD. So we use this hack */ + + struct _PCI_HEADER_TYPE_0 { + ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; + ULONG CIS; + USHORT SubVendorID; + USHORT SubSystemID; + ULONG ROMBaseAddress; + UCHAR CapabilitiesPtr; + UCHAR Reserved1[3]; + ULONG Reserved2; + UCHAR InterruptLine; + UCHAR InterruptPin; + UCHAR MinimumGrant; + UCHAR MaximumLatency; + }; + + struct _PCI_HEADER_TYPE_1 { + ULONG BaseAddresses[PCI_TYPE1_ADDRESSES]; + UCHAR PrimaryBus; + UCHAR SecondaryBus; + UCHAR SubordinateBus; + UCHAR SecondaryLatency; + UCHAR IOBase; + UCHAR IOLimit; + USHORT SecondaryStatus; + USHORT MemoryBase; + USHORT MemoryLimit; + USHORT PrefetchBase; + USHORT PrefetchLimit; + ULONG PrefetchBaseUpper32; + ULONG PrefetchLimitUpper32; + USHORT IOBaseUpper16; + USHORT IOLimitUpper16; + UCHAR CapabilitiesPtr; + UCHAR Reserved1[3]; + ULONG ROMBaseAddress; + UCHAR InterruptLine; + UCHAR InterruptPin; + USHORT BridgeControl; + }; + + struct _PCI_HEADER_TYPE_2 { + ULONG SocketRegistersBaseAddress; + UCHAR CapabilitiesPtr; + UCHAR Reserved; + USHORT SecondaryStatus; + UCHAR PrimaryBus; + UCHAR SecondaryBus; + UCHAR SubordinateBus; + UCHAR SecondaryLatency; + struct { + ULONG Base; + ULONG Limit; + } Range[PCI_TYPE2_ADDRESSES-1]; + UCHAR InterruptLine; + UCHAR InterruptPin; + USHORT BridgeControl; + }; + #define PCI_COMMON_HEADER_LAYOUT \ USHORT VendorID; \ USHORT DeviceID; \ @@ -2931,61 +2990,9 @@ UCHAR HeaderType; \ UCHAR BIST; \ union { \ - struct _PCI_HEADER_TYPE_0 { \ - ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; \ - ULONG CIS; \ - USHORT SubVendorID; \ - USHORT SubSystemID; \ - ULONG ROMBaseAddress; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved1[3]; \ - ULONG Reserved2; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - UCHAR MinimumGrant; \ - UCHAR MaximumLatency; \ - } type0; \ - struct _PCI_HEADER_TYPE_1 { \ - ULONG BaseAddresses[PCI_TYPE1_ADDRESSES]; \ - UCHAR PrimaryBus; \ - UCHAR SecondaryBus; \ - UCHAR SubordinateBus; \ - UCHAR SecondaryLatency; \ - UCHAR IOBase; \ - UCHAR IOLimit; \ - USHORT SecondaryStatus; \ - USHORT MemoryBase; \ - USHORT MemoryLimit; \ - USHORT PrefetchBase; \ - USHORT PrefetchLimit; \ - ULONG PrefetchBaseUpper32; \ - ULONG PrefetchLimitUpper32; \ - USHORT IOBaseUpper16; \ - USHORT IOLimitUpper16; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved1[3]; \ - ULONG ROMBaseAddress; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - USHORT BridgeControl; \ - } type1; \ - struct _PCI_HEADER_TYPE_2 { \ - ULONG SocketRegistersBaseAddress; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved; \ - USHORT SecondaryStatus; \ - UCHAR PrimaryBus; \ - UCHAR SecondaryBus; \ - UCHAR SubordinateBus; \ - UCHAR SecondaryLatency; \ - struct { \ - ULONG Base; \ - ULONG Limit; \ - } Range[PCI_TYPE2_ADDRESSES-1]; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - USHORT BridgeControl; \ - } type2; \ + struct _PCI_HEADER_TYPE_0 type0; \ + struct _PCI_HEADER_TYPE_1 type1; \ + struct _PCI_HEADER_TYPE_2 type2; \ } u; typedef struct _PCI_COMMON_HEADER {

1 0

[tkreuzer] 47480: [DDK/XDK] - Use PCI_COMMON_HEADER_LAYOUT for C, too, place it where it belongs
by tkreuzer＠svn.reactos.org 31 May '10

31 May '10

Author: tkreuzer Date: Mon May 31 04:15:15 2010 New Revision: 47480 URL: http://svn.reactos.org/svn/reactos?rev=47480&view=rev Log: [DDK/XDK] - Use PCI_COMMON_HEADER_LAYOUT for C, too, place it where it belongs Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/iotypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4748… Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=…

1 0

[tkreuzer] 47479: [CRT] - add clang compatible asm version of ldexp and make the code more readable - constify strndup parameter to match standard - fix broken pointer comparison in signal()
by tkreuzer＠svn.reactos.org 31 May '10

31 May '10

Author: tkreuzer Date: Mon May 31 03:50:09 2010 New Revision: 47479 URL: http://svn.reactos.org/svn/reactos?rev=47479&view=rev Log: [CRT] - add clang compatible asm version of ldexp and make the code more readable - constify strndup parameter to match standard - fix broken pointer comparison in signal() Modified: trunk/reactos/lib/sdk/crt/math/i386/ldexp.c trunk/reactos/lib/sdk/crt/misc/getargs.c trunk/reactos/lib/sdk/crt/signal/signal.c Modified: trunk/reactos/lib/sdk/crt/math/i386/ldexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ldex… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] Mon May 31 03:50:09 2010 @@ -21,24 +21,32 @@ #include <math.h> -double ldexp (double __x, int __y); - -double ldexp (double __x, int __y) +double ldexp (double value, int exp) { - register double __val; + register double result; #ifdef __GNUC__ - __asm __volatile__ - ("fscale" - : "=t" (__val) : "0" (__x), "u" ((double) __y)); +#if defined(__clang__) + asm ("fild %[exp]\n" + "fscale\n" + "fstp %%st(1)\n" + : [result] "=t" (result) + : [value] "0" (value), [exp] "m" (exp)); #else - register double __dy = (double)__y; + asm ("fscale" + : "=t" (result) + : "0" (value), "u" ((double)exp) + : "1"); +#endif +#else /* !__GNUC__ */ + register double __dy = (double)exp; __asm { fld __dy - fld __x + fld value fscale - fstp __val + fstp result } -#endif /*__GNUC__*/ - return __val; +#endif /* !__GNUC__ */ + return result; } + Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] Mon May 31 03:50:09 2010 @@ -22,7 +22,7 @@ extern wchar_t **__winitenv; -char* strndup(char* name, size_t len) +char* strndup(char const* name, size_t len) { char *s = malloc(len + 1); if (s != NULL) Modified: trunk/reactos/lib/sdk/crt/signal/signal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/signal/signal.… ============================================================================== --- trunk/reactos/lib/sdk/crt/signal/signal.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/signal/signal.c [iso-8859-1] Mon May 31 03:50:09 2010 @@ -42,7 +42,7 @@ } // check with IsBadCodePtr - if ( func < (__p_sig_fn_t)4096 && func != SIG_DFL && func != SIG_IGN) + if ( (uintptr_t)func < 4096 && func != SIG_DFL && func != SIG_IGN) { __set_errno(EINVAL); return SIG_ERR;

1 0

[tkreuzer] 47478: [time.h] Add missing asctime_s and localtime_s, don't include time_s.h anymore
by tkreuzer＠svn.reactos.org 31 May '10

31 May '10

Author: tkreuzer Date: Mon May 31 03:49:22 2010 New Revision: 47478 URL: http://svn.reactos.org/svn/reactos?rev=47478&view=rev Log: [time.h] Add missing asctime_s and localtime_s, don't include time_s.h anymore Modified: trunk/reactos/include/crt/time.h Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=474… ============================================================================== --- trunk/reactos/include/crt/time.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/time.h [iso-8859-1] Mon May 31 03:49:22 2010 @@ -114,6 +114,7 @@ _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _getsystime(struct tm *_Tm); _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _setsystime(struct tm *_Tm,unsigned _MilliSec); + _CRTIMP errno_t __cdecl asctime_s(char *_Buf,size_t _SizeInWords,const struct tm *_Tm); _CRTIMP errno_t __cdecl _ctime32_s(char *_Buf,size_t _SizeInBytes,const __time32_t *_Time); _CRTIMP errno_t __cdecl _gmtime32_s(struct tm *_Tm,const __time32_t *_Time); _CRTIMP errno_t __cdecl _localtime32_s(struct tm *_Tm,const __time32_t *_Time); @@ -184,6 +185,7 @@ __CRT_INLINE char *__cdecl ctime(const time_t *_Time) { return _ctime32(_Time); } __CRT_INLINE struct tm *__cdecl gmtime(const time_t *_Time) { return _gmtime32(_Time); } __CRT_INLINE struct tm *__cdecl localtime(const time_t *_Time) { return _localtime32(_Time); } +__CRT_INLINE errno_t __cdecl localtime_s(struct tm *_Tm,const time_t *_Time) { return _localtime32_s(_Tm,_Time); } __CRT_INLINE time_t __cdecl mktime(struct tm *_Tm) { return _mktime32(_Tm); } __CRT_INLINE time_t __cdecl _mkgmtime(struct tm *_Tm) { return _mkgmtime32(_Tm); } __CRT_INLINE time_t __cdecl time(time_t *_Time) { return _time32(_Time); } @@ -193,6 +195,7 @@ __CRT_INLINE char *__cdecl ctime(const time_t *_Time) { return _ctime64(_Time); } __CRT_INLINE struct tm *__cdecl gmtime(const time_t *_Time) { return _gmtime64(_Time); } __CRT_INLINE struct tm *__cdecl localtime(const time_t *_Time) { return _localtime64(_Time); } +__CRT_INLINE errno_t __cdecl localtime_s(struct tm *_Tm,const time_t *_Time) { return _localtime64_s(_Tm,_Time); } __CRT_INLINE time_t __cdecl mktime(struct tm *_Tm) { return _mktime64(_Tm); } __CRT_INLINE time_t __cdecl _mkgmtime(struct tm *_Tm) { return _mkgmtime64(_Tm); } __CRT_INLINE time_t __cdecl time(time_t *_Time) { return _time64(_Time); } @@ -214,7 +217,5 @@ #pragma pack(pop) -#include <sec_api/time_s.h> - #endif /* End _TIME_H_ */

1 0

[sserapion] 47477: Opps, accidentally revived memcpy.c
by sserapion＠svn.reactos.org 31 May '10

31 May '10

Author: sserapion Date: Mon May 31 02:55:11 2010 New Revision: 47477 URL: http://svn.reactos.org/svn/reactos?rev=47477&view=rev Log: Opps, accidentally revived memcpy.c Removed: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mem/memcpy.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Mon May 31 02:55:11 2010 @@ -264,14 +264,12 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file>memchr_asm.s</file> - <file>memcpy_asm.s</file> <file>memmove_asm.s</file> <file>memset_asm.s</file> </directory> </if> <ifnot property="ARCH" value="i386"> <file>memchr.c</file> - <file>memcpy.c</file> <file>memmove.c</file> <file>memset.c</file> </ifnot> Removed: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mem/memcpy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/mem/memcpy.c (removed) @@ -1,36 +1,0 @@ -#include <string.h> - -/* NOTE: This code is a duplicate of memmove implementation! */ -void* memcpy(void* dest, const void* src, size_t count) -{ - char *char_dest = (char *)dest; - char *char_src = (char *)src; - - if ((char_dest <= char_src) || (char_dest >= (char_src+count))) - { - /* non-overlapping buffers */ - while(count > 0) - { - *char_dest = *char_src; - char_dest++; - char_src++; - count--; - } - } - else - { - /* overlaping buffers */ - char_dest = (char *)dest + count - 1; - char_src = (char *)src + count - 1; - - while(count > 0) - { - *char_dest = *char_src; - char_dest--; - char_src--; - count--; - } - } - - return dest; -}

1 0

[sserapion] 47476: InfGetIntField should certainly get an INT* as the name suggests and the callers actually expect.
by sserapion＠svn.reactos.org 31 May '10

31 May '10

Author: sserapion Date: Mon May 31 02:45:25 2010 New Revision: 47476 URL: http://svn.reactos.org/svn/reactos?rev=47476&view=rev Log: InfGetIntField should certainly get an INT* as the name suggests and the callers actually expect. Modified: branches/ros-amd64-bringup/reactos/lib/newinflib/infpriv.h branches/ros-amd64-bringup/reactos/lib/newinflib/infros.h branches/ros-amd64-bringup/reactos/lib/newinflib/infrosget.c Modified: branches/ros-amd64-bringup/reactos/lib/newinflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/newinflib/infpriv.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/newinflib/infpriv.h [iso-8859-1] Mon May 31 02:45:25 2010 @@ -116,7 +116,7 @@ PULONG RequiredSize); extern INFSTATUS InfpGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue); + INT* IntegerValue); extern INFSTATUS InfpGetMultiSzField(PINFCONTEXT Context, ULONG FieldIndex, PWSTR ReturnBuffer, Modified: branches/ros-amd64-bringup/reactos/lib/newinflib/infros.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/newinflib/infros.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/newinflib/infros.h [iso-8859-1] Mon May 31 02:45:25 2010 @@ -50,7 +50,7 @@ PULONG RequiredSize); extern BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue); + PINT IntegerValue); extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, ULONG FieldIndex, PWSTR ReturnBuffer, Modified: branches/ros-amd64-bringup/reactos/lib/newinflib/infrosget.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/newinflib/infrosget.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/newinflib/infrosget.c [iso-8859-1] Mon May 31 02:45:25 2010 @@ -84,7 +84,7 @@ BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue) + INT* IntegerValue) { return INF_SUCCESS(InfpGetIntField(Context, FieldIndex, IntegerValue)); }

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 May 2010