Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[ekohl] 64700: [SETUPAPI] Store the module handles to loaded property page provider dlls in the DeviceInfoData (for class property pages) or in the DeviceInfo (for device property pages). The dlls ...
by ekohl＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: ekohl Date: Sun Oct 12 17:13:36 2014 New Revision: 64700 URL: http://svn.reactos.org/svn/reactos?rev=64700&view=rev Log: [SETUPAPI] Store the module handles to loaded property page provider dlls in the DeviceInfoData (for class property pages) or in the DeviceInfo (for device property pages). The dlls are unloaded when the device info set is destroyed. These dlls were unloaded as soon as the property sheet data had been retrieved. These property pages could not be added to a property sheet because unloading the dll invalidated the page reources. Modified: trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Sun Oct 12 17:13:36 2014 @@ -1269,6 +1269,19 @@ goto cleanup; } + if (DeviceInfoData) + { + struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + devInfo->hmodDevicePropPageProvider = hModule; + devInfo->pDevicePropPageProvider = pPropPageProvider; + } + else + { + struct DeviceInfoSet *devInfoSet = (struct DeviceInfoSet *)DeviceInfoSet; + devInfoSet->hmodClassPropPageProvider = hModule; + devInfoSet->pClassPropPageProvider = pPropPageProvider; + } + InitialNumberOfPages = PropertySheetHeader->nPages; Request.cbSize = sizeof(SP_PROPSHEETPAGE_REQUEST); @@ -1299,7 +1312,6 @@ if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); HeapFree(GetProcessHeap(), 0, PropPageProvider); - FreeFunctionPointer(hModule, pPropPageProvider); } TRACE("Returning %d\n", ret); Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Oct 12 17:13:36 2014 @@ -602,6 +602,8 @@ return FALSE; } DestroyClassInstallParams(&deviceInfo->ClassInstallParams); + if (deviceInfo->hmodDevicePropPageProvider) + FreeLibrary(deviceInfo->hmodDevicePropPageProvider); return HeapFree(GetProcessHeap(), 0, deviceInfo); } @@ -622,6 +624,8 @@ RegCloseKey(list->HKLM); CM_Disconnect_Machine(list->hMachine); DestroyClassInstallParams(&list->ClassInstallParams); + if (list->hmodClassPropPageProvider) + FreeLibrary(list->hmodClassPropPageProvider); return HeapFree(GetProcessHeap(), 0, list); } 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] Sun Oct 12 17:13:36 2014 @@ -172,6 +172,10 @@ /* Used by SetupDiGetClassInstallParamsW/SetupDiSetClassInstallParamsW */ struct ClassInstallParams ClassInstallParams; + /* Device property page provider data */ + HMODULE hmodDevicePropPageProvider; + PVOID pDevicePropPageProvider; + /* Variable size array (contains data for instanceId, UniqueId, DeviceDescription) */ WCHAR Data[ANYSIZE_ARRAY]; }; @@ -199,6 +203,10 @@ /* Used by SetupDiGetClassInstallParamsW/SetupDiSetClassInstallParamsW */ struct ClassInstallParams ClassInstallParams; + + /* Class property page provider data */ + HMODULE hmodClassPropPageProvider; + PVOID pClassPropPageProvider; /* Contains the name of the remote computer ('\\COMPUTERNAME' for example), * or NULL if related to local machine. Points into szData field at the

1 0

[tfaber] 64699: [SECUR32] - Call SECUR32_initializeProviders from EnumerateSecurityPackagesW if necessary. Fixes a couple secur32 tests, and an occasional crash in rpcrt4:rpc
by tfaber＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: tfaber Date: Sun Oct 12 16:19:45 2014 New Revision: 64699 URL: http://svn.reactos.org/svn/reactos?rev=64699&view=rev Log: [SECUR32] - Call SECUR32_initializeProviders from EnumerateSecurityPackagesW if necessary. Fixes a couple secur32 tests, and an occasional crash in rpcrt4:rpc Modified: trunk/reactos/dll/win32/secur32/sspi.c Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Sun Oct 12 16:19:45 2014 @@ -37,6 +37,8 @@ DWORD numAllocated; struct list table; } SecureProviderTable; + +static void SECUR32_initializeProviders(void); static CRITICAL_SECTION cs; static CRITICAL_SECTION_DEBUG cs_debug = @@ -122,6 +124,11 @@ SECURITY_STATUS ret = SEC_E_OK; TRACE("(%p, %p)\n", pcPackages, ppPackageInfo); + +#ifdef __REACTOS__ + if (!packageTable) + SECUR32_initializeProviders(); +#endif /* windows just crashes if pcPackages or ppPackageInfo is NULL, so will I */ *pcPackages = 0; @@ -718,6 +725,7 @@ 'S','e','c','u','r','i','t','y','P','r','o','v','i','d','e','r','s',0 }; + /* FIXME: we're missing SECUR32_freeProviders, so all of this gets leaked */ static void SECUR32_initializeProviders(void) { HKEY key; @@ -764,8 +772,10 @@ SecurePackage *ret = NULL; BOOL matched = FALSE; +#ifdef __REACTOS__ if (!packageTable) SECUR32_initializeProviders(); +#endif if (packageTable && packageName) {

1 0

[hbelusca] 64698: [FAST486]: speed up things a bit when we're reading prefixes, by really going to the next instruction (no jump to the end of the do{}while() loop, then restart).
by hbelusca＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: hbelusca Date: Sun Oct 12 14:08:14 2014 New Revision: 64698 URL: http://svn.reactos.org/svn/reactos?rev=64698&view=rev Log: [FAST486]: speed up things a bit when we're reading prefixes, by really going to the next instruction (no jump to the end of the do{}while() loop, then restart). 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 12 14:08:14 2014 @@ -54,6 +54,7 @@ /* Main execution loop */ do { +NextInst: /* Check if this is a new instruction */ if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; @@ -72,7 +73,7 @@ CurrentHandler(State, Opcode); /* If this is a prefix, go to the next instruction immediately */ - if (CurrentHandler == Fast486OpcodePrefix) continue; + if (CurrentHandler == Fast486OpcodePrefix) goto NextInst; /* A non-prefix opcode has been executed, reset the prefix flags */ State->PrefixFlags = 0; @@ -104,8 +105,7 @@ State->IntStatus = FAST486_INT_EXECUTE; } } - while ((CurrentHandler == Fast486OpcodePrefix) || - (Command == FAST486_CONTINUE) || + while ((Command == FAST486_CONTINUE) || (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) || (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0)); }

1 0

[tkreuzer] 64697: [NTOSKRNL] Make sure APCs are disabled when acquiring MmSectionCommitMutex.
by tkreuzer＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: tkreuzer Date: Sun Oct 12 14:05:49 2014 New Revision: 64697 URL: http://svn.reactos.org/svn/reactos?rev=64697&view=rev Log: [NTOSKRNL] Make sure APCs are disabled when acquiring MmSectionCommitMutex. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Oct 12 14:05:49 2014 @@ -1391,7 +1391,7 @@ TempPte = Segment->SegmentPteTemplate; /* Acquire the commit lock and loop all prototype PTEs to be committed */ - KeAcquireGuardedMutexUnsafe(&MmSectionCommitMutex); + KeAcquireGuardedMutex(&MmSectionCommitMutex); while (PointerPte < LastPte) { /* Make sure the PTE is already invalid */ @@ -1417,7 +1417,7 @@ ASSERT(Segment->NumberOfCommittedPages <= Segment->TotalNumberOfPtes); /* Now that we're done, release the lock */ - KeReleaseGuardedMutexUnsafe(&MmSectionCommitMutex); + KeReleaseGuardedMutex(&MmSectionCommitMutex); } /* Is it SEC_BASED, or did the caller manually specify an address? */

1 0

[hbelusca] 64696: [fast486]: code formatting + add a comment about the instruction 0xF1.
by hbelusca＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: hbelusca Date: Sun Oct 12 13:50:05 2014 New Revision: 64696 URL: http://svn.reactos.org/svn/reactos?rev=64696&view=rev Log: [fast486]: code formatting + add a comment about the instruction 0xF1. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sun Oct 12 13:50:05 2014 @@ -166,8 +166,6 @@ UCHAR Number, PFAST486_IDT_ENTRY IdtEntry) { - ULONG FarPointer; - /* Check for protected mode */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) { @@ -185,6 +183,7 @@ else { /* Read from the real-mode IVT */ + ULONG FarPointer; /* Paging is always disabled in real mode */ State->MemReadCallback(State, @@ -215,9 +214,9 @@ USHORT SegmentSelector = IdtEntry->Selector; ULONG Offset = MAKELONG(IdtEntry->Offset, IdtEntry->OffsetHigh); ULONG GateType = IdtEntry->Type; - - BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32) - || (GateType == FAST486_IDT_TRAP_GATE_32); + BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32) || + (GateType == FAST486_IDT_TRAP_GATE_32); + BOOLEAN Success = FALSE; ULONG OldPrefixFlags = State->PrefixFlags; Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Sun Oct 12 13:50:05 2014 @@ -2267,9 +2267,9 @@ ULONG Source, Destination, Result; if (!Fast486ReadModrmDwordOperands(State, - &ModRegRm, - &Source, - &Destination)) + &ModRegRm, + &Source, + &Destination)) { /* Exception occurred */ return FALSE; Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6469… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun Oct 12 13:50:05 2014 @@ -125,7 +125,7 @@ /* Find the largest exponent */ TempResult.Exponent = max(FirstOperand->Exponent, SecondOperand->Exponent); - /* Adjust the first operand to it */ + /* Adjust the first operand to it... */ if (FirstAdjusted.Exponent < TempResult.Exponent) { FirstAdjusted.Mantissa >>= (TempResult.Exponent - FirstAdjusted.Exponent); 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 12 13:50:05 2014 @@ -279,7 +279,7 @@ Fast486OpcodeOutByte, /* 0xEE */ Fast486OpcodeOut, /* 0xEF */ Fast486OpcodePrefix, /* 0xF0 */ - Fast486OpcodeInvalid, /* 0xF1 */ // Invalid opcode + Fast486OpcodeInvalid, /* 0xF1 */ // Invalid opcode -- ICEBP/INT01 opcode Fast486OpcodePrefix, /* 0xF2 */ Fast486OpcodePrefix, /* 0xF3 */ Fast486OpcodeHalt, /* 0xF4 */ @@ -300,7 +300,12 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeInvalid) { - /* This is not a valid opcode */ + /* + * This is not a valid opcode. + * Well, not totally: see http://www.rcollins.org/secrets/opcodes/ICEBP.html + * for more details. + */ + DPRINT1("FAST486 -- Calling ICEBP opcode\n"); Fast486Exception(State, FAST486_EXCEPTION_UD); return FALSE; } @@ -5428,6 +5433,11 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeSalc) { + /* + * See: http://www.rcollins.org/secrets/opcodes/SALC.html + * for more information. + */ + /* Make sure this is the right instruction */ ASSERT(Opcode == 0xD6);

1 0

[tfaber] 64695: [ROSAUTOTEST] - DbgPrint expects a format string! ROSTESTS-145 #resolve
by tfaber＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: tfaber Date: Sun Oct 12 13:23:38 2014 New Revision: 64695 URL: http://svn.reactos.org/svn/reactos?rev=64695&view=rev Log: [ROSAUTOTEST] - DbgPrint expects a format string! ROSTESTS-145 #resolve Modified: trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Sun Oct 12 13:23:38 2014 @@ -136,7 +136,7 @@ } DbgString[size] = 0; - DbgPrint(DbgString); + OutputDebugStringA(DbgString); } last_newline = curr_pos; @@ -153,7 +153,7 @@ memcpy(DbgString, NewString.c_str() + start, size); DbgString[size] = 0; - DbgPrint(DbgString); + OutputDebugStringA(DbgString); NewString.clear(); return NewString;

1 0

[pschweitzer] 64694: [NTFS] Forgot that file²...
by pschweitzer＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: pschweitzer Date: Sun Oct 12 11:52:05 2014 New Revision: 64694 URL: http://svn.reactos.org/svn/reactos?rev=64694&view=rev Log: [NTFS] Forgot that file²... Modified: trunk/reactos/drivers/filesystems/ntfs/close.c Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] Sun Oct 12 11:52:05 2014 @@ -36,7 +36,6 @@ /* * FUNCTION: Closes a file */ -static NTSTATUS NtfsCloseFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject)

1 0

[pschweitzer] 64693: [NTFS] Forgot that file...
by pschweitzer＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: pschweitzer Date: Sun Oct 12 11:50:08 2014 New Revision: 64693 URL: http://svn.reactos.org/svn/reactos?rev=64693&view=rev Log: [NTFS] Forgot that file... Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Oct 12 11:50:08 2014 @@ -470,6 +470,10 @@ /* close.c */ +NTSTATUS +NtfsCloseFile(PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject); + DRIVER_DISPATCH NtfsFsdClose; NTSTATUS NTAPI NtfsFsdClose(PDEVICE_OBJECT DeviceObject,

1 0

[pschweitzer] 64692: [NTFS] On opening, check the file found matches the requested dispositions from the caller
by pschweitzer＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: pschweitzer Date: Sun Oct 12 11:48:42 2014 New Revision: 64692 URL: http://svn.reactos.org/svn/reactos?rev=64692&view=rev Log: [NTFS] On opening, check the file found matches the requested dispositions from the caller Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Oct 12 11:48:42 2014 @@ -221,6 +221,30 @@ FileObject->FileName.Buffer, &Fcb); + if (NT_SUCCESS(Status)) + { + if (RequestedDisposition == FILE_CREATE) + { + Irp->IoStatus.Information = FILE_EXISTS; + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_OBJECT_NAME_COLLISION; + } + + if (RequestedOptions & FILE_NON_DIRECTORY_FILE && + NtfsFCBIsDirectory(Fcb)) + { + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_FILE_IS_A_DIRECTORY; + } + + if (RequestedOptions & FILE_DIRECTORY_FILE && + !NtfsFCBIsDirectory(Fcb)) + { + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_NOT_A_DIRECTORY; + } + } + /* * If the directory containing the file to open doesn't exist then * fail immediately

1 0

[pschweitzer] 64691: [NTFS] Properly reset FCB & SectionObjectPointer fields from the FileObject on close
by pschweitzer＠svn.reactos.org 12 Oct '14

12 Oct '14

Author: pschweitzer Date: Sun Oct 12 11:43:10 2014 New Revision: 64691 URL: http://svn.reactos.org/svn/reactos?rev=64691&view=rev Log: [NTFS] Properly reset FCB & SectionObjectPointer fields from the FileObject on close Modified: trunk/reactos/drivers/filesystems/ntfs/close.c Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] Sun Oct 12 11:43:10 2014 @@ -42,12 +42,14 @@ PFILE_OBJECT FileObject) { PNTFS_CCB Ccb; + PNTFS_FCB Fcb; DPRINT("NtfsCloseFile(DeviceExt %p, FileObject %p)\n", DeviceExt, FileObject); Ccb = (PNTFS_CCB)(FileObject->FsContext2); + Fcb = (PNTFS_FCB)(FileObject->FsContext); DPRINT("Ccb %p\n", Ccb); if (Ccb == NULL) @@ -56,13 +58,15 @@ } FileObject->FsContext2 = NULL; + FileObject->FsContext = NULL; + FileObject->SectionObjectPointer = NULL; if (FileObject->FileName.Buffer) { // This a FO, that was created outside from FSD. // Some FO's are created with IoCreateStreamFileObject() insid from FSD. // This FO's don't have a FileName. - NtfsReleaseFCB(DeviceExt, FileObject->FsContext); + NtfsReleaseFCB(DeviceExt, Fcb); } if (Ccb->DirectorySearchPattern)

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014