Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 44871: NMI Support Patch 10: [NTOS]: Write barebones NMI Trap handler which does a TSS context switch to the NMI TSS and then calls the HAL NMI handler. [NTOS]: Implement KiSaveProcessorState for doing a PRCB context save/restore. You should now be able to test the new NMI functionality by either building the circuit referenced in my e-mail and attaching it to your PCI bus, or by using "nmi 0" in the QEMU stdio console.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 02:34:27 2010 New Revision: 44871 URL: http://svn.reactos.org/svn/reactos?rev=44871&view=rev Log: NMI Support Patch 10: [NTOS]: Write barebones NMI Trap handler which does a TSS context switch to the NMI TSS and then calls the HAL NMI handler. [NTOS]: Implement KiSaveProcessorState for doing a PRCB context save/restore. You should now be able to test the new NMI functionality by either building the circuit referenced in my e-mail and attaching it to your PCI bus, or by using "nmi 0" in the QEMU stdio console. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat Jan 2 02:34:27 2010 @@ -924,6 +924,26 @@ RtlZeroMemory(Address, Size); } +VOID +NTAPI +KiSaveProcessorState(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + // + // Save full context + // + Prcb->ProcessorState.ContextFrame.ContextFlags = CONTEXT_FULL | + CONTEXT_DEBUG_REGISTERS; + KeTrapFrameToContext(TrapFrame, NULL, &Prcb->ProcessorState.ContextFrame); + + // + // Save control registers + // + KiSaveProcessorControlState(&Prcb->ProcessorState); +} + /* PUBLIC FUNCTIONS **********************************************************/ /* Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Jan 2 02:34:27 2010 @@ -10,6 +10,7 @@ #include <asm.h> #include <internal/i386/asmmacro.S> +#include <internal/i386/callconv.s> .intel_syntax noprefix #define Running 2 @@ -790,9 +791,138 @@ .globl _KiTrap2 .func KiTrap2 _KiTrap2: - - /* FIXME: This is an NMI, nothing like a normal exception */ - mov eax, 2 + // + // Don't allow any other NMIs to come in for now + // + cli // Disable interrupts + + // + // Save current state data in registers + // + mov eax, PCR[KPCR_TSS] // Save KTSS + mov ecx, PCR[KPCR_CURRENT_THREAD] // Save ETHREAD + mov edi, [ecx+KTHREAD_APCSTATE_PROCESS] // Save EPROCESS + + // + // Migrate state data to TSS + // + mov ecx, [edi+KPROCESS_DIRECTORY_TABLE_BASE] // Page Directory Table + mov [eax+KTSS_CR3], ecx // Saved in CR3 + mov cx, [edi+KPROCESS_IOPM_OFFSET] // IOPM Offset + mov [eax+KTSS_IOMAPBASE], cx // Saved in IOPM Base + mov ecx, [edi+KPROCESS_LDT_DESCRIPTOR0] // Get LDT descriptor + test ecx, ecx // Check if ne + jz 1f // Doesn't exist + mov cx, KGDT_LDT // Load LDT descriptor +1: + mov [eax+KTSS_LDT], cx // Saved in LDT + + // + // Migrate to NMI TSS + // + push PCR[KPCR_TSS] // Save current TSS + mov eax, PCR[KPCR_GDT] // Get GDT + mov ch, [eax+KGDT_NMI_TSS+KGDT_BASE_HI] // Get High KTSS Base + mov cl, [eax+KGDT_NMI_TSS+KGDT_BASE_MID] // Get Mid KTSS Base + shl ecx, 16 // Build Top KTSS Base + mov cx, [eax+KGDT_NMI_TSS+KGDT_BASE_LOW] // Add Low KTSS Base + mov PCR[KPCR_TSS], ecx + + // + // Clear nested flag and activate the NMI TSS + // + pushf // Get EFLAGS + and dword ptr [esp], ~EFLAGS_NESTED_TASK // Clear nested task + popf // Set EFLAGS + mov ecx, PCR[KPCR_GDT] // Get GDT + lea eax, [ecx+KGDT_NMI_TSS] // Get NMI TSS + mov byte ptr [eax+5], 0x89 // DPL 0, Present, NonBusy + + // + // Build the trap frame and save it into the KPRCB + // + mov eax, [esp] // KGDT_TSS from earlier + push 0 // V86 segments + push 0 // V86 segments + push 0 // V86 segments + push 0 // V86 segments + push [eax+KTSS_SS] // TSS fields -> Trap Frame + push [eax+KTSS_ESP] // TSS fields -> Trap Frame + push [eax+KTSS_EFLAGS] // TSS fields -> Trap Frame + push [eax+KTSS_CS] // TSS fields -> Trap Frame + push [eax+KTSS_EIP] // TSS fields -> Trap Frame + push 0 // Error Code + push [eax+KTSS_EBP] // TSS fields -> Trap Frame + push [eax+KTSS_EBX] // TSS fields -> Trap Frame + push [eax+KTSS_ESI] // TSS fields -> Trap Frame + push [eax+KTSS_EDI] // TSS fields -> Trap Frame + push [eax+KTSS_FS] // TSS fields -> Trap Frame + push PCR[KPCR_EXCEPTION_LIST] // SEH Handler from KPCR + push -1 // Bogus previous mode + push [eax+KTSS_EAX] // TSS fields -> Trap Frame + push [eax+KTSS_ECX] // TSS fields -> Trap Frame + push [eax+KTSS_EDX] // TSS fields -> Trap Frame + push [eax+KTSS_DS] // TSS fields -> Trap Frame + push [eax+KTSS_ES] // TSS fields -> Trap Frame + push [eax+KTSS_GS] // TSS fields -> Trap Frame + push 0 // Debug registers + push 0 // Debug registers + push 0 // Debug registers + push 0 // Debug registers + push 0 // Debug registers + push 0 // Debug registers + push 0 // Temp + push 0 // Temp + push 0 // Debug Pointer + push 0 // Debug Marker + push [eax+KTSS_EIP] // Debug EIP + push [eax+KTSS_EBP] // Debug EBP + mov ebp, esp // Set trap frame address + stdCall _KiSaveProcessorState, ebp, 0 // Save to KPRCB CONTEXT + + // + // BUGBUG: Call Registered NMI handlers + // + + // + // Call the platform driver for NMI handling (panic, etc) + // Do this with IRQL at HIGH + // + push PCR[KPCR_IRQL] // Save real IRQL + mov dword ptr PCR[KPCR_IRQL], HIGH_LEVEL // Force HIGH + stdCall _HalHandleNMI, 0 // Call the HAL + pop PCR[KPCR_IRQL] // Restore real IRQL + + // + // In certain situations, nested NMIs can corrupt the TSS, making us lose + // the original context. If this happens, we have no choice but to panic. + // + mov eax, PCR[KPCR_TSS] // Get current TSS + cmp word ptr [eax], KGDT_NMI_TSS // Check who its points to + je 2f // Back to the NMI TSS crash + + // + // Otherwise, recover the original state + // + add esp, KTRAP_FRAME_LENGTH // Clear the trap frame + pop PCR[KPCR_TSS] // Restore original TSS + mov ecx, PCR[KPCR_GDT] // Get GDT + lea eax, [ecx+KGDT_TSS] // Get KTSS + mov byte ptr [eax+5], 0x8B // DPL 0, Present, Busy + pushf // Get EFLAGS + or dword ptr [esp], EFLAGS_NESTED_TASK // Set nested flags + popf // Set EFLAGS + + // + // Return from NMI + // + iretd // Interrupt return + jmp _KiTrap2 // Handle recursion +2: + // + // Crash the system + // + mov eax, EXCEPTION_NMI jmp _KiSystemFatalException .endfunc

