Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 58917: [WININET_WINETEST] - Hackfix hanging test. There's no benefit in having testbot take longer. ROSTESTS-73 #comment Temporary timeout added in r58917 to prevent hanging.
by tfaber＠svn.reactos.org 04 May '13

04 May '13

Author: tfaber Date: Sat May 4 08:10:58 2013 New Revision: 58917 URL: http://svn.reactos.org/svn/reactos?rev=58917&view=rev Log: [WININET_WINETEST] - Hackfix hanging test. There's no benefit in having testbot take longer. ROSTESTS-73 #comment Temporary timeout added in r58917 to prevent hanging. Modified: trunk/rostests/winetests/wininet/http.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Sat May 4 08:10:58 2013 @@ -2269,7 +2269,11 @@ SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); +#ifdef ROSTESTS_73_FIXED WaitForSingleObject(hCompleteEvent, INFINITE); +#else /* ROSTESTS_73_FIXED */ + ok(WaitForSingleObject(hCompleteEvent, 5000) == WAIT_OBJECT_0, "Wait timed out\n"); +#endif /* ROSTESTS_73_FIXED */ ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED);

1 0

[pschweitzer] 58916: [NTOSKRNL] Prevent potential double free in loop. Fixes CID 732510
by pschweitzer＠svn.reactos.org 03 May '13

03 May '13

Author: pschweitzer Date: Fri May 3 19:31:03 2013 New Revision: 58916 URL: http://svn.reactos.org/svn/reactos?rev=58916&view=rev Log: [NTOSKRNL] Prevent potential double free in loop. Fixes CID 732510 Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Fri May 3 19:31:03 2013 @@ -367,7 +367,11 @@ DeviceNameLength += sizeof(WCHAR); /* Free the buffer if we had one */ - if (PoolObjectNameInfo) ExFreePool(PoolObjectNameInfo); + if (PoolObjectNameInfo) + { + ExFreePool(PoolObjectNameInfo); + PoolObjectNameInfo = NULL; + } /* Go to the next string buffer position */ ErrorMessage->EntryData.NumberOfStrings++; @@ -428,7 +432,7 @@ break; } - /* Derefernece the device object */ + /* Dereference the device object */ if (LogEntry->DeviceObject) ObDereferenceObject(LogEntry->DeviceObject); if (DriverObject) ObDereferenceObject(LogEntry->DriverObject);

1 0

[jgardou] 58915: [PSDK] * Add complete definition of KEY_INFORMATION_CLASS [DDK] * Add KEY_NAME_INFORMATION structure declaration
by jgardou＠svn.reactos.org 03 May '13

03 May '13

Author: jgardou Date: Fri May 3 18:28:34 2013 New Revision: 58915 URL: http://svn.reactos.org/svn/reactos?rev=58915&view=rev Log: [PSDK] * Add complete definition of KEY_INFORMATION_CLASS [DDK] * Add KEY_NAME_INFORMATION structure declaration Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=58… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Fri May 3 18:28:34 2013 @@ -5836,6 +5836,33 @@ _In_ NTSTATUS Status); #endif +/* Output parameters of ZwQueryKey */ + +typedef struct _KEY_NAME_INFORMATION { + ULONG NameLength; + WCHAR Name[1]; +} KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION; + +typedef struct _KEY_CACHED_INFORMATION { + LARGE_INTEGER LastWriteTime; + ULONG TitleIndex; + ULONG SubKeys; + ULONG MaxNameLen; + ULONG Values; + ULONG MaxValueNameLen; + ULONG MaxValueDataLen; + ULONG NameLength; +} KEY_CACHED_INFORMATION, *PKEY_CACHED_INFORMATION; + +typedef struct _KEY_VIRTUALIZATION_INFORMATION { + ULONG VirtualizationCandidate :1; + ULONG VirtualizationEnabled :1; + ULONG VirtualTarget :1; + ULONG VirtualStore :1; + ULONG VirtualSource :1; + ULONG Reserved :27; +} KEY_VIRTUALIZATION_INFORMATION, *PKEY_VIRTUALIZATION_INFORMATION; + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Fri May 3 18:28:34 2013 @@ -632,10 +632,16 @@ FileFsMaximumInformation } FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; -typedef enum _KEY_INFORMATION_CLASS { - KeyBasicInformation, - KeyNodeInformation, - KeyFullInformation +typedef enum _KEY_INFORMATION_CLASS { + KeyBasicInformation = 0, + KeyNodeInformation = 1, + KeyFullInformation = 2, + KeyNameInformation = 3, + KeyCachedInformation = 4, + KeyFlagsInformation = 5, + KeyVirtualizationInformation = 6, + KeyHandleTagsInformation = 7, + MaxKeyInfoClass = 8 } KEY_INFORMATION_CLASS; typedef enum _KEY_VALUE_INFORMATION_CLASS {

