Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 64825: [NTFS] Bugfixing... Part 6/X: - Properly compute file name length. This makes directory enumeration return complete file/directory names. Note that it's also possible to enumer...
by pschweitzer＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: pschweitzer Date: Sun Oct 19 16:29:38 2014 New Revision: 64825 URL: http://svn.reactos.org/svn/reactos?rev=64825&view=rev Log: [NTFS] Bugfixing... Part 6/X: - Properly compute file name length. This makes directory enumeration return complete file/directory names. Note that it's also possible to enumerate the files in open dialog of notepad (for instance :-)) Opening a subdirectory/file is broken though. To be investigated. Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Oct 19 16:29:38 2014 @@ -138,7 +138,7 @@ FileName = GetFileNameFromRecord(FileRecord); ASSERT(FileName != NULL); - Length = FileName->NameLength; + Length = FileName->NameLength * sizeof (WCHAR); if ((sizeof(FILE_NAMES_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); @@ -166,7 +166,7 @@ FileName = GetFileNameFromRecord(FileRecord); ASSERT(FileName != NULL); - Length = FileName->NameLength; + Length = FileName->NameLength * sizeof (WCHAR); if ((sizeof(FILE_DIRECTORY_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); @@ -208,7 +208,7 @@ FileName = GetFileNameFromRecord(FileRecord); ASSERT(FileName != NULL); - Length = FileName->NameLength; + Length = FileName->NameLength * sizeof (WCHAR); if ((sizeof(FILE_FULL_DIRECTORY_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW); @@ -251,7 +251,7 @@ FileName = GetFileNameFromRecord(FileRecord); ASSERT(FileName != NULL); - Length = FileName->NameLength; + Length = FileName->NameLength * sizeof (WCHAR); if ((sizeof(FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) return(STATUS_BUFFER_OVERFLOW);

1 0

[aandrejevic] 64824: [FAST486] The r64823 patch was not properly merged.
by aandrejevic＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: aandrejevic Date: Sun Oct 19 15:02:37 2014 New Revision: 64824 URL: http://svn.reactos.org/svn/reactos?rev=64824&view=rev Log: [FAST486] The r64823 patch was not properly merged. Modified: trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sun Oct 19 15:02:37 2014 @@ -85,11 +85,8 @@ * Check if there is an interrupt to execute, or a hardware interrupt signal * while interrupts are enabled. */ - if (State->Flags.Tf) - { - /* No longer halted */ - State->Halted = FALSE; - + if (State->Flags.Tf && !State->Halted) + { /* Perform the interrupt */ Fast486PerformInterrupt(State, 0x01); @@ -104,6 +101,9 @@ } else if (State->IntStatus == FAST486_INT_EXECUTE) { + /* No longer halted */ + State->Halted = FALSE; + /* Perform the interrupt */ Fast486PerformInterrupt(State, State->PendingIntNum);

1 0