1 0

[cgutman] 44870: [NTOSKRNL] - Fake success from the MmSecureVirtualMemory stub - See issue #4996 for details
by cgutman＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: cgutman Date: Sat Jan 2 02:32:43 2010 New Revision: 44870 URL: http://svn.reactos.org/svn/reactos?rev=44870&view=rev Log: [NTOSKRNL] - Fake success from the MmSecureVirtualMemory stub - See issue #4996 for details Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Jan 2 02:32:43 2010 @@ -635,7 +635,7 @@ IN ULONG Mode) { UNIMPLEMENTED; - return NULL; + return Address; } /*

1 0

[ros-arm-bringup] 44869: NMI Support Patch 9: [NDK]: Add missing KTSS ASM offsets. [NDK]: Add missing EXCEPTION_ codes.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 02:32:34 2010 New Revision: 44869 URL: http://svn.reactos.org/svn/reactos?rev=44869&view=rev Log: NMI Support Patch 9: [NDK]: Add missing KTSS ASM offsets. [NDK]: Add missing EXCEPTION_ codes. Modified: trunk/reactos/include/ndk/i386/asm.h Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Sat Jan 2 02:32:34 2010 @@ -95,7 +95,23 @@ // #define KTSS_ESP0 0x4 #define KTSS_CR3 0x1C +#define KTSS_EIP 0x20 #define KTSS_EFLAGS 0x24 +#define KTSS_EAX 0x28 +#define KTSS_ECX 0x2C +#define KTSS_EDX 0x30 +#define KTSS_EBX 0x34 +#define KTSS_ESP 0x38 +#define KTSS_EBP 0x3C +#define KTSS_ESI 0x40 +#define KTSS_EDI 0x44 +#define KTSS_ES 0x48 +#define KTSS_CS 0x4C +#define KTSS_SS 0x50 +#define KTSS_DS 0x54 +#define KTSS_FS 0x58 +#define KTSS_GS 0x5C +#define KTSS_LDT 0x60 #define KTSS_IOMAPBASE 0x66 #define KTSS_IO_MAPS 0x68 @@ -626,6 +642,26 @@ #define SERVICE_DESCRIPTOR_LENGTH 0x0010 // +// Exception codes +// +#define EXCEPTION_DIVIDED_BY_ZERO 0 +#define EXCEPTION_DEBUG 1 +#define EXCEPTION_NMI 2 +#define EXCEPTION_INT3 3 +#define EXCEPTION_BOUND_CHECK 5 +#define EXCEPTION_INVALID_OPCODE 6 +#define EXCEPTION_NPX_NOT_AVAILABLE 7 +#define EXCEPTION_DOUBLE_FAULT 8 +#define EXCEPTION_NPX_OVERRUN 9 +#define EXCEPTION_INVALID_TSS 0x0A +#define EXCEPTION_SEGMENT_NOT_PRESENT 0x0B +#define EXCEPTION_STACK_FAULT 0x0C +#define EXCEPTION_GP_FAULT 0x0D +#define EXCEPTION_RESERVED_TRAP 0x0F +#define EXCEPTION_NPX_ERROR 0x010 +#define EXCEPTION_ALIGNMENT_CHECK 0x011 + +// // VDM State Pointer // #define FIXED_NTVDMSTATE_LINEAR_PC_AT 0x714