1 0

[jgardou] 58914: [ADVAPI32] - SEH-ize access to the data buffer in RegSetValueExW. Fixes winetest crash
by jgardou＠svn.reactos.org 03 May '13

03 May '13

Author: jgardou Date: Fri May 3 16:44:31 2013 New Revision: 58914 URL: http://svn.reactos.org/svn/reactos?rev=58914&view=rev Log: [ADVAPI32] - SEH-ize access to the data buffer in RegSetValueExW. Fixes winetest crash Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Fri May 3 16:44:31 2013 @@ -14,6 +14,7 @@ /* INCLUDES *****************************************************************/ #include <advapi32.h> +#include <pseh/pseh2.h> WINE_DEFAULT_DEBUG_CHANNEL(reg); /* DEFINES ******************************************************************/ @@ -4952,10 +4953,29 @@ DWORD cbData) { UNICODE_STRING ValueName; - PUNICODE_STRING pValueName; HANDLE KeyHandle; NTSTATUS Status; + if (is_string(dwType) && (cbData != 0)) + { + PWSTR pwsData = (PWSTR)lpData; + + _SEH2_TRY + { + if((pwsData[cbData / sizeof(WCHAR) - 1] != L'\0') && + (pwsData[cbData / sizeof(WCHAR)] == L'\0')) + { + /* Increment length if last character is not zero and next is zero */ + cbData += sizeof(WCHAR); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return ERROR_NOACCESS); + } + _SEH2_END; + } + Status = MapDefaultKey(&KeyHandle, hKey); if (!NT_SUCCESS(Status)) @@ -4964,22 +4984,9 @@ } RtlInitUnicodeString(&ValueName, lpValueName); - pValueName = &ValueName; - - if (is_string(dwType) && (cbData != 0)) - { - PWSTR pwsData = (PWSTR)lpData; - - if((pwsData[cbData / sizeof(WCHAR) - 1] != L'\0') && - (pwsData[cbData / sizeof(WCHAR)] == L'\0')) - { - /* Increment length if last character is not zero and next is zero */ - cbData += sizeof(WCHAR); - } - } Status = NtSetValueKey(KeyHandle, - pValueName, + &ValueName, 0, dwType, (PVOID)lpData,

1 0

[akhaldi] 58913: [WIN32SS] * Plug a leak in IntGdiAddFontResource(). Original fix by Katayama Hirofumi MZ with one more instance covered by Timo Kreuzer. * Return 0 instead of status in the file ma...
by akhaldi＠svn.reactos.org 03 May '13

03 May '13