[aandrejevic] 64823: [FAST486] Implement the HLT instruction. Remove the IdleCallback, since it's unused and probably won't be used. (The load reduction will be implemented in NTVDM instead.)
by aandrejevic＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: aandrejevic Date: Sun Oct 19 14:46:02 2014 New Revision: 64823 URL: http://svn.reactos.org/svn/reactos?rev=64823&view=rev Log: [FAST486] Implement the HLT instruction. Remove the IdleCallback, since it's unused and probably won't be used. (The load reduction will be implemented in NTVDM instead.) Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c trunk/reactos/subsystems/ntvdm/cpu/cpu.c Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sun Oct 19 14:46:02 2014 @@ -205,13 +205,6 @@ PVOID Buffer, ULONG DataCount, UCHAR DataSize -); - -typedef -VOID -(NTAPI *FAST486_IDLE_PROC) -( - PFAST486_STATE State ); typedef @@ -474,7 +467,6 @@ FAST486_MEM_WRITE_PROC MemWriteCallback; FAST486_IO_READ_PROC IoReadCallback; FAST486_IO_WRITE_PROC IoWriteCallback; - FAST486_IDLE_PROC IdleCallback; FAST486_BOP_PROC BopCallback; FAST486_INT_ACK_PROC IntAckCallback; FAST486_REG GeneralRegs[FAST486_NUM_GEN_REGS]; @@ -490,6 +482,7 @@ ULONG ExceptionCount; ULONG PrefixFlags; FAST486_SEG_REGS SegmentOverride; + BOOLEAN Halted; FAST486_INT_STATUS IntStatus; UCHAR PendingIntNum; PULONG Tlb; @@ -510,7 +503,6 @@ FAST486_MEM_WRITE_PROC MemWriteCallback, FAST486_IO_READ_PROC IoReadCallback, FAST486_IO_WRITE_PROC IoWriteCallback, - FAST486_IDLE_PROC IdleCallback, FAST486_BOP_PROC BopCallback, FAST486_INT_ACK_PROC IntAckCallback, PULONG Tlb); Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sun Oct 19 14:46:02 2014 @@ -55,28 +55,31 @@ do { NextInst: - /* Check if this is a new instruction */ - if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; - - /* Perform an instruction fetch */ - if (!Fast486FetchByte(State, &Opcode)) - { - /* Exception occurred */ + if (!State->Halted) + { + /* Check if this is a new instruction */ + if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; + + /* Perform an instruction fetch */ + if (!Fast486FetchByte(State, &Opcode)) + { + /* Exception occurred */ + State->PrefixFlags = 0; + continue; + } + + // TODO: Check for CALL/RET to update ProcedureCallCount. + + /* Call the opcode handler */ + CurrentHandler = Fast486OpcodeHandlers[Opcode]; + CurrentHandler(State, Opcode); + + /* If this is a prefix, go to the next instruction immediately */ + if (CurrentHandler == Fast486OpcodePrefix) goto NextInst; + + /* A non-prefix opcode has been executed, reset the prefix flags */ State->PrefixFlags = 0; - continue; - } - - // TODO: Check for CALL/RET to update ProcedureCallCount. - - /* Call the opcode handler */ - CurrentHandler = Fast486OpcodeHandlers[Opcode]; - CurrentHandler(State, Opcode); - - /* If this is a prefix, go to the next instruction immediately */ - if (CurrentHandler == Fast486OpcodePrefix) goto NextInst; - - /* A non-prefix opcode has been executed, reset the prefix flags */ - State->PrefixFlags = 0; + } /* * Check if there is an interrupt to execute, or a hardware interrupt signal @@ -84,6 +87,9 @@ */ if (State->Flags.Tf) { + /* No longer halted */ + State->Halted = FALSE; + /* Perform the interrupt */ Fast486PerformInterrupt(State, 0x01); @@ -165,13 +171,6 @@ static VOID NTAPI -Fast486IdleCallback(PFAST486_STATE State) -{ - UNREFERENCED_PARAMETER(State); -} - -static VOID -NTAPI Fast486BopCallback(PFAST486_STATE State, UCHAR BopCode) { UNREFERENCED_PARAMETER(State); @@ -197,7 +196,6 @@ FAST486_MEM_WRITE_PROC MemWriteCallback, FAST486_IO_READ_PROC IoReadCallback, FAST486_IO_WRITE_PROC IoWriteCallback, - FAST486_IDLE_PROC IdleCallback, FAST486_BOP_PROC BopCallback, FAST486_INT_ACK_PROC IntAckCallback, PULONG Tlb) @@ -207,7 +205,6 @@ State->MemWriteCallback = (MemWriteCallback ? MemWriteCallback : Fast486MemWriteCallback); State->IoReadCallback = (IoReadCallback ? IoReadCallback : Fast486IoReadCallback ); State->IoWriteCallback = (IoWriteCallback ? IoWriteCallback : Fast486IoWriteCallback ); - State->IdleCallback = (IdleCallback ? IdleCallback : Fast486IdleCallback ); State->BopCallback = (BopCallback ? BopCallback : Fast486BopCallback ); State->IntAckCallback = (IntAckCallback ? IntAckCallback : Fast486IntAckCallback ); @@ -229,7 +226,6 @@ FAST486_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; FAST486_IO_READ_PROC IoReadCallback = State->IoReadCallback; FAST486_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; - FAST486_IDLE_PROC IdleCallback = State->IdleCallback; FAST486_BOP_PROC BopCallback = State->BopCallback; FAST486_INT_ACK_PROC IntAckCallback = State->IntAckCallback; PULONG Tlb = State->Tlb; @@ -283,7 +279,6 @@ State->MemWriteCallback = MemWriteCallback; State->IoReadCallback = IoReadCallback; State->IoWriteCallback = IoWriteCallback; - State->IdleCallback = IdleCallback; State->BopCallback = BopCallback; State->IntAckCallback = IntAckCallback; State->Tlb = Tlb; Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sun Oct 19 14:46:02 2014 @@ -574,12 +574,6 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeNop) { - if (State->PrefixFlags & FAST486_PREFIX_REP) - { - /* Idle cycle */ - State->IdleCallback(State); - } - return TRUE; } @@ -895,7 +889,7 @@ } /* Halt */ - // TODO: Halt the CPU until an interrupt occurs, using IdleCallback if needed. + State->Halted = TRUE; /* Return success */ return TRUE; Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/cpu.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] Sun Oct 19 14:46:02 2014 @@ -163,7 +163,6 @@ EmulatorWriteMemory, EmulatorReadIo, EmulatorWriteIo, - NULL, EmulatorBiosOperation, EmulatorIntAcknowledge, NULL /* TODO: Use a TLB */);

1 0