1 0

[ros-arm-bringup] 44868: NMI Support Patch 8: [NTOS]: Implement a GNU Assembler version of the Windows SDK ASM calling convention macros. Only stdCall and its helpers have been written -- feel free to write the rest. Based on callconv.inc from Microsoft). SUGGESTION: Slowly start rewriting current code to use calling convention macros as it is much cleaner.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 02:28:36 2010 New Revision: 44868 URL: http://svn.reactos.org/svn/reactos?rev=44868&view=rev Log: NMI Support Patch 8: [NTOS]: Implement a GNU Assembler version of the Windows SDK ASM calling convention macros. Only stdCall and its helpers have been written -- feel free to write the rest. Based on callconv.inc from Microsoft). SUGGESTION: Slowly start rewriting current code to use calling convention macros as it is much cleaner. Added: trunk/reactos/ntoskrnl/include/internal/i386/callconv.s (with props) Added: trunk/reactos/ntoskrnl/include/internal/i386/callconv.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/callconv.s (added) +++ trunk/reactos/ntoskrnl/include/internal/i386/callconv.s [iso-8859-1] Sat Jan 2 02:28:36 2010 @@ -1,0 +1,100 @@ +/* + * PROJECT: ReactOS Source Development Kit (SDK) + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/ddk/api/callconv.s + * PURPOSE: x86 Calling Convention Helpers + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +// +// @name CountArg +// +// This macro counts the number of arguments in the ArgList and returns +// the value in cCount. +// +// @param cCount - Count of arguments +// @param ArgList - Argument list +// +// @remark None. +// +.macro CountArg cCount:req,ArgList:vararg + + cCount = 0 + + .irp arg, \ArgList + cCount = cCount+1 + .endr + +.endm + +// +// @name RevPush +// +// This macro pushes the arguments in ArgList in the reverse order +// and returns the number of arguments in cCount +// +// @param cCount - Count of arguments +// @param ArgList - Argument list +// +// @remark None. +// +.macro RevPush cCount:req,ArgList:vararg + LOCAL index, x + + CountArg cCount, ArgList + + index = cCount + .rept cCount + x = 0 + .irp arg,ArgList + x=x+1 + .ifeq index-x + push arg + .exitm + .endif + .endr + + index = index-1 + .endr +.endm + +// +// @name stdCallCall +// +// This macro performs a function call using the STDCALL convention and applies +// the correct name decoration required based on the stack bytes +// +// @param Func - Function name +// @param N - Number of stack bytes for arguments +// +// @remark None. +// +.macro stdCallCall Func:req,N:req + .ifdef __imp_&Func&@&N + call dword ptr [__imp_&Func&@&N] + .else + call Func&@&N + .endif +.endm + +// +// @name stdCall +// +// This macro pushes the arguments required for a function call using the +// STDCALL convention and then issues the call +// +// @param Func - Function name +// @param ArgList - Argument list +// +// @remark None. +// +.macro stdCall Func:req,ArgList:vararg + LOCAL Bytes + + RevPush Bytes,ArgList + Bytes = Bytes*4 + + stdCallCall Func, %(Bytes) +.endm Propchange: trunk/reactos/ntoskrnl/include/internal/i386/callconv.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 44867: [KS] - Return correct error code
by janderwald＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: janderwald Date: Sat Jan 2 02:22:38 2010 New Revision: 44867 URL: http://svn.reactos.org/svn/reactos?rev=44867&view=rev Log: [KS] - Return correct error code Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Sat Jan 2 02:22:38 2010 @@ -511,19 +511,18 @@ break; } + Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); - if (KeyInfo->DataLength + sizeof(WCHAR) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) { - Status = STATUS_MORE_ENTRIES; + Status = STATUS_BUFFER_OVERFLOW; ExFreePool(KeyInfo); break; } RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength); ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0'; - Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); ExFreePool(KeyInfo); break; case KSPROPERTY_PIN_PROPOSEDATAFORMAT:

