Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[ekohl] 50264: [NPFS] - Add support for FileFullDirectoryInformation and FileBothDirectoryInformation. - Fix an off-by-one bug in the buffer size calculation. - Zero-initialize the return buffer.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 2 19:37:08 2011 New Revision: 50264 URL: http://svn.reactos.org/svn/reactos?rev=50264&view=rev Log: [NPFS] - Add support for FileFullDirectoryInformation and FileBothDirectoryInformation. - Fix an off-by-one bug in the buffer size calculation. - Zero-initialize the return buffer. Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Sun Jan 2 19:37:08 2011 @@ -35,6 +35,8 @@ NTSTATUS Status = STATUS_SUCCESS; PFILE_NAMES_INFORMATION NamesBuffer; PFILE_DIRECTORY_INFORMATION DirectoryBuffer; + PFILE_FULL_DIR_INFORMATION FullDirBuffer; + PFILE_BOTH_DIR_INFORMATION BothDirBuffer; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -132,6 +134,8 @@ if (PipeIndex >= FileIndex) { + RtlZeroMemory(Buffer, BufferLength); + switch (FileInformationClass) { case FileDirectoryInformation: @@ -145,7 +149,37 @@ RtlCopyMemory(DirectoryBuffer->FileName, PipeFcb->PipeName.Buffer, PipeFcb->PipeName.Length); - *Size = sizeof(FILE_DIRECTORY_INFORMATION) + PipeFcb->PipeName.Length - 1; + *Size = sizeof(FILE_DIRECTORY_INFORMATION) + PipeFcb->PipeName.Length - sizeof(WCHAR); + Status = STATUS_SUCCESS; + break; + + case FileFullDirectoryInformation: + FullDirBuffer = (PFILE_FULL_DIR_INFORMATION)Buffer; + FullDirBuffer->NextEntryOffset = 0; + FullDirBuffer->FileIndex = PipeIndex; + FullDirBuffer->FileAttributes = FILE_ATTRIBUTE_NORMAL; + FullDirBuffer->EndOfFile.QuadPart = PipeFcb->CurrentInstances; + FullDirBuffer->AllocationSize.LowPart = PipeFcb->MaximumInstances; + FullDirBuffer->FileNameLength = PipeFcb->PipeName.Length; + RtlCopyMemory(FullDirBuffer->FileName, + PipeFcb->PipeName.Buffer, + PipeFcb->PipeName.Length); + *Size = sizeof(FILE_FULL_DIR_INFORMATION) + PipeFcb->PipeName.Length - sizeof(WCHAR); + Status = STATUS_SUCCESS; + break; + + case FileBothDirectoryInformation: + BothDirBuffer = (PFILE_BOTH_DIR_INFORMATION)Buffer; + BothDirBuffer->NextEntryOffset = 0; + BothDirBuffer->FileIndex = PipeIndex; + BothDirBuffer->FileAttributes = FILE_ATTRIBUTE_NORMAL; + BothDirBuffer->EndOfFile.QuadPart = PipeFcb->CurrentInstances; + BothDirBuffer->AllocationSize.LowPart = PipeFcb->MaximumInstances; + BothDirBuffer->FileNameLength = PipeFcb->PipeName.Length; + RtlCopyMemory(BothDirBuffer->FileName, + PipeFcb->PipeName.Buffer, + PipeFcb->PipeName.Length); + *Size = sizeof(FILE_BOTH_DIR_INFORMATION) + PipeFcb->PipeName.Length - sizeof(WCHAR); Status = STATUS_SUCCESS; break; @@ -157,7 +191,7 @@ RtlCopyMemory(NamesBuffer->FileName, PipeFcb->PipeName.Buffer, PipeFcb->PipeName.Length); - *Size = sizeof(FILE_NAMES_INFORMATION) + PipeFcb->PipeName.Length - 1; + *Size = sizeof(FILE_NAMES_INFORMATION) + PipeFcb->PipeName.Length - sizeof(WCHAR); Status = STATUS_SUCCESS; break;

13 years, 11 months