[tkreuzer] 64822: [USER32] Fix uninitialized variable use/warnings in - RegisterClassExWOWW (found by MSVC runtime checks) - IntDrawState (CID-514399) - IntCallWindowProcA (CID-514389) - IntCallWin...
by tkreuzer＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: tkreuzer Date: Sun Oct 19 13:17:49 2014 New Revision: 64822 URL: http://svn.reactos.org/svn/reactos?rev=64822&view=rev Log: [USER32] Fix uninitialized variable use/warnings in - RegisterClassExWOWW (found by MSVC runtime checks) - IntDrawState (CID-514399) - IntCallWindowProcA (CID-514389) - IntCallWindowProcW (CID-414390) - SendMessageA (CID-514392) - SendMessageW (CID-514393) - SendMessageTimeoutA (CID-514441) - SendMessageCallbackA (CID-514442) - SendNotifyMessageW (CID-514443) - SendNotifyMessageA (CID-514444) - User32CallWindowProcFromKernel (CID-514445) - DesktopWndProcA (CID-716765) Modified: trunk/reactos/win32ss/user/user32/windows/class.c trunk/reactos/win32ss/user/user32/windows/draw.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Sun Oct 19 13:17:49 2014 @@ -67,7 +67,7 @@ ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, &SectionName, &KeyedData ); - + if (NT_SUCCESS(Status) && KeyedData.ulDataFormatVersion == 1) { struct dll_redirect *dll = KeyedData.lpSectionBase; @@ -165,7 +165,7 @@ Error_Exit: if ( Ret || !hLibModule ) { - if ( phLibModule ) *phLibModule = hLibModule; + if ( phLibModule ) *phLibModule = hLibModule; } else { @@ -173,7 +173,7 @@ FreeLibrary(hLibModule); SetLastError(save_error); } - + return Ret; } @@ -269,7 +269,7 @@ Error_Exit: if ( Ret || !hLibModule ) { - if ( phLibModule ) *phLibModule = hLibModule; + if ( phLibModule ) *phLibModule = hLibModule; } else { @@ -1022,7 +1022,7 @@ { WCHAR tmpbuf[MAX_ATOM_LEN + 1]; int len; - + if (nMaxCount <= 0) return 0; if (!GetClassNameW( hWnd, tmpbuf, sizeof(tmpbuf)/sizeof(WCHAR) )) return 0; RtlUnicodeToMultiByteN( lpClassName, nMaxCount - 1, (PULONG)&len, tmpbuf, strlenW(tmpbuf) * sizeof(WCHAR) ); @@ -1256,7 +1256,7 @@ { WCHAR tmpbuf[MAX_ATOM_LEN + 1]; UINT len; - + if ((INT)cchType <= 0) return 0; if (!RealGetWindowClassW( hwnd, tmpbuf, sizeof(tmpbuf)/sizeof(WCHAR) )) return 0; RtlUnicodeToMultiByteN( pszType, cchType - 1, (PULONG)&len, tmpbuf, strlenW(tmpbuf) * sizeof(WCHAR) ); @@ -1472,6 +1472,7 @@ WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); } */ + RtlInitEmptyAnsiString(&AnsiMenuName, NULL, 0); if (WndClass.lpszMenuName != NULL) { if (!IS_INTRESOURCE(WndClass.lpszMenuName)) Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Sun Oct 19 13:17:49 2014 @@ -1272,6 +1272,10 @@ case DST_COMPLEX: /* cx and cy must be set in this mode */ return FALSE; + + default: + ERR("Invalid opcode: %u\n", opcode); + return FALSE; } if(!cx) @@ -1552,7 +1556,7 @@ /* Handle system colors */ if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1)) hbr = GetSysColorBrush(PtrToUlong(hbr) - 1); - + prevhbr = SelectObject(hDC, hbr); if (prevhbr == NULL) return (INT)FALSE; Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Sun Oct 19 13:17:49 2014 @@ -1357,6 +1357,9 @@ AnsiMsg.message = message; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; // Desktop is always Unicode so convert Ansi here. if (!MsgiAnsiToUnicodeMessage(hwnd, &UcMsg, &AnsiMsg)) @@ -1501,7 +1504,10 @@ UnicodeMsg.message = Msg; UnicodeMsg.wParam = wParam; UnicodeMsg.lParam = lParam; - if (! MsgiUnicodeToAnsiMessage(hWnd, &AnsiMsg, &UnicodeMsg)) + UnicodeMsg.time = 0; + UnicodeMsg.pt.x = 0; + UnicodeMsg.pt.y = 0; + if (! MsgiUnicodeToAnsiMessage(hWnd, &AnsiMsg, &UnicodeMsg)) { goto Exit; } @@ -1699,6 +1705,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (! MsgiAnsiToUnicodeMessage(hWnd, &UnicodeMsg, &AnsiMsg)) { goto Exit; @@ -2428,6 +2437,9 @@ UMMsg.message = Msg; UMMsg.wParam = wParam; UMMsg.lParam = lParam; + UMMsg.time = 0; + UMMsg.pt.x = 0; + UMMsg.pt.y = 0; if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, FALSE)) { @@ -2492,6 +2504,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (!MsgiAnsiToUnicodeMessage(Wnd, &UcMsg, &AnsiMsg)) { @@ -2548,6 +2563,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (!MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { @@ -2635,6 +2653,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (! MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { @@ -2728,6 +2749,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (! MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { return FALSE; @@ -2763,6 +2787,9 @@ UMMsg.message = Msg; UMMsg.wParam = wParam; UMMsg.lParam = lParam; + UMMsg.time = 0; + UMMsg.pt.x = 0; + UMMsg.pt.y = 0; if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) { return FALSE; @@ -2924,6 +2951,9 @@ KMMsg.hwnd = CallbackArgs->Wnd; KMMsg.message = CallbackArgs->Msg; KMMsg.wParam = CallbackArgs->wParam; + KMMsg.time = 0; + KMMsg.pt.x = 0; + KMMsg.pt.y = 0; /* Check if lParam is really a pointer and adjust it if it is */ if (0 <= CallbackArgs->lParamBufferSize) {