Author: akhaldi Date: Fri May 3 09:57:19 2013 New Revision: 58913 URL: http://svn.reactos.org/svn/reactos?rev=58913&view=rev Log: [WIN32SS] * Plug a leak in IntGdiAddFontResource(). Original fix by Katayama Hirofumi MZ with one more instance covered by Timo Kreuzer. * Return 0 instead of status in the file mapping failure path. By Timo Kreuzer. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri May 3 09:57:19 2013 @@ -346,7 +346,8 @@ if (!NT_SUCCESS(Status)) { DPRINT("Could not map file: %wZ\n", FileName); - return Status; + ObDereferenceObject(SectionObject); + return 0; } IntLockFreeType; @@ -357,6 +358,7 @@ 0, &Face); IntUnLockFreeType; + ObDereferenceObject(SectionObject); if (Error) { @@ -364,7 +366,6 @@ DPRINT("Unknown font file format\n"); else DPRINT("Error reading font file (error code: %u)\n", Error); - ObDereferenceObject(SectionObject); return 0; } @@ -372,7 +373,6 @@ if (!Entry) { FT_Done_Face(Face); - ObDereferenceObject(SectionObject); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } @@ -381,7 +381,6 @@ if (FontGDI == NULL) { FT_Done_Face(Face); - ObDereferenceObject(SectionObject); ExFreePoolWithTag(Entry, TAG_FONT); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; @@ -392,7 +391,6 @@ { EngFreeMem(FontGDI); FT_Done_Face(Face); - ObDereferenceObject(SectionObject); ExFreePoolWithTag(Entry, TAG_FONT); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0;

1 0

[akhaldi] 58912: [CRT] * Annotate tchar.h.
by akhaldi＠svn.reactos.org 02 May '13

02 May '13