1 0

[dgorbachev] 44866: Lift a protection (forgotten in 44842).
by dgorbachev＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: dgorbachev Date: Sat Jan 2 01:17:37 2010 New Revision: 44866 URL: http://svn.reactos.org/svn/reactos?rev=44866&view=rev Log: Lift a protection (forgotten in 44842). Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Sat Jan 2 01:17:37 2010 @@ -415,6 +415,7 @@ // IdtPte = HalAddressToPte(((PKIPCR)KeGetPcr())->IDT); RestoreWriteProtection = IdtPte->Write; + IdtPte->Write = 1; // // Use special invalid opcode and GPF trap handlers

1 0

[janderwald] 44865: [SETUPAPI] - Implement SetupInitializeFileLogA, SetupInitializeFileLogW, SetupTerminateFileLog
by janderwald＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: janderwald Date: Sat Jan 2 00:44:41 2010 New Revision: 44865 URL: http://svn.reactos.org/svn/reactos?rev=44865&view=rev Log: [SETUPAPI] - Implement SetupInitializeFileLogA, SetupInitializeFileLogW, SetupTerminateFileLog Modified: trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Sat Jan 2 00:44:41 2010 @@ -1758,3 +1758,177 @@ return bResult; } + +/*********************************************************************** + * SetupInitializeFileLogW(SETUPAPI.@) + */ +HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags) +{ + struct FileLog * Log; + HANDLE hLog; + WCHAR Windir[MAX_PATH]; + DWORD ret; + + TRACE("%s, 0x%x\n",debugstr_w(LogFileName),Flags); + + if (Flags & SPFILELOG_SYSTEMLOG) + { + if (!IsUserAdmin() && !(Flags & SPFILELOG_QUERYONLY)) + { + /* insufficient privileges */ + SetLastError(ERROR_ACCESS_DENIED); + return INVALID_HANDLE_VALUE; + } + + if (LogFileName || (Flags & SPFILELOG_FORCENEW)) + { + /* invalid parameter */ + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + ret = GetSystemWindowsDirectoryW(Windir, MAX_PATH); + if (!ret || ret >= MAX_PATH) + { + /* generic failure */ + return INVALID_HANDLE_VALUE; + } + + /* append path */ + wcscat(Windir, L"repair\\setup.log"); + } + else + { + if (!LogFileName) + { + /* invalid parameter */ + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + /* copy filename */ + wcsncpy(Windir, LogFileName, MAX_PATH); + } + + if (FileExists(Windir, NULL)) + { + /* take ownership */ + ret = TakeOwnershipOfFile(Windir); + + if (ret != ERROR_SUCCESS) + { + /* failed */ + SetLastError(ret); + return INVALID_HANDLE_VALUE; + } + + if (!SetFileAttributesW(Windir, FILE_ATTRIBUTE_NORMAL)) + { + /* failed */ + return INVALID_HANDLE_VALUE; + } + + if ((Flags & SPFILELOG_FORCENEW)) + { + if (!DeleteFileW(Windir)) + { + /* failed */ + return INVALID_HANDLE_VALUE; + } + } + } + + /* open log file */ + hLog = CreateFileW(Windir, + (Flags & SPFILELOG_QUERYONLY) ? GENERIC_READ : GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + + if (hLog == INVALID_HANDLE_VALUE) + { + /* failed */ + return INVALID_HANDLE_VALUE; + } + + /* close log handle */ + CloseHandle(hLog); + + /* allocate file log struct */ + Log = HeapAlloc(GetProcessHeap(), 0, sizeof(struct FileLog)); + if (!Log) + { + /* not enough memory */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + /* initialize log */ + Log->LogName = HeapAlloc(GetProcessHeap(), 0, (wcslen(Windir)+1) * sizeof(WCHAR)); + if (!Log->LogName) + { + /* not enough memory */ + HeapFree(GetProcessHeap(), 0, Log); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + wcscpy(Log->LogName, Windir); + Log->ReadOnly = (Flags & SPFILELOG_QUERYONLY); + Log->SystemLog = (Flags & SPFILELOG_SYSTEMLOG); + + return (HSPFILELOG)Log; +} + +/*********************************************************************** + * SetupInitializeFileLogA(SETUPAPI.@) + */ +HSPFILELOG WINAPI SetupInitializeFileLogA(LPCSTR LogFileName, DWORD Flags) +{ + HSPFILELOG hLog; + LPWSTR LogFileNameW = NULL; + + TRACE("%s, 0x%x\n",debugstr_a(LogFileName),Flags); + + if (LogFileName) + { + LogFileNameW = strdupAtoW(LogFileName); + + if (!LogFileNameW) + { + /* not enough memory */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + hLog = SetupInitializeFileLogW(LogFileNameW, Flags); + HeapFree(GetProcessHeap(), 0, LogFileNameW); + } + else + { + hLog = SetupInitializeFileLogW(NULL, Flags); + } + + return hLog; +} + +/*********************************************************************** + * SetupTerminateFileLog(SETUPAPI.@) + */ +BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle) +{ + struct FileLog * Log; + + TRACE ("%p\n",FileLogHandle); + + Log = (struct FileLog *)FileLogHandle; + + /* free file log handle */ + HeapFree(GetProcessHeap(), 0, Log->LogName); + HeapFree(GetProcessHeap(), 0, Log); + + SetLastError(ERROR_SUCCESS); + + return TRUE; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Sat Jan 2 00:44:41 2010 @@ -226,6 +226,13 @@ INT* IconIndexes; }; +struct FileLog /* HSPFILELOG */ +{ + DWORD ReadOnly; + DWORD SystemLog; + LPWSTR LogName; +}; + extern HINSTANCE hInstance; #define RC_STRING_MAX_SIZE 256 Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Sat Jan 2 00:44:41 2010 @@ -39,33 +39,6 @@ { FIXME( "%x %x: stub\n", w1, w2 ); return 0; -} - -/*********************************************************************** - * SetupInitializeFileLogW(SETUPAPI.@) - */ -HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags) -{ - FIXME("Stub %s, 0x%x\n",debugstr_w(LogFileName),Flags); - return INVALID_HANDLE_VALUE; -} - -/*********************************************************************** - * SetupInitializeFileLogA(SETUPAPI.@) - */ -HSPFILELOG WINAPI SetupInitializeFileLogA(LPCSTR LogFileName, DWORD Flags) -{ - FIXME("Stub %s, 0x%x\n",debugstr_a(LogFileName),Flags); - return INVALID_HANDLE_VALUE; -} - -/*********************************************************************** - * SetupTerminateFileLog(SETUPAPI.@) - */ -BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle) -{ - FIXME ("Stub %p\n",FileLogHandle); - return TRUE; } /***********************************************************************