1 0

[tkreuzer] 64821: [CRT] Fix MSVC global constructor initialization.
by tkreuzer＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: tkreuzer Date: Sun Oct 19 10:27:22 2014 New Revision: 64821 URL: http://svn.reactos.org/svn/reactos?rev=64821&view=rev Log: [CRT] Fix MSVC global constructor initialization. Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sun Oct 19 10:27:22 2014 @@ -20,6 +20,12 @@ #error Unsupported platform #endif +/* + * Initializer / constructor handling + * see http://msdn.microsoft.com/en-us/library/bb918180.aspx + * Destructors are registered from the initializers using atexit() + */ + extern _PVFV __xi_a[]; extern _PVFV __xi_z[]; extern _PVFV __xc_a[]; @@ -34,7 +40,7 @@ _PVFV *current; for (current = start; current < end; current++) { - if (*current != NULL); + if (*current != NULL) (*current)(); } } @@ -47,12 +53,6 @@ { /* Nothing to do */ return 1; -} - -void -__do_global_dtors(void) -{ - } void

1 0

[hbelusca] 64820: Ok Arch, it's good to remove unuseful brackets, but don't exaggerate too much. Also check how the RtlInsertAsLeft/RightChild macros are defined. Since MS don't use the nice do { ....
by hbelusca＠svn.reactos.org 19 Oct '14

19 Oct '14

Author: hbelusca Date: Sun Oct 19 00:05:18 2014 New Revision: 64820 URL: http://svn.reactos.org/svn/reactos?rev=64820&view=rev Log: Ok Arch, it's good to remove unuseful brackets, but don't exaggerate too much. Also check how the RtlInsertAsLeft/RightChild macros are defined. Since MS don't use the nice do { ... } while(0) for them, you cannot just use the if (blah) foo(); else bar(); to do the job, but you need the extra-brackets. And you cannot just change the macros definitions to not "break" headers compatibility (or... idiocies). Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=64… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Sun Oct 19 00:05:18 2014 @@ -22,17 +22,25 @@ FixupChildLinks(PRTL_SPLAY_LINKS Links, BOOLEAN Root, BOOLEAN LeftChild) { if (RtlLeftChild(Links)) + { RtlInsertAsLeftChild(Links, RtlLeftChild(Links)); + } if (RtlRightChild(Links)) + { RtlInsertAsRightChild(Links, RtlRightChild(Links)); + } if (!Root) { if (LeftChild) + { RtlInsertAsLeftChild(RtlParent(Links), Links); + } else + { RtlInsertAsRightChild(RtlParent(Links), Links); + } } } @@ -86,15 +94,23 @@ if (!RootA) { if (LeftA) + { RtlInsertAsLeftChild(RtlParent(&Ta), LinkB); + } else + { RtlInsertAsRightChild(RtlParent(&Ta), LinkB); + } } if (LeftB) + { RtlInsertAsLeftChild(LinkB, LinkA); + } else + { RtlInsertAsRightChild(LinkB, LinkA); + } } FixupChildLinks(LinkA, FALSE, LeftB);

1 0