Author: akhaldi Date: Thu May 2 17:09:34 2013 New Revision: 58912 URL: http://svn.reactos.org/svn/reactos?rev=58912&view=rev Log: [CRT] * Annotate tchar.h. Modified: trunk/reactos/include/crt/tchar.h Modified: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/tchar.h [iso-8859-1] Thu May 2 17:09:34 2013 @@ -855,65 +855,489 @@ #else /* !_MB_MAP_DIRECT */ - _CRTIMP _CONST_RETURN char *__cdecl _tcschr(const char *_Str,unsigned int _Val); - _CRTIMP size_t __cdecl _tcscspn(const char *_Str,const char *_Control); - _CRTIMP char *__cdecl _tcsncat(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsncat_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsncpy(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsncpy_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP _CONST_RETURN char *__cdecl _tcspbrk(const char *_Str,const char *_Control); - _CRTIMP _CONST_RETURN char *__cdecl _tcsrchr(const char *_Str,unsigned int _Ch); - _CRTIMP size_t __cdecl _tcsspn(const char *_Str,const char *_Control); - _CRTIMP _CONST_RETURN char *__cdecl _tcsstr(const char *_Str,const char *_Substr); - _CRTIMP char *__cdecl _tcstok(char *_Str,const char *_Delim); - _CRTIMP char *__cdecl _tcstok_l(char *_Str,const char *_Delim,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsnset(char *_Str,unsigned int _Val,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsrev(char *_Str); - _CRTIMP char *__cdecl _tcsset(char *_Str,unsigned int _Val); - _CRTIMP char *__cdecl _tcsset_l(char *_Str,unsigned int _Val,_locale_t _Locale); - _CRTIMP int __cdecl _tcscmp(const char *_Str1,const char *_Str); - _CRTIMP int __cdecl _tcsicmp(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _tcsicmp_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _tcsnccmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcsnicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsnicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcscoll(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _tcscoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _tcsicoll(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _tcsicoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _tcsnccoll(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsnccoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcsncoll(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcsncicoll(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsncicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _tcsnicoll(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _tcsnicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP size_t __cdecl _tcsclen(const char *_Str); - _CRTIMP size_t __cdecl _tcscnlen(const char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _tcsclen_l(const char *_Str,_locale_t _Locale); - _CRTIMP size_t __cdecl _tcscnlen_l(const char *_Str,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsnccat(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsnccat_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsnccpy(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsnccpy_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsncset(char *_Str,unsigned int _Val,size_t _MaxCount); - _CRTIMP char *__cdecl _tcsdec(const char *_Start,const char *_Pos); - _CRTIMP char *__cdecl _tcsinc(const char *_Ptr); - _CRTIMP size_t __cdecl _tcsnbcnt(const char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _tcsnccnt(const char *_Str,size_t _MaxCount); - _CRTIMP unsigned int __cdecl _tcsnextc (const char *_Str); - _CRTIMP char *__cdecl _tcsninc(const char *_Ptr,size_t _Count); - _CRTIMP char *__cdecl _tcsspnp(const char *_Str1,const char *_Str2); - _CRTIMP char *__cdecl _tcslwr(char *_Str); - _CRTIMP char *__cdecl _tcslwr_l(char *_Str,_locale_t _Locale); - _CRTIMP char *__cdecl _tcsupr(char *_Str); - _CRTIMP char *__cdecl _tcsupr_l(char *_Str,_locale_t _Locale); - _CRTIMP size_t __cdecl _tclen(const char *_Str); - _CRTIMP void __cdecl _tccpy(char *_DstCh,const char *_SrcCh); + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + _tcschr( + _In_z_ const char *_Str, + _In_ unsigned int _Val); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcscspn( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _CRTIMP + char* + __cdecl + _tcsncat( + _Inout_updates_z_(_MaxCount) char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsncat_l( + _Inout_updates_z_(_MaxCount) char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsncpy( + _Out_writes_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsncpy_l( + _Out_writes_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + _tcspbrk( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + _tcsrchr( + _In_z_ const char *_Str, + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcsspn( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + _tcsstr( + _In_z_ const char *_Str, + _In_z_ const char *_Substr); + + _Check_return_ + _CRTIMP + char* + __cdecl + _tcstok( + _Inout_opt_ char *_Str, + _In_z_ const char *_Delim); + + _Check_return_ + _CRTIMP + char* + __cdecl + _tcstok_l( + _Inout_opt_ char *_Str, + _In_z_ const char *_Delim, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsnset( + _Inout_z_ char *_Str, + _In_ unsigned int _Val, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsrev( + _Inout_z_ char *_Str); + + _CRTIMP + char* + __cdecl + _tcsset( + _Inout_z_ char *_Str, + _In_ unsigned int _Val); + + _CRTIMP + char* + __cdecl + _tcsset_l( + _Inout_z_ char *_Str, + _In_ unsigned int _Val, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcscmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsicmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsicmp_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnccmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncicmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncicmp_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnicmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnicmp_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcscoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcscoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsicoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsicoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnccoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnccoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncicoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsncicoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnicoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _tcsnicoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcsclen( + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcscnlen( + _In_z_ const char *_Str, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcsclen_l( + _In_z_ const char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tcscnlen_l( + _In_z_ const char *_Str, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsnccat( + _Inout_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsnccat_l( + _Inout_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsnccpy( + _Out_writes_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsnccpy_l( + _Out_writes_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsncset( + _Inout_updates_z_(_MaxCount) char *_Str, + _In_ unsigned int _Val, + _In_ size_t _MaxCount); + + _CRTIMP + char* + __cdecl + _tcsdec( + _In_reads_z_(_Pos-_Start + 1) const char *_Start, + _In_z_ const char *_Pos); + + _CRTIMP + char* + __cdecl + _tcsinc( + _In_z_ const char *_Ptr); + + _CRTIMP + size_t + __cdecl + _tcsnbcnt( + _In_reads_(_MaxCount) _Pre_z_ const char *_Str, + _In_ size_t _MaxCount); + + _CRTIMP + size_t + __cdecl + _tcsnccnt( + _In_reads_(_MaxCount) _Pre_z_ const char *_Str, + _In_ size_t _MaxCount); + + _CRTIMP + unsigned int + __cdecl + _tcsnextc( + _In_z_ const char *_Str); + + _CRTIMP + char* + __cdecl + _tcsninc( + _In_reads_(_Count) _Pre_z_ const char *_Ptr, + _In_ size_t _Count); + + _CRTIMP + char* + __cdecl + _tcsspnp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _CRTIMP + char* + __cdecl + _tcslwr( + _Inout_ char *_Str); + + _CRTIMP + char* + __cdecl + _tcslwr_l( + _Inout_ char *_Str, + _In_opt_ _locale_t _Locale); + + _CRTIMP + char* + __cdecl + _tcsupr( + _Inout_ char *_Str); + + _CRTIMP + char* + __cdecl + _tcsupr_l( + _Inout_ char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _tclen( + _In_z_ const char *_Str); + + _CRTIMP + void + __cdecl + _tccpy( + _Pre_notnull_ _Post_z_ char *_DstCh, + _In_z_ const char *_SrcCh); #ifdef __cplusplus #ifndef _CPP_TCHAR_INLINES_DEFINED

