Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[gedmurphy] 69517: [DEVMGR] A few g++ fixes

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 12 19:18:47 2015 New Revision: 69517 URL: http://svn.reactos.org/svn/reactos?rev=69517&view=rev Log: [DEVMGR] A few g++ fixes Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/Node.cpp trunk/reactos/dll/win32/devmgr_new/devmgmt/Node.h trunk/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/win32/devmgr/devmgr/ClassNode.cpp +* FILE: dll/win32/devmgr/devmgmt/ClassNode.cpp * PURPOSE: Class object for * COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org> * Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/win32/devmgr/devmgr/ClassNode.cpp +* FILE: dll/win32/devmgr/devmgmt/ClassNode.cpp * PURPOSE: Class object for * COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org> * Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -5,8 +5,9 @@ { private: SP_DEVINFO_DATA m_DevinfoData; + DEVINST m_DevInst; HDEVINFO m_hDevInfo; - DEVINST m_DevInst; + ULONG m_Status; ULONG m_ProblemNumber; int m_OverlayImage; Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/devmgr/devmgr/DeviceView.cpp + * FILE: dll/win32/devmgr/devmgmt/DeviceView.cpp * PURPOSE: Implements the tree view which contains the devices * COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org> */ @@ -51,7 +51,7 @@ m_hPropertyDialog(NULL), m_hMenu(NULL), m_ViewType(DevicesByType), - m_ShowHidden(FALSE), + m_ShowHidden(false), m_RootNode(NULL) { ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA)); Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -14,10 +14,7 @@ class CDeviceView { - CRootNode *m_RootNode; - CAtlList<CClassNode *> m_ClassNodeList; - CAtlList<CDeviceNode *> m_DeviceNodeList; - SP_CLASSIMAGELIST_DATA m_ImageListData; + HWND m_hMainWnd; HWND m_hTreeView; HWND m_hPropertyDialog; @@ -25,6 +22,11 @@ ViewType m_ViewType; HTREEITEM m_hTreeRoot; bool m_ShowHidden; + + CRootNode *m_RootNode; + CAtlList<CClassNode *> m_ClassNodeList; + CAtlList<CDeviceNode *> m_DeviceNodeList; + SP_CLASSIMAGELIST_DATA m_ImageListData; public: CDeviceView( Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/devmgr/devmgr/MainWindow.cpp + * FILE: dll/win32/devmgr/devmgmt/MainWindow.cpp * PURPOSE: Implements the main container window for the device view * COPYRIGHT: Copyright 2014 - 2015 Ged Murphy <gedmurphy(a)reactos.org> */ @@ -60,18 +60,18 @@ {SC_SIZE, IDS_HINT_SYS_SIZE}, {SC_MINIMIZE, IDS_HINT_SYS_MINIMIZE}, {SC_MAXIMIZE, IDS_HINT_SYS_MAXIMIZE}, - {SC_CLOSE, IDS_HINT_SYS_CLOSE}, + {SC_CLOSE, IDS_HINT_SYS_CLOSE} }; static TBBUTTON TbButtons[] = { - { BTN_PROPERTIES, IDC_PROPERTIES, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { BTN_SCAN_HARDWARE, IDC_SCAN_HARDWARE, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { 2, IDC_STATIC, TBSTATE_ENABLED, BTNS_SEP, 0, 0 }, - { BTN_ENABLE_DRV, IDC_ENABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { BTN_DISABLE_DRV, IDC_DISABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { BTN_UPDATE_DRV, IDC_UPDATE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { BTN_UNINSTALL_DRV, IDC_UNINSTALL_DRV, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 } + { BTN_PROPERTIES, IDC_PROPERTIES, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_SCAN_HARDWARE, IDC_SCAN_HARDWARE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { 2, IDC_STATIC, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0 }, + { BTN_ENABLE_DRV, IDC_ENABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_DISABLE_DRV, IDC_DISABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_UPDATE_DRV, IDC_UPDATE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_UNINSTALL_DRV, IDC_UNINSTALL_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } }; @@ -245,7 +245,6 @@ CDeviceManager::RefreshView(_In_ ViewType Type) { UINT CheckId = 0; - BOOL bSuccess; // Refreshed the cached view m_DeviceView->Refresh(Type, FALSE, TRUE, NULL); @@ -261,20 +260,19 @@ } // Set the new check item - bSuccess = CheckMenuRadioItem(m_hMenu, - IDC_DEVBYTYPE, - IDC_RESBYCONN, - CheckId, - MF_BYCOMMAND); - - return TRUE; + CheckMenuRadioItem(m_hMenu, + IDC_DEVBYTYPE, + IDC_RESBYCONN, + CheckId, + MF_BYCOMMAND); + + return true; } bool CDeviceManager::CreateToolBar(void) { TBADDBITMAP TbAddBitmap; - INT Index; DWORD dwStyles = WS_CHILDWINDOW | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | TBSTYLE_TOOLTIPS | CCS_NODIVIDER; DWORD dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; @@ -307,7 +305,7 @@ TbAddBitmap.hInst = g_hThisInstance; TbAddBitmap.nID = IDB_TOOLBAR; - Index = SendMessageW(m_hToolBar, TB_ADDBITMAP, _countof(TbButtons), (LPARAM)&TbAddBitmap); + SendMessageW(m_hToolBar, TB_ADDBITMAP, _countof(TbButtons), (LPARAM)&TbAddBitmap); SendMessageW(m_hToolBar, TB_ADDBUTTONSW, _countof(TbButtons), (LPARAM)TbButtons); SendMessageW(m_hToolBar, TB_AUTOSIZE, 0, 0); @@ -496,7 +494,7 @@ CDeviceManager::OnNotify(_In_ LPARAM lParam) { LPNMHDR NmHdr = (LPNMHDR)lParam; - LRESULT Ret; + LRESULT Ret = 0; switch (NmHdr->code) { @@ -556,7 +554,7 @@ } } - return 0; + return Ret; } LRESULT Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/Node.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/Node.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/Node.cpp [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/win32/devmgr/devmgr/node.cpp +* FILE: dll/win32/devmgr/devmgmt/node.cpp * PURPOSE: Abstract base object for each node in the tree * COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org> * Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/Node.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/Node.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/Node.h [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -12,12 +12,12 @@ class CNode { protected: + NodeType m_NodeType; PSP_CLASSIMAGELIST_DATA m_ImageListData; LPWSTR m_DeviceId; WCHAR m_DisplayName[DISPLAY_NAME_LEN]; GUID m_ClassGuid; INT m_ClassImage; - NodeType m_NodeType; public: CNode( @@ -25,7 +25,7 @@ _In_ PSP_CLASSIMAGELIST_DATA ImageListData ); - ~CNode(); + virtual ~CNode(); virtual bool SetupNode() = 0; Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp [iso-8859-1] Mon Oct 12 19:18:47 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/win32/devmgr/devmgr/RootNode.cpp +* FILE: dll/win32/devmgr/devmgmt/RootNode.cpp * PURPOSE: Root object for * COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org> *

9 years, 2 months

[pschweitzer] 69516: [NTDLL_APITEST] Fix test Spotted by Alex

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Oct 12 17:43:42 2015 New Revision: 69516 URL: http://svn.reactos.org/svn/reactos?rev=69516&view=rev Log: [NTDLL_APITEST] Fix test Spotted by Alex Modified: trunk/rostests/apitests/ntdll/RtlAllocateHeap.c Modified: trunk/rostests/apitests/ntdll/RtlAllocateHeap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlAllocat… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlAllocateHeap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlAllocateHeap.c [iso-8859-1] Mon Oct 12 17:43:42 2015 @@ -23,7 +23,7 @@ { Buffers[i] = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_CREATE_ALIGN_16, (i % 16 ) + 1); ASSERT(Buffers[i] != NULL); - if (!((ULONG_PTR)Buffers[i] & 0x2)) + if (!((ULONG_PTR)Buffers[i] & 0xF)) { Aligned = FALSE; } @@ -34,7 +34,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffers[i]); } - ok(Aligned == FALSE, "No unaligned address returned\n"); + ok(Aligned == FALSE, "No unaligned address returned\n"); Aligned = TRUE; Parameters.Length = sizeof(Parameters); @@ -48,7 +48,7 @@ { Buffers[i] = RtlAllocateHeap(hHeap, 0, (i % 16 ) + 1); ASSERT(Buffers[i] != NULL); - if (!((ULONG_PTR)Buffers[i] & 0x2)) + if (!((ULONG_PTR)Buffers[i] & 0xF)) { Aligned = FALSE; } @@ -61,5 +61,5 @@ RtlDestroyHeap(hHeap); - ok(Aligned == FALSE, "No unaligned address returned\n"); + ok(Aligned == TRUE, "Unaligned address returned\n"); }

9 years, 2 months

[sginsberg] 69515: [RTL] Merge DbgBreakPointWithStatus and RtlpBreakWithStatusInstruction together as one function (the latter is just a label for KD), and add new macro necessary for this (MASM ve...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Oct 12 17:11:56 2015 New Revision: 69515 URL: http://svn.reactos.org/svn/reactos?rev=69515&view=rev Log: [RTL] Merge DbgBreakPointWithStatus and RtlpBreakWithStatusInstruction together as one function (the latter is just a label for KD), and add new macro necessary for this (MASM very much wants "::" on a global label inside a PROC local scope). Timo, you are awesome. Bonus: Complement HEX()'s awesomeness with the other explicit radix specifiers. Modified: trunk/reactos/include/asm/asm.inc trunk/reactos/lib/rtl/i386/debug_asm.S Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=69… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Mon Oct 12 17:11:56 2015 @@ -21,10 +21,13 @@ ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING #endif -/* Hex numbers need to be in 01ABh format */ +/* Explicit radix in MASM syntax */ +#define BIN(x) x##y +#define OCT(x) x##q +#define DEC(x) x##t #define HEX(x) 0##x##h -/* Macro values need to be marked */ +/* Macro values need not be marked */ #define VAL(x) x /* MASM/ML doesn't want explicit [rip] addressing */ @@ -49,6 +52,11 @@ %__current_function_name ENDP ENDM #define ENDFUNC .ENDP + +/* Global labels need an extra colon */ +GLOBAL_LABEL MACRO label + %label:: +ENDM /* check http://msdn.microsoft.com/en-us/library/9c9k076y%28VS.80%29.aspx and http://msdn.microsoft.com/en-us/library/ms679352%28VS.85%29.aspx */ @@ -193,8 +201,11 @@ .altmacro -/* Hex numbers need to be in 0x1AB format */ -#define HEX(y) 0x##y +/* Explicit radix in GAS syntax */ +#define BIN(x) 0b##x +#define OCT(x) 0##x +#define DEC(x) x +#define HEX(x) 0x##x /* Macro values need to be marked */ #define VAL(x) \x @@ -226,6 +237,11 @@ /* MASM compatible PUBLIC */ .macro PUBLIC symbol .global \symbol +.endm + +/* No special marking of global labels */ +.macro GLOBAL_LABEL label + \label: .endm /* Dummy ASSUME */ Modified: trunk/reactos/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/debug_asm.S?r… ============================================================================== --- trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] Mon Oct 12 17:11:56 2015 @@ -8,48 +8,62 @@ #include <asm.inc> -/* GLOBALS ****************************************************************/ - -PUBLIC _DbgBreakPoint@0 -PUBLIC _DbgBreakPointWithStatus@4 -PUBLIC _DbgUserBreakPoint@0 -PUBLIC _DebugService@20 -PUBLIC _DebugService2@12 -PUBLIC _DbgBreakPointNoBugCheck@0 -PUBLIC _RtlpBreakWithStatusInstruction@0 - /* FUNCTIONS ***************************************************************/ .code +PUBLIC _DbgBreakPointNoBugCheck@0 FUNC _DbgBreakPointNoBugCheck@0 FPO 0, 0, 0, 0, 0, FRAME_FPO + + /* Do breakpoint */ int 3 ret + ENDFUNC + +PUBLIC _DbgUserBreakPoint@0 _DbgUserBreakPoint@0: +PUBLIC _DbgBreakPoint@0 FUNC _DbgBreakPoint@0 FPO 0, 0, 0, 0, 0, FRAME_FPO + + /* Do breakpoint */ int 3 ret + ENDFUNC + +PUBLIC _DbgBreakPointWithStatus@4 FUNC _DbgBreakPointWithStatus@4 FPO 0, 1, 0, 0, 0, FRAME_FPO + + /* Put Status in EAX */ mov eax, [esp+4] + +PUBLIC _RtlpBreakWithStatusInstruction@0 +GLOBAL_LABEL _RtlpBreakWithStatusInstruction@0 + + /* + * Do a "labeled" breakpoint -- the KD data block has a "BreakpointWithStatus" field + * pointing to this label, letting a debugger easily check that a breakpoint has occured here + * and thereby know that there is a Status for it to retrieve from EAX + * + * In other words, Status is passed as an argument directly to the debugger + */ + int 3 + ret 4 + ENDFUNC -FUNC _RtlpBreakWithStatusInstruction@0 - FPO 0, 0, 0, 0, 0, FRAME_FPO - int 3 - ret 4 -ENDFUNC +PUBLIC _DebugService2@12 FUNC _DebugService2@12 FPO 0, 3, 3, 0, 1, FRAME_NONFPO - /* Setup the stack */ + /* Set up the stack */ push ebp mov ebp, esp @@ -60,19 +74,22 @@ int HEX(2D) int 3 - /* Restore stack */ + /* Return */ pop ebp ret 12 + ENDFUNC + +PUBLIC _DebugService@20 FUNC _DebugService@20 FPO 0, 5, 3, 0, 1, FRAME_NONFPO - /* Setup the stack */ + /* Set up the stack */ push ebp mov ebp, esp - /* Save the registers */ + /* Save non-volatiles */ push ebx push edi @@ -85,13 +102,14 @@ int HEX(2D) int 3 - /* Restore registers */ + /* Restore non-volatiles */ pop edi pop ebx /* Return */ pop ebp ret 20 + ENDFUNC END

9 years, 2 months

[akhaldi] 69514: [MBEDTLS] Fix _CRT_SECURE_NO_DEPRECATE redefinition warnings.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 12 13:15:14 2015 New Revision: 69514 URL: http://svn.reactos.org/svn/reactos?rev=69514&view=rev Log: [MBEDTLS] Fix _CRT_SECURE_NO_DEPRECATE redefinition warnings. Modified: trunk/reactos/include/reactos/libs/mbedtls/config.h Modified: trunk/reactos/include/reactos/libs/mbedtls/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/config.h [iso-8859-1] Mon Oct 12 13:15:14 2015 @@ -29,8 +29,10 @@ #ifndef MBEDTLS_CONFIG_H #define MBEDTLS_CONFIG_H +#ifndef __REACTOS__ #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) #define _CRT_SECURE_NO_DEPRECATE 1 +#endif #endif /**

9 years, 2 months

[akhaldi] 69513: [MBEDTLS] Missed these files in svn. Addendum to r69512. CORE-10318

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 12 12:50:06 2015 New Revision: 69513 URL: http://svn.reactos.org/svn/reactos?rev=69513&view=rev Log: [MBEDTLS] Missed these files in svn. Addendum to r69512. CORE-10318 Modified: trunk/reactos/include/reactos/libs/mbedtls/base64.h trunk/reactos/include/reactos/libs/mbedtls/cipher.h trunk/reactos/include/reactos/libs/mbedtls/config.h trunk/reactos/include/reactos/libs/mbedtls/ctr_drbg.h trunk/reactos/include/reactos/libs/mbedtls/hmac_drbg.h trunk/reactos/include/reactos/libs/mbedtls/md.h trunk/reactos/include/reactos/libs/mbedtls/pk.h trunk/reactos/include/reactos/libs/mbedtls/pkcs11.h trunk/reactos/include/reactos/libs/mbedtls/ssl.h trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h trunk/reactos/include/reactos/libs/mbedtls/timing.h trunk/reactos/include/reactos/libs/mbedtls/version.h Modified: trunk/reactos/include/reactos/libs/mbedtls/base64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/base64.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/base64.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -44,6 +44,9 @@ * \return 0 if successful, or MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL. * *olen is always updated to reflect the amount * of data that has (or would have) been written. + * If that length cannot be represented, then no data is + * written to the buffer and *olen is set to the maximum + * length representable as a size_t. * * \note Call this function with dlen = 0 to obtain the * required buffer size in *olen Modified: trunk/reactos/include/reactos/libs/mbedtls/cipher.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/cipher.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/cipher.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -46,7 +46,8 @@ #define MBEDTLS_CIPHER_MODE_STREAM #endif -#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline) +#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ + !defined(inline) && !defined(__cplusplus) #define inline __inline #endif Modified: trunk/reactos/include/reactos/libs/mbedtls/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/config.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -1245,6 +1245,8 @@ * * If set, the X509 parser will not break-off when parsing an X509 certificate * and encountering an unknown critical extension. + * + * \warning Depending on your PKI use, enabling this can be a security risk! * * Uncomment to prevent an error. */ Modified: trunk/reactos/include/reactos/libs/mbedtls/ctr_drbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/ctr_drbg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/ctr_drbg.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -111,7 +111,7 @@ /** * \brief CTR_DRBG context initialization - * Makes the context ready for mbetls_ctr_drbg_seed() or + * Makes the context ready for mbedtls_ctr_drbg_seed() or * mbedtls_ctr_drbg_free(). * * \param ctx CTR_DRBG context to be initialized Modified: trunk/reactos/include/reactos/libs/mbedtls/hmac_drbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/hmac_drbg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/hmac_drbg.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -98,7 +98,7 @@ /** * \brief HMAC_DRBG context initialization - * Makes the context ready for mbetls_hmac_drbg_seed(), + * Makes the context ready for mbedtls_hmac_drbg_seed(), * mbedtls_hmac_drbg_seed_buf() or * mbedtls_hmac_drbg_free(). * Modified: trunk/reactos/include/reactos/libs/mbedtls/md.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/md.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/md.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -26,10 +26,6 @@ #define MBEDTLS_MD_H #include <stddef.h> - -#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline) -#define inline __inline -#endif #define MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE -0x5080 /**< The selected feature is not available. */ #define MBEDTLS_ERR_MD_BAD_INPUT_DATA -0x5100 /**< Bad input parameters to function. */ Modified: trunk/reactos/include/reactos/libs/mbedtls/pk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/pk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/pk.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -42,6 +42,11 @@ #if defined(MBEDTLS_ECDSA_C) #include "ecdsa.h" +#endif + +#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ + !defined(inline) && !defined(__cplusplus) +#define inline __inline #endif #define MBEDTLS_ERR_PK_ALLOC_FAILED -0x3F80 /**< Memory allocation failed. */ @@ -59,7 +64,6 @@ #define MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE -0x3980 /**< Unavailable feature, e.g. RSA disabled for RSA key. */ #define MBEDTLS_ERR_PK_SIG_LEN_MISMATCH -0x3900 /**< The signature is valid but its length is less than expected. */ - #ifdef __cplusplus extern "C" { #endif Modified: trunk/reactos/include/reactos/libs/mbedtls/pkcs11.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/pkcs11.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/pkcs11.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -37,7 +37,8 @@ #include <pkcs11-helper-1.0/pkcs11h-certificate.h> -#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline) +#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ + !defined(inline) && !defined(__cplusplus) #define inline __inline #endif @@ -54,7 +55,7 @@ } mbedtls_pkcs11_context; /** - * Initialize a mbetls_pkcs11_context. + * Initialize a mbedtls_pkcs11_context. * (Just making memory references valid.) */ void mbedtls_pkcs11_init( mbedtls_pkcs11_context *ctx ); Modified: trunk/reactos/include/reactos/libs/mbedtls/ssl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/ssl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/ssl.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -139,6 +139,8 @@ #define MBEDTLS_SSL_TRANSPORT_STREAM 0 /*!< TLS */ #define MBEDTLS_SSL_TRANSPORT_DATAGRAM 1 /*!< DTLS */ +#define MBEDTLS_SSL_MAX_HOST_NAME_LEN 255 /*!< Maximum host name defined in RFC 1035 */ + /* RFC 6066 section 4, see also mfl_code_to_length in ssl_tls.c * NONE must be zero so that memset()ing structure to zero works */ #define MBEDTLS_SSL_MAX_FRAG_LEN_NONE 0 /*!< don't use this extension */ @@ -840,7 +842,7 @@ /** * \brief Initialize an SSL context - * Just makes the context ready for mbetls_ssl_setup() or + * Just makes the context ready for mbedtls_ssl_setup() or * mbedtls_ssl_free() * * \param ssl SSL context Modified: trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/ssl_internal.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -41,7 +41,8 @@ #include "sha512.h" #endif -#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline) +#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ + !defined(inline) && !defined(__cplusplus) #define inline __inline #endif Modified: trunk/reactos/include/reactos/libs/mbedtls/timing.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/timing.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/timing.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -92,7 +92,7 @@ * (See \c mbedtls_timing_get_delay().) * * \param data Pointer to timing data - * Must point to a valid \c mbetls_timing_delay_context struct. + * Must point to a valid \c mbedtls_timing_delay_context struct. * \param int_ms First (intermediate) delay in milliseconds. * \param fin_ms Second (final) delay in milliseconds. * Pass 0 to cancel the current delay. @@ -104,7 +104,7 @@ * (Memory helper: number of delays passed.) * * \param data Pointer to timing data - * Must point to a valid \c mbetls_timing_delay_context struct. + * Must point to a valid \c mbedtls_timing_delay_context struct. * * \return -1 if cancelled (fin_ms = 0) * 0 if none of the delays are passed, Modified: trunk/reactos/include/reactos/libs/mbedtls/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… ============================================================================== --- trunk/reactos/include/reactos/libs/mbedtls/version.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/mbedtls/version.h [iso-8859-1] Mon Oct 12 12:50:06 2015 @@ -39,19 +39,18 @@ */ #define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MINOR 1 -#define MBEDTLS_VERSION_PATCH 1 +#define MBEDTLS_VERSION_PATCH 2 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02010100 -#define MBEDTLS_VERSION_STRING "2.1.1" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.1" +#define MBEDTLS_VERSION_NUMBER 0x02010200 +#define MBEDTLS_VERSION_STRING "2.1.2" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.1.2" #if defined(MBEDTLS_VERSION_C) - #ifdef __cplusplus extern "C" { #endif

9 years, 2 months

[akhaldi] 69512: [MBEDTLS] Update to v2.1.2. By Ismael Ferreras Morezuelas. CORE-10318

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 12 12:47:42 2015 New Revision: 69512 URL: http://svn.reactos.org/svn/reactos?rev=69512&view=rev Log: [MBEDTLS] Update to v2.1.2. By Ismael Ferreras Morezuelas. CORE-10318 Modified: trunk/reactos/dll/3rdparty/mbedtls/base64.c trunk/reactos/dll/3rdparty/mbedtls/bignum.c trunk/reactos/dll/3rdparty/mbedtls/debug.c trunk/reactos/dll/3rdparty/mbedtls/ecp.c trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c trunk/reactos/dll/3rdparty/mbedtls/net.c trunk/reactos/dll/3rdparty/mbedtls/pem.c trunk/reactos/dll/3rdparty/mbedtls/pkcs12.c trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/dll/3rdparty/mbedtls/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/base6… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/base64.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/base64.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -69,6 +69,8 @@ 49, 50, 51, 127, 127, 127, 127, 127 }; +#define BASE64_SIZE_T_MAX ( (size_t) -1 ) /* SIZE_T_MAX is not standard */ + /* * Encode a buffer into base64 format */ @@ -85,14 +87,15 @@ return( 0 ); } - n = ( slen << 3 ) / 6; - - switch( ( slen << 3 ) - ( n * 6 ) ) - { - case 2: n += 3; break; - case 4: n += 2; break; - default: break; - } + n = slen / 3 + ( slen % 3 != 0 ); + + if( n > ( BASE64_SIZE_T_MAX - 1 ) / 4 ) + { + *olen = BASE64_SIZE_T_MAX; + return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL ); + } + + n *= 4; if( dlen < n + 1 ) { @@ -184,7 +187,10 @@ } if( n == 0 ) + { + *olen = 0; return( 0 ); + } n = ( ( n * 6 ) + 7 ) >> 3; n -= j; Modified: trunk/reactos/dll/3rdparty/mbedtls/bignum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/bignu… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/bignum.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/bignum.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -58,11 +58,14 @@ #define biL (ciL << 3) /* bits in limb */ #define biH (ciL << 2) /* half limb size */ +#define MPI_SIZE_T_MAX ( (size_t) -1 ) /* SIZE_T_MAX is not standard */ + /* * Convert between bits/chars and number of limbs - */ -#define BITS_TO_LIMBS(i) (((i) + biL - 1) / biL) -#define CHARS_TO_LIMBS(i) (((i) + ciL - 1) / ciL) + * Divide first in order to avoid potential overflows + */ +#define BITS_TO_LIMBS(i) ( (i) / biL + ( (i) % biL != 0 ) ) +#define CHARS_TO_LIMBS(i) ( (i) / ciL + ( (i) % ciL != 0 ) ) /* * Initialize one MPI @@ -409,6 +412,9 @@ if( radix == 16 ) { + if( slen > MPI_SIZE_T_MAX >> 2 ) + return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA ); + n = BITS_TO_LIMBS( slen << 2 ); MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, n ) ); Modified: trunk/reactos/dll/3rdparty/mbedtls/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/debug… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/debug.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/debug.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -42,7 +42,8 @@ #define mbedtls_snprintf snprintf #endif -#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline) +#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ + !defined(inline) && !defined(__cplusplus) #define inline __inline #endif Modified: trunk/reactos/dll/3rdparty/mbedtls/ecp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecp.c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ecp.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ecp.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -62,7 +62,8 @@ #define mbedtls_free free #endif -#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline) +#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ + !defined(inline) && !defined(__cplusplus) #define inline __inline #endif Modified: trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecp_c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -31,7 +31,8 @@ #include <string.h> -#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline) +#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ + !defined(inline) && !defined(__cplusplus) #define inline __inline #endif Modified: trunk/reactos/dll/3rdparty/mbedtls/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/net.c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/net.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -292,7 +292,7 @@ struct sockaddr_storage client_addr; #if defined(__socklen_t_defined) || defined(_SOCKLEN_T) || \ - defined(_SOCKLEN_T_DECLARED) + defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t) socklen_t n = (socklen_t) sizeof( client_addr ); socklen_t type_len = (socklen_t) sizeof( type ); #else Modified: trunk/reactos/dll/3rdparty/mbedtls/pem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pem.c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/pem.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/pem.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -316,6 +316,9 @@ ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */ } + if( s1 == s2 ) + return( MBEDTLS_ERR_PEM_INVALID_DATA ); + ret = mbedtls_base64_decode( NULL, 0, &len, s1, s2 - s1 ); if( ret == MBEDTLS_ERR_BASE64_INVALID_CHARACTER ) Modified: trunk/reactos/dll/3rdparty/mbedtls/pkcs12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkcs1… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/pkcs12.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/pkcs12.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -86,6 +86,8 @@ return( 0 ); } +#define PKCS12_MAX_PWDLEN 128 + static int pkcs12_pbe_derive_key_iv( mbedtls_asn1_buf *pbe_params, mbedtls_md_type_t md_type, const unsigned char *pwd, size_t pwdlen, unsigned char *key, size_t keylen, @@ -94,7 +96,10 @@ int ret, iterations; mbedtls_asn1_buf salt; size_t i; - unsigned char unipwd[258]; + unsigned char unipwd[PKCS12_MAX_PWDLEN * 2 + 2]; + + if( pwdlen > PKCS12_MAX_PWDLEN ) + return( MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA ); memset( &salt, 0, sizeof(mbedtls_asn1_buf) ); memset( &unipwd, 0, sizeof(unipwd) ); @@ -124,6 +129,8 @@ } return( 0 ); } + +#undef PKCS12_MAX_PWDLEN int mbedtls_pkcs12_pbe_sha1_rc4_128( mbedtls_asn1_buf *pbe_params, int mode, const unsigned char *pwd, size_t pwdlen, Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -60,6 +60,7 @@ size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; size_t hostname_len; *olen = 0; @@ -71,6 +72,12 @@ ssl->hostname ) ); hostname_len = strlen( ssl->hostname ); + + if( end < p || (size_t)( end - p ) < hostname_len + 9 ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "buffer too small" ) ); + return; + } /* * struct { @@ -115,6 +122,7 @@ size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; *olen = 0; @@ -122,6 +130,12 @@ return; MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding renegotiation extension" ) ); + + if( end verify_data_len ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "buffer too small" ) ); + return; + } /* * Secure renegotiation @@ -149,6 +163,7 @@ size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; size_t sig_alg_len = 0; const int *md; #if defined(MBEDTLS_RSA_C) || defined(MBEDTLS_ECDSA_C) @@ -162,9 +177,27 @@ MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding signature_algorithms extension" ) ); + for( md = ssl->conf->sig_hashes; *md != MBEDTLS_MD_NONE; md++ ) + { +#if defined(MBEDTLS_ECDSA_C) + sig_alg_len += 2; +#endif +#if defined(MBEDTLS_RSA_C) + sig_alg_len += 2; +#endif + } + + if( end < p || (size_t)( end - p ) < sig_alg_len + 6 ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "buffer too small" ) ); + return; + } + /* * Prepare signature_algorithms extension (TLS 1.2) */ + sig_alg_len = 0; + for( md = ssl->conf->sig_hashes; *md != MBEDTLS_MD_NONE; md++ ) { #if defined(MBEDTLS_ECDSA_C) @@ -214,6 +247,7 @@ size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; unsigned char *elliptic_curve_list = p + 6; size_t elliptic_curve_len = 0; const mbedtls_ecp_curve_info *info; @@ -235,6 +269,25 @@ for( info = mbedtls_ecp_curve_list(); info->grp_id != MBEDTLS_ECP_DP_NONE; info++ ) { #endif + elliptic_curve_len += 2; + } + + if( end conf->curve_list; *grp_id != MBEDTLS_ECP_DP_NONE; grp_id++ ) + { + info = mbedtls_ecp_curve_info_from_grp_id( *grp_id ); +#else + for( info = mbedtls_ecp_curve_list(); info->grp_id != MBEDTLS_ECP_DP_NONE; info++ ) + { +#endif elliptic_curve_list[elliptic_curve_len++] = info->tls_id >> 8; elliptic_curve_list[elliptic_curve_len++] = info->tls_id & 0xFF; @@ -260,11 +313,17 @@ size_t *olen ) { unsigned char *p = buf; - ((void) ssl); + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; *olen = 0; MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding supported_point_formats extension" ) ); + + if( end > 8 ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS ) & 0xFF ); @@ -285,13 +344,21 @@ size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; + + *olen = 0; if( ssl->conf->mfl_code == MBEDTLS_SSL_MAX_FRAG_LEN_NONE ) { - *olen = 0; return; } MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding max_fragment_length extension" ) ); + + if( end > 8 ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH ) & 0xFF ); @@ -310,14 +377,22 @@ unsigned char *buf, size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; + + *olen = 0; if( ssl->conf->trunc_hmac == MBEDTLS_SSL_TRUNC_HMAC_DISABLED ) { - *olen = 0; return; } MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding truncated_hmac extension" ) ); + + if( end > 8 ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_TRUNCATED_HMAC ) & 0xFF ); @@ -334,16 +409,24 @@ unsigned char *buf, size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; + + *olen = 0; if( ssl->conf->encrypt_then_mac == MBEDTLS_SSL_ETM_DISABLED || ssl->conf->max_minor_ver == MBEDTLS_SSL_MINOR_VERSION_0 ) { - *olen = 0; return; } MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding encrypt_then_mac " "extension" ) ); + + if( end > 8 ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC ) & 0xFF ); @@ -360,16 +443,24 @@ unsigned char *buf, size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; + + *olen = 0; if( ssl->conf->extended_ms == MBEDTLS_SSL_EXTENDED_MS_DISABLED || ssl->conf->max_minor_ver == MBEDTLS_SSL_MINOR_VERSION_0 ) { - *olen = 0; return; } MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding extended_master_secret " "extension" ) ); + + if( end > 8 ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET ) & 0xFF ); @@ -386,15 +477,23 @@ unsigned char *buf, size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; size_t tlen = ssl->session_negotiate->ticket_len; + *olen = 0; + if( ssl->conf->session_tickets == MBEDTLS_SSL_SESSION_TICKETS_DISABLED ) { - *olen = 0; return; } MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding session ticket extension" ) ); + + if( end > 8 ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SESSION_TICKET ) & 0xFF ); @@ -404,8 +503,7 @@ *olen = 4; - if( ssl->session_negotiate->ticket == NULL || - ssl->session_negotiate->ticket_len == 0 ) + if( ssl->session_negotiate->ticket == NULL || tlen == 0 ) { return; } @@ -423,15 +521,27 @@ unsigned char *buf, size_t *olen ) { unsigned char *p = buf; + const unsigned char *end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; + size_t alpnlen = 0; const char **cur; + *olen = 0; + if( ssl->conf->alpn_list == NULL ) { - *olen = 0; return; } MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding alpn extension" ) ); + + for( cur = ssl->conf->alpn_list; *cur != NULL; cur++ ) + alpnlen += (unsigned char)( strlen( *cur ) & 0xFF ) + 1; + + if( end > 8 ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_ALPN ) & 0xFF ); @@ -799,13 +909,13 @@ ext_len += olen; #endif +#if defined(MBEDTLS_SSL_ALPN) + ssl_write_alpn_ext( ssl, p + 2 + ext_len, &olen ); + ext_len += olen; +#endif + #if defined(MBEDTLS_SSL_SESSION_TICKETS) ssl_write_session_ticket_ext( ssl, p + 2 + ext_len, &olen ); - ext_len += olen; -#endif - -#if defined(MBEDTLS_SSL_ALPN) - ssl_write_alpn_ext( ssl, p + 2 + ext_len, &olen ); ext_len += olen; #endif Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_s… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -2351,6 +2351,7 @@ size_t dn_size, total_dn_size; /* excluding length bytes */ size_t ct_len, sa_len; /* including length bytes */ unsigned char *buf, *p; + const unsigned char * const end = ssl->out_msg + MBEDTLS_SSL_MAX_CONTENT_LEN; const mbedtls_x509_crt *crt; int authmode; @@ -2471,10 +2472,14 @@ total_dn_size = 0; while( crt != NULL && crt->version != 0 ) { - if( p - buf > 4096 ) + dn_size = crt->subject_raw.len; + + if( end subject_raw.len; + } + *p++ = (unsigned char)( dn_size >> 8 ); *p++ = (unsigned char)( dn_size ); memcpy( p, crt->subject_raw.p, dn_size ); Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_t… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -5707,7 +5707,9 @@ ( conf->psk_identity = mbedtls_calloc( 1, psk_identity_len ) ) == NULL ) { mbedtls_free( conf->psk ); + mbedtls_free( conf->psk_identity ); conf->psk = NULL; + conf->psk_identity = NULL; return( MBEDTLS_ERR_SSL_ALLOC_FAILED ); } @@ -5730,7 +5732,7 @@ return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); if( ssl->handshake->psk != NULL ) - mbedtls_free( ssl->conf->psk ); + mbedtls_free( ssl->handshake->psk ); if( ( ssl->handshake->psk = mbedtls_calloc( 1, psk_len ) ) == NULL ) { @@ -5831,6 +5833,9 @@ hostname_len = strlen( hostname ); if( hostname_len + 1 == 0 ) + return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); + + if( hostname_len > MBEDTLS_SSL_MAX_HOST_NAME_LEN ) return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); ssl->hostname = mbedtls_calloc( 1, hostname_len + 1 ); @@ -6993,7 +6998,7 @@ #endif /* - * Load default in mbetls_ssl_config + * Load default in mbedtls_ssl_config */ int mbedtls_ssl_config_defaults( mbedtls_ssl_config *conf, int endpoint, int transport, int preset ) Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Mon Oct 12 12:47:42 2015 @@ -79,7 +79,7 @@ Website: http://www.ijg.org/ Title: mbed TLS -Used Version: 2.1.1 +Used Version: 2.1.2 Website: https://tls.mbed.org/ Title: libpng

9 years, 2 months

[akhaldi] 69511: [EXT2_NEW] Addendum to r69509. CORE-10272 CR-82

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 12 11:16:25 2015 New Revision: 69511 URL: http://svn.reactos.org/svn/reactos?rev=69511&view=rev Log: [EXT2_NEW] Addendum to r69509. CORE-10272 CR-82 Added: trunk/reactos/drivers/filesystems/ext2_new/ext2fs_reg.inf (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/asm/ (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/asm/page.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/asm/semaphore.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/asm/uaccess.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/buffer_head.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/debugfs.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/freezer.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/highmem.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/init.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/kernel.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/kthread.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/lockdep.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/magic.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/mm.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/mutex.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/nls.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/pagemap.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/poison.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/proc_fs.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/sched.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/slab.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/spinlock.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/string.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/time.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/timer.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/version.h (with props) Modified: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/types.h Added: trunk/reactos/drivers/filesystems/ext2_new/ext2fs_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2_new/ext2fs_reg.inf (added) +++ trunk/reactos/drivers/filesystems/ext2_new/ext2fs_reg.inf [iso-8859-1] Mon Oct 12 11:16:25 2015 @@ -0,0 +1,12 @@ +; ext2/3/4 filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2fs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","CodePage",0x00000000,"default" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","WritingSupport",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","CheckingBitmap",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","Ext3ForceWriting",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","AutoMount",0x00010001,0x00000001 Propchange: trunk/reactos/drivers/filesystems/ext2_new/ext2fs_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Oct 12 11:16:25 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/page.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/page.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/semaphore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/semaphore.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/uaccess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/asm/uaccess.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/buffer_head.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/buffer_head.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/debugfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/debugfs.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/freezer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/freezer.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/highmem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/highmem.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/init.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/init.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/kernel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/kernel.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/kthread.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/kthread.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/lockdep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/lockdep.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/magic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/magic.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/mm.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/mutex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/mutex.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/nls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/nls.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/pagemap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/pagemap.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/poison.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/poison.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/proc_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/proc_fs.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/sched.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/sched.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/slab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/slab.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/spinlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/spinlock.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/string.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/time.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/timer.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2_new/inc/linux/types.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2_new/inc/linux/types.h [iso-8859-1] Mon Oct 12 11:16:25 2015 @@ -46,7 +46,8 @@ // gcc special keyworks // #if defined(_MSC_VER) || !defined(__REACTOS__) - #define __attribute__(x) +/* FIXME: Inspect why this is needed */ +#define __attribute__(x) #endif #define __bitwise #define __releases(x) Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… ============================================================================== (empty) Propchange: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/version.h ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 2 months

[tfaber] 69510: [BROWSEUI] - Increase height of the animation control in the file operation progress dialog to avoid cut-off. Patch by Jared Smudde. CORE-10326 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 12 10:55:16 2015 New Revision: 69510 URL: http://svn.reactos.org/svn/reactos?rev=69510&view=rev Log: [BROWSEUI] - Increase height of the animation control in the file operation progress dialog to avoid cut-off. Patch by Jared Smudde. CORE-10326 #resolve Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/browseui/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -95,7 +95,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -113,7 +113,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -113,7 +113,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -96,7 +96,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -97,7 +97,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -95,7 +95,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -103,7 +103,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -97,7 +97,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -97,7 +97,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -114,7 +114,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -95,7 +95,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -97,7 +97,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX Modified: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Mon Oct 12 10:55:16 2015 @@ -115,7 +115,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX

9 years, 2 months

[akhaldi] 69509: [EXT2_NEW] Add Matt Wu's ext2 filesystem driver. Not enabled by default just yet. Brought to you by Peter Hater with reviews and improvements by Thomas Faber and Pierre Schweitzer....

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 12 10:19:10 2015 New Revision: 69509 URL: http://svn.reactos.org/svn/reactos?rev=69509&view=rev Log: [EXT2_NEW] Add Matt Wu's ext2 filesystem driver. Not enabled by default just yet. Brought to you by Peter Hater with reviews and improvements by Thomas Faber and Pierre Schweitzer. CORE-10272 CR-82 Added: trunk/reactos/drivers/filesystems/ext2_new/ (with props) trunk/reactos/drivers/filesystems/ext2_new/CMakeLists.txt (with props) trunk/reactos/drivers/filesystems/ext2_new/ext2fs.rc (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/ (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/common.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/ext2fs.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/Ext2_fs.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/atomic.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/bit_spinlock.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/bitops.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/config.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/errno.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext3_fs.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext3_fs_i.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext3_fs_sb.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext3_jbd.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext4.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext4_ext.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext4_jbd2.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/fs.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/group.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/jbd.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/journal-head.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/list.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/log2.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/module.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/rbtree.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/stddef.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/linux/types.h (with props) trunk/reactos/drivers/filesystems/ext2_new/inc/resource.h (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ (with props) trunk/reactos/drivers/filesystems/ext2_new/src/block.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/cleanup.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/close.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/cmcb.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/create.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/debug.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/devctl.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/dirctl.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/dispatch.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/except.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext2.rc (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext3/ (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext3/generic.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext3/htree.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext3/indirect.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext3/recover.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext4/ (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext4/ext4_bh.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext4/ext4_extents.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext4/ext4_jbd2.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/ext4/extents.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/fastio.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/fileinfo.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/flush.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/fsctl.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/init.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/jbd/ (with props) trunk/reactos/drivers/filesystems/ext2_new/src/jbd/recovery.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/jbd/replay.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/jbd/revoke.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/linux.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/lock.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/memory.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/misc.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/ (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_ascii.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_base.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp1250.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp1251.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp1255.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp437.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp737.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp775.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp850.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp852.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp855.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp857.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp860.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp861.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp862.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp863.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp864.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp865.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp866.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp869.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp874.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp932.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp936.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp949.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp950.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_euc-jp.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-1.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-13.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-14.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-15.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-2.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-3.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-4.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-5.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-6.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-7.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-9.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_koi8-r.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_koi8-ru.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_koi8-u.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_utf8.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/pnp.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/rbtree.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/read.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/shutdown.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/volinfo.c (with props) trunk/reactos/drivers/filesystems/ext2_new/src/write.c (with props) Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/CMakeL… Added: trunk/reactos/drivers/filesystems/ext2_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/ext2fs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/ext2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/Ext2_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/atomic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/bit_spinlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/bitops.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext3_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext3_fs_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext3_fs_sb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext3_jbd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext4_ext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/ext4_jbd2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/group.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/jbd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/journal-head.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/log2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/module.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/linux/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/inc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/block.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/cmcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/devctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext3/generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext3/htree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext3/indirect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext3/recover.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext4/ext4_bh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext4/ext4_extents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext4/ext4_jbd2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/ext4/extents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/jbd/recovery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/jbd/replay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/jbd/revoke.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_ascii.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp1250.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp1251.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp1255.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp437.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp737.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp775.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp850.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp852.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp855.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp857.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp860.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp861.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp862.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp863.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp864.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp865.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp869.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp874.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp932.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp936.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp949.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_cp950.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_euc-jp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-13.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-14.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-15.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-6.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-7.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_iso8859-9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_koi8-r.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_koi8-ru.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_koi8-u.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/nls/nls_utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/rbtree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n… Added: trunk/reactos/drivers/filesystems/ext2_new/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2_n…

9 years, 2 months

[tfaber] 69508: [EXPLORER] - Correct tray icon image list handling. Patch by Joachim Henze CORE-10257 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 12 10:05:39 2015 New Revision: 69508 URL: http://svn.reactos.org/svn/reactos?rev=69508&view=rev Log: [EXPLORER] - Correct tray icon image list handling. Patch by Joachim Henze CORE-10257 #resolve Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Mon Oct 12 10:05:39 2015 @@ -163,14 +163,8 @@ if (iconData->uFlags & NIF_ICON) { - TBBUTTONINFO tbbiOld = { 0 }; - tbbiOld.cbSize = sizeof(tbbiOld); - tbbiOld.dwMask = TBIF_BYINDEX | TBIF_IMAGE; - - GetButtonInfo(index, &tbbiOld); - tbbi.dwMask |= TBIF_IMAGE; - tbbi.iImage = ImageList_ReplaceIcon(m_ImageList, tbbiOld.iImage, iconData->hIcon); + tbbi.iImage = ImageList_ReplaceIcon(m_ImageList, index, iconData->hIcon); } if (iconData->uFlags & NIF_TIP) @@ -215,22 +209,28 @@ if (index < 0) return FALSE; - TBBUTTONINFO tbbiOld = { 0 }; - tbbiOld.cbSize = sizeof(tbbiOld); - tbbiOld.dwMask = TBIF_BYINDEX | TBIF_IMAGE; - - GetButtonInfo(index, &tbbiOld); - - ImageList_Remove(m_ImageList, tbbiOld.iImage); - - DeleteButton(index); - if (!(notifyItem->dwState & NIS_HIDDEN)) { m_VisibleButtonCount--; } delete notifyItem; + + ImageList_Remove(m_ImageList, index); + + int count = GetButtonCount(); + + /* shift all buttons one index to the left -- starting one index right + from item to delete -- to preserve their correct icon and tip */ + for (int i = index; i < count - 1; i++) + { + notifyItem = GetItemData(i + 1); + SetItemData(i, notifyItem); + UpdateButton(notifyItem); + } + + /* Delete the right-most, now obsolete button */ + DeleteButton(count - 1); return TRUE; } @@ -322,7 +322,7 @@ LRESULT OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - + INT iBtn = HitTest(&pt); if (iBtn >= 0)

9 years, 2 months

← Newer
1
...
23
24
25
26
27
28
29
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2015