[hbelusca] 64819: Fix whitespace, and get rid of that sh*tty K&R style.
by hbelusca＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: hbelusca Date: Sat Oct 18 23:59:25 2014 New Revision: 64819 URL: http://svn.reactos.org/svn/reactos?rev=64819&view=rev Log: Fix whitespace, and get rid of that sh*tty K&R style. Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=64… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Sat Oct 18 23:59:25 2014 @@ -21,18 +21,18 @@ VOID FixupChildLinks(PRTL_SPLAY_LINKS Links, BOOLEAN Root, BOOLEAN LeftChild) { - if (RtlLeftChild(Links)) { + if (RtlLeftChild(Links)) RtlInsertAsLeftChild(Links, RtlLeftChild(Links)); - } - if (RtlRightChild(Links)) { + + if (RtlRightChild(Links)) RtlInsertAsRightChild(Links, RtlRightChild(Links)); - } - if (!Root) { - if (LeftChild) { + + if (!Root) + { + if (LeftChild) RtlInsertAsLeftChild(RtlParent(Links), Links); - } else { + else RtlInsertAsRightChild(RtlParent(Links), Links); - } } } @@ -57,14 +57,16 @@ Set Q's parent to S, and the proper child ptr of S to Q When Q is the root, Set S's parent to S - */ + +*/ static VOID SwapSplayLinks(PRTL_SPLAY_LINKS LinkA, PRTL_SPLAY_LINKS LinkB) { - if (RtlParent(LinkA) == LinkB || RtlIsRoot(LinkB)) { + if (RtlParent(LinkA) == LinkB || RtlIsRoot(LinkB)) + { PRTL_SPLAY_LINKS Tmp = LinkA; LinkA = LinkB; LinkB = Tmp; @@ -72,25 +74,27 @@ { RTL_SPLAY_LINKS Ta = *LinkA, Tb = *LinkB; - BOOLEAN RootA = RtlIsRoot(LinkA), - LeftA = RtlIsLeftChild(LinkA), - LeftB = RtlIsLeftChild(LinkB); + BOOLEAN RootA = RtlIsRoot(LinkA), + LeftA = RtlIsLeftChild(LinkA), + LeftB = RtlIsLeftChild(LinkB); + *LinkB = Ta; *LinkA = Tb; // A was parent of B is a special case: A->Parent is now B - if (RtlParent(&Tb) == LinkA) { - if (!RootA) { - if (LeftA) { + if (RtlParent(&Tb) == LinkA) + { + if (!RootA) + { + if (LeftA) RtlInsertAsLeftChild(RtlParent(&Ta), LinkB); - } else { + else RtlInsertAsRightChild(RtlParent(&Ta), LinkB); - } - } - if (LeftB) { + } + + if (LeftB) RtlInsertAsLeftChild(LinkB, LinkA); - } else { + else RtlInsertAsRightChild(LinkB, LinkA); - } } FixupChildLinks(LinkA, FALSE, LeftB); @@ -102,8 +106,10 @@ #ifdef VERIFY_SWAP_SPLAY_LINKS // Verify the distinct cases of node swap - if (RootA) { - if (RtlParent(&Tb) == LinkA) { + if (RootA) + { + if (RtlParent(&Tb) == LinkA) + { // LinkA = D, LinkB = B // D B S S.L S.R S Q Q.R ASSERT(RtlParent(LinkA) == LinkB); @@ -112,7 +118,9 @@ ASSERT(RtlParent(LinkB) == LinkB); ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); - } else { + } + else + { // LinkA = D, LinkB = A // D A S.P S.L S.R S Q.L Q.R ASSERT(RtlParent(LinkA) == RtlParent(&Tb)); @@ -122,8 +130,11 @@ ASSERT(RtlLeftChild(LinkB) == RtlLeftChild(&Ta)); ASSERT(RtlRightChild(LinkB) == RtlRightChild(&Ta)); } - } else { - if (RtlParent(&Tb) == LinkA) { + } + else + { + if (RtlParent(&Tb) == LinkA) + { // LinkA = B, LinkB = A // B A S S.L S.R Q.P Q Q.R ASSERT(RtlParent(LinkA) == LinkB); @@ -132,7 +143,9 @@ ASSERT(RtlParent(LinkB) == RtlParent(&Ta)); ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); - } else { + } + else + { // LinkA = A, LinkB = C // A C S.P S.L S.R Q.P Q.L Q.R ASSERT(!memcmp(LinkA, &Tb, sizeof(Tb))); @@ -323,8 +336,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlRealPredecessor(PRTL_SPLAY_LINKS Links) @@ -352,8 +365,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlRealSuccessor(PRTL_SPLAY_LINKS Links) @@ -381,8 +394,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlSplay(PRTL_SPLAY_LINKS Links) @@ -725,8 +738,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlSubtreePredecessor(IN PRTL_SPLAY_LINKS Links) @@ -745,8 +758,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlSubtreeSuccessor(IN PRTL_SPLAY_LINKS Links)

1 0