1 0

[dgorbachev] 44864: Fix parameter type of NtQueryInformationThread; do not call ExitThread from itself. Bug #5076.
by dgorbachev＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: dgorbachev Date: Sat Jan 2 00:14:10 2010 New Revision: 44864 URL: http://svn.reactos.org/svn/reactos?rev=44864&view=rev Log: Fix parameter type of NtQueryInformationThread; do not call ExitThread from itself. Bug #5076. Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Sat Jan 2 00:14:10 2010 @@ -242,7 +242,7 @@ ExitThread(DWORD uExitCode) { NTSTATUS Status; - BOOLEAN LastThread; + ULONG LastThread; /* * Terminate process if this is the last thread @@ -251,7 +251,7 @@ Status = NtQueryInformationThread(NtCurrentThread(), ThreadAmILastThread, &LastThread, - sizeof(BOOLEAN), + sizeof(LastThread), NULL); if (NT_SUCCESS(Status) && LastThread) { @@ -266,8 +266,9 @@ NtCurrentTeb()->FreeStackOnTermination = TRUE; NtTerminateThread(NULL, uExitCode); - /* We will never reach this place. This silences the compiler */ - ExitThread(uExitCode); + /* We should never reach this place */ + DPRINT1("It should not happen\n"); + while (TRUE) ; } /*