[rmessiant] 50263: [NTOS] - Reduce PDE/PTE confusion a little more. - MiQueryMemoryBasicInformation: Fall back on MEMORY_AREA data in sections until the MM rewrite also covers these. See issue #579...

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Sun Jan 2 19:30:26 2011 New Revision: 50263 URL: http://svn.reactos.org/svn/reactos?rev=50263&view=rev Log: [NTOS] - Reduce PDE/PTE confusion a little more. - MiQueryMemoryBasicInformation: Fall back on MEMORY_AREA data in sections until the MM rewrite also covers these. See issue #5791 for more info. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Sun Jan 2 19:30:26 2011 @@ -29,7 +29,7 @@ /* Converting address to a corresponding PDE or PTE entry */ #define MiAddressToPde(x) \ - ((PMMPTE)(((((ULONG)(x)) >> 22) << 2) + PAGEDIRECTORY_MAP)) + ((PMMPDE)(((((ULONG)(x)) >> 22) << 2) + PAGEDIRECTORY_MAP)) #define MiAddressToPte(x) \ ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PAGETABLE_MAP)) #define MiAddressToPteOffset(x) \ 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] Sun Jan 2 19:30:26 2011 @@ -1127,15 +1127,15 @@ if (!PointerPde->u.Long) { /* No address in this range used yet, move to the next PDE range */ - *NextVa = MiPteToAddress(MiPteToAddress(PointerPde + 1)); + *NextVa = MiPteToAddress(MiPdeToAddress(PointerPde + 1)); break; } - /* The PDE is empty, but is it faulted in? */ + /* The PDE is not empty, but is it faulted in? */ if (!PointerPde->u.Hard.Valid) { /* It isn't, go ahead and do the fault */ - LockChange = MiMakeSystemAddressValid(MiPteToAddress(PointerPde), + LockChange = MiMakeSystemAddressValid(MiPdeToAddress(PointerPde), TargetProcess); } @@ -2353,6 +2353,8 @@ MEMORY_BASIC_INFORMATION MemoryInfo; KAPC_STATE ApcState; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PMEMORY_AREA MemoryArea; + SIZE_T ResultLength; /* Check for illegal addresses in user-space, or the shared memory area */ if ((BaseAddress > MM_HIGHEST_VAD_ADDRESS) || @@ -2542,30 +2544,49 @@ /* This must be a VM VAD */ ASSERT(Vad->u.VadFlags.PrivateMemory); - /* Build the initial information block */ - Address = PAGE_ALIGN(BaseAddress); - MemoryInfo.BaseAddress = Address; - MemoryInfo.AllocationBase = (PVOID)(Vad->StartingVpn << PAGE_SHIFT); - MemoryInfo.AllocationProtect = MmProtectToValue[Vad->u.VadFlags.Protection]; - MemoryInfo.Type = MEM_PRIVATE; - - /* Find the largest chunk of memory which has the same state and protection mask */ - MemoryInfo.State = MiQueryAddressState(Address, - Vad, - TargetProcess, - &MemoryInfo.Protect, - &NextAddress); - Address = NextAddress; - while (((ULONG_PTR)Address >> PAGE_SHIFT) <= Vad->EndingVpn) - { - /* Keep going unless the state or protection mask changed */ - NewState = MiQueryAddressState(Address, Vad, TargetProcess, &NewProtect, &NextAddress); - if ((NewState != MemoryInfo.State) || (NewProtect != MemoryInfo.Protect)) break; + /* Lock the address space of the process */ + MmLockAddressSpace(&TargetProcess->Vm); + + /* Find the memory area the specified address belongs to */ + MemoryArea = MmLocateMemoryAreaByAddress(&TargetProcess->Vm, BaseAddress); + ASSERT(MemoryArea != NULL); + + /* Determine information dependent on the memory area type */ + if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) + { + Status = MmQuerySectionView(MemoryArea, BaseAddress, &MemoryInfo, &ResultLength); + ASSERT(NT_SUCCESS(Status)); + } + else + { + /* Build the initial information block */ + Address = PAGE_ALIGN(BaseAddress); + MemoryInfo.BaseAddress = Address; + MemoryInfo.AllocationBase = (PVOID)(Vad->StartingVpn << PAGE_SHIFT); + MemoryInfo.AllocationProtect = MmProtectToValue[Vad->u.VadFlags.Protection]; + MemoryInfo.Type = MEM_PRIVATE; + + /* Find the largest chunk of memory which has the same state and protection mask */ + MemoryInfo.State = MiQueryAddressState(Address, + Vad, + TargetProcess, + &MemoryInfo.Protect, + &NextAddress); Address = NextAddress; - } - - /* Now that we know the last VA address, calculate the region size */ - MemoryInfo.RegionSize = ((ULONG_PTR)Address - (ULONG_PTR)MemoryInfo.BaseAddress); + while (((ULONG_PTR)Address >> PAGE_SHIFT) <= Vad->EndingVpn) + { + /* Keep going unless the state or protection mask changed */ + NewState = MiQueryAddressState(Address, Vad, TargetProcess, &NewProtect, &NextAddress); + if ((NewState != MemoryInfo.State) || (NewProtect != MemoryInfo.Protect)) break; + Address = NextAddress; + } + + /* Now that we know the last VA address, calculate the region size */ + MemoryInfo.RegionSize = ((ULONG_PTR)Address - (ULONG_PTR)MemoryInfo.BaseAddress); + } + + /* Unlock the address space of the process */ + MmUnlockAddressSpace(&TargetProcess->Vm); /* Check if we were attached */ if (ProcessHandle != NtCurrentProcess()) @@ -2596,7 +2617,7 @@ } /* All went well */ - DPRINT("Base: %p AllocBase: %p Protect: %lx AllocProtect: %lx " + DPRINT("Base: %p AllocBase: %p AllocProtect: %lx Protect: %lx " "State: %lx Type: %lx Size: %lx\n", MemoryInfo.BaseAddress, MemoryInfo.AllocationBase, MemoryInfo.AllocationProtect, MemoryInfo.Protect,

13 years, 11 months

[janderwald] 50262: [KERNEL32] - Fix heap corruptions in MoveFileWithProgress - Fixes kernel32_winetest change crash - Introduced in rev 18073 (25.Sept 2005)

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 2 16:54:00 2011 New Revision: 50262 URL: http://svn.reactos.org/svn/reactos?rev=50262&view=rev Log: [KERNEL32] - Fix heap corruptions in MoveFileWithProgress - Fixes kernel32_winetest change crash - Introduced in rev 18073 (25.Sept 2005) Modified: trunk/reactos/dll/win32/kernel32/file/move.c Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Sun Jan 2 16:54:00 2011 @@ -418,7 +418,7 @@ /* Get the file name */ memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); - if (hFile == NULL) + if (hFile == INVALID_HANDLE_VALUE) loop=FALSE; if (findBuffer.cFileName[0] == L'\0') @@ -446,13 +446,13 @@ { size = wcslen(lpExistingFileName2)-4; FindClose(hFile); + hFile = INVALID_HANDLE_VALUE; + wcscpy( &lpExistingFileName2[size],L"\0"); if (wcsncmp(lpExistingFileName,lpExistingFileName2,size)) { DWORD Attributes; - - FindClose(hFile); /* delete folder */ TRACE("MoveFileWithProgressW : Delete folder : %S\n",lpDeleteFile);

13 years, 11 months

[cwittich] 50261: [PSDK] sync urlmon.idl with wine 1.3.10

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 2 14:21:47 2011 New Revision: 50261 URL: http://svn.reactos.org/svn/reactos?rev=50261&view=rev Log: [PSDK] sync urlmon.idl with wine 1.3.10 Modified: trunk/reactos/include/psdk/urlmon.idl Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… ============================================================================== --- trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] Sun Jan 2 14:21:47 2011 @@ -1927,6 +1927,9 @@ cpp_quote("#define INET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x800C0014)") cpp_quote("#define INET_E_REDIRECT_TO_DIR _HRESULT_TYPEDEF_(0x800C0015)") cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST _HRESULT_TYPEDEF_(0x800C0016)") +cpp_quote("#define INET_E_USE_EXTENDED_BINDING _HRESULT_TYPEDEF_(0x800C0017)") +cpp_quote("#define INET_E_TERMINATED_BIND _HRESULT_TYPEDEF_(0x800C0018)") +cpp_quote("#define INET_E_INVALID_CERTIFICATE _HRESULT_TYPEDEF_(0x800C0019)") cpp_quote("#define INET_E_CODE_DOWNLOAD_DECLINED _HRESULT_TYPEDEF_(0x800C0100)") cpp_quote("#define INET_E_RESULT_DISPATCHED _HRESULT_TYPEDEF_(0x800C0200)") cpp_quote("#define INET_E_CANNOT_REPLACE_SFP_FILE _HRESULT_TYPEDEF_(0x800C0300)")

13 years, 11 months

[tkreuzer] 50260: [WIN32K] Improve LDEVOBJ_bLoadImage, use ExportSectionPointer from the GdiDriverInfo structure instead of calling RtlImageDirectoryEntryToData

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 2 13:05:51 2011 New Revision: 50260 URL: http://svn.reactos.org/svn/reactos?rev=50260&view=rev Log: [WIN32K] Improve LDEVOBJ_bLoadImage, use ExportSectionPointer from the GdiDriverInfo structure instead of calling RtlImageDirectoryEntryToData Modified: trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Sun Jan 2 13:05:51 2011 @@ -31,6 +31,8 @@ NTAPI InitLDEVImpl() { + ULONG cbSize; + /* Initialize the loader lock */ ghsemLDEVList = EngCreateSemaphore(); if (!ghsemLDEVList) @@ -60,7 +62,11 @@ gpldevWin32k->pGdiDriverInfo->ImageAddress = &__ImageBase; gpldevWin32k->pGdiDriverInfo->SectionPointer = NULL; gpldevWin32k->pGdiDriverInfo->EntryPoint = (PVOID)DriverEntry; - gpldevWin32k->pGdiDriverInfo->ExportSectionPointer = NULL; + gpldevWin32k->pGdiDriverInfo->ExportSectionPointer = + RtlImageDirectoryEntryToData(&__ImageBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &cbSize); gpldevWin32k->pGdiDriverInfo->ImageLength = 0; // FIXME; return STATUS_SUCCESS; @@ -182,7 +188,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to load a GDI driver: '%S', Status = 0x%lx\n", + DPRINT1("Failed to load a GDI driver: '%S', Status = 0x%lx\n", pstrPathName->Buffer, Status); /* Free the allocated memory */ @@ -277,17 +283,14 @@ PVOID pvProcAdress = NULL; PUSHORT pOrdinals; PULONG pNames, pAddresses; - ULONG i, cbSize; + ULONG i; /* Make sure we have a driver info */ ASSERT(pldev && pldev->pGdiDriverInfo != NULL); /* Get the pointer to the export directory */ pvImageBase = pldev->pGdiDriverInfo->ImageAddress; - pExportDir = RtlImageDirectoryEntryToData(pvImageBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &cbSize); + pExportDir = pldev->pGdiDriverInfo->ExportSectionPointer; if (!pExportDir) { return NULL;

13 years, 11 months

[fireball] 50259: [NTOS] - Temporary bring back the old boot image until I or sir_richard commit a proper fix.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 2 09:30:24 2011 New Revision: 50259 URL: http://svn.reactos.org/svn/reactos?rev=50259&view=rev Log: [NTOS] - Temporary bring back the old boot image until I or sir_richard commit a proper fix. Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available.

13 years, 11 months

[janderwald] 50258: [NETCFGX] - Fix case where there is only one static dns server set

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jan 1 21:34:17 2011 New Revision: 50258 URL: http://svn.reactos.org/svn/reactos?rev=50258&view=rev Log: [NETCFGX] - Fix case where there is only one static dns server set Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sat Jan 1 21:34:17 2011 @@ -2867,8 +2867,16 @@ } CoTaskMemFree(pPerInfo); } - - } + } + else + { + if (!Info.AutoconfigActive) + { + CopyIpAddrString(&Info.DnsServerList, &pCurSettings->Ns, IPADDR, NULL); + } + pCurSettings->AutoconfigActive = Info.AutoconfigActive; + } + if (FAILED(LoadFilterSettings(This))) return E_FAIL;

13 years, 11 months

[janderwald] 50257: [IPHLPAPI] - Rewrite name server enumeration routines - Check if static dns entries are present before checking for dynamic dns entries - Fixes static dns entries [NETCFGX] - Ge...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jan 1 21:13:07 2011 New Revision: 50257 URL: http://svn.reactos.org/svn/reactos?rev=50257&view=rev Log: [IPHLPAPI] - Rewrite name server enumeration routines - Check if static dns entries are present before checking for dynamic dns entries - Fixes static dns entries [NETCFGX] - GetPerAdapterInfo requires IP_PER_ADAPTER_INFO struct - Fix reading static dns entries - Delete static name server key, when changing dns servers to automatic (dhcp) - Don't delete DhcpNameServer key yet, as more interaction is needed with dhcp service when changing from static dns to dynamic dhcp - Should finally fix static dns when dhcp is active Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Sat Jan 1 21:13:07 2011 @@ -1622,7 +1622,11 @@ return ERROR_BUFFER_OVERFLOW; } - if(RegQueryValueExW(hkey, L"DHCPNameServer", NULL, NULL, NULL, &dwSize) == ERROR_SUCCESS) + if(RegQueryValueExW(hkey, L"NameServer", NULL, NULL, NULL, &dwSize) == ERROR_SUCCESS) + { + pPerAdapterInfo->AutoconfigActive = FALSE; + } + else { pPerAdapterInfo->AutoconfigActive = TRUE; } Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sat Jan 1 21:13:07 2011 @@ -147,7 +147,7 @@ typedef VOID (*EnumNameServersFunc)( PWCHAR Interface, PWCHAR NameServer, PVOID Data ); -void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, PVOID Data, EnumNameServersFunc cb ); +LSTATUS EnumNameServers( HKEY RegHandle, LPWSTR Interface, PVOID Data, EnumNameServersFunc cb ); NTSTATUS getIPAddrEntryForIf(HANDLE tcpFile, char *name, DWORD index, Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Sat Jan 1 21:13:07 2011 @@ -52,197 +52,348 @@ IP_ADDR_STRING * pCurrent; } NAME_SERVER_LIST_PRIVATE, *PNAME_SERVER_LIST_PRIVATE; -NTSYSAPI -PVOID -NTAPI -RtlAllocateHeap ( - HANDLE Heap, - ULONG Flags, - SIZE_T Size - ); - -NTSYSAPI -BOOLEAN -NTAPI -RtlFreeHeap ( - HANDLE Heap, - ULONG Flags, - PVOID Address - ); - -NTSYSAPI -NTSTATUS -NTAPI -RtlUnicodeToMultiByteN ( - PCHAR MbString, - ULONG MbSize, - PULONG ResultSize, - PWCHAR UnicodeString, - ULONG UnicodeSize - ); - - -typedef VOID (*EnumInterfacesFunc)( HKEY ChildKeyHandle, - PWCHAR ChildKeyName, - PVOID Data ); - -/* - * EnumInterfaces - * - * Call the enumeration function for each name server. - */ - -static void EnumInterfaces( PVOID Data, EnumInterfacesFunc cb ) { - HKEY RegHandle; - HKEY ChildKeyHandle = 0; - PWCHAR RegKeyToEnumerate = - L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces"; - PWCHAR ChildKeyName = 0; - DWORD CurrentInterface; - - if (OpenChildKeyRead(HKEY_LOCAL_MACHINE,RegKeyToEnumerate,&RegHandle)) { - return; - } - - for (CurrentInterface = 0; TRUE; CurrentInterface++) { - ChildKeyName = GetNthChildKeyName( RegHandle, CurrentInterface ); - if (!ChildKeyName) break; - if (OpenChildKeyRead(RegHandle,ChildKeyName, - &ChildKeyHandle) == 0) { - cb( ChildKeyHandle, ChildKeyName, Data ); - RegCloseKey( ChildKeyHandle ); - } - ConsumeChildKeyName( ChildKeyName ); - } -} - -/* - * EnumNameServers - */ - -void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, - PVOID Data, EnumNameServersFunc cb ) { - PWCHAR NameServerString = - QueryRegistryValueString(RegHandle, L"DhcpNameServer"); - - if (!NameServerString) - NameServerString = QueryRegistryValueString(RegHandle, L"NameServer"); - - if (NameServerString) { - /* Now, count the non-empty comma separated */ - DWORD ch; - DWORD LastNameStart = 0; - for (ch = 0; NameServerString[ch]; ch++) { - if (NameServerString[ch] == ',') { - if (ch - LastNameStart > 0) { /* Skip empty entries */ - PWCHAR NameServer = - malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); - if (NameServer) { - memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart) * sizeof(WCHAR)); - NameServer[ch - LastNameStart] = 0; - cb( Interface, NameServer, Data ); - free(NameServer); - LastNameStart = ch +1; - } - } - LastNameStart = ch + 1; /* The first one after the comma */ - } - } - if (ch - LastNameStart > 0) { /* A last name? */ - PWCHAR NameServer = malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); - if (NameServer) { - memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart) * sizeof(WCHAR)); - NameServer[ch - LastNameStart] = 0; - cb( Interface, NameServer, Data ); - free(NameServer); +typedef VOID (*ENUM_INTERFACE_CALLBACK)( + HKEY ChildKeyHandle, + LPWSTR ChildKeyName, + PVOID CallbackContext); + +LSTATUS +QueryNameServer( + IN HKEY hInterface, + IN LPCWSTR NameServerKey, + OUT LPWSTR * OutNameServer) +{ + DWORD dwLength, dwType; + LPWSTR NameServer; + LSTATUS Status; + + /* query ns */ + dwLength = 0; + Status = RegQueryValueExW(hInterface, NameServerKey, NULL, &dwType, NULL, &dwLength); + + if (Status != ERROR_SUCCESS) + { + /* failed to retrieve size */ + DbgPrint("Status %x\n", Status); + return Status; + } + + /* add terminating null */ + dwLength += sizeof(WCHAR); + + /* allocate name server */ + NameServer = HeapAlloc(GetProcessHeap(), 0, dwLength); + + if (!NameServer) + { + /* no memory */ + return ERROR_OUTOFMEMORY; + } + + /* query ns */ + Status = RegQueryValueExW(hInterface, NameServerKey, NULL, &dwType, (LPBYTE)NameServer, &dwLength); + + if (Status != ERROR_SUCCESS || dwType != REG_SZ) + { + /* failed to retrieve ns */ + HeapFree(GetProcessHeap(), 0, NameServer); + return Status; + } + + /* null terminate it */ + NameServer[dwLength / sizeof(WCHAR)] = L'\0'; + + /* store result */ + *OutNameServer = NameServer; + + return STATUS_SUCCESS; +} + + +LSTATUS +EnumNameServers( + IN HKEY hInterface, + IN LPWSTR InterfaceName, + PVOID ServerCallbackContext, + EnumNameServersFunc CallbackRoutine) +{ + LSTATUS Status; + LPWSTR NameServer; + WCHAR Buffer[50]; + DWORD Length; + LPWSTR Start, Comma; + + /* query static assigned name server */ + Status = QueryNameServer(hInterface, L"NameServer", &NameServer); + if (Status != ERROR_SUCCESS) + { + /* query dynamic assigned name server */ + Status = QueryNameServer(hInterface, L"DhcpNameServer", &NameServer); + + if (Status != ERROR_SUCCESS) + { + /* failed to retrieve name servers */ + return Status; + } + } + + /* enumerate all name servers, terminated by comma */ + Start = NameServer; + + do + { + /* find next terminator */ + Comma = wcschr(Start, L','); + + if (Comma) + { + /* calculate length */ + Length = Comma - Start; + + /* copy name server */ + RtlMoveMemory(Buffer, Start, Length * sizeof(WCHAR)); + + /* null terminate it */ + Buffer[Length] = L'\0'; + + /* perform callback */ + CallbackRoutine(InterfaceName, Buffer, ServerCallbackContext); + + } + else + { + /* perform callback */ + CallbackRoutine(InterfaceName, Start, ServerCallbackContext); + + /* last entry */ + break; + } + + /* increment offset */ + Start = Comma + 1; + + }while(TRUE); + + /* free name server string */ + HeapFree(GetProcessHeap(), 0, NameServer); + + /* done */ + return ERROR_SUCCESS; +} + +LSTATUS +EnumInterfaces( + ENUM_INTERFACE_CALLBACK CallbackRoutine, + PVOID InterfaceCallbackContext) +{ + HKEY hKey, hInterface; + LSTATUS Status; + DWORD NumInterfaces, InterfaceNameLen, Index, Length; + LPWSTR InterfaceName; + + /* first open interface key */ + Status = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces", 0, KEY_READ, &hKey); + + /* check for success */ + if (Status != ERROR_SUCCESS) + { + /* failed to open interface key */ + return Status; + } + + /* now get maximum interface name length and number of interfaces */ + Status = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &NumInterfaces, &InterfaceNameLen, NULL, NULL, NULL, NULL, NULL, NULL); + if (Status != ERROR_SUCCESS) + { + /* failed to get key info */ + RegCloseKey(hKey); + return Status; + } + + /* RegQueryInfoKey does not include terminating null */ + InterfaceNameLen++; + + /* allocate interface name */ + InterfaceName = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, InterfaceNameLen * sizeof(WCHAR)); + + if (!InterfaceName) + { + /* no memory */ + RegCloseKey(hKey); + return ERROR_OUTOFMEMORY; + } + + /* no enumerate all interfaces */ + for(Index = 0; Index < NumInterfaces; Index++) + { + /* query interface name */ + Length = InterfaceNameLen; + Status = RegEnumKeyExW(hKey, Index, InterfaceName, &Length, NULL, NULL, NULL, NULL); + + if (Status == ERROR_SUCCESS) + { + /* make sure it is null terminated */ + InterfaceName[Length] = L'\0'; + + /* now open child key */ + Status = RegOpenKeyExW(hKey, InterfaceName, 0, KEY_READ, &hInterface); + + if (Status == ERROR_SUCCESS) + { + /* perform enumeration callback */ + CallbackRoutine(hInterface, InterfaceName, InterfaceCallbackContext); + + /* close interface key */ + RegCloseKey(hInterface); } - } - ConsumeRegValueString(NameServerString); - } -} - -static void CreateNameServerListEnumNamesFuncCount( PWCHAR Interface, - PWCHAR Server, - PVOID _Data ) { - PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data; + } + } + + /* free interface name */ + HeapFree(GetProcessHeap(), 0, InterfaceName); + + /* close root interface key */ + RegCloseKey(hKey); + + /* done */ + return Status; +} + +VOID +CountNameServerCallback( + IN LPWSTR InterfaceName, + IN LPWSTR Server, + IN PVOID CallbackContext) +{ + /* get context */ + PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)CallbackContext; + + /* increment server count */ Data->NumServers++; } -static void CreateNameServerListEnumIfFuncCount( HKEY RegHandle, - PWCHAR InterfaceName, - PVOID _Data ) { - PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data; - EnumNameServers(RegHandle,InterfaceName,Data, - CreateNameServerListEnumNamesFuncCount); -} - -VOID CreateNameServerListEnumNamesFunc( - PWCHAR Interface, - PWCHAR Server, - PVOID _Data ) -{ - PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data; - +VOID +CountServerCallbackTrampoline( + HKEY ChildKeyHandle, + LPWSTR ChildKeyName, + PVOID CallbackContext) +{ + EnumNameServers(ChildKeyHandle, ChildKeyName, CallbackContext, CountNameServerCallback); +} + +LSTATUS +CountNameServers( + IN PNAME_SERVER_LIST_PRIVATE PrivateData ) +{ + return EnumInterfaces(CountServerCallbackTrampoline, (PVOID)PrivateData); +} + +VOID +CreateNameServerListCallback( + IN LPWSTR InterfaceName, + IN LPWSTR Server, + IN PVOID CallbackContext) +{ + /* get context */ + PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)CallbackContext; + + /* convert to ansi ns string */ if (WideCharToMultiByte(CP_ACP, 0, Server, -1, Data->pCurrent->IpAddress.String, 16, NULL, NULL)) { - Data->pCurrent->Next = (struct _IP_ADDR_STRING*)(char*)Data->pCurrent + sizeof(IP_ADDR_STRING); + /* store offset to next name server struct */ + Data->pCurrent->Next = (struct _IP_ADDR_STRING*)(Data->pCurrent + 1); + + /* move to next entry */ Data->pCurrent = Data->pCurrent->Next; + + /* increment server count */ Data->NumServers++; } else { + /* failed to convert dns server */ Data->pCurrent->IpAddress.String[0] = '\0'; } } -static void CreateNameServerListEnumIfFunc( HKEY RegHandle, - PWCHAR InterfaceName, - PVOID _Data ) { - PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data; - EnumNameServers(RegHandle,InterfaceName,Data, - CreateNameServerListEnumNamesFunc); -} - -static int CountNameServers( PNAME_SERVER_LIST_PRIVATE PrivateData ) { - EnumInterfaces(PrivateData,CreateNameServerListEnumIfFuncCount); - return PrivateData->NumServers; -} - -static void MakeNameServerList( PNAME_SERVER_LIST_PRIVATE PrivateData ) { - EnumInterfaces(PrivateData,CreateNameServerListEnumIfFunc); -} - -PIPHLP_RES_INFO getResInfo() { - DWORD ServerCount; +VOID +CreateNameServerListCallbackTrampoline( + HKEY ChildKeyHandle, + LPWSTR ChildKeyName, + PVOID CallbackContext) +{ + EnumNameServers(ChildKeyHandle, ChildKeyName, CallbackContext, CreateNameServerListCallback); +} + +LSTATUS +MakeNameServerList( + PNAME_SERVER_LIST_PRIVATE PrivateData ) +{ + return EnumInterfaces(CreateNameServerListCallbackTrampoline, (PVOID)PrivateData); +} + +PIPHLP_RES_INFO +getResInfo() +{ NAME_SERVER_LIST_PRIVATE PrivateNSEnum; PIPHLP_RES_INFO ResInfo; - IP_ADDR_STRING * DnsList; + IP_ADDR_STRING * DnsList = NULL; + LSTATUS Status; PrivateNSEnum.NumServers = 0; - ServerCount = CountNameServers( &PrivateNSEnum ); - - PrivateNSEnum.NumServers = ServerCount; - DnsList = HeapAlloc(GetProcessHeap(), 0, ServerCount * sizeof(IP_ADDR_STRING)); - if (!DnsList) return NULL; - - ZeroMemory(DnsList, ServerCount * sizeof(IP_ADDR_STRING)); - - ResInfo = (PIPHLP_RES_INFO)RtlAllocateHeap ( GetProcessHeap(), 0, sizeof(IPHLP_RES_INFO)); - if( !ResInfo ) - { - HeapFree( GetProcessHeap(), 0, DnsList ); + + /* count name servers */ + Status = CountNameServers(&PrivateNSEnum); + + if (Status != ERROR_SUCCESS) + { + /* failed to enumerate name servers */ return NULL; } - PrivateNSEnum.NumServers = 0; - PrivateNSEnum.pCurrent = DnsList; - - MakeNameServerList( &PrivateNSEnum ); - ResInfo->DnsList = DnsList; - ResInfo->riCount = PrivateNSEnum.NumServers; - + /* are there any servers */ + if (PrivateNSEnum.NumServers) + { + /* allocate dns servers */ + DnsList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, PrivateNSEnum.NumServers * sizeof(IP_ADDR_STRING)); + + if (!DnsList) + { + /* no memory */ + return NULL; + } + } + + /* allocate private struct */ + ResInfo = (PIPHLP_RES_INFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IPHLP_RES_INFO)); + + if(!ResInfo) + { + /* no memory */ + if (DnsList) + { + /* free dns list */ + HeapFree( GetProcessHeap(), 0, DnsList); + } + return NULL; + } + + /* are there any servers */ + if (PrivateNSEnum.NumServers) + { + /* initialize enumeration context */ + PrivateNSEnum.NumServers = 0; + PrivateNSEnum.pCurrent = DnsList; + + /* enumerate servers */ + MakeNameServerList( &PrivateNSEnum ); + + /* store result */ + ResInfo->DnsList = DnsList; + ResInfo->riCount = PrivateNSEnum.NumServers; + } + + /* done */ return ResInfo; } Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sat Jan 1 21:13:07 2011 @@ -2765,11 +2765,12 @@ HRESULT Initialize(TcpipConfNotifyImpl * This) { - DWORD dwSize; + DWORD dwSize, Status; WCHAR szBuffer[50]; IP_ADAPTER_INFO * pCurrentAdapter; IP_ADAPTER_INFO * pInfo; PIP_PER_ADAPTER_INFO pPerInfo; + IP_PER_ADAPTER_INFO Info; LPOLESTR pStr; HRESULT hr; BOOL bFound; @@ -2846,13 +2847,17 @@ CopyIpAddrString(&pCurrentAdapter->IpAddressList, &pCurSettings->Ip, SUBMASK, NULL); CopyIpAddrString(&pCurrentAdapter->GatewayList, &pCurSettings->Gw, METRIC, NULL); //FIXME } - uLength = 0; - if (GetPerAdapterInfo(pCurrentAdapter->Index, NULL, &uLength) == ERROR_BUFFER_OVERFLOW) + + uLength = sizeof(IP_PER_ADAPTER_INFO); + ZeroMemory(&Info, sizeof(IP_PER_ADAPTER_INFO)); + + if (GetPerAdapterInfo(pCurrentAdapter->Index, &Info, &uLength) == ERROR_BUFFER_OVERFLOW) { pPerInfo = (PIP_PER_ADAPTER_INFO)CoTaskMemAlloc(uLength); if (pPerInfo) { - if (GetPerAdapterInfo(pCurrentAdapter->Index, pPerInfo, &uLength) == NOERROR) + Status = GetPerAdapterInfo(pCurrentAdapter->Index, pPerInfo, &uLength); + if (Status == NOERROR) { if (!pPerInfo->AutoconfigActive) { @@ -2862,9 +2867,8 @@ } CoTaskMemFree(pPerInfo); } - } - - + + } if (FAILED(LoadFilterSettings(This))) return E_FAIL; @@ -3284,16 +3288,15 @@ if (!pCurrentConfig->Ns || pCurrentConfig->AutoconfigActive) { - RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR)); + RegDeleteValueW(hKey, L"NameServer"); } else { pStr = CreateMultiSzString(pCurrentConfig->Ns, IPADDR, &dwSize, TRUE); if(pStr) { - RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)pStr, dwSize); - RegDeleteValueW(hKey, L"DhcpNameServer"); + //RegDeleteValueW(hKey, L"DhcpNameServer"); CoTaskMemFree(pStr); } }

13 years, 11 months

[sir_richard] 50256: [VIDEOPRT/WIN32K]: Synchronize and share PEVENT/ENG_EVENT/VIDEO_PORT_EVENT implementation, as these objects are actually the same (and VideoPrt Event* APIs can be used on GRE E...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jan 1 18:15:25 2011 New Revision: 50256 URL: http://svn.reactos.org/svn/reactos?rev=50256&view=rev Log: [VIDEOPRT/WIN32K]: Synchronize and share PEVENT/ENG_EVENT/VIDEO_PORT_EVENT implementation, as these objects are actually the same (and VideoPrt Event* APIs can be used on GRE Event Objects). Use ENG_EVENT structure from ntddvdeo.h instead of re-creating our own. Drivers using these interfaces will no longer explode. [VIDEOPRT]: Add parameter checks to DeleteEvent and WaitForSingleObject. [VIDEOPRT]: Fix WaitForSingleObject. It was waiting on the Object paramter itself -- which is the VideoPrt/ENG Event, not a real object, we have to wait on ->pKEvent instead. [VIDEOPRT]: Fix WaitForSingleObject round two, it was returning the NT_STATUS, while VideoPrt should return VP_STATUS/Win32 error codes. [WIN32K]: Allocate/free GRE events directly from pool, instead of using Eng APIs. Use documented tag for GRE Events (Dfsm), found in pooltag.txt [WIN32K]: Implement EngMapEvent and EngUnmapEvent. Modified: trunk/reactos/drivers/video/videoprt/event.c trunk/reactos/drivers/video/videoprt/videoprt.h trunk/reactos/subsystems/win32/win32k/eng/engevent.c trunk/reactos/subsystems/win32/win32k/include/engevent.h Modified: trunk/reactos/drivers/video/videoprt/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/eve… ============================================================================== --- trunk/reactos/drivers/video/videoprt/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/event.c [iso-8859-1] Sat Jan 1 18:15:25 2011 @@ -1,120 +1,140 @@ /* - * VideoPort driver - * - * Copyright (C) 2002, 2003, 2004 ReactOS Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * PROJECT: ReactOS Video Port Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/video/videoprt/event.c + * PURPOSE: Event Support Routines + * PROGRAMMERS: ReactOS Portable Systems Group */ +/* INCLUDES *******************************************************************/ + #include "videoprt.h" +#include "../../subsystems/win32/win32k/include/engevent.h" /* PUBLIC FUNCTIONS ***********************************************************/ /* * @implemented */ +VP_STATUS +NTAPI +VideoPortCreateEvent(IN PVOID HwDeviceExtension, + IN ULONG EventFlag, + IN PVOID Unused, + OUT PEVENT *Event) +{ + VP_STATUS Result = NO_ERROR; + PVIDEO_PORT_EVENT EngEvent; -VP_STATUS NTAPI -VideoPortCreateEvent( - IN PVOID HwDeviceExtension, - IN ULONG EventFlag, - IN PVOID Unused, - OUT PEVENT *Event) -{ - PVIDEO_PORT_EVENT VpEvent; - EVENT_TYPE Type = SynchronizationEvent; + /* Allocate memory for the event structure */ + EngEvent = ExAllocatePoolWithTag(NonPagedPool, + sizeof(VIDEO_PORT_EVENT) + sizeof(KEVENT), + TAG_VIDEO_PORT); + if (EngEvent) + { + /* Set KEVENT pointer */ + EngEvent->pKEvent = EngEvent + 1; + + /* Initialize the kernel event */ + KeInitializeEvent(EngEvent->pKEvent, + (EventFlag & EVENT_TYPE_MASK) ? + NotificationEvent : SynchronizationEvent, + EventFlag & INITIAL_EVENT_STATE_MASK); - /* Allocate storage for the event structure */ - VpEvent = ExAllocatePoolWithTag( - NonPagedPool, - sizeof(VIDEO_PORT_EVENT), - TAG_VIDEO_PORT); + /* Pass pointer to our structure to the caller */ + *Event = (PEVENT)EngEvent; + DPRINT("VideoPortCreateEvent() created %p\n", EngEvent); + } + else + { + /* Out of memory */ + DPRINT("VideoPortCreateEvent() failed\n"); + Result = ERROR_NOT_ENOUGH_MEMORY; + } - /* Fail if not enough memory */ - if (!VpEvent) return ERROR_NOT_ENOUGH_MEMORY; - - /* Initialize the event structure */ - RtlZeroMemory(VpEvent, sizeof(VIDEO_PORT_EVENT)); - VpEvent->pKEvent = &VpEvent->Event; - - /* Determine the event type */ - if (EventFlag & NOTIFICATION_EVENT) - Type = NotificationEvent; - - /* Initialize kernel event */ - KeInitializeEvent(VpEvent->pKEvent, Type, EventFlag & INITIAL_EVENT_SIGNALED); - - /* Indicate success */ - return NO_ERROR; + /* Return result */ + return Result; } /* * @implemented */ +VP_STATUS +NTAPI +VideoPortDeleteEvent(IN PVOID HwDeviceExtension, + IN PEVENT Event) +{ + /* Handle error cases */ + if (!Event) return ERROR_INVALID_PARAMETER; + if (Event->fFlags & ENG_EVENT_USERMAPPED) return ERROR_INVALID_PARAMETER; + if (!Event->pKEvent) return ERROR_INVALID_PARAMETER; -VP_STATUS NTAPI -VideoPortDeleteEvent( - IN PVOID HwDeviceExtension, - IN PEVENT Event) -{ - /* Free storage */ - ExFreePool(Event); + /* Free storage */ + ExFreePool(Event); - /* Indicate success */ - return NO_ERROR; + /* Indicate success */ + return NO_ERROR; } /* * @implemented */ - -LONG NTAPI -VideoPortSetEvent( - IN PVOID HwDeviceExtension, - IN PEVENT Event) +LONG +NTAPI +VideoPortSetEvent(IN PVOID HwDeviceExtension, + IN PEVENT Event) { - return KeSetEvent(Event->pKEvent, IO_NO_INCREMENT, FALSE); + return KeSetEvent(Event->pKEvent, IO_NO_INCREMENT, FALSE); } /* * @implemented */ - -VOID NTAPI -VideoPortClearEvent( - IN PVOID HwDeviceExtension, - IN PEVENT Event) +VOID +NTAPI +VideoPortClearEvent(IN PVOID HwDeviceExtension, + IN PEVENT Event) { - KeClearEvent(Event->pKEvent); + KeClearEvent(Event->pKEvent); } /* * @implemented */ +VP_STATUS +NTAPI +VideoPortWaitForSingleObject(IN PVOID HwDeviceExtension, + IN PVOID Event, + IN PLARGE_INTEGER Timeout OPTIONAL) +{ + PVIDEO_PORT_EVENT EngEvent = Event; + NTSTATUS Status; + + /* Handle error cases */ + if (!EngEvent) return ERROR_INVALID_PARAMETER; + if (!EngEvent->pKEvent) return ERROR_INVALID_PARAMETER; + if (EngEvent->fFlags & ENG_EVENT_USERMAPPED) return ERROR_INVALID_PARAMETER; + + /* Do the actual wait */ + Status = KeWaitForSingleObject(EngEvent->pKEvent, + Executive, + KernelMode, + FALSE, + Timeout); + if (Status == STATUS_TIMEOUT) + { + /* Convert to wait timeout, otherwise NT_SUCCESS would return NO_ERROR */ + return WAIT_TIMEOUT; + } + else if (NT_SUCCESS(Status)) + { + /* All other success codes are Win32 success */ + return NO_ERROR; + } + + /* Otherwise, return default Win32 failure */ + return ERROR_INVALID_PARAMETER; +} -VP_STATUS NTAPI -VideoPortWaitForSingleObject( - IN PVOID HwDeviceExtension, - IN PVOID Object, - IN PLARGE_INTEGER Timeout OPTIONAL) -{ - return KeWaitForSingleObject( - Object, - Executive, - KernelMode, - FALSE, - Timeout); -} +/* EOF */ + Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Sat Jan 1 18:15:25 2011 @@ -107,11 +107,7 @@ typedef struct _VIDEO_PORT_EVENT { - /* Public part */ ENG_EVENT; - - /* Private part */ - KEVENT Event; } VIDEO_PORT_EVENT, *PVIDEO_PORT_EVENT; /* agp.c */ Modified: trunk/reactos/subsystems/win32/win32k/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] Sat Jan 1 18:15:25 2011 @@ -1,54 +1,59 @@ /* * PROJECT: ReactOS Win32K - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: subsystems/win32/win32k/eng/engevent.c * PURPOSE: Event Support Routines * PROGRAMMERS: Aleksey Bragin <aleksey(a)reactos.org> + * ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include <win32k.h> +#include <ntddvdeo.h> #define NDEBUG #include <debug.h> -#define TAG_ENG ' gnE' +/* Dfsm - <unknown> - Eng event allocation (ENG_KEVENTALLOC,ENG_ALLOC) in ntgdi\gre */ +#define TAG_GRE_EVENT 'msfD' -/* PUBLIC FUNCTIONS **********************************************************/ +/* PUBLIC FUNCTIONS ***********************************************************/ BOOL APIENTRY EngCreateEvent(OUT PEVENT* Event) { + BOOLEAN Result = TRUE; PENG_EVENT EngEvent; /* Allocate memory for the event structure */ - EngEvent = EngAllocMem(FL_NONPAGED_MEMORY | FL_ZERO_MEMORY, - sizeof(ENG_EVENT), - TAG_ENG); + EngEvent = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ENG_EVENT) + sizeof(KEVENT), + TAG_GRE_EVENT); + if (EngEvent) + { + /* Set KEVENT pointer */ + EngEvent->fFlags = 0; + EngEvent->pKEvent = EngEvent + 1; - /* Check if we are out of memory */ - if (!EngEvent) + /* Initialize the kernel event */ + KeInitializeEvent(EngEvent->pKEvent, + SynchronizationEvent, + FALSE); + + /* Pass pointer to our structure to the caller */ + *Event = EngEvent; + DPRINT("EngCreateEvent() created %p\n", EngEvent); + } + else { - /* We are, fail */ - return FALSE; + /* Out of memory */ + DPRINT("EngCreateEvent() failed\n"); + Result = FALSE; } - /* Set KEVENT pointer */ - EngEvent->pKEvent = &EngEvent->KEvent; - - /* Initialize the kernel event */ - KeInitializeEvent(EngEvent->pKEvent, - SynchronizationEvent, - FALSE); - - /* Pass pointer to our structure to the caller */ - *Event = EngEvent; - - DPRINT("EngCreateEvent() created %p\n", EngEvent); - - /* Return success */ - return TRUE; + /* Return result */ + return Result; } BOOL @@ -66,7 +71,7 @@ } /* Free the allocated memory */ - EngFreeMem(Event); + ExFreePool(Event); /* Return success */ return TRUE; @@ -106,18 +111,57 @@ IN PVOID Reserved2, IN PVOID Reserved3) { - DPRINT("EngMapEvent(%x %x %p %p %p)\n", hDev, hUserObject, Reserved1, Reserved2, Reserved3); - UNIMPLEMENTED; - return NULL; + PENG_EVENT EngEvent; + NTSTATUS Status; + + /* Allocate memory for the event structure */ + EngEvent = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ENG_EVENT), + TAG_GRE_EVENT); + if (!EngEvent) return NULL; + + /* Zero it out */ + EngEvent->fFlags = 0; + EngEvent->pKEvent = NULL; + + /* Create a handle, and have Ob fill out the pKEvent field */ + Status = ObReferenceObjectByHandle(EngEvent, + EVENT_ALL_ACCESS, + ExEventObjectType, + UserMode, + &EngEvent->pKEvent, + NULL); + if (NT_SUCCESS(Status)) + { + /* Pulse the event and set that it's mapped by user */ + KePulseEvent(EngEvent->pKEvent, EVENT_INCREMENT, FALSE); + EngEvent->fFlags |= ENG_EVENT_USERMAPPED; + } + else + { + /* Free the allocation */ + ExFreePool(EngEvent); + EngEvent = NULL; + } + + /* Support legacy interface */ + if (Reserved1) *(PVOID*)Reserved1 = EngEvent; + return EngEvent; } BOOL APIENTRY EngUnmapEvent(IN PEVENT Event) { - DPRINT("EngUnmapEvent(%p)\n", Event); - UNIMPLEMENTED; - return FALSE; + /* Must be a usermapped event */ + if (!(Event->fFlags & ENG_EVENT_USERMAPPED)) return FALSE; + + /* Dereference the object, destroying it */ + ObDereferenceObject(Event->pKEvent); + + /* Free the Eng object */ + ExFreePool(Event); + return TRUE; } BOOL @@ -126,7 +170,6 @@ IN PLARGE_INTEGER TimeOut) { NTSTATUS Status; - DPRINT("EngWaitForSingleObject(%p %I64d)\n", Event, TimeOut->QuadPart); /* Validate parameters */ @@ -148,12 +191,7 @@ TimeOut); /* Check if there is a failure or a timeout */ - if (!NT_SUCCESS(Status)) - { - /* Return failure */ - return FALSE; - } + return NT_SUCCESS(Status); +} - /* Return success */ - return TRUE; -} +/* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/include/engevent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/engevent.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/engevent.h [iso-8859-1] Sat Jan 1 18:15:25 2011 @@ -1,13 +1,8 @@ #pragma once -#define ENG_EVENT_USERMAPPED 1 +// +// Flags for the fFlags field of ENG_EVENT +// +#define ENG_EVENT_USERMAPPED 0x01 -typedef struct _ENG_EVENT -{ - /* Public part */ - PVOID pKEvent; - ULONG fFlags; - - /* Private part */ - KEVENT KEvent; -} ENG_EVENT, *PENG_EVENT; +/* EOF */

13 years, 11 months

[janderwald] 50255: [AUDIO-BRINGUP] - Remove debugging code which caused a crash when the ks device does not use resources

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jan 1 16:44:19 2011 New Revision: 50255 URL: http://svn.reactos.org/svn/reactos?rev=50255&view=rev Log: [AUDIO-BRINGUP] - Remove debugging code which caused a crash when the ks device does not use resources Modified: branches/audio-bringup/drivers/ksfilter/ks/device.c Modified: branches/audio-bringup/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/device.c [iso-8859-1] Sat Jan 1 16:44:19 2011 @@ -282,8 +282,6 @@ NTSTATUS Status; PCM_RESOURCE_LIST TranslatedResourceList; PCM_RESOURCE_LIST UntranslatedResourceList; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor, UnPartialDescriptor; - ULONG Index; /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -308,31 +306,6 @@ TranslatedResourceList = IoStack->Parameters.StartDevice.AllocatedResourcesTranslated; UntranslatedResourceList = IoStack->Parameters.StartDevice.AllocatedResources; - - DPRINT("ResourceDescriptorCount %lu\n", TranslatedResourceList->List[0].PartialResourceList.Count); - for (Index = 0; Index < TranslatedResourceList->List[0].PartialResourceList.Count; Index ++ ) - { - PartialDescriptor = &TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; - UnPartialDescriptor = &UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; - DPRINT("Descriptor Type %u\n", PartialDescriptor->Type); - - if (PartialDescriptor->Type == CmResourceTypeInterrupt) - { - DPRINT("CmResourceTypeInterrupt Index %u TRANS Interrupt Number Affinity %x Level %u Vector %u Flags %x Share %x\n", Index, PartialDescriptor->u.Interrupt.Affinity, PartialDescriptor->u.Interrupt.Level, PartialDescriptor->u.Interrupt.Vector, PartialDescriptor->Flags, PartialDescriptor->ShareDisposition); - DPRINT("CmResourceTypeInterrupt Index %u UNTRANS Interrupt Number Affinity %x Level %u Vector %u Flags %x Share %x\\n", Index, UnPartialDescriptor->u.Interrupt.Affinity, UnPartialDescriptor->u.Interrupt.Level, UnPartialDescriptor->u.Interrupt.Vector, UnPartialDescriptor->Flags, UnPartialDescriptor->ShareDisposition); - - } - else if (PartialDescriptor->Type == CmResourceTypePort) - { - DPRINT("CmResourceTypePort Index %u TRANS Port Length %u Start %u %u Flags %x Share %x\n", Index, PartialDescriptor->u.Port.Length, PartialDescriptor->u.Port.Start.HighPart, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags, PartialDescriptor->ShareDisposition); - DPRINT("CmResourceTypePort Index %u UNTRANS Port Length %u Start %u %u Flags %x Share %x\n", Index, UnPartialDescriptor->u.Port.Length, UnPartialDescriptor->u.Port.Start.HighPart, UnPartialDescriptor->u.Port.Start.LowPart, UnPartialDescriptor->Flags, UnPartialDescriptor->ShareDisposition); - } - else if (PartialDescriptor->Type == CmResourceTypeMemory) - { - DPRINT("CmResourceTypeMemory Index %u TRANS Start %x Length %u Flags %x Share %x\n", Index, PartialDescriptor->u.Memory.Start.LowPart, PartialDescriptor->u.Memory.Length, PartialDescriptor->Flags, PartialDescriptor->ShareDisposition); - DPRINT("CmResourceTypeMemory Index %u TRANS Start %x Length %u Flags %x Share %x\n", Index, UnPartialDescriptor->u.Memory.Start.LowPart, UnPartialDescriptor->u.Memory.Length, UnPartialDescriptor->Flags, UnPartialDescriptor->ShareDisposition); - } - } ASSERT(DeviceHeader->KsDevice.Descriptor);

13 years, 11 months

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 January 2011