[hbelusca] 64818: [RTL] Implement RtlDeleteNoSplay which is really just a copy/paste of RtlDelete, but without splaying the tree after deletion of the node. Needed by the filter driver fltmgr.sys. ...
by hbelusca＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: hbelusca Date: Sat Oct 18 23:51:35 2014 New Revision: 64818 URL: http://svn.reactos.org/svn/reactos?rev=64818&view=rev Log: [RTL] Implement RtlDeleteNoSplay which is really just a copy/paste of RtlDelete, but without splaying the tree after deletion of the node. Needed by the filter driver fltmgr.sys. Dedicated to Mr. V ;) Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=64… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Sat Oct 18 23:51:35 2014 @@ -154,17 +154,17 @@ N = Links; /* Check if we have two children */ - if ((RtlLeftChild(N)) && (RtlRightChild(N))) + if (RtlLeftChild(N) && RtlRightChild(N)) { /* Get the predecessor */ SP = RtlSubtreePredecessor(N); - /* Swap it with N, this will guarantee that N will have only a child */ + /* Swap it with N, this will guarantee that N will only have a child */ SwapSplayLinks(SP, N); } /* Check if we have no children */ - if (!(RtlLeftChild(N)) && !(RtlRightChild(N))) + if (!RtlLeftChild(N) && !RtlRightChild(N)) { /* If we are also the root, then the tree is gone */ if (RtlIsRoot(N)) return NULL; @@ -176,12 +176,12 @@ if (RtlIsLeftChild(N)) { /* N was a left child, so erase its parent's left child link */ - RtlLeftChild(RtlParent(N)) = NULL; + RtlLeftChild(P) = NULL; } else { /* N was a right child, so erase its parent's right child link */ - RtlRightChild(RtlParent(N)) = NULL; + RtlRightChild(P) = NULL; } /* And finally splay the parent */ @@ -196,44 +196,130 @@ } else { - /* We have a right child, get him instead */ + /* We have a right child, get it instead */ C = RtlRightChild(N); } /* Check if we are the root entry */ if (RtlIsRoot(N)) { - /* Our child is now root, return him */ - C->Parent = C; + /* Our child is now root, return it */ + RtlParent(C) = C; return C; } + + /* Get our parent */ + P = RtlParent(N); /* Find out who is referencing us and link to our child instead */ if (RtlIsLeftChild(N)) { /* N was a left child, so set its parent's left child as our child */ - RtlLeftChild(RtlParent(N)) = C; + RtlLeftChild(P) = C; } else { /* N was a right child, so set its parent's right child as our child */ - RtlRightChild(RtlParent(N)) = C; + RtlRightChild(P) = C; } /* Finally, inherit our parent and splay the parent */ - C->Parent = N->Parent; - return RtlSplay(RtlParent(C)); -} - -/* -* @unimplemented -*/ + RtlParent(C) = P; + return RtlSplay(P); +} + +/* + * @implemented + */ VOID NTAPI RtlDeleteNoSplay(PRTL_SPLAY_LINKS Links, PRTL_SPLAY_LINKS *Root) { - UNIMPLEMENTED; + PRTL_SPLAY_LINKS N, P, C, SP; + N = Links; + + /* Check if we have two children */ + if (RtlLeftChild(N) && RtlRightChild(N)) + { + /* Get the predecessor */ + SP = RtlSubtreePredecessor(N); + + /* If we are the root, the new root will be our predecessor after swapping */ + if (RtlIsRoot(N)) *Root = SP; + + /* Swap the predecessor with N, this will guarantee that N will only have a child */ + SwapSplayLinks(SP, N); + } + + /* Check if we have no children */ + if (!RtlLeftChild(N) && !RtlRightChild(N)) + { + /* If we are also the root, then the tree is gone */ + if (RtlIsRoot(N)) + { + *Root = NULL; + return; + } + + /* Get our parent */ + P = RtlParent(N); + + /* Find out who is referencing us and delete the reference */ + if (RtlIsLeftChild(N)) + { + /* N was a left child, so erase its parent's left child link */ + RtlLeftChild(P) = NULL; + } + else + { + /* N was a right child, so erase its parent's right child link */ + RtlRightChild(P) = NULL; + } + + /* We are done */ + return; + } + + /* If we got here, we have a child (not two: we swapped above!) */ + if (RtlLeftChild(N)) + { + /* We have a left child, so get it */ + C = RtlLeftChild(N); + } + else + { + /* We have a right child, get it instead */ + C = RtlRightChild(N); + } + + /* Check if we are the root entry */ + if (RtlIsRoot(N)) + { + /* Our child is now root, return it */ + RtlParent(C) = C; + *Root = C; + return; + } + + /* Get our parent */ + P = RtlParent(N); + + /* Find out who is referencing us and link to our child instead */ + if (RtlIsLeftChild(N)) + { + /* N was a left child, so set its parent's left child as our child */ + RtlLeftChild(P) = C; + } + else + { + /* N was a right child, so set its parent's right child as our child */ + RtlRightChild(P) = C; + } + + /* Finally, inherit our parent and we are done */ + RtlParent(C) = P; + return; } /*

1 0

[tkreuzer] 64817: [CRT] Implement __do_global_ctors for MSVC
by tkreuzer＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: tkreuzer Date: Sat Oct 18 21:38:07 2014 New Revision: 64817 URL: http://svn.reactos.org/svn/reactos?rev=64817&view=rev Log: [CRT] Implement __do_global_ctors for MSVC Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sat Oct 18 21:38:07 2014 @@ -10,6 +10,7 @@ #include <stdarg.h> #include <rtcapi.h> #include <assert.h> +#include <internal.h> #if defined(_M_IX86) #pragma comment(linker, "/alternatename:__RTC_Initialize=__RTC_NoInitialize") @@ -18,6 +19,25 @@ #else #error Unsupported platform #endif + +extern _PVFV __xi_a[]; +extern _PVFV __xi_z[]; +extern _PVFV __xc_a[]; +extern _PVFV __xc_z[]; + +static +void +__do_xtors( + _PVFV *start, + _PVFV *end) +{ + _PVFV *current; + for (current = start; current < end; current++) + { + if (*current != NULL); + (*current)(); + } +} void _pei386_runtime_relocator(void) { @@ -38,7 +58,8 @@ void __do_global_ctors(void) { - + __do_xtors(__xi_a, __xi_z); + __do_xtors(__xc_a, __xc_z); } BOOL