1 0

[akhaldi] 58911: [CRT] * Annotate memory.h.
by akhaldi＠svn.reactos.org 02 May '13

02 May '13

Author: akhaldi Date: Thu May 2 14:21:18 2013 New Revision: 58911 URL: http://svn.reactos.org/svn/reactos?rev=58911&view=rev Log: [CRT] * Annotate memory.h. Modified: trunk/reactos/include/crt/memory.h Modified: trunk/reactos/include/crt/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/memory.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/memory.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/memory.h [iso-8859-1] Thu May 2 14:21:18 2013 @@ -20,21 +20,103 @@ #ifndef _CRT_MEMORY_DEFINED #define _CRT_MEMORY_DEFINED - _CRTIMP void *__cdecl _memccpy(void *_Dst,const void *_Src,int _Val,size_t _MaxCount); - _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); - _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); - _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); - int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); - void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _Size); - void *__cdecl memset(void *_Dst,int _Val,size_t _Size); -#ifndef NO_OLDNAMES - _CRTIMP void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size); - _CRTIMP int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); -#endif -#endif + _CRTIMP + void* + __cdecl + _memccpy( + _Out_writes_bytes_opt_(_MaxCount) void *_Dst, + _In_ const void *_Src, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Check_return_ + _CONST_RETURN + void* + __cdecl + memchr( + _In_reads_bytes_opt_(_MaxCount) const void *_Buf, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _memicmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + int + __cdecl + _memicmp_l( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Check_return_ + int + __cdecl + memcmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _MaxCount, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == ((unsigned char*)_Src)[_Iter_])) + _CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) + void* + __cdecl + memcpy( + _Out_writes_bytes_all_(_MaxCount) void *_Dst, + _In_reads_bytes_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _Size, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == _Val)) + void* + __cdecl + memset( + _Out_writes_bytes_all_(_Size) void *_Dst, + _In_ int _Val, + _In_ size_t _Size); + +#ifndef NO_OLDNAMES + + _CRTIMP + void* + __cdecl + memccpy( + _Out_writes_bytes_opt_(_Size) void *_Dst, + _In_reads_bytes_opt_(_Size) const void *_Src, + _In_ int _Val, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + int + __cdecl + memicmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + +#endif /* NO_OLDNAMES */ + +#endif /* _CRT_MEMORY_DEFINED */ #ifdef __cplusplus } #endif -#endif + +#endif /* _INC_MEMORY */

1 0

[pschweitzer] 58910: [NTOSKRNL] This is C, use VOID Spotted by Thomas Faber
by pschweitzer＠svn.reactos.org 02 May '13

02 May '13

Author: pschweitzer Date: Thu May 2 08:04:12 2013 New Revision: 58910 URL: http://svn.reactos.org/svn/reactos?rev=58910&view=rev Log: [NTOSKRNL] This is C, use VOID Spotted by Thomas Faber Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c trunk/reactos/ntoskrnl/fsrtl/stackovf.c Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] Thu May 2 08:04:12 2013 @@ -16,7 +16,7 @@ PERESOURCE FsRtlPagingIoResources; ULONG FsRtlPagingIoResourceSelector; -NTSTATUS NTAPI INIT_FUNCTION FsRtlInitializeWorkerThread(); +NTSTATUS NTAPI INIT_FUNCTION FsRtlInitializeWorkerThread(VOID); static UCHAR LegalAnsiCharacterArray[] = { Modified: trunk/reactos/ntoskrnl/fsrtl/stackovf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/stackovf.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/stackovf.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/stackovf.c [iso-8859-1] Thu May 2 08:04:12 2013 @@ -147,7 +147,7 @@ NTSTATUS NTAPI INIT_FUNCTION -FsRtlInitializeWorkerThread() +FsRtlInitializeWorkerThread(VOID) { ULONG i; NTSTATUS Status;

1 0

[hbelusca] 58909: [FREELDR] Revert an unneeded modification.
by hbelusca＠svn.reactos.org 01 May '13

01 May '13

Author: hbelusca Date: Wed May 1 22:36:42 2013 New Revision: 58909 URL: http://svn.reactos.org/svn/reactos?rev=58909&view=rev Log: [FREELDR] Revert an unneeded modification. Modified: branches/kd++/boot/freeldr/freeldr/windows/winldr.c Modified: branches/kd++/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/boot/freeldr/freeldr/w… ============================================================================== --- branches/kd++/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ branches/kd++/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Wed May 1 22:36:42 2013 @@ -126,7 +126,9 @@ do { - while (*LoadOptions == '/') ++LoadOptions; + while (*LoadOptions == '/') + ++LoadOptions; + *NewLoadOptions++ = *LoadOptions; } while (*LoadOptions++);

1 0

[ekohl] 58908: [NET] Clean-up the new functions. This should have been done by the author of the patch!
by ekohl＠svn.reactos.org 01 May '13

01 May '13

Author: ekohl Date: Wed May 1 21:54:40 2013 New Revision: 58908 URL: http://svn.reactos.org/svn/reactos?rev=58908&view=rev Log: [NET] Clean-up the new functions. This should have been done by the author of the patch! Modified: trunk/reactos/base/applications/network/net/cmdContinue.c trunk/reactos/base/applications/network/net/cmdHelpMsg.c trunk/reactos/base/applications/network/net/cmdPause.c trunk/reactos/base/applications/network/net/net.h Modified: trunk/reactos/base/applications/network/net/cmdContinue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdContinue.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdContinue.c [iso-8859-1] Wed May 1 21:54:40 2013 @@ -9,42 +9,49 @@ #include "net.h" -int cmdContinue(int argc, wchar_t *argv[]) +INT cmdContinue(INT argc, WCHAR **argv) { - int errorCode = 0; - SC_HANDLE hManager, hService; + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; SERVICE_STATUS status; - if(argc != 3) + INT nError = 0; + + if (argc != 3) { puts("Usage: NET CONTINUE <Service Name>"); return 1; } - hManager=OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ENUMERATE_SERVICE); - if(hManager == NULL) + hManager = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ENUMERATE_SERVICE); + if (hManager == NULL) { - printf("[OpenSCManager] Error: %d\n", errorCode = GetLastError()); - return errorCode; - } - - hService = OpenService(hManager, argv[2], SERVICE_PAUSE_CONTINUE); - - if(hService == NULL) - { - printf("[OpenService] Error: %d\n", errorCode=GetLastError()); - CloseServiceHandle(hManager); - return errorCode; + printf("[OpenSCManager] Error: %ld\n", GetLastError()); + nError = 1; + goto done; } - if(!ControlService(hService, SERVICE_CONTROL_CONTINUE, &status)) + hService = OpenService(hManager, argv[2], SERVICE_PAUSE_CONTINUE); + if (hService == NULL) { - printf("[ControlService] Error: %d\n", errorCode=GetLastError()); + printf("[OpenService] Error: %ld\n", GetLastError()); + nError = 1; + goto done; } - CloseServiceHandle(hService); - CloseServiceHandle(hManager); - - return errorCode; + if (!ControlService(hService, SERVICE_CONTROL_CONTINUE, &status)) + { + printf("[ControlService] Error: %ld\n", GetLastError()); + nError = 1; + } + +done: + if (hService != NULL) + CloseServiceHandle(hService); + + if (hManager != NULL) + CloseServiceHandle(hManager); + + return nError; } /* EOF */ Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] Wed May 1 21:54:40 2013 @@ -10,38 +10,42 @@ #include "net.h" #include "stdlib.h" -int cmdHelpMsg(int argc, wchar_t *argv[]) +INT cmdHelpMsg(INT argc, WCHAR **argv) { - wchar_t *endptr; - LPSTR lpBuffer; - long errNum; + LPWSTR endptr; + LPWSTR lpBuffer; + LONG errNum; - if(argc<3) + if (argc < 3) { puts("Usage: NET HELPMSG <Error Code>"); return 1; } + errNum = wcstol(argv[2], &endptr, 10); - if(*endptr != 0) + if (*endptr != 0) { puts("Usage: NET HELPMSG <Error Code>"); return 1; } /* Unicode printing is not supported in ReactOS yet */ - if(FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - errNum, - LANG_USER_DEFAULT, - (LPSTR)&lpBuffer, - 0, - NULL)) + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + errNum, + LANG_USER_DEFAULT, + (LPWSTR)&lpBuffer, + 0, + NULL)) { - printf("\n%s\n", lpBuffer); + printf("\n%S\n", lpBuffer); LocalFree(lpBuffer); } - else printf("Unrecognized error code: %ld\n", errNum); - + else + { + printf("Unrecognized error code: %ld\n", errNum); + } + return 0; } Modified: trunk/reactos/base/applications/network/net/cmdPause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdPause.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdPause.c [iso-8859-1] Wed May 1 21:54:40 2013 @@ -9,41 +9,48 @@ #include "net.h" -int cmdPause(int argc, wchar_t *argv[]) +INT cmdPause(INT argc, WCHAR **argv) { - int errorCode=0; - SC_HANDLE hManager, hService; + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; SERVICE_STATUS status; - if(argc != 3) + INT nError = 0; + + if (argc != 3) { puts("Usage: NET PAUSE <Service Name>"); return 1; } hManager = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ENUMERATE_SERVICE); - if(hManager == NULL) + if (hManager == NULL) { - printf("[OpenSCManager] Error: %d\n", errorCode=GetLastError()); - return errorCode; - } - - hService=OpenService(hManager, argv[2], SERVICE_PAUSE_CONTINUE); - if(hService == NULL) - { - printf("[OpenService] Error: %d\n", errorCode=GetLastError()); - CloseServiceHandle(hManager); - return errorCode; - } - - if(!ControlService(hService, SERVICE_CONTROL_PAUSE, &status)) - { - printf("[ControlService] Error: %d\n", errorCode=GetLastError()); + printf("[OpenSCManager] Error: %ld\n", GetLastError()); + nError = 1; + goto done; } - CloseServiceHandle(hService); - CloseServiceHandle(hManager); + hService = OpenService(hManager, argv[2], SERVICE_PAUSE_CONTINUE); + if (hService == NULL) + { + printf("[OpenService] Error: %ld\n", GetLastError()); + nError = 1; + goto done; + } - return errorCode; + if (!ControlService(hService, SERVICE_CONTROL_PAUSE, &status)) + { + printf("[ControlService] Error: %ld\n", GetLastError()); + } + +done: + if (hService != NULL) + CloseServiceHandle(hService); + + if (hManager != NULL) + CloseServiceHandle(hManager); + + return nError; } /* EOF */ Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Wed May 1 21:54:40 2013 @@ -4,7 +4,7 @@ * FILE: * PURPOSE: * - * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) */ #include <stdarg.h> @@ -16,9 +16,9 @@ VOID help(VOID); INT unimplemented(INT argc, WCHAR **argv); +INT cmdContinue(INT argc, WCHAR **argv); INT cmdHelp(INT argc, WCHAR **argv); +INT cmdHelpMsg(INT argc, WCHAR **argv); +INT cmdPause(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStop(INT argc, WCHAR **argv); -int cmdHelpMsg(int argc, wchar_t *argv[]); -int cmdPause(int argc, wchar_t *argv[]); -int cmdContinue(int argc, wchar_t *argv[]);

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