1 0

[ros-arm-bringup] 44863: NMI Support Patch 7 Build Fixer: [HAL]: Define HalpNMIInProgress as an external in the HAL private headers.
by ros-arm-bringup＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ros-arm-bringup Date: Fri Jan 1 22:07:22 2010 New Revision: 44863 URL: http://svn.reactos.org/svn/reactos?rev=44863&view=rev Log: NMI Support Patch 7 Build Fixer: [HAL]: Define HalpNMIInProgress as an external in the HAL private headers. Modified: trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Fri Jan 1 22:07:22 2010 @@ -244,6 +244,8 @@ #endif // !CONFIG_SMP #endif // _M_AMD64 +extern BOOLEAN HalpNMIInProgress; + extern PVOID HalpRealModeStart; extern PVOID HalpRealModeEnd;

1 0

[ros-arm-bringup] 44862: NMI Support Patch 7 Straggler: [HAL]: Piggyback on V8086 handler (don't restore kernel GPF handler) during an NMI, so that we don't enter another fault context during a recursive NMI after display reset. If another NMI does happen, the V8086 GPF handler will just spin.
by ros-arm-bringup＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ros-arm-bringup Date: Fri Jan 1 22:05:41 2010 New Revision: 44862 URL: http://svn.reactos.org/svn/reactos?rev=44862&view=rev Log: NMI Support Patch 7 Straggler: [HAL]: Piggyback on V8086 handler (don't restore kernel GPF handler) during an NMI, so that we don't enter another fault context during a recursive NMI after display reset. If another NMI does happen, the V8086 GPF handler will just spin. Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri Jan 1 22:05:41 2010 @@ -313,9 +313,19 @@ HalpRestoreTrapHandlers(VOID) { // - // We're back, restore the handlers we over-wrote - // - KeRegisterInterruptHandler(13, HalpGpfHandler); + // Keep dummy GPF handler in case we get an NMI during V8086 + // + if (!HalpNMIInProgress) + { + // + // Not an NMI -- put back the original handler + // + KeRegisterInterruptHandler(13, HalpGpfHandler); + } + + // + // Restore invalid opcode handler + // KeRegisterInterruptHandler(6, HalpBopHandler); }

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