1 0

[tkreuzer] 64816: [RunTmChk] - Implement _RTC_GetErrDesc, _RTC_SetErrorFuncW, add stubs for _RTC_NumErrors, _RTC_SetErrorType, _RTC_SetErrorFunc - Implement _RTC_DefaultErrorFuncW which will be use...
by tkreuzer＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: tkreuzer Date: Sat Oct 18 21:22:52 2014 New Revision: 64816 URL: http://svn.reactos.org/svn/reactos?rev=64816&view=rev Log: [RunTmChk] - Implement _RTC_GetErrDesc, _RTC_SetErrorFuncW, add stubs for _RTC_NumErrors, _RTC_SetErrorType, _RTC_SetErrorFunc - Implement _RTC_DefaultErrorFuncW which will be used, when no other error func was set - Implement _RTC_InitBase, which will be called from _RTC_Initialize, and which in turn calls either _CRT_RTC_INITW, if CRT was linked, or a local _CRT_RTC_INITW0, which in turn will return the error function to use. This allows us to use a custom error function for all modules that link to (MSV)CRT. Only user32 does not really fit into here, since it uses the same startup code but does not link to MSVCRT. [CRT] - Call _RTC_Initialize from __main before initializing the global constructors, but fall back to a dummy _RTC_NoInitialize(), when RunTmChk.lib was not linked. Now we properly initialize both our own as well as MS RunTmChk lib. Added: trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c (with props) Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt trunk/reactos/lib/sdk/runtmchk/rtcapi.c Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sat Oct 18 21:22:52 2014 @@ -6,6 +6,18 @@ #include <windows.h> #include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <rtcapi.h> +#include <assert.h> + +#if defined(_M_IX86) +#pragma comment(linker, "/alternatename:__RTC_Initialize=__RTC_NoInitialize") +#elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) +#pragma comment(linker, "/alternatename:_RTC_Initialize=_RTC_NoInitialize") +#else +#error Unsupported platform +#endif void _pei386_runtime_relocator(void) { @@ -36,16 +48,39 @@ return TRUE; } -void Catch_RTC_Failure(int errType, const wchar_t *file, int line, - const wchar_t *module, const wchar_t *format, ...) +int +__cdecl +Catch_RTC_Failure( + int errType, + const wchar_t *file, + int line, + const wchar_t *module, + const wchar_t *format, + ...) { /* FIXME: better failure routine */ __debugbreak(); + return 0; } -void* __cdecl _CRT_RTC_INITW(void *res0, void **res1, int res2, int res3, int res4) +extern +void +__cdecl +_RTC_NoInitialize(void) { - return &Catch_RTC_Failure; + /* Do nothing, if RunTmChk.lib is not pulled in */ +} + +_RTC_error_fnW +__cdecl +_CRT_RTC_INITW( + void *_Res0, + void **_Res1, + int _Res2, + int _Res3, + int _Res4) +{ + return &Catch_RTC_Failure; } static int initialized = 0; @@ -56,6 +91,9 @@ if (!initialized) { initialized = 1; + + _RTC_Initialize(); + __do_global_ctors (); } } Modified: trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/runtmchk/CMakeList… ============================================================================== --- trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt [iso-8859-1] Sat Oct 18 21:22:52 2014 @@ -1,5 +1,8 @@ -list(APPEND SOURCE rtcapi.c) +list(APPEND SOURCE + rtcapi.c + rtcuserapi.c +) if(ARCH STREQUAL "i386") list(APPEND ASM_SOURCE i386/_RTC_CheckEsp.S) Modified: trunk/reactos/lib/sdk/runtmchk/rtcapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/runtmchk/rtcapi.c?… ============================================================================== --- trunk/reactos/lib/sdk/runtmchk/rtcapi.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/runtmchk/rtcapi.c [iso-8859-1] Sat Oct 18 21:22:52 2014 @@ -7,21 +7,76 @@ #include <rtcapi.h> -unsigned long -__cdecl -DbgPrint( - const char *fmt, ...); - -void +#if defined(_M_IX86) +#pragma comment(linker, "/alternatename:__CRT_RTC_INITW=__CRT_RTC_INITW0") +#elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) +#pragma comment(linker, "/alternatename:_CRT_RTC_INITW=_CRT_RTC_INITW0") +#else +#error Unsupported platform +#endif + +int +__cdecl +_RTC_DefaultErrorFuncW( + int errType, + const wchar_t *file, + int line, + const wchar_t *module, + const wchar_t *format, + ...) +{ + /* Simple fallback function */ + __debugbreak(); + return 0; +} + +_RTC_error_fnW _RTC_pErrorFuncW = _RTC_DefaultErrorFuncW; + +/* + Default CRT RTC init, if we don't link to CRT +*/ +_RTC_error_fnW +__cdecl +_CRT_RTC_INITW0( + void *_Res0, + void **_Res1, + int _Res2, + int _Res3, + int _Res4) +{ + return &_RTC_DefaultErrorFuncW; +} + +void +__cdecl _RTC_InitBase(void) { + static char initialized = 0; + _RTC_error_fnW errorFunc; + + if (!initialized) + { + errorFunc = _CRT_RTC_INITW(0, 0, 0, 1, 0); + _RTC_SetErrorFuncW(errorFunc); + initialized = 1; + } +} + +void +__cdecl +_RTC_Shutdown(void) +{ __debugbreak(); } void -_RTC_Shutdown(void) -{ - __debugbreak(); +__cdecl +_RTC_Initialize(void) +{ + /* Usually this function would walk an array of function pointers and call + each of these, like done with global ctors, but since these are currently + only _RTC_InitBase, we simply call that function once. */ + _RTC_InitBase(); } void @@ -30,7 +85,13 @@ void* retaddr, int errnum) { - __debugbreak(); + _RTC_pErrorFuncW(errnum, + L"unknown file", + -1, + L"unknown module", + L"Invalid stack pointer value caught at %p, error %d\n", + retaddr, + errnum); } void @@ -38,7 +99,12 @@ _RTC_UninitUse( const char *_Varname) { - __debugbreak(); + _RTC_pErrorFuncW(_RTC_UNINIT_LOCAL_USE, + L"unknown file", + -1, + L"unknown module", + L"Use of uninitialized variable %S!\n", + _Varname); } void @@ -59,7 +125,12 @@ /* Check if they contain the guard bytes */ if ((*guard1 != 0xCCCCCCCC) || (*guard2 != 0xCCCCCCCC)) { - __debugbreak(); + _RTC_pErrorFuncW(_RTC_CORRUPT_STACK, + L"unknown file", + -1, + L"unknown module", + L"Stack corruption near '%s'\n", + _Fd->variables[i].name); } } } @@ -90,7 +161,11 @@ (current->guard2[2] != 0xCCCCCCCC) || (*guard != 0xCCCCCCCC)) { - __debugbreak(); + _RTC_pErrorFuncW(_RTC_CORRUPTED_ALLOCA, + L"unknown file", + -1, + L"unknown module", + L"Stack corruption in alloca frame\n"); } } } @@ -124,3 +199,4 @@ *_PAllocaInfoList = _PAllocaBase; } } + Added: trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/runtmchk/rtcuserap… ============================================================================== --- trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c (added) +++ trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c [iso-8859-1] Sat Oct 18 21:22:52 2014 @@ -0,0 +1,91 @@ +/* + * PROJECT: MSVC runtime check support library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Provides support functions for MSVC runtime checks + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <rtcapi.h> + +extern _RTC_error_fnW _RTC_pErrorFuncW; + +int +__cdecl +_RTC_DefaultErrorFuncW( + int errType, + const wchar_t *file, + int line, + const wchar_t *module, + const wchar_t *format, + ...); + +static +char* +_RTC_ErrorDescription[] = +{ + "The stack pointer was wrong after returning from a function call.", /* _RTC_CHKSTK */ + "Data was lost when a type was converted to a smaller type.", /* _RTC_CVRT_LOSS_INFO */ + "The stack near a local variable was corrupted.", /* _RTC_CORRUPT_STACK */ + "An uninitialized local variable was used.", /* _RTC_UNINIT_LOCAL_USE */ + "The stack around an alloca was corrupted.", /* _RTC_CORRUPTED_ALLOCA */ +}; + +int +__cdecl +_RTC_NumErrors(void) +{ + /* Not supported yet */ + __debugbreak(); + return 0; +} + +const char * +__cdecl +_RTC_GetErrDesc( + _RTC_ErrorNumber _Errnum) +{ + if (_Errnum < (sizeof(_RTC_ErrorDescription) / sizeof(_RTC_ErrorDescription[0]))) + { + return _RTC_ErrorDescription[_Errnum]; + } + + return "Invalid/Unknown error."; +} + +int +__cdecl +_RTC_SetErrorType( + _RTC_ErrorNumber _Errnum, + int _ErrType) +{ + /* Not supported yet */ + __debugbreak(); + return 0; +} + +_RTC_error_fn +__cdecl +_RTC_SetErrorFunc( + _RTC_error_fn new_fn) +{ + /* Not supported yet */ + __debugbreak(); + return 0; +} + +_RTC_error_fnW +__cdecl +_RTC_SetErrorFuncW(_RTC_error_fnW new_fn) +{ + _RTC_error_fnW old_fn; + + /* Get the current error func */ + old_fn = _RTC_pErrorFuncW; + + /* Set the new function or reset when 0 was passed */ + _RTC_pErrorFuncW = new_fn ? new_fn : _RTC_DefaultErrorFuncW; + + /* Return the old error func, or 0, if none was set */ + return old_fn != _RTC_DefaultErrorFuncW ? old_fn : 0; +} + Propchange: trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs